658 Commits

Author SHA1 Message Date
puxuan
4369ed4075 config 2025-09-26 15:42:14 +08:00
puxuan
0ac2b10096 活动 2025-09-26 09:44:45 +08:00
puxuan
e91c3d797d 冲刺活动 2025-09-25 20:13:36 +08:00
puxuan
1c5b577038 活动 2025-09-25 16:05:10 +08:00
puxuan
18296991a2 商业化 2025-09-25 11:41:03 +08:00
puxuan
08d3ed2d7e 商店 2025-09-24 16:23:21 +08:00
puxuan
87b4c11a9c 阵容 2025-09-24 12:03:05 +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
dee92b0594 fix bug 2025-09-23 20:58:26 +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
0c1b99ad82 fix bug 2025-09-22 11:33:05 +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
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
c8d0e2b3c5 fix bug 2025-09-15 20:01:46 +08:00
puxuan
63ad8832a9 每日挑战 2025-09-15 17:20:59 +08:00
puxuan
4de0784535 fix bug 2025-09-15 11:41:49 +08:00
puxuan
f981f0b664 fix bug 2025-09-15 10:54:29 +08:00
puxuan
1fc0cbe7b1 抽卡 2025-09-12 15:12:39 +08:00
puxuan
03cf4e1843 装备 2025-09-12 09:50:57 +08:00
puxuan
dcc9d416c5 装备 2025-09-09 21:11:16 +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
5ab0b5f1ab 公司 2025-09-05 16:42:05 +08:00
puxuan
991d7f52bb fix bug 2025-09-05 15:40:40 +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
a6dbfc3fa9 fix bug 2025-09-04 16:22:50 +08:00
puxuan
ca872ddab7 fix bug 2025-09-03 18:36:02 +08:00
puxuan
80edb5a22f fix bug 2025-09-03 16:51:55 +08:00
puxuan
fcb5091001 特效 2025-09-02 20:45:18 +08:00
puxuan
008fc9eddf 技能弹窗 2025-08-29 14:40:01 +08:00
puxuan
bbcb866671 fix bug 2025-08-28 16:37:15 +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
d30e9e502f fix bug 2025-08-21 21:06:54 +08:00
puxuan
a5d135a78a fix bug 2025-08-21 18:26:13 +08:00
puxuan
6f86255585 成就 2025-08-21 16:01:34 +08:00
puxuan
3d7c916058 idle 2025-08-21 14:42:52 +08:00
puxuan
b506620e47 fix bug 2025-08-20 17:44:40 +08:00
puxuan
5fbf156762 英雄 2025-08-20 11:43:19 +08:00
puxuan
9bfbada234 fix bug 2025-08-19 20:33:25 +08:00
puxuan
edfbd9ec35 fix bug 2025-08-19 15:11:57 +08:00