(client) feat:彻底完成瓦片地图模块化加载和索引

2025-07-17 16:02:38 +08:00
parent a4a0f11344
commit e6f9339be2
4 changed files with 90 additions and 141 deletions
--- a/Client/Assets/Scenes/Test.unity
+++ b/Client/Assets/Scenes/Test.unity
@ -272,7 +272,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5e7ec2149bca47f42965dd01c01116cd, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  dataLevel: {fileID: 1236360967}
  textureLevel: {fileID: 9462741}
 --- !u!156049354 &613797069
 Grid:
@ -299,7 +298,6 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 1236360969}
  - {fileID: 9462743}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -440,129 +438,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1236360966
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1236360969}
-  - component: {fileID: 1236360967}
-  - component: {fileID: 1236360968}
-  m_Layer: 0
-  m_Name: groundDataLevel
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1839735485 &1236360967
-Tilemap:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1236360966}
-  m_Enabled: 1
-  m_Tiles: {}
-  m_AnimatedTiles: {}
-  m_TileAssetArray: []
-  m_TileSpriteArray: []
-  m_TileMatrixArray: []
-  m_TileColorArray: []
-  m_TileObjectToInstantiateArray: []
-  m_AnimationFrameRate: 1
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Origin: {x: 0, y: 0, z: 0}
-  m_Size: {x: 0, y: 0, z: 1}
-  m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
-  m_TileOrientation: 0
-  m_TileOrientationMatrix:
-    e00: 1
-    e01: 0
-    e02: 0
-    e03: 0
-    e10: 0
-    e11: 1
-    e12: 0
-    e13: 0
-    e20: 0
-    e21: 0
-    e22: 1
-    e23: 0
-    e30: 0
-    e31: 0
-    e32: 0
-    e33: 1
--- !u!483693784 &1236360968
-TilemapRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1236360966}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_ChunkSize: {x: 32, y: 32, z: 32}
-  m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
-  m_MaxChunkCount: 16
-  m_MaxFrameAge: 16
-  m_SortOrder: 0
-  m_Mode: 0
-  m_DetectChunkCullingBounds: 0
-  m_MaskInteraction: 0
--- !u!4 &1236360969
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1236360966}
-  serializedVersion: 2
-  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: 613797070}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1371068281
 GameObject:
  m_ObjectHideFlags: 0
--- a/Client/Assets/Scripts/Managers/PackagesImageManager.cs
+++ b/Client/Assets/Scripts/Managers/PackagesImageManager.cs
@ -31,9 +31,8 @@ namespace Managers

        void SplitTextureIntoSprites(string name, Texture2D texture, int rows, int cols, int pixelsPerUnit)
        {
-            if (texture == null || rows <= 0 || cols <= 0)
+            if (texture == null || rows <= 1 || cols <= 1)
            {
-                Debug.LogError("Invalid parameters for splitting texture.");
                return;
            }

@ -61,7 +60,7 @@ namespace Managers
                    // 创建Sprite
                    var sprite = Sprite.Create(texture, (Rect)spriteRect, new Vector2(0.5f, 0.5f), pixelsPerUnit);

-                    var index = row * cols + col;
+                    var index = (rows-row-1) * cols + col;
                    sprites[name + $"_{index}"] = sprite;
                }
            }
--- a/Client/Assets/Scripts/Map/DoubleMap.cs
+++ b/Client/Assets/Scripts/Map/DoubleMap.cs
@ -16,27 +16,98 @@ namespace Map
        void Start()
        {
            TileManager.Instance.Init();
+            var mapSize = 100;
+            float noiseScale = 0.1f;
+            
+            for (int x = 0; x < mapSize; x++)
+            {
+                List<int> col = new();
+                for (int y = 0; y < mapSize; y++)
+                {
+                    // 计算柏林噪声值
+                    float noiseValue = Mathf.PerlinNoise(x * noiseScale, y * noiseScale);
+                    if (noiseValue < 0.5f) // 小于 0.5 表示 Dirt
+                    {
+                        col.Add(TileManager.Instance.tileID.GetValueOrDefault("Dirt"));
+                    }
+                    else // 大于等于 0.5 表示 Grass
+                    {
+                        col.Add(TileManager.Instance.tileID.GetValueOrDefault("Grass"));
+                    }
+
+                }
+                mapData.Add(col);
+                UpdateTexture();
+            }
+
+            for (int x = 0; x < 16; x++)
+            {
+                textureLevel.SetTile(new(x,-1),TileManager.Instance.tileBaseMapping.GetValueOrDefault($"GrassDirt_{x}"));
+            }
        }

        public void UpdateTexture()
        {
-            
+            for (int i = 0; i < mapData.Count; i++)
+            {
+                for (int j = 0; j < mapData[i].Count; j++)
+                {
+                    UpdateTexture(i, j);
+                }
+            }
+        }
+
+        public int GetTile(int x, int y)
+        {
+            if (x < 0 || x >= mapData.Count)
+            {
+                return 0;
+            }
+
+            var col = mapData[x];
+            if (y < 0 || y >= mapData.Count)
+            {
+                return 0;
+            }
+
+            return col[y];
        }

        public void SetTile(int x, int y, string tileName)
        {
-
+            SetTile(x,y,TileManager.Instance.tileID.GetValueOrDefault(tileName));
        }

        public void SetTile(int x, int y, int id)
        {
-            
+            mapData[x][y] = id;
+            UpdateTexture(x, y);
+            UpdateTexture(x, y-1);
+            UpdateTexture(x-1, y);
+            UpdateTexture(x-1, y-1);
+        }
+        /// <summary>
+        /// 更新对应坐标的贴图
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public void UpdateTexture(int x, int y)
+        {
+            var lt = GetTile(x, y + 1);
+            var rt = GetTile(x + 1, y + 1);
+            var lb = GetTile(x, y);
+            var rb = GetTile(x + 1, y);
+            if (TileManager.Instance.tileToTileBaseMapping.ContainsKey((lt, rt, lb, rb)))
+            {
+                textureLevel.SetTile(new(x,y),TileManager.Instance.tileToTileBaseMapping[(lt, rt, lb, rb)]);
+            }
        }
-        
    }

    public class TileManager:Utils.Singleton<TileManager>
    {
+        public Dictionary<string,TileBase> tileBaseMapping = new();
        public Dictionary<(int, int, int, int), TileBase> tileToTileBaseMapping = new();
        public Dictionary<string, int> tileID = new();
        public void Init()
@ -46,7 +117,7 @@ namespace Map
            Managers.PackagesImageManager.Instance.Init();
            var imagePack = Managers.PackagesImageManager.Instance;
            var tileType = Managers.DefineManager.Instance.QueryDefinesByType<TileDef>();
-            for (var i = 1; i < tileType.Length; i++)
+            for (var i = 0; i < tileType.Length; i++)
            {
                tileID.Add(tileType[i].name, i);
            }
@ -57,7 +128,7 @@ namespace Map
                foreach (var keyVal in mappingTableDef.tileDict)
                {
                    var key = keyVal.Key;
-                    var val=keyVal.Value;
+                    var val = keyVal.Value;
                    var parts = key.Split('_');
                    if (parts.Length != 4)
                    {
@ -67,14 +138,15 @@ namespace Map
                    }

                    if (!(tileID.TryGetValue(parts[0], out var k1) &&
-                        tileID.TryGetValue(parts[1], out var k2) &&
-                        tileID.TryGetValue(parts[2], out var k3) &&
-                        tileID.TryGetValue(parts[3], out var k4)))
+                          tileID.TryGetValue(parts[1], out var k2) &&
+                          tileID.TryGetValue(parts[2], out var k3) &&
+                          tileID.TryGetValue(parts[3], out var k4)))
                    {
                        var packName = Managers.DefineManager.Instance.GetDefinePackageName(mappingTableDef);
                        Debug.LogError($"来自{packName}定义的TileMappingTableDef键值{key}中存在未定义的瓦片名称");
                        continue;
                    }
+
                    var sprite = imagePack.GetSprite(val);
                    if (sprite == null)
                    {
@ -82,14 +154,17 @@ namespace Map
                        Debug.LogError($"来自{packName}定义的TileMappingTableDef键值{val}中存在未定义的图片名称");
                        continue;
                    }
+
                    if (tileToTileBaseMapping.ContainsKey((k1, k2, k3, k4)))
                    {
                        var packName = Managers.DefineManager.Instance.GetDefinePackageName(mappingTableDef);
                        Debug.LogWarning($"来自{packName}定义的TileMappingTableDef键值{(k1, k2, k3, k4)}存在重复索引，将忽略重复项");
                        continue;
                    }
+
                    var tile = LoadTile(sprite);
-                    tileToTileBaseMapping.Add((k1, k2, k3, k4), tile);
+                    tileToTileBaseMapping[(k1, k2, k3, k4)] = tile;
+                    tileBaseMapping[val] = tile;
                }
            }
        }
--- a/Client/Data/Core/Define/Map/Map.xml
+++ b/Client/Data/Core/Define/Map/Map.xml
@ -28,17 +28,17 @@
        <!-- 0 + (2 * 4) = 8 -->
        <Grass_Dirt_Dirt_Dirt value="GrassDirt_15"/>
        <!-- 3 + (3 * 4) = 15 -->
-        <Dirt_Grass_Dirt_Grass value="GrassDirt_4"/>
+        <Dirt_Grass_Dirt_Grass value="GrassDirt_1"/>
        <!-- 1 + (0 * 4) = 1 -->
        <Grass_Dirt_Grass_Dirt value="GrassDirt_11"/>
        <!-- 3 + (2 * 4) = 11 -->
-        <Dirt_Dirt_Grass_Grass value="GrassDirt_12"/>
+        <Dirt_Dirt_Grass_Grass value="GrassDirt_3"/>
        <!-- 3 + (0 * 4) = 3 -->
        <Grass_Grass_Dirt_Dirt value="GrassDirt_9"/>
        <!-- 1 + (2 * 4) = 9 -->
        <Dirt_Grass_Grass_Grass value="GrassDirt_5"/>
        <!-- 1 + (1 * 4) = 5 -->
-        <Grass_Dirt_Grass_Grass value="GrassDirt_8"/>
+        <Grass_Dirt_Grass_Grass value="GrassDirt_2"/>
        <!-- 2 + (0 * 4) = 2 -->
        <Grass_Grass_Dirt_Grass value="GrassDirt_10"/>
        <!-- 2 + (2 * 4) = 10 -->