From 9e287e969b7c13ac525015b267746eaa49707114 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 7 Jun 2024 19:57:40 +0800 Subject: [PATCH] =?UTF-8?q?0.1=E6=8A=98=E6=89=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZeroPointOneMissionPanel.prefab | 94 +++++++++++++++++-- .../UI/EightDayGift/ZeroPointOnePanel.prefab | 84 ++++++++++++++++- .../Modules/EightDay/ZeroPointOnePanel.lua | 3 +- 3 files changed, 171 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab index afb44b3c70..1da28a5fc4 100644 --- a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOneMissionPanel.prefab @@ -1,5 +1,84 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &105401004182425247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1667597859189722562} + - component: {fileID: 6583424891324042316} + - component: {fileID: 5818193953583377883} + m_Layer: 5 + m_Name: info2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1667597859189722562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105401004182425247} + 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: 4386142345502020838} + 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} + m_AnchoredPosition: {x: 3.1, y: 286.6} + m_SizeDelta: {x: 636.4, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6583424891324042316 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105401004182425247} + m_CullTransparentMesh: 0 +--- !u!114 &5818193953583377883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105401004182425247} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6792453, g: 0.40967014, b: 0.14417945, a: 0.88235295} + 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6BCF\u4E2A\u6863\u4F4D\u9650\u8D2D\u6B21\u6570\u4E0A\u9650\u4E3A10\u6B21\uFF0C\u8D85\u51FA\u90E8\u5206\u4E0D\u518D\u7D2F\u8BA1\u6B21\u6570" --- !u!1 &939292615496588645 GameObject: m_ObjectHideFlags: 0 @@ -34,8 +113,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: -196, y: 323} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 7.5, y: 323} + m_SizeDelta: {x: 645.2, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &939292615496588646 CanvasRenderer: @@ -58,7 +137,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.92549026, g: 0.7058824, b: 0.3019608, a: 1} + m_Color: {r: 0.6792453, g: 0.40967014, b: 0.14417945, a: 0.88235295} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -72,13 +151,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4EFB\u52A1\u6BCF\u65E50\u70B9\u5237\u65B0" + m_Text: "\u4EFB\u52A1\u6BCF\u65E50\u70B9\u5237\u65B0 \u5B8C\u6210\u6307\u5B9A\u4EFB\u52A1\u589E\u52A0\u6B21\u6570" --- !u!1 &1245655103351528457 GameObject: m_ObjectHideFlags: 0 @@ -111,8 +190,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: -82} - m_SizeDelta: {x: 642.6, y: 686} + m_AnchoredPosition: {x: 0, y: -99.1} + m_SizeDelta: {x: 642.6, y: 651.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3190547112957765004 GameObject: @@ -227,6 +306,7 @@ RectTransform: - {fileID: 3695524975965647850} - {fileID: 3003317230655257774} - {fileID: 939292615496588644} + - {fileID: 1667597859189722562} m_Father: {fileID: 3380683485130715011} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab index 03495831d6..d31e4d3a3c 100644 --- a/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/EightDayGift/ZeroPointOnePanel.prefab @@ -6016,7 +6016,7 @@ 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: -696} + m_AnchoredPosition: {x: 0, y: -660} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6454889608471836892 @@ -6482,6 +6482,85 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5237\u65B00.1\u62981\u6B21" +--- !u!1 &2560680095143396781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5298451826559049031} + - component: {fileID: 5482494292953206081} + - component: {fileID: 8712930667000073848} + m_Layer: 5 + m_Name: refreshTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5298451826559049031 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2560680095143396781} + 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: 6077850415073973405} + 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} + m_AnchoredPosition: {x: 0, y: -720} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5482494292953206081 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2560680095143396781} + m_CullTransparentMesh: 0 +--- !u!114 &8712930667000073848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2560680095143396781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6792453, g: 0.40967014, b: 0.14417945, a: 0.88235295} + 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: New Text --- !u!1 &2733993419522306014 GameObject: m_ObjectHideFlags: 0 @@ -22140,6 +22219,7 @@ RectTransform: - {fileID: 4774588663108910} - {fileID: 38417487231569506} - {fileID: 1962601901498433989} + - {fileID: 5298451826559049031} m_Father: {fileID: 347573386479821606} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27308,7 +27388,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 226, y: 306} - m_Spacing: {x: 10, y: 30} + m_Spacing: {x: 10, y: 20} m_Constraint: 1 m_ConstraintCount: 4 --- !u!1 &8492298996012635124 diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/ZeroPointOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/ZeroPointOnePanel.lua index 2f919d82d7..4206a943d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/ZeroPointOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/ZeroPointOnePanel.lua @@ -31,7 +31,7 @@ function ZeroPointOnePanel:InitComponent() this.badeffect = Util.GetGameObject(this.effect,"Partical/uv_zi") this.badeffect:SetActive(false) this.btn_refresh=Util.GetGameObject(this.gameObject,"panel/btn_refresh") - + this.refreshTxt=Util.GetGameObject(this.gameObject,"panel/refreshTxt"):GetComponent("Text") end @@ -72,6 +72,7 @@ function ZeroPointOnePanel:Refresh() end Util.SetGray(this.btn_refresh,refreshNum<=0)--已经领取置灰 this.btn_refresh:GetComponent("Button").interactable = refreshNum>0--不可点击 + this.refreshTxt.text=string.format("可刷新%s次",refreshNum) this.SetAllReward() end