xiekaidong
|
0b5670c7a4
|
每日挑战任务完成情况上报
|
2023-06-15 17:30:49 +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 |
|
xiekaidong
|
3e92da4286
|
界面处理
|
2023-06-13 10:20:17 +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 |
|
xiekaidong
|
c10a2e6b71
|
显示优化
|
2023-06-06 11:32:22 +08:00 |
|
Fang
|
a85373b5fb
|
编译
|
2023-06-06 10:40:02 +08:00 |
|
CloudJ
|
b46065772c
|
编译
|
2023-06-05 11:48:01 +08:00 |
|
Fang
|
6c637656e5
|
编译
|
2023-06-05 10:43:13 +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 |
|
Fang
|
5356a92634
|
功能解锁飞行动画
|
2023-06-02 18:36:05 +08:00 |
|
chenxi
|
9679058a5f
|
ab name
|
2023-06-01 20:42:28 +08:00 |
|
Fang
|
645d23fb74
|
编译
|
2023-05-31 14:42:15 +08:00 |
|
Fang
|
0b8904f47a
|
每日挑战界面调整、扣除次数修复
|
2023-05-31 10:27:09 +08:00 |
|
chenxi
|
a58c63a617
|
ab name
|
2023-05-30 21:15:29 +08:00 |
|
chenxi
|
2fbe01e673
|
每日挑战
|
2023-05-30 11:45:27 +08:00 |
|
xiekaidong
|
f4b1d70efa
|
boss的buff自动提示
|
2023-05-22 17:24:07 +08:00 |
|
chenxi
|
3b90d16d0c
|
编译
|
2023-05-18 15:40:48 +08:00 |
|
xiekaidong
|
6d19ff3c7c
|
宝箱显示
|
2023-05-17 20:18:34 +08:00 |
|
chenxi
|
1e6eac90fb
|
编译
|
2023-05-08 09:44:06 +08:00 |
|
chenxi
|
62b4039351
|
主城
|
2023-05-05 22:05:13 +08:00 |
|
chenxi
|
e81de3ea03
|
连击效果
|
2023-04-26 20:48:06 +08:00 |
|
xiekaidong
|
8ebcad8898
|
界面调整和gm修改
|
2023-04-26 18:25:25 +08:00 |
|
xiekaidong
|
131f058f60
|
主界面宝箱
|
2023-04-26 10:37:25 +08:00 |
|
xiekaidong
|
3196f8901f
|
进度条显示bug修复
|
2023-04-25 22:39:22 +08:00 |
|
xiekaidong
|
9801e68bf5
|
下边页签动效
|
2023-04-24 16:12:46 +08:00 |
|
xiekaidong
|
31950885ef
|
宝箱修改
|
2023-04-24 11:22:05 +08:00 |
|
xiekaidong
|
7cab14eba5
|
编译lua
|
2023-04-24 10:51:41 +08:00 |
|
xiekaidong
|
fd6eb94de4
|
bug和显示优化
|
2023-04-23 17:22:33 +08:00 |
|
xiekaidong
|
e24c1df8fb
|
bug修复
|
2023-04-23 15:57:59 +08:00 |
|
chenxi
|
1cf51cc739
|
资源处理和ab name
|
2023-04-21 22:55:50 +08:00 |
|
chenxi
|
5ba1ade099
|
编译
|
2023-04-21 14:22:34 +08:00 |
|
chenxi
|
62a3ba1905
|
红点
|
2023-04-21 11:57:11 +08:00 |
|
chenxi
|
18f974d5b8
|
主城箭头
|
2023-04-20 18:02:15 +08:00 |
|
chenxi
|
164ce095d4
|
编译
|
2023-04-19 15:37:19 +08:00 |
|
chenxi
|
07dd3631c4
|
编译
|
2023-04-16 23:06:53 +08:00 |
|
xiekaidong
|
10159333ea
|
战斗回合概念
|
2023-04-14 18:00:58 +08:00 |
|
chenxi
|
8c1ada2003
|
编译
|
2023-04-13 22:05:31 +08:00 |
|
chenxi
|
3d28196523
|
修复一些报错
|
2023-04-11 20:33:59 +08:00 |
|
chenxi
|
5c05e888c9
|
章节
|
2023-04-07 20:50:58 +08:00 |
|
chenxi
|
4809253845
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
# Assets/arts/textures/ui/common.meta
# Assets/arts/textures/ui/common/common_alpha.png.meta
# Assets/arts/textures/ui/common/common_arrow_3.png
# Assets/arts/textures/ui/common/common_arrow_3.png.meta
# Assets/arts/textures/ui/common/common_arrow_4.png
# Assets/arts/textures/ui/common/common_arrow_4.png.meta
# Assets/arts/textures/ui/common/common_bg_0.png.meta
# Assets/arts/textures/ui/common/common_bg_3.png
# Assets/arts/textures/ui/common/common_bg_3.png.meta
# Assets/arts/textures/ui/common/common_board_10.png
# Assets/arts/textures/ui/common/common_board_10.png.meta
# Assets/arts/textures/ui/common/common_board_6.png
# Assets/arts/textures/ui/common/common_board_6.png.meta
# Assets/arts/textures/ui/common/common_board_7.png
# Assets/arts/textures/ui/common/common_board_7.png.meta
# Assets/arts/textures/ui/common/common_btn_2.png
# Assets/arts/textures/ui/common/common_btn_2.png.meta
# Assets/arts/textures/ui/common/common_btn_3.png
# Assets/arts/textures/ui/common/common_btn_3.png.meta
# Assets/arts/textures/ui/common/common_check_1.png
# Assets/arts/textures/ui/common/common_check_1.png.meta
# Assets/arts/textures/ui/common/common_chest_1.png
# Assets/arts/textures/ui/common/common_chest_1.png.meta
# Assets/arts/textures/ui/common/common_dec_1.png
# Assets/arts/textures/ui/common/common_dec_1.png.meta
# Assets/arts/textures/ui/common/common_hp.png
# Assets/arts/textures/ui/common/common_hp.png.meta
# Assets/arts/textures/ui/common/common_inf.png
# Assets/arts/textures/ui/common/common_inf.png.meta
# Assets/arts/textures/ui/common/common_lock_2.png
# Assets/arts/textures/ui/common/common_lock_2.png.meta
# Assets/arts/textures/ui/common/common_progress_4.png
# Assets/arts/textures/ui/common/common_progress_4.png.meta
|
2023-04-07 15:27:09 +08:00 |
|
xiekaidong
|
87af2478d9
|
整理项目
|
2023-04-03 11:04:31 +08:00 |
|