47 Commits

Author SHA1 Message Date
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
xiekaidong
297dcded77 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:26:48 +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
xiekaidong
8f07e19054 新机制 2023-08-08 16:37:57 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
041d222d53 更新配置 2023-08-02 18:30:43 +08:00
Fang
fe2f7de08b 礼包入口spine 2023-07-14 15:26:38 +08:00
Fang
dfb1967899 竞技场战令文案替换 2023-07-06 14:42:10 +08:00
chenxi
594a6cced5 更新配置 2023-06-20 19:58:07 +08:00
xiekaidong
749de33dae 更新配置 2023-06-20 15:29:34 +08:00
Fang
b45ee34f5f 导表 2023-06-20 11:44:21 +08:00
xiekaidong
ad7212ff13 新的肉鸽机制-改变effect概率 2023-06-13 11:11:06 +08:00
chenxi
94ce7bdc8e 更新配置 2023-06-06 18:40:23 +08:00
xiekaidong
e85af27bf2 更新配置 2023-06-05 15:54:09 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
xiekaidong
9a6c3966cb bug修复 2023-06-01 17:25:28 +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
905cf03f74 更新配置 2023-05-26 19:44:55 +08:00
xiekaidong
c89eb8ef3f 禁锢 2023-05-26 18:08:05 +08:00
chenxi
0b6607d714 七天乐 2023-05-26 14:51:24 +08:00
chenxi
e552761eea 七天乐 2023-05-26 11:39:23 +08:00
CloudJ
cc674c3204 更新配置表与pb 修复一些问题 2023-05-25 15:26:57 +08:00
chenxi
6369eab7f6 战令 2023-05-12 15:32:53 +08:00
chenxi
a903fe2950 更新配置 2023-04-26 19:01:23 +08:00
chenxi
3caafceabd 更新配置 2023-04-25 20:19:09 +08:00
xiekaidong
99d6318442 bug修复 2023-04-25 17:50:41 +08:00
chenxi
7f3c65c7ef 体力恢复 2023-04-24 21:20:55 +08:00
chenxi
d1707711b3 更新配置 2023-04-24 17:39:08 +08:00
chenxi
c42a3dd0b1 更新配置 2023-04-24 17:25:59 +08:00
chenxi
794deae7a0 更新配置 2023-04-22 00:06:58 +08:00
chenxi
8701bda613 更新配置 2023-04-21 18:22:29 +08:00
chenxi
0e43cbbbd0 更新配置 2023-04-21 17:44:07 +08:00
chenxi
2a9f4350b0 普攻改成数组 2023-04-21 17:11:59 +08:00
xiekaidong
867bf72134 引导,更新配置 2023-04-21 16:26:57 +08:00
chenxi
f0cb7a6d73 更新配置 2023-04-19 15:05:27 +08:00
chenxi
421748cd17 更新配置 2023-04-18 22:25:33 +08:00
chenxi
e908d3bc90 更新配置 2023-04-17 16:53:06 +08:00
xiekaidong
3b909a2a81 一些界面修改和接入关卡结算 2023-04-14 22:19:22 +08:00
chenxi
f41759dff4 移动攻击表现 2023-04-12 23:10:22 +08:00
chenxi
25d13668e6 战斗 2023-04-12 21:14:10 +08:00
xiekaidong
4b1875aafd 棋盘新的读取方式 2023-04-12 15:16:30 +08:00