puxuan
|
c4b592025d
|
fix bug
|
2025-09-22 16:09:04 +08:00 |
|
puxuan
|
2278d90172
|
.
|
2025-09-22 15:21:55 +08:00 |
|
puxuan
|
5ef5298243
|
主界面英雄
|
2025-09-22 14:57:14 +08:00 |
|
puxuan
|
0c1b99ad82
|
fix bug
|
2025-09-22 11:33:05 +08:00 |
|
puxuan
|
026fbcc5c4
|
fix bug
|
2025-09-22 10:19:13 +08:00 |
|
puxuan
|
ac5b0c44fa
|
Merge branch 'dev_hero' into dev_equip
|
2025-09-19 15:02:35 +08:00 |
|
puxuan
|
5f1b5b34bd
|
fix bug
|
2025-09-19 14:56:10 +08:00 |
|
puxuan
|
e7e0bde881
|
Merge branch 'dev_hero' into dev_equip
# Conflicts:
# Assets/lua/app/common/data_manager.lua.bytes
# Assets/lua/app/global/global_const.lua.bytes
|
2025-09-19 14:52:24 +08:00 |
|
tuxinyu
|
aa340aae4f
|
1111111111
|
2025-09-17 19:35:38 +08:00 |
|
puxuan
|
83f941496d
|
装备
|
2025-09-17 17:24:03 +08:00 |
|
tuxinyu
|
3598a27b56
|
111111111111
|
2025-09-16 21:10:43 +08:00 |
|
tuxinyu
|
691bd7cccb
|
11111111
|
2025-09-16 21:06:32 +08:00 |
|
tuxinyu
|
0301b00a7d
|
1111111111
|
2025-09-16 20:43:24 +08:00 |
|
tuxinyu
|
08cc62b173
|
111111
|
2025-09-16 20:09:56 +08:00 |
|
tuxinyu
|
73230eef02
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-16 19:53:17 +08:00 |
|
tuxinyu
|
00845e9738
|
111111
|
2025-09-16 19:53:10 +08:00 |
|
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 |
|
tuxinyu
|
603f289cb9
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-15 20:33:35 +08:00 |
|
tuxinyu
|
85906420c5
|
111111
|
2025-09-15 20:33:25 +08:00 |
|
puxuan
|
447a5364dc
|
抽卡
|
2025-09-15 20:32:12 +08:00 |
|
tuxinyu
|
5f9e2bf603
|
111111111
|
2025-09-15 20:21:53 +08:00 |
|
tuxinyu
|
3d26181207
|
1111111111
|
2025-09-15 20:03:53 +08:00 |
|
tuxinyu
|
5873842dae
|
11111111
|
2025-09-15 19:48:06 +08:00 |
|
tuxinyu
|
7a4cbe79d8
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-15 19:38:09 +08:00 |
|
tuxinyu
|
31ae34260e
|
11111111111
|
2025-09-15 19:38:01 +08:00 |
|
puxuan
|
63ad8832a9
|
每日挑战
|
2025-09-15 17:20:59 +08:00 |
|
tuxinyu
|
18096ad14d
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-15 12:39:56 +08:00 |
|
tuxinyu
|
88cee05344
|
1111111
|
2025-09-15 12:39:48 +08:00 |
|
puxuan
|
f981f0b664
|
fix bug
|
2025-09-15 10:54:29 +08:00 |
|
puxuan
|
44326ddfa0
|
动画
|
2025-09-15 10:10:03 +08:00 |
|
tuxinyu
|
5f766555a7
|
1111111
|
2025-09-12 17:31:24 +08:00 |
|
tuxinyu
|
303fb3fef2
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-12 17:19:32 +08:00 |
|
tuxinyu
|
f250b2c03f
|
111111111
|
2025-09-12 17:19:25 +08:00 |
|
puxuan
|
1fc0cbe7b1
|
抽卡
|
2025-09-12 15:12:39 +08:00 |
|
puxuan
|
974e8d2337
|
fix bug
|
2025-09-12 10:25:24 +08:00 |
|
puxuan
|
03cf4e1843
|
装备
|
2025-09-12 09:50:57 +08:00 |
|
changyuxiang
|
d65af7f268
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-11 21:33:56 +08:00 |
|
changyuxiang
|
dbdaff5f3c
|
25001
|
2025-09-11 21:33:31 +08:00 |
|
tuxinyu
|
2483e8bdd4
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-11 20:35:42 +08:00 |
|
tuxinyu
|
049d79f8dc
|
111111111
|
2025-09-11 20:35:31 +08:00 |
|
puxuan
|
b9b7cc1c74
|
Merge branch 'dev_hero' into dev_equip
|
2025-09-09 20:15:01 +08:00 |
|
puxuan
|
ceb9317d64
|
box
|
2025-09-09 20:13:47 +08:00 |
|
puxuan
|
f4f0111fa9
|
装备
|
2025-09-09 19:40:07 +08:00 |
|
puxuan
|
72ba48e7d1
|
战斗力
|
2025-09-09 19:25:18 +08:00 |
|
puxuan
|
15f7e7eaf0
|
背包
|
2025-09-08 20:02:09 +08:00 |
|
puxuan
|
f11022dc96
|
背包
|
2025-09-08 17:36:27 +08:00 |
|
puxuan
|
9627e10463
|
skill
|
2025-09-08 15:49:20 +08:00 |
|
puxuan
|
13e846a688
|
fix bug
|
2025-09-08 14:31:58 +08:00 |
|
puxuan
|
eaee735bff
|
。
|
2025-09-05 16:43:04 +08:00 |
|