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 |
gaoxin
|
c86cf619d0
|
【视频背景】尝试修复部分机型视频背景显示黑屏的问题
|
2021-06-16 17:30:54 +08:00 |
gaoxin
|
98b1518306
|
【添加stream配置】
|
2021-06-16 17:29:17 +08:00 |
zhangqiang
|
feb6480759
|
【章节剧情】点击跳过没有返回挂机界面
|
2021-06-16 10:53:21 +08:00 |
gaoxin
|
488f1e8af0
|
【stream】外部资源添加
|
2021-06-16 10:48:53 +08:00 |
JieLing
|
b7e78d9d5f
|
Revert Revert "【包配置】将登录图配置放到streaming文件夹"
|
2021-06-16 10:44:12 +08:00 |
gaoxin
|
46c1fb1070
|
【森罗】修复转盘游戏点击报错
|
2021-06-11 20:40:10 +08:00 |
gaoxin
|
eb27240907
|
【热更】修复草花cdn报错
|
2021-06-11 19:26:20 +08:00 |
gaoxin
|
57ece39059
|
【热更】添加草花和灵动专服的配置
|
2021-06-11 18:28:32 +08:00 |
gaoxin
|
8df099eabc
|
【资源】草花loading图替换
|
2021-06-11 18:28:05 +08:00 |
gaoxin
|
20dd0067d3
|
【资源】喜扑登录背景图替换
|
2021-06-11 16:11:01 +08:00 |
JieLing
|
8c161a0ddd
|
Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test
|
2021-06-11 15:43:25 +08:00 |
ZhangBiao
|
4edff2eee8
|
【升级限量礼包】无剩余礼包逻辑缺失修复
(cherry picked from commit ca9a0199b7 )
|
2021-06-11 14:10:10 +08:00 |
gaoxin
|
3ba5186b7b
|
【热更】没有更新 files文件
|
2021-06-11 13:19:22 +08:00 |
gaoxin
|
9ec33b5c6d
|
【热更】添加测试服和喜扑的配置
|
2021-06-11 13:04:29 +08:00 |
gaoxin
|
41af3c5db2
|
【热更新工具】
|
2021-06-11 13:04:22 +08:00 |
wangzhenxing
|
588ca169c9
|
[战斗]======被动200去掉注释
|
2021-06-11 11:51:52 +08:00 |
gaoxin
|
06875b8986
|
【包配置】喜扑多渠道处理
|
2021-06-11 08:58:15 +08:00 |
gaoxin
|
28c7d285a0
|
Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7 .
|
2021-06-11 02:36:08 +08:00 |
gaoxin
|
03d56901d7
|
【包配置】将登录图配置放到streaming文件夹
|
2021-06-11 01:48:39 +08:00 |
gaoxin
|
77acfd6bcd
|
【登录】版号信息走表配置
|
2021-06-11 01:45:09 +08:00 |
gaoxin
|
24ccf53511
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 23:03:13 +08:00 |
gaoxin
|
874feefbb5
|
【version】灵动专服测试
|
2021-06-10 23:03:00 +08:00 |
jiaoyangna
|
e764f74e6d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 23:01:07 +08:00 |
jiaoyangna
|
65860bb337
|
删除剧情对话挂机地图音效
|
2021-06-10 22:59:26 +08:00 |
gaoxin
|
4ee928c2d4
|
Merge remote-tracking branch 'origin/china/zf_test' into china/dev-c
|
2021-06-10 22:56:18 +08:00 |
JieLing
|
0f0ba0dfc2
|
【包配置】灵动正式服数数appid修改
|
2021-06-10 22:53:46 +08:00 |
JieLing
|
530374e00b
|
【资源】循环引用资源优化
|
2021-06-10 22:53:11 +08:00 |
jiaoyangna
|
b76f517cbb
|
[战斗]===============被动200修改 同阵营这个被动只会触发一次
|
2021-06-10 22:08:51 +08:00 |
wangzhenxing
|
4165e6acd5
|
【战斗】=======注释之前被动200修改
|
2021-06-10 22:02:35 +08:00 |
wangzhenxing
|
77121e01e3
|
[战斗]=========被动200 同一个阵营如果有多个200被动 只会生效一个
|
2021-06-10 21:57:00 +08:00 |
jiaoyangna
|
83553d8aef
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 20:17:03 +08:00 |
jiaoyangna
|
04633b4ece
|
无尽副本快速返回主城报错
|
2021-06-10 20:16:44 +08:00 |
zhangqiang
|
23f90ccf52
|
【线上】【鸿蒙阵】共鸣装备无法卸下,弹服务器开小差
|
2021-06-10 18:37:16 +08:00 |
JieLing
|
2e798c6888
|
【资源名重复】
|
2021-06-10 18:24:59 +08:00 |
zhangqiang
|
5d57464da8
|
【森罗音效】福星高照老头的音效,界面关闭不停
|
2021-06-10 17:56:07 +08:00 |
jiaoyangna
|
529067bb2f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 17:44:20 +08:00 |
jiaoyangna
|
e087d4c57c
|
ID1016424】
【无尽副本】反复从无尽地图返回主城报错
|
2021-06-10 17:43:52 +08:00 |
zhangqiang
|
4915842ee2
|
【山河社稷图】奖励排序
|
2021-06-10 17:05:51 +08:00 |
jiaoyangna
|
ddd0ece70b
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:38:43 +08:00 |
jiaoyangna
|
819278dd3d
|
【ID1016436】
【无尽副本】战斗结算界面有经验
|
2021-06-10 16:38:19 +08:00 |
gaoxin
|
fbe1acdf43
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:38:18 +08:00 |
gaoxin
|
8494dd02d7
|
【立绘错位】尝试修复神将卡牌上有时会出现立绘错位
|
2021-06-10 16:37:44 +08:00 |
zhangqiang
|
3506d2bb2c
|
【页签图标替换】局部 + 修行提示文字修改
|
2021-06-10 16:33:43 +08:00 |
jiaoyangna
|
8115705d1a
|
【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
|
2021-06-10 16:30:49 +08:00 |
gaoxin
|
0458ee7bf7
|
【debug】修复部分报错导致报错的问题。。。
|
2021-06-10 16:11:02 +08:00 |
gaoxin
|
4382e822e0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-10 16:10:18 +08:00 |