161 Commits
Author SHA1 Message Date
guanchao 00028dbd4a Merge branch 'feat-modalQueueManager' into test 2026-11-04 10:39:33 +08:00
guanchao 004451cf55 fix: 小鱼干活动弹出活动之后还会再弹出一个loading 2026-11-03 20:50:13 +08:00
guanchao 9486b3ce98 feat: 修改构建流程 2026-11-03 20:41:22 +08:00
guanchao 8ba4676fc9 feat: 道具弹窗换图 2026-11-03 18:59:20 +08:00
guanchao c937916397 feat: 调整金字塔活动结算弹窗 2026-11-03 16:58:01 +08:00
guanchao 93385361d0 feat: 调整每日任务动画数值 2026-11-03 14:45:21 +08:00
guanchao 218d47a36b feat: 调整UI 2026-11-02 18:56:47 +08:00
guanchao b986d3e273 feat: 取消转场动画播放loading动画 2026-11-02 18:49:00 +08:00
guanchao b52fa83e96 feat: 网络异常状态直接返回首页 2026-11-02 18:40:38 +08:00
guanchao 64223ff6fa feat: 战令换图 2026-11-02 13:11:34 +08:00
guanchao 9c91046467 fix: 百人赛问题 2026-10-30 15:03:00 +08:00
keke 8dae0e5839 新排行榜加周竞赛功能升级 2026-10-28 12:07:07 +08:00
guanchao 7708887d9f feat: 困难关卡调整金币倍率 2026-10-28 11:33:42 +08:00
guanchao 568c38edb3 feat: 内存统计功能添加开关 2026-10-28 06:04:42 +08:00
guanchao 7cec10e4a1 暂存 2026-10-27 19:54:38 +08:00
guanchao 29dec73da6 feat: 调整弹窗规则 2026-10-27 15:57:33 +08:00
guanchao e6e359d9d3 fix: 数数收集到的报错信息 2026-10-27 14:55:03 +08:00
guanchao 0e3d448412 feat: 弹窗规则调整 2026-10-27 14:42:51 +08:00
guanchao 80161ea5fe fix: 动画效果 2026-10-27 13:28:12 +08:00
guanchao 49bc2235b3 fix: 动画效果 2026-10-27 13:27:45 +08:00
guanchao 9bf0d4486e fix: 数数收集到的报错 2026-10-26 21:50:06 +08:00
guanchao 153d9adb1d feat: 低内存机型针对首页排行榜进行懒加载 2026-10-26 20:09:23 +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
COMPUTER\EDY 61413d1e48 Merge branch 'Laser_gate' 2026-10-23 16:44:22 +08:00
COMPUTER\EDY ffb90777d1 更新 洗澡功能 2026-10-23 16:43:58 +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 c6accd4a9a 更新方块生门扩展 2026-10-21 10:13:21 +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