From 40610b0c1970f7b03368701e24df479ff62d32fd Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 31 Aug 2020 18:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=AE=E7=A5=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 80 +++++++++++++++++++ .../ManagedResources/~Lua/Common/Language.lua | 3 +- .../View/GeneralPopup_ResolveDismantle.lua | 10 ++- .../Resolve/View/Resolve_Dismantle.lua | 2 +- 4 files changed, 92 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index a3be21b0db..05446e2739 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -3466,6 +3466,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1854288102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1854288103} + - component: {fileID: 1854288105} + - component: {fileID: 1854288104} + m_Layer: 5 + m_Name: FourStarUpTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1854288103 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854288102} + 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: 99061827347249233} + 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: -181} + m_SizeDelta: {x: 896.2, y: 103.95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1854288105 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854288102} + m_CullTransparentMesh: 0 +--- !u!114 &1854288104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854288102} + 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.92549026, g: 0.8588236, b: 0.74509805, a: 1} + m_RaycastTarget: 0 + 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5305\u542B4\u661F\u6216\u66F4\u9AD8\u661F\u7EA7\u7684\u795E\u5C06" --- !u!1 &2094983473 GameObject: m_ObjectHideFlags: 0 @@ -4081,6 +4160,7 @@ RectTransform: - {fileID: 842539747175188767} - {fileID: 4223901690703525666} - {fileID: 2653261043892842644} + - {fileID: 1854288103} m_Father: {fileID: 2925180131101153177} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 7ac8e4d51d..9a55bfd7c7 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1879,7 +1879,7 @@ [11878] = "升星被动技能id ", [11879] = "新增技能", [11880] = "道具不足!", - [11881] = "赠送1个元神玉和20个置换玉", + [11881] = "赠送1个元神玉", [11882] = "赠送1个妖灵玉", [11883] = "活动结束!", [11884] = "赠送10个元神玉", @@ -2387,4 +2387,5 @@ [12386] = "极速排名", [12387] = "军团副本", [12388] = "该神将在巅峰战阵容中已上阵", + [12389] = "包含4星或更高星级的神将", } diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua index 2535204bb4..8956627ce5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua @@ -19,6 +19,8 @@ function this:InitComponent(gameObject) this.bodyText=Util.GetGameObject(gameObject,"BodyText"):GetComponent("Text") this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn") this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn") + this.FourStarUpTip=Util.GetGameObject(gameObject,"FourStarUpTip") + Util.GetGameObject(gameObject,"FourStarUpTip"):GetComponent("Text").text = Language[12389] --滚动条根节点 this.root = Util.GetGameObject(gameObject, "Root") @@ -56,7 +58,13 @@ function this:OnShow(_parent,...) local args = {...} dropList = args[1] selectHeroData=args[2] - + local isShowFourStarUpTip = false + for k,v in pairs(selectHeroData) do + if v.star >= 4 then + isShowFourStarUpTip = true + end + end + this.FourStarUpTip:SetActive(isShowFourStarUpTip) this.titleText.text=Language[11643] --返还比 local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,35).Value)/100 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 56d1670d25..bb8fb14646 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -193,7 +193,7 @@ function this.QuickSelectListData(type) if type == 1 then selectHeroData={} for k, v in pairs(tarHero) do - if LengthOfTable(selectHeroData)