Commit Graph
137 Commits
Author SHA1 Message Date
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 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 71fdea2bab feat: 弹窗管理器暂存 2026-10-21 15:26:14 +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
COMPUTER\EDY 06ef53017d 激光版本 2026-10-20 11:24:09 +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 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 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 a4bc41d06d 回退到400e0f81,撤销两次三连胜修改 2026-10-19 14:05:49 +08:00
COMPUTER\EDY 60c7c8aa4a 修复3连胜不断连胜 2026-10-16 20:29:54 +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
guanchao 400e0f81b9 feat: cdn请求优化 2026-10-16 15:02:14 +08:00
guanchao e279afa31d fix: 部分活动未上报yinli_Pay 2026-10-15 15:37:27 +08:00
guanchao 287f088fec feat: 每日任务兼容 2026-10-15 11:56:15 +08:00
guanchao 6816600fa1 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster 2026-10-14 18:08:15 +08:00
guanchao ba040e553b feat: 每日任务领取时可以同时领多个奖励,不需要等待上一次奖励动画播放完毕 2026-10-14 18:08:10 +08:00
COMPUTER\EDY 89e1de46d4 更新开关门冻结状态下不开门 2026-10-14 18:06:36 +08:00
guanchao 2c58225818 Merge branch 'feat-dailyQuest' 2026-10-14 14:39:25 +08:00
guanchao 618f94a721 feat: 每日任务首次通过关卡逻辑调整 2026-10-14 14:39:00 +08:00
guanchao 4e158f0463 Merge branch 'main' into feat-dailyQuest 2026-10-13 20:30:46 +08:00
COMPUTER\EDY cf665aac1c 修复一个 体力礼包问题 2026-10-13 20:10:18 +08:00
guanchao 94631eb478 Merge branch 'main' into feat-newVersion 2026-10-13 13:46:16 +08:00
guanchao 518a65759e fix: 移除编辑器/浏览器预览 2026-10-13 13:45:49 +08:00
COMPUTER\EDY d8d8144e42 更新修复金字塔 2026-10-13 12:55:12 +08:00
guanchao bc5272de5d feat: 新版本更新逻辑 2026-10-13 09:08:25 +08:00
COMPUTER\EDY 64d4d11dda Merge branch 'hp_gift'
# Conflicts:
#	assets/pyramid/art.meta
2026-10-12 18:42:32 +08:00
COMPUTER\EDY 16d878c0b4 最后更新 无限体力礼包,将两个分包从主包拆出来 2026-10-12 18:40:56 +08:00
COMPUTER\EDY 5241738241 无限体力礼包第一版 2026-10-12 17:44:35 +08:00
guanchao 52a801f1c4 fix: 资源引用问题 2026-10-12 17:03:13 +08:00
guanchao 1011ed4b22 feat: 合并金字塔活动 2026-10-12 15:00:49 +08:00