Fang
|
ee97ab1c93
|
Merge branch 'dev' into fang/dungeon
# Conflicts:
# Assets/lua/app/config/item.lua.bytes
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/skill.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/config/strings/cn/item.lua.bytes
# Assets/lua/app/config/strings/de/item.lua.bytes
# Assets/lua/app/config/strings/en/global.lua.bytes
# Assets/lua/app/config/strings/en/item.lua.bytes
# Assets/lua/app/config/strings/fr/item.lua.bytes
# Assets/lua/app/config/strings/id/item.lua.bytes
# Assets/lua/app/config/strings/ja/item.lua.bytes
# Assets/lua/app/config/strings/ko/item.lua.bytes
# Assets/lua/app/config/strings/pt/item.lua.bytes
# Assets/lua/app/config/strings/ru/item.lua.bytes
# Assets/lua/app/config/strings/th/item.lua.bytes
# Assets/lua/app/config/strings/vi/item.lua.bytes
# Assets/lua/app/config/strings/zh/global.lua.bytes
# Assets/lua/app/config/strings/zh/item.lua.bytes
# Assets/lua/app/module/battle/battle_const.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
# Assets/lua/app/ui/battle/battle_ui.lua.bytes
# Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
|
2023-06-14 11:42:03 +08:00 |
|
xiekaidong
|
523c2e4a7f
|
交换一下战斗双方死亡的判定顺序
|
2023-06-14 10:43:29 +08:00 |
|
xiekaidong
|
2c10467ffc
|
对手先手期间，英雄不会播放死亡动作bug修复
|
2023-06-14 10:03:52 +08:00 |
|
chenxi
|
481af73ddb
|
cdkey临时界面
|
2023-06-13 20:54:29 +08:00 |
|
xiekaidong
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|
xiekaidong
|
80d3f8cb17
|
grideffect=6的处理
|
2023-06-13 15:08:42 +08:00 |
|
xiekaidong
|
de0b2828a7
|
新的肉鸽机制-改变effect概率
|
2023-06-13 11:11:46 +08:00 |
|
chenxi
|
e86d257330
|
merge
|
2023-06-13 10:45:07 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
xiekaidong
|
47ddf4f7c7
|
更新协议
|
2023-06-12 16:53:24 +08:00 |
|
xiekaidong
|
f48f17db38
|
攻击距离可配置
|
2023-06-12 10:38:07 +08:00 |
|
xiekaidong
|
dd104eae3f
|
每日挑战不显示每日buff信息
|
2023-06-12 09:47:25 +08:00 |
|
chenxi
|
92f0b087c9
|
编译
|
2023-06-08 21:38:54 +08:00 |
|
chenxi
|
52ad339930
|
fix bug
|
2023-06-07 19:50:16 +08:00 |
|
xiekaidong
|
8ccfae34f3
|
登陆界面复制账号
|
2023-06-06 21:06:13 +08:00 |
|
chenxi
|
29832da12e
|
编译
|
2023-06-06 18:44:31 +08:00 |
|
CloudJ
|
700804df00
|
编译
|
2023-06-06 18:22:26 +08:00 |
|
xiekaidong
|
de983ee4e5
|
战斗bi日志上报
|
2023-06-06 18:07:07 +08:00 |
|
Fang
|
49af10d8a9
|
战斗退出后显示主界面控制
|
2023-06-06 17:31:34 +08:00 |
|
xiekaidong
|
f3c87a786f
|
修改上报
|
2023-06-06 15:25:51 +08:00 |
|
xiekaidong
|
ffcfe93299
|
切换波次时自动关闭buff弹窗
|
2023-06-06 14:13:07 +08:00 |
|
chenxi
|
f91872672a
|
音效和ab
|
2023-06-06 11:30:15 +08:00 |
|
CloudJ
|
e7d278de0c
|
编译
|
2023-06-06 11:15:26 +08:00 |
|
CloudJ
|
f413a2fadb
|
音效
|
2023-06-06 11:09:18 +08:00 |
|
xiekaidong
|
b2f8e11059
|
音效
|
2023-06-06 11:01:33 +08:00 |
|
xiekaidong
|
9a6732acdd
|
增加棋盘查看字段
|
2023-06-05 21:08:16 +08:00 |
|
xiekaidong
|
5bc73b98ab
|
消除显示优化
|
2023-06-05 20:53:19 +08:00 |
|
chenxi
|
7224512691
|
充值后提示绑定
|
2023-06-05 18:33:48 +08:00 |
|
xiekaidong
|
f2a67512f8
|
显示bug修复
|
2023-06-05 18:26:27 +08:00 |
|
chenxi
|
8ea8688321
|
侧边栏调整位置
|
2023-06-05 16:26:38 +08:00 |
|
xiekaidong
|
9a48380ba2
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-05 16:24:51 +08:00 |
|
xiekaidong
|
88042cfd50
|
音效容错
|
2023-06-05 16:24:40 +08:00 |
|
chenxi
|
9a169f666e
|
侧边栏优化
|
2023-06-05 16:24:28 +08:00 |
|
xiekaidong
|
74bf06ed0b
|
加一个GM快速查看棋盘
|
2023-06-05 16:13:42 +08:00 |
|
xiekaidong
|
431fb21513
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-05 11:05:20 +08:00 |
|
xiekaidong
|
f7a16c8b5c
|
每日挑战引导
|
2023-06-05 11:05:17 +08:00 |
|
CloudJ
|
aa04bc028b
|
编译
|
2023-06-05 10:58:59 +08:00 |
|
xiekaidong
|
120258758a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-05 10:46:41 +08:00 |
|
xiekaidong
|
e2e071c73d
|
技能选择规则优化
|
2023-06-05 10:46:37 +08:00 |
|
Fang
|
6c637656e5
|
编译
|
2023-06-05 10:43:13 +08:00 |
|
xiekaidong
|
9d25c123c5
|
bug修复
|
2023-06-05 10:37:15 +08:00 |
|
CloudJ
|
e1eedcd3fb
|
编译
|
2023-06-03 23:29:48 +08:00 |
|
xiekaidong
|
e6a28c8acd
|
修改bug，优化战斗流程逻辑
|
2023-06-03 19:12:33 +08:00 |
|
xiekaidong
|
a0ee5ae6f1
|
更改一下死亡召唤触发时机
|
2023-06-03 17:47:04 +08:00 |
|
xiekaidong
|
5d7a7b2ded
|
新增一个战斗用gm命令
|
2023-06-03 15:48:51 +08:00 |
|
xiekaidong
|
b60f9b1ca4
|
boss机制棋盘效果处理
|
2023-06-02 22:28:55 +08:00 |
|
CloudJ
|
30983ba637
|
编译
|
2023-06-02 20:35:37 +08:00 |
|
xiekaidong
|
ffcd0014c7
|
新增障碍物效果类型
|
2023-06-02 20:14:09 +08:00 |
|
Fang
|
efa1e1dd49
|
修复每日挑战boss模型重叠
|
2023-06-02 19:33:06 +08:00 |
|
xiekaidong
|
c65d52c8de
|
水泡动画
|
2023-06-02 19:02:18 +08:00 |
|