diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/ItemBoxDropPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/ItemBoxDropPopup.prefab new file mode 100644 index 0000000000..af30224507 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Popup/ItemBoxDropPopup.prefab @@ -0,0 +1,392 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1157983193835290705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1371503800933121299} + - component: {fileID: 1370189074285409315} + - component: {fileID: 1373081405406599807} + - component: {fileID: 1261700307789078251} + m_Layer: 5 + m_Name: ItemBoxDropPopup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1371503800933121299 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157983193835290705} + 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: 1372092334872715139} + - {fileID: 1171702016879965980} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1370189074285409315 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157983193835290705} + m_CullTransparentMesh: 0 +--- !u!223 &1373081405406599807 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157983193835290705} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1261700307789078251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157983193835290705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &1158182485736505065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1372092334872715139} + - component: {fileID: 1369832990238342029} + - component: {fileID: 1261941170152963937} + - component: {fileID: 6432356592432109381} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1372092334872715139 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158182485736505065} + 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: 1371503800933121299} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1369832990238342029 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158182485736505065} + m_CullTransparentMesh: 0 +--- !u!114 &1261941170152963937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158182485736505065} + 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: 0, g: 0, b: 0, a: 0.4} + 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: 0} + 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 &6432356592432109381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158182485736505065} + 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: 1261941170152963937} + 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 &1574539067300207120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 831446063178628480} + - component: {fileID: 6285917489663473546} + - component: {fileID: 6205205652677173844} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &831446063178628480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574539067300207120} + 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: 1171702016879965980} + m_RootOrder: 0 + 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: -42.800026} + m_SizeDelta: {x: 920, y: 1369.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6285917489663473546 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574539067300207120} + m_CullTransparentMesh: 0 +--- !u!114 &6205205652677173844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574539067300207120} + 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: 30 + m_Bottom: 100 + m_ChildAlignment: 1 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 160, y: 160} + m_Spacing: {x: 50, y: 55} + m_Constraint: 1 + m_ConstraintCount: 4 +--- !u!1 &6134118711542377596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1171702016879965980} + - component: {fileID: 6612913156638035289} + - component: {fileID: 680383269293037605} + - component: {fileID: 3992641446958067920} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1171702016879965980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6134118711542377596} + 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: 831446063178628480} + m_Father: {fileID: 1371503800933121299} + 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: 0, y: 0} + m_SizeDelta: {x: 920, y: 1321.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6612913156638035289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6134118711542377596} + m_CullTransparentMesh: 0 +--- !u!114 &680383269293037605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6134118711542377596} + 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: bd924e4cc5106cc4d9954033f40bb316, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3992641446958067920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6134118711542377596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 1.3, y: 1.3, z: 1.3} + initFloat: 0 + isInit: 1 + changeV3: {x: 0.95, y: 0.95, z: 0.95} + changeFloat: 0 + duration: 0.2 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 0} + - initV3: {x: 0.95, y: 0.95, z: 0.95} + initFloat: 0 + isInit: 0 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0 + duration: 0.1 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 0} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/ItemBoxDropPopup.prefab.meta b/Assets/ManagedResources/Prefabs/UI/Popup/ItemBoxDropPopup.prefab.meta new file mode 100644 index 0000000000..6fa29962b9 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Popup/ItemBoxDropPopup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4574238358bef1b4baada89ee8e6a228 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index 1d52f758c9..0061879426 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -437,6 +437,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1072018704561060568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1386577653423883800} + - component: {fileID: 1090750468132068739} + - component: {fileID: 7831688637863679833} + - component: {fileID: 7248881980219198612} + m_Layer: 5 + m_Name: helpBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1386577653423883800 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072018704561060568} + 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: 4975760459880888510} + 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: 337.65002, y: -0.49995422} + m_SizeDelta: {x: 66, y: 66} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1090750468132068739 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072018704561060568} + m_CullTransparentMesh: 0 +--- !u!114 &7831688637863679833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072018704561060568} + 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: 1b9752b20af636a45b9f0dae7266a760, 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 &7248881980219198612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072018704561060568} + 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: 7831688637863679833} + 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 &1080533870544626936 GameObject: m_ObjectHideFlags: 0 @@ -2464,6 +2581,7 @@ RectTransform: m_Children: - {fileID: 9015164529682029271} - {fileID: 2385377180415136348} + - {fileID: 1386577653423883800} m_Father: {fileID: 24503027976330875} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 955bef0e39..970d6f8d7a 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -272,6 +272,7 @@ ConfigName = { ChongRankInformation ="ChongRankInformation", ChangingCardStar = "ChangingCardStar", SuperZhenChong="SuperZhenChong", + RewardItemConfig="RewardItemConfig", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index dea7dca1ae..330e5839bb 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -478,6 +478,7 @@ UIName = { ActivityChongRank=486,--gm开服冲榜 GMShuaChongTeQuan=487,--GM礼包 GMSong10WanPanel=488,--送10万真充 + ItemBoxDropPopup=489,--背包宝箱奖励道具掉落弹窗 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua new file mode 100644 index 0000000000..8cf3a8b6dc --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua @@ -0,0 +1,90 @@ +require("Base/BasePanel") +ItemBoxDropPopup = Inherit(BasePanel) +local this = ItemBoxDropPopup +--初始化组件(用于子类重写) +function this:InitComponent() + this.spLoader = SpriteLoader.New() + this.mask = Util.GetGameObject(this.transform, "mask") + this.dropGrid=Util.GetGameObject(this.transform, "bg/grid") +end + +--绑定事件(用于子类重写) +function this:BindEvent() + Util.AddClick(this.mask, function() + this:ClosePanel() + end) + +end + + +--添加事件监听(用于子类重写) +function this:AddListener() + +end + +--移除事件监听(用于子类重写) +function this:RemoveListener() + +end +local itemListPrefab={} +--界面打开时调用(用于子类重写) +function this:OnOpen(rewardGroup) + local winData={} + for i = 1, #rewardGroup do + winData[i]={} + winData[i].allWeight=0 + winData[i].itemList={} + local rewardItems= ConfigManager.GetConfigData(ConfigName.RewardGroup,rewardGroup[i]).RewardItem + for j = 1, #rewardItems do + local rewardItemConfig=ConfigManager.GetConfigData(ConfigName.RewardItemConfig,rewardItems[j]) + winData[i].allWeight=winData[i].allWeight+rewardItemConfig.Chance + local itemInfo={} + itemInfo.weight=rewardItemConfig.Chance + itemInfo.itemId=rewardItemConfig.ItemId + itemInfo.randomMax=rewardItemConfig.RandomMax + winData[i].itemList[j]=itemInfo + end + end + local index=1 + for i = 1, #winData do + for j = 1, #winData[i].itemList do + local itemData=winData[i].itemList[j] + if itemData.randomMax>0 then + local view= SubUIManager.Open(SubUIConfig.ItemView, this.dropGrid.transform) + view.gameObject.name = "frame"..index + itemListPrefab[index] = view + index=index+1 + view:OnOpen(false,{itemData.itemId,1},1.15,true,false,false,self.sortingOrder) + local str=string.format("获取概率:%s%%",itemData.weight/ winData[i].allWeight*100) + view:ResetName(str) + end + end + end +end + + + +--界面关闭时调用(用于子类重写) +function this:OnClose() + if #itemListPrefab > 0 then + for i = 1, #itemListPrefab do + destroy(itemListPrefab[i].gameObject) + end + end + itemListPrefab = {} +end + +--界面销毁时调用(用于子类重写) +function this:OnDestroy() + + this.spLoader:Destroy() + if #itemListPrefab > 0 then + for i = 1, #itemListPrefab do + destroy(itemListPrefab[i].gameObject) + end + end + itemListPrefab = {} + +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua.meta new file mode 100644 index 0000000000..22690dc102 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/ItemBoxDropPopup.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fbab210f71720bc4d9695b09331eed49 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 442f1ea90a..21ecbeb214 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -49,6 +49,7 @@ function RewardItemSingleShowPopup:InitComponent() this.btnJump = Util.GetGameObject(self.transform, "bg/bottomBar/btnJump") this.btnClose = Util.GetGameObject(self.transform, "bg/bottomBar/btnClose") this.btnSureText = Util.GetGameObject(this.btnSure.transform, "Text"):GetComponent("Text") + this.helpBtn = Util.GetGameObject(self.transform, "bg/topBar/helpBtn") end @@ -60,6 +61,10 @@ function RewardItemSingleShowPopup:BindEvent() PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false self:ClosePanel() end) + + Util.AddClick(this.helpBtn, function() + UIManager.OpenPanel(UIName.ItemBoxDropPopup,itemConfigData.RewardGroup) + end) Util.AddClick(this.mask, function() PlaySoundWithoutClick(SoundConfig.Sound_UICancel) PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false @@ -344,6 +349,7 @@ function RewardItemSingleShowPopup:OnOpen(...) isNoShowSureBtn = data[4] and data[4] or false end function RewardItemSingleShowPopup:OnShow() + this.helpBtn.gameObject:SetActive(false) this.itemName.text = GetStringByEquipQua(itemConfigData.Quantity, GetLanguageStrById(itemConfigData.Name)) this.topBar:GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tongyong_di_"..itemConfigData.Quantity) --判断自选宝箱界面是否开启 @@ -388,8 +394,7 @@ function RewardItemSingleShowPopup:OnShow() then this.btnSureText.text = Language[10193] this.btnSure:SetActive(true) - elseif isBagPanel and (itemConfigData.ItemType == 10 - or itemConfigData.ItemType == ItemType.GMzck + elseif isBagPanel and (itemConfigData.ItemType == ItemType.GMzck or itemConfigData.ItemType == ItemType.GMBigZck or itemConfigData.ItemType == ItemType.GMzcq) or itemConfigData.ItemType == ItemType.GMxck @@ -397,6 +402,10 @@ function RewardItemSingleShowPopup:OnShow() or itemConfigData.ItemType == ItemType.GMxsZcq and func then--是否宝箱可使用 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] + elseif isBagPanel and itemConfigData.ItemType == 10 and func then + this.btnSure:SetActive(true) + this.btnSureText.text = Language[10195] + this.helpBtn.gameObject:SetActive(true) elseif isBagPanel and itemConfigData.ItemType == 12 and func then-- 改名卡 this.btnSure:SetActive(true) this.btnSureText.text = Language[10195] diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index a2b459aeab..dcdbcaf1a0 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -994,6 +994,10 @@ function ItemView:ResetNameSize(v2,v3) self.name:GetComponent("RectTransform").localScale = v3 end +function ItemView:ResetName(nameStr) + self.name:GetComponent("Text").text=nameStr +end + function ItemView:OnClose() self.frameBtn:GetComponent("Button").enabled = true