COMPUTER\EDY b5db0d3920 Merge branch 'main' into feat-newPass ... # Conflicts: # assets/GameplayIntro/compressed.meta # assets/Script/module/Pay/Utils.ts # assets/gacha_bundle/compressed.meta # assets/gacha_bundle/img/cat.meta # assets/libs/dn-sdk-minigame.meta # assets/passCheck/script.meta # assets/propWindow/compressed.meta # assets/res/shop.meta # assets/win/compressed.meta # settings/project.json # tools/test-battle-pass.cjs		2026-10-09 11:04:16 +08:00
..
ActivityScheduleService.ts	feat: 百人赛和小程序福利图标移动到首页右侧	2026-09-28 20:08:04 +08:00
ActivityScheduleService.ts.meta	feat: 百人赛完成	2026-09-21 12:44:48 +08:00
BattlePassModel.ts	更新战令奖励统一	2026-10-09 10:55:43 +08:00
BattlePassModel.ts.meta	更新三期战令相关，涉及到jiazai Map Reward Utils 剩下都是战令内的	2026-09-09 18:01:35 +08:00
BattlePassSettlementModel.ts	feat: 战令更新	2026-10-09 10:03:29 +08:00
BattlePassSettlementModel.ts.meta	feat: 战令更新	2026-10-09 10:03:29 +08:00
CloudRiseService.ts	feat: 百人赛提交	2026-09-24 16:50:43 +08:00
CloudRiseService.ts.meta	feat: 百人赛暂存	2026-09-16 12:44:01 +08:00
GameConfig.ts	更新战令奖励统一	2026-10-09 10:55:43 +08:00
GameConfig.ts.meta	消消王者首次更新	2026-06-17 15:43:40 +08:00
ReviveCostConfig.ts	大版本优化，主要在Map,JiaZai,GameManager, 优化新内存方案进游戏慢的问题，重新调整了所有的分包加载逻辑顺序	2026-09-08 20:40:59 +08:00
ReviveCostConfig.ts.meta	更新ab 复活金币	2026-08-21 18:51:43 +08:00
ShopCatalog.ts	更新AB商城最终版	2026-09-29 18:57:56 +08:00
ShopCatalog.ts.meta	更新AB商城最终版	2026-09-29 18:57:56 +08:00
StarterPack.ts	fix: keep starter pack rewards client-side	2026-09-30 21:49:05 +08:00
StarterPack.ts.meta	feat: 新手礼包	2026-09-09 19:27:42 +08:00