Commit Graph

7013 Commits (4ee928c2d4d3be3140fc9098695e8e348e720148)
 

Author SHA1 Message Date
ZhangBiao 07a877bd4c 【牛气冲天】红点修改 2021-06-03 18:19:12 +08:00
gaoxin ec6404419d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:10:20 +08:00
gaoxin 02f02206ca 【循环滚动】修复快速切换报错 2021-06-03 18:10:15 +08:00
jiaoyangna 361a9b67ae Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:00:49 +08:00
jiaoyangna 6777d87a72 图鉴隐藏皮肤 2021-06-03 18:00:28 +08:00
ZhangBiao 1d697c5370 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 17:59:27 +08:00
ZhangBiao d19325ce7b 【公会红点】报错修改 2021-06-03 17:59:14 +08:00
zhangqiang 7a80a23435 【化虚坛】红点加功能开启判断 2021-06-03 17:56:58 +08:00
gaoxin e77c978e6e 【闪屏】删除猕猴桃 2021-06-03 17:46:38 +08:00
jiaoyangna 1400ebaddb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 17:43:24 +08:00
jiaoyangna b9336dbe7f 去掉对话背景 2021-06-03 17:43:07 +08:00
jiaoyangna 2a6fba6073 【无尽副本】地图跳转到商店。副本重置期间,还可以返回地图 2021-06-03 17:24:17 +08:00
gaoxin 44303e89d3 【音频】替换 2021-06-03 17:23:40 +08:00
jiaoyangna ab694c89f7 关闭解锁章节挂机界面 2021-06-03 17:09:30 +08:00
jiaoyangna fd6e00c757 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 16:51:55 +08:00
jiaoyangna dd0518b9a0 引导顺序修改 2021-06-03 16:51:36 +08:00
gaoxin 280ec50e34 【登录】报错 2021-06-03 16:07:38 +08:00
wangzhenxing 4644de33a5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 15:52:33 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
gaoxin adeeccdc84 【登录界面】特效只在特殊背景下显示 2021-06-03 15:44:28 +08:00
gaoxin 154cab45a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 15:08:10 +08:00
gaoxin 0f47dae77e 【资源】物品资源修改 2021-06-03 15:07:45 +08:00
jiaoyangna d92b951c3c 无尽任务进度修改 2021-06-03 15:01:48 +08:00
gaoxin 2f0208ec73 【工具】添加c-v2测试包配置 2021-06-03 14:39:36 +08:00
JieLing 44901a5410 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 14:37:36 +08:00
JieLing 1f5256afdf 【工具】打包工具优化 2021-06-03 14:37:28 +08:00
jiaoyangna fba66fae7e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 14:31:30 +08:00
jiaoyangna 66954a3f65 礼包特效 2021-06-03 14:31:10 +08:00
JieLing f50717ce27 删除视频文件加 2021-06-03 14:23:25 +08:00
gaoxin 6268827039 【战斗】首领关卡跳过功能打开 2021-06-03 14:19:45 +08:00
gaoxin 39fd13b7dc 【称号】主城他人称号特效不显示的问题 2021-06-03 14:01:39 +08:00
gaoxin 51eb62af65 【资源】新增一批功能提示按钮 2021-06-03 13:57:40 +08:00
gaoxin 9bd23a74cf 【登录视频】优化加载过程 2021-06-03 13:52:55 +08:00
JieLing 2024f8173e 【添加播放视频的配置】 2021-06-03 12:32:25 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
jiaoyangna 7c0a3dc57b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:41:28 +08:00
jiaoyangna 461f481bd8 配音提交 2021-06-03 11:41:08 +08:00
wangzhenxing 4f3aa3016a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:24:11 +08:00
wangzhenxing 200e48ed73 [称号]=====称号高度设置 2021-06-03 11:23:05 +08:00
gaoxin b27e2b8fb0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:21:04 +08:00
gaoxin 11d7cc3e89 【关卡】介绍文字修改 2021-06-03 11:20:53 +08:00
gaoxin b7f92e6db3 Merge branch 'china/dev' into china/dev-c 2021-06-03 11:08:40 +08:00
jiaoyangna 5e846c29f6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:00:11 +08:00
jiaoyangna 9b13236cfc 添加限制皮肤显示 2021-06-03 10:59:54 +08:00
gaoxin e8421f8223 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 10:43:10 +08:00
gaoxin 9e1d0b6bb7 【资源】新头像资源替换 2021-06-03 10:42:59 +08:00
jiaoyangna 9e2c3f60ac Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 10:40:47 +08:00
jiaoyangna 8e2feb0cd9 图片提交 2021-06-03 10:40:22 +08:00
gaoxin c9f17c4883 【登录视频】优化显示 2021-06-03 10:39:25 +08:00
jiaoyangna e50b59d005 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 10:39:21 +08:00