From 7cdf302e908dcc50ea3c602267986f428c761547 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sun, 24 Apr 2022 14:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=8D=B0=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Bag/BagPanel.prefab | 10 +- .../UI/GeneralPanel/GeneralBigPopup.prefab | 159 ++++++++++++++++-- .../~Lua/Common/GlobalDefine.lua | 1 + .../View/GeneralBigPopup_GodPrintUp.lua | 11 +- .../~Lua/Modules/GodPrint/GodPrintPanel.lua | 2 +- .../~Lua/Modules/GodPrint/GodPrintPopUp.lua | 85 +++++----- .../~Lua/Modules/GodPrint/GodPrintPopUpV2.lua | 4 +- 7 files changed, 206 insertions(+), 66 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab index efd733c2e1..2359e1e67a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab @@ -9659,7 +9659,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7708593339809397097 RectTransform: m_ObjectHideFlags: 0 @@ -9676,10 +9676,10 @@ RectTransform: m_Father: {fileID: 396553229042369325} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1205, y: -82} - m_SizeDelta: {x: 184, y: 126} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2753840214985009666 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 3191ccb268..4614462560 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -72,10 +72,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5168\u4F53\u795E\u5C06\u706D\u4F5B+2%" @@ -555,8 +555,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: 270.5} - m_SizeDelta: {x: 900, y: 133} + m_AnchoredPosition: {x: 0, y: 267.7} + m_SizeDelta: {x: 900, y: 160.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &163111710 MonoBehaviour: @@ -1089,6 +1089,7 @@ GameObject: - component: {fileID: 625498816} - component: {fileID: 5845350622295593739} - component: {fileID: 6295463953125275852} + - component: {fileID: 7469862961136109853} m_Layer: 5 m_Name: Obj m_TagString: Untagged @@ -1152,6 +1153,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7469862961136109853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625498815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6295463953125275852} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &698860520 GameObject: m_ObjectHideFlags: 0 @@ -1304,8 +1347,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 473.5, y: -80} - m_SizeDelta: {x: 853, y: 60} + m_AnchoredPosition: {x: 473.5, y: -78} + m_SizeDelta: {x: 853, y: 56.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &729931225 CanvasRenderer: @@ -1342,10 +1385,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5168\u4F53\u795E\u5C06\u706D\u4F5B+2%" @@ -1388,7 +1431,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -37.1} - m_SizeDelta: {x: 900, y: 124.2} + m_SizeDelta: {x: 900, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &794274111 MonoBehaviour: @@ -2537,7 +2580,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: 54.2, y: -50.9} + m_AnchoredPosition: {x: 54.2, y: -90} m_SizeDelta: {x: 16.22, y: 33.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1472422953 @@ -5555,6 +5598,7 @@ GameObject: - component: {fileID: 4327397916482905987} - component: {fileID: 2653167985050240692} - component: {fileID: 7066719372588098218} + - component: {fileID: 2448716844135999165} m_Layer: 5 m_Name: Obj m_TagString: Untagged @@ -5618,6 +5662,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2448716844135999165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230607366222055463} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7066719372588098218} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &264744814816159712 GameObject: m_ObjectHideFlags: 0 @@ -16476,7 +16562,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -25691,6 +25777,7 @@ GameObject: - component: {fileID: 6647561818014999786} - component: {fileID: 168764808739770700} - component: {fileID: 5768232195690746561} + - component: {fileID: 2245268330562873507} m_Layer: 5 m_Name: Obj m_TagString: Untagged @@ -25754,6 +25841,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2245268330562873507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5071822486276829357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5768232195690746561} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5083880161830746655 GameObject: m_ObjectHideFlags: 0 @@ -27755,7 +27884,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: 54.2, y: -50.9} + m_AnchoredPosition: {x: 54.2, y: -90} m_SizeDelta: {x: 16.22, y: 33.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5920624837821711060 @@ -31558,7 +31687,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: 54.2, y: -50.9} + m_AnchoredPosition: {x: 54.2, y: -90} m_SizeDelta: {x: 16.22, y: 33.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2733929508341948159 @@ -34585,7 +34714,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -36613,7 +36742,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 459c9c167f..baa3e09654 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1926,6 +1926,7 @@ HELP_TYPE = { jingjishilian = 122, HomeLand = 126, PowerRice = 127,--战力冲刺 + GodPrint=129,--神印 } NumToComplexFont = { diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua index 96df5826a4..ecb9459a8c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_GodPrintUp.lua @@ -19,6 +19,7 @@ local heroId=nil function this:InitComponent(gameObject) self.spLoader = SpriteLoader.New() this.titleTxt=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") + this.titleTxt.text="神印升品" this.frame=Util.GetGameObject(gameObject,"curGem"):GetComponent("Image") this.icon=Util.GetGameObject(gameObject,"curGem/icon"):GetComponent("Image") this.quan=Util.GetGameObject(gameObject,"curGem/quan"):GetComponent("Image") @@ -45,11 +46,9 @@ function this:BindEvent() SoundManager.PlaySound(SoundConfig.UI_Baoqi) PopupTipPanel.ShowTip("升品成功") parent:ClosePanel() - LogError("--11111111111111") --删除魂印 UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() - -- this.StartCompoundSoulPrint(curSelectSoulPrint, true) - LogError("22222222") + -- this.StartCompoundSoulPrint(curSelectSoulPrint, true) if func then func() end @@ -87,7 +86,8 @@ function this:OnShow(_parent,_args) if i<=#list then this.costList[i]:SetActive(true) this.costList[i]:GetComponent("Image").sprite=self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[list[i][1]].Quantity)) - Util.GetGameObject(this.costList[i],"Obj"):GetComponent("Image").sprite=self.spLoader:LoadSprite(GetResourcePath(itemConfig[list[i][1]].ResourceID)) + local btnObj=Util.GetGameObject(this.costList[i],"Obj") + btnObj:GetComponent("Image").sprite=self.spLoader:LoadSprite(GetResourcePath(itemConfig[list[i][1]].ResourceID)) local quan=Util.GetGameObject(this.costList[i],"quan"):GetComponent("Image") quan.gameObject:SetActive(itemConfig[list[i][1]].ItemBaseType==6) quan.sprite=self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[list[i][1]].Quantity].circle) @@ -102,6 +102,9 @@ function this:OnShow(_parent,_args) else numTxt.text=string.format("%s/%s",bagNum,list[i][2]) end + Util.AddClick(btnObj,function() + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemConfig[list[i][1]].Id,nil) + end) else this.costList[i]:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua index c337725e93..d344be512d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPanel.lua @@ -80,7 +80,7 @@ end function GodPrintPanel:BindEvent() --帮助按钮 Util.AddClick(this.helpBtn, function() - UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.SoulPrint,this.helpPosition.x,this.helpPosition.y) + UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.GodPrint,this.helpPosition.x,this.helpPosition.y) end) --向左切换英雄数据 Util.AddClick(this.leftBtn, function() diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua index b226ad12c6..57821792d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua @@ -48,6 +48,8 @@ function GodPrintPopUp:InitComponent() --魂印效果 self.midBar = Util.GetGameObject(self.transform, "Panel/midBar") self.effectText=Util.GetGameObject(self.midBar,"basePro/Info"):GetComponent("Text") + self.desText=Util.GetGameObject(self.midBar,"basePro/PropertyName"):GetComponent("Text") + self.desText.text="神印效果:" --适用范围(还没做具体内容) self.trialScope=Util.GetGameObject(self.midBar,"TrialScope") @@ -263,46 +265,51 @@ function GodPrintPopUp:RefreshShow(type) end end --适用范围 - local isOpenTrialScope=equipConfig[soulId].Range and equipConfig[soulId].Range[1]~=0 and equipConfig[soulId].Range[1]--是否开启适用 - if isOpenTrialScope then - self.trialScopeText.text = "以下神将可装备:" - self.scroll_1:SetActive(#equipConfig[soulId].Range<=3) - self.scroll_2:SetActive(#equipConfig[soulId].Range>3) - --适用英雄<=3时 固定长度生成(预设) 反之使用优化滚动条 - if #equipConfig[soulId].Range<=3 then - for j = 0, self.scroll_1.transform.childCount-1 do - self.scroll_1.transform:GetChild(j).gameObject:SetActive(false) - end - for i = 1, #equipConfig[soulId].Range do--遍历每个适用英雄 - local item= proList[i] - if not item then - item= newObjToParent(self.trialScopePre,self.scroll_1) - item.name="ProPre"..i - proList[i]=item - end - proList[i].gameObject:SetActive(true) - local _heroId=equipConfig[soulId].Range[i] - local frame=Util.GetGameObject(item,"Head/Frame"):GetComponent("Image") - local icon=Util.GetGameObject(item,"Head/Icon"):GetComponent("Image") - local name=Util.GetGameObject(item,"Name"):GetComponent("Text") - local info=Util.GetGameObject(item,"Info"):GetComponent("Text") - frame.sprite=self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[_heroId].Quantity)) - icon.sprite=self.spLoader:LoadSprite(GetResourcePath(itemConfig[_heroId].ResourceID)) - name.text=GetLanguageStrById(itemConfig[_heroId].Name) - info.text=x(i) - end - else - self.scrollView:SetData(equipConfig[soulId].Range,function(index,root) - self:SetScrollPre(root,equipConfig[soulId].Range[index],index) - end) - self.scrollView:SetIndex(1) - end - else - self.scroll_1:SetActive(false) - self.scroll_2:SetActive(false) - self.trialScopeText.text = "以下神将可装备:所有神将" + -- local isOpenTrialScope=equipConfig[soulId].Range and equipConfig[soulId].Range[1]~=0 and equipConfig[soulId].Range[1]--是否开启适用 + -- if isOpenTrialScope then + -- self.trialScopeText.text = "以下神将可装备:" + -- self.scroll_1:SetActive(#equipConfig[soulId].Range<=3) + -- self.scroll_2:SetActive(#equipConfig[soulId].Range>3) + -- --适用英雄<=3时 固定长度生成(预设) 反之使用优化滚动条 + -- if #equipConfig[soulId].Range<=3 then + -- for j = 0, self.scroll_1.transform.childCount-1 do + -- self.scroll_1.transform:GetChild(j).gameObject:SetActive(false) + -- end + -- for i = 1, #equipConfig[soulId].Range do--遍历每个适用英雄 + -- local item= proList[i] + -- if not item then + -- item= newObjToParent(self.trialScopePre,self.scroll_1) + -- item.name="ProPre"..i + -- proList[i]=item + -- end + -- proList[i].gameObject:SetActive(true) + -- local _heroId=equipConfig[soulId].Range[i] + -- local frame=Util.GetGameObject(item,"Head/Frame"):GetComponent("Image") + -- local icon=Util.GetGameObject(item,"Head/Icon"):GetComponent("Image") + -- local name=Util.GetGameObject(item,"Name"):GetComponent("Text") + -- local info=Util.GetGameObject(item,"Info"):GetComponent("Text") + -- frame.sprite=self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[_heroId].Quantity)) + -- icon.sprite=self.spLoader:LoadSprite(GetResourcePath(itemConfig[_heroId].ResourceID)) + -- name.text=GetLanguageStrById(itemConfig[_heroId].Name) + -- info.text=x(i) + -- end + -- else + -- self.scrollView:SetData(equipConfig[soulId].Range,function(index,root) + -- self:SetScrollPre(root,equipConfig[soulId].Range[index],index) + -- end) + -- self.scrollView:SetIndex(1) + -- end + -- else + -- self.scroll_1:SetActive(false) + -- self.scroll_2:SetActive(false) + -- self.trialScopeText.text = "以下神将可装备:所有神将" + -- end + self.scroll_1:SetActive(false) + self.scroll_2:SetActive(false) + if equipConfig[soulId].Describe then + self.trialScopeText.text = "以下神将可装备:"..equipConfig[soulId].Describe end - + --获取途径 self.howGet:SetActive(type==Type.Access) --获取途径 diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua index dde43cf8ca..e91bb56896 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUpV2.lua @@ -85,10 +85,10 @@ end --刷新面板 function this.RefreshShow(type) if type==Type.Detail then - this.title.text=Language[11906] + this.title.text="神印详情" this.empty.gameObject:SetActive(#curHeroData.godPrintList==0) elseif type==Type.Replace then - this.title.text=Language[11907] + this.title.text="选择替换下的神印" this.empty.gameObject:SetActive(false) end --数据是无序的 需要按位置排序下