ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f9ed1f14be
								
							
								
							
						 | 
						
							
							
								
								化虚境动效添加
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7da522065d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:03:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								70d3fcfe9f
								
							
								
							
						 | 
						
							
							
								
								断器阁动效增加
							
							
							
							
							
						 | 
						
							2020-09-04 17:03:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7dbf679a40
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 16:55:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5a861862d5
								
							
								
							
						 | 
						
							
							
								
								商店添加动画
							
							
							
							
							
						 | 
						
							2020-09-04 16:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								332e32bb22
								
							
								
							
						 | 
						
							
							
								
								宝物资源
							
							
							
							
							
						 | 
						
							2020-09-04 16:50:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								59481b302a
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-09-04 15:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								86feac0023
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_tishen_hw
							
							
							
							
							
							
							
							# Conflicts:
#	ProjectSettings/ProjectSettings.asset 
							
						 | 
						
							2020-09-04 15:08:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f6686cb1ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 15:06:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b3b001c0df
								
							
								
							
						 | 
						
							
							
								
								装备魂印黑边
							
							
							
							
							
						 | 
						
							2020-09-04 15:05:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d6a9afa63
								
							
								
							
						 | 
						
							
							
								
								场景提交
							
							
							
							
							
						 | 
						
							2020-09-04 15:01:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								70f553b732
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 14:35:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								502fa23bd1
								
							
								
							
						 | 
						
							
							
								
								关两个垃圾log
							
							
							
							
							
						 | 
						
							2020-09-04 14:35:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8232879006
								
							
								
							
						 | 
						
							
							
								
								车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
							
							
							
							
							
						 | 
						
							2020-09-04 14:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								82b1d2595a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_tishen_hw
							
							
							
							
							
						 | 
						
							2020-09-04 13:47:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1c59eb5ff4
								
							
								
							
						 | 
						
							
							
								
								编队提示文字适配
							
							
							
							
							
						 | 
						
							2020-09-04 11:33:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								18f5055d20
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 10:26:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f7d939b016
								
							
								
							
						 | 
						
							
							
								
								关闭登录流程
							
							
							
							
							
						 | 
						
							2020-09-04 10:25:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6d15b0171e
								
							
								
							
						 | 
						
							
							
								
								工会副本
							
							
							
							
							
						 | 
						
							2020-09-04 10:23:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30697705be
								
							
								
							
						 | 
						
							
							
								
								每次销毁界面时清理一次不用的资源,界面打开音效配置添加
							
							
							
							
							
						 | 
						
							2020-09-04 10:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Genkins
							
						 | 
						
							
							
							
							
								
							
								22b9eb795b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 21:19:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Genkins
							
						 | 
						
							
							
							
							
								
							
								927da716aa
								
							
								
							
						 | 
						
							
							
								
								RoleRender Manager
							
							
							
							
							
						 | 
						
							2020-09-03 21:12:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e6e5c39cdd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 19:50:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d1facab9de
								
							
								
							
						 | 
						
							
							
								
								重复引用的资源路径修改
							
							
							
							
							
						 | 
						
							2020-09-03 19:50:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ca036d6d0a
								
							
								
							
						 | 
						
							
							
								
								天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
							
							
							
							
							
						 | 
						
							2020-09-03 18:16:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bc26eaff73
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 17:54:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								14ce57d5f0
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-09-03 17:54:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								f84a683088
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-09-03 16:58:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0d6c12bd58
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 16:51:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ce9ca7937a
								
							
								
							
						 | 
						
							
							
								
								无尽副本剩余行动力微调
							
							
							
							
							
						 | 
						
							2020-09-03 16:51:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ca67dc9457
								
							
								
							
						 | 
						
							
							
								
								louti
							
							
							
							
							
						 | 
						
							2020-09-03 16:45:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8827fccbaf
								
							
								
							
						 | 
						
							
							
								
								去掉编队索引赋值
							
							
							
							
							
						 | 
						
							2020-09-03 16:43:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a372dd7a5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-10 16:32:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2f9c449e31
								
							
								
							
						 | 
						
							
							
								
								新手引导预设修改
							
							
							
							
							
						 | 
						
							2020-09-10 16:32:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dbb941851c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 16:30:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c51e180255
								
							
								
							
						 | 
						
							
							
								
								十绝阵界面适配调整、修改排行单位错误
							
							
							
							
							
						 | 
						
							2020-09-03 16:30:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								352f338abe
								
							
								
							
						 | 
						
							
							
								
								界面战力不一致
							
							
							
							
							
						 | 
						
							2020-09-03 16:03:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6e860dde51
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 15:59:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d39a324917
								
							
								
							
						 | 
						
							
							
								
								森罗文字提示修改
							
							
							
							
							
						 | 
						
							2020-09-03 15:59:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5b0a96c40f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 15:14:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8a84e8feaa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-10 15:08:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								36b66f03e1
								
							
								
							
						 | 
						
							
							
								
								【破阵诛仙】 在线结束,主城入口显示0000不消失,点击入口黑屏
							
							
							
							
							
						 | 
						
							2020-09-10 15:08:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3e46c0804c
								
							
								
							
						 | 
						
							
							
								
								特权商城礼包顺序问题修复
							
							
							
							
							
						 | 
						
							2020-09-03 15:14:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b7f59ef2fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 14:42:41 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2612f04dc4
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-03 16:24:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2f32484379
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-03 16:19:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								04b18aa4ad
								
							
								
							
						 | 
						
							
							
								
								竞技场有免费次数 时提示红点
							
							
							
							
							
						 | 
						
							2020-09-03 14:42:31 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3232e4126f
								
							
								
							
						 | 
						
							
							
								
								effect: 116 兼容金翅大鹏10星天赋
							
							
							
							
							
						 | 
						
							2020-09-03 15:20:27 +09:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cf0cd114fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 14:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6a951e8fd7
								
							
								
							
						 | 
						
							
							
								
								神将,进阶提交
							
							
							
							
							
						 | 
						
							2020-09-03 14:12:32 +08:00 |