(client) feat:添加角色定义,为匿名定义建立索引,修复一些数据定义中的错误 (#39)

Co-authored-by: zzdxxz <2079238449@qq.com>
Co-committed-by: zzdxxz <2079238449@qq.com>
This commit is contained in:
2025-07-19 19:03:53 +08:00
committed by TheRedApricot
parent 44cfb55985
commit 389376ec47
43 changed files with 3081 additions and 607 deletions

View File

@ -16,27 +16,93 @@ namespace Map
void Start()
{
TileManager.Instance.Init();
var mapSize = 10;
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();
}
}
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 +112,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 +123,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 +133,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 +149,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;
}
}
}