xiekaidong
|
fe19b35f7d
|
更新配置
|
2023-06-16 10:09:59 +08:00 |
|
xiekaidong
|
0b5670c7a4
|
每日挑战任务完成情况上报
|
2023-06-15 17:30:49 +08:00 |
|
xiekaidong
|
402aaa1ad1
|
副本开启引导触发、神秘宝箱开启音效
|
2023-06-15 15:33:09 +08:00 |
|
chenxi
|
7a141820b4
|
merge
|
2023-06-14 15:43:17 +08:00 |
|
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 |
|
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 |
|
chenxi
|
e86d257330
|
merge
|
2023-06-13 10:45:07 +08:00 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +08:00 |
|
chenxi
|
e81eab8c4f
|
编译
|
2023-06-12 18:27:47 +08:00 |
|
chenxi
|
92f0b087c9
|
编译
|
2023-06-08 21:38:54 +08:00 |
|
chenxi
|
ba0a25fde5
|
编译
|
2023-06-08 18:32:37 +08:00 |
|
chenxi
|
52ad339930
|
fix bug
|
2023-06-07 19:50:16 +08:00 |
|
xiekaidong
|
a0f67c414a
|
主界面关卡宝箱领取显示bug修复
|
2023-06-07 10:31:24 +08:00 |
|
Fang
|
49af10d8a9
|
战斗退出后显示主界面控制
|
2023-06-06 17:31:34 +08:00 |
|
CloudJ
|
a7756805cb
|
编译
|
2023-06-06 17:12:25 +08:00 |
|
xiekaidong
|
247f64e371
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/lua/app/common/audio_manager.lua.bytes
|
2023-06-06 11:32:34 +08:00 |
|
xiekaidong
|
c10a2e6b71
|
显示优化
|
2023-06-06 11:32:22 +08:00 |
|
chenxi
|
f91872672a
|
音效和ab
|
2023-06-06 11:30:15 +08:00 |
|
Fang
|
a85373b5fb
|
编译
|
2023-06-06 10:40:02 +08:00 |
|
CloudJ
|
ade6fd169a
|
编译
|
2023-06-06 10:22:05 +08:00 |
|
chenxi
|
0e93f635ba
|
红点位置
|
2023-06-05 20:41:57 +08:00 |
|
chenxi
|
312e1d66e9
|
编译
|
2023-06-05 19:09:06 +08:00 |
|
CloudJ
|
958822d6a2
|
编译
|
2023-06-05 17:25:21 +08:00 |
|
chenxi
|
9a169f666e
|
侧边栏优化
|
2023-06-05 16:24:28 +08:00 |
|
CloudJ
|
ab33223ea6
|
编译
|
2023-06-05 14:10:56 +08:00 |
|
CloudJ
|
b46065772c
|
编译
|
2023-06-05 11:48:01 +08:00 |
|
xiekaidong
|
f7a16c8b5c
|
每日挑战引导
|
2023-06-05 11:05:17 +08:00 |
|
Fang
|
6c637656e5
|
编译
|
2023-06-05 10:43:13 +08:00 |
|
CloudJ
|
e1eedcd3fb
|
编译
|
2023-06-03 23:29:48 +08:00 |
|
CloudJ
|
85d7f77f7c
|
首充侧边栏替换
|
2023-06-03 22:56:16 +08:00 |
|
chenxi
|
1bf9102d37
|
金猪spine和英雄位置
|
2023-06-03 11:59:07 +08:00 |
|
chenxi
|
52949c0c81
|
货币顺序调整
|
2023-06-02 21:31:00 +08:00 |
|
CloudJ
|
30388af01b
|
编译
|
2023-06-02 20:26:57 +08:00 |
|
CloudJ
|
3b8bf3106a
|
编译
|
2023-06-02 19:59:29 +08:00 |
|
Fang
|
efa1e1dd49
|
修复每日挑战boss模型重叠
|
2023-06-02 19:33:06 +08:00 |
|
CloudJ
|
03424f4786
|
编译
|
2023-06-02 18:43:49 +08:00 |
|
Fang
|
5356a92634
|
功能解锁飞行动画
|
2023-06-02 18:36:05 +08:00 |
|
CloudJ
|
a1b9dcbf2e
|
替换一波ui
|
2023-06-01 20:47:43 +08:00 |
|
chenxi
|
9679058a5f
|
ab name
|
2023-06-01 20:42:28 +08:00 |
|
chenxi
|
706f50f93c
|
编译
|
2023-06-01 20:39:23 +08:00 |
|
chenxi
|
0344f33f9e
|
侧边栏
|
2023-06-01 15:36:58 +08:00 |
|
chenxi
|
3e3d1670f1
|
侧边栏spine
|
2023-06-01 15:05:35 +08:00 |
|
Fang
|
441c8a1b90
|
报错fix
|
2023-06-01 14:38:58 +08:00 |
|
chenxi
|
f6a509c434
|
成就spine
|
2023-06-01 11:59:50 +08:00 |
|
Fang
|
2ccddd2731
|
spine动画报错fix
|
2023-06-01 11:47:35 +08:00 |
|
Fang
|
5727d67a28
|
主界面成长礼包图标动画添加
|
2023-06-01 11:12:18 +08:00 |
|
chenxi
|
6d8fd7bf5e
|
功能解锁图标
|
2023-05-31 20:55:01 +08:00 |
|
Fang
|
c5e4e9e4a9
|
主界面按钮切换动画替换
|
2023-05-31 17:57:20 +08:00 |
|
Fang
|
645d23fb74
|
编译
|
2023-05-31 14:42:15 +08:00 |
|
xiekaidong
|
0fc01c78b6
|
战斗相关bug修复
|
2023-05-31 14:24:15 +08:00 |
|