From b96df9fc637a099d28be5463e431009023071ff5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 16 Jun 2021 17:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B2=E7=8F=91=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 --- .../UI/linglong/LingLongBaoJingPanel.prefab | 425 ++++++++++++++++-- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Recruit/RecruitManager.lua | 22 + .../Modules/Recruit/RewardPreviewPopup.lua | 4 +- .../linglongbaojing/LingLongBaoJingPanel.lua | 113 +++-- 5 files changed, 505 insertions(+), 60 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab index 407fc1349a..548e64adb8 100644 --- a/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/linglong/LingLongBaoJingPanel.prefab @@ -283,7 +283,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 255737259440665538} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: @@ -293,7 +293,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: -73.3, y: 0.5149994} + m_AnchoredPosition: {x: -83.47, y: 0.5149994} m_SizeDelta: {x: 997.7, y: 55.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3567988700894188445 @@ -363,6 +363,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5440215220911143333} + - {fileID: 1254796480463580031} - {fileID: 421251705855434687} - {fileID: 5150044729195959801} - {fileID: 8473776116068084149} @@ -371,7 +372,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92.9, y: -48.25} + m_AnchoredPosition: {x: 92.899994, y: -48.24994} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8666360816142649532 @@ -460,6 +461,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429943958677697746} m_CullTransparentMesh: 0 +--- !u!1 &456989311741324857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120091719624130423} + - component: {fileID: 3641747956655270454} + - component: {fileID: 1172324901777956081} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1120091719624130423 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456989311741324857} + 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: 6190145852569696698} + 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.62, y: -0.62} + m_SizeDelta: {x: 57.81, y: 57.81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3641747956655270454 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456989311741324857} + m_CullTransparentMesh: 0 +--- !u!114 &1172324901777956081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 456989311741324857} + 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: 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!1 &473483983824973758 GameObject: m_ObjectHideFlags: 0 @@ -569,8 +644,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: 90.4, y: 58.4} - m_SizeDelta: {x: 748.2, y: 56.9} + m_AnchoredPosition: {x: 100.57, y: 58.4} + m_SizeDelta: {x: 727.86, y: 56.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2188550660584983941 MonoBehaviour: @@ -613,9 +688,9 @@ MonoBehaviour: m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 - m_MaxValue: 2500 + m_MaxValue: 100 m_WholeNumbers: 0 - m_Value: 2500 + m_Value: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -691,6 +766,80 @@ RectTransform: m_AnchoredPosition: {x: 5, y: 518.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1227861081257809320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7705544587840120834} + - component: {fileID: 6271012712568920267} + - component: {fileID: 3199535005012558164} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7705544587840120834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227861081257809320} + 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: 2764982912260668087} + 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.62, y: -0.62} + m_SizeDelta: {x: 57.81, y: 57.81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6271012712568920267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227861081257809320} + m_CullTransparentMesh: 0 +--- !u!114 &3199535005012558164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227861081257809320} + 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: 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!1 &1375318419621536282 GameObject: m_ObjectHideFlags: 0 @@ -1087,7 +1236,7 @@ RectTransform: m_Children: - {fileID: 8705891729216183813} m_Father: {fileID: 6190145852569696698} - 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} @@ -1359,7 +1508,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 992349910648309963} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1512,6 +1661,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1739151525309243581} + - {fileID: 7705544587840120834} - {fileID: 7284825588361281462} - {fileID: 7758567843364080032} - {fileID: 8321010789391908964} @@ -1821,6 +1971,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2649475293087733865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8483019154670052763} + - component: {fileID: 7649955521118547839} + - component: {fileID: 6857039443700183752} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8483019154670052763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649475293087733865} + 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: 992349910648309963} + 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.62, y: -0.62} + m_SizeDelta: {x: 57.81, y: 57.81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7649955521118547839 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649475293087733865} + m_CullTransparentMesh: 0 +--- !u!114 &6857039443700183752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649475293087733865} + 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: 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!1 &2682055445014035835 GameObject: m_ObjectHideFlags: 0 @@ -2701,7 +2925,7 @@ RectTransform: m_Children: - {fileID: 1153798877495053237} m_Father: {fileID: 992349910648309963} - 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} @@ -2775,7 +2999,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6190145852569696698} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2964,7 +3188,7 @@ RectTransform: m_Children: - {fileID: 4800599575322876319} m_Father: {fileID: 2764982912260668087} - 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} @@ -3077,7 +3301,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3245895638547307483} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3383,7 +3607,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 992349910648309963} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3665,7 +3889,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8579320183759755487} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3739,7 +3963,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3245895638547307483} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4278,7 +4502,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6190145852569696698} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4710,6 +4934,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9059866938651532869} + - {fileID: 1120091719624130423} - {fileID: 5711242641009471444} - {fileID: 7916537379995825708} - {fileID: 3670308899541116944} @@ -4909,8 +5134,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: -277.72, y: 8.541962} - m_SizeDelta: {x: 754.8, y: 96.5} + m_AnchoredPosition: {x: -263.36005, y: 8.541962} + m_SizeDelta: {x: 740.44, y: 96.5} m_Pivot: {x: 0, y: 0} --- !u!114 &464791979518474937 MonoBehaviour: @@ -5128,6 +5353,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5311781109549568340} + - {fileID: 7615329133186878444} - {fileID: 8747810975598831072} - {fileID: 1744940711907334725} - {fileID: 1367942759821303526} @@ -5241,7 +5467,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2764982912260668087} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5285,6 +5511,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7555884742670570846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1254796480463580031} + - component: {fileID: 302896696865761677} + - component: {fileID: 4220792220808362711} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1254796480463580031 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7555884742670570846} + 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: 8579320183759755487} + 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.62, y: -0.62} + m_SizeDelta: {x: 57.81, y: 57.81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &302896696865761677 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7555884742670570846} + m_CullTransparentMesh: 0 +--- !u!114 &4220792220808362711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7555884742670570846} + 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: 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!1 &7706371091501782160 GameObject: m_ObjectHideFlags: 0 @@ -5390,7 +5690,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2764982912260668087} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6023,6 +6323,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4094820516506043138} + - {fileID: 8483019154670052763} - {fileID: 2240193299084499899} - {fileID: 2867467063193590179} - {fileID: 6265460108412381704} @@ -6138,7 +6439,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: c89a24ab39cdd8543b2f91f3d8a494d0, type: 3} + m_Sprite: {fileID: 21300000, guid: 70db171292de9c94d8ce491d40f2590b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6239,7 +6540,7 @@ RectTransform: m_Children: - {fileID: 5771206812456113072} m_Father: {fileID: 8579320183759755487} - 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} @@ -6314,7 +6615,7 @@ RectTransform: m_Children: - {fileID: 5226295500724230476} m_Father: {fileID: 3245895638547307483} - 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} @@ -6715,7 +7016,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8579320183759755487} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6764,3 +7065,77 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 100 +--- !u!1 &9218313704793911841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7615329133186878444} + - component: {fileID: 4040722496424145066} + - component: {fileID: 4242263656767845901} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7615329133186878444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9218313704793911841} + 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: 3245895638547307483} + 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.000022113, y: -0.000012159} + m_SizeDelta: {x: 108.56, y: 108.56} + m_Pivot: {x: 0.4999999, y: 0.5} +--- !u!222 &4040722496424145066 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9218313704793911841} + m_CullTransparentMesh: 0 +--- !u!114 &4242263656767845901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9218313704793911841} + 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: c89a24ab39cdd8543b2f91f3d8a494d0, 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 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 79df7d0dc8..da0e3165a4 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2236,6 +2236,7 @@ PRE_REWARD_POOL_TYPE = { LING_SHOU= 12,--灵兽 LING_SHOU_UP= 13,--灵兽抽取UP XIANG_YAO_UP= 14,--降妖夺宝UP + LINGLONG = 15, --玲珑宝镜 } DirectBuyType = { XSHL = 11,--限时豪礼 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index f0aec43c52..bf0bc7d4aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -251,11 +251,33 @@ function this.GetRewardPreviewData(type) or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP return this.GetActivityPreviewData(type)--非常驻抽卡需要检测时间 + elseif type==PRE_REWARD_POOL_TYPE.LINGLONG then --限时招募--开启时间有限制的 + return this.GetLINGLONGPreviewData() else return {} end end +function this.GetLINGLONGPreviewData() + local curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.lingLongBaoJing) + if not curActivityId or curActivityId < 1 then --活动招募 + return {} + end + local previewData = {} + for i, v in ipairs(ConfigManager.GetAllConfigsDataByKey(ConfigName.LingLongPool,"ActivityId",curActivityId)) do + local data = {} + data.Reward = v.ItemId + data.ShowWeight = v.FakeRate + data.Sort = v.Sort + table.insert(previewData, data) + end + table.sort(previewData,function(a,b) + return a.Sort < b.Sort + end) + LogGreen("previewData:"..#previewData) + return previewData +end + function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览 local previewData = {} -- 根据当前期获取卡池信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua index 53b5afc577..ae1b8a6ce9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua @@ -96,6 +96,8 @@ function this.CreatePreview(typeNum, type) this.CreateLuckInfo(showData,Language[11709]) elseif type == PRE_REWARD_POOL_TYPE.UPPER_LUCK_FIND then this.CreateLuckInfo(showData,Language[11710]) + elseif type == PRE_REWARD_POOL_TYPE.LINGLONG then + this.CreateLuckInfo(showData,"玲珑宝镜") elseif type == PRE_REWARD_POOL_TYPE.GHOST_FIND then this.previewList[4].gameObject:SetActive(false) this.CreateEastGhostInfo(showData) @@ -105,7 +107,7 @@ function this.CreatePreview(typeNum, type) -- 显隐显示 for i = 1, 4 do if this.previewList[i] then - if type == PRE_REWARD_POOL_TYPE.LUCK_FIND or type == PRE_REWARD_POOL_TYPE.UPPER_LUCK_FIND then + if type == PRE_REWARD_POOL_TYPE.LUCK_FIND or type == PRE_REWARD_POOL_TYPE.UPPER_LUCK_FIND or type == PRE_REWARD_POOL_TYPE.LINGLONG then this.previewList[i]:SetActive(i <= 1) elseif type == PRE_REWARD_POOL_TYPE.GHOST_FIND then this.previewList[i]:SetActive(i <= 3) diff --git a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua index a3ed319290..d6f041caf2 100644 --- a/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/linglongbaojing/LingLongBaoJingPanel.lua @@ -15,7 +15,8 @@ function LingLongBaoJingPanel:New(gameObject) return b end - +local a,b,c,d +local configs ---初始化组件(用于子类重写) function LingLongBaoJingPanel:InitComponent(gameObject) self.spLoader = SpriteLoader.New() @@ -66,11 +67,25 @@ function LingLongBaoJingPanel:InitComponent(gameObject) self.rewardBoxList={}--奖励盒 self.rewardBox=Util.GetGameObject(self.slider,"RewardBox") for i=1,5 do - self.rewardBoxList[i]=Util.GetGameObject(self.rewardBox,"Item"..i) + if not self.rewardBoxList[i] then + self.rewardBoxList[i] = {} + end + self.rewardBoxList[i].go=Util.GetGameObject(self.rewardBox,"Item"..i) + self.rewardBoxList[i].icon =Util.GetGameObject(self.rewardBoxList[i].go,"icon"):GetComponent("Image")--幸运值 + self.rewardBoxList[i].value =Util.GetGameObject(self.rewardBoxList[i].go,"Value"):GetComponent("Text")--幸运值 + self.rewardBoxList[i].redPoint=Util.GetGameObject(self.rewardBoxList[i].go,"redPoint") + self.rewardBoxList[i].Num=Util.GetGameObject(self.rewardBoxList[i].go,"Num/Text"):GetComponent("Text")--幸运值 end self.itemRewardList = {} - self.costId = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117).Value + local config = ConfigManager.GetConfigData(ConfigName.SpecialConfig,117) + local strs = string.split(config.Value,"|") + self.costId = tonumber(strs[1]) + strs = string.split(strs[2],"#") + a = tonumber(strs[1]) + b = tonumber(strs[2]) + c = tonumber(strs[3]) + d = tonumber(strs[4]) end ---绑定事件(用于子类重写) @@ -82,10 +97,14 @@ function LingLongBaoJingPanel:BindEvent() end) Util.AddClick(self.btnPreview, function() - UIManager.OpenPanel(UIName.RewardPreviewPopup) + UIManager.OpenPanel(UIName.RewardPreviewPopup,PRE_REWARD_POOL_TYPE.LINGLONG) end) Util.AddClick(self.propBtn, function() + if not self.enough then + PopupTipPanel.ShowTip("道具不足") + return + end LingLongBaoJingManager.QiMenDunJiaDrawRequest(self.actId,function(idList,drop) -- local drop = {} -- drop.itemlist = {} @@ -111,7 +130,9 @@ function LingLongBaoJingPanel:BindEvent() self.itemList[2][2].selectKuang.gameObject:SetActive(false) else self.itemList[2][idList[1]].selectKuang.gameObject:SetActive(false) - end + end + self:SetPropShow() + self:RrFreshInfo() end) end curTurnPos = 1 @@ -155,6 +176,7 @@ end -- 打开,重新打开时回调 function LingLongBaoJingPanel:OnShow(_sortingOrder) + self.parent.tabbox.gameObject:SetActive(false) self.gameObject:SetActive(true) self.sortingOrder = _sortingOrder self.actId = self.actConfig.ActId @@ -175,6 +197,7 @@ function LingLongBaoJingPanel:OnShow(_sortingOrder) self:RefreshTreasureType() self:DelayMaskWithTime(1.5) self:SetPropShow() + self:CreatBox() end --赋值 function LingLongBaoJingPanel:RefreshTreasureType() @@ -219,6 +242,7 @@ end ---界面关闭时调用(用于子类重写) function LingLongBaoJingPanel:OnClose() + self.parent.tabbox.gameObject:SetActive(true) self.gameObject:SetActive(false) if self.thread then coroutine.stop(self.thread) @@ -312,42 +336,64 @@ end ---设置道具拥有显示 1道具id 2探宝类型 function LingLongBaoJingPanel:SetPropShow() - self.propImage.SpriteLoader = self.spLoader.LoadSprite(GetSpriteNameByItemId(self.costId)) - self.propText.text = BagManager.GetItemCountById(self.costId) + self.propImage.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(self.costId)) + local count = BagManager.GetItemCountById(self.costId) + local singleCount = (a * 1^3 + b * 1^2 + c * 1 ^1 + d * 1^0) + local color + if singleCount <= count then + self.enough = true + color = "FFA000" + else + self.enough = false + color = "FF0000" + end + self.propText.text = string.format("%s",color,singleCount) +end + +function LingLongBaoJingPanel:CreatBox() + self:RefreshLuckyValue() end ---刷新幸运值 function LingLongBaoJingPanel:RefreshLuckyValue() - -- if LuckyTurnTableManager.curTreasureType==TreasureType.Lucky then - -- LuckyTurnTableManager.SetLuckyValue() - -- local data=LuckyTurnTableManager.GetLuckyValue() - -- self.luckyValueNum.text=data.."/"..LuckyTurnTableManager.boxReward_One[5].Values[1][1] - -- self.luckySlider.minValue=0 - -- self.luckySlider.maxValue=LuckyTurnTableManager.boxReward_One[5].Values[1][1] - -- self.luckySlider.value=data - -- self.rewardBoxList[1].transform:DOAnchorPosX(-11.4,0)--有时间再优化成动态计算 - -- self.rewardBoxList[2].transform:DOAnchorPosX(125.2,0) - -- self.rewardBoxList[3].transform:DOAnchorPosX(262,0) - -- self.rewardBoxList[4].transform:DOAnchorPosX(400,0) - -- self.rewardBoxList[5].transform:DOAnchorPosX(654.25,0) - -- elseif LuckyTurnTableManager.curTreasureType==TreasureType.Advanced then - -- LuckyTurnTableManager.SetLuckyValue() - -- local data=LuckyTurnTableManager.GetLuckyValue() - -- self.luckyValueNum.text=data.."/"..LuckyTurnTableManager.boxReward_Two[5].Values[1][1] - -- self.luckySlider.minValue=0 - -- self.luckySlider.maxValue=LuckyTurnTableManager.boxReward_Two[5].Values[1][1] - -- self.luckySlider.value=data - -- self.rewardBoxList[1].transform:DOAnchorPosX(-11.4,0) - -- self.rewardBoxList[2].transform:DOAnchorPosX(125.2,0) - -- self.rewardBoxList[3].transform:DOAnchorPosX(262,0) - -- self.rewardBoxList[4].transform:DOAnchorPosX(400,0) - -- self.rewardBoxList[5].transform:DOAnchorPosX(654.25,0) - -- end + configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",self.actId) + local list = {} + for k,v in ipairs(configs) do + table.insert(list,v.Values[1][1]) + end + table.sort(list,function(a,b) return a < b end) + local pos = self:CalutePos1(self.rewardBox,list) + for i = 1,5 do + local v3 = self.rewardBoxList[i].go:GetComponent("RectTransform").anchoredPosition3D + v3.x = pos[i] + self.rewardBoxList[i].go:GetComponent("RectTransform").anchoredPosition3D = v3 + self.rewardBoxList[i].value.text = configs[i].Values[1][1] + self.rewardBoxList[i].redPoint.gameObject:SetActive(false) + if i < 5 then + self.rewardBoxList[i].Num.text = configs[i].Reward[1][2] + self.rewardBoxList[i].icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configs[i].Reward[1][1])) + end + end + self.luckySlider.minValue = 0 + self.luckySlider.maxValue = configs[#configs].Values[1][1] + self:RrFreshInfo() +end + +function LingLongBaoJingPanel:CalutePos1(parent,list) + local pos = {} + local wi = parent.transform.rect.width + for i = 1,#list do + local pos1 = wi *(list[i]/list[#list]) + table.insert(pos,pos1) + end + return pos end ---刷新信息 function LingLongBaoJingPanel:RrFreshInfo() - + -- local actInfo = ActivityGiftManager.GetActivityInfoByType(ActivityTypeDef.lingLongBaoJing) + -- self.luckyValueNum.text = actInfo.value .."/" ..configs[#configs].Values[1][1] + --self.luckySlider.value = actInfo.value end ---延时遮罩 1按时间 @@ -363,5 +409,4 @@ function LingLongBaoJingPanel:DelayMaskWithBool(b) self.mask.gameObject:SetActive(b) end - return LingLongBaoJingPanel \ No newline at end of file