From feb8aa2f9ff698ca25b5135f1de0bb3c98b49c15 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 15 Oct 2020 19:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=8D=E9=81=A5=E6=B8=B8=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E9=A2=84=E8=AE=BE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/XiaoYao/XiaoYaoEventPanel.prefab | 867 ++++++++++++++++++ .../UI/XiaoYao/XiaoYaoEventPanel.prefab.meta | 7 + .../Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab | 16 +- .../ResConfigs/ResourcePathConfig.asset | 4 + Assets/ManagedResources/~Lua/Data/UIData.lua | 1 + .../Modules/XiaoYao/XiaoYaoEventPanel.lua | 43 + .../XiaoYao/XiaoYaoEventPanel.lua.meta | 7 + .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 20 +- .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 69 +- .../ExcelTool/DataConfigMD5Record.asset | 652 ++++++------- 10 files changed, 1323 insertions(+), 363 deletions(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab new file mode 100644 index 0000000000..8175bbe66a --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab @@ -0,0 +1,867 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5211396038589999715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396038589999714} + - component: {fileID: 5211396038589999724} + - component: {fileID: 5211396038589999725} + m_Layer: 5 + m_Name: Image (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396038589999714 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038589999715} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5211396039673714623} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 347.69995, y: 2.6000977} + m_SizeDelta: {x: 391, y: 83} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211396038589999724 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038589999715} + m_CullTransparentMesh: 0 +--- !u!114 &5211396038589999725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038589999715} + 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: b412cdd35b24b424290c719209962f15, 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 &5211396038736744969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396038736744968} + - component: {fileID: 5211396038736745013} + - component: {fileID: 5211396038736744970} + - component: {fileID: 5211396038736744971} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396038736744968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038736744969} + 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: 5211396039673714623} + 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.8000489, y: 234.75} + m_SizeDelta: {x: 307, y: 105} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211396038736745013 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038736744969} + m_CullTransparentMesh: 0 +--- !u!114 &5211396038736744970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038736744969} + 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: 4c74df2ebd73abd48b318d390da81e45, 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 &5211396038736744971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038736744969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 4, y: 4, z: 4} + initFloat: 0 + isInit: 1 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0 + duration: 0.2 + delay: 0 + curveType: 0 + changeType: 4 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 0} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 +--- !u!1 &5211396038879270288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396038879270291} + - component: {fileID: 5211396038879270300} + - component: {fileID: 5211396038879270301} + - component: {fileID: 5211396038879270290} + m_Layer: 5 + m_Name: XiaoYaoEventPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396038879270291 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038879270288} + 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: 5211396039422754033} + - {fileID: 5211396039673714623} + 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 &5211396038879270300 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038879270288} + m_CullTransparentMesh: 0 +--- !u!223 &5211396038879270301 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038879270288} + 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 &5211396038879270290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038879270288} + 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 &5211396038954660886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396038954660881} + - component: {fileID: 5211396038954660883} + - component: {fileID: 5211396038954660880} + m_Layer: 5 + m_Name: Image (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396038954660881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038954660886} + 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: 5211396039673714623} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -343.8001, y: 6.6000977} + m_SizeDelta: {x: 391, y: 83} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211396038954660883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038954660886} + m_CullTransparentMesh: 0 +--- !u!114 &5211396038954660880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396038954660886} + 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: b412cdd35b24b424290c719209962f15, 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 &5211396039422754038 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396039422754033} + - component: {fileID: 5211396039422754034} + - component: {fileID: 5211396039422754035} + - component: {fileID: 5211396039422754032} + m_Layer: 5 + m_Name: closeBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396039422754033 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039422754038} + 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: 5211396038879270291} + 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 &5211396039422754034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039422754038} + m_CullTransparentMesh: 0 +--- !u!114 &5211396039422754035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039422754038} + 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.47058824} + 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 &5211396039422754032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039422754038} + 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: 5211396039422754035} + 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 &5211396039611489437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396039611489436} + - component: {fileID: 5211396039611489438} + - component: {fileID: 5211396039611489439} + m_Layer: 5 + m_Name: Image2 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396039611489436 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039611489437} + 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: 5211396039673714623} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.8000489, y: -11.299805} + m_SizeDelta: {x: 805, y: 225} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211396039611489438 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039611489437} + m_CullTransparentMesh: 0 +--- !u!114 &5211396039611489439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039611489437} + 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: 0.65882355} + 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: d5d353f7a9fe75848bfe7ce3e8d6ba00, 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 &5211396039673714620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396039673714623} + - component: {fileID: 5211396039673714619} + - component: {fileID: 5211396039673714616} + - component: {fileID: 5211396039673714617} + - component: {fileID: 5211396039673714622} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396039673714623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039673714620} + 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: 5211396038736744968} + - {fileID: 5211396038954660881} + - {fileID: 5211396038589999714} + - {fileID: 5211396039611489436} + - {fileID: 5211396040021950467} + - {fileID: 4838702532749912415} + m_Father: {fileID: 5211396038879270291} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.14990234, y: 7.25} + m_SizeDelta: {x: -0.2999512, y: -1479.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211396039673714619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039673714620} + m_CullTransparentMesh: 0 +--- !u!114 &5211396039673714616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039673714620} + 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: 3ddf57e863f9779499219883f26c457c, 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 &5211396039673714617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039673714620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &5211396039673714622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396039673714620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: [] + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 +--- !u!1 &5211396040021950464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5211396040021950467} + - component: {fileID: 5211396040021950477} + - component: {fileID: 5211396040021950466} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5211396040021950467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396040021950464} + 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: 5211396039673714623} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5211396040021950477 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396040021950464} + m_CullTransparentMesh: 0 +--- !u!114 &5211396040021950466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211396040021950464} + 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: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &7861715659272053939 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 209971410732065439} + - component: {fileID: 823541989204434481} + - component: {fileID: 2431278252624565442} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &209971410732065439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861715659272053939} + 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: 4838702532749912415} + 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: 105} + m_SizeDelta: {x: 169, y: 207} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &823541989204434481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861715659272053939} + m_CullTransparentMesh: 0 +--- !u!114 &2431278252624565442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7861715659272053939} + 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: d090a211e2b853746b5d2662d8f4b3ae, 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 &9132433766242789470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4838702532749912415} + - component: {fileID: 4544877072755820538} + - component: {fileID: 6525320071425691543} + m_Layer: 5 + m_Name: eventIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4838702532749912415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9132433766242789470} + 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: 209971410732065439} + m_Father: {fileID: 5211396039673714623} + m_RootOrder: 5 + 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: 185, y: 193} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4544877072755820538 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9132433766242789470} + m_CullTransparentMesh: 0 +--- !u!114 &6525320071425691543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9132433766242789470} + 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: d2597f149085bab469d7034a78b0d219, 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/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab.meta b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab.meta new file mode 100644 index 0000000000..e6cc406430 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoEventPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1b182f6023f8b3458c5b25499fd4618 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 537403845c..4f0811a684 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -1179,7 +1179,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.5, y: -336} + m_AnchoredPosition: {x: 92.5, y: -96.5} m_SizeDelta: {x: 185, y: 193} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8809899214388357845 @@ -1295,8 +1295,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: 0, y: 49.7} - m_SizeDelta: {x: 185, y: 193} + m_AnchoredPosition: {x: 0, y: 63.9} + m_SizeDelta: {x: 119, y: 151} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8162398967560234576 CanvasRenderer: @@ -1326,7 +1326,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: d97be51fc8083f849a8e6e51b2a20850, type: 3} + m_Sprite: {fileID: 21300000, guid: aa369979a77fd0b47a181013d8226dd4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1582,8 +1582,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: 0, y: 49.7} - m_SizeDelta: {x: 185, y: 193} + m_AnchoredPosition: {x: 0, y: 63.9} + m_SizeDelta: {x: 119, y: 151} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8477823113637739355 CanvasRenderer: @@ -1927,8 +1927,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: 0, y: 49.7} - m_SizeDelta: {x: 185, y: 193} + m_AnchoredPosition: {x: 0, y: 63.9} + m_SizeDelta: {x: 119, y: 151} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6901291718702421079 CanvasRenderer: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 35c39a7bb4..c915a5e1d0 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -35090,6 +35090,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 261 resAbNameIndex: 2318 + - resName: XiaoYaoEventPanel + extension: .prefab + resPathIndex: 262 + resAbNameIndex: 2318 - resName: XiaoyaoHeroGetPopup extension: .prefab resPathIndex: 262 diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index fc701ff62d..e18a1784d9 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -337,6 +337,7 @@ UIName = { XiaoYaoYouPanel=337, --逍遥游入口界面 XiaoYaoMapPanel=338, --逍遥游地图界面 XiaoYaoRewardPreviewPanel=347,--逍遥游奖池预览界面 + XiaoYaoEventPanel=348,--逍遥游触发事件展示界面 } diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua new file mode 100644 index 0000000000..41df4ad264 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua @@ -0,0 +1,43 @@ +require("Base/BasePanel") +local XiaoYaoEventPanel = Inherit(BasePanel) +local this = XiaoYaoEventPanel + +--初始化组件(用于子类重写) +function this:InitComponent() + + this.btnBack = Util.GetGameObject(self.transform, "closeBtn") + this.title=Util.GetGameObject(self.transform, "bg/title"):GetComponent("Image") + +end + +--绑定事件(用于子类重写) +function this:BindEvent() + Util.AddClick(this.btnBack, function() + this:ClosePanel() + end) +end + +--界面打开时调用(用于子类重写) +function this:OnOpen(_type,_data) + if _type==0 then + this.title.sprite=Util.LoadSprite("x_xiaoyaoyou_youlichenggong") + else + this.title.sprite=Util.LoadSprite("x_xiaoyaoyou_chufaxianyuan") + end +end + +--界面打开或者重新打开后,界面刷新时调用(用于子类重写) +function this:OnShow() + +end + +--界面关闭时调用(用于子类重写) +function this:OnClose() + this.starPanel:SetActive(false) +end + +--界面销毁时调用(用于子类重写) +function this:OnDestroy() +end + +return XiaoYaoEventPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua.meta new file mode 100644 index 0000000000..c389fd433a --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fa25bffccce83004f992feeb2c678c56 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 7aa7e4a35b..d4b3ff0366 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -1,7 +1,6 @@ XiaoYaoManager = {} local this = XiaoYaoManager this.curMapId=0; -this.curMapData={} this.MonsterData={} this.fightBossIndex = 0 @@ -29,33 +28,28 @@ end function this.OpenXiaoYaoMap(mapId) NetManager.JourneyGetOneInfoResponse(mapId,function (msg) this.curMapId=mapId - this.curMapData=msg - Log("格子数量:"..#this.curMapData.cell) - if this.curMapData.cell~=nil then - table.sort(this.curMapData.cell,function(a,b) + local curMapData=msg + if curMapData.cell~=nil then + table.sort(curMapData.cell,function(a,b) return a.cellIndex < b.cellIndex end) end this.fightBossIndex = 0 this.InitLuckyTurnTables(msg) this.InitMonsterData(msg.monsterInfo,1) - Log("打开逍遥游地图列表界面") - UIManager.OpenPanel(UIName.XiaoYaoMapPanel) + Log("打开逍遥游地图界面") + UIManager.OpenPanel(UIName.XiaoYaoMapPanel,curMapData) end) end --掷骰子请求 function this.StartXiaoYao() NetManager.JourneyDoResponse(this.curMapId,function (msg) - for i = 1, #msg.pointes do - Log("骰子点数:"..msg.pointes[i]) - 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.monster,2) + --this.InitMonsterData(msg.monster,2) elseif msg.pathType == 6 then - this.InitLuckyTurnTables(msg) + --this.InitLuckyTurnTables(msg) end Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.StartXiaoYao, msg) end) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index b0ff9d30d9..59765019b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -2,9 +2,11 @@ require("Base/BasePanel") XiaoYaoMapPanel = Inherit(BasePanel) local this = XiaoYaoMapPanel local cursortingOrder +local mapData={} local curGridIndex=1 local allGridData={} local isAuto=false +local priThread = nil --初始化组件(用于子类重写) function this:InitComponent() @@ -83,6 +85,11 @@ function this:BindEvent() this.youliTag:SetActive(isAuto) XiaoYaoManager.StartXiaoYao() end) + + --开始游历 + Util.AddClick(this.succeedObj,function() + XiaoYaoManager.OpenMapList() + end) end --添加事件监听(用于子类重写) @@ -118,9 +125,7 @@ function this.RunMap(_data) end if curGridIndex>=#allGridData then this.StopAuto() - MsgPanel.ShowTwo("已到达终点,是否重新云游!", nil, function() - XiaoYaoManager.OpenMapList() - end) + UIManager.OpenPanel(UIName.XiaoYaoEventPanel,0) end if isAuto then XiaoYaoManager.StartXiaoYao() @@ -129,14 +134,18 @@ function this.RunMap(_data) end,0.3,-1,true) this.turnEffect:Start() end - +--取消自动游历 function this.StopAuto() isAuto=false this.youliTag:SetActive(false) this.toggle.gameObject:SetActive(false) end - +--事件触发处理 function this.EventTrigger(_data) + if priThread then + coroutine.stop(priThread) + priThread = nil + end Log("触发事件类型为:".._data.pathType) if _data.pathType==0 then --普通节点 @@ -147,10 +156,17 @@ function this.EventTrigger(_data) elseif _data.pathType==3 then --额外骰子节点 PopupTipPanel.ShowTip("骰子x2") elseif _data.pathType==4 then --招募英雄节点 + UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType) + priThread = coroutine.start(function() + coroutine.wait(1) + PopupTipPanel.ShowTip("触发了东海寻仙") + end) this.shopBtn:SetActive(true) elseif _data.pathType==5 then --怪物节点 + UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType) this.bossBtn:SetActive(true) elseif _data.pathType==6 then --转盘 + UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType) this.rouleBtn:SetActive(true) end if _data.drop.itemlist ~= nil and #_data.drop.itemlist > 0 then @@ -167,19 +183,20 @@ function this.EventTrigger(_data) end end --界面打开时调用(用于子类重写) -function this:OnOpen(...) - curGridIndex=XiaoYaoManager.curMapData.location - Log("当前位置索引:"..curGridIndex) - for i = 1, #XiaoYaoManager.curMapData.cell do - local x, y=Map_Pos2UV(XiaoYaoManager.curMapData.cell[i].cellId) +function this:OnOpen(_mapData) + mapData=_mapData + this.InitShowEvent() + --初始化地图 + for i = 1, #mapData.cell do + local x, y=Map_Pos2UV(mapData.cell[i].cellId) allGridData[i]={} allGridData[i].x=x*128-64 allGridData[i].y=-y*128+64 - if XiaoYaoManager.curMapData.cell[i].pointId>0 then - allGridData[i].event = ConfigManager.GetConfigData(ConfigName.MapPointConfig,XiaoYaoManager.curMapData.cell[i].pointId).Icon + if mapData.cell[i].pointId>0 then + allGridData[i].event = ConfigManager.GetConfigData(ConfigName.MapPointConfig,mapData.cell[i].pointId).Icon end end - Log("当前数量"..this.gridParent.transform.childCount) + Log("当前地图格子数量"..this.gridParent.transform.childCount) if this.gridParent.transform.childCount<=0 then for i = 1, #allGridData do local obj= newObjToParent(this.grid, this.gridParent.transform) @@ -193,11 +210,12 @@ function this:OnOpen(...) self.effectLive.transform.localScale = MapFloatingConfig[allGridData[i].event].scale self.effectLive.transform.localPosition = MapFloatingConfig[allGridData[i].event].position end - end - + end obj.transform:DOAnchorPos(Vector3(allGridData[i].x,allGridData[i].y,0),0) end end + curGridIndex=mapData.location + Log("当前位置索引:"..curGridIndex) this.TT.transform:DOAnchorPos(Vector3(allGridData[curGridIndex].x,allGridData[curGridIndex].y,0),0) this.TT.transform:SetAsLastSibling() this.MapMove(allGridData[curGridIndex].x,0) @@ -206,11 +224,26 @@ function this:OnOpen(...) this.mapProcess.text=string.format("%d%%",(curGridIndex/#allGridData*100)) local mapBg = mapConfig.MapImage Log("当前地图id:"..XiaoYaoManager.curMapId) + --实例化地图背景 for i = 1, #mapBg do Log(mapBg[i]) this.mapParent.transform:GetChild(i-1):GetComponent("Image").sprite=Util.LoadSprite(mapBg[i]) end - +end +--初始化地图事件显示 +function this.InitShowEvent() + if mapData.diceNum>1 then --骰子x2 + -- body + end + if mapData.randomTime>0 and mapData.randomNum>0 then + this.rouleBtn:SetActive(true) + end + if mapData.monsterInfo then + this.bossBtn:SetActive(true) + end + if mapData.goodsInfo then + this.shopBtn:SetActive(true) + end end function this.MapMove(curX,moveTime) @@ -269,6 +302,10 @@ function this:OnClose() this.turnEffect:Stop() this.turnEffect=nil end + this.rouleBtn:SetActive(false) + this.bossBtn:SetActive(false) + this.shopBtn:SetActive(false) + this.StopAuto() end --界面销毁时调用(用于子类重写) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index 2552444c04..bdc92de947 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -13,380 +13,380 @@ MonoBehaviour: m_Name: DataConfigMD5Record m_EditorClassIdentifier: _keys: - - E:\data_execl\master_develop/base_data\ArenaRobotSetting.xlsx - - E:\data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx - - E:\data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx - - E:\data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx - - E:\data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx - - E:\data_execl\master_develop/base_data\EndlessDifficulty.xlsx - - E:\data_execl\master_develop/base_data\ArenaRobotConfig.xlsx - - E:\data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx - E:\data_execl\master_develop/base_data\ActivityDropReward.xlsx - - E:\data_execl\master_develop/base_data\AreaConfig.xlsx - E:\data_execl\master_develop/base_data\ActivityRankingReward.xlsx - - E:\data_execl\master_develop/base_data\AccomplishmentConfig.xlsx - - E:\data_execl\master_develop/base_data\AdventureReward.xlsx - - E:\data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx - - E:\data_execl\master_develop/base_data\ExpeditionSetting.xlsx - - E:\data_execl\master_develop/base_data\ErrorCodeHint.xlsx - - E:\data_execl\master_develop/base_data\ArenaSetting.xlsx - E:\data_execl\master_develop/base_data\AchievementConfig.xlsx + - E:\data_execl\master_develop/base_data\AdventureConfig.xlsx + - E:\data_execl\master_develop/base_data\AdventureReward.xlsx + - E:\data_execl\master_develop/base_data\AreaConfig.xlsx + - E:\data_execl\master_develop/base_data\ArenaBattleReward.xlsx + - E:\data_execl\master_develop/base_data\AccomplishmentConfig.xlsx + - E:\data_execl\master_develop/base_data\ArenaRobotSetting.xlsx + - E:\data_execl\master_develop/base_data\ArenaRobotConfig.xlsx + - E:\data_execl\master_develop/base_data\ArenaReward.xlsx + - E:\data_execl\master_develop/base_data\ArenaSetting.xlsx + - E:\data_execl\master_develop/base_data\BeginnerTask.xlsx - E:\data_execl\master_develop/base_data\AudioConfig.xlsx - E:\data_execl\master_develop/base_data\BeStronger.xlsx - E:\data_execl\master_develop/base_data\BlessingConfig.xlsx - - E:\data_execl\master_develop/base_data\AdventureConfig.xlsx - - E:\data_execl\master_develop/base_data\FakeBattle.xlsx - - E:\data_execl\master_develop/base_data\ArenaBattleReward.xlsx - - E:\data_execl\master_develop/base_data\ArenaReward.xlsx - - E:\data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx - - E:\data_execl\master_develop/base_data\GameSetting.xlsx - - E:\data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx - - E:\data_execl\master_develop/base_data\BeginnerTask.xlsx - - E:\data_execl\master_develop/base_data\GodSacrificeSetting.xlsx - - E:\data_execl\master_develop/base_data\GodSacrificeConfig.xlsx - E:\data_execl\master_develop/base_data\BloodyBattleReward.xlsx - E:\data_execl\master_develop/base_data\BlessingRewardPool.xlsx - E:\data_execl\master_develop/base_data\BloodyBattleTask.xlsx - - E:\data_execl\master_develop/base_data\GuildScoreConfig.xlsx - - E:\data_execl\master_develop/base_data\FreeTravel.xlsx - - E:\data_execl\master_develop/base_data\BloodyBattleSetting.xlsx - - E:\data_execl\master_develop/base_data\FoodsConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildHelpConfig.xlsx - - E:\data_execl\master_develop/base_data\GlobalSystemConfig.xlsx - - E:\data_execl\master_develop/base_data\GlobalActivity.xlsx - - E:\data_execl\master_develop/base_data\ArtResourcesConfig.xlsx - - E:\data_execl\master_develop/base_data\GuideConfig.xlsx - - E:\data_execl\master_develop/base_data\BloodyRankConfig.xlsx - - E:\data_execl\master_develop/base_data\ChallengeStarBox.xlsx - - E:\data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx - - E:\data_execl\master_develop/base_data\ChampionshipSetting.xlsx - E:\data_execl\master_develop/base_data\ActivityRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildBossConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildWarConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildCheckpointRank.xlsx - - E:\data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildLevelConfig.xlsx - - E:\data_execl\master_develop/base_data\FreeTravelStore.xlsx - - E:\data_execl\master_develop/base_data\HeroRankupGroup.xlsx - - E:\data_execl\master_develop/base_data\HeroRankupConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildRedPackConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\BuffEffectConfig.xlsx - - E:\data_execl\master_develop/base_data\ChallengeMapConfig.xlsx - - E:\data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx - - E:\data_execl\master_develop/base_data\ChallengeConfig.xlsx - - E:\data_execl\master_develop/base_data\ChallengeSetting.xlsx - - E:\data_execl\master_develop/base_data\ChampionshipReward.xlsx - - E:\data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx - - E:\data_execl\master_develop/base_data\CombatControl.xlsx - - E:\data_execl\master_develop/base_data\EquipSuiteConfig.xlsx - - E:\data_execl\master_develop/base_data\DifferDemonsConfig.xlsx - - E:\data_execl\master_develop/base_data\DialogueViewConfig.xlsx - - E:\data_execl\master_develop/base_data\CustomEventConfig.xlsx - - E:\data_execl\master_develop/base_data\DailyTasksConfig.xlsx - - E:\data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx - - E:\data_execl\master_develop/base_data\DialRewardSetting.xlsx - - E:\data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildSetting.xlsx - - E:\data_execl\master_develop/base_data\GuildWarRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildSacrificeRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\FloodConfig.xlsx - - E:\data_execl\master_develop/base_data\ChapterOptionConfig.xlsx - - E:\data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx - - E:\data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx - - E:\data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx - - E:\data_execl\master_develop/base_data\ExchangeRate.xlsx - - E:\data_execl\master_develop/base_data\DialRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\DailyChallengeConfig.xlsx - - E:\data_execl\master_develop/base_data\JewelConfig.xlsx - - E:\data_execl\master_develop/base_data\LoginPosterConfig.xlsx - - E:\data_execl\master_develop/base_data\LuckyCatConfig.xlsx - - E:\data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx + - E:\data_execl\master_develop/base_data\BloodyBattleSetting.xlsx + - E:\data_execl\master_develop/base_data\BloodyMessagesConfig.xlsx - E:\data_execl\master_develop/base_data\BloodyBattleTreasure.xlsx - - E:\data_execl\master_develop/base_data\LuxuryFund.xlsx + - E:\data_execl\master_develop/base_data\BloodyRankConfig.xlsx + - E:\data_execl\master_develop/base_data\BuffEffectConfig.xlsx + - E:\data_execl\master_develop/base_data\ChallengeConfig.xlsx + - E:\data_execl\master_develop/base_data\ChallengeMissionConfig.xlsx + - E:\data_execl\master_develop/base_data\ChallengeMapConfig.xlsx + - E:\data_execl\master_develop/base_data\ChallengeSetting.xlsx + - E:\data_execl\master_develop/base_data\ArtResourcesConfig.xlsx + - E:\data_execl\master_develop/base_data\ChallengeStarBox.xlsx + - E:\data_execl\master_develop/base_data\ChampionshipReward.xlsx + - E:\data_execl\master_develop/base_data\ChampionshipSetting.xlsx + - E:\data_execl\master_develop/base_data\CustomEventConfig.xlsx + - E:\data_execl\master_develop/base_data\ChapterOptionConfig.xlsx + - E:\data_execl\master_develop/base_data\CombatControl.xlsx + - E:\data_execl\master_develop/base_data\DailyChallengeConfig.xlsx + - E:\data_execl\master_develop/base_data\DailyTasksConfig.xlsx + - E:\data_execl\master_develop/base_data\DialRewardSetting.xlsx + - E:\data_execl\master_develop/base_data\DialRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\DifferDemonsBoxPools.xlsx + - E:\data_execl\master_develop/base_data\DifferDemonsBoxSeaons.xlsx + - E:\data_execl\master_develop/base_data\ChapterEventPointConfig.xlsx + - E:\data_execl\master_develop/base_data\DifferDemonsBoxSetting.xlsx + - E:\data_execl\master_develop/base_data\DifferDemonsConfig.xlsx + - E:\data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx + - E:\data_execl\master_develop/base_data\DifferDemonsStageConfig.xlsx + - E:\data_execl\master_develop/base_data\EndlessDifficulty.xlsx + - E:\data_execl\master_develop/base_data\DialogueViewConfig.xlsx + - E:\data_execl\master_develop/base_data\EndlessMapConfig.xlsx + - E:\data_execl\master_develop/base_data\DifferDemonsComonpentsConfig.xlsx + - E:\data_execl\master_develop/base_data\EquipPropertyPool.xlsx + - E:\data_execl\master_develop/base_data\EquipSignSetting.xlsx + - E:\data_execl\master_develop/base_data\EquipConfig.xlsx + - E:\data_execl\master_develop/base_data\EquipSign.xlsx + - E:\data_execl\master_develop/base_data\EquipStarsConfig.xlsx + - E:\data_execl\master_develop/base_data\EquipSuiteConfig.xlsx + - E:\data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx + - E:\data_execl\master_develop/base_data\ErrorCodeEerverConfig.xlsx + - E:\data_execl\master_develop/base_data\EquipTalismanaRankup.xlsx + - E:\data_execl\master_develop/base_data\ExchangeActivityConfig.xlsx + - E:\data_execl\master_develop/base_data\ErrorCodeHint.xlsx + - E:\data_execl\master_develop/base_data\ExpeditionFloorConfig.xlsx + - E:\data_execl\master_develop/base_data\ExchangeRate.xlsx + - E:\data_execl\master_develop/base_data\ExpeditionNodeConfig.xlsx + - E:\data_execl\master_develop/base_data\ExpeditionHolyConfig.xlsx + - E:\data_execl\master_develop/base_data\ExpeditionSetting.xlsx + - E:\data_execl\master_develop/base_data\ExpeditionRecruitConfig.xlsx + - E:\data_execl\master_develop/base_data\ExploreFunctionConfig.xlsx + - E:\data_execl\master_develop/base_data\FakeBattle.xlsx + - E:\data_execl\master_develop/base_data\FoodsConfig.xlsx + - E:\data_execl\master_develop/base_data\FreeTravel.xlsx + - E:\data_execl\master_develop/base_data\FloodConfig.xlsx + - E:\data_execl\master_develop/base_data\GameSetting.xlsx + - E:\data_execl\master_develop/base_data\GlobalActivity.xlsx + - E:\data_execl\master_develop/base_data\FreeTravelStore.xlsx + - E:\data_execl\master_develop/base_data\GodSacrificeConfig.xlsx + - E:\data_execl\master_develop/base_data\GlobalSystemConfig.xlsx + - E:\data_execl\master_develop/base_data\GodSacrificeSetting.xlsx + - E:\data_execl\master_develop/base_data\GuildBossConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildBossRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildCheckpointConfig.xlsx + - E:\data_execl\master_develop/base_data\GuideConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildHelpConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildLevelConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildCheckpointRank.xlsx + - E:\data_execl\master_develop/base_data\GuildRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildRedPackConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildSacrificeRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildSacrificeConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildScoreConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildSetting.xlsx + - E:\data_execl\master_develop/base_data\GuildWarConfig.xlsx + - E:\data_execl\master_develop/base_data\GuildWarRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\EventPointConfig.xlsx + - E:\data_execl\master_develop/base_data\HeroConfig.xlsx + - E:\data_execl\master_develop/base_data\EquipTalismana.xlsx + - E:\data_execl\master_develop/base_data\HeroRankupConfig.xlsx + - E:\data_execl\master_develop/base_data\HeroRankupGroup.xlsx + - E:\data_execl\master_develop/base_data\HeroSacrifice.xlsx + - E:\data_execl\master_develop/base_data\HeroLevelConfig.xlsx + - E:\data_execl\master_develop/base_data\JewelConfig.xlsx - E:\data_execl\master_develop/base_data\HeroReturn.xlsx + - E:\data_execl\master_develop/base_data\GuildTechnology.xlsx + - E:\data_execl\master_develop/base_data\JewelResonanceConfig.xlsx + - E:\data_execl\master_develop/base_data\JumpConfig.xlsx + - E:\data_execl\master_develop/base_data\LevelSetting.xlsx + - E:\data_execl\master_develop/base_data\LoginPosterConfig.xlsx + - E:\data_execl\master_develop/base_data\JewelRankupConfig.xlsx + - E:\data_execl\master_develop/base_data\ItemConfig.xlsx + - E:\data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx - E:\data_execl\master_develop/base_data\LotterySetting.xlsx - E:\data_execl\master_develop/base_data\LotterySpecialConfig.xlsx - - E:\data_execl\master_develop/base_data\LevelSetting.xlsx + - E:\data_execl\master_develop/base_data\LuckyCatConfig.xlsx + - E:\data_execl\master_develop/base_data\LuxuryFund.xlsx + - E:\data_execl\master_develop/base_data\MainLevelSettingConfig.xlsx - E:\data_execl\master_develop/base_data\MainMapIconConfig.xlsx - - E:\data_execl\master_develop/base_data\ElementalResonanceConfig.xlsx - - E:\data_execl\master_develop/base_data\SeverConfig.xlsx - E:\data_execl\master_develop/base_data\MazeTreasure.xlsx - - E:\data_execl\master_develop/base_data\EquipSign.xlsx - - E:\data_execl\master_develop/base_data\EquipSignSetting.xlsx - - E:\data_execl\master_develop/base_data\EquipTalismanaLottery.xlsx - - E:\data_execl\master_develop/base_data\EquipStarsConfig.xlsx - - E:\data_execl\master_develop/base_data\EquipConfig.xlsx - - E:\data_execl\master_develop/base_data\EndlessMapConfig.xlsx - - E:\data_execl\master_develop/base_data\JewelResonanceConfig.xlsx - - E:\data_execl\master_develop/base_data\MonsterViewConfig.xlsx - - E:\data_execl\master_develop/base_data\MissionEventsConfig.xlsx - E:\data_execl\master_develop/base_data\MazeTreasureSetting.xlsx - - E:\data_execl\master_develop/base_data\HeroSacrifice.xlsx - - E:\data_execl\master_develop/base_data\HeroConfig.xlsx - - E:\data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\RecommendTeam.xlsx - - E:\data_execl\master_develop/base_data\RunesConfig.xlsx - - E:\data_execl\master_develop/base_data\RewardItemConfig.xlsx - - E:\data_execl\master_develop/base_data\OptionAddCondition.xlsx - - E:\data_execl\master_develop/base_data\PlayerLevelConfig.xlsx - - E:\data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx - - E:\data_execl\master_develop/base_data\EquipPropertyPool.xlsx - - E:\data_execl\master_develop/base_data\SystemMessageConfig.xlsx - - E:\data_execl\master_develop/base_data\StoreTypeConfig.xlsx - - E:\data_execl\master_develop/base_data\SevenDaysScore.xlsx - - E:\data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx - - E:\data_execl\master_develop/base_data\SpiritAnimalStar.xlsx - - E:\data_execl\master_develop/base_data\PlayerRole.xlsx - - E:\data_execl\master_develop/base_data\SignInConfig.xlsx - - E:\data_execl\master_develop/base_data\PlayerAppearance.xlsx - - E:\data_execl\master_develop/base_data\RoleConfig.xlsx + - E:\data_execl\master_develop/base_data\LotteryRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\MissionEventsConfig.xlsx + - E:\data_execl\master_develop/base_data\MapPointConfig.xlsx + - E:\data_execl\master_develop/base_data\MonsterViewConfig.xlsx - E:\data_execl\master_develop/base_data\MonthcardConfig.xlsx - - E:\data_execl\master_develop/base_data\GuildTechnology.xlsx - - E:\data_execl\master_develop/base_data\JewelRankupConfig.xlsx - - E:\data_execl\master_develop/base_data\RandomName.xlsx - - E:\data_execl\master_develop/base_data\SpiritAnimal.xlsx - - E:\data_execl\master_develop/base_data\LevelDifficultyConfig.xlsx - - E:\data_execl\master_develop/base_data\JumpConfig.xlsx + - E:\data_execl\master_develop/base_data\OptionAddCondition.xlsx + - E:\data_execl\master_develop/base_data\MonsterGroup.xlsx + - E:\data_execl\master_develop/base_data\OptionConfig.xlsx + - E:\data_execl\master_develop/base_data\MainLevelConfig.xlsx + - E:\data_execl\master_develop/base_data\PlayerAppearance.xlsx + - E:\data_execl\master_develop/base_data\PassiveSkillConfig.xlsx + - E:\data_execl\master_develop/base_data\PlayerLevelConfig.xlsx + - E:\data_execl\master_develop/base_data\PlayerRole.xlsx + - E:\data_execl\master_develop/base_data\PlayerMountLevelUp.xlsx + - E:\data_execl\master_develop/base_data\PrivilegeTypeConfig.xlsx + - E:\data_execl\master_develop/base_data\PropertyConfig.xlsx - E:\data_execl\master_develop/base_data\QAConfig.xlsx - E:\data_execl\master_develop/base_data\RaceTowerConfig.xlsx - - E:\data_execl\master_develop/base_data\PropertyConfig.xlsx - - E:\data_execl\master_develop/base_data\RunesPoolConfig.xlsx - - E:\data_execl\master_develop/base_data\SpiritAnimalBook.xlsx - - E:\data_execl\master_develop/base_data\SevenDaysActivity.xlsx - - E:\data_execl\master_develop/base_data\TrialSetting.xlsx - - E:\data_execl\master_develop/base_data\TrialQuestionConfig.xlsx - - E:\data_execl\master_develop/base_data\TrialKillConfig.xlsx - - E:\data_execl\master_develop/base_data\SpecialConfig.xlsx - - E:\data_execl\master_develop/base_data\TrialwelfareConfig.xlsx - - E:\data_execl\master_develop/base_data\LotteryRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\TrialGameConfig.xlsx - - E:\data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx - - E:\data_execl\master_develop/base_data\HeroLevelConfig.xlsx - - E:\data_execl\master_develop/base_data\WorldBossConfig.xlsx - - E:\data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx - - E:\data_execl\master_develop/base_data\MapPointConfig.xlsx - - E:\data_execl\master_develop/base_data\SpiritAnimalSetting.xlsx - - E:\data_execl\master_develop/base_data\EventPointConfig.xlsx - - E:\data_execl\master_develop/base_data\ItemConfig.xlsx - - E:\data_execl\master_develop/base_data\TrialConfig.xlsx - - E:\data_execl\master_develop/base_data\TreasureTaskConfig.xlsx - - E:\data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx - - E:\data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx - - E:\data_execl\master_develop/base_data\WorldBossTreasureConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx - - E:\data_execl\master_develop/base_data\PassiveSkillConfig.xlsx - - E:\data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx - - E:\data_execl\master_develop/base_data\VipLevelConfig.xlsx - - E:\data_execl\master_develop/base_data\TaskConfig.xlsx - - E:\data_execl\master_develop/base_data\SpiritAnimalLevel.xlsx - - E:\data_execl\master_develop/base_data\EquipTalismana.xlsx - - E:\data_execl\master_develop/base_data\TestWelfare.xlsx - - E:\data_execl\master_develop/base_data\UIConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopSetting.xlsx - - E:\data_execl\master_develop/base_data\WorldBossSetting.xlsx + - E:\data_execl\master_develop/base_data\RaceTowerRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\RandomName.xlsx + - E:\data_execl\master_develop/base_data\RecommendTeam.xlsx - E:\data_execl\master_develop/base_data\PassiveSkillLogicConfig.xlsx + - E:\data_execl\master_develop/base_data\RechargeCommodityConfig.xlsx + - E:\data_execl\master_develop/base_data\RoleConfig.xlsx + - E:\data_execl\master_develop/base_data\RewardItemConfig.xlsx + - E:\data_execl\master_develop/base_data\RunesConfig.xlsx + - E:\data_execl\master_develop/base_data\RunesPoolConfig.xlsx + - E:\data_execl\master_develop/base_data\SevenDaysActivity.xlsx + - E:\data_execl\master_develop/base_data\SeverConfig.xlsx + - E:\data_execl\master_develop/base_data\SevenDaysScore.xlsx + - E:\data_execl\master_develop/base_data\SignInConfig.xlsx - E:\data_execl\master_develop/base_data\SkillConfig.xlsx + - E:\data_execl\master_develop/base_data\SpecialConfig.xlsx + - E:\data_execl\master_develop/base_data\SpiritAnimal.xlsx + - E:\data_execl\master_develop/base_data\SpiritAnimalBook.xlsx - E:\data_execl\master_develop/base_data\SkillLogicConfig.xlsx - - E:\data_execl\master_develop/base_data\OptionConfig.xlsx - - E:\data_execl\master_develop/base_data\WorkShopTechnology.xlsx - - E:\data_execl\master_develop/base_data\StoreConfig.xlsx + - E:\data_execl\master_develop/base_data\SpiritAnimalSetting.xlsx + - E:\data_execl\master_develop/base_data\SpiritAnimalLevel.xlsx + - E:\data_execl\master_develop/base_data\SpiritAnimalStar.xlsx - E:\data_execl\master_develop/base_data\RewardGroup.xlsx - - E:\data_execl\master_develop/base_data\MonsterGroup.xlsx - - E:\data_execl\master_develop/base_data\MainLevelConfig.xlsx + - E:\data_execl\master_develop/base_data\StoreTypeConfig.xlsx + - E:\data_execl\master_develop/base_data\SystemMessageConfig.xlsx + - E:\data_execl\master_develop/base_data\TaskConfig.xlsx + - E:\data_execl\master_develop/base_data\TestWelfare.xlsx + - E:\data_execl\master_develop/base_data\ThemeActivityTaskConfig.xlsx + - E:\data_execl\master_develop/base_data\TreasureSunlongConfig.xlsx + - E:\data_execl\master_develop/base_data\TreasureSunlongTaskConfig.xlsx + - E:\data_execl\master_develop/base_data\TreasureTaskConfig.xlsx + - E:\data_execl\master_develop/base_data\TrialGameConfig.xlsx + - E:\data_execl\master_develop/base_data\TrialKillConfig.xlsx + - E:\data_execl\master_develop/base_data\TrialConfig.xlsx + - E:\data_execl\master_develop/base_data\TrialQuestionConfig.xlsx + - E:\data_execl\master_develop/base_data\TrialSetting.xlsx + - E:\data_execl\master_develop/base_data\TrialwelfareConfig.xlsx + - E:\data_execl\master_develop/base_data\UIConfig.xlsx + - E:\data_execl\master_develop/base_data\VipLevelConfig.xlsx + - E:\data_execl\master_develop/base_data\WorkShopFoundationConfig.xlsx + - E:\data_execl\master_develop/base_data\WorkShopEquipmentConfig.xlsx + - E:\data_execl\master_develop/base_data\WorkShopFunctionConfig.xlsx + - E:\data_execl\master_develop/base_data\WorkShopRebuildConfig.xlsx + - E:\data_execl\master_develop/base_data\WorkShopSetting.xlsx + - E:\data_execl\master_develop/base_data\WorkShopTechnologySetting.xlsx + - E:\data_execl\master_develop/base_data\WorldBossConfig.xlsx + - E:\data_execl\master_develop/base_data\StoreConfig.xlsx + - E:\data_execl\master_develop/base_data\WorldBossRewardConfig.xlsx + - E:\data_execl\master_develop/base_data\WorldBossSetting.xlsx + - E:\data_execl\master_develop/base_data\WorldBossTreasureConfig.xlsx + - E:\data_execl\master_develop/base_data\WorkShopTechnology.xlsx - E:\data_execl\master_develop/base_data\MonsterConfig.xlsx _values: - - 1289424307 - - 873330994 - - 4055477448 - - 903221398 - - 249002466 - - 1241055907 - - 1656119918 - - 2294226303 - 3591751192 - - 413963702 - 514933169 - - 427098595 - - 613479935 - - 1382260277 - - 3930424554 - - 1448464981 - - 1924824445 - 3062382507 + - 1848421159 + - 613479935 + - 413963702 + - 3252026258 + - 427098595 + - 1289424307 + - 1656119918 + - 2296996310 + - 1924824445 + - 755222564 - 2684915448 - 2137927414 - 996682802 - - 1848421159 - - 1195934816 - - 3252026258 - - 2296996310 - - 2618565706 - - 421974146 - - 1023901955 - - 755222564 - - 2683671888 - - 3228523056 - 230994945 - 939963957 - 2131302457 - - 3079207713 - - 1752629277 - - 2050621784 - - 2204989227 - - 3894020600 - - 3739218118 - - 3808224906 - - 240615618 - - 3194116722 - - 3548626589 - - 1565259591 - - 1120913959 - - 3338153430 - 1556955961 - - 173728414 - - 3585263874 - - 3943131728 - - 3228740331 - - 1645456228 - - 3153364400 - - 706684532 - - 1493914227 - - 3773792064 - - 475620184 - - 1996735664 - - 1442255327 - - 3389195548 - - 1678524219 - - 1572157444 - - 2759035733 - - 1705732776 - - 2943614740 - - 329162371 - - 2055413342 - - 4124958540 - - 460607005 - - 2809447110 - - 3230536998 - - 784634300 - - 932779961 - - 4198004043 - - 2432057406 - - 3472737567 - - 2445182985 - - 1468913191 - - 3766499137 - - 2014737423 - - 986789930 - - 1402356663 - - 568553271 - - 702480255 - - 3566908170 - - 1774803500 - - 727009153 - - 1115338914 - - 2479323017 - - 1393544882 + - 2050621784 + - 4055477448 - 3507522218 - - 2903827109 + - 3548626589 + - 3389195548 + - 2759035733 + - 1572157444 + - 1678524219 + - 1705732776 + - 240615618 + - 1565259591 + - 2943614740 + - 3338153430 + - 3230536998 + - 2014737423 + - 2055413342 + - 1774803500 + - 784634300 + - 4198004043 + - 3566908170 + - 903221398 + - 249002466 + - 329162371 + - 932779961 + - 460607005 + - 583891024 + - 1402356663 + - 1241055907 + - 2809447110 + - 3356066097 + - 568553271 + - 3153107712 + - 3517900411 + - 1586346478 + - 1790592577 + - 494399256 + - 4124958540 + - 2568046174 + - 873330994 + - 2294226303 + - 2432057406 + - 1448464981 + - 986789930 + - 702480255 + - 1120913959 + - 2618565706 + - 3930424554 + - 1023901955 + - 1382260277 + - 1195934816 + - 2204989227 + - 2403464093 + - 3766499137 + - 421974146 + - 3808224906 + - 4029321931 + - 3228523056 + - 3739218118 + - 2683671888 + - 173728414 + - 3943131728 + - 1645456228 + - 3194116722 + - 3894020600 + - 3153364400 + - 3228740331 + - 1442255327 + - 475620184 + - 1468913191 + - 1996735664 + - 3079207713 + - 3472737567 + - 3585263874 + - 2445182985 + - 2764123360 + - 254257928 + - 4033164304 + - 3773792064 + - 1493914227 + - 306567717 + - 3255901169 + - 727009153 - 322704922 + - 312894044 + - 3597116301 + - 3844984492 + - 3705022903 + - 1115338914 + - 980629513 + - 2477271823 + - 295715991 - 2123416371 - 1590267476 - - 3705022903 + - 2479323017 + - 2903827109 + - 1393544882 - 260126611 - - 583891024 - - 2748321716 - 866186388 - - 1790592577 - - 3517900411 - - 2568046174 - - 494399256 - - 1586346478 - - 3356066097 - - 3597116301 - - 515856748 - - 3625815197 - 3746847302 - - 306567717 - - 254257928 - - 595190689 - - 2040154280 - - 1155516420 - - 1071877868 - - 683415129 - - 1173373930 - - 2809015961 - - 3153107712 - - 297530923 - - 3546712513 - - 1952787401 - - 319164499 - - 499276381 - - 3641128642 - - 29725303 - - 2534897219 - - 4285496955 + - 3038919550 + - 3625815197 + - 2711128838 + - 515856748 - 2181074157 - - 312894044 - - 980629513 - - 38983593 - - 4289596114 - - 295715991 - - 3844984492 + - 683415129 + - 812846727 + - 2563511001 + - 2872422326 + - 2534897219 + - 2037042661 + - 1173373930 + - 3641128642 + - 319164499 + - 2809015961 + - 181661788 - 2932343965 - 4114437015 - - 181661788 - - 804383039 - - 3331704838 - - 160427834 - - 141295447 - - 280567271 - - 739739032 - - 743217775 - - 2854113790 - - 3038919550 - - 1982645928 - - 2930068975 - - 3255901169 - - 1321320575 - - 76979816 - - 3048495520 - - 2711128838 - - 1944742871 - - 2764123360 - - 3073497484 - - 266440734 - - 2869536578 - - 80325891 - - 967064327 - - 2777840995 - - 3127079988 - - 98336120 - - 2405621183 - - 110435588 - - 2037042661 - - 3913198156 - - 241982493 - - 148429609 - - 175385063 - - 4033164304 - - 4291486445 - - 4200933839 - - 3663717884 - - 3730808838 + - 595190689 + - 38983593 + - 2040154280 - 3007078117 + - 76979816 + - 4285496955 + - 1071877868 + - 1155516420 + - 804383039 + - 160427834 + - 2748321716 + - 1952787401 + - 29725303 - 4125973660 + - 743217775 + - 1214938188 + - 3836698952 - 1856404627 - - 2563511001 - - 2453679101 + - 1944742871 + - 1619754090 + - 2990216175 + - 3287189135 + - 3546712513 + - 297530923 + - 148429609 + - 4291486445 + - 3913198156 + - 2930068975 + - 80325891 + - 2869536578 + - 1982645928 + - 739739032 + - 266440734 + - 280567271 + - 141295447 + - 2854113790 + - 154069874 + - 241982493 + - 98336120 + - 110435588 + - 2405621183 + - 2777840995 + - 3663717884 + - 3048495520 + - 1321320575 - 1598662966 - - 778122825 - - 812846727 - - 2872422326 + - 967064327 + - 3730808838 + - 3127079988 + - 2453679101 - 3436461193