Commit Graph

181 Commits

Author SHA1 Message Date
YZ\249929363 57bb8f0e21 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb
# Conflicts:
#	assets/Script/JiaZai.ts
2025-08-08 16:20:01 +08:00
YZ\249929363 c336935589 暂存 2025-08-08 16:19:10 +08:00
computer\尼卡 1a6096406e 11 2025-08-08 16:04:29 +08:00
YZ\249929363 753d4c6a9a Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-08 15:31:41 +08:00
YZ\249929363 bfc3bc3100 暂存 2025-08-08 15:31:24 +08:00
computer\尼卡 d8b9129410 月卡 2025-08-08 15:29:50 +08:00
computer\尼卡 2cc681c468 修复 2025-08-08 11:51:56 +08:00
computer\尼卡 942b2c9dc6 冰冻使用道具修改 魔棒bug 2025-08-08 11:04:52 +08:00
YZ\249929363 d5ab6e2611 更新BUG 2025-08-07 20:18:24 +08:00
YZ\249929363 7fa2297b81 修复BUG 2025-08-07 17:53:25 +08:00
YZ\249929363 9d8ad6307c 暂存 2025-08-07 16:59:47 +08:00
YZ\249929363 06e41bf83a 暂存 2025-08-07 16:55:07 +08:00
computer\尼卡 5cc6ea78a7 添加 2025-08-07 16:53:11 +08:00
computer\尼卡 1b267ebc8e 迭代 2025-08-06 19:29:20 +08:00
YZ\249929363 b52fdb1385 更新分享图片 2025-08-06 14:33:47 +08:00
YZ\249929363 c15ea4d981 修复充值BUG等异常。 2025-08-05 17:59:54 +08:00
YZ\249929363 5393ceeeb1 8月4日最后更新 2025-08-04 19:35:56 +08:00
YZ\249929363 d161e193e4 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-04 19:00:18 +08:00
YZ\249929363 185708c192 暂存 2025-08-04 19:00:11 +08:00
computer\尼卡 c566f28150 补充弹窗,修改冰冻 2025-08-04 18:58:17 +08:00
computer\尼卡 ea41dd4b02 添加弹窗 2025-08-04 18:05:47 +08:00
YZ\249929363 ba410a03fa 修正充值错误 2025-08-04 18:02:35 +08:00
YZ\249929363 499f1bdb19 更新 2025-08-04 17:47:07 +08:00
YZ\249929363 5e2f85d646 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-04 16:54:37 +08:00
YZ\249929363 963403919f 修复ios充值暂存 2025-08-04 16:54:33 +08:00
computer\尼卡 1d409fcae0 结算音效和暂停弹窗 2025-08-04 16:49:18 +08:00
computer\尼卡 b1168aefcd 结算,道具特效优化 2025-08-04 15:42:54 +08:00
YZ\249929363 7d17b6559d 更新 2025-08-04 10:41:10 +08:00
YZ\249929363 101417464b Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-01 16:35:43 +08:00
computer\尼卡 9df7640fae 修改月卡时间领取 2025-08-01 16:33:23 +08:00
YZ\249929363 461612e00b 暂存 2025-08-01 16:33:13 +08:00
YZ\249929363 a7cc1e5475 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-01 15:43:48 +08:00
YZ\249929363 6f2571068d 暂存 2025-08-01 15:43:41 +08:00
computer\尼卡 563e50b909 领取界面丢失 2025-08-01 15:41:28 +08:00
YZ\249929363 0222378540 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-01 15:21:53 +08:00
YZ\249929363 6f1368f836 暂存 2025-08-01 15:21:41 +08:00
computer\尼卡 83d32aa5dd 月卡时间 2025-08-01 15:20:21 +08:00
YZ\249929363 2de1357398 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-08-01 10:46:36 +08:00
YZ\249929363 21cf30a5ce 暂存 2025-08-01 10:46:32 +08:00
computer\尼卡 8d2d21e19c 月卡时间显示 2025-08-01 10:45:57 +08:00
YZ\249929363 6874b42304 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-07-31 18:42:50 +08:00
YZ\249929363 e919a575d4 no message 2025-07-31 18:42:45 +08:00
computer\尼卡 66421e4523 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-07-31 18:40:52 +08:00
computer\尼卡 b60eece611 11 2025-07-31 18:39:35 +08:00
YZ\249929363 634de5cc35 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-07-31 18:26:49 +08:00
computer\尼卡 fe660408e2 时间 黑影 2025-07-31 18:25:36 +08:00
YZ\249929363 9b4aed918d Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-07-31 18:05:02 +08:00
YZ\249929363 ab279abf5c 暂存 2025-07-31 18:04:57 +08:00
computer\尼卡 66270dd7ed 领取时间修复 2025-07-31 18:04:23 +08:00
YZ\249929363 e274e42ab1 Merge branch 'main' of https://git.sparkus.cn/yangzhao/cb 2025-07-31 17:13:44 +08:00