zhangpengfei
|
270a11cbc1
|
连击动画增加
|
2023-07-05 10:31:20 +08:00 |
|
CloudJ
|
830e5633f4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-07-05 10:29:03 +08:00 |
|
CloudJ
|
466cbd7a8d
|
thai字体
|
2023-07-05 10:28:57 +08:00 |
|
xiekaidong
|
6f2edceb71
|
显示问题
|
2023-07-05 10:21:46 +08:00 |
|
CloudJ
|
6e799005ad
|
thai
|
2023-07-05 10:20:51 +08:00 |
|
xiekaidong
|
c5ec2e1853
|
竞技场任务
|
2023-07-05 10:16:00 +08:00 |
|
xiekaidong
|
ca456f4bbe
|
bug修复
|
2023-07-04 20:21:48 +08:00 |
|
xiekaidong
|
0320ef81bd
|
prefab资源检查，更新字体
|
2023-07-04 20:16:20 +08:00 |
|
xiekaidong
|
41e7e66d01
|
prefab资源检查，更新字体
|
2023-07-04 20:16:01 +08:00 |
|
xiekaidong
|
4f0174813a
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/arts/atlas/ui/battle.asset
|
2023-07-04 20:13:58 +08:00 |
|
xiekaidong
|
1acaec8748
|
竞技场波次显示
|
2023-07-04 20:13:44 +08:00 |
|
Fang
|
98a14c54c2
|
段位图标重叠fix
|
2023-07-04 18:50:44 +08:00 |
|
Fang
|
91efb4bf35
|
fix and 替图
|
2023-07-04 18:34:41 +08:00 |
|
xiekaidong
|
cc0b2c05f8
|
战斗速度
|
2023-07-04 18:25:20 +08:00 |
|
xiekaidong
|
f660bfe4e7
|
客服红点
|
2023-07-04 18:15:04 +08:00 |
|
xiekaidong
|
3c66b5c3da
|
取消连线
|
2023-07-04 18:05:41 +08:00 |
|
xiekaidong
|
c4b290c735
|
临时处理一下
|
2023-07-04 15:52:07 +08:00 |
|
xiekaidong
|
2f01e53cba
|
资源问题
|
2023-07-04 15:41:12 +08:00 |
|
xiekaidong
|
c3789374c6
|
更新配置
|
2023-07-04 15:38:28 +08:00 |
|
xiekaidong
|
83b8dbe82d
|
Merge branch 'dev' into arena
# Conflicts:
# Assets/arts/atlas/ui/common.spriteatlas
# Assets/lua/app/common/bi_report.lua.bytes
# Assets/lua/app/common/data_manager.lua.bytes
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
# Assets/lua/app/module/chapter/chapter_manager.lua.bytes
# Assets/lua/app/proto/proto_msg_type.lua.bytes
# Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
# Assets/lua/app/userdata/hero/hero_data.lua.bytes
# Assets/proto/protocol.bytes
|
2023-07-04 15:33:45 +08:00 |
|
Fang
|
47fa64a007
|
中途退出不重置对手
|
2023-07-04 15:25:06 +08:00 |
|
Fang
|
829a6e65b0
|
fix
|
2023-07-04 15:15:36 +08:00 |
|
xiekaidong
|
c6bd34ace8
|
竞技场暂停界面
|
2023-07-04 15:06:20 +08:00 |
|
xiekaidong
|
d2a75b56d1
|
竞技场节奏调整
|
2023-07-04 10:55:31 +08:00 |
|
xiekaidong
|
2867cae558
|
客服红点
|
2023-07-04 10:42:37 +08:00 |
|
xiekaidong
|
efb2fc57ba
|
竞技场弹窗礼包
|
2023-07-03 20:02:46 +08:00 |
|
xiekaidong
|
5f4f9df282
|
Merge branch 'arena' of http://git.juzugame.com/b6-client/b6-unity into arena
# Conflicts:
# Assets/prefabs/ui/main_city/main_comp.prefab
|
2023-07-03 20:01:48 +08:00 |
|
xiekaidong
|
246783796b
|
竞技场弹窗礼包
|
2023-07-03 19:58:15 +08:00 |
|
CloudJ
|
ca2233e59a
|
替换战令图标
|
2023-07-03 19:19:12 +08:00 |
|
Fang
|
efe355a0c4
|
完善细节
|
2023-07-03 18:35:49 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
xiekaidong
|
680eeac913
|
更新pb
|
2023-07-03 16:23:27 +08:00 |
|
xiekaidong
|
b7fb8bff59
|
评价弹窗
|
2023-07-03 15:57:42 +08:00 |
|
CloudJ
|
2fe1593610
|
banner
|
2023-07-03 15:03:14 +08:00 |
|
xiekaidong
|
ae9b933f0c
|
google支付问题
|
2023-07-03 14:25:26 +08:00 |
|
Fang
|
c4dabad5c5
|
编译
|
2023-07-03 14:16:50 +08:00 |
|
Fang
|
813af1dff1
|
替图
|
2023-07-03 14:15:22 +08:00 |
|
xiekaidong
|
d4828dc537
|
评价弹窗
|
2023-07-03 11:34:53 +08:00 |
|
CloudJ
|
4adea4f216
|
更换战令图片
|
2023-07-03 10:28:11 +08:00 |
|
xiekaidong
|
6df7c9294f
|
英雄红点优化
|
2023-07-03 10:06:20 +08:00 |
|
Fang
|
0e7f765ca2
|
fix
|
2023-07-03 09:51:15 +08:00 |
|
Fang
|
f25b6ceb6c
|
fix
|
2023-06-30 18:46:11 +08:00 |
|
xiekaidong
|
f7c7f3ad27
|
bug修复
|
2023-06-30 17:54:39 +08:00 |
|
Fang
|
f8a386d933
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:29 +08:00 |
|
xiekaidong
|
8e804732b5
|
替换资源
|
2023-06-30 16:10:57 +08:00 |
|
xiekaidong
|
03cce7d521
|
战斗处理
|
2023-06-30 16:04:26 +08:00 |
|
xiekaidong
|
c2a5538386
|
战斗处理
|
2023-06-30 16:04:06 +08:00 |
|
xiekaidong
|
ad57cef6ea
|
竞技场节奏调整
|
2023-06-30 14:46:02 +08:00 |
|
xiekaidong
|
826cdd1c32
|
战斗系数
|
2023-06-29 21:57:26 +08:00 |
|
xiekaidong
|
cbca95b111
|
战斗bug修复
|
2023-06-29 21:25:44 +08:00 |
|