From 5bf0f649892ae7f1da4523c0aef7cb3760b2caab Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sun, 11 Oct 2020 09:40:22 +0800 Subject: [PATCH] =?UTF-8?q?boss=20=E5=92=8C=20=E8=BD=AC=E7=9B=98=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab | 924 +++++------------- .../Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua | 57 +- .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 85 +- 3 files changed, 372 insertions(+), 694 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab index 8f33490efc..1c80c5bb8b 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoLuckyBossPopup.prefab @@ -1,5 +1,73 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &111316968386865160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7657352103914167475} + - component: {fileID: 6009056775654828864} + - component: {fileID: 4799604205400733920} + m_Layer: 0 + m_Name: rewardList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7657352103914167475 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111316968386865160} + 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: 2354410091790794285} + 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: 63.57501, y: 0.0000061989} + m_SizeDelta: {x: 792.85, y: 131.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6009056775654828864 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111316968386865160} + m_CullTransparentMesh: 0 +--- !u!114 &4799604205400733920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111316968386865160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 20 + m_ChildAlignment: 3 + m_Spacing: 20 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &211364198157320367 GameObject: m_ObjectHideFlags: 0 @@ -33,6 +101,7 @@ RectTransform: - {fileID: 4107591401879039839} - {fileID: 2650705437399728588} - {fileID: 8819556549349584560} + - {fileID: 2354410091790794285} m_Father: {fileID: 7920936004859207622} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -118,116 +187,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &454702790786841196 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3748544352352575495} - - component: {fileID: 3430017565681789000} - - component: {fileID: 1712604645378894782} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3748544352352575495 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 454702790786841196} - 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: 7788251785326453052} - m_RootOrder: 0 - 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 &3430017565681789000 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 454702790786841196} - m_CullTransparentMesh: 0 ---- !u!114 &1712604645378894782 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 454702790786841196} - 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: 0 - 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: b760ab9b733ef614886519bb139bda28, 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 &716335991738864852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3691362129899729998} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3691362129899729998 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716335991738864852} - 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: 2460144728212591190} - m_Father: {fileID: 632941309365972550} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.49996185, y: -2.499999} - m_SizeDelta: {x: -0.0050659, y: -0.005024} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &862734961723078391 GameObject: m_ObjectHideFlags: 0 @@ -259,7 +218,7 @@ RectTransform: m_Children: - {fileID: 6852261054567083894} m_Father: {fileID: 4227166638646970797} - m_RootOrder: 4 + 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} @@ -791,18 +750,14 @@ RectTransform: m_Children: - {fileID: 5797844118260333372} - {fileID: 6930919416826740254} - - {fileID: 4960635721522375327} - - {fileID: 4362621288068448419} - {fileID: 2793905207867123014} - - {fileID: 4539812938182687137} - {fileID: 6539290600892711698} - - {fileID: 632941309365972550} m_Father: {fileID: 2700222768937658443} 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: 459.61, y: -62.950012} + m_AnchoredPosition: {x: 459.59998, y: -94} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2771767497273165475 @@ -855,80 +810,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &2594232244456254107 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2460144728212591190} - - component: {fileID: 3281585638878435032} - - component: {fileID: 215071738348724080} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2460144728212591190 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594232244456254107} - 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: 3691362129899729998} - m_RootOrder: 0 - 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: 2, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3281585638878435032 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594232244456254107} - m_CullTransparentMesh: 0 ---- !u!114 &215071738348724080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594232244456254107} - 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: 0 - 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: 7e74768d355c6904b869927da92a32e1, 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 &3365572594122376224 GameObject: m_ObjectHideFlags: 0 @@ -1039,7 +920,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: 0, y: 0} + m_AnchoredPosition: {x: -1480, y: -5} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7049220849534455626 @@ -1079,101 +960,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4374424091238038352 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2670042912425858543} - - component: {fileID: 8506230361083947800} - - component: {fileID: 4676395944148946571} - - component: {fileID: 4545098874240751177} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2670042912425858543 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4374424091238038352} - 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: 632941309365972550} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 40.2, y: -2.4000006} - m_SizeDelta: {x: -8.47, y: -2.09} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8506230361083947800 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4374424091238038352} - m_CullTransparentMesh: 0 ---- !u!114 &4676395944148946571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4374424091238038352} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - 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: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 0/3 ---- !u!114 &4545098874240751177 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4374424091238038352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 --- !u!1 &4396471659944688024 GameObject: m_ObjectHideFlags: 0 @@ -1248,6 +1034,98 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4496630481517257348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2354410091790794285} + - component: {fileID: 2289098928544743846} + - component: {fileID: 3429332582304695705} + - component: {fileID: 5446073078365409401} + m_Layer: 0 + m_Name: rewardScroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2354410091790794285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4496630481517257348} + 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: 2413547048822279976} + - {fileID: 7657352103914167475} + m_Father: {fileID: 7555683376229264185} + m_RootOrder: 6 + 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: 1.61, y: -539.94995} + m_SizeDelta: {x: 919.2, y: 131.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2289098928544743846 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4496630481517257348} + m_CullTransparentMesh: 0 +--- !u!114 &3429332582304695705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4496630481517257348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 0} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &5446073078365409401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4496630481517257348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4714344079764837486 GameObject: m_ObjectHideFlags: 0 @@ -1446,169 +1324,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5297412852316726249} m_CullTransparentMesh: 0 ---- !u!1 &5358021549342352664 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4362621288068448419} - - component: {fileID: 1336687543438815697} - - component: {fileID: 9157272543847008261} - m_Layer: 5 - m_Name: proIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4362621288068448419 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5358021549342352664} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} - m_Children: [] - m_Father: {fileID: 4227166638646970797} - m_RootOrder: 3 - 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: -53.4, y: 54} - m_SizeDelta: {x: 74, y: 74} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1336687543438815697 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5358021549342352664} - m_CullTransparentMesh: 0 ---- !u!114 &9157272543847008261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5358021549342352664} - 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: 0 - 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: 1c666beff78f70943be2712a7f73f982, 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 &5423056239723360419 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 632941309365972550} - - component: {fileID: 3132224820925427716} - m_Layer: 5 - m_Name: hpExp - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &632941309365972550 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5423056239723360419} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} - m_Children: - - {fileID: 6728521059467473465} - - {fileID: 7788251785326453052} - - {fileID: 3691362129899729998} - - {fileID: 2670042912425858543} - m_Father: {fileID: 4227166638646970797} - m_RootOrder: 7 - 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.0071735, y: -89} - m_SizeDelta: {x: 149.98, y: 28.42} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3132224820925427716 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5423056239723360419} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, 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: 0 - m_TargetGraphic: {fileID: 215071738348724080} - m_FillRect: {fileID: 3748544352352575495} - m_HandleRect: {fileID: 2460144728212591190} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &5565494667416281712 GameObject: m_ObjectHideFlags: 0 @@ -1688,124 +1403,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 999 ---- !u!1 &5920251869144039016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6728521059467473465} - - component: {fileID: 638360474348177781} - - component: {fileID: 8721139019223243352} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6728521059467473465 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5920251869144039016} - 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: 632941309365972550} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -0.49743652, y: -2.5024962} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &638360474348177781 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5920251869144039016} - m_CullTransparentMesh: 0 ---- !u!114 &8721139019223243352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5920251869144039016} - 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: 0 - 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: b62ceaa016421b243bcaa158f3aa968d, 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!1 &6347993739599404022 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4539812938182687137} - - component: {fileID: 7730639954261135584} - m_Layer: 5 - m_Name: star - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4539812938182687137 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6347993739599404022} - 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: 4227166638646970797} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.8200073, y: 3} - m_SizeDelta: {x: 239.96, y: 30} - m_Pivot: {x: 0, y: 0} ---- !u!222 &7730639954261135584 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6347993739599404022} - m_CullTransparentMesh: 0 --- !u!1 &6537675973867770291 GameObject: m_ObjectHideFlags: 0 @@ -1886,80 +1483,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8C01\u8C01\u8C01\u8C01\u8C01" LanguageIndex: 11096 ---- !u!1 &6803614141712372629 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4960635721522375327} - - component: {fileID: 9062110931524889207} - - component: {fileID: 8442081651446702112} - m_Layer: 5 - m_Name: posIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4960635721522375327 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6803614141712372629} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} - m_Children: [] - m_Father: {fileID: 4227166638646970797} - 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.624115, y: -59.044212} - m_SizeDelta: {x: 32, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9062110931524889207 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6803614141712372629} - m_CullTransparentMesh: 0 ---- !u!114 &8442081651446702112 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6803614141712372629} - 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: 0 - 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: b1a92f783ef44174cadd79d112420c8e, 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 &7171890179328870863 GameObject: m_ObjectHideFlags: 0 @@ -2141,7 +1664,7 @@ RectTransform: m_Children: - {fileID: 3912465624479060842} m_Father: {fileID: 4227166638646970797} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2396,42 +1919,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7700632796967714677 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7788251785326453052} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7788251785326453052 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7700632796967714677} - 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: 3748544352352575495} - m_Father: {fileID: 632941309365972550} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -0.24871063, y: -2.5024486} - m_SizeDelta: {x: 0.49744, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7712846647277634778 GameObject: m_ObjectHideFlags: 0 @@ -2641,7 +2128,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: -2.7, y: -546.5} + m_AnchoredPosition: {x: 294.68, y: -546.5} m_SizeDelta: {x: 271.17, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7660136290251236410 @@ -2822,3 +2309,82 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A1\uFF1A25\uFF1A26" LanguageIndex: 11105 +--- !u!1 &9136319240660898480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2413547048822279976} + - component: {fileID: 8507476027570995583} + - component: {fileID: 724431153018416109} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2413547048822279976 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9136319240660898480} + 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: 2354410091790794285} + 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: -379.9, y: 0} + m_SizeDelta: {x: 94.1, y: 131.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8507476027570995583 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9136319240660898480} + m_CullTransparentMesh: 0 +--- !u!114 &724431153018416109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9136319240660898480} + 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.9921569, g: 0.69803923, b: 0.41960788, 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: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 57 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6389\u843D\u5956\u52B1" diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua index ffa7cd33c3..756c1005d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyBossPopup.lua @@ -1,21 +1,20 @@ require("Base/BasePanel") local XiaoYaoLuckyBossPopup = Inherit(BasePanel) local this = XiaoYaoLuckyBossPopup +local monsterGroup = {} +local curMonsterGroup -local monsterGroupId local _LiveName local _LiveNode -local MapPanel -local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) +local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local MonsterConfig=ConfigManager.GetConfig(ConfigName.MonsterConfig) -local MonsterGroupConfig = ConfigManager.GetConfig(ConfigName.MonsterGroup) local ArtConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) -local herosList={} - -function this:InitComponent() +local monsterGroupPrefabs = {} +local rewardPrefabs = {} +function XiaoYaoLuckyBossPopup:InitComponent() this.root = self.gameObject this.btnBack =Util.GetGameObject(this.root,"Panel/bg/btnBack") this.title =Util.GetGameObject(this.root,"Panel/bg/title"):GetComponent("Text") @@ -26,11 +25,12 @@ function this:InitComponent() this.e_fightBtn=Util.GetGameObject(this.root,"Panel/EnemyInfo/fight") this.heroList=Util.GetGameObject(this.root,"Panel/EnemyInfo/Scroll/heroList") + this.rewardList=Util.GetGameObject(this.root,"Panel/EnemyInfo/rewardScroll/rewardList") this.iconPre=Util.GetGameObject(this.root,"Panel/EnemyInfo/Scroll/pre") end -function this:BindEvent() +function XiaoYaoLuckyBossPopup:BindEvent() Util.AddClick(this.btnBack,function() self:ClosePanel() end) @@ -41,16 +41,47 @@ function this:BindEvent() end -function this:OnOpen(...) +function XiaoYaoLuckyBossPopup:OnOpen() end -function this:OnShow() - monsterGroupId = 0 - this.SetSelectHero() +function XiaoYaoLuckyBossPopup:OnShow() + monsterGroup = XiaoYaoManager.GetMonsterDatas() + curMonsterGroup = monsterGroup[1] + this:RefreshMonsterList() + this:SetSelectHero() end -function this.SetSelectHero() +function this:InitMonsterList() + for i = 1 ,#monsterGroupPrefabs do + monsterGroupPrefabs[i].gameObject:SetActive(false) + end + for i = 1 , monsterGroup do + if not monsterGroupPrefabs[i] then + monsterGroupPrefabs[i] = newObjToParent(this.iconPre,this.heroList) + end + monsterGroupPrefabs[i].gameObject:SetActive(true) + this:SetSingleMonster(monsterGroupPrefabs[i],monsterGroup[1]) + end +end +function XiaoYaoLuckyBossPopup:SetSingleMonster(go,data) + local frame = Util.GetGameObject(go,"frame"):GetComponent("Image") + local icon = Util.GetGameObject(go,"icon"):GetComponent("Image") + local lv = Util.GetGameObject(go,"lv/Text"):GetComponent("Text") + local choosed = Util.GetGameObject(go,"choosed") + local _data = monsterGroup[data.monsterId] + frame.sprite = Util.LoadSprite("") + icon.sprite = Util.LoadSprite("") + lv.text = _data.Level + Util.AddOnceClick(go,function() + if curMonsterGroup.monsterId == data.monsterId then + else + this:SetSelectHero() + end + end) +end + +function XiaoYaoLuckyBossPopup:SetSelectHero() local itemId = 10001 local itemNum = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index da6a6aaf36..888d03abab 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -2,6 +2,12 @@ XiaoYaoManager = {} local this = XiaoYaoManager this.curMapId=0; this.curMapData={} + +this.MonsterData={} + +this.luckyTurnTableRewards={} +this.luckyluckyTurnTableTimes = 0 +this.luckyluckyTurnTableRemainTime = 0 --打开逍遥游地图列表界面 function this.OpenMapList() Log("点击打开逍遥游地图列表界面") @@ -11,7 +17,7 @@ function this.OpenMapList() for i = 1, #msg.infos do Log("mapId:"..msg.infos[i].mapId..",process:"..msg.infos[i].process) _data[msg.infos[i].mapId]=msg.infos[i].process - end + end Log("打开逍遥游地图列表界面") UIManager.OpenPanel(UIName.XiaoYaoYouPanel,_data) end) @@ -33,7 +39,8 @@ function this.OpenXiaoYaoMap(mapId) return a.cellIndex < b.cellIndex end) end - + -- this.InitLuckyTurnTables(msg) + -- this.InitMonsterData(msg.monsterInfo,1) Log("打开逍遥游地图列表界面") UIManager.OpenPanel(UIName.XiaoYaoMapPanel) end) @@ -45,8 +52,82 @@ function this.StartXiaoYao() for i = 1, #msg.pointes do this.curMapData.location=this.curMapData.location+msg.pointes[i] end + --0、普通节点 1、奖励节点 2、双倍节点 3、额外骰子节点 4、招募英雄节点 5、怪物节点 6,转盘 + if msg.pathType == 5 then + this.InitMonsterData(msg.monsterInfo,2) + elseif msg.pathType == 6 then + this.InitLuckyTurnTables(msg) + end end) end +function this.InitLuckyTurnTables(msg) + this.luckyTurnTableRewards = {} + for i = 1, #msg.randomItem do + table.insert(this.luckyTurnTableRewards,msg.randomItem[i]) + end + this.luckyluckyTurnTableTimes = msg.randomNum + if msg.randomTime and msg.randomTime > 0 then + this.luckyluckyTurnTableRemainTime = msg.randomTime + elseif msg.overTime and msg.overTime > 0 then + this.luckyluckyTurnTableRemainTime = msg.overTime + end +end + +-- type 1初始化 2添加 +function this.InitMonsterData(BackMonsterDatas,type) + if type == 1 then + this.MonsterData = {} + end + for i= 1, #BackMonsterDatas do + local monster = {} + monster.monsterId = BackMonsterDatas[i].monsterId + monster.monsterIndex = BackMonsterDatas[i].monsterIndex + monster.monsterHp = BackMonsterDatas[i].monsterHp + monster.remainTime = BackMonsterDatas[i].remainTime + monster.attackNum = BackMonsterDatas[i].attackNum + monster.reward = BackMonsterDatas[i].reward + table.insert(this.MonsterData,monster) + end + this.SortMonster(this.MonsterData) + end + + function this.GetMonsterDatas() + if not this.MonsterData or #this.MonsterData < 1 then + return nil + end + for i = 1 , #this.MonsterData do + if this.MonsterData[i].remainTime - PlayerManager.serverTime() < 1 then + table.remove(this.MonsterData,i) + end + end + table.sort(this.MonsterData,function(a,b) + return a.monsterIndex > b.monsterIndex + end) + return this.MonsterData + end + +function this.SortMonster(MonsterData) + table.sort(MonsterData,function(a,b) + if a.remainTime <= b.remainTime then + return a.monsterIndex > b.monsterIndex + else + return a.remainTime > b.remainTime + end + end) +end + +function this.GetMonsterDataReMainTimesAndTime() + if not this.MonsterData or #this.MonsterData < 1 then + return nil + end + local removeData = {} + for i = 1 , #this.MonsterData do + if this.MonsterData[i].remainTime - PlayerManager.serverTime() < 1 then + table.remove(this.MonsterData,i) + end + end + return #this.MonsterData,this.MonsterData[#this.MonsterData].remainTime + end return XiaoYaoManager \ No newline at end of file