Commit Graph

Select branches

Hide Pull Requests

Memory

abTest_50Level

codex/coin-madness

feat-newShop

feat-newbieGift

feature/mini_program_benefits

feature/seven_day_gift

layout-optimization

main

newUI

new_shop

rainbow

rainbow_old

#1

#2

#3

#4

#5

#6

Mono Color

• c36447a646 feat: 新版商城scrollview y值调整 main guanchao 2026-10-08 11:32:50 +0800
• 129074123c Merge branch 'main' into newbieGift COMPUTER\EDY 2026-09-30 22:35:04 +0800
• 18146a65d4 更新新手礼包 COMPUTER\EDY 2026-09-30 22:30:22 +0800
• 7fb430e512 fix: fit activity amounts and show unpaid completion badge keke 2026-09-30 22:05:58 +0800
• 038743f3f2 fix: disable starter pack server purchase guard COMPUTER\EDY 2026-09-30 22:01:37 +0800
• b8e02e08d0 fix: keep starter pack rewards client-side COMPUTER\EDY 2026-09-30 21:49:05 +0800
• 96a5e1acf9 Merge pull request 'codex/coin-madness' (#6) from codex/coin-madness into main dongwenke 2026-09-30 20:08:24 +0800
• 490cc0b1da docs: align Gold Miner documentation with current client and V1.7 gaps codex/coin-madness keke 2026-09-30 20:05:20 +0800
• 7e14f66170 feat: integrate Gold Miner activity and remove development test panels keke 2026-09-30 19:43:47 +0800
• e4973ae845 Merge remote-tracking branch 'origin/main' into codex/coin-madness keke 2026-09-30 19:37:24 +0800
• 60f8fc4047 feat: tier starter packs using daily payment factors COMPUTER\EDY 2026-09-30 18:45:13 +0800
• 44901f1e50 更新 1957关BUG COMPUTER\EDY 2026-09-30 17:59:19 +0800
• 0d12143572 更新修复一个显示异常 COMPUTER\EDY 2026-09-30 17:15:21 +0800
• 36e6adb803 关卡上限调整为2000 COMPUTER\EDY 2026-09-30 11:21:23 +0800
• 4fc9298686 更新商城最新版本支付，并且优化弹窗奖励和部分UI COMPUTER\EDY 2026-09-30 10:10:34 +0800
• 483f73c7a1 Merge remote-tracking branch 'origin/main' into codex/coin-madness keke 2026-09-29 20:46:59 +0800
• 50f024c969 Merge branch 'main' into new_shop new_shop COMPUTER\EDY 2026-09-29 19:00:23 +0800
• 271cdb53d2 更新AB商城最终版 COMPUTER\EDY 2026-09-29 18:57:56 +0800
• 7886bbfef5 refactor(shop): inline B product config in existing payment functions COMPUTER\EDY 2026-09-29 16:29:17 +0800
• 81dac3b154 feat(shop): support layer3 B shop product pricing COMPUTER\EDY 2026-09-29 16:06:14 +0800
• 00f7beb374 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-09-28 20:14:05 +0800
• 8467cc9324 feat: 体验版改为请求正式服 guanchao 2026-09-28 20:14:00 +0800
• f42371a9e0 feat: 体验版改为请求正式服 guanchao 2026-09-28 20:13:04 +0800
• 5237884876 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-09-28 20:08:09 +0800
• 3d8a7bbdc4 feat: 百人赛和小程序福利图标移动到首页右侧 guanchao 2026-09-28 20:08:04 +0800
• 9f613c20b1 更新复活补丁 COMPUTER\EDY 2026-09-28 19:55:30 +0800
• 79cd1fa36d 更新复活月卡和商城2 COMPUTER\EDY 2026-09-28 19:44:50 +0800
• b183bf7e08 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster guanchao 2026-09-28 18:04:19 +0800
• d6d609f955 feat: 新增20关 guanchao 2026-09-28 15:23:30 +0800
• 832daee12b 服务器代码从关超 服务器代码中拉取过来。 COMPUTER\EDY 2026-09-28 14:09:06 +0800
• bef5388952 更新了 BC彩虹方案领取提示 COMPUTER\EDY 2026-09-24 20:46:42 +0800
• bb87d148dc Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster COMPUTER\EDY 2026-09-24 19:54:05 +0800
• 86ccc75bc5 修复64关 COMPUTER\EDY 2026-09-24 19:51:53 +0800
• 2fe6c9fb62 feat: 百人赛 guanchao 2026-09-24 19:33:11 +0800
• 8fb2ef1be8 Merge branch 'feat-cloudRise' guanchao 2026-09-24 17:12:25 +0800
• 5bbf4e94ee feat: 百人赛提交 guanchao 2026-09-24 16:50:43 +0800
• 8b0510e7ef Merge branch 'main' into new_shop COMPUTER\EDY 2026-09-24 16:27:50 +0800
• ad047b618a 优化更新弹窗奖励窗口数字 COMPUTER\EDY 2026-09-24 16:26:57 +0800
• 7fd60ef294 shop 从首场景拆分完毕 COMPUTER\EDY 2026-09-24 15:00:09 +0800
• 6a4990bb35 紧急修复一个 墙壁BUG COMPUTER\EDY 2026-09-24 11:03:21 +0800
• 07169e59f4 更新 COMPUTER\EDY 2026-09-23 19:55:20 +0800
• 8ab910f644 更新弹窗背景大小和首页按钮显示问题 COMPUTER\EDY 2026-09-23 17:03:53 +0800
• 564488612d 更换各类图片的数字编程棕色 COMPUTER\EDY 2026-09-23 16:06:12 +0800
• 3256667420 更新金币和头像框图片，更新一个游戏BUG和失败界面金币还有时钟 COMPUTER\EDY 2026-09-23 12:39:31 +0800
• 300313595d 修复首页和商城体力值，歪的情况 COMPUTER\EDY 2026-09-22 19:54:35 +0800
• a6a73f352c 将游戏中所有图片 压缩一遍 COMPUTER\EDY 2026-09-22 18:09:02 +0800
• 2e0d1826f1 更新首页homeScene涉及到的按钮，以及涉及到的所有分包或者活动的按钮 增加震动 COMPUTER\EDY 2026-09-22 17:38:43 +0800
• b028946207 战令修复 COMPUTER\EDY 2026-09-22 17:00:52 +0800
• 13ea6d64ab 修复战令商城的显示，还有无限体力特效调整 COMPUTER\EDY 2026-09-22 15:32:32 +0800
• fcb0e7a43d 更新图片素材，修复合并BUG COMPUTER\EDY 2026-09-22 13:41:47 +0800
• d9393c362d feat: 商城UI改版 feat-newShop guanchao 2026-09-22 10:17:58 +0800
• 951bf403b5 Merge main into rainbow_old and preserve C rainbow integration rainbow_old COMPUTER\EDY 2026-09-21 20:57:42 +0800
• 1440395025 更新图片十连胜遮罩 COMPUTER\EDY 2026-09-21 19:48:14 +0800
• b6ddb8a613 更新最新UI修改，复活礼包修改。 COMPUTER\EDY 2026-09-21 18:05:43 +0800
• bd4984c909 老彩虹最新更新 WIN-GKKD951VVMJ\Administrator 2026-09-21 18:03:23 +0800
• 4018dbfbfc feat: add per-run reborn gift price tiers COMPUTER\EDY 2026-09-21 17:13:35 +0800
• 736a6bb342 更新各类UI newUI COMPUTER\EDY 2026-09-21 15:30:27 +0800
• 67f2306301 feat: 百人赛完成 guanchao 2026-09-21 12:44:48 +0800
• d9a4ad6f5f Merge branch 'main' into newUI COMPUTER\EDY 2026-09-20 18:29:55 +0800
• 4a81f2c454 更新图片资源 COMPUTER\EDY 2026-09-20 17:51:35 +0800
• 3600a78b6b 更新战令UI COMPUTER\EDY 2026-09-20 17:37:54 +0800
• 74cf4413b5 增加一版彩虹机制 WIN-GKKD951VVMJ\Administrator 2026-09-20 17:14:40 +0800
• c44064852d 更新游戏到1980关，新增添加我的小程序和添加到桌面的埋点 COMPUTER\EDY 2026-09-20 16:22:02 +0800
• 480d1af18b 增加埋点 COMPUTER\EDY 2026-09-20 15:39:50 +0800
• 85014adc78 更新UI COMPUTER\EDY 2026-09-20 12:14:38 +0800
• 19f86db6df Add maximum single recharge amount to user statistics guanchao 2026-09-18 19:10:12 +0800
• ba0bc19949 十连胜调整UI rainbow COMPUTER\EDY 2026-09-18 18:32:09 +0800
• feebcb935e Merge branch 'main' into rainbow COMPUTER\EDY 2026-09-18 17:13:36 +0800
• e2802389a7 为十连胜小更新 COMPUTER\EDY 2026-09-18 16:43:22 +0800
• 9fcdc523a5 Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster COMPUTER\EDY 2026-09-18 16:12:27 +0800
• c125db45c2 十连胜终结提交 COMPUTER\EDY 2026-09-18 15:59:32 +0800
• bf94bf33e0 Merge remote-tracking branch 'origin/main' into codex/coin-madness keke 2026-09-18 15:46:55 +0800
• 7cd1ee331e 更新 获胜里面10连胜图片资源 WIN-GKKD951VVMJ\Administrator 2026-09-18 14:02:07 +0800
• e7a456918a 合并 PR #5：优化微信小程序福利功能 dongwenke 2026-09-18 12:24:16 +0800
• a7aa79bd16 优化微信小程序福利功能 feature/mini_program_benefits keke 2026-09-18 12:14:57 +0800
• f047f63a7b 优化微信小程序福利功能 keke 2026-09-18 11:49:52 +0800
• fdd3d748f4 更新使用锤子时不 暂停时间 COMPUTER\EDY 2026-09-18 11:06:25 +0800
• 320517f94e 最终更新，功能完毕，UI待更新 WIN-GKKD951VVMJ\Administrator 2026-09-18 10:56:57 +0800
• b1eb031eaa 继续更新UI COMPUTER\EDY 2026-09-18 09:15:55 +0800
• f69fd8daf7 Merge branch 'main' into newUI COMPUTER\EDY 2026-09-17 17:01:42 +0800
• 9ae6b0e6af 将游戏内 玩法介绍弹窗的释放做了优化，并且下载做了提前下载bundle,优先级放在了 GameScene 最低优先级。 COMPUTER\EDY 2026-09-17 16:37:30 +0800
• ebe5a4ec35 合并 PR #4：修复玩法介绍道具图尺寸被代码覆盖 dongwenke 2026-09-17 16:33:30 +0800
• d8e249bcb2 修复玩法介绍道具图尺寸被代码覆盖 layout-optimization keke 2026-09-17 16:30:18 +0800
• 2643dd398e feat: 百人赛提交，准备提取公共资源 guanchao 2026-09-17 16:15:06 +0800
• d9a67264b2 更新UI COMPUTER\EDY 2026-09-17 14:54:17 +0800
• 35d8b8a611 合并 PR #3：优化七日显示与动画，优化新玩法提示分页器与图片显示 dongwenke 2026-09-17 11:19:39 +0800
• 5fe9f72c17 优化七日显示与动画，优化新玩法提示分页器与图片显示 keke 2026-09-17 10:43:21 +0800
• f14efa81b5 更新打包配置 COMPUTER\EDY 2026-09-16 19:16:34 +0800
• 09b8a24da1 feat: 暂存百人赛 guanchao 2026-09-16 18:19:34 +0800
• 606abfbe9b 更新配置 COMPUTER\EDY 2026-09-16 18:14:25 +0800
• 60e58dfc46 更新小手，更新难度出现机制 COMPUTER\EDY 2026-09-16 18:13:28 +0800
• 1f25d9725b 修正玩法介绍图片英文命名并更新微信引擎插件至2.4.15 keke 2026-09-16 16:17:12 +0800
• c18d47f4b0 更新配置 WIN-GKKD951VVMJ\Administrator 2026-09-16 14:55:47 +0800
• c2f51a01ee Merge pull request 'layout-optimization' (#2) from layout-optimization into main dongwenke 2026-09-16 14:19:36 +0800
• 6a3ffd09f5 Move recharge statistics to dedicated collection guanchao 2026-09-16 13:11:27 +0800
• 8cb1ab2ec8 feat: 百人赛暂存 guanchao 2026-09-16 12:44:01 +0800
• 194323ff2c chore: remove gameplay preview tools and restore production start scene keke 2026-09-16 12:00:42 +0800
• d916c5528a Merge remote-tracking branch 'origin/main' into layout-optimization keke 2026-09-16 11:55:49 +0800
• 5e71692956 fix: 修复七日礼包已领取遮罩层级及第七天显示 feature/seven_day_gift keke 2026-09-16 11:48:42 +0800
• e1fb37816f fix: correct seven-day gift claimed overlay keke 2026-09-16 11:47:17 +0800