gaoxin
							
						 | 
						
							
							
							
							
								
							
								fa85ecb870
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题""
							
							
							
							
							
							
							
							This reverts commit 0e86945c53. 
							
						 | 
						
							2021-09-22 14:59:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cea14746f8
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-22 13:33:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1c191a78b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua 
							
						 | 
						
							2021-09-22 11:46:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bc659b68f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/角色战斗力计算2
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs 
							
						 | 
						
							2021-09-22 10:54:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e5af89fac9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/玉虚论道
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua 
							
						 | 
						
							2021-09-22 10:37:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								488753ab83
								
							
								
							
						 | 
						
							
							
								
								四灵编队修改提交
							
							
							
							
							
							
							
							(cherry picked from commit 191603b77f) 
							
						 | 
						
							2021-09-18 19:19:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								71b380cdd2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-18 18:55:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e5ef30243
								
							
								
							
						 | 
						
							
							
								
								在线四灵编队修改提交
							
							
							
							
							
						 | 
						
							2021-09-18 18:55:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2ca77d75ef
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】修服选中大奖后次数显示异常
							
							
							
							
							
						 | 
						
							2021-09-18 18:40:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a628176640
								
							
								
							
						 | 
						
							
							
								
								四灵 修改提交
							
							
							
							
							
							
							
							(cherry picked from commit 675cda9b4d) 
							
						 | 
						
							2021-09-18 18:26:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								47485caeda
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】无免费次数按钮逻辑修改
							
							
							
							
							
						 | 
						
							2021-09-18 18:23:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4a494fac11
								
							
								
							
						 | 
						
							
							
								
								在线刷新一下编队
							
							
							
							
							
						 | 
						
							2021-09-18 18:19:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1ddc89ad54
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-18 18:18:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3f24f4cd86
								
							
								
							
						 | 
						
							
							
								
								四灵试炼 修改提交
							
							
							
							
							
						 | 
						
							2021-09-18 17:58:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								02f1888f3f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-18 17:07:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								13e0865cc2
								
							
								
							
						 | 
						
							
							
								
								四灵助战报错修改
							
							
							
							
							
						 | 
						
							2021-09-18 17:07:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								634f78d3c5
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-18 16:52:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e3f4808936
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】选择奖励界面显示错误
							
							
							
							
							
						 | 
						
							2021-09-18 16:32:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								20ed8d5928
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】密保名称
							
							
							
							
							
						 | 
						
							2021-09-18 16:14:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a3ff527bc9
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】选择奖励界面,选中奖励后的显示效果优化
							
							
							
							
							
						 | 
						
							2021-09-18 16:14:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								50f2a73898
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】修复界面刷新不及时的问题
							
							
							
							
							
						 | 
						
							2021-09-18 15:53:13 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								6b2eaf6cca
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-18 15:43:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7e954b997a
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】修复查看剩余奖励报错
							
							
							
							
							
						 | 
						
							2021-09-18 15:15:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								35e0c96748
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-18 15:04:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								39b7267239
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-18 14:19:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a80d16fbda
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】修改选择奖励界面的排序规则
							
							
							
							
							
						 | 
						
							2021-09-18 14:19:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2bfe122214
								
							
								
							
						 | 
						
							
							
								
								易经宝库选择报错修改提交
							
							
							
							
							
							
							
							(cherry picked from commit 8ae7a3174f)
(cherry picked from commit 20ccbed3c9) 
							
						 | 
						
							2021-09-18 13:43:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a7f0c42cae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/玉虚论道
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
	Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2021-09-18 11:52:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a15bd40b96
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】跳转惊喜礼盒
							
							
							
							
							
						 | 
						
							2021-09-18 11:33:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b1265379f9
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】排行榜和开启时间显示
							
							
							
							
							
						 | 
						
							2021-09-18 11:24:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								49cb8272bc
								
							
								
							
						 | 
						
							
							
								
								Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-18 11:04:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								74cdc4374f
								
							
								
							
						 | 
						
							
							
								
								【惊喜礼盒】礼包顺序调整
							
							
							
							
							
						 | 
						
							2021-09-18 11:03:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ac319513dc
								
							
								
							
						 | 
						
							
							
								
								【ID1018514】
							
							
							
							
							
							
							
							【四灵试炼】线上号,打开战斗编队报错 
							
						 | 
						
							2021-09-18 11:02:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0e86945c53
								
							
								
							
						 | 
						
							
							
								
								Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题"
							
							
							
							
							
							
							
							This reverts commit cb4c81b420. 
							
						 | 
						
							2021-09-18 10:56:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9da6a42947
								
							
								
							
						 | 
						
							
							
								
								【惊喜礼盒】修复活动结束,继续购买卡死
							
							
							
							
							
						 | 
						
							2021-09-18 10:56:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								aa6bb5d606
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】修复数据表BasicPoolId列无法读取,将数据格式改为字符串
							
							
							
							
							
						 | 
						
							2021-09-18 10:45:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								45e24095f6
								
							
								
							
						 | 
						
							
							
								
								Revert "【寻宝迷踪】log增加"
							
							
							
							
							
							
							
							This reverts commit e548fa6591. 
							
						 | 
						
							2021-09-18 10:40:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e71f3b5d39
								
							
								
							
						 | 
						
							
							
								
								玉虚商店修改
							
							
							
							
							
						 | 
						
							2021-09-18 10:38:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e548fa6591
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】log增加
							
							
							
							
							
						 | 
						
							2021-09-18 10:38:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1910d54272
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-18 10:29:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								abe720d43d
								
							
								
							
						 | 
						
							
							
								
								【限时召唤】修复奖励界面报错
							
							
							
							
							
						 | 
						
							2021-09-17 20:04:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8307fbe7e1
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】完成!!!
							
							
							
							
							
						 | 
						
							2021-09-17 19:57:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								949d159010
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-17 19:29:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								488ad1caad
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】七界秘宝提交
							
							
							
							
							
						 | 
						
							2021-09-17 17:42:18 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d5ce7b7f84
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======被动37修改
							
							
							
							
							
						 | 
						
							2021-09-17 17:07:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cb4c81b420
								
							
								
							
						 | 
						
							
							
								
								【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
							
							
							
							
							
						 | 
						
							2021-09-17 17:01:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								472409a1b3
								
							
								
							
						 | 
						
							
							
								
								【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题
							
							
							
							
							
						 | 
						
							2021-09-17 17:00:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								01e446fed3
								
							
								
							
						 | 
						
							
							
								
								[战斗]======免疫buff添加类型 5   免疫控制不免疫禁疗
							
							
							
							
							
						 | 
						
							2021-09-17 16:55:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								163950a4a1
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-17 16:29:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								feae377b4f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/角色战斗力计算2
							
							
							
							
							
						 | 
						
							2021-09-17 15:25:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e3f11c86ed
								
							
								
							
						 | 
						
							
							
								
								【战斗力】界面展示优化
							
							
							
							
							
						 | 
						
							2021-09-17 15:24:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								df1409717d
								
							
								
							
						 | 
						
							
							
								
								【战斗】==============技能是否可以释放处 添加目标数量判断,如果没有目标则不能释放
							
							
							
							
							
						 | 
						
							2021-09-17 15:20:44 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								b0c69c81a8
								
							
								
							
						 | 
						
							
							
								
								【四象心法】技能加成bug修改
							
							
							
							
							
						 | 
						
							2021-09-17 15:18:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								247d9a85d0
								
							
								
							
						 | 
						
							
							
								
								【战斗力】删除无用的属性计算
							
							
							
							
							
						 | 
						
							2021-09-17 15:10:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5f11f26c4d
								
							
								
							
						 | 
						
							
							
								
								【红点】报错优化
							
							
							
							
							
						 | 
						
							2021-09-17 15:09:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a7ce05450b
								
							
								
							
						 | 
						
							
							
								
								【战斗力】 功能属性加入战斗力初始化
							
							
							
							
							
						 | 
						
							2021-09-17 15:08:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a793dccf22
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-17 14:47:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								32ba399115
								
							
								
							
						 | 
						
							
							
								
								【ID1018484】
							
							
							
							
							
							
							
							【森罗幻境】抽到整只灵兽,需要重登才会显示在背包 
							
						 | 
						
							2021-09-17 14:47:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2925de34e8
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】结算界面提交
							
							
							
							
							
						 | 
						
							2021-09-17 14:38:05 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								52221aca04
								
							
								
							
						 | 
						
							
							
								
								【战斗】==========被动196 修改
							
							
							
							
							
						 | 
						
							2021-09-17 14:26:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ad4c218f01
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-17 13:42:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4511eec383
								
							
								
							
						 | 
						
							
							
								
								【战斗】==========被动196 修改
							
							
							
							
							
						 | 
						
							2021-09-17 11:55:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								38fcf555dd
								
							
								
							
						 | 
						
							
							
								
								【山河社稷图】修复战斗不一致
							
							
							
							
							
						 | 
						
							2021-09-16 22:43:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4d8576d200
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】战斗层数锁住了
							
							
							
							
							
						 | 
						
							2021-09-16 21:05:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e584db1eaa
								
							
								
							
						 | 
						
							
							
								
								[战斗]===========被动196 200 188修改
							
							
							
							
							
						 | 
						
							2021-09-16 20:31:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								60c954bf38
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-16 19:36:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7e97b7c90b
								
							
								
							
						 | 
						
							
							
								
								【通用大弹窗】修改
							
							
							
							
							
						 | 
						
							2021-09-16 18:11:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								28d68a2d43
								
							
								
							
						 | 
						
							
							
								
								玉虚论道修改
							
							
							
							
							
						 | 
						
							2021-09-16 18:10:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6c17058b8e
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】活动结束跳回还弹出奖励修改
							
							
							
							
							
						 | 
						
							2021-09-16 17:45:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9d8fa02bcc
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】提交
							
							
							
							
							
						 | 
						
							2021-09-16 17:33:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3d948e7f0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-16 17:29:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								da21b0ba37
								
							
								
							
						 | 
						
							
							
								
								修改提交
							
							
							
							
							
						 | 
						
							2021-09-16 17:29:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3b42d8034d
								
							
								
							
						 | 
						
							
							
								
								[战斗]==============技能实例里 技能是否能释放添加判断  如果没有攻击目标就返回 false
							
							
							
							
							
						 | 
						
							2021-09-16 17:27:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6c5552524b
								
							
								
							
						 | 
						
							
							
								
								报错修改
							
							
							
							
							
							
							
							(cherry picked from commit 80e81f9f9b) 
							
						 | 
						
							2021-09-16 17:16:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b4a2cdb018
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-16 17:11:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8293c56b37
								
							
								
							
						 | 
						
							
							
								
								建木神树图片修改提交
							
							
							
							
							
							
							
							(cherry picked from commit f127a0e858) 
							
						 | 
						
							2021-09-16 17:11:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1809ae7890
								
							
								
							
						 | 
						
							
							
								
								【魂灵宝】回收界面排序
							
							
							
							
							
						 | 
						
							2021-09-16 17:05:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								20c122e096
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】红点修改
							
							
							
							
							
						 | 
						
							2021-09-16 16:52:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								90a9abba0d
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】提价
							
							
							
							
							
						 | 
						
							2021-09-16 16:41:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a79d425b3b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-16 16:16:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1e17301cc8
								
							
								
							
						 | 
						
							
							
								
								【背包优化】宝物背包按照品质优先级进行排序,并增加阵营筛选功能
							
							
							
							
							
						 | 
						
							2021-09-16 16:16:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e4a53d447
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-16 14:08:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								415eb7a947
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】寻宝返回后默认返回显示活动第一个页签
							
							
							
							
							
						 | 
						
							2021-09-16 14:06:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								537af282e6
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】提交
							
							
							
							
							
						 | 
						
							2021-09-16 14:05:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								95adcb6b1d
								
							
								
							
						 | 
						
							
							
								
								Revert "【寻宝迷踪】修改提交"
							
							
							
							
							
							
							
							This reverts commit 31304cc252. 
							
						 | 
						
							2021-09-16 13:39:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2494b16f89
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/角色战斗力计算2
							
							
							
							
							
						 | 
						
							2021-09-16 13:37:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								66efc9d4e3
								
							
								
							
						 | 
						
							
							
								
								【战斗力】新战斗力计算系统完成
							
							
							
							
							
						 | 
						
							2021-09-16 13:35:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								31304cc252
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】修改提交
							
							
							
							
							
						 | 
						
							2021-09-16 13:25:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								512a12cc72
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-16 11:24:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d49d73dcb5
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】跳转提交
							
							
							
							
							
						 | 
						
							2021-09-15 19:14:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								45de3d5c99
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-15 18:09:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								faacb77b2e
								
							
								
							
						 | 
						
							
							
								
								【协议】meta提交
							
							
							
							
							
						 | 
						
							2021-09-15 15:34:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								045134941d
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】协议
							
							
							
							
							
						 | 
						
							2021-09-15 15:19:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7462f02cfd
								
							
								
							
						 | 
						
							
							
								
								Revert Revert 回滚错误的合并 4f19f12612
							
							
							
							
							
						 | 
						
							2021-09-15 14:29:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ad9bcaa2fa
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-15 14:02:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4ee0741896
								
							
								
							
						 | 
						
							
							
								
								[战斗]==============被动338修改  护甲逻辑修改
							
							
							
							
							
						 | 
						
							2021-09-15 11:23:04 +08:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								12562b2ae2
								
							
								
							
						 | 
						
							
							
								
								【锻器阁】修复宝物详细打开两次显示异常
							
							
							
							
							
						 | 
						
							2021-09-14 16:56:33 +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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d41a0adeb1
								
							
								
							
						 | 
						
							
							
								
								推送礼包文案修改提交
							
							
							
							
							
						 | 
						
							2021-09-11 17:04:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7df51e8929
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/角色战斗力计算2
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua 
							
						 | 
						
							2021-09-11 16:52:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								79778b6eec
								
							
								
							
						 | 
						
							
							
								
								【战斗】===========被动261  修改
							
							
							
							
							
						 | 
						
							2021-09-11 16:04:06 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d9214666c2
								
							
								
							
						 | 
						
							
							
								
								玉虚论道回放优化
							
							
							
							
							
						 | 
						
							2021-09-11 16:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								41282c144c
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】七界币增加加号
							
							
							
							
							
						 | 
						
							2021-09-11 15:47:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								badf72a6f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-11 15:22:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f49634a6fb
								
							
								
							
						 | 
						
							
							
								
								【ID1018456】
							
							
							
							
							
							
							
							【新推送礼包】礼包文案需要修改 
							
						 | 
						
							2021-09-11 15:18:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1c6599c17a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-11 15:13:02 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4b5c55a1ab
								
							
								
							
						 | 
						
							
							
								
								qqq
							
							
							
							
							
						 | 
						
							2021-09-11 15:05:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								14559c4d6a
								
							
								
							
						 | 
						
							
							
								
								【ID1018450】
							
							
							
							
							
							
							
							【无尽副本】一键上阵会上阵空血神将 
							
						 | 
						
							2021-09-11 14:38:12 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								38947760c1
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 13:37:26 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								cbb088a491
								
							
								
							
						 | 
						
							
							
								
								他人队伍灵兽修改
							
							
							
							
							
						 | 
						
							2021-09-10 22:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								489f6f7e37
								
							
								
							
						 | 
						
							
							
								
								编对拖动英雄保存队伍修改
							
							
							
							
							
						 | 
						
							2021-09-10 21:34:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ad182335d9
								
							
								
							
						 | 
						
							
							
								
								【推送礼包】名称修改
							
							
							
							
							
						 | 
						
							2021-09-10 19:52:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								81421a2e49
								
							
								
							
						 | 
						
							
							
								
								【推送礼包】文字错误修改
							
							
							
							
							
						 | 
						
							2021-09-10 19:52:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4eb8e566fe
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】战斗结束提交
							
							
							
							
							
						 | 
						
							2021-09-10 18:36:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								10783ed104
								
							
								
							
						 | 
						
							
							
								
								【推送礼包】配置错误
							
							
							
							
							
						 | 
						
							2021-09-10 18:27:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								16289857a5
								
							
								
							
						 | 
						
							
							
								
								aaaa
							
							
							
							
							
						 | 
						
							2021-09-10 18:21:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eaf36b56ca
								
							
								
							
						 | 
						
							
							
								
								Revert "【礼包拍脸】修复报错"
							
							
							
							
							
							
							
							This reverts commit 7bfa26d144. 
							
						 | 
						
							2021-09-10 17:56:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5af9e9f0ed
								
							
								
							
						 | 
						
							
							
								
								【编队】修复报错
							
							
							
							
							
						 | 
						
							2021-09-10 17:30:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7bfa26d144
								
							
								
							
						 | 
						
							
							
								
								【礼包拍脸】修复报错
							
							
							
							
							
						 | 
						
							2021-09-10 16:44:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d6725f3320
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua 
							
						 | 
						
							2021-09-10 16:39:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7bce643c71
								
							
								
							
						 | 
						
							
							
								
								【尝试修复IOS不明原因报错】
							
							
							
							
							
						 | 
						
							2021-09-10 16:31:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f7d1601c79
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua 
							
						 | 
						
							2021-09-10 16:26:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								16633b37a8
								
							
								
							
						 | 
						
							
							
								
								【编队优化】
							
							
							
							
							
						 | 
						
							2021-09-10 16:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e2f7284507
								
							
								
							
						 | 
						
							
							
								
								qqqq
							
							
							
							
							
						 | 
						
							2021-09-10 15:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								e91140175f
								
							
								
							
						 | 
						
							
							
								
								四象心法添加通用等级限制
							
							
							
							
							
						 | 
						
							2021-09-10 15:44:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								42df2f4af5
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-10 15:23:15 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								ee557e993a
								
							
								
							
						 | 
						
							
							
								
								开启修行等级限制
							
							
							
							
							
						 | 
						
							2021-09-10 15:08:50 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								a89d168e50
								
							
								
							
						 | 
						
							
							
								
								【四象心法】功能完善
							
							
							
							
							
						 | 
						
							2021-09-10 14:37:47 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								1327abb290
								
							
								
							
						 | 
						
							
							
								
								四象心法修改
							
							
							
							
							
						 | 
						
							2021-09-10 11:22:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2d003aaafd
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua 
							
						 | 
						
							2021-09-10 10:33:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cef2b42bcc
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-10 10:30:50 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								a5271e5a38
								
							
								
							
						 | 
						
							
							
								
								【四象心法】协议提交
							
							
							
							
							
						 | 
						
							2021-09-10 09:51:57 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								4c66f50e66
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/四象心法
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua 
							
						 | 
						
							2021-09-10 09:38:55 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3257b89e70
								
							
								
							
						 | 
						
							
							
								
								eeeeeeee
							
							
							
							
							
						 | 
						
							2021-09-09 23:01:23 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								247ad9fdc7
								
							
								
							
						 | 
						
							
							
								
								【四象心法提交】
							
							
							
							
							
						 | 
						
							2021-09-09 20:45:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								159f2e2494
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua 
							
						 | 
						
							2021-09-09 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a1c21eb441
								
							
								
							
						 | 
						
							
							
								
								qqqqq
							
							
							
							
							
						 | 
						
							2021-09-09 20:32:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8bb679214b
								
							
								
							
						 | 
						
							
							
								
								【玉虚】QA提示添加
							
							
							
							
							
						 | 
						
							2021-09-09 19:21:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c5fc2ddedb
								
							
								
							
						 | 
						
							
							
								
								推送礼包修改提交
							
							
							
							
							
						 | 
						
							2021-09-09 18:11:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ed1f153fa1
								
							
								
							
						 | 
						
							
							
								
								【玉虚】挑战界面动画添加,优化界面显示,挑战完成后关闭界面时刷新挑战列表
							
							
							
							
							
						 | 
						
							2021-09-09 18:04:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ce674fc2ab
								
							
								
							
						 | 
						
							
							
								
								推送礼包文案修改
							
							
							
							
							
						 | 
						
							2021-09-09 17:31:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								48e25d05e7
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 16:47:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								21a222cb27
								
							
								
							
						 | 
						
							
							
								
								aaaaaaaa
							
							
							
							
							
						 | 
						
							2021-09-09 16:47:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1094c3678a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 16:40:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b29d7b43fe
								
							
								
							
						 | 
						
							
							
								
								【玉虚】每日挑战奖励显示优化
							
							
							
							
							
						 | 
						
							2021-09-09 16:40:29 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ea457002be
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 16:27:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c27379226c
								
							
								
							
						 | 
						
							
							
								
								aaaaaaaaaaaaa
							
							
							
							
							
						 | 
						
							2021-09-09 16:27:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b1c987b16f
								
							
								
							
						 | 
						
							
							
								
								【玉虚】界面显示优化,星星显示优化
							
							
							
							
							
						 | 
						
							2021-09-09 16:22:35 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								49a7a2b242
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 15:44:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0d82056bc2
								
							
								
							
						 | 
						
							
							
								
								主界面显示修改
							
							
							
							
							
						 | 
						
							2021-09-09 15:44:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								065734184e
								
							
								
							
						 | 
						
							
							
								
								【玉虚】商店跳转添加
							
							
							
							
							
						 | 
						
							2021-09-09 15:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fd29cae402
								
							
								
							
						 | 
						
							
							
								
								界面销毁时删除红点绑定
							
							
							
							
							
						 | 
						
							2021-09-09 14:27:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								60b842e2ab
								
							
								
							
						 | 
						
							
							
								
								【排行榜】报错修复
							
							
							
							
							
						 | 
						
							2021-09-09 14:05:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d010e309ca
								
							
								
							
						 | 
						
							
							
								
								建木神树 升级修改提交
							
							
							
							
							
						 | 
						
							2021-09-09 14:03:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a58b5f2d88
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-09 11:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3e3d0d9416
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/china/xq' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua 
							
						 | 
						
							2021-09-09 11:22:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5d739f1291
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】排行滑动数据错乱
							
							
							
							
							
						 | 
						
							2021-09-09 11:19:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1fefbb43e6
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-09 11:10:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4727998055
								
							
								
							
						 | 
						
							
							
								
								没有图片问题修改
							
							
							
							
							
							
							
							(cherry picked from commit 76d8399ac9ecd0c999ed6e8b53c7b7e231b73a16) 
							
						 | 
						
							2021-09-09 10:55:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								77ea33d675
								
							
								
							
						 | 
						
							
							
								
								【商店】从其他界面返回时刷新显示
							
							
							
							
							
						 | 
						
							2021-09-09 10:50:03 +08:00 |