xiekaidong
|
e1120e654b
|
编译lua
|
2023-07-12 09:49:10 +08:00 |
|
xiekaidong
|
364d84ae09
|
Merge branch 'master' into dev_20230712
# Conflicts:
# Assets/lua/app/module/chapter/chapter_manager.lua.bytes
# Assets/lua/app/module/login/login_manager.lua.bytes
|
2023-07-12 09:48:12 +08:00 |
|
xiekaidong
|
6576bb731b
|
Merge branch 'dev_20230712' of http://git.juzugame.com/b6-client/b6-unity into dev_20230712
# Conflicts:
# Assets/lua/app/config/localization/localization_global_const.lua.bytes
# Assets/lua/app/config/strings/cn/global.lua.bytes
|
2023-07-11 15:46:43 +08:00 |
|
xiekaidong
|
cdf3186a61
|
设置界面新增社区链接按钮
|
2023-07-11 15:46:31 +08:00 |
|
Fang
|
eb54d58240
|
碎片副本奖励展示优化
|
2023-07-11 14:53:58 +08:00 |
|
xiekaidong
|
3ff2ce8651
|
bug修复
|
2023-07-11 11:43:05 +08:00 |
|
xiekaidong
|
85c0709552
|
Merge branch 'master' into dev_20230712
|
2023-07-11 11:05:55 +08:00 |
|
xiekaidong
|
678d368026
|
一些日志上报混乱修复
|
2023-07-11 11:02:33 +08:00 |
|
xiekaidong
|
36af88f4b5
|
更新配置
|
2023-07-10 18:30:47 +08:00 |
|
xiekaidong
|
cd0a81c0db
|
用户属性主线阵容上报信息错误修复，竞技场消耗上报增加段位id，竞技场结算上报增加胜负
|
2023-07-10 17:46:59 +08:00 |
|
xiekaidong
|
47a5446628
|
修改战斗伤害公式
|
2023-07-10 16:07:46 +08:00 |
|
xiekaidong
|
db42f547d4
|
竞技场引导优化
|
2023-07-10 15:47:10 +08:00 |
|
xiekaidong
|
1107b0831d
|
竞技场匹配阵容提示优化
|
2023-07-10 15:39:59 +08:00 |
|
xiekaidong
|
aec6bfc13c
|
竞技场引导问题修复
|
2023-07-10 15:22:56 +08:00 |
|
xiekaidong
|
01d8ba6a49
|
木兰试玩
|
2023-07-10 12:00:46 +08:00 |
|
xiekaidong
|
c8e1980dac
|
编译lua
|
2023-07-07 17:20:00 +08:00 |
|
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 |
|