MatchMaster

yangzhao/MatchMaster

Fork 0

Commit Graph

Select branches

Hide Pull Requests

Laser_gate

Memory

abTest_50Level

abTest_layerThree_levelTimeChange

codex/coin-madness

feat-newPass

feat-newShop

feat-newVersion

feat-newbieGift

feat-weekCompetition

feature/mini_program_benefits

feature/seven_day_gift

hotfix-memoryuse

layout-optimization

main

newRanks

newUI

new_shop

rainbow

rainbow_old

removeShopAndLevel

test

three_wins

#1

#2

#3

#4

#5

#6

#7

f9aa73f68a 修复藤蔓状态 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-19 15:07:50 +08:00
6d2082135e Merge branch 'optimize-dailyQuest' into test guanchao 2026-10-19 14:28:08 +08:00
9bbd249645 Merge branch 'hotfix-cloudRiseModal' into test guanchao 2026-10-19 14:27:57 +08:00
8808805e99 fix: 黄金矿工活动折扣数字不变 guanchao 2026-10-19 14:24:52 +08:00
a4bc41d06d 回退到400e0f81，撤销两次三连胜修改 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-19 14:05:49 +08:00
bf627c21c0 fix: 百人赛失败和暂停弹窗的zindex冲突 guanchao 2026-10-19 13:48:33 +08:00
39be746cc1 Merge branch 'main' into three_wins three_wins $COMPUTER\EDY$ COMPUTER\EDY 2026-10-19 13:45:52 +08:00
60c7c8aa4a 修复3连胜不断连胜 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-16 20:29:54 +08:00
cd7cb3f7b2 feat: 删除多余注释 guanchao 2026-10-16 19:43:23 +08:00
23108c0f5d feat: 每日任务样式优化 guanchao 2026-10-16 19:31:24 +08:00
aa1e079d22 三连胜提交 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-16 16:24:28 +08:00
7236cfb74f feat: 每日任务优化暂存 guanchao 2026-10-16 16:18:52 +08:00
400e0f81b9 feat: cdn请求优化 guanchao 2026-10-16 15:02:14 +08:00
2278a7ba24 三连胜完结 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-16 14:25:54 +08:00
1c715e9c27 三连胜更新 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-16 10:56:00 +08:00
efc396bee9 三连胜功能更新 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-15 18:37:21 +08:00
b22d243f2c fix: 1961关卡数据回退 guanchao 2026-10-15 16:31:12 +08:00
e279afa31d fix: 部分活动未上报yinli_Pay guanchao 2026-10-15 15:37:27 +08:00
af38c6c9ec fix: 调整关卡 guanchao 2026-10-15 12:30:33 +08:00
287f088fec feat: 每日任务兼容 guanchao 2026-10-15 11:56:15 +08:00
6816600fa1 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-10-14 18:08:15 +08:00
ba040e553b feat: 每日任务领取时可以同时领多个奖励，不需要等待上一次奖励动画播放完毕 guanchao 2026-10-14 18:08:10 +08:00
89e1de46d4 更新开关门冻结状态下不开门 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-14 18:06:36 +08:00
bbd8262fcb fix: 图片资源没压缩导致上传版本失败 guanchao 2026-10-14 16:11:19 +08:00
930d95b55f fix: 战令首页图标 guanchao 2026-10-14 15:54:43 +08:00
6a757393f7 fix: 解决代码冲突时的遗留问题 guanchao 2026-10-14 14:49:42 +08:00
310c418bd2 feat: 调整版本号 guanchao 2026-10-14 14:40:24 +08:00
2c58225818 Merge branch 'feat-dailyQuest' guanchao 2026-10-14 14:39:25 +08:00
618f94a721 feat: 每日任务首次通过关卡逻辑调整 guanchao 2026-10-14 14:39:00 +08:00
4e158f0463 Merge branch 'main' into feat-dailyQuest guanchao 2026-10-13 20:30:46 +08:00
411f44c29f 更新版本 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-13 20:11:49 +08:00
cf665aac1c 修复一个体力礼包问题 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-13 20:10:18 +08:00
cacd57e382 feat: 删除每日任务旧资源 guanchao 2026-10-13 20:01:38 +08:00
fe8594604f 更新资源清理以及战令介绍恢复 feat-newVersion $COMPUTER\EDY$ COMPUTER\EDY 2026-10-13 16:24:32 +08:00
c7eb255ca2 feat: 测试新版本更新逻辑 guanchao 2026-10-13 14:38:54 +08:00
94631eb478 Merge branch 'main' into feat-newVersion guanchao 2026-10-13 13:46:16 +08:00
518a65759e fix: 移除编辑器／浏览器预览 guanchao 2026-10-13 13:45:49 +08:00
d8d8144e42 更新修复金字塔 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-13 12:55:12 +08:00
bc5272de5d feat: 新版本更新逻辑 guanchao 2026-10-13 09:08:25 +08:00
64d4d11dda Merge branch 'hp_gift' $COMPUTER\EDY$ COMPUTER\EDY 2026-10-12 18:42:32 +08:00
16d878c0b4 最后更新无限体力礼包，将两个分包从主包拆出来 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-12 18:40:56 +08:00
5241738241 无限体力礼包第一版 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-12 17:44:35 +08:00
52a801f1c4 fix: 资源引用问题 guanchao 2026-10-12 17:03:13 +08:00
8e5c271302 更新体力包弹窗预制体 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-12 16:27:23 +08:00
1011ed4b22 feat: 合并金字塔活动 guanchao 2026-10-12 15:00:49 +08:00
7cb749c6fe 增加公共金币图片 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-12 10:43:22 +08:00
7302fccb48 更新一个关卡时间AB方案 abTest_layerThree_levelTimeChange $COMPUTER\EDY$ COMPUTER\EDY 2026-10-10 18:35:48 +08:00
eb2fe6175a Merge pull request '修改黄金矿工活动面板的倒计时规则' (#7) from codex/coin-madness into main dongwenke 2026-10-10 17:20:23 +08:00
1f3c329eb3 修改黄金矿工活动面板的倒计时规则 codex/coin-madness keke 2026-10-10 17:15:37 +08:00
85daacefe1 更新无限转移 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-10 14:42:05 +08:00
2390191014 feat: allow repeat Wucai save selection on external entry $COMPUTER\EDY$ COMPUTER\EDY 2026-10-10 12:40:34 +08:00
1a8ba3b11d 更新所有按钮音效 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-10 11:54:48 +08:00
9bf06c7630 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster $COMPUTER\EDY$ COMPUTER\EDY 2026-10-10 11:08:23 +08:00
74070b2766 更新前50关AB 合并 removeShopAndLevel $COMPUTER\EDY$ COMPUTER\EDY 2026-10-10 11:07:10 +08:00
eaadd8f4a6 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-10-09 19:07:51 +08:00
903c81b1f1 feat: 前端轮询战令结算接口逻辑调整 guanchao 2026-10-09 19:07:45 +08:00
6150206adb 商城方案合并采用B 放弃A方案并且删除预制体和独享图片 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 19:06:38 +08:00
64ed8ad737 Merge branch 'feat-newPass' $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 17:54:01 +08:00
ac8f227f01 修复战令UI 问题 feat-newPass $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 17:53:38 +08:00
cddca62fb5 更新后端战令代码 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 14:33:52 +08:00
640dc21370 更新战令 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 14:30:01 +08:00
28d69d29eb fix: replace null jungle settlement records atomically $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 14:21:27 +08:00
b5db0d3920 Merge branch 'main' into feat-newPass $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 11:04:16 +08:00
91b07bc49d 更新战令奖励统一 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 10:55:43 +08:00
6ce1fe8b2a 无异议 $COMPUTER\EDY$ COMPUTER\EDY 2026-10-09 10:28:02 +08:00
112dad4eb2 feat: 战令更新 guanchao 2026-10-09 10:03:29 +08:00
c36447a646 feat: 新版商城scrollview y值调整 guanchao 2026-10-08 11:32:50 +08:00
129074123c Merge branch 'main' into newbieGift $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 22:35:04 +08:00
18146a65d4 更新新手礼包 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 22:30:22 +08:00
7fb430e512 fix: fit activity amounts and show unpaid completion badge keke 2026-09-30 22:05:58 +08:00
038743f3f2 fix: disable starter pack server purchase guard $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 22:01:37 +08:00
b8e02e08d0 fix: keep starter pack rewards client-side $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 21:49:05 +08:00
96a5e1acf9 Merge pull request 'codex/coin-madness' (#6) from codex/coin-madness into main dongwenke 2026-09-30 20:08:24 +08:00
490cc0b1da docs: align Gold Miner documentation with current client and V1.7 gaps keke 2026-09-30 20:05:20 +08:00
7e14f66170 feat: integrate Gold Miner activity and remove development test panels keke 2026-09-30 19:43:47 +08:00
e4973ae845 Merge remote-tracking branch 'origin/main' into codex/coin-madness keke 2026-09-30 19:37:24 +08:00
60f8fc4047 feat: tier starter packs using daily payment factors $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 18:45:13 +08:00
44901f1e50 更新 1957关BUG $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 17:59:19 +08:00
0d12143572 更新修复一个显示异常 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 17:15:21 +08:00
36e6adb803 关卡上限调整为2000 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 11:21:23 +08:00
4fc9298686 更新商城最新版本支付，并且优化弹窗奖励和部分UI $COMPUTER\EDY$ COMPUTER\EDY 2026-09-30 10:10:34 +08:00
483f73c7a1 Merge remote-tracking branch 'origin/main' into codex/coin-madness keke 2026-09-29 20:46:59 +08:00
50f024c969 Merge branch 'main' into new_shop new_shop $COMPUTER\EDY$ COMPUTER\EDY 2026-09-29 19:00:23 +08:00
271cdb53d2 更新AB商城最终版 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-29 18:57:56 +08:00
7886bbfef5 refactor(shop): inline B product config in existing payment functions $COMPUTER\EDY$ COMPUTER\EDY 2026-09-29 16:29:17 +08:00
81dac3b154 feat(shop): support layer3 B shop product pricing $COMPUTER\EDY$ COMPUTER\EDY 2026-09-29 16:06:14 +08:00
94cc9e2ad1 feat: 每日任务进度添加动画 guanchao 2026-09-29 11:18:17 +08:00
00f7beb374 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-09-28 20:14:05 +08:00
8467cc9324 feat: 体验版改为请求正式服 guanchao 2026-09-28 20:14:00 +08:00
f42371a9e0 feat: 体验版改为请求正式服 guanchao 2026-09-28 20:13:04 +08:00
5237884876 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-09-28 20:08:09 +08:00
3d8a7bbdc4 feat: 百人赛和小程序福利图标移动到首页右侧 guanchao 2026-09-28 20:08:04 +08:00
9f613c20b1 更新复活补丁 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-28 19:55:30 +08:00
79cd1fa36d 更新复活月卡和商城2 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-28 19:44:50 +08:00
b183bf7e08 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-09-28 18:04:19 +08:00
d6d609f955 feat: 新增20关 guanchao 2026-09-28 15:23:30 +08:00
832daee12b 服务器代码从关超服务器代码中拉取过来。 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-28 14:09:06 +08:00
bef5388952 更新了 BC彩虹方案领取提示 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 20:46:42 +08:00
bb87d148dc Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 19:54:05 +08:00
86ccc75bc5 修复64关 $COMPUTER\EDY$ COMPUTER\EDY 2026-09-24 19:51:53 +08:00

1 2 3 4