22 Commits

Author SHA1 Message Date
puxuan
2a65830015 升级 2025-10-09 17:28:13 +08:00
puxuan
45e600be69 新加任务 2025-10-07 19:59:53 +08:00
puxuan
4e26d02191 每日挑战 2025-10-07 18:27:59 +08:00
puxuan
4bbe1af8b1 装备 2025-09-12 09:50:19 +08:00
puxuan
af43059ce9 config 2025-09-04 16:27:35 +08:00
puxuan
11bb4e4017 fix bug 2025-08-18 20:49:25 +08:00
puxuan
bb135f8630 fix bug 2025-08-18 11:48:38 +08:00
puxuan
66c6437612 抽卡 2025-08-11 20:37:29 +08:00
puxuan
0166341747 config 2025-07-23 20:05:04 +08:00
xiekaidong
866094a76f 边缘障碍物逻辑优化 2023-08-11 15:17:28 +08:00
xiekaidong
e17c9bf4cf 更新配置 2023-08-10 09:40:35 +08:00
xiekaidong
d311ea14aa Merge branch 'master' into dev_20230815
# Conflicts:
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board.lua
#	lua/app/config/grid_type.lua
#	lua/app/config/strings/cn/avatar.lua
#	lua/app/config/strings/cn/avatar_frame.lua
#	lua/app/config/strings/en/avatar.lua
#	lua/app/config/strings/en/avatar_frame.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/avatar.lua
#	lua/app/config/strings/es/avatar_frame.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/id/avatar.lua
#	lua/app/config/strings/id/avatar_frame.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/avatar.lua
#	lua/app/config/strings/ja/avatar_frame.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/avatar.lua
#	lua/app/config/strings/ko/avatar_frame.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/avatar.lua
#	lua/app/config/strings/pt/avatar_frame.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/th/avatar.lua
#	lua/app/config/strings/th/avatar_frame.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/avatar.lua
#	lua/app/config/strings/vi/avatar_frame.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/avatar.lua
#	lua/app/config/strings/zh/avatar_frame.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/summon.lua
#	lua/app/module/battle/component/battle_unit_comp.lua
#	lua/app/module/battle/team/battle_team.lua
2023-08-10 09:39:07 +08:00
Fang
0e71260aad 更表 2023-08-09 17:25:38 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
Fang
dfb1967899 竞技场战令文案替换 2023-07-06 14:42:10 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
chenxi
8032ca378d 更新配置 2023-06-16 21:34:30 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
CloudJ
c01f881307 配置表 2023-05-30 09:43:49 +08:00
CloudJ
cc674c3204 更新配置表与pb 修复一些问题 2023-05-25 15:26:57 +08:00