puxuan
|
6ad37f7cc0
|
fix bug
|
2025-08-22 10:56:15 +08:00 |
|
puxuan
|
40ae361190
|
局内
|
2025-08-15 17:34:34 +08:00 |
|
puxuan
|
7db28b8e49
|
arena
|
2025-07-21 21:05:32 +08:00 |
|
Fang
|
a586912584
|
添加容错
|
2023-09-08 10:02:17 +08:00 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
Fang
|
30bf431636
|
编译
|
2023-08-11 16:03:20 +08:00 |
|
Fang
|
f821a6e6d1
|
显示fix
|
2023-07-24 21:39:48 +08:00 |
|
xiekaidong
|
a3ab8f74fa
|
副本引导
|
2023-07-24 17:10:59 +08:00 |
|
xiekaidong
|
61336e5d6c
|
编译lua
|
2023-07-19 20:24:13 +08:00 |
|
xiekaidong
|
a048f7d2d9
|
编译lua
|
2023-07-06 10:42:17 +08:00 |
|
Fang
|
4c45a9db92
|
修改头像框界面布局、竞技场赛季刷新fix等
|
2023-07-05 17:49:39 +08:00 |
|
Fang
|
1d337ed62f
|
显示修复
|
2023-07-05 15:56:46 +08:00 |
|
Fang
|
0767c6eae5
|
编译
|
2023-07-05 15:04:42 +08:00 |
|
Fang
|
48293f54c1
|
竞技场宝箱功能补全
|
2023-07-05 14:54:34 +08:00 |
|
xiekaidong
|
2ce21cba6d
|
连击提示
|
2023-07-05 11:23:19 +08:00 |
|
Fang
|
7000dff1bb
|
竞技场fix
|
2023-07-05 10:52:36 +08:00 |
|
Fang
|
91efb4bf35
|
fix and 替图
|
2023-07-04 18:34:41 +08:00 |
|
Fang
|
829a6e65b0
|
fix
|
2023-07-04 15:15:36 +08:00 |
|
Fang
|
efe355a0c4
|
完善细节
|
2023-07-03 18:35:49 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
Fang
|
0e7f765ca2
|
fix
|
2023-07-03 09:51:15 +08:00 |
|
xiekaidong
|
f7c7f3ad27
|
bug修复
|
2023-06-30 17:54:39 +08:00 |
|
xiekaidong
|
4aaaf714bd
|
竞技场敌方自动战斗
|
2023-06-29 20:52:39 +08:00 |
|
Fang
|
d275c58ad4
|
头像昵称
|
2023-06-19 10:57:28 +08:00 |
|
chenxi
|
3f855b2357
|
界面调整
|
2023-06-16 17:36:57 +08:00 |
|
xiekaidong
|
7f47ebdfd0
|
修改显示
|
2023-06-16 11:34:21 +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 |
|
xiekaidong
|
de19bdfa8b
|
显示bug修复
|
2023-06-06 20:37:54 +08:00 |
|
Fang
|
bb89a17fc4
|
编译
|
2023-06-06 10:49:02 +08:00 |
|
CloudJ
|
ade6fd169a
|
编译
|
2023-06-06 10:22:05 +08:00 |
|
chenxi
|
312e1d66e9
|
编译
|
2023-06-05 19:09:06 +08:00 |
|
Fang
|
123128ce1f
|
结算界面金猪动画
|
2023-06-05 18:30:16 +08:00 |
|
Fang
|
0216eabf3b
|
战斗结算界面动画
|
2023-06-05 17:17:26 +08:00 |
|
CloudJ
|
ab33223ea6
|
编译
|
2023-06-05 14:10:56 +08:00 |
|
chenxi
|
7389ba8509
|
只有主线战斗结算界面显示金猪
|
2023-06-02 12:12:09 +08:00 |
|
xiekaidong
|
d391f68779
|
显示问题
|
2023-05-31 14:30:41 +08:00 |
|
chenxi
|
579515ae74
|
编译
|
2023-05-30 19:01:38 +08:00 |
|
chenxi
|
165eff0164
|
金猪和邮件
|
2023-05-23 17:05:47 +08:00 |
|
xiekaidong
|
fff1c9260e
|
宝箱
|
2023-05-17 19:20:18 +08:00 |
|
chenxi
|
6c3bf12de0
|
结算界面
|
2023-04-26 16:59:21 +08:00 |
|
chenxi
|
4a9625302d
|
结算界面
|
2023-04-26 16:01:57 +08:00 |
|
chenxi
|
9f97e78cf7
|
胜利失败音效
|
2023-04-25 15:06:05 +08:00 |
|
xiekaidong
|
01547cfa77
|
编译lua
|
2023-04-24 15:10:56 +08:00 |
|
xiekaidong
|
f270facc6a
|
技能图标变形
|
2023-04-18 21:03:40 +08:00 |
|
chenxi
|
07dd3631c4
|
编译
|
2023-04-16 23:06:53 +08:00 |
|
xiekaidong
|
10159333ea
|
战斗回合概念
|
2023-04-14 18:00: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 |
|