95 Commits

Author SHA1 Message Date
puxuan
3dc8c37011 fix bug 2025-10-28 15:38:29 +08:00
puxuan
97b91ec0d9 fix bug 2025-10-24 16:37:31 +08:00
puxuan
513ee323df fix bug 2025-10-24 14:37:15 +08:00
puxuan
6f3d42635e 资源整理 2025-10-24 12:02:08 +08:00
puxuan
79d68e8caf 天赋动画 2025-10-21 16:07:49 +08:00
puxuan
44531ae9f9 倍速 2025-10-20 16:40:15 +08:00
puxuan
38345d5909 Merge branch 'dev_hero' into dev_act 2025-09-25 16:41:07 +08:00
puxuan
776b6ae29f 结算界面 2025-09-25 16:40:26 +08:00
puxuan
08d3ed2d7e 商店 2025-09-24 16:23:21 +08:00
puxuan
65e9cee902 卡牌召唤 2025-08-29 16:21:17 +08:00
puxuan
db721dbb53 fix bug 2025-08-28 10:38:47 +08:00
puxuan
db6852ca01 res 2025-08-27 20:30:36 +08:00
puxuan
504e40eb38 res 2025-08-27 19:07:24 +08:00
puxuan
06addac953 fix bug 2025-08-27 14:22:36 +08:00
puxuan
b59fd66886 fix bug 2025-08-22 14:35:07 +08:00
puxuan
f5a3400308 fix bug 2025-08-21 11:35:08 +08:00
puxuan
ecd5958b55 fix bug 2025-08-20 15:57:02 +08:00
puxuan
6794741f34 主界面 2025-08-18 10:42:57 +08:00
puxuan
40ae361190 局内 2025-08-15 17:34:34 +08:00
puxuan
e61171acc8 res 2025-08-14 18:19:14 +08:00
puxuan
1aff7876ec 抽卡 2025-08-12 19:44:10 +08:00
puxuan
54cdfc3e47 抽卡 2025-08-11 20:39:27 +08:00
puxuan
2c8a5f70e5 res 2025-08-08 14:19:46 +08:00
puxuan
313e3f6bdf 局内 2025-08-08 11:41:21 +08:00
puxuan
dd1063d61e task 2025-08-06 20:46:47 +08:00
puxuan
4ce72abeb5 res 2025-08-04 18:49:43 +08:00
puxuan
568915467c 主界面 2025-08-04 17:10:12 +08:00
puxuan
c530cf25b9 fix bug 2025-06-17 20:29:18 +08:00
puxuan
99cccbbb75 res 2025-06-17 19:59:50 +08:00
puxuan
43222b0299 主界面 2025-05-13 00:12:08 +08:00
kai
986b121df4 升级引擎 2025-04-30 23:12:28 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
xiekaidong
b6345dce5a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_lock_1.png
#	Assets/arts/textures/ui/common/common_lock_1.png.meta
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
#	Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
2023-09-18 14:51:32 +08:00
xiekaidong
00c9bd3bfe 还原资源 2023-09-13 10:46:12 +08:00
xiekaidong
bd58628e2d 更新资源 2023-09-12 14:41:23 +08:00
xiekaidong
1d12b1c1e8 符文副本 2023-09-11 20:02:19 +08:00
xiekaidong
4da792de57 更新资源 2023-09-09 16:13:44 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
xiekaidong
4d8561a55f 更新资源 2023-08-08 17:59:29 +08:00
xiekaidong
a199c25d16 木棍边缘障碍物 2023-08-02 18:07:58 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
8bf2ff1968 界面调整 2023-07-21 16:16:46 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
1acaec8748 竞技场波次显示 2023-07-04 20:13:44 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
chenxi
86949e1dc5 ab name 2023-06-20 19:59:48 +08:00
xiekaidong
bb0b9a6673 bug修复,上传资源 2023-06-20 17:51:19 +08:00
chenxi
ea2eb1778f 更新战斗资源 2023-06-19 18:52:28 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
xiekaidong
f81d586bca 上传资源 2023-06-16 16:23:14 +08:00