From 60fe96260667f630e3ad7eb2edd8f0f530f46c0b Mon Sep 17 00:00:00 2001 From: tangbin <11111111> Date: Mon, 16 Jun 2025 21:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Maps/1/Texture/xinshoucun02_01.jpg.meta | 22 +- Assets/Scenes/SampleScene.unity | 465 +----------------- Assets/Scripts/Map/MapManager.Load.cs | 44 ++ Assets/Scripts/UI/UICellEditor.cs | 2 - Assets/Scripts/UI/UIMapPanel.cs | 13 +- Assets/Scripts/UI/UIWindow.cs | 12 - 6 files changed, 75 insertions(+), 483 deletions(-) diff --git a/Assets/GameAssets/Maps/1/Texture/xinshoucun02_01.jpg.meta b/Assets/GameAssets/Maps/1/Texture/xinshoucun02_01.jpg.meta index 031ccb4..e4d4ef2 100644 --- a/Assets/GameAssets/Maps/1/Texture/xinshoucun02_01.jpg.meta +++ b/Assets/GameAssets/Maps/1/Texture/xinshoucun02_01.jpg.meta @@ -3,10 +3,10 @@ guid: 45e8592846880044883143a576e27c7a TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,10 +40,10 @@ TextureImporter: wrapU: 1 wrapV: 1 wrapW: 1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -62,6 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -73,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -85,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -97,6 +103,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -109,6 +116,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -117,16 +125,16 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: {} + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 45e9375..4b0dbaa 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -10182,157 +10182,6 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 0 ---- !u!1 &528691190 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 528691191} - - component: {fileID: 528691193} - - component: {fileID: 528691192} - - component: {fileID: 528691194} - - component: {fileID: 528691195} - - component: {fileID: 528691196} - m_Layer: 5 - m_Name: BG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &528691191 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528691190} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 863070731} - - {fileID: 1607154591} - m_Father: {fileID: 1617507956} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 760, y: 540} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &528691192 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528691190} - 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.4537647, g: 0.9339623, b: 0.5590271, a: 0.2784314} - 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: 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 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &528691193 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528691190} - m_CullTransparentMesh: 1 ---- !u!225 &528691194 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528691190} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &528691195 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528691190} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd5845003f63cbd4db0eb1b6d59c51bc, type: 3} - m_Name: - m_EditorClassIdentifier: - worldWidth: 0 - worldHeight: 0 ---- !u!61 &528691196 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528691190} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 --- !u!1 &529363126 GameObject: m_ObjectHideFlags: 0 @@ -15102,7 +14951,6 @@ RectTransform: - {fileID: 779816121} - {fileID: 454030827} - {fileID: 1557474188} - - {fileID: 1271475992} m_Father: {fileID: 1863547971} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -16242,6 +16090,7 @@ MonoBehaviour: m_EditorClassIdentifier: mapWidth: 0 mapHeight: 0 + _curOpenMapId: 0 mapRegion: {fileID: 782149589} gridMat: {fileID: 2100000, guid: 1138da36018c22649b6f1e5a2876f070, type: 2} line: {fileID: 3667588176236566912, guid: cb340bd401e27654591787feda406a29, type: 3} @@ -16448,50 +16297,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846255299} m_CullTransparentMesh: 1 ---- !u!1 &863070730 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 863070731} - - component: {fileID: 863070732} - m_Layer: 5 - m_Name: Regions - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &863070731 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863070730} - 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: 528691191} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 0, y: 0} ---- !u!222 &863070732 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863070730} - m_CullTransparentMesh: 1 --- !u!1 &866787715 GameObject: m_ObjectHideFlags: 0 @@ -23699,127 +23504,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1267180744} m_CullTransparentMesh: 1 ---- !u!1 &1271475991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1271475992} - - component: {fileID: 1271475995} - - component: {fileID: 1271475994} - - component: {fileID: 1271475993} - m_Layer: 5 - m_Name: btnCreateMap - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1271475992 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271475991} - 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: 1566357796} - 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: 148, y: -25} - m_SizeDelta: {x: 90, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1271475993 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271475991} - 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: 1271475994} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1271475994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271475991} - 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 &1271475995 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271475991} - m_CullTransparentMesh: 1 --- !u!1 &1277509611 GameObject: m_ObjectHideFlags: 0 @@ -29615,85 +29299,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1564456686} m_CullTransparentMesh: 1 ---- !u!1 &1566357795 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1566357796} - - component: {fileID: 1566357798} - - component: {fileID: 1566357797} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1566357796 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1566357795} - 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: 1271475992} - 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 &1566357797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1566357795} - 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: "\u521B\u5EFA\u5730\u56FE" ---- !u!222 &1566357798 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1566357795} - m_CullTransparentMesh: 1 --- !u!1 &1572786550 GameObject: m_ObjectHideFlags: 0 @@ -30393,50 +29998,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1598616170} m_CullTransparentMesh: 1 ---- !u!1 &1607154590 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1607154591} - - component: {fileID: 1607154592} - m_Layer: 5 - m_Name: CellsNode - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1607154591 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607154590} - 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: 528691191} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1607154592 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607154590} - m_CullTransparentMesh: 1 --- !u!1 &1608300713 GameObject: m_ObjectHideFlags: 0 @@ -30778,7 +30339,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 528691191} - {fileID: 419543685} m_Father: {fileID: 838871187} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -35933,11 +35493,11 @@ RectTransform: - {fileID: 213849565} m_Father: {fileID: 838871187} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -200, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &1863547972 MonoBehaviour: m_ObjectHideFlags: 0 @@ -35991,7 +35551,6 @@ MonoBehaviour: uiMapPanel: {fileID: 801927800} uiCellInfo: {fileID: 586896008} uiCellEditor: {fileID: 496305464} - uiCreateMap: {fileID: 0} uiEditMapConfig: {fileID: 1325607739} uiTeleportPanel: {fileID: 444900472} uiRelivesPanel: {fileID: 961377802} @@ -36004,7 +35563,7 @@ MonoBehaviour: uiFuBensPanel: {fileID: 529363129} uiJuBaosPanel: {fileID: 754701588} uiMessageBox: {fileID: 1608300717} - newMapTrans: {fileID: 528691191} + newMapTrans: {fileID: 0} bOvering: 0 --- !u!223 &1863547975 Canvas: @@ -39874,7 +39433,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: -7.1, y: 175.7} + m_AnchoredPosition: {x: -7.0999756, y: 175.7} m_SizeDelta: {x: 60, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2033516820 @@ -40341,7 +39900,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2054237627 RectTransform: m_ObjectHideFlags: 0 @@ -40365,11 +39924,11 @@ RectTransform: - {fileID: 129122987} 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_AnchoredPosition: {x: 200, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!223 &2054237628 Canvas: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Map/MapManager.Load.cs b/Assets/Scripts/Map/MapManager.Load.cs index 37d35a1..7da6c7b 100644 --- a/Assets/Scripts/Map/MapManager.Load.cs +++ b/Assets/Scripts/Map/MapManager.Load.cs @@ -1,5 +1,6 @@ using Cysharp.Threading.Tasks; using HxGame; +using HxGame.Data; using System; using System.Collections; using System.Collections.Generic; @@ -89,6 +90,49 @@ public partial class MapManager : MonoBehaviour } return true; } + public void LoadRegionXML(int mapId) + { + Transform regionsTrans = UIWindow.Instance.mapTrans.Find("Regions"); + if (regionsTrans == null) + { + UIWindow.Instance.ShowMessage("没有找到Regions节点"); + return; + } + + MapRegions mapRegions = new MapRegions(); + mapRegions.mapWidth = Convert.ToInt32(txtMapWidth.text); + mapRegions.mapHeight = Convert.ToInt32(txtMapHeight.text); + mapRegions.regionWidth = Convert.ToInt32(txtRegionWidth.text); + mapRegions.regionHeight = Convert.ToInt32(txtRegionHeight.text); + + int row = mapRegions.mapWidth / MapManager.CELLSCALE / mapRegions.regionWidth; + int col = mapRegions.mapHeight / MapManager.CELLSCALE / mapRegions.regionHeight; + + Transform trans = null; + mapRegions.regions = new Region[row, col]; + for (int i = 0; i < row; i++) + { + for (int j = 0; j < col; j++) + { + mapRegions.regions[i, j] = new Region(); + mapRegions.regions[i, j].indexX = i; + mapRegions.regions[i, j].indexY = j; + + string regionName = $"{i}_{j}"; + trans = regionsTrans.Find(regionName); + if (trans == null) + { + UIWindow.Instance.ShowMessage($"没有找到region节点 name={regionName}"); + return; + } + + //mapRegions.regions[i, j].regionName = trans.GetComponent().sprite.name; + mapRegions.regions[i, j].regionName = trans.GetComponent().texture.name; + } + } + + mapRegions.SaveXML(mapId); + } public void LoadMapRegions(int mapId) { diff --git a/Assets/Scripts/UI/UICellEditor.cs b/Assets/Scripts/UI/UICellEditor.cs index 77f3d9b..19f913f 100644 --- a/Assets/Scripts/UI/UICellEditor.cs +++ b/Assets/Scripts/UI/UICellEditor.cs @@ -46,7 +46,6 @@ public class UICellEditor : MonoBehaviour layerPanel.SetActive(false); AddInputNameClickEvent(txtStartPos); AddInputNameClickEvent(txtEndPos); - UIWindow.Instance.HideMouseOver(); } private void AddInputNameClickEvent(InputField input) //可以在Awake中调用 @@ -210,7 +209,6 @@ public class UICellEditor : MonoBehaviour public void OnShowEffectsToggleChange() { MapManager.Instance.HideCells(); - UIWindow.Instance.ShowMouseOver(); } public void SetBrush() diff --git a/Assets/Scripts/UI/UIMapPanel.cs b/Assets/Scripts/UI/UIMapPanel.cs index d48bb5e..6a8307c 100644 --- a/Assets/Scripts/UI/UIMapPanel.cs +++ b/Assets/Scripts/UI/UIMapPanel.cs @@ -112,12 +112,10 @@ public class UIMapPanel : MonoBehaviour UIWindow.Instance.ShowMessage("请先关闭已有地图"); return; } - - int mapId = 0; - - mapId = Convert.ToInt32(dropMap.options[dropMap.value].text); - //UIWindow.Instance.uiCreateMap.LoadMapRegions(mapId); - //UIWindow.Instance.uiCellInfo.LoadCells(); + int mapId = Convert.ToInt32(dropMap.options[dropMap.value].text); + _curOpenMapId = mapId; + MapManager.Instance.LoadMapRegions(_curOpenMapId); + UIWindow.Instance.uiCellInfo.LoadCells(); //UIWindow.Instance.uiCellInfo.ShowCells(); //UIWindow.Instance.uiEditMapConfig.LoadMapConfig(mapId); //UIWindow.Instance.uiMonstersPanel.LoadMonsterConfig(mapId); @@ -126,15 +124,12 @@ public class UIMapPanel : MonoBehaviour //UIWindow.Instance.uiFuBensPanel.LoadFuBenConfig(mapId); //UIWindow.Instance.uiJuBaosPanel.LoadJuBaoConfig(mapId); - _curOpenMapId = mapId; - MapManager.Instance.LoadMapRegions(_curOpenMapId); } public void CloseMap() { MapManager.Instance.CloseMap(); _curOpenMapId = -1; - UIWindow.Instance.HideMouseOver(); } public bool HasMap(string mapId) diff --git a/Assets/Scripts/UI/UIWindow.cs b/Assets/Scripts/UI/UIWindow.cs index 7d801bb..1d38dc5 100644 --- a/Assets/Scripts/UI/UIWindow.cs +++ b/Assets/Scripts/UI/UIWindow.cs @@ -69,18 +69,6 @@ public class UIWindow : MonoBehaviour uiMessageBox.gameObject.SetActive(true); } - public void ShowMouseOver() - { - newMapTrans.GetComponent().enabled = true; - bOvering = true; - } - - public void HideMouseOver() - { - newMapTrans.GetComponent().enabled = false; - bOvering = false; - } - void Update() { if (mapTrans == null)