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
|
d5e8786233
|
更新配置
|
2023-08-08 11:44:16 +08:00 |
|
xiekaidong
|
e51b9bf86a
|
更新配置
|
2023-08-04 16:56:37 +08:00 |
|
xiekaidong
|
08fa2ab356
|
更新配置
|
2023-07-26 15:58:03 +08:00 |
|
xiekaidong
|
37482eb2ca
|
副本引导
|
2023-07-24 17:10:39 +08:00 |
|
Fang
|
abe661f228
|
空名称处理
|
2023-07-03 14:16:03 +08:00 |
|
Fang
|
b45ee34f5f
|
导表
|
2023-06-20 11:44:21 +08:00 |
|
Fang
|
da6e53abfe
|
修改副本显示顺序、碎片副本奖励逻辑
|
2023-06-15 16:08:37 +08:00 |
|
Fang
|
193ea8902f
|
金币副本新增boss抗性
|
2023-06-15 10:46:36 +08:00 |
|
xiekaidong
|
ad7212ff13
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:06 +08:00 |
|
chenxi
|
94ce7bdc8e
|
更新配置
|
2023-06-06 18:40:23 +08:00 |
|
Fang
|
c5c36cbb86
|
更表
|
2023-06-05 17:29:36 +08:00 |
|
xiekaidong
|
e85af27bf2
|
更新配置
|
2023-06-05 15:54:09 +08:00 |
|
chenxi
|
7569ae41d4
|
更新配置
|
2023-05-31 14:32:01 +08:00 |
|
xiekaidong
|
abc9c6af93
|
更新配置
|
2023-05-31 09:34:19 +08:00 |
|
chenxi
|
e86e750a1b
|
更新配置
|
2023-05-30 22:23:19 +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 |
|
CloudJ
|
cc674c3204
|
更新配置表与pb 修复一些问题
|
2023-05-25 15:26:57 +08:00 |
|
xiekaidong
|
43dc8332f8
|
更新配置
|
2023-05-19 16:29:02 +08:00 |
|
chenxi
|
df51c37505
|
更新配置
|
2023-05-18 22:10:22 +08:00 |
|
xiekaidong
|
98070979dc
|
多段伤害
|
2023-05-18 10:58:49 +08:00 |
|
chenxi
|
a1e56df4aa
|
更新配置
|
2023-05-17 20:05:18 +08:00 |
|
chenxi
|
f7cd1c6094
|
战令
|
2023-05-16 18:17:05 +08:00 |
|
chenxi
|
549e285299
|
修改配置
|
2023-04-27 19:08:14 +08:00 |
|
chenxi
|
e724a9e523
|
更新配置
|
2023-04-27 16:54:57 +08:00 |
|
chenxi
|
a903fe2950
|
更新配置
|
2023-04-26 19:01:23 +08:00 |
|
chenxi
|
54174019ee
|
技能加速
|
2023-04-26 14:17:08 +08:00 |
|
chenxi
|
3caafceabd
|
更新配置
|
2023-04-25 20:19:09 +08:00 |
|
chenxi
|
60f6b5c8ef
|
更新配置
|
2023-04-25 18:04:17 +08:00 |
|
xiekaidong
|
99d6318442
|
bug修复
|
2023-04-25 17:50:41 +08:00 |
|
chenxi
|
2742782204
|
配置
|
2023-04-25 15:20:05 +08:00 |
|
chenxi
|
b108325c9f
|
更新配置
|
2023-04-25 14:40:32 +08:00 |
|
chenxi
|
39e5879e70
|
更新配置
|
2023-04-24 21:50:57 +08:00 |
|
chenxi
|
c42a3dd0b1
|
更新配置
|
2023-04-24 17:25:59 +08:00 |
|
xiekaidong
|
69fc9ac72d
|
更新配置
|
2023-04-23 15:55:23 +08:00 |
|
chenxi
|
af56d4b400
|
伤害统计
|
2023-04-21 22:14:57 +08:00 |
|
chenxi
|
9c70bfbfed
|
更新配置
|
2023-04-20 20:54:29 +08:00 |
|
xiekaidong
|
85061a5126
|
一些肉鸽技能
|
2023-04-11 17:26:02 +08:00 |
|
chenxi
|
0908bfe8bc
|
章节
|
2023-04-07 20:50:11 +08:00 |
|