1035 Commits

Author SHA1 Message Date
xiekaidong
cdf3186a61 设置界面新增社区链接按钮 2023-07-11 15:46:31 +08:00
Fang
392134a777 碎片弹窗标题消失fix 2023-07-11 15:14:28 +08:00
Fang
eb54d58240 碎片副本奖励展示优化 2023-07-11 14:53:58 +08:00
xiekaidong
3ff2ce8651 bug修复 2023-07-11 11:43:05 +08:00
xiekaidong
23e7f5f465 更新配置 2023-07-11 11:12:02 +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
a2e84ce943 修改上报参数,bug修复 2023-07-11 10:21:05 +08:00
xiekaidong
1f204e3f0f 英雄试玩 2023-07-10 18:44:40 +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
9ffe0ff7cf 竞技场引导容错 2023-07-10 14:13:35 +08:00
xiekaidong
01d8ba6a49 木兰试玩 2023-07-10 12:00:46 +08:00
xiekaidong
c8e1980dac 编译lua 2023-07-07 17:20:00 +08:00
xiekaidong
07c8ef8648 Merge branch 'master' into dev
# Conflicts:
#	Assets/Editor/JenkinsAdapter.cs
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
2023-07-07 17:14:54 +08:00
xiekaidong
3197d7cc7d 更新配置 2023-07-07 16:53:40 +08:00
xiekaidong
c79d0eebae 二确认弹窗修复 2023-07-07 16:10:14 +08:00
xiekaidong
ae12ce4101 更新配置 2023-07-07 16:06:18 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
8ea9ba537c 首包界面和登录界面 2023-07-07 15:48:54 +08:00
Fang
ab6800b4c2 编译 2023-07-07 15:41:04 +08:00
xiekaidong
3690362f81 审核模式 2023-07-07 14:27:02 +08:00
xiekaidong
4be894d995 Merge branch 'dev' into audit 2023-07-07 14:13:50 +08:00
xiekaidong
747b8a27ad 审核模式不显示竞技场礼包 2023-07-07 14:13:37 +08:00
xiekaidong
ceb1e50650 战斗技能tips 2023-07-07 12:07:05 +08:00
xiekaidong
698cf14607 技能提示 2023-07-07 12:00:37 +08:00
Fang
7e0c87de1a 竞技场挑战前判断阵容、超框 2023-07-07 11:55:27 +08:00
xiekaidong
1e461a0926 竞技场暂停界面可滑动 2023-07-07 11:44:02 +08:00
xiekaidong
145b72b1de 快捷切换多语言 2023-07-07 11:39:42 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
xiekaidong
6c5f93b97c 提审开关 2023-07-07 10:17:17 +08:00
xiekaidong
1dbededa96 加一行代码 2023-07-06 21:50:31 +08:00
Fang
90b1e8ed97 编译 2023-07-06 19:23:46 +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
xiekaidong
cce53a40a2 日志上报 2023-07-06 18:26:19 +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
2a64296093 bug修复 2023-07-06 17:29:14 +08:00
xiekaidong
f96c9a574a 网络模块优化,重连被拒绝后,后台静默重新登陆 2023-07-06 17:21:11 +08:00
Fang
8e5b9560ce 碎片界面标题修改 2023-07-06 17:08:22 +08:00
xiekaidong
f98da34bda 引导延迟 2023-07-06 14:44:48 +08:00
Fang
5dc4ee1b78 竞技场段位替图、战令文案替换 2023-07-06 14:42:54 +08:00
Fang
089dbee9ba 竞技场未上榜处理 2023-07-06 11:41:06 +08:00