diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index aefe553426..ebfeb9812d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -971,9 +971,9 @@ RectTransform: m_Children: - {fileID: 1208897820293777566} - {fileID: 611713263181689987} + - {fileID: 8836181302314509410} - {fileID: 8184831178004648247} - {fileID: 7070420982221907540} - - {fileID: 8836181302314509410} m_Father: {fileID: 4498036380691155199} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1144,7 +1144,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7415649165955874725 CanvasRenderer: @@ -1204,6 +1204,78 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0.18115139, b: 0.023584902, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &2825133170410581866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1362613760829033822} + - component: {fileID: 9002669970980888043} + - component: {fileID: 2816558809142962193} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1362613760829033822 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2825133170410581866} + 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: 2189678882340770692} + m_RootOrder: 1 + 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: 25, y: -14.384} + m_SizeDelta: {x: 120, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9002669970980888043 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2825133170410581866} + m_CullTransparentMesh: 0 +--- !u!114 &2816558809142962193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2825133170410581866} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9490197, g: 0.86666673, b: 0.7019608, 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &3388288748508056731 GameObject: m_ObjectHideFlags: 0 @@ -1520,7 +1592,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7312353712014065580 CanvasRenderer: @@ -1834,7 +1906,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &573021905495986909 CanvasRenderer: @@ -1879,6 +1951,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 0 +--- !u!1 &5840892587357359265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8096397154041804830} + - component: {fileID: 1019469114016265315} + - component: {fileID: 1248751161184312172} + m_Layer: 5 + m_Name: Image1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8096397154041804830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840892587357359265} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 2189678882340770692} + 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: -58.5, y: 0} + m_SizeDelta: {x: 89, y: 89} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1019469114016265315 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840892587357359265} + m_CullTransparentMesh: 0 +--- !u!114 &1248751161184312172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840892587357359265} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: f9265182fc2643642b4a0cb9f45083d0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5992004584232733787 GameObject: m_ObjectHideFlags: 0 @@ -1988,7 +2134,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 0} + m_SizeDelta: {x: 160, y: 29.1375} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6613608729326031968 CanvasRenderer: @@ -2033,6 +2179,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 0 +--- !u!1 &6554356203673568666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2027405839108284586} + - component: {fileID: 223757540183776288} + - component: {fileID: 1190728809846910017} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2027405839108284586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554356203673568666} + 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: 2189678882340770692} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 125.12001, y: -14.568741} + m_SizeDelta: {x: 160, y: 29.1375} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &223757540183776288 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554356203673568666} + m_CullTransparentMesh: 0 +--- !u!114 &1190728809846910017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554356203673568666} + 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.96470594, g: 0.882353, b: 0.7137255, 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: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u67E5\u770B\u795E\u5C06" + LanguageIndex: 0 --- !u!1 &6720412177817388367 GameObject: m_ObjectHideFlags: 0 @@ -2266,8 +2492,9 @@ RectTransform: - {fileID: 8509208401530327142} - {fileID: 1709640756964467835} - {fileID: 3758923872283339064} + - {fileID: 2189678882340770692} m_Father: {fileID: 8883771383315985959} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2296,7 +2523,7 @@ MonoBehaviour: m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 - m_ChildControlHeight: 1 + m_ChildControlHeight: 0 --- !u!1 &7178930038566897171 GameObject: m_ObjectHideFlags: 0 @@ -2621,7 +2848,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8883771383315985959} - m_RootOrder: 3 + 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} @@ -2865,7 +3092,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8883771383315985959} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2920,3 +3147,114 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8761102236121648721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2189678882340770692} + - component: {fileID: 5069264168906449339} + - component: {fileID: 1377851207379512907} + - component: {fileID: 1586720622677949018} + m_Layer: 5 + m_Name: checkHero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2189678882340770692 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8761102236121648721} + 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: 2027405839108284586} + - {fileID: 1362613760829033822} + - {fileID: 8096397154041804830} + m_Father: {fileID: 8184831178004648247} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80, y: -175.71875} + m_SizeDelta: {x: 160, y: 29.1375} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5069264168906449339 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8761102236121648721} + m_CullTransparentMesh: 0 +--- !u!114 &1377851207379512907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8761102236121648721} + 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: 0 + 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: 1586720622677949018} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1586720622677949018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8761102236121648721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index e09a5b3b2d..6d6352a42f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -28,7 +28,7 @@ function RewardItemSingleShowPopup:InitComponent() this.posText = Util.GetGameObject(this.pos, "PosText"):GetComponent("Text") this.armorType = Util.GetGameObject(self.transform, "bgPanel/armor/info/armorType"):GetComponent("Text") this.armorLanTuNum = Util.GetGameObject(self.transform, "armor/info/armorLanTuNum"):GetComponent("Text") - + this.armorTitle = Util.GetGameObject(self.transform, "bgPanel/armor/info/armorTitle"):GetComponent("Text") this.armorDesc = Util.GetGameObject(self.transform, "armor/info/armorDesc"):GetComponent("Text") this.equipQuaText = Util.GetGameObject(self.transform, "bgPanel/armor/equipQuaText"):GetComponent("Text") @@ -41,6 +41,9 @@ function RewardItemSingleShowPopup:InitComponent() this.btnJump = Util.GetGameObject(self.transform, "bg/btnGrid/btnJump") this.btnClose = Util.GetGameObject(self.transform, "bg/btnGrid/btnClose") this.btnSureText = Util.GetGameObject(this.btnSure.transform, "Text"):GetComponent("Text") + + this.checkHero = Util.GetGameObject(self.transform, "bgPanel/armor/info/checkHero") + this.checkHeroText = Util.GetGameObject(this.checkHero, "Text"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -56,6 +59,22 @@ function RewardItemSingleShowPopup:BindEvent() PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false self:ClosePanel() end) + Util.AddClick(this.checkHero, function() + if itemConfigData.ItemType == ItemType.HeroDebris or itemConfigData.ItemType == ItemType.LingShouChip then + if itemConfigData.RewardGroup then + local rg = ConfigManager.GetConfigData(ConfigName.RewardGroup, itemConfigData.RewardGroup[1]) + if rg.ShowItem then + local id = rg.ShowItem[1][1] + if itemConfigData.ItemType == ItemType.HeroDebris then + local star = itemConfig[id].Quantity + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, id, star) + elseif itemConfigData.ItemType == ItemType.LingShouChip then + UIManager.OpenPanel(UIName.PokemonGetInfoPopup, false,id) + end + end + end + end + end) Util.AddClick(this.btnSure, function() if itemConfigData.ItemType == ItemType.HeroDebris then @@ -452,6 +471,15 @@ function RewardItemSingleShowPopup:OnShow() end this.itemView:OnOpen(false, {itemConfigData.Id,0}, 1.1, false, false, false, self.sortingOrder) + if itemConfigData.ItemType == ItemType.HeroDebris then + this.checkHero:SetActive(true) + this.checkHeroText.text = "查看神将" + elseif itemConfigData.ItemType == ItemType.LingShouChip then + this.checkHero:SetActive(true) + this.checkHeroText.text = "查看灵兽" + else + this.checkHero:SetActive(false) + end end