Fang
|
3d98e4e343
|
更表
|
2023-10-20 18:10:19 +08:00 |
|
Fang
|
d4548c017a
|
更表
|
2023-10-20 16:08:00 +08:00 |
|
xiekaidong
|
e12d2cbf3a
|
更新配置
|
2023-10-09 17:48:49 +08:00 |
|
Fang
|
e10c78dc0d
|
更表
|
2023-10-09 15:25:29 +08:00 |
|
Fang
|
033be63595
|
更表
|
2023-10-09 14:25:55 +08:00 |
|
Fang
|
9793884da6
|
锦标赛战令进度条显示修改，帮助文案修改
|
2023-10-08 16:56:27 +08:00 |
|
Fang
|
2f953375a5
|
锦标赛fix
|
2023-10-08 11:35:43 +08:00 |
|
Fang
|
344aacd348
|
配置
|
2023-09-28 10:23:26 +08:00 |
|
Fang
|
7a475edcfc
|
fix
|
2023-09-20 00:10:31 +08:00 |
|
Fang
|
38406343a2
|
更表、超框处理
|
2023-09-19 18:29:59 +08:00 |
|
Fang
|
aabf68a924
|
更表
|
2023-09-19 11:28:17 +08:00 |
|
Fang
|
30e6f98fff
|
界面优化
|
2023-09-18 16:37:42 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
e5547541e3
|
更新配置和优化显示
|
2023-09-15 17:37:03 +08:00 |
|
Fang
|
2d1349eae0
|
自动铸造开启等级
|
2023-09-13 10:37:44 +08:00 |
|
xiekaidong
|
b3af360cd3
|
buff修改
|
2023-09-11 10:49:18 +08:00 |
|
xiekaidong
|
297dcded77
|
魅惑、免疫buff，被控状态下，技能cd不递减
|
2023-09-06 16:26:48 +08:00 |
|
xiekaidong
|
3a7f4576d8
|
更新配置
|
2023-09-05 20:24:35 +08:00 |
|
xiekaidong
|
c685261caa
|
更新配置
|
2023-09-05 20:22:27 +08:00 |
|
xiekaidong
|
a0daa1e692
|
更新配置
|
2023-09-05 18:00:32 +08:00 |
|
xiekaidong
|
180c12435f
|
更新配置
|
2023-09-05 15:59:37 +08:00 |
|
xiekaidong
|
12d5186557
|
倒计时优化
|
2023-09-04 17:25:50 +08:00 |
|
xiekaidong
|
4e5021741d
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/local_data.lua
# lua/app/common/module_manager.lua
# lua/app/config/act_fourteen_bounty.lua.meta
# lua/app/config/act_fourteen_exchange.lua.meta
# lua/app/config/act_fourteen_quest.lua
# lua/app/config/act_fourteen_quest.lua.meta
# lua/app/config/activity_boss_rush_chapter.lua.meta
# lua/app/config/activity_boss_rush_exchange.lua.meta
# lua/app/config/activity_boss_rush_rank.lua.meta
# lua/app/config/activity_exchange.lua.meta
# lua/app/config/avatar_frame.lua
# lua/app/config/chapter_board_bossrush.lua.meta
# lua/app/config/monster_activity.lua.meta
# lua/app/config/strings/cn/act_fourteen_quest.lua.meta
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/task_type.lua.meta
# lua/app/config/strings/de/act_fourteen_quest.lua.meta
# lua/app/config/strings/de/task_type.lua.meta
# lua/app/config/strings/en/act_fourteen_quest.lua.meta
# lua/app/config/strings/en/task_type.lua.meta
# lua/app/config/strings/es/act_fourteen_quest.lua.meta
# lua/app/config/strings/es/task_type.lua.meta
# lua/app/config/strings/fr/act_fourteen_quest.lua.meta
# lua/app/config/strings/fr/task_type.lua.meta
# lua/app/config/strings/id/act_fourteen_quest.lua.meta
# lua/app/config/strings/id/task_type.lua.meta
# lua/app/config/strings/ja/act_fourteen_quest.lua.meta
# lua/app/config/strings/ja/task_type.lua.meta
# lua/app/config/strings/ko/act_fourteen_quest.lua.meta
# lua/app/config/strings/ko/task_type.lua.meta
# lua/app/config/strings/pt/act_fourteen_quest.lua.meta
# lua/app/config/strings/pt/task_type.lua.meta
# lua/app/config/strings/ru/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/act_fourteen_quest.lua.meta
# lua/app/config/strings/th/task_type.lua.meta
# lua/app/config/strings/vi/act_fourteen_quest.lua.meta
# lua/app/config/strings/vi/task_type.lua.meta
# lua/app/config/strings/zh/act_fourteen_quest.lua.meta
# lua/app/config/strings/zh/task_type.lua.meta
# lua/app/proto/proto_msg_type.lua
|
2023-09-01 21:18:54 +08:00 |
|
xiekaidong
|
eed3f88d79
|
首领公开赛
|
2023-09-01 21:10:05 +08:00 |
|
Fang
|
89eeac3f2d
|
新手14天乐
|
2023-09-01 15:35:19 +08:00 |
|
xiekaidong
|
211d7cc71e
|
boss_rush
|
2023-08-30 19:11:38 +08:00 |
|
Fang
|
52cab75d25
|
更表
|
2023-08-30 17:03:50 +08:00 |
|
Fang
|
6ec4c2cd40
|
装备礼包fix
|
2023-08-28 15:25:38 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
Fang
|
f15917914c
|
竞技场段位奖励
|
2023-08-23 14:40:52 +08:00 |
|
Fang
|
017be0ef1c
|
新增皮肤报错fix
|
2023-08-22 11:56:22 +08:00 |
|
xiekaidong
|
cd4b4d4105
|
更新配置
|
2023-08-18 11:52:03 +08:00 |
|
xiekaidong
|
ad1aaffe74
|
更新配置
|
2023-08-15 21:39:25 +08:00 |
|
xiekaidong
|
a62d759abc
|
更新配置
|
2023-08-15 18:42:55 +08:00 |
|
Fang
|
fbe290212e
|
导表
|
2023-08-15 11:37:27 +08:00 |
|
Fang
|
b06ed8a9eb
|
导表
|
2023-08-14 18:32:48 +08:00 |
|
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 |
|