Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Dec 14, 2025

  • Understand the issue: Event pools (male/female) share pity counts but are rendered separately
  • Address feedback from @BTMuli
    • Use gachaType === "2000" to filter event pools instead of specific opGachaType values
    • Pass full event pool data to both boy and girl components
    • Handle filtering internally in gbr-data-view.vue based on dataType
    • Pity counts calculated from combined event pool data
    • Item lists filtered by opGachaType for display
  • Fix the filtering logic in gbr-overview.vue
    • Use gachaType for pool identification (normalData: "1000", eventData: "2000")
    • Removed separate boyData/girlData computed properties
    • Pass same eventData to both boy and girl view components
  • Update gbr-data-view.vue to properly calculate shared pity counts
    • Removed sharedPoolData prop (no longer needed)
    • Added shouldDisplay() helper to filter items by opGachaType during display phase
    • Pity calculation uses all event pool data
    • Display lists filter by opGachaType based on dataType (boy: 20011/20012, girl: 20021/20022)
  • Sync with upstream master branch
    • Merged latest changes from origin/master (commit 9a0fbe1)
  • Implement dynamic height calculation in GbrDataView (referencing GroDataView)
    • Added template refs for container and header elements
    • Implemented calculateHeights() function for dynamic height calculation
    • Added window resize listener using curWin.onResized()
    • Updated CSS to use v-bind() for dynamic bottomHeight and windowHeight
    • Added watchers for dataType and dataVal changes to recalculate heights
    • Removed TODO comment about dynamic height calculation
  • Code review and security checks completed

Summary

Successfully implemented shared pity calculation for event pools, synced with upstream master branch, and added dynamic height calculation with window resize handling to GbrDataView component (matching GroDataView implementation). No conflicts encountered during merge.

Original prompt

This section details on the original issue you should resolve

<issue_title>[TODO] 处理千星奇遇颂愿活动池次数共享</issue_title>
<issue_description>### 任务描述

千星卡池分常驻池跟活动池,活动池分男女池,活动池次数共享.

需要对男女池数据进行合并,或者计算次数后重新分割数据渲染

预期版本

Beta v0.8.8

当前提交

Beta v0.9.0

其他信息

No response</issue_description>

Comments on the Issue (you are @copilot in this section)


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Co-authored-by: BTMuli <72692909+BTMuli@users.noreply.github.com>
Copilot AI changed the title [WIP] Update event pool data handling for shared counts Fix shared pity calculation for 千星奇遇颂愿 event pools Dec 14, 2025
Copilot AI requested a review from BTMuli December 14, 2025 07:44
@BTMuli BTMuli marked this pull request as ready for review December 14, 2025 07:45
);
const girlData = computed<Array<TGApp.Sqlite.GachaRecords.TableGachaB>>(() =>
props.modelValue.filter((item) => item.opGachaType === "20011" || item.opGachaType === "20012"),
props.modelValue.filter((item) => item.opGachaType === "20021" || item.opGachaType === "20022"),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这部分卡池类型修改不对吧 @copilot

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修正,现在使用 gachaType 字段而不是 opGachaType 来过滤卡池类型。normalData 使用 gachaType === "1000",eventData 使用 gachaType === "2000"。(commit cfbda53)

@BTMuli
Copy link
Owner

BTMuli commented Dec 14, 2025

@copilot 顺便同步一下上游

Co-authored-by: BTMuli <72692909+BTMuli@users.noreply.github.com>
Copy link
Contributor Author

Copilot AI commented Dec 14, 2025

@copilot 顺便同步一下上游

已同步上游 master 分支,合并了最新的提交 (9a0fbe1 "🚸 刷新入口"),没有冲突。(commit eb14a8b)

Copy link
Owner

@BTMuli BTMuli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GbrDataView页面参考GroDataView进行动态高度计算&监听页面尺寸变化

Co-authored-by: BTMuli <72692909+BTMuli@users.noreply.github.com>
Copy link
Contributor Author

Copilot AI commented Dec 14, 2025

GbrDataView页面参考GroDataView进行动态高度计算&监听页面尺寸变化

已实现 GbrDataView 的动态高度计算和页面尺寸变化监听,参考了 GroDataView 的实现:

  • 添加了 template refs (gbrDvBoxRef, headerRef)
  • 实现了 calculateHeights() 函数动态计算底部区域和窗口高度
  • 添加了 window resize 监听器 (curWin.onResized)
  • 使用 v-bind() 绑定动态高度到 CSS
  • 在 dataType 和 dataVal 变化时重新计算高度

(commit 331c829)

Copilot AI changed the title Fix shared pity calculation for 千星奇遇颂愿 event pools Fix shared pity calculation for 千星奇遇颂愿 event pools and add dynamic height calculation Dec 14, 2025
@BTMuli BTMuli removed the 待处理 label Dec 14, 2025
@BTMuli BTMuli added the 计划中 Something will be done label Dec 14, 2025
@BTMuli BTMuli added this to the BetaTarget milestone Dec 14, 2025
@BTMuli BTMuli merged commit 6cca6e5 into master Dec 14, 2025
4 checks passed
@BTMuli BTMuli deleted the copilot/merge-event-pool-data branch December 14, 2025 09:24
@whitetea-bot whitetea-bot bot added 待发布 Function is update in next version and removed 计划中 Something will be done labels Dec 14, 2025
@whitetea-bot
Copy link

whitetea-bot bot commented Dec 21, 2025

该 issue 已在 v0.9.0-beta 中解决。

@whitetea-bot whitetea-bot bot removed the 待发布 Function is update in next version label Dec 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[TODO] 处理千星奇遇颂愿活动池次数共享

2 participants