jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c131b4e521
								
							
								
							
						 | 
						
							
							
								
								每日豪礼修改
							
							
							
							
							
							
							
							(cherry picked from commit da3b21d024) 
							
						 | 
						
							2021-03-27 19:26:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								da3b21d024
								
							
								
							
						 | 
						
							
							
								
								每日豪礼修改
							
							
							
							
							
						 | 
						
							2021-03-27 19:25:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5ae49a698d
								
							
								
							
						 | 
						
							
							
								
								【特效】嫦娥,金吒特效修改
							
							
							
							
							
						 | 
						
							2021-03-27 19:02:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								06ccc3c6a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' into master_xma_local
							
							
							
							
							
						 | 
						
							2021-03-27 17:46:18 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4be640d489
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】开服3天内通过公会御令获取途径可以进入
							
							
							
							
							
						 | 
						
							2021-03-27 17:45:06 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5883b66fca
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】开服3天内通过公会御令获取途径可以进入
							
							
							
							
							
						 | 
						
							2021-03-27 17:44:05 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								80b9b48367
								
							
								
							
						 | 
						
							
							
								
								【合并多余修改回滚】
							
							
							
							
							
						 | 
						
							2021-03-27 17:35:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4221ffcf5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' into master_xma_local
							
							
							
							
							
						 | 
						
							2021-03-27 17:34:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								284dae6de6
								
							
								
							
						 | 
						
							
							
								
								【音频】巨鲲音频资源更新
							
							
							
							
							
						 | 
						
							2021-03-27 17:30:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								857d0112fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua 
							
						 | 
						
							2021-03-27 17:11:57 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								66e02dc2b9
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】开服3天内通过公会御令获取途径可以进入
							
							
							
							
							
						 | 
						
							2021-03-27 16:46:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4944bbe2d9
								
							
								
							
						 | 
						
							
							
								
								【公会红包】修复滑动导致按钮位置错误
							
							
							
							
							
						 | 
						
							2021-03-27 15:46:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e248dcff8c
								
							
								
							
						 | 
						
							
							
								
								【心魔试炼】排行榜有空格
							
							
							
							
							
						 | 
						
							2021-03-27 15:46:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0688f20ad6
								
							
								
							
						 | 
						
							
							
								
								【心魔试炼】排行榜有空格
							
							
							
							
							
						 | 
						
							2021-03-27 15:32:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e060430d61
								
							
								
							
						 | 
						
							
							
								
								【公会红包】修复滑动导致按钮位置错误
							
							
							
							
							
						 | 
						
							2021-03-27 15:20:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fbfb02fc34
								
							
								
							
						 | 
						
							
							
								
								【聊天】公会消息缓存添加,暂时删除公会红包跑马灯
							
							
							
							
							
						 | 
						
							2021-03-27 14:58:57 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9101433578
								
							
								
							
						 | 
						
							
							
								
								【战斗】==============链接符显示修改,链接符放逐修改,灵兽无目标修改
							
							
							
							
							
						 | 
						
							2021-03-27 12:37:50 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								79b84039b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/test' into china/local
							
							
							
							
							
						 | 
						
							2021-03-26 20:17:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								518d4aee0a
								
							
								
							
						 | 
						
							
							
								
								【公会红包】修复充值后报错扽问题
							
							
							
							
							
						 | 
						
							2021-03-26 20:10:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								89694f03b5
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】排名数据超过20,滑动时显示错误的问题
							
							
							
							
							
						 | 
						
							2021-03-26 20:09:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								43e945a97a
								
							
								
							
						 | 
						
							
							
								
								【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题
							
							
							
							
							
						 | 
						
							2021-03-26 20:09:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								095701c33f
								
							
								
							
						 | 
						
							
							
								
								【称号时装坐骑】初提
							
							
							
							
							
						 | 
						
							2021-03-26 20:06:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								19d7914e78
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======解决放逐目标有不灭不会被选中;解决只剩放逐目标攻击动画异常问题
							
							
							
							
							
						 | 
						
							2021-03-26 16:50:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fb475c1b8e
								
							
								
							
						 | 
						
							
							
								
								【音效】灵兽巨鲲音效添加
							
							
							
							
							
						 | 
						
							2021-03-26 15:52:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								feb1e97089
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-03-26 15:03:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9786af645c
								
							
								
							
						 | 
						
							
							
								
								【本地化魂印】专属魂印适用范围不显示
							
							
							
							
							
						 | 
						
							2021-03-26 15:03:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								19af51d38f
								
							
								
							
						 | 
						
							
							
								
								[战斗]========= 放逐后的buff刷新修改,放逐后的被动触发屏蔽,控制类buff 叠层逻辑修改
							
							
							
							
							
						 | 
						
							2021-03-26 14:40:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d48458f417
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-03-26 14:33:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a1778caa65
								
							
								
							
						 | 
						
							
							
								
								【公会红包】修复充值后报错扽问题
							
							
							
							
							
						 | 
						
							2021-03-26 14:33:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ad3b3c3e45
								
							
								
							
						 | 
						
							
							
								
								【牛气冲不动了】
							
							
							
							
							
						 | 
						
							2021-03-26 14:05:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dc187723c8
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】upview修改2
							
							
							
							
							
							
							
							(cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e) 
							
						 | 
						
							2021-03-26 14:00:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b7cff350f9
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】修改
							
							
							
							
							
						 | 
						
							2021-03-26 13:56:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3c31b5b5bd
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-03-26 13:49:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dc50f89214
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】upview提交
							
							
							
							
							
						 | 
						
							2021-03-26 13:49:41 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b18ad8487a
								
							
								
							
						 | 
						
							
							
								
								【战斗】casting层级调整,失败界面打开1秒后才能关闭
							
							
							
							
							
						 | 
						
							2021-03-26 12:15:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								63f2ab22ad
								
							
								
							
						 | 
						
							
							
								
								【本地化工具】优化翻译图片导入的规则,将图片像素优化工具修改为工程外生效
							
							
							
							
							
						 | 
						
							2021-03-26 11:44:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cb15f601b3
								
							
								
							
						 | 
						
							
							
								
								【聊天】去除登录之前的消息不显示的限制
							
							
							
							
							
						 | 
						
							2021-03-26 11:31:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1801a3d820
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】排名数据超过20,滑动时显示错误的问题
							
							
							
							
							
						 | 
						
							2021-03-26 11:17:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fd5ef82b5f
								
							
								
							
						 | 
						
							
							
								
								【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题
							
							
							
							
							
						 | 
						
							2021-03-26 10:13:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b7c51cbf48
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】红点bug提交
							
							
							
							
							
							
							
							(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301) 
							
						 | 
						
							2021-03-25 16:33:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8aa411244e
								
							
								
							
						 | 
						
							
							
								
								灵兽秘卷修改提交
							
							
							
							
							
						 | 
						
							2021-03-25 16:21:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								f5a85c4d2e
								
							
								
							
						 | 
						
							
							
								
								【战斗】===================== 灵兽释放技能逻辑修改, rolemanager 添加获取role接口
							
							
							
							
							
						 | 
						
							2021-03-25 15:54:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cfa67e8479
								
							
								
							
						 | 
						
							
							
								
								删除log
							
							
							
							
							
						 | 
						
							2021-03-25 15:34:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								299a7ceff1
								
							
								
							
						 | 
						
							
							
								
								【天书秘卷】 修改
							
							
							
							
							
						 | 
						
							2021-03-25 15:34:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3b99759f6f
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】报空修复
							
							
							
							
							
							
							
							(cherry picked from commit 756e920596af01046ab53a971423b77243a42678) 
							
						 | 
						
							2021-03-25 15:20:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								16853d09c3
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】物品特效、红点检测
							
							
							
							
							
							
							
							(cherry picked from commit 11fb7cc1876c48ec26617da94405812861c4b4b1) 
							
						 | 
						
							2021-03-25 15:02:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								776353406d
								
							
								
							
						 | 
						
							
							
								
								灵兽提交
							
							
							
							
							
						 | 
						
							2021-03-25 14:05:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0a4d9a925b
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】主城报错提交
							
							
							
							
							
						 | 
						
							2021-03-25 11:35:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dd075e3c4c
								
							
								
							
						 | 
						
							
							
								
								itemview 灰色修改
							
							
							
							
							
						 | 
						
							2021-03-25 11:33:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								24fa8c17e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/牛气冲天' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua 
							
						 | 
						
							2021-03-25 11:13:37 +08:00 |