Fang
|
6bfc886dd5
|
配置更新
|
2023-08-14 14:43:50 +08:00 |
|
Fang
|
0ed6abb0f4
|
更新配置
|
2023-08-14 09:47:37 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +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
|
26862b0e02
|
Merge branch 'dev_20230815' into battle
# Conflicts:
# lua/app/config/buff.lua
# lua/app/config/strings/de/buff.lua
# lua/app/config/strings/en/buff.lua
# lua/app/config/strings/es/buff.lua
# lua/app/config/strings/fr/buff.lua
# lua/app/config/strings/id/buff.lua
# lua/app/config/strings/ja/buff.lua
# lua/app/config/strings/ko/buff.lua
# lua/app/config/strings/pt/buff.lua
# lua/app/config/strings/ru/buff.lua
# lua/app/config/strings/th/buff.lua
# lua/app/config/strings/vi/buff.lua
# lua/app/config/strings/zh/buff.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/helper/battle_buff_handle.lua
|
2023-08-08 16:02:24 +08:00 |
|
xiekaidong
|
42ad5ec9fa
|
Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/skill_rogue.lua
# lua/app/config/strings/cn/buff.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skill.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skill.lua
|
2023-08-08 15:58:56 +08:00 |
|
xiekaidong
|
97cddfa125
|
复活buff
|
2023-08-08 15:27:21 +08:00 |
|
xiekaidong
|
d5e8786233
|
更新配置
|
2023-08-08 11:44:16 +08:00 |
|
xiekaidong
|
e51b9bf86a
|
更新配置
|
2023-08-04 16:56:37 +08:00 |
|
Fang
|
84e1e14d79
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:00 +08:00 |
|
xiekaidong
|
6cdae47b74
|
更新配置
|
2023-08-03 16:59:40 +08:00 |
|
xiekaidong
|
e0c2821f76
|
武器副本增加体力消耗
|
2023-08-03 11:08:04 +08:00 |
|
xiekaidong
|
041d222d53
|
更新配置
|
2023-08-02 18:30:43 +08:00 |
|
xiekaidong
|
e0882c61c6
|
更新配置
|
2023-07-31 16:27:31 +08:00 |
|
xiekaidong
|
2f98218e7d
|
更新配置
|
2023-07-27 10:27:48 +08:00 |
|
xiekaidong
|
08fa2ab356
|
更新配置
|
2023-07-26 15:58:03 +08:00 |
|
Fang
|
356cffc973
|
导表
|
2023-07-26 15:15:25 +08:00 |
|
xiekaidong
|
eece88ddce
|
更新配置
|
2023-07-25 22:09:55 +08:00 |
|
Fang
|
22a26bcda0
|
导表
|
2023-07-25 20:18:15 +08:00 |
|
xiekaidong
|
1071013356
|
更新配置
|
2023-07-25 16:50:38 +08:00 |
|
Fang
|
ce1e2f557d
|
收集奖励报错fix
|
2023-07-25 15:44:10 +08:00 |
|
xiekaidong
|
37482eb2ca
|
副本引导
|
2023-07-24 17:10:39 +08:00 |
|
xiekaidong
|
d7ed50ab8c
|
处理界面显示
|
2023-07-24 10:36:25 +08:00 |
|
xiekaidong
|
dbbfbf4842
|
优化技能的释放位置逻辑
|
2023-07-21 15:36:05 +08:00 |
|
xiekaidong
|
bab7c281ca
|
更新配置，英雄排序问题
|
2023-07-21 11:47:19 +08:00 |
|
xiekaidong
|
8b4933f4f0
|
支线副本
|
2023-07-20 17:41:42 +08:00 |
|
xiekaidong
|
000bc5e926
|
武器副本的一些界面
|
2023-07-19 16:52:28 +08:00 |
|
xiekaidong
|
0cfce182b3
|
更新配置
|
2023-07-18 16:45:46 +08:00 |
|
xiekaidong
|
de04cbc6ff
|
更新配置和优化
|
2023-07-17 17:21:00 +08:00 |
|
Fang
|
b2dba1de2e
|
英雄图鉴
|
2023-07-14 17:07:03 +08:00 |
|
xiekaidong
|
a69305960b
|
更新配置
|
2023-07-13 18:03:33 +08:00 |
|
xiekaidong
|
4c8b8116e3
|
更新配置
|
2023-07-12 14:57:56 +08:00 |
|
xiekaidong
|
dde65f49c3
|
设置界面新增社区链接按钮
|
2023-07-11 15:45:14 +08:00 |
|
xiekaidong
|
576320840a
|
更新配置
|
2023-07-07 16:06:11 +08:00 |
|
Fang
|
7eabeeb752
|
超框
|
2023-07-06 19:23:17 +08:00 |
|
Fang
|
2a6d74482f
|
导表
|
2023-07-06 18:19:11 +08:00 |
|
xiekaidong
|
8ee590a831
|
bug修复
|
2023-07-06 17:41:58 +08:00 |
|
Fang
|
47418bab2e
|
竞技场宝箱增加每日次数控制
|
2023-07-06 10:24:53 +08:00 |
|
Fang
|
f24f8d5e75
|
显示修复
|
2023-07-05 15:55:44 +08:00 |
|
xiekaidong
|
cd4af85987
|
更新配置
|
2023-07-05 15:35:10 +08:00 |
|
Fang
|
b563ed2970
|
导表
|
2023-07-05 15:04:22 +08:00 |
|
Fang
|
68f80b45d3
|
竞技场ad宝箱功能补全
|
2023-07-05 15:02:59 +08:00 |
|
xiekaidong
|
7cb37f9d96
|
更新配置
|
2023-07-04 15:37:34 +08:00 |
|
Fang
|
abe661f228
|
空名称处理
|
2023-07-03 14:16:03 +08:00 |
|
Fang
|
9dc155e593
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:50 +08:00 |
|