Commit Graph

6166 Commits (a96a61ec774b57be3c25d1b9fe5f3e614bcec708)

Author SHA1 Message Date
ZhangBiao 326b790bcf 【抽卡】界面报错修改 2021-06-03 19:44:39 +08:00
zhangqiang 1933ffa809 【神将升级】满级还显示升级按钮 2021-06-03 19:38:22 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
gaoxin fb6338de41 【挂机】修复伤害数字不消失 2021-06-03 19:10:41 +08:00
gaoxin 5d9224bc72 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:51:11 +08:00
gaoxin 45351466ed 【log】删除一些无用log 2021-06-03 18:50:58 +08:00
jiaoyangna b758c30f09 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:47:14 +08:00
jiaoyangna b27430089a 【神将图鉴】猪八戒首次打开界面显示错误,报错(非必现) 2021-06-03 18:46:49 +08:00
gaoxin 092ab0e348 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:54 +08:00
gaoxin 327efb10d0 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:26 +08:00
ZhangBiao 46bdf8c271 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:19:23 +08:00
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
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
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
jiaoyangna eea172a5f6 特效层级修改 2021-06-03 10:38:37 +08:00
gaoxin 7273dce8a1 【登录视频】修改视频显示的位置 2021-06-03 10:36:11 +08:00
jiaoyangna 3c3ab0a8b8 图片修改提交 2021-06-03 10:06:24 +08:00
gaoxin 38d8d83dcd 【登录视频】从远端加载 2021-06-03 08:38:33 +08:00
gaoxin 865051dfb1 【资源】法宝资源优化 2021-06-02 21:46:12 +08:00
gaoxin 68b865c000 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:40:26 +08:00
gaoxin a61cd973b6 【立绘】优化 2021-06-02 21:40:22 +08:00
jiaoyangna ff531c4d4b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:32:40 +08:00
jiaoyangna d4cea59040 剧情跳过修改提交 2021-06-02 21:32:23 +08:00
wangzhenxing 232630b130 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:29:50 +08:00
wangzhenxing 5bd6093c18 [称号]====新称号shader 修改 2021-06-02 21:29:26 +08:00
gaoxin 79c20ee090 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:18:30 +08:00
gaoxin 5265470298 【音效】新增人物音效 2021-06-02 21:18:19 +08:00
jiaoyangna 138ab211e6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:16:58 +08:00
jiaoyangna ac3513e05a 无尽红点修改提交 2021-06-02 21:15:56 +08:00
gaoxin c5f60a10fe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:14:41 +08:00
gaoxin 23fb18745f 【立绘】资源优化 2021-06-02 21:14:24 +08:00
wangzhenxing 21492a76af Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:08:07 +08:00
gaoxin 3dd3af7ade Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:07:24 +08:00
wangzhenxing 5cf037f6da [称号]=======聊天界面新称号显示修改 2021-06-02 21:07:02 +08:00
gaoxin c1ba528e09 【打包配置】添加视频文件夹 2021-06-02 21:06:58 +08:00
ZhangBiao 013a2b4951 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:04:53 +08:00
ZhangBiao de30eb3499 【登陆界面】视频卸载判空 2021-06-02 21:04:45 +08:00
jiaoyangna b82347e7eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:59:26 +08:00
jiaoyangna 2f9b8de4db 无尽编队修改提交 2021-06-02 20:59:02 +08:00
gaoxin d65a7fd11a 【称号】修复地图称号不显示 2021-06-02 20:53:49 +08:00
gaoxin f8931146a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:52:58 +08:00
gaoxin 1856d1003b 【立绘】精卫立绘修改 2021-06-02 20:52:54 +08:00
zhangqiang 935bae0f1c 【无尽副本】添加帮助和商店入口 2021-06-02 20:33:30 +08:00
gaoxin d65ec0fe2a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:26:02 +08:00
gaoxin 4d757a84d8 【资源】添加逍遥游预告icon 2021-06-02 20:25:50 +08:00
ZhangBiao a846715e1a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:25:30 +08:00
ZhangBiao ff79cf980c 【首充】报错修改 2021-06-02 20:25:20 +08:00
jiaoyangna 26cd24eba1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:21:33 +08:00
jiaoyangna 06cac292f2 每日豪礼 修改提交 2021-06-02 20:20:39 +08:00
ZhangBiao 131de8d9b9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:12:04 +08:00
ZhangBiao 4cc35be589 【牛气冲天】界面按钮调整 2021-06-02 20:11:37 +08:00
zhangqiang 6fc419abe5 【无尽副本】添加帮助和商店入口 2021-06-02 20:07:04 +08:00
gaoxin f8c2b74f0e 【资源】新增一些icon 2021-06-02 19:57:40 +08:00
gaoxin b7c8ed1ee1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 19:49:20 +08:00
gaoxin 6f6df7f5d6 【称号】在地图中删除称号上的canvas 2021-06-02 19:49:14 +08:00