From 9163954640cf828fee8c0e29a66c7a13dd92efbc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 2 Nov 2022 18:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E5=8C=85=E6=B7=BB=E5=8A=A0=E5=8F=98?= =?UTF-8?q?=E8=BA=AB=E5=8D=A1=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Popup/RewardItemSingleShowPopup.prefab | 243 +++++++++++++++++- .../Popup/RewardItemSingleShowPopup.lua | 24 ++ 2 files changed, 264 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index e7bf406ae1..2b4a7a63da 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -331,7 +331,7 @@ RectTransform: - {fileID: 4588323819209577696} - {fileID: 2632574799536235876} m_Father: {fileID: 24503027976330875} - 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} @@ -437,6 +437,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1080533870544626936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4810780399059350171} + - component: {fileID: 3656984981619108403} + - component: {fileID: 4816919913054477577} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4810780399059350171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080533870544626936} + 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: 7355408683318342882} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3656984981619108403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080533870544626936} + m_CullTransparentMesh: 0 +--- !u!114 &4816919913054477577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1080533870544626936} + 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.6117647, g: 0.53333336, b: 0.4117647, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4F24\u611F\u7684\u6B4C\u4F46\u662F\u5728\u4ECE\u5E9F\u589F\u53D1\u5F0F\u7684\u5B64\u72EC\u7684\u8428\u683C\u7684\u4FFA\u662F\u4E2A\u5927\u7684\u8428\u683C\u7684\u7684\u8428\u683C\u7684\u554A\u5341\u516C\u5206\u7684\u7231\u8FC7\u5BF9\u65B9\u548C\u963F\u9AA8\u6253\u963F\u9AA8\u6253\u548C\u963F\u9AA8\u6253" --- !u!1 &1146790984371115283 GameObject: m_ObjectHideFlags: 0 @@ -1142,6 +1221,101 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0.18115139, b: 0.023584902, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &2951906494525440713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982874991187791482} + - component: {fileID: 7610524389207939500} + - component: {fileID: 3073244623731630659} + - component: {fileID: 4682714541144365914} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1982874991187791482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951906494525440713} + 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: 7355408683318342882} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -4} + m_SizeDelta: {x: 920, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7610524389207939500 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951906494525440713} + m_CullTransparentMesh: 0 +--- !u!114 &3073244623731630659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951906494525440713} + 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: 19d5542f3ad36154883cfc2022d17e0a, 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!114 &4682714541144365914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2951906494525440713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &3076782791878561803 GameObject: m_ObjectHideFlags: 0 @@ -1173,7 +1347,7 @@ RectTransform: - {fileID: 4910517229046981386} - {fileID: 1955969940581183763} m_Father: {fileID: 24503027976330875} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1910,6 +2084,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4975760459880888510} + - {fileID: 7355408683318342882} - {fileID: 4443500930179768395} - {fileID: 1263632745152018353} m_Father: {fileID: 224400331968681076} @@ -2116,6 +2291,68 @@ MonoBehaviour: m_LineSpacing: 0.9 m_Text: 111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111 LanguageIndex: 0 +--- !u!1 &5408787277844815588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7355408683318342882} + - component: {fileID: 2757228791936216680} + m_Layer: 5 + m_Name: infoBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7355408683318342882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5408787277844815588} + 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: 1982874991187791482} + - {fileID: 4810780399059350171} + m_Father: {fileID: 24503027976330875} + 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: 920, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2757228791936216680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5408787277844815588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 20 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 920, y: 110} + m_Spacing: {x: 30, y: 0} + m_Constraint: 2 + m_ConstraintCount: 1 --- !u!1 &5514124625828332966 GameObject: m_ObjectHideFlags: 0 @@ -2837,7 +3074,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000018419016} + m_AnchoredPosition: {x: 0, y: 0.0000040664345} m_SizeDelta: {x: 912, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6602616607235033540 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 3db5431b11..a4af548840 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -21,6 +21,8 @@ function RewardItemSingleShowPopup:InitComponent() this.mask = Util.GetGameObject(self.transform, "mask") this.topBar = Util.GetGameObject(self.transform, "bg/topBar") + this.infoBar = Util.GetGameObject(self.transform, "bg/infoBar") + this.infoBarTxt = Util.GetGameObject(self.transform, "bg/infoBar/Text"):GetComponent("Text") this.itemPos = Util.GetGameObject(self.transform, "bg/topBar/armor/itemPos") this.itemView = SubUIManager.Open(SubUIConfig.ItemView,this.itemPos.transform) this.pos = Util.GetGameObject(self.transform, "bg/topBar/armor/pos") @@ -345,6 +347,28 @@ function RewardItemSingleShowPopup:OnShow() this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name)) this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity) --判断自选宝箱界面是否开启 + if itemConfigData.ItemType==ItemType.Incarnation or itemConfigData.ItemType==ItemType.CommonChip then + local skillId=0 + if itemConfigData.ItemType==ItemType.CommonChip then + if itemConfigData.RewardGroup then + local reward=ConfigManager.GetConfigData(ConfigName.RewardGroup,itemConfigData.RewardGroup[1]) + if reward then + skillId=reward.ShowItem[1][1] + local config=ConfigManager.GetConfigDataByKey(ConfigName.ChangingCard,"CardId",skillId) + skillId=config.Id + end + end + elseif itemConfigData.ItemType==ItemType.Incarnation then + local config=ConfigManager.GetConfigDataByKey(ConfigName.ChangingCard,"CardId",itemConfigData.Id) + skillId=config.Id + end + if skillId~=0 then + this.infoBar:SetActive(true) + this.infoBarTxt.text="变身卡技能:"..IncarnationManager.GetSkillDesStr(skillId,5) + end + else + this.infoBar:SetActive(false) + end local isBoxOpen = UIManager.IsOpen(314) if isBagPanel and isBoxOpen then this.btnSure:SetActive(false)