chenxi
|
b51d130b3b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
# Assets/proto/protocol.bytes
|
2023-06-14 15:41:50 +08:00 |
|
chenxi
|
25534ecacb
|
编译
|
2023-06-14 15:40:09 +08:00 |
|
Fang
|
6ad7ea4135
|
编译
|
2023-06-14 14:54:11 +08:00 |
|
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
|
8e3ebe353d
|
英雄升级特效
|
2023-06-13 18:50:19 +08:00 |
|
chenxi
|
45cb348bfc
|
ios支付
|
2023-06-13 18:19:45 +08:00 |
|
xiekaidong
|
7e8b46effc
|
技能音效
|
2023-06-13 17:44:37 +08:00 |
|
xiekaidong
|
59f0cd755b
|
修改每日挑战战斗界面的任务入口
|
2023-06-13 15:25:06 +08:00 |
|
xiekaidong
|
80d3f8cb17
|
grideffect=6的处理
|
2023-06-13 15:08:42 +08:00 |
|
chenxi
|
04ab254222
|
编译
|
2023-06-13 15:06:57 +08:00 |
|
chenxi
|
25c4dcd4bd
|
编译
|
2023-06-13 14:38:38 +08:00 |
|
chenxi
|
14167e5736
|
金猪倒计时
|
2023-06-13 12:00:06 +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 |
|
chenxi
|
20aea655a1
|
支付转菊花
|
2023-06-12 22:19:42 +08:00 |
|
chenxi
|
e81eab8c4f
|
编译
|
2023-06-12 18:27:47 +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
|
0221c6c826
|
sdk参数
|
2023-06-09 19:02:30 +08:00 |
|
chenxi
|
819d3d3a34
|
编译
|
2023-06-09 17:23:42 +08:00 |
|
chenxi
|
13c49e1e6c
|
支付相关
|
2023-06-09 17:05:29 +08:00 |
|
chenxi
|
f2708125ec
|
编译
|
2023-06-09 11:48:33 +08:00 |
|
chenxi
|
92f0b087c9
|
编译
|
2023-06-08 21:38:54 +08:00 |
|
chenxi
|
ba0a25fde5
|
编译
|
2023-06-08 18:32:37 +08:00 |
|
chenxi
|
082c8e1547
|
Merge branch 'dev_20230608_hotupdate'
|
2023-06-08 17:08:44 +08:00 |
|
xiekaidong
|
4efa656afe
|
上报修复
|
2023-06-08 17:07:51 +08:00 |
|
chenxi
|
3c90febf45
|
多语言
|
2023-06-08 17:02:48 +08:00 |
|
xiekaidong
|
07a1ca566a
|
bug修复
|
2023-06-08 16:42:32 +08:00 |
|
chenxi
|
52ad339930
|
fix bug
|
2023-06-07 19:50:16 +08:00 |
|
chenxi
|
e44e390e88
|
编译
|
2023-06-06 21:13:13 +08:00 |
|
xiekaidong
|
8ccfae34f3
|
登陆界面复制账号
|
2023-06-06 21:06:13 +08:00 |
|
xiekaidong
|
de19bdfa8b
|
显示bug修复
|
2023-06-06 20:37:54 +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 |
|
CloudJ
|
4b7294b8ad
|
编译
|
2023-06-06 17:51:48 +08:00 |
|
Fang
|
49af10d8a9
|
战斗退出后显示主界面控制
|
2023-06-06 17:31:34 +08:00 |
|
CloudJ
|
a7756805cb
|
编译
|
2023-06-06 17:12:25 +08:00 |
|
xiekaidong
|
cb667f4e9c
|
bug修复
|
2023-06-06 16:45:39 +08:00 |
|
chenxi
|
3483961cc5
|
超过5秒提示网络断开连接
|
2023-06-06 15:30:54 +08:00 |
|
xiekaidong
|
f3c87a786f
|
修改上报
|
2023-06-06 15:25:51 +08:00 |
|
xiekaidong
|
77cd8d33ac
|
编译lua
|
2023-06-06 15:06:56 +08:00 |
|
xiekaidong
|
641afee2f7
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-06-06 14:13:10 +08:00 |
|
xiekaidong
|
ffcfe93299
|
切换波次时自动关闭buff弹窗
|
2023-06-06 14:13:07 +08:00 |
|
chenxi
|
29a6483899
|
编译
|
2023-06-06 12:01:23 +08:00 |
|