ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								810614f226
								
							
								
							
						 | 
						
							
							
								
								【四象心法】增加跳转
							
							
							
							
							
							
							
							(cherry picked from commit 98d3911f23) 
							
						 | 
						
							2021-09-27 14:37:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a3c65ee8d1
								
							
								
							
						 | 
						
							
							
								
								【装备名称】金色->白金
							
							
							
							
							
						 | 
						
							2021-09-27 11:12:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								dcdaf48e4d
								
							
								
							
						 | 
						
							
							
								
								【玉虚】关闭manager初始化
							
							
							
							
							
						 | 
						
							2021-09-26 21:50:50 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e763b6472b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-26 17:31:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a3e1782007
								
							
								
							
						 | 
						
							
							
								
								【功能】==========白金装备合成提交
							
							
							
							
							
						 | 
						
							2021-09-26 17:30:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e61dea0f4a
								
							
								
							
						 | 
						
							
							
								
								【白金装备】套装显示添加
							
							
							
							
							
						 | 
						
							2021-09-26 17:13:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ddb97196d9
								
							
								
							
						 | 
						
							
							
								
								【首充】金额改为special表配置
							
							
							
							
							
						 | 
						
							2021-09-24 11:05:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6ced770ef1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-23 19:23:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5af10faa57
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-23 19:23:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fcae70ae04
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-23 16:50:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								80e2cab589
								
							
								
							
						 | 
						
							
							
								
								玲珑宝镜跳转修改提交
							
							
							
							
							
						 | 
						
							2021-09-23 16:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								93b3839727
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】商店刷新事件
							
							
							
							
							
						 | 
						
							2021-09-23 16:46:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9b24649f36
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-23 16:08:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0422b5c738
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-23 16:08:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ac88b50cae
								
							
								
							
						 | 
						
							
							
								
								【编队】修复打开四灵试炼编队报错
							
							
							
							
							
						 | 
						
							2021-09-23 16:05:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2e08cf7672
								
							
								
							
						 | 
						
							
							
								
								玲珑宝镜消耗道具添加加号
							
							
							
							
							
						 | 
						
							2021-09-23 15:50:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								524521d526
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-23 14:51:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								016f0159e5
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-23 14:51:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fb82580b37
								
							
								
							
						 | 
						
							
							
								
								玲珑商市修改提交
							
							
							
							
							
						 | 
						
							2021-09-23 14:33:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								af3f2b8f32
								
							
								
							
						 | 
						
							
							
								
								添加玲珑商市跳转
							
							
							
							
							
						 | 
						
							2021-09-22 20:22:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								32585cec01
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】增加怪物详情界面
							
							
							
							
							
						 | 
						
							2021-09-22 19:38:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5f80bbb7a1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-22 16:26:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b9055110d
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】红点
							
							
							
							
							
						 | 
						
							2021-09-22 16:25:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34f3f42a04
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/角色战斗力计算2
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua 
							
						 | 
						
							2021-09-22 15:36:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								371c0fc080
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2021-09-22 15:21:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								40fb962879
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】合并后提交
							
							
							
							
							
						 | 
						
							2021-09-22 15:19:27 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								db18313495
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/四象心法' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua 
							
						 | 
						
							2021-09-22 15:12:32 +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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
								
							
								488ad1caad
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】七界秘宝提交
							
							
							
							
							
						 | 
						
							2021-09-17 17:42:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a7ce05450b
								
							
								
							
						 | 
						
							
							
								
								【战斗力】 功能属性加入战斗力初始化
							
							
							
							
							
						 | 
						
							2021-09-17 15:08:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								60c954bf38
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-16 19:36:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								28d68a2d43
								
							
								
							
						 | 
						
							
							
								
								玉虚论道修改
							
							
							
							
							
						 | 
						
							2021-09-16 18:10:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								66efc9d4e3
								
							
								
							
						 | 
						
							
							
								
								【战斗力】新战斗力计算系统完成
							
							
							
							
							
						 | 
						
							2021-09-16 13:35:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ad9bcaa2fa
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-15 14:02:39 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								47cb5811cc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/四象心法
							
							
							
							
							
						 | 
						
							2021-09-13 18:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b609616b6b
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-13 18:06:39 +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
							
						 | 
						
							
							
							
							
								
							
								8c9f31f028
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】遗物
							
							
							
							
							
						 | 
						
							2021-09-13 11:42:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								aaa4b987eb
								
							
								
							
						 | 
						
							
							
								
								玉虚论道修改
							
							
							
							
							
						 | 
						
							2021-09-11 19:47:23 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								0d32db8623
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 17:50:21 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								41282c144c
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】七界币增加加号
							
							
							
							
							
						 | 
						
							2021-09-11 15:47:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f49634a6fb
								
							
								
							
						 | 
						
							
							
								
								【ID1018456】
							
							
							
							
							
							
							
							【新推送礼包】礼包文案需要修改 
							
						 | 
						
							2021-09-11 15:18:47 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4b5c55a1ab
								
							
								
							
						 | 
						
							
							
								
								qqq
							
							
							
							
							
						 | 
						
							2021-09-11 15:05:37 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								38947760c1
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 13:37:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4eb8e566fe
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】战斗结束提交
							
							
							
							
							
						 | 
						
							2021-09-10 18:36:39 +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 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e2f7284507
								
							
								
							
						 | 
						
							
							
								
								qqqq
							
							
							
							
							
						 | 
						
							2021-09-10 15:50:24 +08:00 |