 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
|
3e4a448142
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-10-21 15:26:35 +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
|
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
|
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
|
e24fbe5d60
|
fix: 每日任务加号变形
|
2026-10-19 17:49:52 +08:00 |
|
|
guanchao
|
9ac1f11be4
|
fix: 每日任务部分内容未使用图片资源
|
2026-10-19 17:27:11 +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
|
bbe01c3f85
|
fix: 百人赛关闭按钮位置
|
2026-10-19 15:28:40 +08:00 |
|
|
COMPUTER\EDY
|
f9aa73f68a
|
修复藤蔓状态
|
2026-10-19 15:07:50 +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 |
|
|
guanchao
|
400e0f81b9
|
feat: cdn请求优化
|
2026-10-16 15:02:14 +08:00 |
|
|
guanchao
|
b22d243f2c
|
fix: 1961关卡数据回退
|
2026-10-15 16:31:12 +08:00 |
|
|
guanchao
|
e279afa31d
|
fix: 部分活动未上报yinli_Pay
|
2026-10-15 15:37:27 +08:00 |
|
|
guanchao
|
af38c6c9ec
|
fix: 调整关卡
|
2026-10-15 12:30:33 +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
|
bbd8262fcb
|
fix: 图片资源没压缩导致上传版本失败
|
2026-10-14 16:11:19 +08:00 |
|
|
guanchao
|
930d95b55f
|
fix: 战令首页图标
|
2026-10-14 15:54:43 +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 |
|
|
guanchao
|
cacd57e382
|
feat: 删除每日任务旧资源
|
2026-10-13 20:01:38 +08:00 |
|