From 50b9f82c5ab2dc5e284c187d9ae88c26c3109862 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Wed, 20 Dec 2023 16:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E8=AE=AD=E5=8A=A0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=20=E6=9C=88=E5=8D=A1=E6=98=BE=E7=A4=BA=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/HomeLand/TrainBuildLvUpPanel.prefab | 82 ++++++++++++++++++- .../UI/MonthCardPageView/MonthCardPage.prefab | 8 +- .../Modules/HomeLand/TrainBuildLvUpPanel.lua | 2 + .../~Lua/Modules/Operating/MonthCardPage.lua | 4 +- 4 files changed, 89 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab index 51c3a587cf..a23569b37f 100644 --- a/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HomeLand/TrainBuildLvUpPanel.prefab @@ -2399,6 +2399,7 @@ RectTransform: - {fileID: 8757155620257076546} - {fileID: 1948378571384027056} - {fileID: 2556124757473444988} + - {fileID: 9092983290776013051} m_Father: {fileID: 4835946820273722355} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2539,6 +2540,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &7778100243028385986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9092983290776013051} + - component: {fileID: 3617411476755547686} + - component: {fileID: 434135635586240420} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9092983290776013051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7778100243028385986} + 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: 7374197698741745126} + 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: 1.1, y: 195} + m_SizeDelta: {x: 729.8, y: 114} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3617411476755547686 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7778100243028385986} + m_CullTransparentMesh: 0 +--- !u!114 &434135635586240420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7778100243028385986} + 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.6431373, g: 0.4862745, b: 0.19215687, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + 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: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &7880084144206704793 GameObject: m_ObjectHideFlags: 0 @@ -2958,7 +3038,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: 61} + m_AnchoredPosition: {x: 0, y: -6} m_SizeDelta: {x: 800, y: 320} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8935431814318849300 diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab index 320e8e7fbd..bbf4be1187 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab @@ -828,7 +828,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: 278.57, y: 123} + m_AnchoredPosition: {x: 221, y: 73} m_SizeDelta: {x: -896.14, y: -705} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5872956027020472550 @@ -861,7 +861,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -3327,7 +3327,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: 278.57, y: 123} + m_AnchoredPosition: {x: 210, y: 78} m_SizeDelta: {x: -896.14, y: -705} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8555383026908658663 @@ -3360,7 +3360,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua index ec5e472857..f8b8d1cb59 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/TrainBuildLvUpPanel.lua @@ -21,6 +21,8 @@ function TrainBuildLvUpPanel:InitComponent() this.Content = Util.GetGameObject(this.gameObject,"Content") this.Obtain = Util.GetGameObject(this.Content,"Obtain") this.Cost = Util.GetGameObject(this.Content,"Cost") + this.tipInfo = Util.GetGameObject(this.gameObject,"tip"):GetComponent("Text") + this.tipInfo.text = "每个满级特训神将激活:所有神将礼物属性+5%(最高200%)所有神将礼物格子+1(最多开启40个神将礼物格子)" --Obtain this.limit = Util.GetGameObject(this.Obtain,"limit") this.gain = Util.GetGameObject(this.Obtain,"gain") diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 1d249bd552..463e34fb8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -183,8 +183,8 @@ function MonthCardPage:SetMonthCardTimes(i) self.cardPres[i].time:SetActive(true) local residueTimeNum = monthCardData.endingTime - GetTimeStamp() local dayNum = math.floor(residueTimeNum / (24 * 3600)) - --self.cardPres[i].time:GetComponent("Text").text = Language[10480] .. dayNum ..Language[10017] - self.cardPres[i].time:SetActive(false) + self.cardPres[i].time:GetComponent("Text").text = Language[10480] .. dayNum ..Language[10017] + self.cardPres[i].time:SetActive(true) else self.cardPres[i].time:SetActive(false) end