From bf1e1f69e6a294381a4672af51087ad105fc7f70 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 18 Jun 2021 19:13:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A5=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E6=A0=87=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/UpStarPre.prefab | 77 ++++++++++++++++++- .../~Lua/Modules/UpStar/UpStarPre.lua | 10 ++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab index eaccfb852c..dc72f9760e 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarPre.prefab @@ -253,6 +253,80 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1133864347720707026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8252189805900669551} + - component: {fileID: 7080327840937121481} + - component: {fileID: 2580739884167340815} + m_Layer: 5 + m_Name: Get + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8252189805900669551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133864347720707026} + 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: 2418450038452822760} + m_RootOrder: 1 + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7080327840937121481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133864347720707026} + m_CullTransparentMesh: 0 +--- !u!114 &2580739884167340815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133864347720707026} + 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: 84b137e960461f44082b1491d6ce5b7b, 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 &1451235582569363938 GameObject: m_ObjectHideFlags: 0 @@ -288,7 +362,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 140, y: 0} m_SizeDelta: {x: 0, y: 61.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &170924767488423321 @@ -375,6 +449,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2112725178528502482} + - {fileID: 8252189805900669551} m_Father: {fileID: 8749964550444904214} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua index cff0cf596d..448c0e23eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua @@ -129,11 +129,12 @@ function UpStarPre:SetShows(key,shows,parent) self.itemList[key][i] = {} self.itemList[key][i].go = newObjToParent(self.itemPre,parent) self.itemList[key][i].lock = Util.GetGameObject(self.itemList[key][i].go, "lock") + self.itemList[key][i].Get = Util.GetGameObject(self.itemList[key][i].go, "Get") + self.itemList[key][i].Get.gameObject:SetActive(false) if self.data.state == 0 then if key == 1 then self.title.text = string.format("%s星解锁",shows[i][4]) end - self.itemList[key][i].lock.gameObject:SetActive(true) else self.title.text = "" @@ -149,6 +150,13 @@ function UpStarPre:SetShows(key,shows,parent) end function UpStarPre:SetBtn1() + for i = 1,#self.itemList[2] do + if self.data.state == 2 then + self.itemList[2][i].Get.gameObject:SetActive(true) + else + self.itemList[2][i].Get.gameObject:SetActive(false) + end + end if self.data.state == 1 then self.GetBtn.enabled = true self.redPoint.gameObject:SetActive(true)