From ae44413f5375ea9588e2b45c1bf0d4e2c0003363 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 26 Jan 2021 15:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BB=BA=E6=9C=A8=E7=A5=9E=E6=A0=91?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 43 +++++++++++++++++++ .../~Lua/Modules/Net/NetManager.lua | 7 --- .../Modules/SacredTree/SacredTreeManager.lua | 3 +- .../Modules/SacredTree/SacredTreePanel.lua | 2 - 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 3645c72e3c..38bae5301b 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -1468,6 +1468,7 @@ GameObject: - component: {fileID: 5978868307199444870} - component: {fileID: 1072730558999711384} - component: {fileID: 7835085401096484185} + - component: {fileID: 9153693541349561046} m_Layer: 5 m_Name: Mask m_TagString: Untagged @@ -1531,6 +1532,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &9153693541349561046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005787329047355383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7835085401096484185} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2065276793931984838 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 3438688439..ccb8854383 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -1149,13 +1149,6 @@ function this.GetAllFightDataRequest(func) local data = buffer:DataByte() local msg = MapInfoProto_pb.getAllLevelDifficultyInfosResponse() msg:ParseFromString(data) - --FightManager.InitAllMapPgData(msg.levelDifficultyInfos) - --MapTrialManager.RefreshTrialInfo(msg.towerCopyInfo) - CarbonManager.InitCarbonState(msg.mapInfos) - CarbonManager.InitNormalState(msg.playedGenMapId) - CarbonManager.InitCountDownProcess() - CarbonManager.difficultyId = msg.difficultMapOptions - CarbonManager.hasGetRewardCostStar = msg.starNum MapTrialManager.InitTrialRewardData(msg.trialRewardInfo) MapTrialManager.killCount=msg.killCount if func then diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua index cfffd83253..105d23f6f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua @@ -23,7 +23,8 @@ function this.OnPowerChange(oldPower) end function this.GetTowerLevel() - return MonsterCampManager.GetFourElementTotalWave() + -- return MonsterCampManager.GetFourElementTotalWave() + return 100 end --树等级表数据 diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua index 4d4ffa3c67..32bd8dac35 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreePanel.lua @@ -5,7 +5,6 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0) local curTreeLevel = 0 -local curTowerLevel = 0 local length = 0 function SacredTreePanel:InitComponent() @@ -71,7 +70,6 @@ function SacredTreePanel:OnOpen() end function SacredTreePanel:OnShow() curTreeLevel = SacredTreeManager.treeLevel - curTowerLevel = SacredTreeManager.GetTowerLevel() length = LengthOfTable(SacredTreeManager.treeLevelConfig) Util.SetGray(self.upgradeBtn,curTreeLevel >= length)