gaoxin
							
						 | 
						
							
							
							
							
								
							
								65efa9336c
								
							
								
							
						 | 
						
							
							
								
								【魂印】修复神将恭送后没有重置魂印的穿戴状态,导致力战之躯魂印无法穿戴的问题
							
							
							
							
							
						 | 
						
							2021-09-23 20:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f6c336e52f
								
							
								
							
						 | 
						
							
							
								
								【战斗力】添加一些log
							
							
							
							
							
						 | 
						
							2021-09-23 15:52:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								579b566935
								
							
								
							
						 | 
						
							
							
								
								【四象心法】加入新的战斗力计算
							
							
							
							
							
						 | 
						
							2021-09-22 15:42:28 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e3f11c86ed
								
							
								
							
						 | 
						
							
							
								
								【战斗力】界面展示优化
							
							
							
							
							
						 | 
						
							2021-09-17 15:24:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a7ce05450b
								
							
								
							
						 | 
						
							
							
								
								【战斗力】 功能属性加入战斗力初始化
							
							
							
							
							
						 | 
						
							2021-09-17 15:08:37 +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
							
						 | 
						
							
							
							
							
								
							
								fa5446d6d2
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】跨天英雄等级为0修复
							
							
							
							
							
						 | 
						
							2021-09-14 17:32:06 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								47cb5811cc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/四象心法
							
							
							
							
							
						 | 
						
							2021-09-13 18:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d55dd4c59d
								
							
								
							
						 | 
						
							
							
								
								共鸣宝物报错强化修改提交
							
							
							
							
							
						 | 
						
							2021-09-13 16:17:38 +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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								247ad9fdc7
								
							
								
							
						 | 
						
							
							
								
								【四象心法提交】
							
							
							
							
							
						 | 
						
							2021-09-09 20:45:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								39fc099fe6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/xq
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2021-09-03 16:01:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								009a17a25a
								
							
								
							
						 | 
						
							
							
								
								【战力】漏提交
							
							
							
							
							
						 | 
						
							2021-09-03 10:19:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								08e8944e47
								
							
								
							
						 | 
						
							
							
								
								【战力问题】PVP增减伤引起的战力不统一问题修改
							
							
							
							
							
						 | 
						
							2021-09-02 22:24:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4f266a20b9
								
							
								
							
						 | 
						
							
							
								
								红点问题修改提交
							
							
							
							
							
						 | 
						
							2021-09-01 14:17:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d9bef4f49a
								
							
								
							
						 | 
						
							
							
								
								战力修改提交
							
							
							
							
							
						 | 
						
							2021-08-31 18:08:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7713a65826
								
							
								
							
						 | 
						
							
							
								
								排行榜宝器修改
							
							
							
							
							
						 | 
						
							2021-08-31 11:08:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1ea100ed83
								
							
								
							
						 | 
						
							
							
								
								神将情报界面装备宝物修改提交
							
							
							
							
							
						 | 
						
							2021-08-30 16:44:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cd594275e0
								
							
								
							
						 | 
						
							
							
								
								四灵试炼修改提交
							
							
							
							
							
						 | 
						
							2021-08-26 17:25:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								76dbc01270
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/silingshilian
							
							
							
							
							
						 | 
						
							2021-08-12 15:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								5e891ff84b
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级
							
							
							
							
							
						 | 
						
							2021-08-10 14:56:34 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0e0d5ffdb0
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级
							
							
							
							
							
						 | 
						
							2021-08-10 14:52:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6b8c2f2f3c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/silingshilian
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.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/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua 
							
						 | 
						
							2021-08-06 11:15:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								beacff1d20
								
							
								
							
						 | 
						
							
							
								
								共鸣中的宝物去掉红点
							
							
							
							
							
						 | 
						
							2021-07-29 11:53:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								63780c4c7a
								
							
								
							
						 | 
						
							
							
								
								宝物共鸣修改
							
							
							
							
							
						 | 
						
							2021-07-29 11:13:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								12c8efa516
								
							
								
							
						 | 
						
							
							
								
								装备红点提交
							
							
							
							
							
						 | 
						
							2021-07-29 10:23:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7ee1ef9910
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity5.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
#	Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua 
							
						 | 
						
							2021-07-28 17:45:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								55c839dcd0
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "红点修改提交""
							
							
							
							
							
							
							
							This reverts commit d53776b558. 
							
						 | 
						
							2021-07-28 16:59:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ad850da05f
								
							
								
							
						 | 
						
							
							
								
								宝物共鸣修改
							
							
							
							
							
						 | 
						
							2021-07-28 15:40:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								94c92a7f22
								
							
								
							
						 | 
						
							
							
								
								拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点
							
							
							
							
							
						 | 
						
							2021-07-27 18:34:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								917662ff20
								
							
								
							
						 | 
						
							
							
								
								宝物培养红点提交
							
							
							
							
							
						 | 
						
							2021-07-26 17:16:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								734efe7b52
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-07-24 19:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b395410ac1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_c_跨服天梯
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset 
							
						 | 
						
							2021-07-20 18:09:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f7932b9e8c
								
							
								
							
						 | 
						
							
							
								
								【罗浮争锋】国内提交+1
							
							
							
							
							
						 | 
						
							2021-07-13 17:40:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fc8e199a43
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】使者处于突破等级且突破,共鸣神将不算突破
							
							
							
							
							
						 | 
						
							2021-07-08 18:41:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								92fa3e34d8
								
							
								
							
						 | 
						
							
							
								
								【Log】清除颜色Log
							
							
							
							
							
						 | 
						
							2021-07-01 17:30:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a87f40756d
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】将五星神将放入鸿蒙阵,期间进行升星操作,这时候把神将下阵,由等级控制的前五个天赋会被保留,重登显示正常
							
							
							
							
							
						 | 
						
							2021-06-25 15:14:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8f97c36580
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】共鸣是breakId 计算修改
							
							
							
							
							
						 | 
						
							2021-06-17 10:10:22 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4438ad6a72
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】国内首提
							
							
							
							
							
						 | 
						
							2021-06-15 20:08:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7a80a23435
								
							
								
							
						 | 
						
							
							
								
								【化虚坛】红点加功能开启判断
							
							
							
							
							
						 | 
						
							2021-06-03 17:56:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								259155fe52
								
							
								
							
						 | 
						
							
							
								
								【ID1016093】
							
							
							
							
							
							
							
							【无尽副本】点亮新图鉴时,副本没红点 
							
						 | 
						
							2021-06-01 16:53:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2a552d0730
								
							
								
							
						 | 
						
							
							
								
								【踏碎凌霄】引导增加活动是否开启检测
							
							
							
							
							
						 | 
						
							2021-05-29 15:39:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								458ab29053
								
							
								
							
						 | 
						
							
							
								
								【清除Log】清楚部分Log
							
							
							
							
							
						 | 
						
							2021-05-28 10:33:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								33834cc9b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into 0功能/silingshilian
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.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/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua 
							
						 | 
						
							2021-05-24 16:39:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								107d20677a
								
							
								
							
						 | 
						
							
							
								
								无尽副本提交
							
							
							
							
							
						 | 
						
							2021-05-26 20:27:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e3c4ac2440
								
							
								
							
						 | 
						
							
							
								
								无尽副本战力修改提交
							
							
							
							
							
						 | 
						
							2021-05-26 11:52:32 +08:00 |