From c28721699529d051fe7abbb4ca3241f54869ba65 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 31 Mar 2021 14:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91=E9=99=90?= =?UTF-8?q?=E6=97=B6=E7=A5=9E=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TimeLimitSkin/TimeLimitSkinPanel.prefab | 68 ++++++++++++------- .../TimeLimitSkin/TimeLimitSkinPanel.lua | 2 +- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab index 246df2b687..83f4b5325e 100644 --- a/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TimeLimitSkin/TimeLimitSkinPanel.prefab @@ -27,16 +27,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470611551464042855} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4168792694004356739} - m_RootOrder: 1 + m_Father: {fileID: 8025763709527437539} + m_RootOrder: 4 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: 421, y: 1234.4} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -91, y: -457} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6818307923743883987 @@ -167,7 +167,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4168792694004356739} - m_RootOrder: 3 + 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} @@ -245,13 +245,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3919850184491735118} - - {fileID: 983813710301897452} - {fileID: 6231850540444929965} - {fileID: 3339472883357455100} - {fileID: 9147922952771934793} - {fileID: 6168525265727620343} m_Father: {fileID: 8025763709527437539} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -369,11 +368,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8025763709527437539} - m_RootOrder: 6 + m_RootOrder: 7 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: -471, y: -858} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 70, y: 90} m_SizeDelta: {x: 140, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3487649743076382030 @@ -503,7 +502,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8025763709527437539} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -594,7 +593,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4168792694004356739} - m_RootOrder: 2 + 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} @@ -635,6 +634,7 @@ GameObject: - component: {fileID: 4831754600885414914} - component: {fileID: 6204781252442423145} - component: {fileID: 1246551212664164334} + - component: {fileID: 2585591110589829969} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -657,10 +657,10 @@ RectTransform: m_Father: {fileID: 8025763709527437539} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6204781252442423145 CanvasRenderer: @@ -699,6 +699,23 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2585591110589829969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5680570970613505688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} + m_Name: + m_EditorClassIdentifier: + bgList: + - {fileID: 5680570970613505688} + - {fileID: 6372519556189277661} + - {fileID: 8526276543331923421} + - {fileID: 8611072837413772848} --- !u!1 &6009400694693020389 GameObject: m_ObjectHideFlags: 0 @@ -728,7 +745,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8025763709527437539} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -881,7 +898,7 @@ RectTransform: m_Children: - {fileID: 4108124120628740106} m_Father: {fileID: 4168792694004356739} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1247,6 +1264,7 @@ RectTransform: - {fileID: 8384333607727542368} - {fileID: 5611331400449016201} - {fileID: 5550562219189219446} + - {fileID: 983813710301897452} - {fileID: 4168792694004356739} - {fileID: 4221653497422039268} - {fileID: 2476437939275858206} @@ -1328,7 +1346,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4168792694004356739} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1410,10 +1428,10 @@ RectTransform: m_Father: {fileID: 4831754600885414914} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7924323760680267654 CanvasRenderer: @@ -1576,7 +1594,7 @@ PrefabInstance: - target: {fileID: 1838372303905070877, guid: db727bed1bc26784b8deed5f24c8cf79, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1838372303905070877, guid: db727bed1bc26784b8deed5f24c8cf79, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua index d78bae0623..d9433bca69 100644 --- a/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TimeLimitSkin/TimeLimitSkinPanel.lua @@ -10,7 +10,7 @@ local _ItemViewList = {} function TimeLimitSkin:InitComponent() this.backBtn = Util.GetGameObject(self.gameObject,"backBtn") this.time = Util.GetGameObject(self.gameObject,"show/time"):GetComponent("Text") - this.previewBtn = Util.GetGameObject(self.gameObject,"show/previewBtn") + this.previewBtn = Util.GetGameObject(self.gameObject,"previewBtn") this.attri = Util.GetGameObject(self.gameObject,"show/attribute"):GetComponent("Text") this.buyBtn = Util.GetGameObject(self.gameObject,"show/buyBtn") this.reward = Util.GetGameObject(self.gameObject,"show/reward")