puxuan
|
c06f88f8dc
|
Merge branch 'dev_hero' into dev_equip
# Conflicts:
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/global/global_const.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes
# Assets/prefabs/ui/hero/hero_detail_ui.prefab
# Assets/proto/protocol.bytes
|
2025-09-16 16:12:56 +08:00 |
|
puxuan
|
4af4b48bca
|
fix bug
|
2025-09-16 15:28:04 +08:00 |
|
puxuan
|
974e8d2337
|
fix bug
|
2025-09-12 10:25:24 +08:00 |
|
puxuan
|
03cf4e1843
|
装备
|
2025-09-12 09:50:57 +08:00 |
|
puxuan
|
a6dbfc3fa9
|
fix bug
|
2025-09-04 16:22:50 +08:00 |
|
puxuan
|
104a6d1bf5
|
场景
|
2025-09-02 17:30:35 +08:00 |
|
puxuan
|
65e9cee902
|
卡牌召唤
|
2025-08-29 16:21:17 +08:00 |
|
puxuan
|
ef470b60db
|
场景3 4
|
2025-08-29 11:58:09 +08:00 |
|
puxuan
|
079c1b21f6
|
挂机
|
2025-08-28 20:57:42 +08:00 |
|
puxuan
|
8cb98ac1c9
|
fix bug
|
2025-08-28 19:52:35 +08:00 |
|
puxuan
|
db721dbb53
|
fix bug
|
2025-08-28 10:38:47 +08:00 |
|
puxuan
|
5087a05afa
|
天赋信息界面
|
2025-08-27 21:29:19 +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
|
a9c7c04316
|
fix bug
|
2025-08-27 16:24:09 +08:00 |
|
puxuan
|
29317b4ea4
|
fix bug
|
2025-08-27 16:09:59 +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
|
6ad37f7cc0
|
fix bug
|
2025-08-22 10:56:15 +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
|
5fbf156762
|
英雄
|
2025-08-20 11:43:19 +08:00 |
|
puxuan
|
8c228bfc90
|
英雄
|
2025-08-19 21:14:17 +08:00 |
|
puxuan
|
9bfbada234
|
fix bug
|
2025-08-19 20:33:25 +08:00 |
|
puxuan
|
457b3b23a8
|
fix bug
|
2025-08-19 17:32:44 +08:00 |
|
puxuan
|
679ae0de42
|
任务跳转
|
2025-08-19 14:31:44 +08:00 |
|
puxuan
|
1f414ccc84
|
fix bug
|
2025-08-19 10:38:58 +08:00 |
|
puxuan
|
9dd813c593
|
fix bug
|
2025-08-18 20:50:24 +08:00 |
|
puxuan
|
c79625c019
|
英雄技能
|
2025-08-18 18:13:35 +08:00 |
|
puxuan
|
6794741f34
|
主界面
|
2025-08-18 10:42:57 +08:00 |
|
puxuan
|
40ae361190
|
局内
|
2025-08-15 17:34:34 +08:00 |
|
puxuan
|
cb9acdb86b
|
res
|
2025-08-15 14:28:17 +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
|
a0cf7ed49d
|
设置
|
2025-08-08 17:37:48 +08:00 |
|
puxuan
|
8913c7fc88
|
设置
|
2025-08-08 17:14:39 +08:00 |
|
puxuan
|
13126cb4b2
|
res
|
2025-08-08 15:27:17 +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
|
d398da007f
|
talent
|
2025-08-04 09:41:32 +08:00 |
|
puxuan
|
2080d5d643
|
挂机
|
2025-07-28 20:37:09 +08:00 |
|
puxuan
|
7db28b8e49
|
arena
|
2025-07-21 21:05:32 +08:00 |
|
kai
|
4fb30c128d
|
每日挑战
|
2025-07-16 21:56:44 +08:00 |
|
kai
|
4429fb0e24
|
竞技场
|
2025-07-13 23:09:23 +08:00 |
|
kai
|
e1abcbf979
|
主界面
|
2025-07-07 23:37:57 +08:00 |
|
puxuan
|
b4c27e47f0
|
Merge branch 'dev_hero' into dev_chapter
# Conflicts:
# Assets/arts/atlas/ui/main.spriteatlas
# Assets/arts/textures/ui/main/main_bar_2_bg.png.meta
# Assets/arts/textures/ui/main/main_bg_4.png.meta
|
2025-07-04 12:56:52 +08:00 |
|