From 05769016cb54dafc01335cd35ab90b5c0d578e03 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 9 Mar 2021 17:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 34 +++++++++++++++++-- .../FourElementMonsterCampPanel.prefab | 4 +-- .../UI/View/FourTrailSingleHelpHero.prefab | 8 ++--- .../~Lua/View/FourElementSingleWave.lua | 6 ++++ .../~Lua/View/FourTrailSingleHelpHero.lua | 7 ++++ 5 files changed, 51 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 4b0c940690..0978a81abf 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -286,6 +286,7 @@ GameObject: - component: {fileID: 5384802789636426731} - component: {fileID: 6715720694820581294} - component: {fileID: 7380475602189920449} + - component: {fileID: 7321521861390107462} m_Layer: 0 m_Name: tabbox m_TagString: Untagged @@ -366,6 +367,35 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7321521861390107462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 642980662735143318} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 2609ccd74e672d84c8e128abd8dc9428, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &691946464718676944 GameObject: m_ObjectHideFlags: 0 @@ -2508,8 +2538,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1968, y: -889} - m_SizeDelta: {x: 890.93, y: 260.6} + m_AnchoredPosition: {x: 683, y: 1225} + m_SizeDelta: {x: 890.93, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4924746880912058518 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index e8915f9d60..a722139095 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -6143,8 +6143,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 1.3187} - m_SizeDelta: {x: 246, y: 367.23} + m_AnchoredPosition: {x: 0, y: 34.95} + m_SizeDelta: {x: 246, y: 299.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5026953602875523087 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab b/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab index add9f33deb..d372470480 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/FourTrailSingleHelpHero.prefab @@ -900,7 +900,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 3.2, y: 0.000039101} + m_AnchoredPosition: {x: 3.199997, y: 0.000038146973} m_SizeDelta: {x: -125.3, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5935883781838750552 @@ -985,7 +985,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 890.93, y: 260.6} + m_SizeDelta: {x: 910, y: 224} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5164179418648000028 CanvasRenderer: @@ -1008,14 +1008,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.5647059} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 578016bcc0473ff47a2694b7d2c27b1e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua index 7d5e53c266..59e05172dd 100644 --- a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua @@ -174,7 +174,10 @@ function FourElementSingleWave:SetIcon() self.rewardText.text = "扫荡奖励" self.fightBtnMask.sprite = Util.LoadSprite("r_hero_button_002") if self.freeTimes > 0 then + self.fightBtnIcon.gameObject:SetActive(false) + self.fightBtnNum.gameObject:SetActive(false) self.fightBtnText.text = string.format("%s","17232A","免费扫荡") + Util.SetGray(self.fight,false) else self.fightBtnIcon.gameObject:SetActive(true) self.fightBtnNum.gameObject:SetActive(true) @@ -195,11 +198,14 @@ function FourElementSingleWave:SetIcon() self.rewardData = self.data.firstReward if self.data.wave == self.trailData.monsterWave + 1 then --设置挑战fight + self.fightBtnIcon.gameObject:SetActive(false) + self.fightBtnNum.gameObject:SetActive(false) self.fightBtnMask:GetComponent("Image").sprite = Util.LoadSprite("r_hero_button_001") self.fightBtnText.text = string.format("%s","17232A","挑战") else self.fight.gameObject:SetActive(false) end + Util.SetGray(self.fight,false) end end diff --git a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua index b7cae028b3..6b80cf485f 100644 --- a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua +++ b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua @@ -1,6 +1,12 @@  FourTrailSingleHelpHero = {} local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) +local redTrailType = { + [1] = RedPointType.PersonTrailHelp, + [2] = RedPointType.BuddishTrailHelp, + [3] = RedPointType.DemonTrailHelp, + [4] = RedPointType.TaoistTrailHelp, +} function FourTrailSingleHelpHero:New(gameObject) local b = {} b.gameObject = gameObject @@ -157,6 +163,7 @@ function FourTrailSingleHelpHero:SetIcon2(heroData) local item = msg.drop.itemlist[1] PopupTipPanel.ShowTip(string.format("已选择神将,获得%s%s",item.itemNum,ConfigManager.GetConfigData(ConfigName.ItemConfig,item.itemId).Name)) end + CheckRedPointStatus(redTrailType[self.curType]) self:SetIcon2(heroData) end) end