146 Commits

Author SHA1 Message Date
xiekaidong
c4af5f7e5e 显示优化 2023-09-18 10:52:26 +08:00
Fang
a1098edc2e 更新 2023-09-18 10:16:54 +08:00
xiekaidong
e41a9b0b1a 帮助界面 2023-09-16 20:17:13 +08:00
xiekaidong
2038237e6c 界面优化 2023-09-16 18:45:50 +08:00
xiekaidong
e5547541e3 更新配置和优化显示 2023-09-15 17:37:03 +08:00
Fang
3f17beb2f2 淬炼锁定提示 2023-09-13 15:44:54 +08:00
Fang
2d1349eae0 自动铸造开启等级 2023-09-13 10:37:44 +08:00
Fang
35d78447a8 bug fix 2023-09-12 18:43:13 +08:00
Fang
1e21958ae6 更表 2023-09-12 18:11:24 +08:00
Fang
f1f1daafa2 符文功能 2023-09-12 10:35:46 +08:00
xiekaidong
a817d25305 符文副本 2023-09-08 18:53:46 +08:00
xiekaidong
297dcded77 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:26:48 +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
11f982bd04 主动结算 2023-09-04 17:14:35 +08:00
xiekaidong
e7039061a8 更新配置 2023-09-01 21:20:53 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
Fang
6ec4c2cd40 装备礼包fix 2023-08-28 15:25:38 +08:00
xiekaidong
d5afdffecf 封号功能和屏蔽一些网络冗余操作 2023-08-28 14:04:23 +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
0137884ad9 一些描述 2023-08-18 18:35:38 +08:00
xiekaidong
d284ed0bc4 英雄基金 2023-08-18 11:38:21 +08:00
xiekaidong
254a27563a 战令一键领取 2023-08-16 17:35:17 +08:00
Fang
fbe290212e 导表 2023-08-15 11:37:27 +08:00
Fang
0ed6abb0f4 更新配置 2023-08-14 09:47:37 +08:00
Fang
03ed69d44a 竞技场宝箱tips 2023-08-11 15:49:06 +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
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
e51b9bf86a 更新配置 2023-08-04 16:56:37 +08:00
xiekaidong
82823526d9 自愈、海洋护盾buff 2023-08-04 16:19:59 +08:00
xiekaidong
1620d69548 英雄竞技场段位解锁 2023-08-03 18:07:24 +08:00
xiekaidong
6cdae47b74 更新配置 2023-08-03 16:59:40 +08:00
xiekaidong
e05f02088c 统一接口,金币不足提示弹窗询问 2023-08-03 14:53:51 +08:00
xiekaidong
e0c2821f76 武器副本增加体力消耗 2023-08-03 11:08:04 +08:00
xiekaidong
e0882c61c6 更新配置 2023-07-31 16:27:31 +08:00
Fang
356cffc973 导表 2023-07-26 15:15:25 +08:00
xiekaidong
eece88ddce 更新配置 2023-07-25 22:09:55 +08:00
xiekaidong
1071013356 更新配置 2023-07-25 16:50:38 +08:00
xiekaidong
3cd1b81e8f Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725 2023-07-25 16:06:07 +08:00
xiekaidong
74ccb9ac05 韩国社区跳转处理 2023-07-25 16:06:04 +08:00
Fang
ce1e2f557d 收集奖励报错fix 2023-07-25 15:44:10 +08:00