985 Commits

Author SHA1 Message Date
puxuan
18296991a2 商业化 2025-09-25 11:41:03 +08:00
puxuan
08d3ed2d7e 商店 2025-09-24 16:23:21 +08:00
puxuan
aa3cd49667 Merge branch 'dev_hero' into dev_equip
# Conflicts:
#	Assets/lua/app/ui/hero/hero_comp.lua.bytes
2025-09-24 11:06:41 +08:00
puxuan
689e1a7ef3 fix bug 2025-09-23 20:48:50 +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
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
83f941496d 装备 2025-09-17 17:24:03 +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
puxuan
447a5364dc 抽卡 2025-09-15 20:32:12 +08:00
puxuan
63ad8832a9 每日挑战 2025-09-15 17:20:59 +08:00
puxuan
f981f0b664 fix bug 2025-09-15 10:54:29 +08:00
puxuan
44326ddfa0 动画 2025-09-15 10:10:03 +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
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
puxuan
5ab0b5f1ab 公司 2025-09-05 16:42:05 +08:00
puxuan
defa53883f boss技能 2025-09-05 15:04:36 +08:00
puxuan
ee14aded6a fix bug 2025-09-05 14:28:41 +08:00
puxuan
558cfdf2d8 功能开启 2025-09-05 10:50:01 +08:00
puxuan
986d295fbe fix bug 2025-09-04 20:08:09 +08:00
puxuan
64351e1f6b fix bug 2025-09-04 18:33:13 +08:00
puxuan
9ebcf06b5a boss技能弹窗 2025-09-04 18:20:30 +08:00
puxuan
6262219db6 震动 2025-09-04 17:35:45 +08:00
puxuan
a6dbfc3fa9 fix bug 2025-09-04 16:22:50 +08:00
puxuan
f2717b72e9 fix bug 2025-09-03 20:43:22 +08:00
puxuan
6b828c55c0 fix bug 2025-09-03 19:58:45 +08:00
puxuan
ca872ddab7 fix bug 2025-09-03 18:36:02 +08:00
puxuan
b146f13e91 fix bug 2025-09-03 16:43:45 +08:00
puxuan
fcb5091001 特效 2025-09-02 20:45:18 +08:00
puxuan
104a6d1bf5 场景 2025-09-02 17:30:35 +08:00
puxuan
a525866905 建筑 2025-09-01 19:34:53 +08:00
puxuan
418d5780bf 场景5 2025-09-01 10:30:25 +08:00
puxuan
65e9cee902 卡牌召唤 2025-08-29 16:21:17 +08:00