66 Commits

Author SHA1 Message Date
puxuan
30fcf69843 mystery_box 2025-06-10 23:36:41 +08:00
puxuan
6f2dc436f7 config 2025-05-24 14:24:19 +08:00
puxuan
5fd176f477 config 2025-05-24 12:00:09 +08:00
Fang
45d10ff588 更表 2023-11-14 17:45:17 +08:00
Fang
7a475edcfc fix 2023-09-20 00:10:31 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
xiekaidong
87cedf6a28 更新配置 2023-08-17 18:59:17 +08:00
xiekaidong
c60d8cfdcb 更新配置 2023-08-16 11:00:12 +08:00
xiekaidong
866094a76f 边缘障碍物逻辑优化 2023-08-11 15:17:28 +08:00
xiekaidong
4c65578099 更新配置 2023-08-11 10:41:09 +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
Fang
9c42fe1da6 皮肤功能 2023-08-09 14:16:27 +08:00
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
Fang
fe2f7de08b 礼包入口spine 2023-07-14 15:26:38 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
chenxi
c65113785d 更新配置 2023-06-13 14:37:42 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
chenxi
94ce7bdc8e 更新配置 2023-06-06 18:40:23 +08:00
CloudJ
ed3d1898b0 调整宝箱界面 2023-06-06 11:44:58 +08:00
Fang
c5c36cbb86 更表 2023-06-05 17:29:36 +08:00
xiekaidong
e85af27bf2 更新配置 2023-06-05 15:54:09 +08:00
chenxi
a438b745a3 更新配置 2023-06-05 10:07:46 +08:00
chenxi
a79e89cac4 更新配置 2023-06-03 23:53:27 +08:00
xiekaidong
b0131c5567 多段音效 2023-06-02 20:28:01 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +08:00
chenxi
ad9f510a1e 七天乐 2023-05-30 22:22:46 +08:00
chenxi
4b7a41f638 基金显示模型 2023-05-30 17:22:42 +08:00
xiekaidong
a828972f43 更新配置 2023-05-30 15:08:16 +08:00
CloudJ
c01f881307 配置表 2023-05-30 09:43:49 +08:00
chenxi
d47baeebc1 调整一下英雄解锁的逻辑 2023-05-29 15:06:25 +08:00
chenxi
905cf03f74 更新配置 2023-05-26 19:44:55 +08:00
chenxi
0b6607d714 七天乐 2023-05-26 14:51:24 +08:00
CloudJ
cc674c3204 更新配置表与pb 修复一些问题 2023-05-25 15:26:57 +08:00
CloudJ
1fb818d12b 提交一波 2023-05-23 18:37:09 +08:00
xiekaidong
8ae7df28e2 通用技能tips 2023-05-22 16:38:04 +08:00
xiekaidong
5309687502 果冻 2023-05-19 20:44:38 +08:00
xiekaidong
43dc8332f8 更新配置 2023-05-19 16:29:02 +08:00
chenxi
a1e98528ca 更新配置 2023-05-18 20:32:10 +08:00
chenxi
6e33313f69 购买战令界面 2023-05-17 14:40:54 +08:00
chenxi
f7cd1c6094 战令 2023-05-16 18:17:05 +08:00
chenxi
124feb0b09 任务 2023-05-11 10:09:29 +08:00
chenxi
50a2ff4b9f 金猪 2023-05-05 14:59:02 +08:00
chenxi
e724a9e523 更新配置 2023-04-27 16:54:57 +08:00
chenxi
47a75078dc 更新配置 2023-04-26 22:32:08 +08:00
chenxi
a903fe2950 更新配置 2023-04-26 19:01:23 +08:00