From 10e8da678a0a12130ccfec22f7c464ba9f83861d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 24 Feb 2021 14:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E5=AF=BB=E5=AE=9D=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FindTreasureDispatchPanel.prefab | 18 +- .../FindTreasure/FindTreasureMainPanel.prefab | 171 ++++++++++++++---- .../FindTreasure/FindTreasureVipPopup.prefab | 12 +- .../FindTreasureDispatchPanel.lua | 3 + .../FindTreasure/FindTreasureMainPanel.lua | 9 +- .../FindTreasure/FindTreasureVipPopup.lua | 10 + 6 files changed, 170 insertions(+), 53 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab index de2765d231..908812b0b6 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab @@ -1668,8 +1668,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1365269698747770286 CanvasRenderer: @@ -1711,7 +1711,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u6D3E \u9063" LanguageIndex: 0 --- !u!1 &1356996306934603565 @@ -6928,8 +6928,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: -1.44, y: -1.72} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3845921846944542031 CanvasRenderer: @@ -6969,9 +6969,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u4E00\u952E\u6D3E\u9063" LanguageIndex: 0 --- !u!1 &4008811073349812788 @@ -7009,7 +7009,7 @@ RectTransform: 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: 160, y: 30} + m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4057958642829890736 CanvasRenderer: @@ -7049,7 +7049,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5BFB\u5B9D\u6761\u4EF6" diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab index dd0b72052d..1cce2f9cee 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 5278127890882629374} 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_AnchoredPosition: {x: -37.7, y: -4.9} - m_SizeDelta: {x: 160, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8103322622242620384 CanvasRenderer: @@ -1843,8 +1843,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: 0.2} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.96, y: 1.16} + m_SizeDelta: {x: 207.95, y: 62.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8715871964931542575 CanvasRenderer: @@ -1884,9 +1884,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u4E00\u952E\u9886\u53D6" LanguageIndex: 10586 --- !u!1 &2478174538173691587 @@ -2521,8 +2521,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: -1.2} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0.17499, y: 0.77001} + m_SizeDelta: {x: 210.22, y: 62.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3795194594525967566 CanvasRenderer: @@ -2562,9 +2562,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u514D\u8D39\u5237\u65B0" LanguageIndex: 10442 --- !u!1 &3561582130445023091 @@ -8049,7 +8049,7 @@ ParticleSystem: --- !u!199 &1472261994721625855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -8262,17 +8262,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5288388655837948017} - 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: 5278127890882629374} - m_RootOrder: 1 + m_Father: {fileID: 4360609367368554482} + 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_AnchoredPosition: {x: -2.7, y: -1.2} - m_SizeDelta: {x: 65.62, y: 65.62} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 65, y: 65.62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2455842554165844241 CanvasRenderer: @@ -8631,8 +8631,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: -77, y: -26} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -68.04, y: 0} + m_SizeDelta: {x: 79.48, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4357818227745408231 CanvasRenderer: @@ -8664,7 +8664,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 45 + m_FontSize: 38 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -8672,10 +8672,10 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5237\u65B0\n" + m_Text: "\u5237\u65B0" LanguageIndex: 10585 --- !u!1 &5762150164214586152 GameObject: @@ -8686,6 +8686,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5278127890882629374} + - component: {fileID: 1960655619818842684} + - component: {fileID: 9118257187143126115} m_Layer: 5 m_Name: consumeObj m_TagString: Untagged @@ -8705,16 +8707,53 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 763884535534081445} - - {fileID: 188972774718878374} + - {fileID: 4360609367368554482} - {fileID: 1675313321567214563} m_Father: {fileID: 4064920267025176055} 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: -173.34503, y: -20.639984} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -140, y: -20.639984} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1960655619818842684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762150164214586152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &9118257187143126115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762150164214586152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &5833529871443721560 GameObject: m_ObjectHideFlags: 0 @@ -8751,8 +8790,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: 19.5, y: -0.51} - m_SizeDelta: {x: 65.45, y: 65.45} + m_AnchoredPosition: {x: 2.55, y: 0.77} + m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &805268058829116413 CanvasRenderer: @@ -10108,10 +10147,10 @@ RectTransform: m_Father: {fileID: 5278127890882629374} 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: 111.2, y: -5.9} - m_SizeDelta: {x: 160, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3526842707782351193 CanvasRenderer: @@ -14668,7 +14707,7 @@ ParticleSystem: --- !u!199 &1107171649523788123 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15131,6 +15170,66 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9886 \u53D6" LanguageIndex: 10208 +--- !u!1 &8613810599208026521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4360609367368554482} + - component: {fileID: 5665011339865759066} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4360609367368554482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8613810599208026521} + 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: + - {fileID: 188972774718878374} + m_Father: {fileID: 5278127890882629374} + m_RootOrder: 1 + 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_SizeDelta: {x: 0, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5665011339865759066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8613810599208026521} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8678887667588345380 GameObject: m_ObjectHideFlags: 0 @@ -19997,7 +20096,7 @@ ParticleSystem: --- !u!199 &8428054502987121459 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureVipPopup.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureVipPopup.prefab index b7660553c0..343030a623 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureVipPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureVipPopup.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2, y: -1.2} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 130, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1770140345402505148 CanvasRenderer: @@ -896,7 +896,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1, y: 1.5} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 130, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5463057816871727187 CanvasRenderer: @@ -1055,8 +1055,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: -2, y: -1.2} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 1.52, y: 0.5500002} + m_SizeDelta: {x: 130, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &397460999363747225 CanvasRenderer: @@ -1591,8 +1591,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: 1, y: 1.5} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 2.92, y: 0} + m_SizeDelta: {x: 130, y: 52.02} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3127603974678062071 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index 83f8772e8d..10923dfdb4 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -29,6 +29,7 @@ function FindTreasureDispatchPanel:InitComponent() self.BtnBack = Util.GetGameObject(self.transform, "btnBack") self.btnSure = Util.GetGameObject(self.transform, "btnSure") self.btnAutoSure = Util.GetGameObject(self.transform, "btnAutoSure") + self.btnAutoSureText = Util.GetGameObject(self.transform, "btnAutoSure/Text"):GetComponent("Text") self.cardPre = Util.GetGameObject(self.gameObject, "item") self.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") @@ -156,6 +157,8 @@ function FindTreasureDispatchPanel:OnShow() self.matreiaText.text = BagManager.GetItemCountById(FindTreasureManager.materialItemId) .. "/"..takeItemNum self.timeText.text = self:TimeStampToDateString(conFigData.WasteTime) if BagManager.GetItemCountById(FindTreasureManager.materialItemId) < takeItemNum then isMaterial = false end + + self.btnAutoSureText.fontSize = GetCurLanguage() == 0 and 45 or 40 end function FindTreasureDispatchPanel:OnShowPanelData(_allHeroData) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua index 56455f99a6..d22d60d54b 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua @@ -19,6 +19,7 @@ function FindTreasureMainPanel:InitComponent() self.findTreasureVipBtn = Util.GetGameObject(self.gameObject, "FindTreasureVipBtn") self.findTreasureVipBtnRedPoint = Util.GetGameObject(self.gameObject, "FindTreasureVipBtn/redPoint") self.allGetBtn = Util.GetGameObject(self.gameObject, "allGetBtn") + self.allGetBtnText = Util.GetGameObject(self.gameObject, "allGetBtn/Text"):GetComponent("Text") -- self.findTreasureGridGo = Util.GetGameObject(self.gameObject, "rect/rect (1)/grid") self.rewardPre = Util.GetGameObject(self.gameObject, "rewardPre") -- for i = 1, 2 do @@ -47,6 +48,7 @@ function FindTreasureMainPanel:InitComponent() self.refreshBtn = Util.GetGameObject(self.gameObject, "refreshBtn") self.refreshBtnText = Util.GetGameObject(self.gameObject, "refreshBtn/Text") self.refreshImageGo = Util.GetGameObject(self.gameObject, "refreshBtn/refreshImage") + self.refreshImageText = Util.GetGameObject(self.gameObject, "refreshBtn/refreshImage/Text (1)"):GetComponent("Text") self.refreshBtnNumText = Util.GetGameObject(self.gameObject, "refreshBtn/refreshImage/numText"):GetComponent("Text") self.refreshBtnImage = Util.GetGameObject(self.gameObject, "refreshBtn/refreshImage"):GetComponent("Image") @@ -253,7 +255,10 @@ function FindTreasureMainPanel:OnShowPanelData(isSort) --Log("83 itemNum "..itemNum) --Log("79 RefreshItemNum "..RefreshItemNum) self.refreshBtnText:SetActive(itemNum > 0) + self.refreshBtnText:GetComponent("Text").fontSize = GetCurLanguage() ~= 2 and 45 or 35 self.refreshImageGo:SetActive(itemNum <= 0) + self.allGetBtnText.fontSize = GetCurLanguage() ~= 2 and 45 or 35 + self.refreshImageText.fontSize = GetCurLanguage() ~= 2 and 38 or 28 if itemNum <= 0 then if RefreshItemNum > 0 then--劵有时花卷 没时候花妖晶 self.refreshBtnNumText.text = mazeTreasureSetting.RefreshItem[2] @@ -348,10 +353,10 @@ function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,reward local quickGetButtonNumText = Util.GetGameObject(activityRewardGo.gameObject, "quickGetButton/numText"):GetComponent("Text") local getFinishText = Util.GetGameObject(activityRewardGo.gameObject, "getFinishText") local consumeObj = Util.GetGameObject(activityRewardGo.gameObject, "consumeObj") - local consumeObjImage = Util.GetGameObject(activityRewardGo.gameObject, "consumeObj/Image"):GetComponent("Image") + local consumeObjImage = Util.GetGameObject(activityRewardGo.gameObject, "consumeObj/Image/Image"):GetComponent("Image") local consumeObjNumText = Util.GetGameObject(activityRewardGo.gameObject, "consumeObj/numText"):GetComponent("Text") local timeTextGo = Util.GetGameObject(activityRewardGo.gameObject, "timeObject") - LogGreen("rewardData "..rewardData.missionId.." "..rewardData.state.." "..sConFigData.Desc) + -- LogGreen("rewardData "..rewardData.missionId.." "..rewardData.state.." "..sConFigData.Desc) timeTextGo:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId > 0 ) grtButton:SetActive(rewardData.state == 1) jumpButton:SetActive(rewardData.state == 0 and rewardData.heroId and #rewardData.heroId <= 0) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua index 8ed64467d8..e27db74292 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureVipPopup.lua @@ -8,10 +8,14 @@ function FindTreasureVipPopup:InitComponent() self.descText1 = Util.GetGameObject(self.gameObject, "GameObject1/descText"):GetComponent("Text") self.jumpBtn1 = Util.GetGameObject(self.gameObject, "GameObject1/jumpBtn") self.finfsh1 = Util.GetGameObject(self.gameObject, "GameObject1/finish") + self.jumpBtn1Text = Util.GetGameObject(self.gameObject, "GameObject1/jumpBtn/Text"):GetComponent("Text") + self.finfsh1Text = Util.GetGameObject(self.gameObject, "GameObject1/finish/Text"):GetComponent("Text") self.descText2 = Util.GetGameObject(self.gameObject, "GameObject2/descText"):GetComponent("Text") self.jumpBtn2 = Util.GetGameObject(self.gameObject, "GameObject2/jumpBtn") self.finfsh2 = Util.GetGameObject(self.gameObject, "GameObject2/finish") + self.jumpBtn2Text = Util.GetGameObject(self.gameObject, "GameObject2/jumpBtn/Text"):GetComponent("Text") + self.finfsh2Text = Util.GetGameObject(self.gameObject, "GameObject2/finish/Text"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -49,6 +53,8 @@ function FindTreasureVipPopup:OnShow() local desc = string.split(GetLanguageStrById(MazeTreasureSetting[1].DescDailyPrivilege), "#") self.descText1.text = string.gsub(desc[1],"|","#") self.descText2.text = string.gsub(desc[2],"|","#") + self.descText1.fontSize = GetCurLanguage() ~= 2 and 30 or 28 + self.descText2.fontSize = GetCurLanguage() ~= 2 and 30 or 25 local gaoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.GoFindTreasure) local haoState = PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.HaoFindTreasure) @@ -56,6 +62,10 @@ function FindTreasureVipPopup:OnShow() self.finfsh1:SetActive(gaoState) self.jumpBtn2:SetActive(not haoState) self.finfsh2:SetActive(haoState) + self.jumpBtn1Text.fontSize = GetCurLanguage() ~= 2 and 35 or 20 + self.jumpBtn2Text.fontSize = GetCurLanguage() ~= 2 and 35 or 20 + self.finfsh1Text.fontSize = GetCurLanguage() ~= 2 and 35 or 20 + self.finfsh2Text.fontSize = GetCurLanguage() ~= 2 and 35 or 20 end --界面关闭时调用(用于子类重写)