COMPUTER\EDY
|
bef5388952
|
更新了 BC彩虹方案领取提示
|
2026-09-24 20:46:42 +08:00 |
|
|
COMPUTER\EDY
|
bb87d148dc
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-09-24 19:54:05 +08:00 |
|
|
COMPUTER\EDY
|
86ccc75bc5
|
修复64关
|
2026-09-24 19:51:53 +08:00 |
|
|
guanchao
|
2fe6c9fb62
|
feat: 百人赛
|
2026-09-24 19:33:11 +08:00 |
|
|
guanchao
|
8fb2ef1be8
|
Merge branch 'feat-cloudRise'
# Conflicts:
# assets/Script/Map.ts
# assets/UI/UI/start/startUI2.plist
# assets/UI/UI/start/startUI2.plist.meta
# assets/UI/UI/start/startUI2.png
# assets/UI/UI/start/startUI2.png.meta
# settings/project.json
# tools/test-prop-guide.cjs
|
2026-09-24 17:12:25 +08:00 |
|
|
guanchao
|
5bbf4e94ee
|
feat: 百人赛提交
|
2026-09-24 16:50:43 +08:00 |
|
|
COMPUTER\EDY
|
ad047b618a
|
优化更新弹窗奖励窗口数字
|
2026-09-24 16:26:57 +08:00 |
|
|
COMPUTER\EDY
|
6a4990bb35
|
紧急修复一个 墙壁BUG
|
2026-09-24 11:03:21 +08:00 |
|
|
COMPUTER\EDY
|
8ab910f644
|
更新弹窗背景大小和首页按钮显示问题
|
2026-09-23 17:03:53 +08:00 |
|
|
COMPUTER\EDY
|
564488612d
|
更换各类图片的数字编程棕色
|
2026-09-23 16:06:12 +08:00 |
|
|
COMPUTER\EDY
|
3256667420
|
更新金币和头像框图片，更新一个游戏BUG和失败界面金币还有时钟
|
2026-09-23 12:39:31 +08:00 |
|
|
COMPUTER\EDY
|
300313595d
|
修复首页和商城体力值，歪的情况
|
2026-09-22 19:54:35 +08:00 |
|
|
COMPUTER\EDY
|
a6a73f352c
|
将游戏中所有图片 压缩一遍
|
2026-09-22 18:09:02 +08:00 |
|
|
COMPUTER\EDY
|
2e0d1826f1
|
更新首页homeScene涉及到的按钮，以及涉及到的所有分包或者活动的按钮 增加震动
|
2026-09-22 17:38:43 +08:00 |
|
|
COMPUTER\EDY
|
b028946207
|
战令修复
|
2026-09-22 17:00:52 +08:00 |
|
|
COMPUTER\EDY
|
13ea6d64ab
|
修复战令商城的显示，还有无限体力特效调整
|
2026-09-22 15:32:32 +08:00 |
|
|
COMPUTER\EDY
|
fcb0e7a43d
|
更新图片素材，修复合并BUG
|
2026-09-22 13:41:47 +08:00 |
|
|
COMPUTER\EDY
|
951bf403b5
|
Merge main into rainbow_old and preserve C rainbow integration
|
2026-09-21 20:57:42 +08:00 |
|
|
COMPUTER\EDY
|
1440395025
|
更新图片十连胜遮罩
|
2026-09-21 19:48:14 +08:00 |
|
|
COMPUTER\EDY
|
b6ddb8a613
|
更新最新UI修改，复活礼包修改。
|
2026-09-21 18:05:43 +08:00 |
|
|
WIN-GKKD951VVMJ\Administrator
|
bd4984c909
|
老彩虹最新更新
|
2026-09-21 18:03:23 +08:00 |
|
|
COMPUTER\EDY
|
4018dbfbfc
|
feat: add per-run reborn gift price tiers
|
2026-09-21 17:13:35 +08:00 |
|
|
COMPUTER\EDY
|
736a6bb342
|
更新各类UI
|
2026-09-21 15:30:27 +08:00 |
|
|
guanchao
|
67f2306301
|
feat: 百人赛完成
|
2026-09-21 12:44:48 +08:00 |
|
|
COMPUTER\EDY
|
d9a4ad6f5f
|
Merge branch 'main' into newUI
# Conflicts:
# assets/Scene/HomeScene.fire
# assets/Script/Map.ts
# assets/res/public.meta
# settings/project.json
|
2026-09-20 18:29:55 +08:00 |
|
|
COMPUTER\EDY
|
4a81f2c454
|
更新图片资源
|
2026-09-20 17:51:35 +08:00 |
|
|
COMPUTER\EDY
|
3600a78b6b
|
更新战令UI
|
2026-09-20 17:37:54 +08:00 |
|
|
WIN-GKKD951VVMJ\Administrator
|
74cf4413b5
|
增加一版彩虹机制
|
2026-09-20 17:14:40 +08:00 |
|
|
COMPUTER\EDY
|
c44064852d
|
更新游戏到1980关，新增添加我的小程序和添加到桌面的埋点
|
2026-09-20 16:22:02 +08:00 |
|
|
COMPUTER\EDY
|
480d1af18b
|
增加埋点
|
2026-09-20 15:39:50 +08:00 |
|
|
COMPUTER\EDY
|
85014adc78
|
更新UI
|
2026-09-20 12:14:38 +08:00 |
|
|
guanchao
|
19f86db6df
|
Add maximum single recharge amount to user statistics
|
2026-09-18 19:10:12 +08:00 |
|
|
COMPUTER\EDY
|
ba0bc19949
|
十连胜调整UI
|
2026-09-18 18:32:09 +08:00 |
|
|
COMPUTER\EDY
|
feebcb935e
|
Merge branch 'main' into rainbow
# Conflicts:
# assets/GameplayIntro/script.meta
# assets/Scene/GameScene.fire
# assets/resources/texture.meta
# assets/seven_day_gift/docs.meta
# assets/seven_day_gift/test.meta
# settings/project.json
|
2026-09-18 17:13:36 +08:00 |
|
|
COMPUTER\EDY
|
e2802389a7
|
为十连胜小更新
|
2026-09-18 16:43:22 +08:00 |
|
|
COMPUTER\EDY
|
9fcdc523a5
|
Merge branch 'main' of https://git.sparkus.cn/yangzhao/MatchMaster
|
2026-09-18 16:12:27 +08:00 |
|
|
COMPUTER\EDY
|
c125db45c2
|
十连胜终结提交
|
2026-09-18 15:59:32 +08:00 |
|
|
WIN-GKKD951VVMJ\Administrator
|
7cd1ee331e
|
更新 获胜里面10连胜图片资源
|
2026-09-18 14:02:07 +08:00 |
|
 dongwenke
|
e7a456918a
|
合并 PR #5：优化微信小程序福利功能
Reviewed-on: #5
|
2026-09-18 12:24:16 +08:00 |
|
|
keke
|
a7aa79bd16
|
优化微信小程序福利功能
|
2026-09-18 12:14:57 +08:00 |
|
|
keke
|
f047f63a7b
|
优化微信小程序福利功能
|
2026-09-18 11:49:52 +08:00 |
|
|
COMPUTER\EDY
|
fdd3d748f4
|
更新使用锤子时不 暂停时间
|
2026-09-18 11:06:25 +08:00 |
|
|
WIN-GKKD951VVMJ\Administrator
|
320517f94e
|
最终更新，功能完毕，UI待更新
|
2026-09-18 10:56:57 +08:00 |
|
|
COMPUTER\EDY
|
b1eb031eaa
|
继续更新UI
|
2026-09-18 09:15:55 +08:00 |
|
|
COMPUTER\EDY
|
f69fd8daf7
|
Merge branch 'main' into newUI
# Conflicts:
# assets/gacha_bundle/img/cat.meta
# assets/libs/dn-sdk-minigame.meta
# assets/passCheck/script.meta
# assets/pause/texture.meta
|
2026-09-17 17:01:42 +08:00 |
|
|
COMPUTER\EDY
|
9ae6b0e6af
|
将游戏内 玩法介绍弹窗的释放做了优化，并且下载做了提前下载bundle,优先级放在了 GameScene 最低优先级。
|
2026-09-17 16:37:30 +08:00 |
|
|
dongwenke
|
ebe5a4ec35
|
合并 PR #4：修复玩法介绍道具图尺寸被代码覆盖
Reviewed-on: #4
|
2026-09-17 16:33:30 +08:00 |
|
|
keke
|
d8e249bcb2
|
修复玩法介绍道具图尺寸被代码覆盖
|
2026-09-17 16:30:18 +08:00 |
|
|
guanchao
|
2643dd398e
|
feat: 百人赛提交，准备提取公共资源
|
2026-09-17 16:15:06 +08:00 |
|
|
COMPUTER\EDY
|
d9a67264b2
|
更新UI
|
2026-09-17 14:54:17 +08:00 |
|