yangzhao/MatchMaster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
303 Commits 23 Branches 0 Tags
f7adc1342b2e34ba486b0eee99d2055e2c0534c5
Commit Graph
214 Commits
Author SHA1 Message Date
guanchao f7adc1342b feat: 版本号 2026-11-02 13:18:26 +08:00
guanchao 2eea7c3042 feat: 版本号 2026-10-30 15:33:22 +08:00
guanchao 9c91046467 fix: 百人赛问题 2026-10-30 15:03:00 +08:00
guanchao 2f6b6ae6fe feat: 新增20关 2026-10-29 10:41:19 +08:00
guanchao e6e359d9d3 fix: 数数收集到的报错信息 2026-10-27 14:55:03 +08:00
guanchao ad8b653e0f feat: 修改版本号 2026-10-26 20:09:56 +08:00
guanchao 153d9adb1d feat: 低内存机型针对首页排行榜进行懒加载 2026-10-26 20:09:23 +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 d6f4eaf8da fix: 抽卡报错 2026-10-23 11:36:16 +08:00
guanchao 47995a0ba0 fix: 百人赛匹配、活动进度异常处理，黄金矿工样式 2026-10-22 17:17:52 +08:00
guanchao 421e35b89c feat: resource_get事件补充、修复异常关卡 2026-10-21 16:33:54 +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
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 1b17ebfa17 Merge branch 'hotfix-cloudRiseModal' 2026-10-19 18:30:10 +08:00
guanchao bbe01c3f85 fix: 百人赛关闭按钮位置 2026-10-19 15:28:40 +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
COMPUTER\EDY aa1e079d22 三连胜提交 2026-10-16 16:24:28 +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
COMPUTER\EDY 89e1de46d4 更新开关门冻结状态下不开门 2026-10-14 18:06:36 +08:00
guanchao 6a757393f7 fix: 解决代码冲突时的遗留问题 2026-10-14 14:49:42 +08:00
guanchao 310c418bd2 feat: 调整版本号 2026-10-14 14:40:24 +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 411f44c29f 更新版本 2026-10-13 20:11:49 +08:00
COMPUTER\EDY cf665aac1c 修复一个 体力礼包问题 2026-10-13 20:10:18 +08:00
COMPUTER\EDY fe8594604f 更新资源清理以及 战令 介绍恢复 2026-10-13 16:24:32 +08:00
guanchao c7eb255ca2 feat: 测试新版本更新逻辑 2026-10-13 14:38:54 +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
COMPUTER\EDY 7302fccb48 更新一个 关卡时间AB方案 2026-10-10 18:35:48 +08:00
COMPUTER\EDY 85daacefe1 更新无限转移 2026-10-10 14:42:05 +08:00