From d21ebe57bbdd5d33e98cb5f7e6700ddc302d1b69 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 9 Jun 2021 20:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=912?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonsterCamp/MonsterCampNewPanel.prefab | 83 ++++++++++++++++++- .../MonsterCamp/MonsterCampNewPanel.lua | 2 +- .../~Lua/View/MonsterCampSingleWave.lua | 5 +- 3 files changed, 84 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index 5b3e14bb39..2550095903 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -1943,6 +1943,7 @@ RectTransform: - {fileID: 36710699440588707} - {fileID: 36710699706665151} - {fileID: 319346788655540141} + - {fileID: 1638008210914493715} m_Father: {fileID: 1370899235566794450} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4360,9 +4361,9 @@ RectTransform: m_Father: {fileID: 3260027997770271091} m_RootOrder: 2 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: -8.9, y: 829.7} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -8.9, y: -130.29999} m_SizeDelta: {x: 257, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1978896024203804663 @@ -5245,7 +5246,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.99215686, g: 0.92156863, b: 0.7607843, a: 1} + m_Color: {r: 0.9921569, g: 0.6745098, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -12523,6 +12524,80 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &8434516540341639129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1638008210914493715} + - component: {fileID: 1209380748850859581} + - component: {fileID: 7060167941869638567} + m_Layer: 5 + m_Name: finishImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1638008210914493715 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8434516540341639129} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 260746988764377451} + m_RootOrder: 15 + 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.34255, y: 23.664988} + m_SizeDelta: {x: 285.32, y: 424.53} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1209380748850859581 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8434516540341639129} + m_CullTransparentMesh: 0 +--- !u!114 &7060167941869638567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8434516540341639129} + 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: 0 + 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: 1a8144852a7b0f648b611da6133cdfde, 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 &8515440308364414431 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index 3ae64574d6..c5e398d80e 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -46,7 +46,7 @@ function MonsterCampNewPanel:InitComponent() this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn") this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank") this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight") - this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("g_guanka_tongguanjiangli_zh") + this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("g_guanka_tongguanjiangli_zh") end --绑定事件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua index 12ac5f2532..f9cf312418 100644 --- a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua @@ -41,7 +41,8 @@ function MonsterCampSingleWave:InitComponent(go,_data) self.btn=Util.GetGameObject(go,"bg/btn") self.data = _data - + Util.GetGameObject(self.hero, "finishImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("s_silingshilian_yitongguan_zh") + self.finishImage = Util.GetGameObject(self.hero, "finishImage") self.rewardList = {} for i = 1, self.rewardGrid.transform.childCount do local temp = self:NewItemView(SubUIConfig.ItemView, self.rewardGrid.transform:GetChild(i-1).gameObject) @@ -211,10 +212,12 @@ function MonsterCampSingleWave:SetIcon() Util.SetGray(self.fight,false) self.hero.transform.localPosition = Vector3.New(0,-33,0) self.fight.gameObject:SetActive(false) + self.finishImage.gameObject:SetActive(false) self.fightBtnIcon.gameObject:SetActive(false) self.fightBtnNum.gameObject:SetActive(false) self.rewardText.text = "奖励" if self.data.Id < MonsterCampManager.monsterWave - 1 then + self.finishImage.gameObject:SetActive(true) elseif self.data.Id == MonsterCampManager.monsterWave - 1 then--扫荡 -- self.rewardText.text = "扫荡奖励" self.fight.gameObject:SetActive(true)