AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-07 16:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改luban模板配置，支持异步加载配置实例

Browse Source 
修改luban模板配置，支持异步加载配置实例
This commit is contained in:
ALEXTANG
2023-08-15 12:07:21 +08:00
parent 5239b89326
commit aa0d40c758
8 changed files with 132 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/GameScripts/HotFix/GameLogic/GameApp.cs
View File

@@ -35,7 +35,7 @@ public partial class GameApp:Singleton<GameApp>
/// </summary>
private void StartGameLogic()
{
}
/// <summary>

1
Assets/GameScripts/HotFix/GameLogic/GameApp_RegisterSystem.cs
View File

@@ -38,6 +38,7 @@ public partial class GameApp
//带生命周期的单例系统。
AddLogicSys(BehaviourSingleSystem.Instance);
AddLogicSys(DataCenterSys.Instance);
AddLogicSys(ConfigSystem.Instance);
GMBehaviourSystem.Instance.Active();
}

106
Assets/GameScripts/HotFix/GameProto/ConfigLoader.cs
View File

@@ -1,8 +1,11 @@
using System.Collections.Generic;
using System.Threading;
using Bright.Serialization;
using System.IO;
using System.Threading.Tasks;
using Cysharp.Threading.Tasks;
using GameBase;
using GameConfig;
using SimpleJSON;
using TEngine;
using UnityEngine;
/// <summary>
@@ -20,57 +23,84 @@ public class ConfigLoader:Singleton<ConfigLoader>
{
if (!_init)
{
_init = true;
Load();
Log.Error("Config not loaded. You need Take LoadAsync at first.");
}
return _tables;
}
}
private readonly Dictionary<string, TextAsset> _configs = new Dictionary<string, TextAsset>();
/// <summary>
/// 加载配置
/// 异步加载配置。
/// </summary>
public void Load()
public async Task LoadAsync()
{
var tablesCtor = typeof(Tables).GetConstructors()[0];
var loaderReturnType = tablesCtor.GetParameters()[0].ParameterType.GetGenericArguments()[1];
System.Delegate loader = loaderReturnType == typeof(ByteBuf)
? new System.Func<string, ByteBuf>(LoadByteBuf)
: (System.Delegate)new System.Func<string, JSONNode>(LoadJson);
_tables = (Tables)tablesCtor.Invoke(new object[] { loader });
_tables = new Tables();
await _tables.LoadAsync(LoadByteBufAsync);
_init = true;
}
/// <summary>
/// 加载Json配置。
/// </summary>
/// <param name="file">FileName</param>
/// <returns>JSONNode</returns>
private JSONNode LoadJson(string file)
{
#if UNITY_EDITOR
var ret = File.ReadAllText($"{Application.dataPath}/../GenerateDatas/json/{file}.json", System.Text.Encoding.UTF8);
#else
var textAssets = GameModule.Resource.LoadAsset<TextAsset>(file);
var ret = textAssets.text;
#endif
return JSON.Parse(ret);
}
/// <summary>
/// 加载二进制配置。
/// 异步加载二进制配置。
/// </summary>
/// <param name="file">FileName</param>
/// <returns>ByteBuf</returns>
private ByteBuf LoadByteBuf(string file)
private async Task<ByteBuf> LoadByteBufAsync(string file)
{
byte[] ret = null;
#if UNITY_EDITOR
ret = File.ReadAllBytes($"{Application.dataPath}/../GenerateDatas/bytes/{file}.bytes");
#else
var textAssets = GameModule.Resource.LoadAsset<TextAsset>(file);
ret = textAssets.bytes;
#if false
GameTickWatcher gameTickWatcher = new GameTickWatcher();
#endif
byte[] ret;
var location = file;
if (_configs.TryGetValue(location, out var config))
{
ret = config.bytes;
}
else
{
var textAssets = await GameModule.Resource.LoadAssetAsync<TextAsset>(location,CancellationToken.None);
ret = textAssets.bytes;
RegisterTextAssets(file, textAssets);
}
#if false
Log.Warning($"LoadByteBuf {file} used time {gameTickWatcher.ElapseTime()}");
#endif
return new ByteBuf(ret);
}
/// <summary>
/// 注册配置资源。
/// </summary>
/// <param name="key">资源Key。</param>
/// <param name="value">资源实例。</param>
/// <returns>注册成功。</returns>
private bool RegisterTextAssets(string key, TextAsset value)
{
if (string.IsNullOrEmpty(key))
{
return false;
}
if (value == null)
{
return false;
}
_configs[key] = value;
return true;
}
}
public class ConfigSystem : BaseLogicSys<ConfigSystem>
{
public override bool OnInit()
{
InitConfig().Forget();
return base.OnInit();
}
private async UniTaskVoid InitConfig()
{
await ConfigLoader.Instance.LoadAsync();
}
}

32
Assets/GameScripts/HotFix/GameProto/GameConfig/Tables.cs
View File

@@ -6,36 +6,37 @@
// </auto-generated>
//------------------------------------------------------------------------------
using Bright.Serialization;
using System.Threading.Tasks;
namespace GameConfig
{
public partial class Tables
{
public item.TbItem TbItem {get; }
public Battle.TbSkill TbSkill {get; }
public Battle.TbBuff TbBuff {get; }
public Battle.TbBuffAttr TbBuffAttr {get; }
public sealed class Tables
{
public item.TbItem TbItem {get; private set; }
public Battle.TbSkill TbSkill {get; private set; }
public Battle.TbBuff TbBuff {get; private set; }
public Battle.TbBuffAttr TbBuffAttr {get; private set; }
public Tables(System.Func<string, ByteBuf> loader)
public Tables() { }
public async Task LoadAsync(System.Func<string, Task<ByteBuf>> loader)
{
var tables = new System.Collections.Generic.Dictionary<string, object>();
TbItem = new item.TbItem(loader("item_tbitem"));
TbItem = new item.TbItem(await loader("item_tbitem"));
tables.Add("item.TbItem", TbItem);
TbSkill = new Battle.TbSkill(loader("battle_tbskill"));
TbSkill = new Battle.TbSkill(await loader("battle_tbskill"));
tables.Add("Battle.TbSkill", TbSkill);
TbBuff = new Battle.TbBuff(loader("battle_tbbuff"));
TbBuff = new Battle.TbBuff(await loader("battle_tbbuff"));
tables.Add("Battle.TbBuff", TbBuff);
TbBuffAttr = new Battle.TbBuffAttr(loader("battle_tbbuffattr"));
TbBuffAttr = new Battle.TbBuffAttr(await loader("battle_tbbuffattr"));
tables.Add("Battle.TbBuffAttr", TbBuffAttr);
PostInit();
TbItem.Resolve(tables);
TbSkill.Resolve(tables);
TbBuff.Resolve(tables);
TbBuffAttr.Resolve(tables);
PostResolve();
}
public void TranslateText(System.Func<string, string, string> translator)
@@ -45,9 +46,6 @@ public partial class Tables
TbBuff.TranslateText(translator);
TbBuffAttr.TranslateText(translator);
}
partial void PostInit();
partial void PostResolve();
}
}