diff --git a/Client/Assets/Resource.meta b/Client/Assets/Resources.meta similarity index 100% rename from Client/Assets/Resource.meta rename to Client/Assets/Resources.meta diff --git a/Client/Assets/Resource/Image.meta b/Client/Assets/Resources/Image.meta similarity index 100% rename from Client/Assets/Resource/Image.meta rename to Client/Assets/Resources/Image.meta diff --git a/Client/Assets/Resource/Image/TileMap.meta b/Client/Assets/Resources/Image/TileMap.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap.meta rename to Client/Assets/Resources/Image/TileMap.meta diff --git a/Client/Assets/Resource/Image/TileMap/GrassDirtDirtWater.png b/Client/Assets/Resources/Image/TileMap/GrassDirtDirtWater.png similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassDirtDirtWater.png rename to Client/Assets/Resources/Image/TileMap/GrassDirtDirtWater.png diff --git a/Client/Assets/Resource/Image/TileMap/GrassDirtDirtWater.png.meta b/Client/Assets/Resources/Image/TileMap/GrassDirtDirtWater.png.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassDirtDirtWater.png.meta rename to Client/Assets/Resources/Image/TileMap/GrassDirtDirtWater.png.meta diff --git a/Client/Assets/Resource/Image/TileMap/GrassDirtWaterWater.png b/Client/Assets/Resources/Image/TileMap/GrassDirtWaterWater.png similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassDirtWaterWater.png rename to Client/Assets/Resources/Image/TileMap/GrassDirtWaterWater.png diff --git a/Client/Assets/Resource/Image/TileMap/GrassDirtWaterWater.png.meta b/Client/Assets/Resources/Image/TileMap/GrassDirtWaterWater.png.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassDirtWaterWater.png.meta rename to Client/Assets/Resources/Image/TileMap/GrassDirtWaterWater.png.meta diff --git a/Client/Assets/Resource/Image/TileMap/GrassGrassDirtWater.png b/Client/Assets/Resources/Image/TileMap/GrassGrassDirtWater.png similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassGrassDirtWater.png rename to Client/Assets/Resources/Image/TileMap/GrassGrassDirtWater.png diff --git a/Client/Assets/Resource/Image/TileMap/GrassGrassDirtWater.png.meta b/Client/Assets/Resources/Image/TileMap/GrassGrassDirtWater.png.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassGrassDirtWater.png.meta rename to Client/Assets/Resources/Image/TileMap/GrassGrassDirtWater.png.meta diff --git a/Client/Assets/Resource/Image/TileMap/GrassSoild.png b/Client/Assets/Resources/Image/TileMap/GrassSoild.png similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassSoild.png rename to Client/Assets/Resources/Image/TileMap/GrassSoild.png diff --git a/Client/Assets/Resource/Image/TileMap/GrassSoild.png.meta b/Client/Assets/Resources/Image/TileMap/GrassSoild.png.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassSoild.png.meta rename to Client/Assets/Resources/Image/TileMap/GrassSoild.png.meta diff --git a/Client/Assets/Resource/Image/TileMap/GrassWater.png b/Client/Assets/Resources/Image/TileMap/GrassWater.png similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassWater.png rename to Client/Assets/Resources/Image/TileMap/GrassWater.png diff --git a/Client/Assets/Resource/Image/TileMap/GrassWater.png.meta b/Client/Assets/Resources/Image/TileMap/GrassWater.png.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap/GrassWater.png.meta rename to Client/Assets/Resources/Image/TileMap/GrassWater.png.meta diff --git a/Client/Assets/Resource/Image/TileMap/SoildWater.png b/Client/Assets/Resources/Image/TileMap/SoildWater.png similarity index 100% rename from Client/Assets/Resource/Image/TileMap/SoildWater.png rename to Client/Assets/Resources/Image/TileMap/SoildWater.png diff --git a/Client/Assets/Resource/Image/TileMap/SoildWater.png.meta b/Client/Assets/Resources/Image/TileMap/SoildWater.png.meta similarity index 100% rename from Client/Assets/Resource/Image/TileMap/SoildWater.png.meta rename to Client/Assets/Resources/Image/TileMap/SoildWater.png.meta diff --git a/Client/Assets/Resource/TileMap.meta b/Client/Assets/Resources/TileMap.meta similarity index 100% rename from Client/Assets/Resource/TileMap.meta rename to Client/Assets/Resources/TileMap.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_0.asset b/Client/Assets/Resources/TileMap/GrassSoild_0.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_0.asset rename to Client/Assets/Resources/TileMap/GrassSoild_0.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_0.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_0.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_0.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_0.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_1.asset b/Client/Assets/Resources/TileMap/GrassSoild_1.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_1.asset rename to Client/Assets/Resources/TileMap/GrassSoild_1.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_1.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_1.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_1.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_1.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_10.asset b/Client/Assets/Resources/TileMap/GrassSoild_10.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_10.asset rename to Client/Assets/Resources/TileMap/GrassSoild_10.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_10.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_10.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_10.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_10.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_11.asset b/Client/Assets/Resources/TileMap/GrassSoild_11.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_11.asset rename to Client/Assets/Resources/TileMap/GrassSoild_11.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_11.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_11.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_11.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_11.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_12.asset b/Client/Assets/Resources/TileMap/GrassSoild_12.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_12.asset rename to Client/Assets/Resources/TileMap/GrassSoild_12.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_12.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_12.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_12.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_12.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_13.asset b/Client/Assets/Resources/TileMap/GrassSoild_13.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_13.asset rename to Client/Assets/Resources/TileMap/GrassSoild_13.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_13.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_13.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_13.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_13.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_14.asset b/Client/Assets/Resources/TileMap/GrassSoild_14.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_14.asset rename to Client/Assets/Resources/TileMap/GrassSoild_14.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_14.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_14.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_14.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_14.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_15.asset b/Client/Assets/Resources/TileMap/GrassSoild_15.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_15.asset rename to Client/Assets/Resources/TileMap/GrassSoild_15.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_15.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_15.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_15.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_15.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_2.asset b/Client/Assets/Resources/TileMap/GrassSoild_2.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_2.asset rename to Client/Assets/Resources/TileMap/GrassSoild_2.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_2.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_2.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_2.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_2.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_3.asset b/Client/Assets/Resources/TileMap/GrassSoild_3.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_3.asset rename to Client/Assets/Resources/TileMap/GrassSoild_3.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_3.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_3.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_3.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_3.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_4.asset b/Client/Assets/Resources/TileMap/GrassSoild_4.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_4.asset rename to Client/Assets/Resources/TileMap/GrassSoild_4.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_4.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_4.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_4.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_4.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_5.asset b/Client/Assets/Resources/TileMap/GrassSoild_5.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_5.asset rename to Client/Assets/Resources/TileMap/GrassSoild_5.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_5.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_5.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_5.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_5.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_6.asset b/Client/Assets/Resources/TileMap/GrassSoild_6.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_6.asset rename to Client/Assets/Resources/TileMap/GrassSoild_6.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_6.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_6.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_6.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_6.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_7.asset b/Client/Assets/Resources/TileMap/GrassSoild_7.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_7.asset rename to Client/Assets/Resources/TileMap/GrassSoild_7.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_7.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_7.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_7.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_7.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_8.asset b/Client/Assets/Resources/TileMap/GrassSoild_8.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_8.asset rename to Client/Assets/Resources/TileMap/GrassSoild_8.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_8.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_8.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_8.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_8.asset.meta diff --git a/Client/Assets/Resource/TileMap/GrassSoild_9.asset b/Client/Assets/Resources/TileMap/GrassSoild_9.asset similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_9.asset rename to Client/Assets/Resources/TileMap/GrassSoild_9.asset diff --git a/Client/Assets/Resource/TileMap/GrassSoild_9.asset.meta b/Client/Assets/Resources/TileMap/GrassSoild_9.asset.meta similarity index 100% rename from Client/Assets/Resource/TileMap/GrassSoild_9.asset.meta rename to Client/Assets/Resources/TileMap/GrassSoild_9.asset.meta diff --git a/Client/Assets/Resource/TileMap/New Tile Palette.prefab b/Client/Assets/Resources/TileMap/New Tile Palette.prefab similarity index 100% rename from Client/Assets/Resource/TileMap/New Tile Palette.prefab rename to Client/Assets/Resources/TileMap/New Tile Palette.prefab diff --git a/Client/Assets/Resource/TileMap/New Tile Palette.prefab.meta b/Client/Assets/Resources/TileMap/New Tile Palette.prefab.meta similarity index 100% rename from Client/Assets/Resource/TileMap/New Tile Palette.prefab.meta rename to Client/Assets/Resources/TileMap/New Tile Palette.prefab.meta diff --git a/Client/Assets/Scripts/Configs/ConfigProcessor.cs b/Client/Assets/Scripts/Configs/ConfigProcessor.cs index 6df16ac..3cafbd3 100644 --- a/Client/Assets/Scripts/Configs/ConfigProcessor.cs +++ b/Client/Assets/Scripts/Configs/ConfigProcessor.cs @@ -271,7 +271,7 @@ namespace Configs // 加载指定路径下的所有资源 T[] resources = Resources.LoadAll(path); - + foreach (T resource in resources) { if (resource != null) diff --git a/Client/Assets/Scripts/Map/DoubleMap.cs b/Client/Assets/Scripts/Map/DoubleMap.cs index 9669b07..654ea9b 100644 --- a/Client/Assets/Scripts/Map/DoubleMap.cs +++ b/Client/Assets/Scripts/Map/DoubleMap.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using UnityEngine; using UnityEngine.Tilemaps; @@ -7,9 +8,12 @@ namespace Map { public Tilemap dataLevel; public Tilemap textureLevel; + + public Dictionary tileDict = new(); void Start() { - + tileDict = Configs.ConfigProcessor.LoadResources("TileMap"); + Debug.Log(tileDict.Count); } // Update is called once per frame