diff --git a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab index 8feee8a68f..ad68aa17e7 100644 --- a/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab +++ b/Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab @@ -4718,80 +4718,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &21653544405932016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4735445548485736621} - - component: {fileID: 7924073229174121159} - - component: {fileID: 3721485334006677240} - m_Layer: 0 - m_Name: gap - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4735445548485736621 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 21653544405932016} - 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: 9211702803995542886} - 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: 59.44, y: -0.2} - m_SizeDelta: {x: 3.47, y: 26.65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7924073229174121159 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 21653544405932016} - m_CullTransparentMesh: 0 ---- !u!114 &3721485334006677240 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 21653544405932016} - 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: d5ad0ae51623aa34e9776b74b933314f, 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 &29242666286010783 GameObject: m_ObjectHideFlags: 0 @@ -19209,6 +19135,85 @@ RectTransform: m_AnchoredPosition: {x: 96.6, y: 168.4} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1217251524387533806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1117909453575152904} + - component: {fileID: 3128805303209545176} + - component: {fileID: 1070990917816616422} + m_Layer: 0 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1117909453575152904 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217251524387533806} + 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: 9211702803995542886} + 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: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3128805303209545176 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217251524387533806} + m_CullTransparentMesh: 0 +--- !u!114 &1070990917816616422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1217251524387533806} + 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: 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4F11\u7720\u4E2D" --- !u!1 &1280090969264805897 GameObject: m_ObjectHideFlags: 0 @@ -38651,80 +38656,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &2698342133487505828 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 354934467606848631} - - component: {fileID: 4180799201023261549} - - component: {fileID: 1544042486198999219} - m_Layer: 0 - m_Name: gap (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &354934467606848631 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2698342133487505828} - 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: 9211702803995542886} - 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: -57.6, y: -0.19983244} - m_SizeDelta: {x: 3.47, y: 26.65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4180799201023261549 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2698342133487505828} - m_CullTransparentMesh: 0 ---- !u!114 &1544042486198999219 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2698342133487505828} - 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: d5ad0ae51623aa34e9776b74b933314f, 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 &2790261080264162895 GameObject: m_ObjectHideFlags: 0 @@ -62463,80 +62394,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &3839852833347783258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8270806674133246578} - - component: {fileID: 268420601804009258} - - component: {fileID: 3463575325663581418} - m_Layer: 0 - m_Name: gap (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8270806674133246578 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3839852833347783258} - 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: 9211702803995542886} - 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: -18.4, y: -0.19983244} - m_SizeDelta: {x: 3.47, y: 26.65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &268420601804009258 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3839852833347783258} - m_CullTransparentMesh: 0 ---- !u!114 &3463575325663581418 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3839852833347783258} - 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: d5ad0ae51623aa34e9776b74b933314f, 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 &3862580283545253296 GameObject: m_ObjectHideFlags: 0 @@ -81336,80 +81193,6 @@ Transform: m_Father: {fileID: 7336250749874875678} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4550115354327041163 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6552475919043407751} - - component: {fileID: 6078783368330029528} - - component: {fileID: 7314203242258219064} - m_Layer: 0 - m_Name: hpRed - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6552475919043407751 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4550115354327041163} - 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: 9211702803995542886} - 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: -78.19, y: -0.48004} - m_SizeDelta: {x: 39.98, y: 18.13} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6078783368330029528 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4550115354327041163} - m_CullTransparentMesh: 0 ---- !u!114 &7314203242258219064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4550115354327041163} - 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: 8535f438fe5e4a9499c9c6e7d8534b67, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &4810681059330249303 GameObject: m_ObjectHideFlags: 0 @@ -91152,7 +90935,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6037003966826909070 RectTransform: m_ObjectHideFlags: 0 @@ -125030,12 +124813,7 @@ RectTransform: m_Children: - {fileID: 2662475946003623012} - {fileID: 6037003966826909070} - - {fileID: 6552475919043407751} - - {fileID: 4735445548485736621} - - {fileID: 8576226710025649191} - - {fileID: 8270806674133246578} - - {fileID: 354934467606848631} - - {fileID: 3161791870447984699} + - {fileID: 1117909453575152904} m_Father: {fileID: 39877747597438363} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -129642,154 +129420,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &8638777532699109095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3161791870447984699} - - component: {fileID: 2637467897918120382} - - component: {fileID: 7290447253381775168} - m_Layer: 0 - m_Name: light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3161791870447984699 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8638777532699109095} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.090377, y: 1.090377, z: 1.090377} - m_Children: [] - m_Father: {fileID: 9211702803995542886} - 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: 96, y: 0.6} - m_SizeDelta: {x: 46, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2637467897918120382 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8638777532699109095} - m_CullTransparentMesh: 0 ---- !u!114 &7290447253381775168 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8638777532699109095} - 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: 494fab97aac2e764ba7f6f568e43f871, 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 &8708393955844257519 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8576226710025649191} - - component: {fileID: 3407872111842745513} - - component: {fileID: 1912411136162595385} - m_Layer: 0 - m_Name: gap (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8576226710025649191 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8708393955844257519} - 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: 9211702803995542886} - 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: 20.8, y: -0.19983286} - m_SizeDelta: {x: 3.47, y: 26.65} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3407872111842745513 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8708393955844257519} - m_CullTransparentMesh: 0 ---- !u!114 &1912411136162595385 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8708393955844257519} - 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: d5ad0ae51623aa34e9776b74b933314f, 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 &8731609849687984975 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua index 7d426b73c5..e2ae71b337 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreMainPanel.lua @@ -40,11 +40,12 @@ function ExploreMainPanel:BindEvent() UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.ExploreMapTip,ExploreManager.GetExploreMapTipData(self.mapId)) end) Util.AddClick(self.jinruBtn,function() - if LengthOfTable(self.data[self.mapId].formations) > 0 then - UIManager.OpenPanel(UIName.ExplorePanel,ExploreManager.ExploreMapData[self.mapId]) - else - - end + -- if LengthOfTable(self.data[self.mapId].formations) > 0 then + -- UIManager.OpenPanel(UIName.ExplorePanel,ExploreManager.ExploreMapData[self.mapId]) + -- else + -- PopupTipPanel.ShowTip("目标区域无探索队伍,无法进入!") + -- end + UIManager.OpenPanel(UIName.ExplorePanel,ExploreManager.ExploreMapData[self.mapId]) end) Util.AddClick(self.tansuoBtn,function() --选择队伍弹窗 diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua index 2750a586bd..d8c83ac45a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua @@ -225,6 +225,10 @@ function this.GetFormationDataByMapId(mapId) return datas end +function this.GetHpById(id) + return this.FormationData[id].hp +end + --红点检测 function this.CheckRedPoint() for k,v in pairs(this.FormationData) do diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua index 1f0601cd8e..796af7202f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExplorePanel.lua @@ -5,56 +5,56 @@ local this = ExplorePanel local fightMap = require("Modules/Fight/View/ExploreMapView") --初始化组件(用于子类重写) function ExplorePanel:InitComponent() - self.spLoader = SpriteLoader.New() - self.upView = SubUIManager.Open(SubUIConfig.UpView,self.gameObject.transform) - self.backBtn = Util.GetGameObject(self.gameObject, "btns/backBtn") - self.lookReward = Util.GetGameObject(self.gameObject, "btns/lookReward") + this.spLoader = SpriteLoader.New() + this.upView = SubUIManager.Open(SubUIConfig.UpView,this.gameObject.transform) + this.backBtn = Util.GetGameObject(this.gameObject, "btns/backBtn") + this.lookReward = Util.GetGameObject(this.gameObject, "btns/lookReward") - --fightMap:InitComponent(self.gameObject, this) + fightMap:InitComponent(this.gameObject, this) end --绑定事件(用于子类重写 function ExplorePanel:BindEvent() - Util.AddClick(self.backBtn,function() - self:ClosePanel() + Util.AddClick(this.backBtn,function() + this:ClosePanel() end) - Util.AddClick(self.lookReward,function() - UIManager.OpenPanel(UIName.ExploreRewardPopup,self.mapData.mapId) + Util.AddClick(this.lookReward,function() + UIManager.OpenPanel(UIName.ExploreRewardPopup,this.mapData.mapId) end) end --添加事件监听(用于子类重 function ExplorePanel:AddListener() - --fightMap:AddListener() + fightMap:AddListener() end --移除事件监听(用于子类重写) function ExplorePanel:RemoveListener() - --fightMap:RemoveListener() + fightMap:RemoveListener() end --界面打开时调用(用于子类重写) function ExplorePanel:OnOpen(data) - self.mapData = data + this.mapData = data end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ExplorePanel:OnShow() - --fightMap:Init() + fightMap:Init() end --界面关闭时调用(用于子类重写) function ExplorePanel:OnClose() - --fightMap:OnClose() + fightMap:OnClose() end function ExplorePanel:OnSortingOrderChange() - --fightMap:OnSortingOrderChange(self.sortingOrder) + fightMap:OnSortingOrderChange(this.sortingOrder) end --界面销毁时调用(用于子类重写) function ExplorePanel:OnDestroy() - SubUIManager.Close(self.upView) - self.upView = nil - self.spLoader:Destroy() + SubUIManager.Close(this.upView) + this.upView = nil + this.spLoader:Destroy() end return ExplorePanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua index 3848953a89..cd6f4d67a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua @@ -98,8 +98,8 @@ function this:Init() this:LoadMapData() -- 加载一个小人 local tempconfig = ConfigManager.GetConfigData(ConfigName.ChallengeMapConfig,m_curMapId) - NetManager.ExplorerMapPlayerInfoRequest(this.mapData.mapId,function(msg) - local NPCList = ExploreManager.InitMapUserInfosData(msg,this.mapData.mapId) + NetManager.ExplorerMapPlayerInfoRequest(m_parent.mapData.mapId,function(msg) + local NPCList = ExploreManager.InitMapUserInfosData(msg,m_parent.mapData.mapId) local area = monsterArea[m_curMapId] local suv = startUV[m_curMapId] for k,v in pairs(NPCList) do @@ -108,27 +108,19 @@ function this:Init() local index3 = math.random(1,2) local index4 = math.random(area.y_pos.min,area.y_pos.max) this.playerViews[v.formationId] = SubUIManager.Open(SubUIConfig.SingleExplorePlayerView,this.mapRoot.transform,this) - this.playerViews[v.formationId]:SetData((index3 == 1 and index1 or index2),index4,false,v) - if v.formationId > 3000 then - this.playerViews + + if v.formationId > 3100 then + if not this.playerViews[0] then + this.playerViews[v.formationId]:SetData((index3 == 1 and index1 or index2),index4,true,v) + this.playerViews[0] = this.playerViews[v.formationId] + else + this.playerViews[v.formationId]:SetData((index3 == 1 and index1 or index2),index4,false,v) + end + else + this.playerViews[v.formationId]:SetData((index3 == 1 and index1 or index2),index4,false,v) end end end) - - if not this.playerViews[0] then - --Log(m_curMapId) - if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.guajigongneng) then - iconNum = 20 - local randomNum = 8--math.random(2,3) - - end) - else - iconNum = 4 - end - this.playerViews[0] = SubUIManager.Open(SubUIConfig.SingleExplorePlayerView,this.mapRoot.transform,this) - this.playerViews[0]:SetData(startUV[m_curMapId].u,startUV[m_curMapId].v,true) - end - -- 设置相机初始化位置 local v4 = this.playerViews[0].transform.localPosition v4.z = -50 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua index 95504c6079..e2a6f26350 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua @@ -142,7 +142,6 @@ function this:Refresh(_data,_item) end else _item.exploring.gameObject:SetActive(true) - end Util.AddOnceClick(_item.exploring,function() NetManager.ExplorerMapRewardRequest(0,_data.formationId,function(drop) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua index b83d06fd97..ab3788815d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua @@ -89,6 +89,7 @@ end --界面打开时调用(用于子类重写) function this:OnShow(_parent,...) this.icon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(Explore[1].Cost[1])) + --队伍 for i = 1,math.max(#this.itemList,#this.data) do if not this.data[i] then if this.itemList[i] then @@ -131,7 +132,7 @@ function this:OnShow(_parent,...) this:Refresh(this.data[i],this.itemList[i],i) end end - + --地图下拉框 for k,v in pairs(this.mapTipPreList) do v.go.gameObject:SetActive(false) end @@ -151,6 +152,7 @@ function this:OnShow(_parent,...) this.SetMapName() end) end + --时间下拉框 for i = 1,math.max(#this.mapTimeTipPreList,#this.timeList) do if not this.timeList[i] then this.mapTimeTipPreList[i].go.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index cc52d596ba..6d660761de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -427,27 +427,7 @@ function RewardItemSingleShowPopup:OnShow() isShow = false end elseif JumpConfig[jumpDataList[i]].Type == JumpType.recharge then - local actConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"PageType",JumpType.recharge,"Sort",JumpConfig[jumpDataList[i]].Skipfactor[1]) - local list = OperatingManager.GetGiftGoodsInfoList(actConfig.ShopData[1][2]) - local goodIdList = {} - for i = 1,#list do - local rechargeConfig = RechargeCommodityConfig[list[i].goodsId] - if rechargeConfig.Limit == 0 or rechargeConfig.Limit - list[i].buyTimes > 0 then - if rechargeConfig.ShowType == actConfig.ShopData[1][3] then - for j = 1,#rechargeConfig.RewardShow do - if rechargeConfig.RewardShow[j][1] == heroConfig.Id or rechargeConfig.RewardShow[j][1] == heroConfig.PiecesId then - table.insert(goodIdList,rechargeConfig.Id) - break - end - end - end - end - end - if #goodIdList < 1 then - isShow = false - else - isShow = true - end + isShow = true end if isShow then local tempView = SubUIManager.Open(SubUIConfig.JumpViewNew, this.equipProGrid.transform, jumpDataList[i],heroConfig,self) diff --git a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua index 2a59e3800a..4ec9b4cd80 100644 --- a/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua @@ -74,10 +74,13 @@ function SingleExplorePlayerView:InitComponent() self.buffDefend = Util.GetGameObject(self.buffEffectRoot, "r_MapEffect_NewEvent_012") self.buffEffectRoot:SetActive(false) + self.blood = Util.GetGameObject(self.ui,"blood") + self.bloodSlider = Util.GetGameObject(self.blood,"hpYellow"):GetComponent("Image") + self.tip = Util.GetGameObject(self.blood,"tip") -- 隐藏一堆东西 Util.GetGameObject(self.ui,"arrow"):SetActive(false) Util.GetGameObject(self.ui,"pos"):SetActive(false) - Util.GetGameObject(self.ui,"blood"):SetActive(false) + self.blood:SetActive(false) Util.GetGameObject(self.ui,"optionCancelBtn"):SetActive(false) Util.GetGameObject(self.ui,"roleOption"):SetActive(false) @@ -138,12 +141,13 @@ function SingleExplorePlayerView:OnOpen(parent) end function SingleExplorePlayerView:SetData(u,v,isSelf,data) + self.data = data self.isclose = false self._PlayTimeStamp = 0 if isSelf then self.ui:GetComponent("Canvas").worldCamera = TileMapView.GetCamera() end - self.isSelf = isSelf + self.isSelf = isSelf or data.formationId > 3100 local v3 = TileMapView.GetLiveTilePos(u, v) self.gameObject.transform.localPosition = Vector3(v3.x, v3.y, v3.z - 10) @@ -167,6 +171,16 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data) self.PracticeIcon:SetActive(true) PracticeManager.SetPracticeIcon(self.PracticeIcon,PracticeManager.PracticeLevel) end + self.blood:SetActive(true) + local hp = ExploreManager.GetHpById(data.formationId) + if hp <= 0 then + self.tip.gameObject:SetActive(true) + self.bloodSlider.gameObject:SetActive(false) + else + self.bloodSlider.fillAmount = hp/FormationManager.GetFormationPower(data.formationId) + self.bloodSlider.gameObject:SetActive(true) + self.tip.gameObject:SetActive(false) + end else npc = data.sex == ROLE_SEX.BOY and npc1 or npc2 scale = data.sex == ROLE_SEX.BOY and 1 or 0.5 @@ -191,6 +205,7 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data) self.PracticeIcon:SetActive(true) PracticeManager.SetPracticeIcon(self.PracticeIcon,data.practiceLevel) end + self.blood:SetActive(false) end self.playerLiveView:OnOpen(GetPlayerRoleSingleConFig().Scale2) self.playerLiveView:OnSortingOrderChange(sortingorder) @@ -214,6 +229,21 @@ function SingleExplorePlayerView:SetData(u,v,isSelf,data) PlayUIAnim(self.gameObject) end +function SingleExplorePlayerView:RefreshHp() + if self.isSelf then + self.blood:SetActive(true) + local hp = ExploreManager.GetHpById(self.data.formationId) + if hp <= 0 then + self.tip.gameObject:SetActive(true) + self.bloodSlider.gameObject:SetActive(false) + else + self.bloodSlider.fillAmount = hp/FormationManager.GetFormationPower(self.data.formationId) + self.bloodSlider.gameObject:SetActive(true) + self.tip.gameObject:SetActive(false) + end + end +end + function SingleExplorePlayerView:SetWalkDir(dir) if self.playerLiveView then self.playerLiveView:SetWalkDir(dir)