3904 Commits

Author SHA1 Message Date
tuxinyu
25d14cf9c2 1111111111 2025-09-23 20:51:42 +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
fb6c741cc1 fix bug 2025-09-23 20:17:07 +08:00
puxuan
a831629459 敌方属性计算 2025-09-23 20:00:40 +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
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
989d1601eb 引导坐标 2025-09-22 12:00:41 +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
545a879fa3 config 2025-09-19 15:02:17 +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
puxuan
e36dd5e583 新增肉鸽类型 2025-09-19 14:50:04 +08:00
puxuan
21b5b2b20a 属性 2025-09-18 17:52:48 +08:00
tuxinyu
2647f6925d 11111111 2025-09-17 19:52:54 +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
e0e35ed993 11111111 2025-09-16 21:01:27 +08:00
tuxinyu
0301b00a7d 1111111111 2025-09-16 20:43:24 +08:00
tuxinyu
a8fc5ea363 Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-09-16 20:10:03 +08:00
tuxinyu
08cc62b173 111111 2025-09-16 20:09:56 +08:00
puxuan
1c080a08b2 config 2025-09-16 20:08:47 +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
50a42a6219 config 2025-09-16 16:08:15 +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
35e73dfc1a Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero 2025-09-15 20:03:59 +08:00
tuxinyu
3d26181207 1111111111 2025-09-15 20:03:53 +08:00
puxuan
c8d0e2b3c5 fix bug 2025-09-15 20:01:46 +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
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