Commit Graph

84 Commits

Author SHA1 Message Date
guanchao 2643dd398e feat: 百人赛提交,准备提取公共资源 2026-09-17 16:15:06 +08:00
guanchao 09b8a24da1 feat: 暂存百人赛 2026-09-16 18:19:34 +08:00
guanchao 6a3ffd09f5 Move recharge statistics to dedicated collection 2026-09-16 13:11:27 +08:00
guanchao 8cb1ab2ec8 feat: 百人赛暂存 2026-09-16 12:44:01 +08:00
guanchao 58a97dc355 fix: anchor recharge statistics to previous Beijing day end 2026-09-15 18:01:22 +08:00
guanchao d137b4e030 fix: report recharge in fen with daily three-hour cutoff 2026-09-15 17:51:32 +08:00
guanchao 2224688b65 feat: add rolling paid-user recharge statistics job 2026-09-15 17:38:54 +08:00
guanchao 7cbdb87313 fix: 新手礼包金币数展示错误 2026-09-10 18:01:07 +08:00
guanchao 08c369a2cc Merge branch 'feat-newbieGift' 2026-09-10 17:49:23 +08:00
guanchao 5ba9c563d7 fix: 新手礼包金币数展示错误 2026-09-10 17:46:17 +08:00
COMPUTER\EDY a47ab69331 更改版本号配置 2026-09-10 17:28:05 +08:00
COMPUTER\EDY d477dd54c0 更新强制使用引导道具功能。 2026-09-10 17:09:05 +08:00
COMPUTER\EDY e96d8994b3 修复连胜BUG 主要在setUI 和GameTool 相关GM_INFO.winStreak , 增加ab前50所需关卡配置和新功能出现配置列表 2026-09-10 16:08:34 +08:00
guanchao 85d3dd6c50 Merge branch 'feat-newbieGift' 2026-09-10 15:20:12 +08:00
guanchao 243ab073b2 feat: 新手礼包修改样式,添加埋点数据 2026-09-10 15:12:06 +08:00
COMPUTER\EDY 6c37331f73 旧战令换算修复 2026-09-10 11:44:53 +08:00
guanchao b189305423 feat: 新手礼包及七日签到更新 2026-09-10 10:43:30 +08:00
guanchao 371f4b02e5 Merge branch 'feat-newbieGift' 2026-09-09 20:06:13 +08:00
guanchao 6a30a6b953 fix: 游戏结束回到首页时新手礼包弹出了两次 2026-09-09 19:55:18 +08:00
guanchao 1b8cd1f557 feat: 新手礼包 2026-09-09 19:27:42 +08:00
dongwenke 55814f4ea3 Merge pull request 'feature/seven_day_gift' (#1) from feature/seven_day_gift into main
Reviewed-on: #1
2026-09-09 19:25:53 +08:00
keke 2e0b55b9e7 fix: 修复七日活动依赖加载与战令自动弹窗排队 2026-09-09 19:20:38 +08:00
keke 4bf2c7596f Merge remote-tracking branch 'origin/main' into feature/seven_day_gift 2026-09-09 18:08:46 +08:00
COMPUTER\EDY 5292b6562d 更新三期战令相关,涉及到jiazai Map Reward Utils 剩下都是战令内的 2026-09-09 18:01:35 +08:00
keke d9710b055c merge: 同步 main 加载优化并兼容主页活动队列 2026-09-09 10:09:22 +08:00
COMPUTER\EDY 4e0378577d 大版本优化,主要在Map,JiaZai,GameManager, 优化新内存方案进游戏慢的问题,重新调整了所有的分包加载逻辑顺序 2026-09-08 20:40:59 +08:00
keke 9ca9804ad4 merge: 同步最新 main 并保留七日活动主页入口 2026-09-08 20:28:40 +08:00
keke 79e4a25039 feat: 完善七日活动交互、奖励动画与猫形象支持 2026-09-08 20:25:28 +08:00
COMPUTER\EDY af740a5b3c 更新了所有方块和墙壁图片以及墙壁图片的引用,GameScene和homeScene 场景一些UI调动,更新高内存机型的预热机制 2026-09-07 20:01:42 +08:00
keke f2f12d480c feat: 七日活动分包及本地模拟测试,补齐领取动画 2026-09-07 19:03:42 +08:00
keke 3d5dafe71c fix: 修复七日活动道具同步 2026-09-04 19:50:08 +08:00
keke e1ab800383 feat: 添加七日签到活动 2026-09-04 18:36:07 +08:00
COMPUTER\EDY 122b5041ce 更新1940关卡,替换新玩法出现图片 2026-09-03 20:30:22 +08:00
COMPUTER\EDY 6b56b88284 更新从五彩转移过来的奖励页面 2026-09-03 15:45:05 +08:00
COMPUTER\EDY 81ba29d067 更新内存优化方案,更新获胜结算界面图和动画 2026-09-03 14:58:36 +08:00
huanghaipeng 111d47a866 chore: normalize Cocos meta line endings 2026-09-02 18:27:29 +08:00
COMPUTER\EDY 88cf4760c9 更新 intercept BUG错误 2026-09-02 14:13:58 +08:00
huanghaipeng e30027083b Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-09-01 20:17:46 +08:00
huanghaipeng 14eb24f493 添加测试服务器请求地址 2026-09-01 20:16:06 +08:00
COMPUTER\EDY 731f89a205 Merge branch 'Memory'
# Conflicts:
#	assets/Scene/GameScene.fire
#	assets/Script/Map.ts
#	assets/Script/module/Config/GameConfig.ts
#	assets/common.meta
2026-09-01 20:12:36 +08:00
COMPUTER\EDY d39341d5bc 更新优化 2026-09-01 18:47:54 +08:00
WIN-GKKD951VVMJ\Administrator e9ec02be41 更新服务器代码 2026-09-01 14:08:37 +08:00
WIN-GKKD951VVMJ\Administrator 76cb0b5546 大更新 2026-08-31 20:03:32 +08:00
COMPUTER\EDY 52c1b924ec 补更新 2026-08-28 23:06:22 +08:00
COMPUTER\EDY f8ef17bd56 更新 2026-08-28 22:59:13 +08:00
COMPUTER\EDY a9c2c0301c 更新内存优化 2026-08-28 19:21:40 +08:00
WIN-GKKD951VVMJ\Administrator 6cf2e385e6 更新UI小鱼干活动 2026-08-28 19:19:27 +08:00
COMPUTER\EDY 393667f236 无用更新 2026-08-27 19:45:54 +08:00
COMPUTER\EDY 4a352390b8 更新 2026-08-27 19:31:20 +08:00
COMPUTER\EDY 588db1bd39 提交 2026-08-26 10:38:10 +08:00