Fang
|
6bfc886dd5
|
配置更新
|
2023-08-14 14:43:50 +08:00 |
|
Fang
|
0ed6abb0f4
|
更新配置
|
2023-08-14 09:47:37 +08:00 |
|
Fang
|
03ed69d44a
|
竞技场宝箱tips
|
2023-08-11 15:49:06 +08:00 |
|
xiekaidong
|
7247cada75
|
Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-lua into dev_20230815
|
2023-08-11 15:17:32 +08:00 |
|
xiekaidong
|
866094a76f
|
边缘障碍物逻辑优化
|
2023-08-11 15:17:28 +08:00 |
|
Fang
|
84796cd4a8
|
活动礼包弹出逻辑补充
|
2023-08-11 15:08:23 +08:00 |
|
Fang
|
a749cbfa94
|
导表
|
2023-08-11 14:27:14 +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
|
ccb0f42081
|
新buff和新机制
|
2023-08-08 16:38:54 +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 |
|
xiekaidong
|
82823526d9
|
自愈、海洋护盾buff
|
2023-08-04 16:19:59 +08:00 |
|
Fang
|
84e1e14d79
|
装备材料副本扫荡排序修改
|
2023-08-04 10:53:00 +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
|
b581328fd6
|
武器副本增加体力消耗
|
2023-08-03 11:08:19 +08:00 |
|
xiekaidong
|
e0c2821f76
|
武器副本增加体力消耗
|
2023-08-03 11:08:04 +08:00 |
|
xiekaidong
|
041d222d53
|
更新配置
|
2023-08-02 18:30:43 +08:00 |
|
xiekaidong
|
62ee8bab01
|
木棍边缘障碍物
|
2023-08-02 18:07:44 +08:00 |
|
xiekaidong
|
e0882c61c6
|
更新配置
|
2023-07-31 16:27:31 +08:00 |
|
xiekaidong
|
80be66cc4b
|
Merge branch 'master' into dev_20230809
# Conflicts:
# lua/app/userdata/hero/hero_entity.lua
|
2023-07-31 16:25:06 +08:00 |
|
xiekaidong
|
ef6969c4d9
|
引导修改
|
2023-07-28 18:40:11 +08:00 |
|
Fang
|
7c7d201e01
|
技能tips
|
2023-07-28 11:46:22 +08:00 |
|
xiekaidong
|
5a7249a545
|
更新配置
|
2023-07-27 12:32:51 +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
|
2f84455356
|
更新配置
|
2023-07-25 19:28:47 +08:00 |
|
Fang
|
b2d2b65e73
|
显示fix
|
2023-07-25 18:11:05 +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
|
5fcf27a659
|
基金ad奖励显示fix
|
2023-07-25 15:44:10 +08:00 |
|
Fang
|
ce1e2f557d
|
收集奖励报错fix
|
2023-07-25 15:44:10 +08:00 |
|
xiekaidong
|
e59b7f1ccb
|
Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725
|
2023-07-24 18:47:54 +08:00 |
|
xiekaidong
|
c6d10d8825
|
调整一下逻辑
|
2023-07-24 18:47:46 +08:00 |
|
Fang
|
d10b9049f7
|
装备属性加成计算fix
|
2023-07-24 18:37:43 +08:00 |
|
xiekaidong
|
37482eb2ca
|
副本引导
|
2023-07-24 17:10:39 +08:00 |
|