From 239f8c50e42c86a687303a277773f5729813975c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 20 May 2021 16:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A4=BE=E7=A8=B7=E5=A4=A7=E5=85=B8?= =?UTF-8?q?=E3=80=91=E5=A5=96=E5=8A=B1=E6=8F=90=E7=A4=BA=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralRankRewardPanel.prefab | 83 ++++++++++++++++++- .../GeneralPanel/GeneralRankRewardPanel.lua | 7 ++ 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab index b48c9b7b1c..43048261b8 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab @@ -1824,6 +1824,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8668657611625403729} + - {fileID: 5504859140887548415} m_Father: {fileID: 7762200945649804485} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3224,6 +3225,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7CFB\u7EDF\u7CFB\u7EDF" LanguageIndex: 0 +--- !u!1 &8670598815330534361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5504859140887548415} + - component: {fileID: 2745569501434497595} + - component: {fileID: 5919797093109403205} + m_Layer: 0 + m_Name: Text2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5504859140887548415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8670598815330534361} + 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: 3868607663952482914} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 54} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2745569501434497595 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8670598815330534361} + m_CullTransparentMesh: 0 +--- !u!114 &5919797093109403205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8670598815330534361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.98823535, g: 0.9294118, b: 0.76470596, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6392\u884C\u5956\u52B1\u5C06\u5728\u6D3B\u52A8\u7ED3\u675F\u540E\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E" + LanguageIndex: 0 --- !u!1 &8751832165543929816 GameObject: m_ObjectHideFlags: 0 @@ -3315,7 +3396,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7575865812575048841 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 59d9c26799..580b70adfe 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -47,6 +47,7 @@ function GeneralRankRewardPanel:InitComponent() this.myRankNum = Util.GetGameObject(self.gameObject, "content1/myRank/num"):GetComponent("Text") this.text = Util.GetGameObject(this.arenaBottom, "tips/Text"):GetComponent("Text") + this.text2 = Util.GetGameObject(this.arenaBottom, "tips/Text2"):GetComponent("Text") local v2 = Util.GetGameObject(self.gameObject, "content1/scrollRect"):GetComponent("RectTransform").rect this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "content1/scrollRect").transform, @@ -85,6 +86,8 @@ end -- tab改变回调事件 function this.OnTabChange(index) tabNum = index + this.text2.text = "" + this.text2.color = UIColor.WRITE if curRankType == 2 then this.ShowRewardInfo() local type = tabNum == 1 and RANK_TYPE.GOLD_EXPER or RANK_TYPE.CELEBRATION_GUILD @@ -92,6 +95,10 @@ function this.OnTabChange(index) local rank = myRankData.rank > 0 and myRankData.rank or Language[10036] this.text.text = Language[10103]..rank end) + if type == RANK_TYPE.GOLD_EXPER then + this.text2.text = string.format("前10名奖励需个人贡献值需达到%s分才能获取", 2500) + this.text2.color = UIColor.RED + end elseif curRankType == 3 then this.ShowRewardInfo() this.text.text = Language[10758]