diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 4b0dbaa..eead31e 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -468,7 +468,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 83, y: -85.300095} + m_AnchoredPosition: {x: -36, y: -17.800217} m_SizeDelta: {x: 100, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &16179819 @@ -540,7 +540,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6637771, b: 0.39215687, a: 1} + m_Color: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1330,7 +1330,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -151, y: 30.700104} + m_AnchoredPosition: {x: -673, y: -26.800049} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &75572017 @@ -2709,7 +2709,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.2, y: -75} + m_AnchoredPosition: {x: 1.199997, y: -75} m_SizeDelta: {x: 350, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &141538170 @@ -5199,7 +5199,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 284887504} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5207,7 +5207,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 62.1, y: 94} + m_AnchoredPosition: {x: -451, y: 35.19995} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &284887506 @@ -7350,7 +7350,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 66.5, y: 62.800125} + m_AnchoredPosition: {x: -473, y: 4.0000763} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &400502306 @@ -8541,7 +8541,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.6, y: -75} + m_AnchoredPosition: {x: -0.6000061, y: -75} m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &444900472 @@ -8682,7 +8682,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50, y: -25} + m_AnchoredPosition: {x: -806, y: -25} m_SizeDelta: {x: 90, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &454030828 @@ -9150,7 +9150,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 44.7, y: 30.700104} + m_AnchoredPosition: {x: -442, y: -28.800049} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &493765333 @@ -9213,7 +9213,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &496305461 RectTransform: m_ObjectHideFlags: 0 @@ -9237,8 +9237,8 @@ RectTransform: 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: 116} - m_SizeDelta: {x: 0, y: -883.5} + m_AnchoredPosition: {x: 0, y: 134.52496} + m_SizeDelta: {x: 0, y: -846.44995} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &496305462 MonoBehaviour: @@ -10224,7 +10224,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.8, y: -75} + m_AnchoredPosition: {x: 1.800003, y: -75} m_SizeDelta: {x: 380, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &529363129 @@ -10540,7 +10540,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 102, y: -42.5998} + m_AnchoredPosition: {x: 406.80005, y: 24.80011} m_SizeDelta: {x: 150, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &547735948 @@ -11189,7 +11189,6 @@ GameObject: m_Component: - component: {fileID: 586896005} - component: {fileID: 586896007} - - component: {fileID: 586896006} - component: {fileID: 586896008} m_Layer: 5 m_Name: CellInfoPanel @@ -11206,7 +11205,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 586896004} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -11232,41 +11231,11 @@ RectTransform: - {fileID: 16179818} m_Father: {fileID: 1863547971} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 328} - m_SizeDelta: {x: 0, y: -855} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &586896006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 586896004} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.749677, g: 1, b: 0.2783019, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_AnchoredPosition: {x: 235, y: 0} + m_SizeDelta: {x: -470, y: 116} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &586896007 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12537,8 +12506,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: 147.5, y: -2.4999237} - m_SizeDelta: {x: 60, y: 30} + m_AnchoredPosition: {x: 71.7766, y: 30.564949} + m_SizeDelta: {x: 66.9532, y: 39.271} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &676414813 MonoBehaviour: @@ -13807,7 +13776,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.8, y: -75} + m_AnchoredPosition: {x: 1.800003, y: -75} m_SizeDelta: {x: 380, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &754701588 @@ -14220,7 +14189,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -147, y: -25} + m_AnchoredPosition: {x: -903, y: -25} m_SizeDelta: {x: 90, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &779816122 @@ -14898,7 +14867,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.2, y: -75} + m_AnchoredPosition: {x: 1.199997, y: -75} m_SizeDelta: {x: 380, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &799717143 @@ -14950,14 +14919,14 @@ RectTransform: - {fileID: 1898069112} - {fileID: 779816121} - {fileID: 454030827} - - {fileID: 1557474188} + - {fileID: 992754507} m_Father: {fileID: 1863547971} 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, y: -50} - m_SizeDelta: {x: 400, y: 95} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 105} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &801927798 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14971,7 +14940,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9433962, g: 0.734247, b: 0.734247, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -15354,8 +15323,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: -146, y: 21} - m_SizeDelta: {x: 90, y: 30} + m_AnchoredPosition: {x: -896, y: 20} + m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &819298049 MonoBehaviour: @@ -16092,6 +16061,13 @@ MonoBehaviour: mapHeight: 0 _curOpenMapId: 0 mapRegion: {fileID: 782149589} + _curMapRegions: + regionRowNum: 0 + regionColNum: 0 + regionWidth: 0 + regionHeight: 0 + cellWidthPixel: 0 + cellHeightPixel: 0 gridMat: {fileID: 2100000, guid: 1138da36018c22649b6f1e5a2876f070, type: 2} line: {fileID: 3667588176236566912, guid: cb340bd401e27654591787feda406a29, type: 3} cellType: 1 @@ -16645,7 +16621,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -86.8, y: -43.199924} + m_AnchoredPosition: {x: 218, y: 24.199951} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &901478401 @@ -16859,7 +16835,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.2, y: -75} + m_AnchoredPosition: {x: 1.199997, y: -75} m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &906896166 @@ -18215,7 +18191,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.2, y: -75} + m_AnchoredPosition: {x: 1.199997, y: -75} m_SizeDelta: {x: 350, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &961377802 @@ -19027,16 +19003,16 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992754506} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000028100333} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 809609761} - m_Father: {fileID: 1325607736} + m_Father: {fileID: 801927797} 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: 79.8, y: -198.3} + m_AnchoredPosition: {x: -554, y: -19} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &992754508 @@ -19167,7 +19143,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -135.8, y: -2.4999237} + m_AnchoredPosition: {x: -215, y: 35.19995} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &995221088 @@ -21417,7 +21393,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.2, y: -75} + m_AnchoredPosition: {x: 1.199997, y: -75} m_SizeDelta: {x: 250, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1109599117 @@ -24043,7 +24019,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 136, y: 31.000076} + m_AnchoredPosition: {x: -344, y: -28.800049} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1291799214 @@ -25016,14 +24992,13 @@ RectTransform: - {fileID: 94875565} - {fileID: 263692382} - {fileID: 229065466} - - {fileID: 992754507} m_Father: {fileID: 1863547971} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 327} - m_SizeDelta: {x: 0, y: 430} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 215.36} + m_SizeDelta: {x: 400, y: 430} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1325607737 MonoBehaviour: m_ObjectHideFlags: 0 @@ -26353,7 +26328,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1406982595 MonoBehaviour: @@ -28190,7 +28165,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 67.4, y: -2.4999237} + m_AnchoredPosition: {x: -11.79995, y: 35.19995} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1509529897 @@ -28429,7 +28404,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -86, y: -86.29993} + m_AnchoredPosition: {x: -205, y: -18.800049} m_SizeDelta: {x: 100, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1528671582 @@ -28501,7 +28476,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.6637771, b: 0.39215687, a: 1} + m_Color: {r: 0.29176116, g: 1, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -28716,139 +28691,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &1557474187 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1557474188} - - component: {fileID: 1557474191} - - component: {fileID: 1557474190} - - component: {fileID: 1557474189} - m_Layer: 5 - m_Name: btnGiveup - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1557474188 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1557474187} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1906007346} - m_Father: {fileID: 801927797} - 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: 49, y: -25} - m_SizeDelta: {x: 90, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1557474189 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1557474187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1557474190} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 801927800} - m_TargetAssemblyTypeName: UIMapPanel, Assembly-CSharp - m_MethodName: ResetMap - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1557474190 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1557474187} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1557474191 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1557474187} - m_CullTransparentMesh: 1 --- !u!1 &1558735727 GameObject: m_ObjectHideFlags: 0 @@ -29878,7 +29720,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 143.4, y: 62.800125} + m_AnchoredPosition: {x: -387, y: 4.0000763} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1595503985 @@ -30268,7 +30110,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 149.8, y: 93.80002} + m_AnchoredPosition: {x: -345, y: 34.99997} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1615225088 @@ -30640,7 +30482,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -48.7, y: 94.10002} + m_AnchoredPosition: {x: -565, y: 35.299973} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1636137588 @@ -31473,7 +31315,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -57.2, y: 62.80008} + m_AnchoredPosition: {x: -585, y: 4.0000305} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1663129100 @@ -33720,7 +33562,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -136.6, y: 63.100082} + m_AnchoredPosition: {x: -672, y: 4.3000336} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1766076125 @@ -34995,7 +34837,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.6, y: -75} + m_AnchoredPosition: {x: -0.6000061, y: -75} m_SizeDelta: {x: 350, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1826197404 @@ -35463,7 +35305,6 @@ GameObject: m_Component: - component: {fileID: 1863547971} - component: {fileID: 1863547973} - - component: {fileID: 1863547972} - component: {fileID: 1863547974} - component: {fileID: 1863547975} - component: {fileID: 1863547976} @@ -35493,41 +35334,11 @@ RectTransform: - {fileID: 213849565} m_Father: {fileID: 838871187} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 1080} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1863547972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1863547970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1863547973 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36678,7 +36489,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -136.2, y: 93.80002} + m_AnchoredPosition: {x: -664, y: 35} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1896052476 @@ -36761,7 +36572,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 49, y: 20} + m_AnchoredPosition: {x: -707, y: 20} m_SizeDelta: {x: 280, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1898069113 @@ -36934,85 +36745,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901756425} m_CullTransparentMesh: 1 ---- !u!1 &1906007345 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1906007346} - - component: {fileID: 1906007348} - - component: {fileID: 1906007347} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1906007346 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906007345} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1557474188} - 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!114 &1906007347 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906007345} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u653E\u5F03\u8BBE\u7F6E" ---- !u!222 &1906007348 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906007345} - m_CullTransparentMesh: 1 --- !u!1 &1907248857 GameObject: m_ObjectHideFlags: 0 @@ -38078,7 +37810,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -53.1, y: 31.000076} + m_AnchoredPosition: {x: -563, y: -27.800049} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1961181750 @@ -38936,7 +38668,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.8, y: -75} + m_AnchoredPosition: {x: 1.800003, y: -75} m_SizeDelta: {x: 380, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1996955546 @@ -40317,8 +40049,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: -54.8, y: -2.4999084} - m_SizeDelta: {x: 60, y: 30} + m_AnchoredPosition: {x: -124.999954, y: 30.564484} + m_SizeDelta: {x: 78, y: 39.271} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2065719431 MonoBehaviour: diff --git a/Assets/Scripts/UI/UIMapPanel.cs b/Assets/Scripts/UI/UIMapPanel.cs index 55162ac..b3c8c6a 100644 --- a/Assets/Scripts/UI/UIMapPanel.cs +++ b/Assets/Scripts/UI/UIMapPanel.cs @@ -136,28 +136,6 @@ public class UIMapPanel : MonoBehaviour return MapManager.Instance.allMaps.ContainsKey(mapId); } - public void ResetMap() - { - if (dropMap.options.Count == 0) - { - UIWindow.Instance.ShowMessage("请先扫描地图"); - return; - } - - if (_curOpenMapId < 0) - { - UIWindow.Instance.ShowMessage("没有地图"); - return; - } - - //先关闭地图 - CloseMap(); - UIWindow.Instance.uiEditMapConfig.Cleanup(); - - //再打开地图 - OpenMap(); - } - private void Update() { if (Input.GetKey(KeyCode.LeftControl) && Input.GetKey(KeyCode.S))