gaoxin
							
						 | 
						
							
							
							
							
								
							
								b26cbe30ae
								
							
								
							
						 | 
						
							
							
								
								【奖励界面】修复部分奖励界面显示异常的问题
							
							
							
							
							
						 | 
						
							2021-09-15 10:24:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3622d49888
								
							
								
							
						 | 
						
							
							
								
								【奖励界面】修复部分奖励界面显示异常的问题
							
							
							
							
							
						 | 
						
							2021-09-15 10:17:02 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								08ecd82227
								
							
								
							
						 | 
						
							
							
								
								【战斗】==============被动346  347  348  349  350 提交
							
							
							
							
							
						 | 
						
							2021-09-14 19:58:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								599fe0dcee
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua 
							
						 | 
						
							2021-09-14 17:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ec14782e3f
								
							
								
							
						 | 
						
							
							
								
								【红点】没删干净
							
							
							
							
							
						 | 
						
							2021-09-14 17:40:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fcc1e17cad
								
							
								
							
						 | 
						
							
							
								
								【红点】无用红点绑定事件删除
							
							
							
							
							
						 | 
						
							2021-09-14 17:37:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								120be3af6f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-14 17:32:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fa5446d6d2
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】跨天英雄等级为0修复
							
							
							
							
							
						 | 
						
							2021-09-14 17:32:06 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								2c9f80f8f2
								
							
								
							
						 | 
						
							
							
								
								bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/09/14,17:05:31
							
							
							
							
							
						 | 
						
							2021-09-14 17:05:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								12562b2ae2
								
							
								
							
						 | 
						
							
							
								
								【锻器阁】修复宝物详细打开两次显示异常
							
							
							
							
							
						 | 
						
							2021-09-14 16:56:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d9c2f3451b
								
							
								
							
						 | 
						
							
							
								
								好感度第一次提交
							
							
							
							
							
						 | 
						
							2021-09-14 14:45:22 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								a54cd46bc4
								
							
								
							
						 | 
						
							
							
								
								【四象心法】添加技能属性加成脚本
							
							
							
							
							
						 | 
						
							2021-09-14 11:37:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								dbf05190bc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev-c-battle
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua 
							
						 | 
						
							2021-09-14 10:32:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d056a2dd70
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-14 10:10:57 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								982e0c5268
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======被动56修改
							
							
							
							
							
						 | 
						
							2021-09-13 20:17:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1de0eda8bd
								
							
								
							
						 | 
						
							
							
								
								【适配】觉醒1080*2550左下角“等级上限”文字被切
							
							
							
							
							
						 | 
						
							2021-09-13 20:02:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1251150a9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-13 19:53:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								afa857f134
								
							
								
							
						 | 
						
							
							
								
								【灵兽优化】灵兽升星需求数字移动至ICON下方
							
							
							
							
							
						 | 
						
							2021-09-13 19:53:05 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b468cb6164
								
							
								
							
						 | 
						
							
							
								
								[战斗]============被动56修改  boss免疫额外生命百分比伤害
							
							
							
							
							
						 | 
						
							2021-09-13 19:43:13 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								f0da745b6c
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2021-09-13 19:00:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8d59f41e34
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-13 18:46:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								828538d28a
								
							
								
							
						 | 
						
							
							
								
								精炼等级描述修改提交
							
							
							
							
							
						 | 
						
							2021-09-13 18:46:41 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								47cb5811cc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/四象心法
							
							
							
							
							
						 | 
						
							2021-09-13 18:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								4aa823fb3c
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-13 18:40:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6bbb40171e
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】点击一次挑战,挑战两次,尝试修改
							
							
							
							
							
						 | 
						
							2021-09-13 18:37:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b4cd343f0e
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】资源文件提交
							
							
							
							
							
						 | 
						
							2021-09-13 18:10:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								20dc2526d6
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
						 | 
						
							2021-09-13 18:09:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b609616b6b
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-13 18:06:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cb6c480956
								
							
								
							
						 | 
						
							
							
								
								宝物强化界面消耗本体去掉加号
							
							
							
							
							
						 | 
						
							2021-09-13 17:30:01 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								b25468cd26
								
							
								
							
						 | 
						
							
							
								
								四象心法bug 修改
							
							
							
							
							
						 | 
						
							2021-09-13 17:18:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d55dd4c59d
								
							
								
							
						 | 
						
							
							
								
								共鸣宝物报错强化修改提交
							
							
							
							
							
						 | 
						
							2021-09-13 16:17:38 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								bee3fa5099
								
							
								
							
						 | 
						
							
							
								
								图片资源修改提交
							
							
							
							
							
						 | 
						
							2021-09-13 14:37:04 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b3eb686222
								
							
								
							
						 | 
						
							
							
								
								bug修改提交
							
							
							
							
							
						 | 
						
							2021-09-13 14:11:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7cff74a295
								
							
								
							
						 | 
						
							
							
								
								无尽秘宝激活错误修改提交
							
							
							
							
							
						 | 
						
							2021-09-13 14:11:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								94ed6ad618
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2021-09-13 13:56:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c68496654f
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】遗物
							
							
							
							
							
						 | 
						
							2021-09-13 13:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8c9f31f028
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】遗物
							
							
							
							
							
						 | 
						
							2021-09-13 11:42:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								441e5ba1cc
								
							
								
							
						 | 
						
							
							
								
								aaaaa
							
							
							
							
							
						 | 
						
							2021-09-13 10:06:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6a3d4b99f7
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-11 20:26:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8e55ed2fff
								
							
								
							
						 | 
						
							
							
								
								【玉虚】角色信息界面大小动态变化
							
							
							
							
							
						 | 
						
							2021-09-11 20:26:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								aaa4b987eb
								
							
								
							
						 | 
						
							
							
								
								玉虚论道修改
							
							
							
							
							
						 | 
						
							2021-09-11 19:47:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								683b48fb0c
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-11 18:53:58 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								8d6c58352b
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 18:05:55 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								0d6e6908b9
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 17:59:27 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								0d32db8623
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 17:50:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f37eec36e3
								
							
								
							
						 | 
						
							
							
								
								推送礼包文字描述修改提交
							
							
							
							
							
						 | 
						
							2021-09-11 17:27:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3ec8e9ee31
								
							
								
							
						 | 
						
							
							
								
								去掉空格
							
							
							
							
							
						 | 
						
							2021-09-11 17:21:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0a955034c7
								
							
								
							
						 | 
						
							
							
								
								【ID1018447】
							
							
							
							
							
							
							
							【送神祠】阵营筛选的选中框资源错误 
							
						 | 
						
							2021-09-11 17:19:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e74731a43
								
							
								
							
						 | 
						
							
							
								
								【ID1018450】
							
							
							
							
							
							
							
							【无尽副本】一键上阵会上阵空血神将 
							
						 | 
						
							2021-09-11 17:11:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c98f2c1f02
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua 
							
						 | 
						
							2021-09-11 17:06:01 +08:00 |