Update SingletonSystem.cs

调整编辑器模式下模块销毁顺序，解决编辑器退出运行后资源管理器销毁了还被调用问题

Books/2-框架概览.md

@@ -1,16 +1,16 @@
 # TEngine
 
 ## TEngine-Runtime
-### AOT内核基于Gameframework,最简化以及商业化适配。
+### AOT内核基于Gameframework,优化、最简化以及商业化适配。
 ![image](src/2-1.png)
 
 ## AOT游戏框架模块基类。
-#### 框架思路为面向接口编程，如Resource资源模块，开发白皮书为先定义IResourceManager的接口规范，然后编写ResourceManager继承框架具体实现(GameFrameworkModule)以及实现接口。最后实现调用层GameFrameworkModuleBase，调用层可以拓展编辑器供开发者自定义模块参数。
+#### 框架思路为面向接口编程，如Resource资源模块，开发白皮书为先定义IResourceManager的接口规范，然后编写ResourceManager继承框架具体实现(ModuleImp)以及实现接口。最后实现调用层Module，调用层可以拓展编辑器供开发者自定义模块参数。
 ``` csharp
 /// <summary>
-/// 游戏框架模块抽象类。GameFrameworkModule为具体框架模块实现。
+/// 游戏框架模块抽象类。ModuleImp为具体框架模块实现。
 /// </summary>
-internal abstract class GameFrameworkModule
+internal abstract class ModuleImp
 {
     /// <summary>
     /// 获取游戏框架模块优先级。
@@ -34,16 +34,16 @@ internal abstract class GameFrameworkModule
 //=====================================================================//
 
 /// <summary>
-/// 游戏框架模块抽象类。GameFrameworkModuleBase 为Mono调用层。
+/// 游戏框架模块抽象类。Module 为Mono调用层。
 /// </summary>
-public abstract class GameFrameworkModuleBase : MonoBehaviour
+public abstract class Module : MonoBehaviour
 {
     /// <summary>
     /// 游戏框架模块初始化。
     /// </summary>
     protected virtual void Awake()
     {
-        GameEntry.RegisterModule(this);
+        ModuleSystem.RegisterModule(this);
     }
 }
 ```

Books/3-6-配置表模块.md

@@ -1,11 +1,19 @@
-# 3-6.配置表模块 - ConfigLoader
+# 3-6.配置表模块 - ConfigSystem
 接入最佳游戏配置解决方案 - <a href="https://github.com/focus-creative-games/luban"><strong>Luban</strong></a>
 
 <a href="https://luban.doc.code-philosophy.com/#/manual/traits"><strong>Luban文档 </strong></a>
 
-### 在TEngine中Luban工具集位于以下目录
+### 在TEngine中Luban配置表目录位于以下目录
 ![image](src/3-6-1.png)
 
+### 安装luban配置表
+1.在TEngine根目录同级克隆下最新的luban-next仓库。
+![image](src/3-6-2.png)
+2.Tools目录执行build-luban完成
+![image](src/3-6-3.png)
+
+3.转表则去luban配置目录执行对应bat
+
 TEngine内置默认使用懒加载配置，也支持基于UniTask的异步加载，同步加载，包括服务器的Task异步加载，使用对应转表的bat即可。
 
 ### 介绍

Books/99-各平台运行RunAble.md

@@ -13,4 +13,11 @@
 ![image](src/Android-RunSuccessed.png)
 
 ### IOS真机运行
-![image](src/Iphone-RunSuccessed.png)
+![image](src/Iphone-RunSuccessed.png)
+
+### 索尼 PS5 真机运行
+
+![image](src/Console%20Viewer.png)
+
+
+![image](src/Console%20Output.png)

Books/Donate.md

@@ -0,0 +1,16 @@
+## <strong>Buy me a coffee.
+
+您的赞助会让我们做得更快更好，如果觉得TEngine对您有帮助，不妨赞助我买杯咖啡吧~
+
+
+<p align="center">
+
+<img src="src/Donate-微信.jpg" alt="logo" width="384" height="562">
+
+</p>
+
+<p align="center">
+
+<img src="src/Donate-支付宝.jpg" alt="logo" width="384" height="562">
+
+</p>

BuildCLI/build_android.bat

@@ -0,0 +1,9 @@
+cd /d %~dp0
+
+call path_define.bat
+
+%UNITYEDITOR_PATH%/Unity.exe %WORKSPACE% -logFile %BUILD_LOGFILE% -executeMethod TEngine.ReleaseTools.AutomationBuildAndroid -quit -batchmode -CustomArgs:Language=en_US; %WORKSPACE%
+
+@REM for /f "delims=[" %%i in (%BUILD_LOGFILE%) do echo %%i
+
+pause

BuildCLI/path_define.bat

@@ -0,0 +1,6 @@
+cd /d %~dp0
+
+set WORKSPACE=G:/github/TEngine/UnityProject
+set UNITYEDITOR_PATH=G:/UnityEditor/2021.3.20f1c1/Editor
+set BUILD_DLL_LOGFILE=./build_dll.log
+set BUILD_LOGFILE=./build.log

Configs/CustomTemplate/CustomTemplate_Client_LazyLoad/ConfigSystem.cs

@@ -1,61 +0,0 @@
-using Bright.Serialization;
-using GameBase;
-using GameConfig;
-using TEngine;
-using UnityEngine;
-
-/// <summary>
-/// 配置加载器。
-/// </summary>
-public class ConfigSystem : Singleton<ConfigSystem>
-{
-    private bool _init = false;
-
-    private Tables _tables;
-
-    public Tables Tables
-    {
-        get
-        {
-            if (!_init)
-            {
-                Load();
-            }
-
-            return _tables;
-        }
-    }
-
-    /// <summary>
-    /// 加载配置。
-    /// </summary>
-    public void Load()
-    {
-        _tables = new Tables(LoadIdxByteBuf, LoadByteBuf);
-        _init = true;
-    }
-
-    /// <summary>
-    /// 加载二进制配置。
-    /// </summary>
-    /// <param name="file">FileName</param>
-    /// <returns>ByteBuf</returns>
-    private ByteBuf LoadByteBuf(string file)
-    {
-        var textAssets = GameModule.Resource.LoadAsset<TextAsset>(file);
-        byte[] ret = textAssets.bytes;
-        return new ByteBuf(ret);
-    }
-
-    /// <summary>
-    /// 加载懒加载Index。
-    /// </summary>
-    /// <param name="file"></param>
-    /// <returns></returns>
-    private ByteBuf LoadIdxByteBuf(string file)
-    {
-        var textAssets = GameModule.Resource.LoadAsset<TextAsset>($"Idx_{file}");
-        byte[] ret = textAssets.bytes;
-        return new ByteBuf(ret);
-    }
-}

Configs/CustomTemplate/CustomTemplate_Client_LazyLoad/config/cs_bin/_.tpl

@@ -1,87 +0,0 @@
-using Bright.Serialization;
-using System.Collections.Generic;
-{{
-    name = x.name
-    parent_def_type = x.parent_def_type
-    export_fields = x.export_fields
-    hierarchy_export_fields = x.hierarchy_export_fields
-}}
-
-
-namespace {{x.namespace_with_top_module}}
-{
-
-{{~if x.comment != '' ~}}
-/// <summary>
-/// {{x.escape_comment}}
-/// </summary>
-{{~end~}}
-public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Config.BeanBase {{end}}
-{
-    public {{name}}(ByteBuf _buf) {{if parent_def_type}} : base(_buf) {{end}}
-    {
-        {{~ for field in export_fields ~}}
-        {{cs_deserialize '_buf' field.convention_name field.ctype}}
-        {{~if field.index_field~}}
-        foreach(var _v in {{field.convention_name}})
-        { 
-            {{field.convention_name}}_Index.Add(_v.{{field.index_field.convention_name}}, _v);
-        }
-        {{~end~}}
-        {{~end~}}
-        PostInit();
-    }
-
-    public static {{name}} Deserialize{{name}}(ByteBuf _buf)
-    {
-    {{~if x.is_abstract_type~}}
-        switch (_buf.ReadInt())
-        {
-        {{~for child in x.hierarchy_not_abstract_children~}}
-            case {{child.full_name}}.__ID__: return new {{child.full_name}}(_buf);
-        {{~end~}}
-            default: throw new SerializationException();
-        }
-    {{~else~}}
-        return new {{x.full_name}}(_buf);
-    {{~end~}}
-    }
-
-    {{~ for field in export_fields ~}}
-{{~if field.comment != '' ~}}
-    /// <summary>
-    /// {{field.escape_comment}}
-    /// </summary>
-{{~end~}}
-    public {{cs_define_type field.ctype}} {{field.convention_name}} { get; private set; }
-    {{~if field.index_field~}} 
-    public readonly Dictionary<{{cs_define_type field.index_field.ctype}}, {{cs_define_type field.ctype.element_type}}> {{field.convention_name}}_Index = new Dictionary<{{cs_define_type field.index_field.ctype}}, {{cs_define_type field.ctype.element_type}}>();
-    {{~end~}}
-    {{~if field.gen_ref~}}
-    public {{field.cs_ref_validator_define}}
-    {{~end~}}
-    {{~if (gen_datetime_mills field.ctype) ~}}
-    public long {{field.convention_name}}_Millis => {{field.convention_name}} * 1000L;
-    {{~end~}}
-    {{~if field.gen_text_key~}}
-    public {{cs_define_text_key_field field}} { get; }
-    {{~end~}}
-    {{~end~}}
-
-{{~if !x.is_abstract_type~}}
-    public const int __ID__ = {{x.id}};
-    public override int GetTypeId() => __ID__;
-{{~end~}}
-    public override string ToString()
-    {
-        return "{{full_name}}{ "
-    {{~for field in hierarchy_export_fields ~}}
-        + "{{field.convention_name}}:" + {{cs_to_string field.convention_name field.ctype}} + ","
-    {{~end~}}
-        + "}";
-    }
-    
-    partial void PostInit();
-}
-
-}

Configs/CustomTemplate/CustomTemplate_Client_LazyLoad/config/cs_bin/table.tpl

@@ -1,413 +0,0 @@
-using Bright.Serialization;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace {{x.namespace_with_top_module}}
-{
-   {{ 
-        name = x.name
-        key_type = x.key_ttype
-        key_type1 =  x.key_ttype1
-        key_type2 =  x.key_ttype2
-        value_type =  x.value_ttype
-    }}
-{{~if x.comment != '' ~}}
-/// <summary>
-/// {{x.escape_comment}}
-/// </summary>
-{{~end~}}
-    public partial class {{name}}
-    {
-        public static {{name}} Instance { get; private set; }
-        {{~if x.is_map_table ~}}
-        private bool _readAll = false;
-        private Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}> _dataMap;
-        private List<{{cs_define_type value_type}}> _dataList;
-        public Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}> DataMap
-        {
-            get
-            {
-                if(!_readAll)
-                {
-                    ReadAll();
-                    _readAll = true;
-                }
-                return _dataMap;
-            }
-        }
-        public List<{{cs_define_type value_type}}> DataList
-        {
-            get
-            {
-                if(!_readAll)
-                {
-                    ReadAll();
-                    _readAll = true;
-                }
-                return _dataList;
-            }
-        }
-        private Dictionary<{{cs_define_type key_type}},int> _indexMap;
-        public List<{{cs_define_type key_type}}> Indexes;
-        private System.Func<ByteBuf> _dataLoader;
-
-        private void ReadAll()
-        {
-            _dataList.Clear();
-            foreach(var index in Indexes)
-            {
-                var v = Get(index);
-                _dataMap[index] = v;
-                _dataList.Add(v);
-            }
-        }
-
-        public {{name}}(ByteBuf _buf, string _tbName, System.Func<string,  ByteBuf> _loader)
-        {
-            Instance = this;
-            _dataMap = new Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}>();
-            _dataList = new List<{{cs_define_type value_type}}>();
-            _indexMap = new Dictionary<{{cs_define_type key_type}}, int>();
-            _dataLoader = new System.Func<ByteBuf>(() => _loader(_tbName));
-
-            for (int n = _buf.ReadSize(); n > 0; --n)
-            {
-                {{cs_define_type key_type}} key;
-                {{cs_deserialize '_buf' 'key' key_type}}
-                int index = _buf.ReadInt();
-                _indexMap[key] = index;
-            }
-            Indexes = _indexMap.Keys.ToList();
-            PostInit();
-        }
-
-    {{~if value_type.is_dynamic~}}
-        public T GetOrDefaultAs<T>({{cs_define_type key_type}} key) where T : {{cs_define_type value_type}}
-        {
-            if(_indexMap.TryGetValue(key,out var _))
-            {
-                return (T)Get(key);
-            }
-            return default(T);
-        }
-        public T GetAs<T>({{cs_define_type key_type}} key) where T : {{cs_define_type value_type}} => (T)Get(key);
-    {{~end~}}
-        public {{cs_define_type value_type}} this[{{cs_define_type key_type}} key] => Get(key);
-        public {{cs_define_type value_type}} Get({{cs_define_type key_type}} key)
-        {
-            {{cs_define_type value_type}} _v;
-            if(_dataMap.TryGetValue(key, out _v))
-            {
-                return _v;
-            }
-            ResetByteBuf(_indexMap[key]);
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataMap[_v.{{x.index_field.convention_name}}] = _v;
-            _v.Resolve(tables);
-            if(_indexMap.Count == _dataMap.Count)
-            {
-                _buf = null;
-            }
-            return _v;
-        }
-        public {{cs_define_type value_type}} GetOrDefault({{cs_define_type key_type}} key)
-        {
-            if(_indexMap.TryGetValue(key,out var _))
-            {
-                return Get(key);
-            }
-            return null;
-        }
-        {{~else if x.is_list_table ~}}
-        private bool _readAllList = false;
-        private List<{{cs_define_type value_type}}> _dataList;
-        public List<{{cs_define_type value_type}}> DataList
-        {
-            get
-            {
-                if(!_readAllList)
-                {
-                    ReadAllList();
-                    _readAllList = true;
-                }
-                return _dataList;
-            }
-        }
-        private System.Func<ByteBuf> _dataLoader;
-
-        {{~if x.is_union_index~}}
-        private bool _readAll;
-        private {{cs_table_union_map_type_name x}} _dataMapUnion;
-        public {{cs_table_union_map_type_name x}} DataMapUnion
-        {
-            get
-            {
-                if(!_readAll)
-                {
-                    ReadAll();
-                    _readAll = true;
-                }
-                return _dataMapUnion;
-            }            
-        }
-        private void ReadAll()
-        {
-            foreach(var index in Indexes)
-            {
-                var ({{cs_table_get_param_name_list x}}) = index;
-                var v = Get({{cs_table_get_param_name_list x}});
-                _dataMapUnion[({{cs_table_get_param_name_list x}})] = v;
-            }
-        }
-        private void ReadAllList()
-        {
-            _dataList.Clear();
-            foreach(var index in Indexes)
-            {
-                var ({{cs_table_get_param_name_list x}}) = index;
-                var v = Get({{cs_table_get_param_name_list x}});
-                _dataList.Add(v);
-            }
-        }
-        private Dictionary<({{cs_table_get_param_def_list x}}),int> _indexMap;
-        public List<({{cs_table_get_param_def_list x}})> Indexes;
-        
-        {{~else if !x.index_list.empty?~}}
-        {{~for idx in x.index_list~}}
-        private bool _readAll{{idx.index_field.convention_name}} = false;
-        private Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}> _dataMap_{{idx.index_field.name}};
-        public Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}> DataMap_{{idx.index_field.name}}
-        {
-            get
-            {
-                if(!_readAll{{idx.index_field.convention_name}})
-                {
-                    ReadAll{{idx.index_field.convention_name}}();
-                    _readAll{{idx.index_field.convention_name}} = true;
-                }
-                return _dataMap_{{idx.index_field.name}};
-            }   
-        }
-        {{~if for.first ~}}
-        private void ReadAllList()
-        {
-            _dataList.Clear();
-             foreach(var index in Indexes_{{idx.index_field.name}})
-            {
-                var v = GetBy{{idx.index_field.convention_name}}(index);
-                _dataList.Add(v);
-            }
-        }
-        {{~end~}}
-        private void ReadAll{{idx.index_field.convention_name}}()
-        {
-            foreach(var index in Indexes_{{idx.index_field.name}})
-            {
-                var v = GetBy{{idx.index_field.convention_name}}(index);
-                _dataMap_{{idx.index_field.name}}[index] = v;
-            }
-        }
-        private Dictionary<{{cs_define_type idx.type}},int> _indexMap_{{idx.index_field.name}};
-        public List<{{cs_define_type idx.type}}> Indexes_{{idx.index_field.name}};
-        {{~end~}}
-        {{~else~}}
-        private bool _readAll = false;
-        private Dictionary<int,int> _indexMap;
-        public List<int> Indexes;
-        private Dictionary<int, {{cs_define_type value_type}}> _dataMap;
-        private Dictionary<int, {{cs_define_type value_type}}> DataMap
-        {
-            get
-            {
-                if(!_readAll)
-                {
-                    ReadAllList();
-                }
-                return _dataMap;
-            }
-        }
-        private void ReadAllList()
-        {
-            _dataList.Clear();
-            foreach(var index in Indexes)
-            {
-                var v = Get(index);
-                _dataList.Add(v);
-            }
-        }
-        {{~end~}}
-        public {{name}}(ByteBuf _buf, string _tbName, System.Func<string,  ByteBuf> _loader)
-        {
-            Instance = this;
-            _dataList = new List<{{cs_define_type value_type}}>();
-            _dataLoader = new System.Func<ByteBuf>(()=> _loader(_tbName));
-        {{~if x.is_union_index~}}
-            _dataMapUnion = new {{cs_table_union_map_type_name x}}();
-            _indexMap = new Dictionary<({{cs_table_get_param_def_list x}}),int>();
-            {{key_value ='('}}
-            for (int i = _buf.ReadSize(); i > 0; i--)
-            {
-            {{~for idx in x.index_list~}}
-                {{field_name = 'key'+for.index}}
-                {{cs_define_type idx.type}} {{field_name}};
-                {{cs_deserialize '_buf' field_name idx.type}}
-                {{~if for.last~}}
-                {{key_value=key_value+field_name+')'}}
-                {{~else~}}
-                {{key_value=key_value+field_name+', '}}
-                {{~end~}}
-            {{~end~}}
-                _indexMap.Add({{key_value}}, _buf.ReadInt());
-            }
-            Indexes = _indexMap.Keys.ToList();
-        {{~else if !x.index_list.empty?~}}
-        {{~for idx in x.index_list~}}
-            _dataMap_{{idx.index_field.name}} = new Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}>();
-            _indexMap_{{idx.index_field.name}} = new Dictionary<{{cs_define_type idx.type}},int>();
-        {{~end~}}
-        
-
-            int size = _buf.ReadSize();
-            for(int i = 0; i < size; i++)
-            {     
-        {{~for idx in x.index_list~}} 
-                {{cs_define_type idx.type}} key_{{idx.index_field.name}};
-                {{cs_deserialize '_buf' 'key_'+idx.index_field.name idx.type}}
-        {{~end~}}
-                int index = _buf.ReadInt();
-        {{~for idx in x.index_list~}} 
-                _indexMap_{{idx.index_field.name}}.Add(key_{{idx.index_field.name}},index);
-        {{~end~}}
-            }
-        {{~for idx in x.index_list~}} 
-            Indexes_{{idx.index_field.name}} = _indexMap_{{idx.index_field.name}}.Keys.ToList();
-        {{~end~}}
-        {{~else~}}
-            _indexMap = new Dictionary<int,int>();
-            _dataMap = new Dictionary<int, {{cs_define_type value_type}}>();
-            int size = _buf.ReadSize();
-            for(int i = 0; i < size; i++)
-            {
-                _indexMap.Add(i,_buf.ReadInt());
-            }
-            Indexes = _indexMap.Keys.ToList();
-        {{~end~}}
-        }
-
-
-
-        {{~if x.is_union_index~}}
-        public {{cs_define_type value_type}} Get({{cs_table_get_param_def_list x}})
-        {
-            {{cs_define_type value_type}} __v;
-            if(_dataMapUnion.TryGetValue(({{cs_table_get_param_name_list x}}), out __v))
-            {
-                return __v;
-            }
-            ResetByteBuf(_indexMap[({{cs_table_get_param_name_list x}})]);
-
-            {{cs_deserialize '_buf' '__v' value_type}}
-            _dataList.Add(__v);
-            _dataMapUnion.Add(({{cs_table_get_param_name_list x}}), __v);
-            __v.Resolve(tables);
-            if(_indexMap.Count == _dataMapUnion.Count)
-            {
-                _buf = null;
-            }
-            return __v;
-        }
-        {{~else if !x.index_list.empty? ~}}
-            {{~for idx in x.index_list~}}
-        public {{cs_define_type value_type}} GetBy{{idx.index_field.convention_name}}({{cs_define_type idx.type}} key)
-        {
-            if(_dataMap_{{idx.index_field.name}}.TryGetValue(key,out var value))
-            {
-                return value;
-            }
-            int index = _indexMap_{{idx.index_field.name}}[key];
-            ResetByteBuf(index);
-            {{cs_define_type value_type}} _v;
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataMap_{{idx.index_field.name}}[key] = _v;
-            _v.Resolve(tables);
-            return _v;
-        }    
-            {{~end~}}
-        {{~else if x.index_list.empty? ~}}
-        public {{cs_define_type value_type}} this[int index] => Get(index);
-        public {{cs_define_type value_type}} Get(int index)
-        {
-            {{cs_define_type value_type}} _v;
-            if(_dataMap.TryGetValue(index, out _v))
-            {
-                return _v;
-            }
-            ResetByteBuf(_indexMap[index]);
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataMap[index] = _v;
-            _v.Resolve(tables);
-            if(_indexMap.Count == _dataMap.Count)
-            {
-                _buf = null;
-            }
-            return _v;
-        }
-        {{~end~}}
-        {{~else~}}
-
-        private {{cs_define_type value_type}} _data;
-
-        public {{name}} (ByteBuf _buf, string _tbName, System.Func<string, ByteBuf> _loader)
-        {
-            Instance = this;
-            ByteBuf _dataBuf = _loader(_tbName);
-            int n = _buf.ReadSize();
-            int m = _dataBuf.ReadSize();
-            if (n != 1 || m != 1) throw new SerializationException("table mode=one, but size != 1");
-            {{cs_deserialize '_dataBuf' '_data' value_type}}
-        }
-
-
-        {{~ for field in value_type.bean.hierarchy_export_fields ~}}
-    {{~if field.comment != '' ~}}
-        /// <summary>
-        /// {{field.escape_comment}}
-        /// </summary>
-    {{~end~}}
-        public {{cs_define_type field.ctype}} {{field.convention_name}} => _data.{{field.convention_name}};
-        {{~if field.gen_ref~}}
-        public {{cs_define_type field.ref_type}} {{field.convention_name}}_Ref => _data.{{field.convention_name}}_Ref;
-        {{~end~}}
-        {{~end~}}
-
-        {{~end~}}
-        
-    {{~if x.is_map_table||x.is_list_table ~}}
-        private void ResetByteBuf(int readerInex = 0)
-        {
-            if( _buf == null)
-            {
-                    if (_buf == null)
-            {
-                _buf = _dataLoader();
-            }
-            }
-            _buf.ReaderIndex = readerInex;
-        }
-    {{~end~}}
-    
-    {{~if x.mode != 'ONE'~}}
-        private ByteBuf _buf = null;
-        private Dictionary<string, object> tables;
-    {{~end~}}
-        public void CacheTables(Dictionary<string, object> _tables)
-        {
-    {{~if x.mode == 'ONE'~}}
-            _data.Resolve(_tables);
-    {{~else~}}
-            tables = _tables;
-    {{~end~}}
-        }
-        partial void PostInit();
-    }
-} 

Configs/CustomTemplate/CustomTemplate_Client_LazyLoad/config/cs_bin/tables.tpl

@@ -1,40 +0,0 @@
-using Bright.Serialization;
-
-{{
-    name = x.name
-    namespace = x.namespace
-    tables = x.tables
-
-}}
-namespace {{namespace}}
-{
-   
-public partial class {{name}}
-{
-    {{~for table in tables ~}}
-{{~if table.comment != '' ~}}
-    /// <summary>
-    /// {{table.escape_comment}}
-    /// </summary>
-{{~end~}}
-    public {{table.full_name}} {{table.name}} {get; }
-    {{~end~}}
-
-    public {{name}}(System.Func<string, ByteBuf> idxLoader,System.Func<string, ByteBuf> dataLoader)
-    {
-        var tables = new System.Collections.Generic.Dictionary<string, object>();
-        {{~for table in tables ~}}
-        {{table.name}} = new {{table.full_name}}(idxLoader("{{table.output_data_file}}"),"{{table.output_data_file}}",dataLoader); 
-        tables.Add("{{table.full_name}}", {{table.name}});
-        {{~end~}}
-
-        PostInit();
-        {{~for table in tables ~}}
-        {{table.name}}.CacheTables(tables); 
-        {{~end~}}
-    }
-    
-    partial void PostInit();
-}
-
-}

Configs/CustomTemplate/CustomTemplate_Client_UniTask/ConfigSystem.cs

@@ -1,95 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using Bright.Serialization;
-using Cysharp.Threading.Tasks;
-using GameBase;
-using GameConfig;
-using TEngine;
-using UnityEngine;
-
-/// <summary>
-/// 配置加载器
-/// </summary>
-public class ConfigSystem : Singleton<ConfigSystem>
-{
-    private bool _init = false;
-
-    private Tables _tables;
-
-    public Tables Tables
-    {
-        get
-        {
-            if (!_init)
-            {
-#if !UNITY_WEBGL
-                _init = true;
-
-#endif
-                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 async UniTask LoadAsync()
-    {
-        _tables = new Tables();
-        await _tables.LoadAsync(LoadByteBufAsync);
-        _init = true;
-    }
-
-    /// <summary>
-    /// 异步加载二进制配置。
-    /// </summary>
-    /// <param name="file">FileName</param>
-    /// <returns>ByteBuf</returns>
-    private async UniTask<ByteBuf> LoadByteBufAsync(string file)
-    {
-#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;
-    }
-}

Configs/CustomTemplate/CustomTemplate_Client_UniTask/config/cs_bin/bean.tpl

@@ -1,115 +0,0 @@
-using Bright.Serialization;
-using System.Collections.Generic;
-{{
-    name = x.name
-    parent_def_type = x.parent_def_type
-    export_fields = x.export_fields
-    hierarchy_export_fields = x.hierarchy_export_fields
-}}
-
-{{cs_start_name_space_grace x.namespace_with_top_module}}
-{{~if x.comment != '' ~}}
-/// <summary>
-/// {{x.escape_comment}}
-/// </summary>
-{{~end~}}
-public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Config.BeanBase {{end}}
-{
-    public {{name}}(ByteBuf _buf) {{if parent_def_type}} : base(_buf) {{end}}
-    {
-        {{~ for field in export_fields ~}}
-        {{cs_deserialize '_buf' field.convention_name field.ctype}}
-        {{~if field.index_field~}}
-        foreach(var _v in {{field.convention_name}})
-        { 
-            {{field.convention_name}}_Index.Add(_v.{{field.index_field.convention_name}}, _v);
-        }
-        {{~end~}}
-        {{~end~}}
-        PostInit();
-    }
-
-    public static {{name}} Deserialize{{name}}(ByteBuf _buf)
-    {
-    {{~if x.is_abstract_type~}}
-        switch (_buf.ReadInt())
-        {
-        {{~for child in x.hierarchy_not_abstract_children~}}
-            case {{child.full_name}}.__ID__: return new {{child.full_name}}(_buf);
-        {{~end~}}
-            default: throw new SerializationException();
-        }
-    {{~else~}}
-        return new {{x.full_name}}(_buf);
-    {{~end~}}
-    }
-
-    {{~ for field in export_fields ~}}
-{{~if field.comment != '' ~}}
-    /// <summary>
-    /// {{field.escape_comment}}
-    /// </summary>
-{{~end~}}
-    public {{cs_define_type field.ctype}} {{field.convention_name}} { get; private set; }
-    {{~if field.index_field~}} 
-    public readonly Dictionary<{{cs_define_type field.index_field.ctype}}, {{cs_define_type field.ctype.element_type}}> {{field.convention_name}}_Index = new Dictionary<{{cs_define_type field.index_field.ctype}}, {{cs_define_type field.ctype.element_type}}>();
-    {{~end~}}
-    {{~if field.gen_ref~}}
-    public {{field.cs_ref_validator_define}}
-    {{~end~}}
-    {{~if (gen_datetime_mills field.ctype) ~}}
-    public long {{field.convention_name}}_Millis => {{field.convention_name}} * 1000L;
-    {{~end~}}
-    {{~if field.gen_text_key~}}
-    public {{cs_define_text_key_field field}} { get; }
-    {{~end~}}
-    {{~end~}}
-
-{{~if !x.is_abstract_type~}}
-    public const int __ID__ = {{x.id}};
-    public override int GetTypeId() => __ID__;
-{{~end~}}
-
-    public {{x.cs_method_modifier}} void Resolve(Dictionary<string, object> _tables)
-    {
-        {{~if parent_def_type~}}
-        base.Resolve(_tables);
-        {{~end~}}
-        {{~ for field in export_fields ~}}
-        {{~if field.gen_ref~}}
-        {{cs_ref_validator_resolve field}}
-        {{~else if field.has_recursive_ref~}}
-        {{cs_recursive_resolve field '_tables'}}
-        {{~end~}}
-        {{~end~}}
-        PostResolve();
-    }
-
-    public {{x.cs_method_modifier}} void TranslateText(System.Func<string, string, string> translator)
-    {
-        {{~if parent_def_type~}}
-        base.TranslateText(translator);
-        {{~end~}}
-        {{~ for field in export_fields ~}}
-        {{~if field.gen_text_key~}}
-        {{cs_translate_text field 'translator'}}
-        {{~else if field.has_recursive_text~}}
-        {{cs_recursive_translate_text field 'translator'}}
-        {{~end~}}
-        {{~end~}}
-    }
-
-    public override string ToString()
-    {
-        return "{{full_name}}{ "
-    {{~for field in hierarchy_export_fields ~}}
-        + "{{field.convention_name}}:" + {{cs_to_string field.convention_name field.ctype}} + ","
-    {{~end~}}
-        + "}";
-    }
-    
-    partial void PostInit();
-    partial void PostResolve();
-}
-
-{{cs_end_name_space_grace x.namespace_with_top_module}}

Configs/CustomTemplate/CustomTemplate_Client_UniTask/config/cs_bin/table.tpl

@@ -1,173 +0,0 @@
-using Bright.Serialization;
-using System.Collections.Generic;
-
-
-{{cs_start_name_space_grace x.namespace_with_top_module}}
-   {{ 
-        name = x.name
-        key_type = x.key_ttype
-        key_type1 =  x.key_ttype1
-        key_type2 =  x.key_ttype2
-        value_type =  x.value_ttype
-    }}
-{{~if x.comment != '' ~}}
-/// <summary>
-/// {{x.escape_comment}}
-/// </summary>
-{{~end~}}
-public partial class {{name}}
-{
-    {{~if x.is_map_table ~}}
-    private readonly Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}> _dataMap;
-    private readonly List<{{cs_define_type value_type}}> _dataList;
-    
-    public {{name}}(ByteBuf _buf)
-    {
-        _dataMap = new Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}>();
-        _dataList = new List<{{cs_define_type value_type}}>();
-        
-        for(int n = _buf.ReadSize() ; n > 0 ; --n)
-        {
-            {{cs_define_type value_type}} _v;
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataList.Add(_v);
-            _dataMap.Add(_v.{{x.index_field.convention_name}}, _v);
-        }
-        PostInit();
-    }
-
-    public Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}> DataMap => _dataMap;
-    public List<{{cs_define_type value_type}}> DataList => _dataList;
-
-{{~if value_type.is_dynamic~}}
-    public T GetOrDefaultAs<T>({{cs_define_type key_type}} key) where T : {{cs_define_type value_type}} => _dataMap.TryGetValue(key, out var v) ? (T)v : null;
-    public T GetAs<T>({{cs_define_type key_type}} key) where T : {{cs_define_type value_type}} => (T)_dataMap[key];
-{{~end~}}
-    public {{cs_define_type value_type}} GetOrDefault({{cs_define_type key_type}} key) => _dataMap.TryGetValue(key, out var v) ? v : null;
-    public {{cs_define_type value_type}} Get({{cs_define_type key_type}} key) => _dataMap[key];
-    public {{cs_define_type value_type}} this[{{cs_define_type key_type}} key] => _dataMap[key];
-
-    public void Resolve(Dictionary<string, object> _tables)
-    {
-        foreach(var v in _dataList)
-        {
-            v.Resolve(_tables);
-        }
-        PostResolve();
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        foreach(var v in _dataList)
-        {
-            v.TranslateText(translator);
-        }
-    }
-        {{~else if x.is_list_table ~}}
-    private readonly List<{{cs_define_type value_type}}> _dataList;
-
-    {{~if x.is_union_index~}}
-    private {{cs_table_union_map_type_name x}} _dataMapUnion;
-    {{~else if !x.index_list.empty?~}}
-    {{~for idx in x.index_list~}}
-    private Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}> _dataMap_{{idx.index_field.name}};
-    {{~end~}}
-    {{~end~}}
-
-    public {{name}}(ByteBuf _buf)
-    {
-        _dataList = new List<{{cs_define_type value_type}}>();
-        
-        for(int n = _buf.ReadSize() ; n > 0 ; --n)
-        {
-            {{cs_define_type value_type}} _v;
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataList.Add(_v);
-        }
-    {{~if x.is_union_index~}}
-        _dataMapUnion = new {{cs_table_union_map_type_name x}}();
-        foreach(var _v in _dataList)
-        {
-            _dataMapUnion.Add(({{cs_table_key_list x "_v"}}), _v);
-        }
-    {{~else if !x.index_list.empty?~}}
-    {{~for idx in x.index_list~}}
-        _dataMap_{{idx.index_field.name}} = new Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}>();
-    {{~end~}}
-    foreach(var _v in _dataList)
-    {
-    {{~for idx in x.index_list~}}
-        _dataMap_{{idx.index_field.name}}.Add(_v.{{idx.index_field.convention_name}}, _v);
-    {{~end~}}
-    }
-    {{~end~}}
-        PostInit();
-    }
-
-
-    public List<{{cs_define_type value_type}}> DataList => _dataList;
-
-    {{~if x.is_union_index~}}
-    public {{cs_define_type value_type}} Get({{cs_table_get_param_def_list x}}) => _dataMapUnion.TryGetValue(({{cs_table_get_param_name_list x}}), out {{cs_define_type value_type}} __v) ? __v : null;
-    {{~else if !x.index_list.empty? ~}}
-        {{~for idx in x.index_list~}}
-    public {{cs_define_type value_type}} GetBy{{idx.index_field.convention_name}}({{cs_define_type idx.type}} key) => _dataMap_{{idx.index_field.name}}.TryGetValue(key, out {{cs_define_type value_type}} __v) ? __v : null;
-        {{~end~}}
-    {{~end~}}
-
-    public void Resolve(Dictionary<string, object> _tables)
-    {
-        foreach(var v in _dataList)
-        {
-            v.Resolve(_tables);
-        }
-        PostResolve();
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        foreach(var v in _dataList)
-        {
-            v.TranslateText(translator);
-        }
-    }
-    {{~else~}}
-
-     private readonly {{cs_define_type value_type}} _data;
-
-    public {{name}}(ByteBuf _buf)
-    {
-        int n = _buf.ReadSize();
-        if (n != 1) throw new SerializationException("table mode=one, but size != 1");
-        {{cs_deserialize '_buf' '_data' value_type}}
-        PostInit();
-    }
-
-
-    {{~ for field in value_type.bean.hierarchy_export_fields ~}}
-{{~if field.comment != '' ~}}
-    /// <summary>
-    /// {{field.escape_comment}}
-    /// </summary>
-{{~end~}}
-     public {{cs_define_type field.ctype}} {{field.convention_name}} => _data.{{field.convention_name}};
-    {{~end~}}
-
-    public void Resolve(Dictionary<string, object> _tables)
-    {
-        _data.Resolve(_tables);
-        PostResolve();
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        _data.TranslateText(translator);
-    }
-
-    {{~end~}}
-    
-    partial void PostInit();
-    partial void PostResolve();
-}
-
-{{cs_end_name_space_grace x.namespace_with_top_module}}

Configs/CustomTemplate/CustomTemplate_Client_UniTask/config/cs_bin/tables.tpl

@@ -1,53 +0,0 @@
-using Bright.Serialization;
-using Cysharp.Threading.Tasks;
-using System.Collections.Generic;
-
-{{
-    name = x.name
-    namespace = x.namespace
-    tables = x.tables
-}}
-namespace {{namespace}}
-{
-   
-public sealed class {{name}}
-{
-    {{~for table in tables ~}}
-{{~if table.comment != '' ~}}
-    /// <summary>
-    /// {{table.escape_comment}}
-    /// </summary>
-{{~end~}}
-    public {{table.full_name}} {{table.name}} {get; private set; }
-    {{~end~}}
-
-    public {{name}}() { }
-    
-    public async UniTask LoadAsync(System.Func<string, UniTask<ByteBuf>> loader)
-    {
-        var tables = new System.Collections.Generic.Dictionary<string, object>();
-		List<UniTask> list = new List<UniTask>();
-        {{~for table in tables ~}}
-		list.Add(UniTask.Create(async () =>
-		{
-			{{table.name}} = new {{table.full_name}}(await loader("{{table.output_data_file}}")); 
-			tables.Add("{{table.full_name}}", {{table.name}});
-		}));
-        {{~end~}}
-
-		await UniTask.WhenAll(list);
-
-        {{~for table in tables ~}}
-        {{table.name}}.Resolve(tables); 
-        {{~end~}}
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        {{~for table in tables ~}}
-        {{table.name}}.TranslateText(translator); 
-        {{~end~}}
-    }
-}
-
-}

Configs/CustomTemplate/CustomTemplate_Server_Task/config/cs_bin/bean.tpl

@@ -1,115 +0,0 @@
-using Bright.Serialization;
-using System.Collections.Generic;
-{{
-    name = x.name
-    parent_def_type = x.parent_def_type
-    export_fields = x.export_fields
-    hierarchy_export_fields = x.hierarchy_export_fields
-}}
-
-{{cs_start_name_space_grace x.namespace_with_top_module}}
-{{~if x.comment != '' ~}}
-/// <summary>
-/// {{x.escape_comment}}
-/// </summary>
-{{~end~}}
-public {{x.cs_class_modifier}} partial class {{name}} : {{if parent_def_type}} {{x.parent}} {{else}} Bright.Config.BeanBase {{end}}
-{
-    public {{name}}(ByteBuf _buf) {{if parent_def_type}} : base(_buf) {{end}}
-    {
-        {{~ for field in export_fields ~}}
-        {{cs_deserialize '_buf' field.convention_name field.ctype}}
-        {{~if field.index_field~}}
-        foreach(var _v in {{field.convention_name}})
-        { 
-            {{field.convention_name}}_Index.Add(_v.{{field.index_field.convention_name}}, _v);
-        }
-        {{~end~}}
-        {{~end~}}
-        PostInit();
-    }
-
-    public static {{name}} Deserialize{{name}}(ByteBuf _buf)
-    {
-    {{~if x.is_abstract_type~}}
-        switch (_buf.ReadInt())
-        {
-        {{~for child in x.hierarchy_not_abstract_children~}}
-            case {{child.full_name}}.__ID__: return new {{child.full_name}}(_buf);
-        {{~end~}}
-            default: throw new SerializationException();
-        }
-    {{~else~}}
-        return new {{x.full_name}}(_buf);
-    {{~end~}}
-    }
-
-    {{~ for field in export_fields ~}}
-{{~if field.comment != '' ~}}
-    /// <summary>
-    /// {{field.escape_comment}}
-    /// </summary>
-{{~end~}}
-    public {{cs_define_type field.ctype}} {{field.convention_name}} { get; private set; }
-    {{~if field.index_field~}} 
-    public readonly Dictionary<{{cs_define_type field.index_field.ctype}}, {{cs_define_type field.ctype.element_type}}> {{field.convention_name}}_Index = new Dictionary<{{cs_define_type field.index_field.ctype}}, {{cs_define_type field.ctype.element_type}}>();
-    {{~end~}}
-    {{~if field.gen_ref~}}
-    public {{field.cs_ref_validator_define}}
-    {{~end~}}
-    {{~if (gen_datetime_mills field.ctype) ~}}
-    public long {{field.convention_name}}_Millis => {{field.convention_name}} * 1000L;
-    {{~end~}}
-    {{~if field.gen_text_key~}}
-    public {{cs_define_text_key_field field}} { get; }
-    {{~end~}}
-    {{~end~}}
-
-{{~if !x.is_abstract_type~}}
-    public const int __ID__ = {{x.id}};
-    public override int GetTypeId() => __ID__;
-{{~end~}}
-
-    public {{x.cs_method_modifier}} void Resolve(Dictionary<string, object> _tables)
-    {
-        {{~if parent_def_type~}}
-        base.Resolve(_tables);
-        {{~end~}}
-        {{~ for field in export_fields ~}}
-        {{~if field.gen_ref~}}
-        {{cs_ref_validator_resolve field}}
-        {{~else if field.has_recursive_ref~}}
-        {{cs_recursive_resolve field '_tables'}}
-        {{~end~}}
-        {{~end~}}
-        PostResolve();
-    }
-
-    public {{x.cs_method_modifier}} void TranslateText(System.Func<string, string, string> translator)
-    {
-        {{~if parent_def_type~}}
-        base.TranslateText(translator);
-        {{~end~}}
-        {{~ for field in export_fields ~}}
-        {{~if field.gen_text_key~}}
-        {{cs_translate_text field 'translator'}}
-        {{~else if field.has_recursive_text~}}
-        {{cs_recursive_translate_text field 'translator'}}
-        {{~end~}}
-        {{~end~}}
-    }
-
-    public override string ToString()
-    {
-        return "{{full_name}}{ "
-    {{~for field in hierarchy_export_fields ~}}
-        + "{{field.convention_name}}:" + {{cs_to_string field.convention_name field.ctype}} + ","
-    {{~end~}}
-        + "}";
-    }
-    
-    partial void PostInit();
-    partial void PostResolve();
-}
-
-{{cs_end_name_space_grace x.namespace_with_top_module}}

Configs/CustomTemplate/CustomTemplate_Server_Task/config/cs_bin/table.tpl

@@ -1,173 +0,0 @@
-using Bright.Serialization;
-using System.Collections.Generic;
-
-
-{{cs_start_name_space_grace x.namespace_with_top_module}}
-   {{ 
-        name = x.name
-        key_type = x.key_ttype
-        key_type1 =  x.key_ttype1
-        key_type2 =  x.key_ttype2
-        value_type =  x.value_ttype
-    }}
-{{~if x.comment != '' ~}}
-/// <summary>
-/// {{x.escape_comment}}
-/// </summary>
-{{~end~}}
-public partial class {{name}}
-{
-    {{~if x.is_map_table ~}}
-    private readonly Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}> _dataMap;
-    private readonly List<{{cs_define_type value_type}}> _dataList;
-    
-    public {{name}}(ByteBuf _buf)
-    {
-        _dataMap = new Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}>();
-        _dataList = new List<{{cs_define_type value_type}}>();
-        
-        for(int n = _buf.ReadSize() ; n > 0 ; --n)
-        {
-            {{cs_define_type value_type}} _v;
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataList.Add(_v);
-            _dataMap.Add(_v.{{x.index_field.convention_name}}, _v);
-        }
-        PostInit();
-    }
-
-    public Dictionary<{{cs_define_type key_type}}, {{cs_define_type value_type}}> DataMap => _dataMap;
-    public List<{{cs_define_type value_type}}> DataList => _dataList;
-
-{{~if value_type.is_dynamic~}}
-    public T GetOrDefaultAs<T>({{cs_define_type key_type}} key) where T : {{cs_define_type value_type}} => _dataMap.TryGetValue(key, out var v) ? (T)v : null;
-    public T GetAs<T>({{cs_define_type key_type}} key) where T : {{cs_define_type value_type}} => (T)_dataMap[key];
-{{~end~}}
-    public {{cs_define_type value_type}} GetOrDefault({{cs_define_type key_type}} key) => _dataMap.TryGetValue(key, out var v) ? v : null;
-    public {{cs_define_type value_type}} Get({{cs_define_type key_type}} key) => _dataMap[key];
-    public {{cs_define_type value_type}} this[{{cs_define_type key_type}} key] => _dataMap[key];
-
-    public void Resolve(Dictionary<string, object> _tables)
-    {
-        foreach(var v in _dataList)
-        {
-            v.Resolve(_tables);
-        }
-        PostResolve();
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        foreach(var v in _dataList)
-        {
-            v.TranslateText(translator);
-        }
-    }
-        {{~else if x.is_list_table ~}}
-    private readonly List<{{cs_define_type value_type}}> _dataList;
-
-    {{~if x.is_union_index~}}
-    private {{cs_table_union_map_type_name x}} _dataMapUnion;
-    {{~else if !x.index_list.empty?~}}
-    {{~for idx in x.index_list~}}
-    private Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}> _dataMap_{{idx.index_field.name}};
-    {{~end~}}
-    {{~end~}}
-
-    public {{name}}(ByteBuf _buf)
-    {
-        _dataList = new List<{{cs_define_type value_type}}>();
-        
-        for(int n = _buf.ReadSize() ; n > 0 ; --n)
-        {
-            {{cs_define_type value_type}} _v;
-            {{cs_deserialize '_buf' '_v' value_type}}
-            _dataList.Add(_v);
-        }
-    {{~if x.is_union_index~}}
-        _dataMapUnion = new {{cs_table_union_map_type_name x}}();
-        foreach(var _v in _dataList)
-        {
-            _dataMapUnion.Add(({{cs_table_key_list x "_v"}}), _v);
-        }
-    {{~else if !x.index_list.empty?~}}
-    {{~for idx in x.index_list~}}
-        _dataMap_{{idx.index_field.name}} = new Dictionary<{{cs_define_type idx.type}}, {{cs_define_type value_type}}>();
-    {{~end~}}
-    foreach(var _v in _dataList)
-    {
-    {{~for idx in x.index_list~}}
-        _dataMap_{{idx.index_field.name}}.Add(_v.{{idx.index_field.convention_name}}, _v);
-    {{~end~}}
-    }
-    {{~end~}}
-        PostInit();
-    }
-
-
-    public List<{{cs_define_type value_type}}> DataList => _dataList;
-
-    {{~if x.is_union_index~}}
-    public {{cs_define_type value_type}} Get({{cs_table_get_param_def_list x}}) => _dataMapUnion.TryGetValue(({{cs_table_get_param_name_list x}}), out {{cs_define_type value_type}} __v) ? __v : null;
-    {{~else if !x.index_list.empty? ~}}
-        {{~for idx in x.index_list~}}
-    public {{cs_define_type value_type}} GetBy{{idx.index_field.convention_name}}({{cs_define_type idx.type}} key) => _dataMap_{{idx.index_field.name}}.TryGetValue(key, out {{cs_define_type value_type}} __v) ? __v : null;
-        {{~end~}}
-    {{~end~}}
-
-    public void Resolve(Dictionary<string, object> _tables)
-    {
-        foreach(var v in _dataList)
-        {
-            v.Resolve(_tables);
-        }
-        PostResolve();
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        foreach(var v in _dataList)
-        {
-            v.TranslateText(translator);
-        }
-    }
-    {{~else~}}
-
-     private readonly {{cs_define_type value_type}} _data;
-
-    public {{name}}(ByteBuf _buf)
-    {
-        int n = _buf.ReadSize();
-        if (n != 1) throw new SerializationException("table mode=one, but size != 1");
-        {{cs_deserialize '_buf' '_data' value_type}}
-        PostInit();
-    }
-
-
-    {{~ for field in value_type.bean.hierarchy_export_fields ~}}
-{{~if field.comment != '' ~}}
-    /// <summary>
-    /// {{field.escape_comment}}
-    /// </summary>
-{{~end~}}
-     public {{cs_define_type field.ctype}} {{field.convention_name}} => _data.{{field.convention_name}};
-    {{~end~}}
-
-    public void Resolve(Dictionary<string, object> _tables)
-    {
-        _data.Resolve(_tables);
-        PostResolve();
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        _data.TranslateText(translator);
-    }
-
-    {{~end~}}
-    
-    partial void PostInit();
-    partial void PostResolve();
-}
-
-{{cs_end_name_space_grace x.namespace_with_top_module}}

Configs/CustomTemplate/CustomTemplate_Server_Task/config/cs_bin/tables.tpl

@@ -1,46 +0,0 @@
-using Bright.Serialization;
-using System.Threading.Tasks;
-
-{{
-    name = x.name
-    namespace = x.namespace
-    tables = x.tables
-}}
-namespace {{namespace}}
-{
-   
-public sealed class {{name}}
-{
-    {{~for table in tables ~}}
-{{~if table.comment != '' ~}}
-    /// <summary>
-    /// {{table.escape_comment}}
-    /// </summary>
-{{~end~}}
-    public {{table.full_name}} {{table.name}} {get; private set; }
-    {{~end~}}
-
-    public {{name}}() { }
-    
-    public async Task LoadAsync(System.Func<string, Task<ByteBuf>> loader)
-    {
-        var tables = new System.Collections.Generic.Dictionary<string, object>();
-        {{~for table in tables ~}}
-        {{table.name}} = new {{table.full_name}}(await loader("{{table.output_data_file}}")); 
-        tables.Add("{{table.full_name}}", {{table.name}});
-        {{~end~}}
-
-        {{~for table in tables ~}}
-        {{table.name}}.Resolve(tables); 
-        {{~end~}}
-    }
-
-    public void TranslateText(System.Func<string, string, string> translator)
-    {
-        {{~for table in tables ~}}
-        {{table.name}}.TranslateText(translator); 
-        {{~end~}}
-    }
-}
-
-}

Configs/Defines/Actor.xml

@@ -1,36 +0,0 @@
-<module name="Battle">
-	<enum name="ActorAttrDataType">
-		<var name="None" alias="无效数据" value="0"/>
-		<var name="MaxHp" alias="最大血量" value="1"/>
-		<var name="Attack" alias="攻击力" value="2"/>
-		<var name="PhyDamage" alias="物理伤害" value="3"/>
-		<var name="PhyDef" alias="物理防御" value="4"/>
-		<var name="MagicDamage" alias="法术伤害" value="5"/>
-		<var name="MagicDef" alias="法术防御" value="6"/>
-		<var name="MoveSpeed" alias="移动速度" value="7"/>
-		<var name="AttackSpeed" alias="攻击速度" value="8"/>
-		<var name="Hit" alias="命中率" value="9"/>
-		<var name="Dodge" alias="闪避率" value="10"/>
-		<var name="CriticalAtkRatio" alias="暴击率" value="11"/>
-		<var name="SanValue" alias="San值(疯狂值)" value="12"/>
-		<var name="MaxMp" alias="最大MP" value="13"/>
-
-		<var name="PhyDamageRatio" alias="物理伤害倍率" value="14"/>
-		<var name="MagicDamageRatio" alias="魔法伤害倍率" value="15"/>
-		<var name="CriticalRatio" alias="暴击倍率" value="16"/>
-		<var name="CriticalReduce" alias="暴击减免" value="17"/>
-	</enum>
-
-	<enum name="ActorAttrAddType">
-		<var name="NONE" alias="无效数据" value="0"/>
-		<var name="ABSOLUTE_VAL" alias="加法计算" value="1"/>
-		<var name="SUM_PERCENT_VAL" alias="多个项结果累加，然后对加法做乘法" value="2"/>
-		<var name="MUL_PERCENT_VAL" alias="每一项都是对最终结果做乘法" value="3"/>
-	</enum>
-
-	<bean name="ResAttrImpactData" sep="," parent="">
-		<var name="DataType" type="ActorAttrDataType"/>
-		<var name="AddType" type="ActorAttrAddType"/>
-		<var name="Value" type="float"/>
-	</bean>
-</module>

Configs/Defines/BuffConfig.xml

@@ -1,68 +0,0 @@
-<module name="Battle">
-	<enum name="BuffTimeType">
-		<var name="BUFF_TIME_DURING" alias="指定持续时间" value="0"/>
-		<var name="BUFF_TIME_INFINIT" alias="无尽时间" value="1"/>
-	</enum>
-
-	<enum name="BuffReplaceType">
-		<var name="BUFF_REPLACE_INSTEAD" alias="更新时间范围" value="0"/>
-		<var name="BUFF_REPLACE_FORBIT" alias="不允许叠加" value="1"/>
-		<var name="BUFF_REPLACE_ADD_TIME" alias="累加时间范围" value="2"/>
-		<var name="BUFF_REPLACE_ADD_ATTR" alias="叠加数值" value="3"/>
-		<var name="BUFF_REPLACE_TYPE_COUNT" alias="叠加种类" value="4"/>
-	</enum>
-
-	<enum name="BuffStateID">
-		<var name="BUFF_STATE_NONE" alias="无状态" value="0"/>
-		<var name="BUFF_STATE_STUN" alias="眩晕状态" value="1"/>
-		<var name="BUFF_STATE_UNDEAD" alias="无敌状态" value="2"/>
-		<var name="BUFF_STATE_INVISIBLE" alias="隐身状态" value="3"/>
-		<var name="BUFF_STATE_BIGGER" alias="体形变大" value="4"/>
-		<var name="BUFF_STATE_NO_MOVE" alias="定身,不能移动" value="5"/>
-		<var name="BUFF_STATE_NO_SKILL" alias="沉默，不能放技能" value="6"/>
-		<var name="BUFF_STATE_SLEEP" alias="昏睡" value="7"/>
-		<var name="BUFF_STATE_FORCE_COLLIDER" alias="强制开启阻挡" value="8"/>
-		<var name="BUFF_STATE_IGNORE_COLLIDER" alias="无视阻挡" value="9"/>
-		<var name="BUFF_STATE_MAX" alias="最大状态" value="10"/>
-	</enum>
-
-	<enum name="BuffResultType">
-		<var name="BUFF_RESULT_NONE" alias="无" value="0"/>
-		<var name="BUFF_RESULT_PHY_ATK_UP" alias="物理攻击提升" value="1"/>
-		<var name="BUFF_RESULT_PHY_ATK_DOWN" alias="物理攻击降低" value="2"/>
-		<var name="BUFF_RESULT_PHY_DEF_UP" alias="物理防御提升" value="3"/>
-		<var name="BUFF_RESULT_PHY_DEF_DOWN" alias="物理防御降低" value="4"/>
-		<var name="BUFF_RESULT_PHY_HIT_UP" alias="物理命中提升" value="5"/>
-		<var name="BUFF_RESULT_PHY_HIT_DOWN" alias="物理命中降低" value="6"/>
-		<var name="BUFF_RESULT_PHY_LOSE_HP" alias="物理持续掉血" value="7"/>
-
-		<var name="BUFF_RESULT_MAG_ATK_UP" alias="法术攻击提升" value="8"/>
-		<var name="BUFF_RESULT_MAG_ATK_DOWN" alias="法术攻击降低" value="9"/>
-		<var name="BUFF_RESULT_MAG_DEF_UP" alias="法术防御提升" value="10"/>
-		<var name="BUFF_RESULT_MAG_DEF_DOWN" alias="法术防御降低" value="11"/>
-		<var name="BUFF_RESULT_MAG_HIT_UP" alias="法术命中提升" value="12"/>
-		<var name="BUFF_RESULT_MAG_HIT_DOWN" alias="法术命中降低" value="13"/>
-		<var name="BUFF_RESULT_MAG_LOSE_HP" alias="法术持续掉血" value="14"/>
-
-		<var name="BUFF_RESULT_CIRT_UP" alias="暴击率提升" value="15"/>
-		<var name="BUFF_RESULT_CIRT_DOWN" alias="暴击率降低" value="16"/>
-		<var name="BUFF_RESULT_CIRT_VALUE_UP" alias="暴击倍率提升" value="17"/>
-		<var name="BUFF_RESULT_CIRT_VALUE_DOWN" alias="暴击倍率降低" value="18"/>
-
-		<var name="BUFF_RESULT_MOVE_SPEED_UP" alias="移速提升" value="19"/>
-		<var name="BUFF_RESULT_MOVE_SPEED_DOWN" alias="移速降低" value="20"/>
-	</enum>
-
-	<bean name="BuffTriggleState" sep="," parent="">
-		<var name="StateID" type="BuffStateID"/>
-		<var name="StateParam" type="float"/>
-	</bean>
-
-	<bean name="BuffDotTickConfig" sep="," parent="">
-		<!-- 触发间隔,如果为0, 则只加一次 -->
-		<var name="TickTime" type="float"/>
-		<!-- 1增加buff的时候立刻触发,否则等待TickTime后再触发 -->
-		<var name="TickWhenAdd" type="int"/>
-	</bean>
-
-</module>

Configs/Defines/SkillConfig.xml

@@ -1,25 +0,0 @@
-<module name="Battle">
-	<enum name="SkillMagicType"> 技能元素类型
-		<var name="SKILL_TYPE_NONE" alias="无类型" value="0"/>
-		<var name="SKILL_TYPE_DMG_PHY" alias="物理伤害属性" value="1"/>
-		<var name="SKILL_TYPE_DMG_MAGIC" alias="魔法伤害属性" value="2"/>
-	</enum>
-
-	<enum name="SkillAttrDamageType"> 伤害类型
-		<var name="ATTR_TYPE_NONE" alias="无数值" value="0"/>
-		<var name="ATTR_TYPE_DMG_WEAPON" alias="按释放者的伤害类型*X%+固定值计算,目标有防御计算" value="1"/>
-		<var name="ATTR_TYPE_DMG_NO_DEFEND" alias="按释放者的伤害类型*X%+固定值计算（无视目标的防御）" value="2"/>
-		<var name="ATTR_TYPE_DMG_TARGET_HP_NO_DEFEND" alias="按受击者的气血上限*X%+固定值计算（无视目标的防御）" value="3"/>
-		<var name="ATTR_TYPE_HP_AS_ATK" alias="按释放者的攻击类型*X%+固定值计算，恢复当前生命" value="4"/>
-		<var name="ATTR_TYPE_HP_RATIO" alias="按受击者的HP上限*X%+固定值计算，恢复当前生命" value="5"/>
-	</enum>
-
-	<bean name="SkillAttrDamageData" sep="," parent="">
-		<var name="MagicType" type="SkillMagicType"/>
-		<var name="AttrType" type="SkillAttrDamageType"/>
-		<var name="Param1" type="float"/>
-		<var name="Param2" type="float"/>
-		<var name="Param3" type="float"/>
-		<var name="MaxLimit" type="float"/>
-	</bean>
-</module>

Configs/Defines/__root__.xml

@@ -1,23 +0,0 @@
-<root>
-
-	<topmodule name="GameConfig"/>
-
-	<externalselector name="unity"/>
-
-	<patch name="cn"/>
-	<patch name="en"/>
-
-	<group name="c,client" default="1"/> client
-	<group name="s,server" default="1"/> server
-	<group name="e" default="1"/> editor
-	
-	<import name="."/>
-	
-	<importexcel name="__tables__.xlsx" type="table"/> 相对data目录
-	<importexcel name="__enums__.xlsx" type="enum"/>相对data目录
-	<importexcel name="__beans__.xlsx" type="bean"/>相对data目录
-
-	<service name="server" manager="Tables" group="s"/>
-	<service name="client" manager="Tables" group="c"/>
-	<service name="all" manager="Tables" group="c,s,e"/>
-</root>

Configs/GameConfig/CustomTemplate/ConfigSystem.cs

@@ -1,4 +1,4 @@
-using Bright.Serialization;
+using Luban;
 using GameBase;
 using GameConfig;
 using TEngine;
@@ -21,6 +21,7 @@ public class ConfigSystem : Singleton<ConfigSystem>
             {
                 Load();
             }
+
             return _tables;
         }
     }
@@ -41,8 +42,9 @@ public class ConfigSystem : Singleton<ConfigSystem>
     /// <returns>ByteBuf</returns>
     private ByteBuf LoadByteBuf(string file)
     {
-        var textAssets = GameModule.Resource.LoadAsset<TextAsset>(file);
-        byte[] ret = textAssets.bytes;
-        return new ByteBuf(ret);
+        TextAsset textAsset = GameModule.Resource.LoadAsset<TextAsset>(file);
+        byte[] bytes = textAsset.bytes;
+        GameModule.Resource.UnloadAsset(textAsset);
+        return new ByteBuf(bytes);
     }
 }

Configs/GameConfig/CustomTemplate/CustomTemplate_Client_LazyLoad/cs-bin/tables.sbn

@@ -0,0 +1,55 @@
+using Luban;
+
+{{namespace_with_grace_begin __namespace}}
+public partial class {{__name}}
+{
+    #region The Tables
+
+    {{~for table in __tables ~}}
+{{~if table.comment != '' ~}}
+    /// <summary>
+    /// {{escape_comment table.comment}}
+    /// </summary>
+{{~end~}}
+    private {{table.full_name}} m_{{table.name}};
+    public {{table.full_name}} {{format_property_name __code_style table.name}} 
+    {
+        get
+        {
+            if (m_{{table.name}} == null)
+            {
+                m_{{table.name}} = new {{table.full_name}}(defaultLoader("{{table.output_data_file}}"));
+                m_{{table.name}}.ResolveRef(this);
+            }
+            return m_{{table.name}};
+        }
+        set
+        {
+            m_{{table.name}} = value;
+            m_{{table.name}}.ResolveRef(this);
+        }
+    }
+    {{~end~}}
+
+    #endregion
+
+    System.Func<string, ByteBuf> defaultLoader;
+
+    public {{__name}}(System.Func<string, ByteBuf> loader)
+    {
+        SetDefaultLoader(loader);
+        Init();
+    }
+    
+    public void SetDefaultLoader(System.Func<string, ByteBuf> loader)
+    {
+        defaultLoader = null;
+        defaultLoader = loader;
+    }
+
+    //public partial void Init();
+
+    public void Init(){}
+}
+
+{{namespace_with_grace_end __namespace}}

Configs/GameConfig/Defines/builtin.xml

@@ -0,0 +1,17 @@
+<module name="">
+    <bean name="vector2" valueType="1" sep=",">
+        <var name="x" type="float"/>
+        <var name="y" type="float"/>
+    </bean>
+    <bean name="vector3" valueType="1" sep=",">
+        <var name="x" type="float"/>
+        <var name="y" type="float"/>
+        <var name="z" type="float"/>
+    </bean>
+    <bean name="vector4" valueType="1" sep=",">
+        <var name="x" type="float"/>
+        <var name="y" type="float"/>
+        <var name="z" type="float"/>
+        <var name="w" type="float"/>
+    </bean>
+</module>

Configs/GameConfig/gen_code_bin_to_project.bat

@@ -0,0 +1,20 @@
+Cd /d %~dp0
+echo %CD%
+
+set WORKSPACE=../..
+set LUBAN_DLL=%WORKSPACE%\Tools\Luban\Luban.dll
+set CONF_ROOT=.
+set DATA_OUTPATH=%WORKSPACE%/UnityProject/Assets/AssetRaw/Configs/bytes/
+set CODE_OUTPATH=%WORKSPACE%/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/
+
+xcopy /s /e /i /y "%CONF_ROOT%\CustomTemplate\ConfigSystem.cs" "%WORKSPACE%\UnityProject\Assets\GameScripts\HotFix\GameProto\ConfigSystem.cs"
+
+dotnet %LUBAN_DLL% ^
+    -t client ^
+    -c cs-bin ^
+    -d bin^
+    --conf %CONF_ROOT%\luban.conf ^
+    -x outputCodeDir=%CODE_OUTPATH% ^
+    -x outputDataDir=%DATA_OUTPATH% 
+pause
+

Configs/GameConfig/gen_code_bin_to_project_lazyload.bat

@@ -0,0 +1,21 @@
+Cd /d %~dp0
+echo %CD%
+
+set WORKSPACE=../..
+set LUBAN_DLL=%WORKSPACE%\Tools\Luban\Luban.dll
+set CONF_ROOT=.
+set DATA_OUTPATH=%WORKSPACE%/UnityProject/Assets/AssetRaw/Configs/bytes/
+set CODE_OUTPATH=%WORKSPACE%/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/
+
+xcopy /s /e /i /y "%CONF_ROOT%\CustomTemplate\ConfigSystem.cs" "%WORKSPACE%\UnityProject\Assets\GameScripts\HotFix\GameProto\ConfigSystem.cs"
+
+dotnet %LUBAN_DLL% ^
+    -t client ^
+    -c cs-bin ^
+    -d bin^
+    --conf %CONF_ROOT%\luban.conf ^
+    --customTemplateDir %CONF_ROOT%\CustomTemplate\CustomTemplate_Client_LazyLoad ^
+    -x outputCodeDir=%CODE_OUTPATH% ^
+    -x outputDataDir=%DATA_OUTPATH% 
+pause
+

Configs/GameConfig/gen_code_bin_to_server.bat

@@ -0,0 +1,18 @@
+Cd /d %~dp0
+echo %CD%
+
+set WORKSPACE=../../
+set LUBAN_DLL=%WORKSPACE%/Tools/Luban/Luban.dll
+set CONF_ROOT=.
+set DATA_OUTPATH=%WORKSPACE%/Server/GameConfig 
+set CODE_OUTPATH=%WORKSPACE%/Server/Hotfix/Config/GameConfig
+
+dotnet %LUBAN_DLL% ^
+    -t server^
+    -c cs-bin ^
+    -d bin^
+    --conf %CONF_ROOT%\luban.conf ^
+    -x outputCodeDir=%CODE_OUTPATH% ^
+    -x outputDataDir=%DATA_OUTPATH% 
+pause
+

Configs/GameConfig/luban.conf

@@ -0,0 +1,22 @@
+{
+	"groups":
+	[
+		{"names":["c"], "default":true},
+		{"names":["s"], "default":true},
+		{"names":["e"], "default":true}
+	],
+	"schemaFiles":
+	[
+		{"fileName":"Defines", "type":""},
+		{"fileName":"Datas/__tables__.xlsx", "type":"table"},
+		{"fileName":"Datas/__beans__.xlsx", "type":"bean"},
+		{"fileName":"Datas/__enums__.xlsx", "type":"enum"}
+	],
+	"dataDir": "Datas",
+	"targets":
+	[
+		{"name":"server", "manager":"Tables", "groups":["s"], "topModule":"GameConfig"},
+		{"name":"client", "manager":"Tables", "groups":["c"], "topModule":"GameConfig"},
+		{"name":"all", "manager":"Tables", "groups":["c,s,e"], "topModule":"GameConfig"}
+	]
+}

Configs/gen_code_bin_to_project.bat

@@ -1,21 +0,0 @@
-cd /d %~dp0
-set WORKSPACE=..
-
-set GEN_CLIENT=%WORKSPACE%\Tools\Luban.ClientServer\Luban.ClientServer.exe
-set CONF_ROOT=%WORKSPACE%\Configs
-set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas
-set CUSTOM_TEMP=%WORKSPACE%\Configs\CustomTemplate\CustomTemplate_Client
-
-xcopy %CUSTOM_TEMP%\ConfigSystem.cs %WORKSPACE%\UnityProject\Assets\GameScripts\HotFix\GameProto\ConfigSystem.cs /s /e /i /y
-
-%GEN_CLIENT% -j cfg --^
- -d %CONF_ROOT%\Defines\__root__.xml ^
- --input_data_dir %CONF_ROOT%\Excels^
- --output_code_dir %WORKSPACE%/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig ^
- --output_data_dir %WORKSPACE%/UnityProject/Assets/AssetRaw/Configs/bytes/ ^
- --gen_types code_cs_unity_bin,data_bin ^
- -s client 
-
-echo ======== 生成配置文件结束 ========
-
-pause

Configs/gen_code_bin_to_project_lazyload.bat

@@ -1,40 +0,0 @@
-cd /d %~dp0
-set WORKSPACE=..
-
-set GEN_CLIENT=%WORKSPACE%\Tools\Luban.ClientServer\Luban.ClientServer.exe
-set CONF_ROOT=%WORKSPACE%\Configs
-set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas
-set CUSTOM_TEMP=%WORKSPACE%\Configs\CustomTemplate\CustomTemplate_Client_LazyLoad
-
-xcopy %CUSTOM_TEMP%\ConfigSystem.cs %WORKSPACE%\UnityProject\Assets\GameScripts\HotFix\GameProto\ConfigSystem.cs /s /e /i /y
-
-%GEN_CLIENT% --template_search_path %CONF_ROOT%\CustomTemplate\CustomTemplate_Client_LazyLoad -j cfg --^
- -d %CONF_ROOT%\Defines\__root__.xml ^
- --input_data_dir %CONF_ROOT%\Excels^
- --output_code_dir %WORKSPACE%/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig ^
- --output_data_dir %WORKSPACE%/UnityProject/Assets/AssetRaw/Configs/bytes/ ^
- --gen_types data_bin ^
- -s client 
-
-%GEN_CLIENT% --template_search_path %CONF_ROOT%\CustomTemplate\CustomTemplate_Client_LazyLoad -j cfg --^
- -d %CONF_ROOT%\Defines\__root__.xml ^
- --input_data_dir %CONF_ROOT%\Excels^
- --output_code_dir %WORKSPACE%/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig ^
- --output_data_dir ..\GenerateDatas\bidx ^
- --gen_types code_cs_unity_bin,data_bidx ^
- -s client 
-
-echo ======== 生成配置文件结束 ========
-set WORKSPACE=..
-
-set "prefix=Idx_"
-
-for %%a in (%DATA_OUTPUT%\bidx\*) do (
-    ren "%%a" "Idx_%%~nxa"
-)
-
-echo ======== 所有文件已添加前缀 ========
-
-xcopy %DATA_OUTPUT%\bidx\ %WORKSPACE%\UnityProject\Assets\AssetRaw\Configs\bidx\ /s /e /i /y
-
-pause

Configs/gen_code_bin_to_project_unitask.bat

@@ -1,21 +0,0 @@
-cd /d %~dp0
-set WORKSPACE=..
-
-set GEN_CLIENT=%WORKSPACE%\Tools\Luban.ClientServer\Luban.ClientServer.exe
-set CONF_ROOT=%WORKSPACE%\Configs
-set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas
-set CUSTOM_TEMP=%WORKSPACE%\Configs\CustomTemplate\CustomTemplate_Client_UniTask
-
-xcopy %CUSTOM_TEMP%\ConfigSystem.cs %WORKSPACE%\UnityProject\Assets\GameScripts\HotFix\GameProto\ConfigSystem.cs /s /e /i /y
-
-%GEN_CLIENT% --template_search_path %CONF_ROOT%\CustomTemplate\CustomTemplate_Client_UniTask -j cfg --^
- -d %CONF_ROOT%\Defines\__root__.xml ^
- --input_data_dir %CONF_ROOT%\Excels^
- --output_code_dir %WORKSPACE%/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig ^
- --output_data_dir %WORKSPACE%/UnityProject/Assets/AssetRaw/Configs/bytes/ ^
- --gen_types code_cs_unity_bin,data_bin ^
- -s client
-
-echo ======== 生成配置文件结束 ========
-
-pause

Configs/gen_code_bin_to_server.bat

@@ -1,18 +0,0 @@
-cd /d %~dp0
-set WORKSPACE=..
-
-set GEN_CLIENT=%WORKSPACE%\Tools\Luban.ClientServer\Luban.ClientServer.exe
-set CONF_ROOT=%WORKSPACE%\Configs
-set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas
-
-%GEN_CLIENT% --template_search_path %CONF_ROOT%\CustomTemplate\CustomTemplate_Server_Task -j cfg --^
- -d %CONF_ROOT%\Defines\__root__.xml ^
- --input_data_dir %CONF_ROOT%\Excels^
- --output_code_dir %WORKSPACE%/DotNet/Logic/src/Config/GameConfig ^
- --output_data_dir ..\DotNet\Config\GameConfig ^
- --gen_types code_cs_bin,data_bin ^
- -s server
-
-echo ======== 生成配置文件结束 ========
-
-pause

README.md

@@ -33,9 +33,6 @@
 
 #### TEngine是一个简单(新手友好开箱即用)且强大的Unity框架全平台解决方案,对于需要一套上手快、文档清晰、高性能且可拓展性极强的商业级解决方案的开发者或者团队来说是一个很好的选择。
 
-
-## <a href="http://1.12.241.46:5000/"><strong>文档快速入门 »</strong></a>
-
 ## 文档快速预览 - 5分钟
 * [全平台跑通示意](Books/99-各平台运行RunAble.md): 全平台跑通示意。
 * [01_介绍](Books/0-介绍.md): 简单介绍。
@@ -46,27 +43,23 @@
 * [06_对象池模块](Books/3-4-%E5%AF%B9%E8%B1%A1%E6%B1%A0%E6%A8%A1%E5%9D%97.md): 展示对象池模块概览。
 * [07_配置表模块](Books/3-6-%E9%85%8D%E7%BD%AE%E8%A1%A8%E6%A8%A1%E5%9D%97.md): 展示配置表模块概览。
 * [08_流程模块](Books/3-7-%E6%B5%81%E7%A8%8B%E6%A8%A1%E5%9D%97.md): 展示商业化流程模块。
+* [09_UI模块](Books/3-5-UI模块.md): 展示商业化UI模块。
 
 
 ## <strong>为什么要使用TEngine
 0. 开箱即用5分钟即可上手整套开发流程，代码整洁，思路清晰，功能强大。高内聚低耦合。您可以很轻易的把您不需要的模块进行移除替换。
 1. 严格按照商业要求使用次世代的HybridClr进行热更新、最佳的Luban配置表(TEngine支持懒加载、异步加载、同步加载配置。)、百万DAU游戏验证过的YooAsset资源框架（框架管理资源引用与释放。），全平台热更新流程已跑通。
 2. 严格按照商业化流程执行的热更新、商业化的UI开发流程、以及资源管理等等，设计并实现了YooAsset资源自动释放、支持LRU、ARC严格管理资源内存。
-3. C#双端解决方案，服务器使用Fantasy，是一套源于ETServer，但极为简洁，性能更强，更好上手的一套商业级服务器框架。
-4. 支持全平台，已有项目使用TEngine上架Steam、Wechat-minigame、AppStore。
+3. 支持全平台，已有项目使用TEngine上架Steam、Wechat-minigame、AppStore。
 
-## <strong>资源重要拓展概念
-* AssetReference (资源引用标识) 通用加载资源的时候绑定一个引用标识使你无需关心手动Dispose资源句柄。
+## <strong>最新的Demo飞机大战位于demo分支
 
-* AssetGroup（资源组数据）进行资源分组绑定管理内存中的生命周期资源生命周期托管给资源组的根节点进行Dispose。
+## <strong>服务器相关
+TEngine本身为纯净的客户端。不强绑定任何服务器。但是个人开发以及中小型公司开发双端则推荐C#服务器。
 
-* LruCacheTable (Least Recently Used Cache缓存表)
-
-* ArcCacheTable (Adaptive Replacement Cache缓存表)
-
-## <strong>为什么服务器使用C#
 Net Core现在已经更新到了8.0的版本，在性能和设计上其实是远超JAVA和GO。在JAVAER还在为JVM更新和添加更多功能时，其实他们已经被国内大环境所包围了，看不到.Net Core的性能之强，组件化的结构。国内大环境是JAVA和GO的天下这个不可否认，但是国外C#也确实很多。其实.Net Core最大的问题是大多数自己人都不知道他的优点(AOT、JIT混合编译、热重载等等)，甚至很多守旧派抵制core。GO喜欢吹性能，但其实目前来看，除了协程的轻量级，大多数性能测试其实不如JAVA和.Net。简单可以说出了C++的性能以外，Net Core其实都打得过。
-<strong>当然作为商业级解决方案服务器的耦合度也极低，如果不喜欢您也可以很轻松直接移除替换成你的服务器。</strong>
+
+需要服务器可以合并<a href="https://github.com/ALEXTANGXIAO/GameNetty"><strong>GameNetty</strong></a>过来，或者分支Fantasy为接好的带有Fantasy服务器的双端分支。
 
 ## <strong>项目结构概览
 ```
@@ -85,6 +78,11 @@ Assets
         └── GameLogic   // 游戏业务逻辑程序集 [Dll]
             ├── GameApp.cs                  // 热更主入口
             └── GameApp_RegisterSystem.cs   // 热更主入口注册系统   
+
+
+TEngine
+├── Editor              // TEngine编辑器核心代码
+└── Runtime             // TEngine运行时核心代码
 ```
 
  - 必要：项目使用了以下第三方插件，请自行购买导入：
@@ -99,7 +97,14 @@ Assets
 
 #### <a href="https://github.com/focus-creative-games/hybridclr"><strong>HybridCLR</strong></a> - 特性完整、零成本、高性能、低内存的近乎完美的Unity全平台原生c#热更方案
 
-#### <a href="https://github.com/qq362946/Fantasy"><strong>Fantasy</strong></a> - Fantasy是一套源于ETServer但极为简洁，性能更强，更好上手的一套商业级服务器框架。
+#### <a href="https://github.com/qq362946/Fantasy"><strong>Fantasy</strong></a> - Fantasy是一套源于ETServer但极为简洁，更好上手的一套商业级服务器框架。
+
+#### <a href="https://github.com/ALEXTANGXIAO/GameNetty"><strong>GameNetty</strong></a> - GameNetty是一套源于ETServer，首次拆分最新的ET8.1的前后端解决方案（包），客户端最精简大约750k，完美做成包的形式，几乎零成本 无侵入的嵌入进你的框架。
 
 ## <strong>交流群
 ### <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MzOcQIzGVLQ5AC5LHaqqA3h_F6lZ_DX4&authKey=LctqAWGHkJ7voQvuj1oaSe5tsGrc1XmQG3U4QniieGUlxY3lC7FtDIpEvPOX0vT8&noverify=0&group_code=862987645">群   号：862987645 </strong></a>
+
+
+## <strong>Buy me a 奶茶.
+
+[您的赞助会让我们做得更快更好，如果觉得TEngine对您有帮助，不妨请我可爱的女儿买杯奶茶吧~](Books/Donate.md)

Tools/Luban.ClientServer/about.txt

@@ -1 +0,0 @@
-目前使用luban-classic，请自行导入

Tools/Luban/about.txt

@@ -0,0 +1 @@
+使用luban-next, 请前往Tools/build-luban编译或者自行导入

UnityProject/.gitignore

@@ -90,6 +90,7 @@ Sandbox/
 # [Aa]ssets/Plugins/Sirenix.meta
 
 #YooAssets
+package/
 yoo/
 [Aa]ssets/TEngine/AssetSetting/Resources/BuiltinFileManifest.asset
 [Aa]ssets/TEngine/AssetSetting/Resources/BuiltinFileManifest.asset.meta

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas

@@ -1,14 +1,13 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!612988286 &4096168566840163508
-SpriteAtlasAsset:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: UIRaw_Atlas_Common
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
+  m_EditorData:
     serializedVersion: 2
     textureSettings:
       serializedVersion: 2
@@ -34,6 +33,30 @@ SpriteAtlasAsset:
       m_Overridden: 1
       m_AndroidETC2FallbackOverride: 0
       m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 3
+      m_BuildTarget: Android
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 100
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    - serializedVersion: 3
+      m_BuildTarget: WebGL
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 1
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
     packingSettings:
       serializedVersion: 2
       padding: 2
@@ -50,6 +73,19 @@ SpriteAtlasAsset:
     - {fileID: 21300000, guid: d623a2b7e069a4c4592d3da48f476189, type: 3}
     - {fileID: 21300000, guid: 57e4117f4cd6ae54284898652e70d553, type: 3}
     bindAsDefault: 1
-    isAtlasV2: 1
+    isAtlasV2: 0
     cachedData: {fileID: 0}
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: 2761fc23b4aa7e34187ac5ffbc3fad9b, type: 3}
+  - {fileID: 21300000, guid: f9a06e163014f4f46b14f4499d3e7240, type: 3}
+  - {fileID: 21300000, guid: d623a2b7e069a4c4592d3da48f476189, type: 3}
+  - {fileID: 21300000, guid: 57e4117f4cd6ae54284898652e70d553, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - red_button
+  - blue_button
+  - white_background
+  - white_button
+  m_RenderDataMap: {}
+  m_Tag: UIRaw_Atlas_Common
   m_IsVariant: 0

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c91b064c2cd7a34448ae0d6d7ee58e7f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Assets/Editor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 40c870edb8e84064a8be2d56acb8bbc0
+guid: 3b549395c8849674b9cafbbf4c694e57
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

UnityProject/Assets/Editor/I2Localization.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6a824de3af698c34bb4343dbb911498b
+guid: 4c9eb26aee01e8643bd4e6dc965d3366
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

UnityProject/Assets/Editor/I2Localization/I2Languages.asset

@@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f0b0c553be8edd4682e9180fdd13e37, type: 3}
+  m_Name: I2Languages
+  m_EditorClassIdentifier: 
+  mSource:
+    UserAgreesToHaveItOnTheScene: 0
+    UserAgreesToHaveItInsideThePluginsFolder: 0
+    GoogleLiveSyncIsUptoDate: 1
+    mTerms: []
+    CaseInsensitiveTerms: 0
+    OnMissingTranslation: 1
+    mTerm_AppName: 
+    mLanguages: []
+    IgnoreDeviceLanguage: 0
+    _AllowUnloadingLanguages: 0
+    Google_WebServiceURL: 
+    Google_SpreadsheetKey: 
+    Google_SpreadsheetName: 
+    Google_LastUpdatedVersion: 
+    Google_Password: change_this
+    GoogleUpdateFrequency: 3
+    GoogleInEditorCheckFrequency: 2
+    GoogleUpdateSynchronization: 1
+    GoogleUpdateDelay: 0
+    Assets: []
+    Spreadsheet_LocalFileName: 
+    Spreadsheet_LocalCSVSeparator: ','
+    Spreadsheet_LocalCSVEncoding: utf-8
+    Spreadsheet_SpecializationAsRows: 1
+    Spreadsheet_SortRows: 1

UnityProject/Assets/Editor/I2Localization/I2Languages.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b763f43bfb633944aa8955535b965c1f
+guid: f069f2f03dfa55843a74dedc551eefb2
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

UnityProject/Assets/GameScripts/HotFix/GameBase/Singleton.cs

@@ -1,14 +1,14 @@
-using TEngine;
+using System.Diagnostics;
 
 namespace GameBase
 {
     /// <summary>
-    /// 通用单例。
+    /// 全局对象必须继承于此。
     /// </summary>
-    /// <typeparam name="T">泛型T。</typeparam>
-    public class Singleton<T> where T : new()
+    /// <typeparam name="T">子类类型。</typeparam>
+    public abstract class Singleton<T> : ISingleton where T : Singleton<T>, new()
     {
-        private static T _instance;
+        protected static T _instance = default(T);
 
         public static T Instance
         {
@@ -17,11 +17,43 @@ namespace GameBase
                 if (null == _instance)
                 {
                     _instance = new T();
-                    Log.Assert(_instance != null);
+                    _instance.Init();
+                    SingletonSystem.Retain(_instance);
                 }
 
                 return _instance;
             }
         }
+
+        public static bool IsValid => _instance != null;
+
+        protected Singleton()
+        {
+#if UNITY_EDITOR
+            string st = new StackTrace().ToString();
+            // using const string to compare simply
+            if (!st.Contains("GameBase.Singleton`1[T].get_Instance"))
+            {
+                UnityEngine.Debug.LogError($"请必须通过Instance方法来实例化{typeof(T).FullName}类");
+            }
+#endif
+        }
+
+        protected virtual void Init()
+        {
+        }
+
+        public virtual void Active()
+        {
+        }
+
+        public virtual void Release()
+        {
+            if (_instance != null)
+            {
+                SingletonSystem.Release(_instance);
+                _instance = null;
+            }
+        }
     }
 }

UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonBehaviour.cs

@@ -0,0 +1,108 @@
+using TEngine;
+using UnityEngine;
+
+namespace GameBase
+{
+    /// <summary>
+    /// 全局MonoBehavior必须继承于此
+    /// </summary>
+    /// <typeparam name="T">子类类型</typeparam>
+    public class SingletonBehaviour<T> : MonoBehaviour where T : SingletonBehaviour<T>
+    {
+        private static T _instance;
+
+        private void Awake()
+        {
+            if (CheckInstance())
+            {
+                OnLoad();
+            }
+        }
+
+        private bool CheckInstance()
+        {
+            if (this == Instance)
+            {
+                return true;
+            }
+            Object.Destroy(gameObject);
+            return false;
+        }
+
+        protected virtual void OnLoad()
+        {
+
+        }
+
+        protected virtual void OnDestroy()
+        {
+            Release();
+        }
+
+        /// <summary>
+        /// 判断对象是否有效
+        /// </summary>
+        public static bool IsValid
+        {
+            get
+            {
+                return _instance != null;
+            }
+        }
+
+        public static T Active()
+        {
+            return Instance;
+        }
+
+        public static void Release()
+        {
+            if (_instance != null)
+            {
+                SingletonSystem.Release(_instance.gameObject);
+                _instance = null;   
+            }
+        }
+
+        /// <summary>
+        /// 实例
+        /// </summary>
+        public static T Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    System.Type thisType = typeof(T);
+                    string instName = thisType.Name;
+                    GameObject go = SingletonSystem.GetGameObject(instName);
+                    if (go == null)
+                    {
+                        go = GameObject.Find($"/{instName}");
+                        if (go == null)
+                        {
+                            go = new GameObject(instName);
+                            go.transform.position = Vector3.zero;
+                        }
+                        SingletonSystem.Retain(go);
+                    }
+
+                    if (go != null)
+                    {
+                        _instance = go.GetComponent<T>();
+                        if (_instance == null)
+                        {
+                            _instance = go.AddComponent<T>();
+                        }
+                    }
+
+                    if(_instance == null)
+                    {
+                        Log.Error($"Can't create SingletonBehaviour<{typeof(T)}>");
+                    }
+                }
+                return _instance;
+            }
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonBehaviour.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bc365e281d234e61891bf9f922a0897a
+timeCreated: 1715574965

UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonSystem.cs

@@ -0,0 +1,141 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace GameBase
+{
+    public interface ISingleton
+    {
+        /// <summary>
+        /// 激活接口，通常用于在某个时机手动实例化
+        /// </summary>
+        void Active();
+
+        /// <summary>
+        /// 释放接口
+        /// </summary>
+        void Release();
+    }
+
+    /// <summary>
+    /// 框架中的全局对象与Unity场景依赖相关的DontDestroyOnLoad需要统一管理，方便重启游戏时清除工作
+    /// </summary>
+    public static class SingletonSystem
+    {
+        private static List<ISingleton> _singletons;
+        private static Dictionary<string, GameObject> _gameObjects;
+
+        public static void Retain(ISingleton go)
+        {
+            if (_singletons == null)
+            {
+                _singletons = new List<ISingleton>();
+            }
+
+            _singletons.Add(go);
+        }
+
+        public static void Retain(GameObject go)
+        {
+            if (_gameObjects == null)
+            {
+                _gameObjects = new Dictionary<string, GameObject>();
+            }
+
+            if (_gameObjects.TryAdd(go.name, go))
+            {
+                if (Application.isPlaying)
+                {
+                    Object.DontDestroyOnLoad(go);
+                }
+            }
+        }
+
+        public static void Release(GameObject go)
+        {
+            if (_gameObjects != null && _gameObjects.ContainsKey(go.name))
+            {
+                _gameObjects.Remove(go.name);
+                Object.Destroy(go);
+            }
+        }
+
+        public static void Release(ISingleton go)
+        {
+            if (_singletons != null && _singletons.Contains(go))
+            {
+                _singletons.Remove(go);
+            }
+        }
+
+        public static void Release()
+        {
+            if (_gameObjects != null)
+            {
+                foreach (var item in _gameObjects)
+                {
+                    Object.Destroy(item.Value);
+                }
+
+                _gameObjects.Clear();
+            }
+
+            if (_singletons != null)
+            {
+                for (int i = _singletons.Count -1; i >= 0; i--)
+                {
+                    _singletons[i].Release();
+                }
+
+                _singletons.Clear();
+            }
+
+            Resources.UnloadUnusedAssets();
+        }
+
+        public static GameObject GetGameObject(string name)
+        {
+            GameObject go = null;
+            if (_gameObjects != null)
+            {
+                _gameObjects.TryGetValue(name, out go);
+            }
+            
+            return go;
+        }
+
+        internal static bool ContainsKey(string name)
+        {
+            if (_gameObjects != null)
+            {
+                return _gameObjects.ContainsKey(name);
+            }
+
+            return false;
+        }
+
+        public static void Restart()
+        {
+            if (Camera.main != null)
+            {
+                Camera.main.gameObject.SetActive(false);
+            }
+
+            Release();
+            SceneManager.LoadScene(0);
+        }
+
+        internal static ISingleton GetSingleton(string name)
+        {
+            for (int i = 0; i < _singletons.Count; ++i)
+            {
+                if (_singletons[i].ToString() == name)
+                {
+                    return _singletons[i];
+                }
+            }
+
+            return null;
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameBase/SingletonSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4ad00b596d0743a4b04591fe52087d0f
+timeCreated: 1715574577

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 40a878a415f34e7a855fc4916bbb8e6b
+timeCreated: 1702479104

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/Attribute.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1dcaa491f139438dbd963d8bbf0dba85
+timeCreated: 1702385397

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/Attribute/BaseAttribute.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace GameLogic
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class BaseAttribute: Attribute
+    {
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/Attribute/BaseAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 819c4eaddddd4646a100da2e3f19c3c7
+timeCreated: 1702385397

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/CodeTypes.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace GameLogic
+{
+    public class CodeTypes
+    {
+        private static CodeTypes _instance;
+        public static CodeTypes Instance => _instance ??= new CodeTypes();
+
+        private readonly Dictionary<string, Type> _allTypes = new();
+        private readonly UnOrderMultiMapSet<Type, Type> _types = new();
+        
+        public void Init(Assembly[] assemblies)
+        {
+            Dictionary<string, Type> addTypes = GetAssemblyTypes(assemblies);
+            foreach ((string fullName, Type type) in addTypes)
+            {
+                _allTypes[fullName] = type;
+                
+                if (type.IsAbstract)
+                {
+                    continue;
+                }
+                
+                // 记录所有的有BaseAttribute标记的的类型
+                object[] objects = type.GetCustomAttributes(typeof(BaseAttribute), true);
+
+                foreach (object o in objects)
+                {
+                    _types.Add(o.GetType(), type);
+                }
+            }
+        }
+
+        public HashSet<Type> GetTypes(Type systemAttributeType)
+        {
+            if (!_types.ContainsKey(systemAttributeType))
+            {
+                return new HashSet<Type>();
+            }
+
+            return _types[systemAttributeType];
+        }
+
+        public Dictionary<string, Type> GetTypes()
+        {
+            return _allTypes;
+        }
+
+        public Type GetType(string typeName)
+        {
+            return _allTypes[typeName];
+        }
+        
+        public static Dictionary<string, Type> GetAssemblyTypes(params Assembly[] args)
+        {
+            Dictionary<string, Type> types = new Dictionary<string, Type>();
+
+            foreach (Assembly ass in args)
+            {
+                foreach (Type type in ass.GetTypes())
+                {
+                    if (type.FullName != null)
+                    {
+                        types[type.FullName] = type;
+                    }
+                }
+            }
+
+            return types;
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/CodeTypes.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 01fdfc4515314c579523ac3716005210
+timeCreated: 1702385429

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/UnOrderMultiMapSet.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+
+namespace GameLogic
+{
+    public class UnOrderMultiMapSet<TKey, TValue>: Dictionary<TKey, HashSet<TValue>>
+    {
+        public new HashSet<TValue> this[TKey t]
+        {
+            get
+            {
+                HashSet<TValue> set;
+                if (!TryGetValue(t, out set))
+                {
+                    set = new HashSet<TValue>();
+                }
+                return set;
+            }
+        }
+        
+        public Dictionary<TKey, HashSet<TValue>> GetDictionary()
+        {
+            return this;
+        }
+        
+        public void Add(TKey t, TValue k)
+        {
+            HashSet<TValue> set;
+            TryGetValue(t, out set);
+            if (set == null)
+            {
+                set = new HashSet<TValue>();
+                base[t] = set;
+            }
+            set.Add(k);
+        }
+
+        public bool Remove(TKey t, TValue k)
+        {
+            HashSet<TValue> set;
+            TryGetValue(t, out set);
+            if (set == null)
+            {
+                return false;
+            }
+            if (!set.Remove(k))
+            {
+                return false;
+            }
+            if (set.Count == 0)
+            {
+                Remove(t);
+            }
+            return true;
+        }
+
+        public bool Contains(TKey t, TValue k)
+        {
+            HashSet<TValue> set;
+            TryGetValue(t, out set);
+            if (set == null)
+            {
+                return false;
+            }
+            return set.Contains(k);
+        }
+
+        public new int Count
+        {
+            get
+            {
+                int count = 0;
+                foreach (KeyValuePair<TKey,HashSet<TValue>> kv in this)
+                {
+                    count += kv.Value.Count;
+                }
+                return count;
+            }
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CodeTypes/UnOrderMultiMapSet.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b798f0c1317c4caf9ace168f07b51d4f
+timeCreated: 1702385485

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/RedNote/RedNoteBehaviour.cs

@@ -171,7 +171,7 @@ namespace GameLogic
             CurState = false;
         }
 
-        public override void OnDestroy()
+        protected override void OnDestroy()
         {
             RemoveNotifyBind();
         }

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/RedNote/RedNoteMgr.cs

@@ -516,7 +516,7 @@ namespace GameLogic
         {
             if (paramList is { Count: > 0 })
             {
-                return false;
+                return true;
             }
 
             return false;

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/RedNote/RedNoteWidget.cs

@@ -7,14 +7,14 @@ namespace GameLogic
     public class RedNoteWidget : UIWidget
     {
         #region 脚本工具生成的代码
-        public override void ScriptGenerator()
+        protected override void ScriptGenerator()
         {
         }
         #endregion
 
         private Image m_image;
         public RedNoteBehaviour m_redNote;
-        public override void OnCreate()
+        protected override void OnCreate()
         {
             m_redNote = CreateWidget<RedNoteBehaviour>(gameObject);
             m_image = gameObject.GetComponent<Image>();
@@ -42,10 +42,10 @@ namespace GameLogic
 
         public void SetSprite(string sprite)
         {
-            m_image.SetSprite(sprite);
+            // m_image.SetSprite(sprite);
         }
 
-        public override void OnUpdate()
+        protected override void OnUpdate()
         {
             /*if (!m_redNote.CurState)
             {

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2de5a58f37a4ae64e804f150144da809
+guid: 123e7155051957847883c574bf957c7f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader/ActorShaderGroup.cs

@@ -0,0 +1,49 @@
+using UnityEngine;
+
+namespace TEngine
+{
+    /// <summary>
+    /// 封装一个角色可能用到的各种shader场景。
+    /// </summary>
+    class ActorShaderGroup
+    {
+        private readonly TShader[] _allShader = new TShader[(int)ActorShaderEnvType.EnvTypeMax];
+
+        /// <summary>
+        /// 增加Shader到角色Shader分组。
+        /// </summary>
+        /// <param name="shaderType">当前环境类型。</param>
+        /// <param name="shader">TShader。</param>
+        public void AddShader(ActorShaderEnvType shaderType, TShader shader)
+        {
+            _allShader[(int)shaderType] = shader;
+        }
+
+        /// <summary>
+        /// 根据当前环境获取Shader。
+        /// </summary>
+        /// <param name="type">当前环境类型。</param>
+        /// <returns>TShader。</returns>
+        public TShader GetShader(ActorShaderEnvType type)
+        {
+            return _allShader[(int)type];
+        }
+
+        /// <summary>
+        /// 判断是否符合shader集合。
+        /// </summary>
+        /// <param name="shader">Shader实例。</param>
+        /// <returns>是否符合。</returns>
+        public bool IsMatch(Shader shader)
+        {
+            foreach (var dodShader in _allShader)
+            {
+                if (dodShader != null && dodShader.Shader == shader)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader/ActorShaderGroup.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 79b6e5be73e14c929b6a3b4a980976ac
+timeCreated: 1701916950

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader/ActorShaderMgr.cs

@@ -0,0 +1,117 @@
+using GameBase;
+using UnityEngine;
+
+namespace TEngine
+{
+    enum ActorShaderGroupType
+    {
+        /// <summary>
+        /// 通用的角色shader
+        /// </summary>
+        Brdf = 0,
+
+        /// <summary>
+        /// 眼睛
+        /// </summary>
+        BrdfEye,
+
+        ///可能后面扩展，比如特效的特殊角色材质
+        GroupMax,
+    }
+
+    enum ActorShaderEnvType
+    {
+        /// <summary>
+        /// 游戏内场景默认模型，不带阴影，不带xray，不透明效果
+        /// </summary>
+        EnvNormal = 0,
+
+        /// <summary>
+        /// 展示场景
+        /// </summary>
+        EnvShow,
+
+        /// <summary>
+        /// 带阴影
+        /// </summary>
+        EnvShadow,
+
+        /// <summary>
+        /// 带xray，默认也带Shadow
+        /// </summary>
+        EnvXRay,
+
+        /// <summary>
+        /// 透明渐隐效果
+        /// </summary>
+        EnvAlphaFade,
+
+        /// <summary>
+        /// 展示场景没shadow
+        /// </summary>
+        EnvShow_NoShadow,
+
+        EnvTypeMax
+    }
+
+    /// <summary>
+    /// 角色Shader管理器。
+    /// </summary>
+    class ActorShaderMgr : Singleton<ActorShaderMgr>
+    {
+        private readonly ActorShaderGroup[] _allShaderGroup = new ActorShaderGroup[(int)ActorShaderGroupType.GroupMax];
+
+        public ActorShaderMgr()
+        {
+            CreateBrdfShader();
+        }
+
+        /// <summary>
+        /// 根据当前Render查找角色的Shader分组。
+        /// </summary>
+        /// <param name="render">Render。</param>
+        /// <returns>角色的Shader分组。</returns>
+        public ActorShaderGroup FindShaderGroup(Renderer render)
+        {
+            var sharedMat = render.sharedMaterial;
+            if (sharedMat == null)
+            {
+                return null;
+            }
+
+            var shader = sharedMat.shader;
+            foreach (var group in _allShaderGroup)
+            {
+                if (group != null && group.IsMatch(shader))
+                {
+                    return group;
+                }
+            }
+            return null;
+        }
+
+        private void CreateBrdfShader()
+        {
+            //通用的效果
+            var actorShader = new ActorShaderGroup();
+            actorShader.AddShader(ActorShaderEnvType.EnvNormal, new TShader("TEngine/Actor/ActorBrdf",shaderLocation:"ActorBrdf"));
+            actorShader.AddShader(ActorShaderEnvType.EnvShow, new TShader("TEngine/Actor/Show/ActorBrdf",shaderLocation:"ActorBrdf_Show"));
+            actorShader.AddShader(ActorShaderEnvType.EnvShow_NoShadow, new TShader("TEngine/Actor/Show/ActorBrdf_NoShadow",shaderLocation:"ActorBrdf_NoShadow"));
+            actorShader.AddShader(ActorShaderEnvType.EnvShadow, new TShader("TEngine/Actor/ActorBrdf",shaderLocation:"ActorBrdf_Normal"));
+            actorShader.AddShader(ActorShaderEnvType.EnvXRay, new TShader("TEngine/Actor/X-Ray",shaderLocation:"X-Ray"));
+            actorShader.AddShader(ActorShaderEnvType.EnvAlphaFade, new TShader("TEngine/Actor/Fade/ActorBrdf",shaderLocation:"ActorBrdf_Fade"));
+            _allShaderGroup[(int)ActorShaderGroupType.Brdf] = actorShader;
+
+
+            //眼睛效果
+            actorShader = new ActorShaderGroup();
+            actorShader.AddShader(ActorShaderEnvType.EnvNormal, new TShader("TEngine/Actor/ActorEye",shaderLocation:"ActorEye"));
+            actorShader.AddShader(ActorShaderEnvType.EnvShow, new TShader("TEngine/Actor/Show/ActorEye",shaderLocation:"ActorEye_Show", "MRT_DISABLE", "MRT_ENABLE"));
+            actorShader.AddShader(ActorShaderEnvType.EnvShadow, new TShader("TEngine/Actor/ActorEye",shaderLocation:"ActorEye"));
+            actorShader.AddShader(ActorShaderEnvType.EnvXRay, new TShader("TEngine/Actor/ActorEye",shaderLocation:"ActorEye"));
+            actorShader.AddShader(ActorShaderEnvType.EnvAlphaFade, new TShader("TEngine/Actor/Fade/ActorEye",shaderLocation:"ActorEye_Fade"));
+            
+            _allShaderGroup[(int)ActorShaderGroupType.BrdfEye] = actorShader;
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader/ActorShaderMgr.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5a38b9b4bee84fabb1ef8db5292a6db6
+timeCreated: 1701916853

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader/TShader.cs

@@ -0,0 +1,154 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace TEngine
+{
+    /// <summary>
+    /// TShader scripts used for all rendering.
+    /// <remarks>统一封装对shader的管理。</remarks>
+    /// </summary>
+    public class TShader
+    {
+        private bool _loaded;
+        private Shader _shader;
+        private readonly string _shaderName;
+        private readonly string _shaderLocation;
+        private readonly List<string> _keywordOn = new List<string>();
+        private readonly List<string> _keywordOff = new List<string>();
+
+        /// <summary>
+        /// Shader scripts used for all rendering.
+        /// </summary>
+        public Shader Shader
+        {
+            get
+            {
+                if (!_loaded)
+                {
+                    _loaded = true;
+                    _shader = FindShader(_shaderLocation,_shaderName);
+
+                    if (_shader == null)
+                    {
+                        Log.Error($"invalid shader path: {_shaderLocation}, shader name {_shaderName}");
+                    }
+                }
+
+                return _shader;
+            }
+        }
+        
+        /// <summary>
+        /// 查找Shader。
+        /// </summary>
+        /// <param name="shaderLocation">Shader定位地址。</param>
+        /// <param name="shaderName">Shader名称。</param>
+        /// <returns>Shader实例。</returns>
+        public static Shader FindShader(string shaderLocation,string shaderName)
+        {
+            Shader shader = GameModule.Resource.LoadAsset<Shader>(shaderLocation);
+            if (shader != null)
+            {
+                return shader;
+            }
+            return Shader.Find(shaderName);
+        }
+
+        /// <summary>
+        /// TShader构造函数。
+        /// </summary>
+        /// <param name="shaderName">shader名称。</param>
+        /// <param name="shaderLocation">shader路径。</param>
+        public TShader(string shaderName, string shaderLocation)
+        {
+            _shaderName = shaderName;
+            _shaderLocation = shaderLocation;
+            _shader = null;
+        }
+
+        /// <summary>
+        /// TShader构造函数。
+        /// </summary>
+        /// <param name="shaderName">shader名称。</param>
+        /// <param name="shaderLocation">shader路径。</param>
+        /// <param name="keywordOn">开启选项。</param>
+        /// <param name="keywordOff">关闭选项。</param>
+        public TShader(string shaderName, string shaderLocation, string keywordOn, string keywordOff)
+        {
+            _shaderName = shaderName;
+            _shaderLocation = shaderLocation;
+            _shader = null;
+            _keywordOn.Add(keywordOn);
+            _keywordOff.Add(keywordOff);
+        }
+
+        /// <summary>
+        /// TShader构造函数。
+        /// </summary>
+        /// <param name="shaderName">shader名称。</param>
+        /// <param name="shaderLocation">shader路径。</param>
+        /// <param name="keywordOn">开启选项。</param>
+        /// <param name="keywordOff">关闭选项。</param>
+        public TShader(string shaderName, string shaderLocation, string[] keywordOn, string[] keywordOff)
+        {
+            _shaderName = shaderName;
+            _shaderLocation = shaderLocation;
+            _shader = null;
+            _keywordOn.AddRange(keywordOn);
+            _keywordOff.AddRange(keywordOff);
+        }
+
+        /// <summary>
+        /// 设置Shader效果。
+        /// </summary>
+        /// <param name="render">渲染对象。</param>
+        public void ApplyRender(Renderer render)
+        {
+            var sharedMat = render.sharedMaterial;
+            if (sharedMat != null)
+            {
+                //copy一份材质
+                sharedMat = render.material;
+                sharedMat.shader = Shader;
+
+                foreach (var keyword in _keywordOff)
+                {
+                    sharedMat.DisableKeyword(keyword);
+                }
+
+                foreach (var keyword in _keywordOn)
+                {
+                    sharedMat.EnableKeyword(keyword);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 清除shader。
+        /// </summary>
+        /// <param name="render">渲染对象。</param>
+        public void ClearRender(Renderer render)
+        {
+            if (_keywordOff.Count <= 0 && _keywordOn.Count <= 0)
+            {
+                return;
+            }
+
+            var sharedMat = render.sharedMaterial;
+            if (sharedMat != null)
+            {
+                //copy一份材质。
+                sharedMat = render.material;
+                for (int k = 0; k < _keywordOn.Count; k++)
+                {
+                    sharedMat.DisableKeyword(_keywordOn[k]);
+                }
+
+                for (int k = 0; k < _keywordOff.Count; k++)
+                {
+                    sharedMat.EnableKeyword(_keywordOff[k]);
+                }
+            }
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/Shader/TShader.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e219233984c14f7d97bc744c07fe13d0
+timeCreated: 1698115491

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/SuperScrollView/Scripts/GridView/LoopGridView.cs

@@ -377,7 +377,7 @@ namespace GameLogic
         private GridItemPool TryCreateItemPool(string itemPrefabName)
         {
             string resPath = itemPrefabName;
-            GameObject go = GameModule.Resource.LoadAsset<GameObject>(resPath, _containerTrans);
+            GameObject go = GameModule.Resource.LoadGameObject(resPath, parent: _containerTrans);
             if (go != null)
             {
                 go.SetActive(false);

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/SuperScrollView/Scripts/ListView/LoopListView.cs

@@ -669,7 +669,7 @@ namespace GameLogic
         private ItemPool TryCreateItemPool(string itemPrefabName)
         {
             string resPath = itemPrefabName;
-            GameObject go = GameModule.Resource.LoadAsset<GameObject>(resPath, _containerTrans);
+            GameObject go = GameModule.Resource.LoadGameObject(resPath, parent: _containerTrans);
             if (go != null)
             {
                 go.SetActive(false);

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/SwitchPage/SwitchTabItem.cs

@@ -55,7 +55,7 @@ namespace GameLogic
             }
         }
 
-        public override void BindMemberProperty()
+        protected override void BindMemberProperty()
         {
             m_selectNode = FindChild("SelectNode");
             m_noSelectNode = FindChild("NoSelectNode");

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UIListBase.cs

@@ -9,10 +9,10 @@ namespace GameLogic
     /// <summary>
     /// UI列表Item
     /// </summary>
-    /// <typeparam name="DataT"></typeparam>
-    public interface IListDataItem<in DataT>
+    /// <typeparam name="TData"></typeparam>
+    public interface IListDataItem<in TData>
     {
-        void SetItemData(DataT d);
+        void SetItemData(TData d);
     }
 
     /// <summary>
@@ -86,7 +86,7 @@ namespace GameLogic
         {
         }
 
-        public override void RegisterEvent()
+        protected override void RegisterEvent()
         {
             base.RegisterEvent();
             AddSelectEvt();
@@ -180,8 +180,7 @@ namespace GameLogic
         /// <param name="n"></param>
         public void SetDatas(List<DataT> dataList, int n = -1)
         {
-            AdjustItemNum(Mathf.Max(0, n >= 0 ? n : (dataList == null ? 0 : (dataList.Count - dataStartOffset))),
-                dataList);
+            AdjustItemNum(Mathf.Max(0, n >= 0 ? n : (dataList == null ? 0 : (dataList.Count - dataStartOffset))), dataList);
         }
 
         /// <summary>
@@ -215,8 +214,7 @@ namespace GameLogic
                 return;
             }
 
-            var listDataItem = item as IListDataItem<DataT>;
-            if (listDataItem != null)
+            if (item is IListDataItem<DataT> listDataItem)
             {
                 listDataItem.SetItemData(GetData(i));
             }
@@ -271,8 +269,7 @@ namespace GameLogic
 
             var preIndex = selectIndex;
             m_selectIndex = i;
-            var item = GetItem(preIndex) as IListSelectItem;
-            if (item != null)
+            if (GetItem(preIndex) is IListSelectItem item)
             {
                 item.SetSelected(false);
             }
@@ -282,12 +279,19 @@ namespace GameLogic
             {
                 item.SetSelected(true);
             }
-
+            UpdateSnapTargetItem();
             if (triggerEvt && funcOnSelectChange != null)
             {
                 funcOnSelectChange.Invoke();
             }
         }
+        
+        /// <summary>
+        /// 刷新Snap
+        /// </summary>
+        protected virtual void UpdateSnapTargetItem()
+        {
+        }
 
         /// <summary>
         /// 获取当前选中的数据
@@ -318,6 +322,11 @@ namespace GameLogic
         {
             return null;
         }
+        
+        /// <summary>
+        /// 点击选择
+        /// </summary>
+        public bool SelectByClick = true;
 
         /// <summary>
         /// item被点击
@@ -331,7 +340,10 @@ namespace GameLogic
                 funcOnItemClick.Invoke(i);
             }
 
-            selectIndex = i;
+            if (SelectByClick)
+            {
+                selectIndex = i;
+            }
         }
     }
 }

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UIListWidget.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using TEngine;
+
+namespace GameLogic
+{
+    /// <summary>
+    /// 普通UI列表。
+    /// </summary>
+    public class UIListWidget<TItem, TData> : UIListBase<TItem, TData> where TItem : UIWidget, new()
+    {
+        /// <summary>
+        /// item列表。
+        /// </summary>
+        protected List<TItem> m_items = new List<TItem>();
+
+        /// <summary>
+        /// item列表。
+        /// </summary>
+        public List<TItem> items => m_items;
+
+        /// <summary>
+        /// 设置显示数据。
+        /// </summary>
+        /// <param name="n"></param>
+        /// <param name="datas"></param>
+        /// <param name="funcItem"></param>
+        protected override void AdjustItemNum(int n, List<TData> datas = null, Action<TItem, int> funcItem = null)
+        {
+            base.AdjustItemNum(n, datas, funcItem);
+            AdjustIconNum(m_items, n, gameObject.transform, itemBase);
+            UpdateList(funcItem);
+        }
+
+        /// <summary>
+        /// 刷新列表。
+        /// </summary>
+        /// <param name="funcItem"></param>
+        protected void UpdateList(Action<TItem, int> funcItem = null)
+        {
+            for (var i = 0; i < m_items.Count; i++)
+            {
+                UpdateListItem(m_items[i], i, funcItem);
+            }
+        }
+
+        /// <summary>
+        /// 获取item
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        public override TItem GetItem(int i)
+        {
+            return i >= 0 && i < m_items.Count ? m_items[i] : null;
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UIListWidget.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 96f732d895e94fbc99c904d66ca844ca
+timeCreated: 1701844130

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UILoopGridWidget.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TEngine;
 using UnityEngine;
 
 namespace GameLogic
@@ -17,7 +18,7 @@ namespace GameLogic
         /// <summary>
         /// Item字典
         /// </summary>
-        private Dictionary<int, TItem> m_itemCache = new Dictionary<int, TItem>();
+        private GameFrameworkDictionary<int, TItem> m_itemCache = new GameFrameworkDictionary<int, TItem>();
 
         /// <summary>
         /// 计算偏差后的ItemList
@@ -29,19 +30,19 @@ namespace GameLogic
         /// </summary>
         public List<TItem> items => m_items;
 
-        public override void BindMemberProperty()
+        protected override void BindMemberProperty()
         {
             base.BindMemberProperty();
             LoopRectView = rectTransform.GetComponent<LoopGridView>();
         }
 
-        public override void OnCreate()
+        protected override void OnCreate()
         {
             base.OnCreate();
             LoopRectView.InitGridView(0, OnGetItemByIndex);
         }
 
-        public override void OnDestroy()
+        protected override void OnDestroy()
         {
             base.OnDestroy();
             m_itemCache.Clear();
@@ -65,6 +66,7 @@ namespace GameLogic
             LoopRectView.SetListItemCount(n);
             LoopRectView.RefreshAllShownItem();
             m_tpFuncItem = null;
+            UpdateAllItemSelect();
         }
 
         /// <summary>
@@ -147,11 +149,20 @@ namespace GameLogic
        /// <summary>
        /// 获取item
        /// </summary>
-       /// <param name="i"></param>
+       /// <param name="index"></param>
        /// <returns></returns>
-        public override TItem GetItem(int i)
+        public override TItem GetItem(int index)
         {
-            return i >= 0 && i < m_items.Count ? m_items[i] : null;
+            for (var i = 0; i < m_itemCache.Count; i++)
+            {
+                
+                var item = m_itemCache.GetValueByIndex(i);
+                if (item.GetItemIndex() == index)
+                {
+                    return item;
+                }
+            }
+            return null;
         }
 
        /// <summary>
@@ -163,9 +174,35 @@ namespace GameLogic
             m_items.Clear();
             for (int i = 0; i < m_itemCache.Count; i++)
             {
-                m_items.Add(m_itemCache[i]);
+                m_items.Add(m_itemCache.GetValueByIndex(i));
             }
             return m_items;
         }
+       
+       /// <summary>
+       /// 获取Item。
+       /// </summary>
+       /// <param name="index">索引。</param>
+       /// <returns>TItem。</returns>
+       public TItem GetItemByIndex(int index)
+       {
+           return m_itemCache.GetValueByIndex(index);
+       }
+       
+       /// <summary>
+       /// 刷新所有item选中状态
+       /// </summary>
+       /// <returns></returns>
+       public void UpdateAllItemSelect()
+       {
+           var index = selectIndex;
+           for (var i = 0; i < m_itemCache.Count; i++)
+           {
+               if (m_itemCache.GetValueByIndex(i) is IListSelectItem item)
+               {
+                   item.SetSelected(item.GetItemIndex() == index);
+               }
+           }
+       }
     }
 }

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UILoopListViewWidget.cs

@@ -8,15 +8,15 @@ namespace GameLogic
     {
         public LoopListView LoopRectView { private set; get; }
 
-        private Dictionary<int, T> m_itemCache = new Dictionary<int, T>();
+        private GameFrameworkDictionary<int, T> m_itemCache = new GameFrameworkDictionary<int, T>();
 
-        public override void BindMemberProperty()
+        protected override void BindMemberProperty()
         {
             base.BindMemberProperty();
             LoopRectView = this.rectTransform.GetComponent<LoopListView>();
         }
 
-        public override void OnDestroy()
+        protected override void OnDestroy()
         {
             base.OnDestroy();
             m_itemCache.Clear();
@@ -71,9 +71,8 @@ namespace GameLogic
             List<T> list = new List<T>();
             for (int i = 0; i < m_itemCache.Count; i++)
             {
-                list.Add(m_itemCache[i]);
+                list.Add(m_itemCache.GetValueByIndex(i));
             }
-
             return list;
         }
 
@@ -85,11 +84,11 @@ namespace GameLogic
         /// <summary>
         /// 获取Item。
         /// </summary>
-        /// <param name="index"></param>
-        /// <returns></returns>
+        /// <param name="index">索引。</param>
+        /// <returns>TItem。</returns>
         public T GetItemByIndex(int index)
         {
-            return m_itemCache[index];
+            return m_itemCache.GetValueByIndex(index);
         }
     }
 }

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/UI/Widget/UILoopListWidget.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TEngine;
 using UnityEngine;
 
 namespace GameLogic
@@ -16,8 +17,9 @@ namespace GameLogic
 
         /// <summary>
         /// Item字典
+        /// <remarks>Key => GameObjectHashCode | Value => TItem.</remarks>
         /// </summary>
-        private Dictionary<int, TItem> m_itemCache = new Dictionary<int, TItem>();
+        private GameFrameworkDictionary<int, TItem> m_itemCache = new GameFrameworkDictionary<int, TItem>();
 
         /// <summary>
         /// 计算偏差后的ItemList
@@ -29,19 +31,19 @@ namespace GameLogic
         /// </summary>
         public List<TItem> items => m_items;
 
-        public override void BindMemberProperty()
+        protected override void BindMemberProperty()
         {
             base.BindMemberProperty();
             LoopRectView = rectTransform.GetComponent<LoopListView>();
         }
 
-        public override void OnCreate()
+        protected override void OnCreate()
         {
             base.OnCreate();
             LoopRectView.InitListView(0, OnGetItemByIndex);
         }
 
-        public override void OnDestroy()
+        protected override void OnDestroy()
         {
             base.OnDestroy();
             m_itemCache.Clear();
@@ -65,6 +67,7 @@ namespace GameLogic
             LoopRectView.SetListItemCount(n);
             LoopRectView.RefreshAllShownItem();
             m_tpFuncItem = null;
+            UpdateAllItemSelect();
         }
 
         /// <summary>
@@ -145,11 +148,20 @@ namespace GameLogic
        /// <summary>
        /// 获取item
        /// </summary>
-       /// <param name="i"></param>
+       /// <param name="index"></param>
        /// <returns></returns>
-        public override TItem GetItem(int i)
+        public override TItem GetItem(int index)
         {
-            return i >= 0 && i < m_items.Count ? m_items[i] : null;
+            for (var i = 0; i < m_itemCache.Count; i++)
+            {
+                
+                var item = m_itemCache.GetValueByIndex(i);
+                if (item.GetItemIndex() == index)
+                {
+                    return item;
+                }
+            }
+            return null;
         }
 
        /// <summary>
@@ -161,7 +173,7 @@ namespace GameLogic
             m_items.Clear();
             for (int i = 0; i < m_itemCache.Count; i++)
             {
-                m_items.Add(m_itemCache[i]);
+                m_items.Add(m_itemCache.GetValueByIndex(i));
             }
             return m_items;
         }
@@ -174,5 +186,40 @@ namespace GameLogic
         {
             return LoopRectView.GetItemStartIndex();
         }
+        
+        /// <summary>
+        /// 获取Item。
+        /// </summary>
+        /// <param name="index">索引。</param>
+        /// <returns>TItem。</returns>
+        public TItem GetItemByIndex(int index)
+        {
+            return m_itemCache.GetValueByIndex(index);
+        }
+        
+        /// <summary>
+        /// 刷新所有item选中状态
+        /// </summary>
+        /// <returns></returns>
+        public void UpdateAllItemSelect()
+        {
+            var index = selectIndex;
+            for (var i = 0; i < m_itemCache.Count; i++)
+            {
+                if (m_itemCache.GetValueByIndex(i) is IListSelectItem item)
+                {
+                    item.SetSelected(item.GetItemIndex() == index);
+                }
+            }
+        }
+
+        protected override void UpdateSnapTargetItem()
+        {
+            base.UpdateSnapTargetItem();
+            if (LoopRectView != null && LoopRectView.ItemSnapEnable)
+            {
+                LoopRectView.SetSnapTargetItemIndex(selectIndex);
+            }
+        }
     }
 }

UnityProject/Assets/GameScripts/HotFix/GameLogic/Event.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d1f693ff76ae490fbe194855d94e8266
+timeCreated: 1702479172

UnityProject/Assets/GameScripts/HotFix/GameLogic/Event/EventInterfaceHelper.cs

@@ -0,0 +1,20 @@
+using System;
+using TEngine;
+
+namespace GameLogic
+{
+    /// <summary>
+    /// 事件接口帮助类。
+    /// </summary>
+    internal class EventInterfaceHelper
+    {
+        /// <summary>
+        /// 初始化。
+        /// </summary>
+        public static void Init()
+        {
+            RegisterEventInterface_Logic.Register(GameEvent.EventMgr);
+            RegisterEventInterface_UI.Register(GameEvent.EventMgr);
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Event/EventInterfaceHelper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9afaf331ee7249adb5cc0953dfd3413c
+timeCreated: 1702379658

UnityProject/Assets/GameScripts/HotFix/GameLogic/Event/EventInterfaceImpAttribute.cs

@@ -0,0 +1,16 @@
+using TEngine;
+
+namespace GameLogic
+{
+    [System.AttributeUsage(System.AttributeTargets.Class)]
+    internal class EventInterfaceImpAttribute : BaseAttribute
+    {
+        private EEventGroup _eGroup;
+        public EEventGroup EventGroup => _eGroup;
+
+        public EventInterfaceImpAttribute(EEventGroup group)
+        {
+            _eGroup = group;
+        }
+    }
+}

UnityProject/Assets/GameScripts/HotFix/GameLogic/Event/EventInterfaceImpAttribute.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8bbf40942b0e4470bb8d8a82577f713c
+timeCreated: 1702479403