Commit Graph
313 Commits
Author SHA1 Message Date
guanchao e00f4fc8d4 fix: 排行榜报错 2026-10-27 12:45:12 +08:00
guanchao 9bf0d4486e fix: 数数收集到的报错 2026-10-26 21:50:06 +08:00
guanchao 2780bddbfd feat: 低内存机型针对首页排行榜进行懒加载 2026-10-26 20:08:18 +08:00
guanchao 9991d294fd feat: 内存检测 2026-10-26 18:45:45 +08:00
guanchao 53c7c73966 feat: 添加内存定位 2026-10-26 12:20:04 +08:00
guanchao 0d0cf6f2fa Merge branch 'hotfix-memoryuse' into test 2026-10-23 18:52:06 +08:00
guanchao 9e3195f753 feat: 内存优化 2026-10-23 18:51:24 +08:00
guanchao d6f4eaf8da fix: 抽卡报错 2026-10-23 11:36:16 +08:00
guanchao 4b04fef44e fix: gacha error 2026-10-23 11:20:25 +08:00
guanchao f7d72e6466 Merge branch 'feat-modalQueueManager' into test 2026-10-23 10:59:15 +08:00
guanchao 3af51fddb4 Merge branch 'main' into test 2026-10-23 10:51:46 +08:00
guanchao a7b162168b feat: 动画管理器 2026-10-23 10:47:20 +08:00
guanchao 47995a0ba0 fix: 百人赛匹配、活动进度异常处理,黄金矿工样式 2026-10-22 17:17:52 +08:00
guanchao fa63af1d67 feat: 弹窗统一管理 2026-10-21 19:56:42 +08:00
guanchao 421e35b89c feat: resource_get事件补充、修复异常关卡 2026-10-21 16:33:54 +08:00
guanchao 3e4a448142 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-10-21 15:26:35 +08:00
guanchao 71fdea2bab feat: 弹窗管理器暂存 2026-10-21 15:26:14 +08:00
COMPUTER\EDY 4bac33fe7c 误操作打开 2026-10-21 10:58:47 +08:00
guanchao 92cae07b07 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-10-21 10:46:28 +08:00
guanchao b2383083b8 fix: 首页销毁时,活动清理代码仍然访问已失效的首页节点 2026-10-21 10:46:16 +08:00
COMPUTER\EDY 7a295ddd5a Merge branch 'main' into Laser_gate
# Conflicts:
#	assets/custom/Json/level2021.json.meta
#	assets/custom/Json/level2022.json.meta
#	assets/custom/Json/level2023.json.meta
#	assets/custom/Json/level2024.json.meta
#	assets/custom/Json/level2025.json.meta
#	assets/custom/Json/level2026.json.meta
#	assets/custom/Json/level2027.json.meta
#	assets/custom/Json/level2028.json.meta
#	assets/custom/Json/level2029.json.meta
#	assets/custom/Json/level2030.json.meta
#	assets/custom/Json/level2031.json.meta
#	assets/custom/Json/level2032.json.meta
#	assets/custom/Json/level2033.json.meta
#	assets/custom/Json/level2034.json.meta
#	assets/custom/Json/level2035.json.meta
#	assets/custom/Json/level2036.json.meta
#	assets/custom/Json/level2037.json.meta
#	assets/custom/Json/level2038.json.meta
#	assets/custom/Json/level2039.json.meta
#	assets/custom/Json/level2040.json.meta
2026-10-20 15:47:36 +08:00
guanchao c167851c46 feat: 新增20关 2026-10-20 15:46:51 +08:00
COMPUTER\EDY e8de598a12 激光门完毕 2026-10-20 15:44:17 +08:00
COMPUTER\EDY 06ef53017d 激光版本 2026-10-20 11:24:09 +08:00
guanchao 6609fb23d9 fix: 黄金矿工折扣文字位置 2026-10-20 10:37:51 +08:00
guanchao 013f81c7a1 Merge branch 'optimize-dailyQuest' 2026-10-19 19:17:12 +08:00
guanchao 1b17ebfa17 Merge branch 'hotfix-cloudRiseModal' 2026-10-19 18:30:10 +08:00
guanchao 27b13a2192 fix: 图片位置 2026-10-19 18:28:46 +08:00
guanchao e8db1c0f42 fix: 图片位置 2026-10-19 18:25:23 +08:00
guanchao 48095c24f1 feat: 新增20关 2026-10-19 18:04:59 +08:00
guanchao e24fbe5d60 fix: 每日任务加号变形 2026-10-19 17:49:52 +08:00
guanchao c184372bc9 Merge branch 'hotfix-cloudRiseModal' into test 2026-10-19 17:38:33 +08:00
guanchao 9ac1f11be4 fix: 每日任务部分内容未使用图片资源 2026-10-19 17:27:11 +08:00
guanchao 9cfc11fd26 fix: 每日任务合并分支导致的代码缺失 2026-10-19 17:01:55 +08:00
guanchao 9d30991cd3 Merge branch 'hotfix-cloudRiseModal' into test 2026-10-19 16:26:12 +08:00
guanchao 5e7b36f1b0 fix: 每日任务奖励文字 2026-10-19 16:25:00 +08:00
guanchao d26dd047f8 fix: 折扣数字样式问题 2026-10-19 15:51:57 +08:00
guanchao 83fb0fb12f Merge branch 'hotfix-cloudRiseModal' into test 2026-10-19 15:30:16 +08:00
guanchao bbe01c3f85 fix: 百人赛关闭按钮位置 2026-10-19 15:28:40 +08:00
COMPUTER\EDY f9aa73f68a 修复藤蔓状态 2026-10-19 15:07:50 +08:00
guanchao 6d2082135e Merge branch 'optimize-dailyQuest' into test 2026-10-19 14:28:08 +08:00
guanchao 9bbd249645 Merge branch 'hotfix-cloudRiseModal' into test 2026-10-19 14:27:57 +08:00
guanchao 8808805e99 fix: 黄金矿工活动折扣数字不变 2026-10-19 14:24:52 +08:00
COMPUTER\EDY a4bc41d06d 回退到400e0f81,撤销两次三连胜修改 2026-10-19 14:05:49 +08:00
guanchao bf627c21c0 fix: 百人赛失败和暂停弹窗的zindex冲突 2026-10-19 13:48:33 +08:00
COMPUTER\EDY 60c7c8aa4a 修复3连胜不断连胜 2026-10-16 20:29:54 +08:00
guanchao cd7cb3f7b2 feat: 删除多余注释 2026-10-16 19:43:23 +08:00
guanchao 23108c0f5d feat: 每日任务样式优化 2026-10-16 19:31:24 +08:00
COMPUTER\EDY aa1e079d22 三连胜提交 2026-10-16 16:24:28 +08:00
guanchao 7236cfb74f feat: 每日任务优化暂存 2026-10-16 16:18:52 +08:00