767 Commits

Author SHA1 Message Date
puxuan
ddb9b12654 1 2025-10-09 17:03:34 +08:00
puxuan
d9cbbb3337 特权 2025-10-08 18:17:27 +08:00
puxuan
c01bb6dd49 七天乐 2025-10-08 17:26:12 +08:00
puxuan
743d0f097b 特权 2025-10-08 16:03:28 +08:00
puxuan
ddcb2c72f0 新加任务 2025-10-07 20:00:23 +08:00
puxuan
4aa2e6f2a7 Merge branch 'dev_hero' into dev_act
# Conflicts:
#	Assets/lua/app/config/buff.lua.bytes
#	Assets/lua/app/config/fx.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/attr.lua.bytes
#	Assets/lua/app/config/strings/cn/task_type.lua.bytes
#	Assets/lua/app/config/strings/de/attr.lua.bytes
#	Assets/lua/app/config/strings/en/attr.lua.bytes
#	Assets/lua/app/config/strings/en/task_type.lua.bytes
#	Assets/lua/app/config/strings/es/attr.lua.bytes
#	Assets/lua/app/config/strings/es/task_type.lua.bytes
#	Assets/lua/app/config/strings/fr/attr.lua.bytes
#	Assets/lua/app/config/strings/id/attr.lua.bytes
#	Assets/lua/app/config/strings/id/task_type.lua.bytes
#	Assets/lua/app/config/strings/ja/attr.lua.bytes
#	Assets/lua/app/config/strings/ja/task_type.lua.bytes
#	Assets/lua/app/config/strings/ko/attr.lua.bytes
#	Assets/lua/app/config/strings/ko/task_type.lua.bytes
#	Assets/lua/app/config/strings/pt/attr.lua.bytes
#	Assets/lua/app/config/strings/pt/task_type.lua.bytes
#	Assets/lua/app/config/strings/ru/attr.lua.bytes
#	Assets/lua/app/config/strings/th/attr.lua.bytes
#	Assets/lua/app/config/strings/th/task_type.lua.bytes
#	Assets/lua/app/config/strings/vi/attr.lua.bytes
#	Assets/lua/app/config/strings/vi/task_type.lua.bytes
#	Assets/lua/app/config/strings/zh/attr.lua.bytes
#	Assets/lua/app/config/strings/zh/task_type.lua.bytes
2025-10-07 18:30:51 +08:00
puxuan
614909a19f 每日挑战 2025-10-07 18:28:34 +08:00
puxuan
8060568ced 签到 2025-10-07 17:19:46 +08:00
puxuan
9c290fa178 活动 2025-10-07 11:21:54 +08:00
puxuan
c819d7ce8a 礼包 2025-09-29 21:10:50 +08:00
puxuan
7b4916851e 基金 2025-09-29 19:53:13 +08:00
puxuan
e911269404 活动 2025-09-29 17:03:14 +08:00
puxuan
e57618f534 冲刺 2025-09-29 16:27:54 +08:00
puxuan
d8249cc3ac 冲刺 2025-09-29 15:37:57 +08:00
puxuan
778505742a lua 2025-09-28 20:37:41 +08:00
puxuan
f93e31fb95 活动 2025-09-28 20:05:55 +08:00
puxuan
dc4c1fc49e 活动 2025-09-28 16:11:00 +08:00
puxuan
e10aa91ae9 冲刺活动 2025-09-28 14:43:19 +08:00
puxuan
4369ed4075 config 2025-09-26 15:42:14 +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
8ae9b1c288 2025-09-24 12:04:04 +08:00
puxuan
87b4c11a9c 阵容 2025-09-24 12:03:05 +08:00
puxuan
a831629459 敌方属性计算 2025-09-23 20:00:40 +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
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
dbd220fcfc 2025-09-12 15:24:11 +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
f11022dc96 背包 2025-09-08 17:36:27 +08:00
puxuan
13e846a688 fix bug 2025-09-08 14:31:58 +08:00
puxuan
991d7f52bb fix bug 2025-09-05 15:40:40 +08:00
puxuan
ee14aded6a fix bug 2025-09-05 14:28:41 +08:00
puxuan
9ebcf06b5a boss技能弹窗 2025-09-04 18:20:30 +08:00
puxuan
a6dbfc3fa9 fix bug 2025-09-04 16:22:50 +08:00
puxuan
fcb5091001 特效 2025-09-02 20:45:18 +08:00
puxuan
98cc05b3cc fix bug 2025-08-29 17:23:14 +08:00
puxuan
49f697de6e 技能描述 2025-08-29 14:25:56 +08:00