537 Commits

Author SHA1 Message Date
puxuan
1ccc4dcae0 特权 2025-10-08 18:17:02 +08:00
puxuan
920aa71690 特权 2025-10-08 16:02:30 +08:00
puxuan
45e600be69 新加任务 2025-10-07 19:59:53 +08:00
puxuan
d83268f66e Merge branch 'dev_hero' into dev_act
# Conflicts:
#	lua/app/config/fx.lua
#	lua/app/config/strings/cn/attr.lua
#	lua/app/config/strings/de/attr.lua
#	lua/app/config/strings/en/attr.lua
#	lua/app/config/strings/es/attr.lua
#	lua/app/config/strings/fr/attr.lua
#	lua/app/config/strings/id/attr.lua
#	lua/app/config/strings/ja/attr.lua
#	lua/app/config/strings/ko/attr.lua
#	lua/app/config/strings/pt/attr.lua
#	lua/app/config/strings/ru/attr.lua
#	lua/app/config/strings/th/attr.lua
#	lua/app/config/strings/vi/attr.lua
#	lua/app/config/strings/zh/attr.lua
2025-10-07 18:31:30 +08:00
puxuan
4e26d02191 每日挑战 2025-10-07 18:27:59 +08:00
puxuan
1bc3f1e9f2 基金 2025-09-29 19:52:41 +08:00
puxuan
869dad3cff 冲刺 2025-09-29 16:27:22 +08:00
puxuan
d8e2d6ce43 活动 2025-09-28 20:35:26 +08:00
puxuan
9a9254de99 活动 2025-09-28 20:04:42 +08:00
puxuan
c41b85349a 冲刺活动 2025-09-28 14:42:58 +08:00
puxuan
d98418b50f config 2025-09-26 15:41:46 +08:00
puxuan
6546675a6f 冲刺活动 2025-09-25 20:12:22 +08:00
puxuan
a20f3f0dd1 活动 2025-09-25 16:04:15 +08:00
puxuan
35059a2f70 签到 2025-09-25 11:40:28 +08:00
puxuan
56936f582b 商店 2025-09-24 16:21:47 +08:00
puxuan
fa6e612330 Merge branch 'dev_hero' into dev_equip 2025-09-23 16:22:21 +08:00
puxuan
24e9b0bc45 fix bug 2025-09-22 16:08:20 +08:00
puxuan
8424f7c65d fix bug 2025-09-22 10:18:07 +08:00
puxuan
5cb6d1235f Merge branch 'dev_hero' into dev_equip 2025-09-19 15:02:44 +08:00
puxuan
50cc038083 config 2025-09-19 15:01:49 +08:00
puxuan
3d1a5203a7 Merge branch 'dev_hero' into dev_equip 2025-09-19 14:51:57 +08:00
puxuan
349f321a97 新增肉鸽类型 2025-09-19 14:49:12 +08:00
puxuan
526b1690c5 属性 2025-09-18 17:51:59 +08:00
puxuan
6347ed6f9c 装备 2025-09-17 17:23:26 +08:00
puxuan
a9998c9169 config 2025-09-16 20:08:21 +08:00
puxuan
2960713f83 Merge branch 'dev_hero' into dev_equip
# Conflicts:
#	lua/app/config/localization/localization_global_const.lua
#	lua/app/config/strings/cn/global.lua
2025-09-16 16:12:53 +08:00
puxuan
27e83d731f config 2025-09-16 16:07:43 +08:00
puxuan
e1d389b02d 每日挑战 2025-09-15 17:20:14 +08:00
puxuan
1f9283c93b config 2025-09-12 16:27:25 +08:00
puxuan
4bbe1af8b1 装备 2025-09-12 09:50:19 +08:00
puxuan
c8e5d669ab 装备 2025-09-11 10:45:22 +08:00
puxuan
00f30b9ab3 装备 2025-09-09 21:10:35 +08:00
puxuan
d0362beb78 Merge branch 'dev_hero' into dev_equip 2025-09-09 20:14:48 +08:00
puxuan
d758c405db config 2025-09-09 20:02:39 +08:00
puxuan
a2eaf90572 装备 2025-09-09 19:39:38 +08:00
puxuan
371f5f2893 背包 2025-09-08 20:00:23 +08:00
puxuan
196c03b48b 背包 2025-09-08 17:35:56 +08:00
puxuan
8150bff1d4 config 2025-09-05 16:49:52 +08:00
puxuan
160cc58d78 boss技能 2025-09-05 15:04:14 +08:00
puxuan
af43059ce9 config 2025-09-04 16:27:35 +08:00
puxuan
9481bb830c fix bug 2025-09-04 16:21:46 +08:00
puxuan
58f9825721 config 2025-09-04 09:40:35 +08:00
puxuan
a48c5a860a fix bug 2025-09-03 16:43:04 +08:00
puxuan
0ad11e3e21 fix bug 2025-09-02 20:44:41 +08:00
puxuan
af73f1f5d2 fix bug 2025-09-02 17:28:52 +08:00
puxuan
c4141108da config 2025-09-01 09:44:32 +08:00
puxuan
46f972483a fix bug 2025-08-27 16:09:18 +08:00
puxuan
60eee47520 config 2025-08-27 09:45:24 +08:00
puxuan
4049b0831b config 2025-08-22 14:56:41 +08:00
puxuan
02ad035a42 config 2025-08-21 19:35:52 +08:00