jiaoyangna
|
e5cacccd8a
|
Merge branch 'china/dev-inner' into china/dev-c
|
2021-06-17 17:57:44 +08:00 |
jiaoyangna
|
687a9ea45d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-17 17:57:39 +08:00 |
jiaoyangna
|
4c1cd67e6e
|
Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner
|
2021-06-17 17:56:51 +08:00 |
ZhangBiao
|
a6f4c307b5
|
【惊喜礼盒】
|
2021-06-17 17:55:14 +08:00 |
ZhangBiao
|
9b6e14eeb1
|
【惊喜礼盒】完成!
|
2021-06-17 17:43:56 +08:00 |
jiaoyangna
|
5c09522231
|
Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner
|
2021-06-17 17:19:27 +08:00 |
jiaoyangna
|
4f115efb05
|
活动提交
|
2021-06-17 17:18:42 +08:00 |
ZhangBiao
|
87f3fa8f64
|
【惊喜礼盒】提交
|
2021-06-17 17:09:36 +08:00 |
JieLing
|
6e7189162b
|
【先遣服】配置文件是从包版本26开始的
|
2021-06-17 17:00:20 +08:00 |
gaoxin
|
ac7501a1d5
|
【战斗】修复群体性的免疫效果不会正常消失的问题
|
2021-06-17 16:01:48 +08:00 |
ZhangBiao
|
54bc0f2caa
|
【惊喜礼盒】提价
|
2021-06-17 15:26:10 +08:00 |
jiaoyangna
|
6f5cd1d44a
|
惊喜礼包推送
|
2021-06-17 15:21:22 +08:00 |
jiaoyangna
|
bc20fa57fc
|
惊喜礼包推送修改提交
|
2021-06-17 15:05:44 +08:00 |
jiaoyangna
|
b1e3d0a163
|
Merge branch '0功能/升星预览' into china/dev-c
|
2021-06-17 15:05:03 +08:00 |
gaoxin
|
87032a513a
|
【配置】无用配置文件删除
|
2021-06-17 11:45:11 +08:00 |
gaoxin
|
d06bdbadd1
|
【打包配置】修改商务服的打包分支
|
2021-06-17 11:21:05 +08:00 |
JieLing
|
29ff3e41f6
|
Merge branch 'china/local' into china/test
|
2021-06-17 11:17:55 +08:00 |
JieLing
|
0e8016e150
|
Merge branch 'china/dev' into china/local
|
2021-06-17 11:17:41 +08:00 |
gaoxin
|
0138a9576f
|
【打包工具】添加根据分支判断要打的包,添加灵动商务服配置
|
2021-06-17 11:16:11 +08:00 |
JieLing
|
50393845c5
|
Merge branch 'china/local' into china/test
|
2021-06-17 11:00:50 +08:00 |
JieLing
|
ac03e2e41d
|
Merge branch 'china/dev' into china/local
|
2021-06-17 11:00:08 +08:00 |
gaoxin
|
562b57db73
|
【场景】新增猕猴桃商务出包场景
|
2021-06-17 10:59:20 +08:00 |
gaoxin
|
23c17edfc7
|
【包配置】删除对喜扑的包的特殊处理
|
2021-06-17 10:43:39 +08:00 |
gaoxin
|
12bd0b64a1
|
Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-17 10:26:13 +08:00 |
zhangqiang
|
8f97c36580
|
【鸿蒙阵】共鸣是breakId 计算修改
|
2021-06-17 10:10:22 +08:00 |
JieLing
|
6431157671
|
Merge remote-tracking branch 'origin/gx/china/stream' into china/zf_test
|
2021-06-17 10:01:56 +08:00 |
JieLing
|
a9685687a3
|
Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test
|
2021-06-17 10:01:30 +08:00 |
gaoxin
|
b8f9d894d9
|
【登录】修复logo为空时显示默认logo的问题
|
2021-06-16 20:38:42 +08:00 |
ZhangBiao
|
814fb29c45
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-16 19:56:18 +08:00 |
ZhangBiao
|
0b4c5f3c8f
|
【惊喜礼盒】提交
|
2021-06-16 19:56:10 +08:00 |
gaoxin
|
4f28f777b9
|
【添加包配置说明文件】
|
2021-06-16 18:55:11 +08:00 |
JieLing
|
447025cd5a
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:47:22 +08:00 |
gaoxin
|
6bd67926e7
|
【包配置】优化登录界面的打开速度,添加登录界面视频背景配置字段
|
2021-06-16 18:46:46 +08:00 |
JieLing
|
18be3ba841
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:35:39 +08:00 |
gaoxin
|
3b68cd422f
|
【无用log】
|
2021-06-16 18:35:07 +08:00 |
JieLing
|
964c216ecc
|
Merge branch 'gx/china/stream' into china/zf_test
|
2021-06-16 18:33:49 +08:00 |
gaoxin
|
6cf9492d06
|
【优化更新界面显示】
|
2021-06-16 18:23:30 +08:00 |
jiaoyangna
|
9f2e0dbfd0
|
【ID1009503】 每日豪礼文字重新包装
|
2021-06-16 18:05:57 +08:00 |
gaoxin
|
c86cf619d0
|
【视频背景】尝试修复部分机型视频背景显示黑屏的问题
|
2021-06-16 17:30:54 +08:00 |
gaoxin
|
98b1518306
|
【添加stream配置】
|
2021-06-16 17:29:17 +08:00 |
jiaoyangna
|
27bfb84fb5
|
问号大小修改提交
|
2021-06-16 15:29:29 +08:00 |
jiaoyangna
|
0bfea18692
|
问号大小修改
|
2021-06-16 15:25:48 +08:00 |
jiaoyangna
|
a35b9d404b
|
数字修改提交
|
2021-06-16 15:14:36 +08:00 |
jiaoyangna
|
c5ecf50429
|
修改问号位置
|
2021-06-16 15:12:05 +08:00 |
zhangqiang
|
aa666a5158
|
【公会】带神印的成员信息报错
|
2021-06-16 14:50:19 +08:00 |
ZhangBiao
|
656c8b3359
|
【惊喜礼盒】提交
|
2021-06-16 11:59:52 +08:00 |
gaoxin
|
fbd02f1a29
|
【工具】热更和打包工具完成后自动提交
|
2021-06-16 11:47:07 +08:00 |
gaoxin
|
0814f45cfa
|
【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加
|
2021-06-16 11:47:00 +08:00 |
jiaoyangna
|
b83e8902d7
|
【ID1009368】
添加升星预览功能
|
2021-06-16 11:16:41 +08:00 |
zhangqiang
|
feb6480759
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-16 10:53:21 +08:00 |