changyuxiang
|
ad6cc54cfa
|
1
|
2025-09-23 21:23:24 +08:00 |
|
changyuxiang
|
6d5086d5e6
|
1
|
2025-09-23 21:11:22 +08:00 |
|
changyuxiang
|
65574eecaa
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 20:57:20 +08:00 |
|
changyuxiang
|
db1f0229db
|
改点东西
|
2025-09-23 20:57:17 +08:00 |
|
puxuan
|
689e1a7ef3
|
fix bug
|
2025-09-23 20:48:50 +08:00 |
|
tuxinyu
|
7edaf6ccc0
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-23 20:35:52 +08:00 |
|
tuxinyu
|
9cef0fd55f
|
111111111
|
2025-09-23 20:35:42 +08:00 |
|
puxuan
|
5200466331
|
Merge branch 'dev_hero' into dev_equip
|
2025-09-23 16:22:02 +08:00 |
|
puxuan
|
34518800c4
|
fix bug
|
2025-09-22 17:38:01 +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
|
2647f6925d
|
11111111
|
2025-09-17 19:52:54 +08:00 |
|
tuxinyu
|
aa340aae4f
|
1111111111
|
2025-09-17 19:35:38 +08:00 |
|
tuxinyu
|
e0e35ed993
|
11111111
|
2025-09-16 21:01:27 +08:00 |
|
tuxinyu
|
0301b00a7d
|
1111111111
|
2025-09-16 20:43:24 +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
|
fb20918bc6
|
.
|
2025-09-16 16:11:51 +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
|
b65a6adc2d
|
111111111
|
2025-09-15 20:22:54 +08:00 |
|
tuxinyu
|
5f9e2bf603
|
111111111
|
2025-09-15 20:21:53 +08:00 |
|
tuxinyu
|
4a8cd3fb1c
|
11111111111
|
2025-09-15 20:09:50 +08:00 |
|
tuxinyu
|
3d26181207
|
1111111111
|
2025-09-15 20:03:53 +08:00 |
|
tuxinyu
|
5873842dae
|
11111111
|
2025-09-15 19:48:06 +08:00 |
|
changyuxiang
|
2751a48575
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-15 12:46:42 +08:00 |
|
changyuxiang
|
f03d3de706
|
1
|
2025-09-15 12:46:33 +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 |
|
changyuxiang
|
6d52fa22c1
|
1
|
2025-09-15 12:37:31 +08:00 |
|
changyuxiang
|
6f0d6c4eba
|
1
|
2025-09-15 12:36:45 +08:00 |
|
changyuxiang
|
8d621fabe4
|
新英雄获得
|
2025-09-12 21:05:38 +08:00 |
|
changyuxiang
|
ec09ae2a0f
|
战力提升
|
2025-09-12 20:16:07 +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
|
ceb9317d64
|
box
|
2025-09-09 20:13:47 +08:00 |
|
puxuan
|
7adbf9e3c4
|
res
|
2025-09-09 19:42:49 +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 |
|
changyuxiang
|
af88eb3db9
|
1
|
2025-09-05 22:38:23 +08:00 |
|
changyuxiang
|
8fb94acaa6
|
Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero
|
2025-09-05 20:48:02 +08:00 |
|