433 Commits

Author SHA1 Message Date
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
Fang
7e0c87de1a 竞技场挑战前判断阵容、超框 2023-07-07 11:55:27 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
xiekaidong
92b4bb8c23 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-06 18:42:52 +08:00
xiekaidong
50f4e6c871 bug修复 2023-07-06 18:42:49 +08:00
Fang
a8574eef7d 掉段显示fix 2023-07-06 18:31:16 +08:00
Fang
951cfb2d92 成长礼包触发方式修改 2023-07-06 18:21:15 +08:00
xiekaidong
939b0c4651 竞技场日志上报 2023-07-06 18:09:03 +08:00
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
xiekaidong
f96c9a574a 网络模块优化,重连被拒绝后,后台静默重新登陆 2023-07-06 17:21:11 +08:00
xiekaidong
f98da34bda 引导延迟 2023-07-06 14:44:48 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
xiekaidong
3405a1b1ae Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 17:55:15 +08:00
xiekaidong
7bedad109d bug修复 2023-07-05 17:55:12 +08:00
Fang
4c45a9db92 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:49:39 +08:00
xiekaidong
b8e057fab3 英雄面板属性加密 2023-07-05 17:25:46 +08:00
xiekaidong
6ace7d8845 竞技场引导 2023-07-05 15:47:05 +08:00
xiekaidong
b96a9aca6b 竞技场开启引导 2023-07-05 15:46:03 +08:00
xiekaidong
29c5bb9021 更新配置 2023-07-05 15:36:23 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
Fang
48293f54c1 竞技场宝箱功能补全 2023-07-05 14:54:34 +08:00
xiekaidong
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +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
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +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
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
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
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
c4dabad5c5 编译 2023-07-03 14:16:50 +08:00
xiekaidong
d4828dc537 评价弹窗 2023-07-03 11:34:53 +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
03cce7d521 战斗处理 2023-06-30 16:04:26 +08:00
xiekaidong
826cdd1c32 战斗系数 2023-06-29 21:57:26 +08:00
xiekaidong
cbca95b111 战斗bug修复 2023-06-29 21:25:44 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
d9e859946e bug修复 2023-06-29 14:43:16 +08:00
xiekaidong
46d7ebb42e 调整格子效果生效顺序 2023-06-21 16:03:04 +08:00
chenxi
8c7642c41d 编译 2023-06-21 11:18:38 +08:00
Fang
32364f7c4d 超框 2023-06-20 20:20:23 +08:00