From 7ec14c670f8eea981e390c9cc288bb6877854e37 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Mon, 7 Aug 2023 15:14:43 +0800 Subject: [PATCH] =?UTF-8?q?Luban=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=8B=93?= =?UTF-8?q?=E5=B1=95=E5=88=86=E7=BB=84-=E5=88=86=E7=BB=84=E4=B8=BAc?= =?UTF-8?q?=E5=92=8Cclient=E7=9A=84=E4=B8=BA=E4=BB=85=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E5=AD=97=E6=AE=B5s=E5=92=8Cserver=E4=B8=BA=E4=BB=85?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Luban配置表拓展分组-分组为c和client的为仅客户端字段s和server为仅服务器字段 --- .../AssetRaw/Configs/bytes/item_tbitem.bytes | Bin 450 -> 440 bytes .../HotFix/GameProto/GameConfig/item/Item.cs | 6 ------ .../Config/GameConfig/Battle/BuffConfig.cs | 12 ----------- .../GameConfig/Battle/SkillBaseConfig.cs | 6 ------ .../Logic/src/Config/GameConfig/item/Item.cs | 20 ------------------ Luban/gen_code_bin.bat | 18 ---------------- Luban/gen_code_bin_to_project.bat | 2 +- Luban/gen_code_bin_to_server.bat | 2 +- 8 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 Luban/gen_code_bin.bat diff --git a/Assets/AssetRaw/Configs/bytes/item_tbitem.bytes b/Assets/AssetRaw/Configs/bytes/item_tbitem.bytes index 732323777008fc0bc3b2a0960f5d78571683ee3d..fc43544b8742a35fc8fbdb396dd6562b0728a3fe 100644 GIT binary patch delta 50 zcmX@ayn}gy%tTp@iEbJb^ED>U(3p5oW8y1~$-<0Qll_3WlTn*@xd0o}azUo$LOja_ FxdFt?59(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { item.ItemExchange _e0; _e0 = item.ItemExchange.DeserializeItemExchange(_buf); ExchangeList.Add(_e0);}} ExchangeColumn = item.ItemExchange.DeserializeItemExchange(_buf); @@ -64,10 +63,6 @@ public sealed partial class Item : Bright.Config.BeanBase /// public bool BatchUseable { get; private set; } /// - /// 品质 - /// - public item.EQuality Quality { get; private set; } - /// /// 道具兑换配置 /// public item.ItemExchange ExchangeStream { get; private set; } @@ -106,7 +101,6 @@ public sealed partial class Item : Bright.Config.BeanBase + "UpgradeToItemId:" + UpgradeToItemId + "," + "ExpireTime:" + ExpireTime + "," + "BatchUseable:" + BatchUseable + "," - + "Quality:" + Quality + "," + "ExchangeStream:" + ExchangeStream + "," + "ExchangeList:" + Bright.Common.StringUtil.CollectionToString(ExchangeList) + "," + "ExchangeColumn:" + ExchangeColumn + "," diff --git a/DotNet/Logic/src/Config/GameConfig/Battle/BuffConfig.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffConfig.cs index 8cc5dc93..640ea812 100644 --- a/DotNet/Logic/src/Config/GameConfig/Battle/BuffConfig.cs +++ b/DotNet/Logic/src/Config/GameConfig/Battle/BuffConfig.cs @@ -18,8 +18,6 @@ public sealed partial class BuffConfig : Bright.Config.BeanBase BuffID = _buf.ReadInt(); Name = _buf.ReadString(); PrefId = _buf.ReadInt(); - Desc = _buf.ReadString(); - Icon = _buf.ReadString(); TimeType = (Battle.BuffTimeType)_buf.ReadInt(); ReplaceType = (Battle.BuffReplaceType)_buf.ReadInt(); State = Battle.BuffTriggleState.DeserializeBuffTriggleState(_buf); @@ -44,14 +42,6 @@ public sealed partial class BuffConfig : Bright.Config.BeanBase /// public int PrefId { get; private set; } /// - /// 描述 - /// - public string Desc { get; private set; } - /// - /// 图标 - /// - public string Icon { get; private set; } - /// /// 持续类型 /// public Battle.BuffTimeType TimeType { get; private set; } @@ -81,8 +71,6 @@ public sealed partial class BuffConfig : Bright.Config.BeanBase + "BuffID:" + BuffID + "," + "Name:" + Name + "," + "PrefId:" + PrefId + "," - + "Desc:" + Desc + "," - + "Icon:" + Icon + "," + "TimeType:" + TimeType + "," + "ReplaceType:" + ReplaceType + "," + "State:" + State + "," diff --git a/DotNet/Logic/src/Config/GameConfig/Battle/SkillBaseConfig.cs b/DotNet/Logic/src/Config/GameConfig/Battle/SkillBaseConfig.cs index c04e6a12..9006dd10 100644 --- a/DotNet/Logic/src/Config/GameConfig/Battle/SkillBaseConfig.cs +++ b/DotNet/Logic/src/Config/GameConfig/Battle/SkillBaseConfig.cs @@ -19,7 +19,6 @@ public sealed partial class SkillBaseConfig : Bright.Config.BeanBase Name = _buf.ReadString(); SkillDispID = _buf.ReadInt(); SkillType = _buf.ReadInt(); - Desc = _buf.ReadString(); CostMP = _buf.ReadInt(); GCDID = _buf.ReadInt(); SkillCD = _buf.ReadFloat(); @@ -51,10 +50,6 @@ public sealed partial class SkillBaseConfig : Bright.Config.BeanBase /// public int SkillType { get; private set; } /// - /// 描述 - /// - public string Desc { get; private set; } - /// /// 消耗MP /// public int CostMP { get; private set; } @@ -97,7 +92,6 @@ public sealed partial class SkillBaseConfig : Bright.Config.BeanBase + "Name:" + Name + "," + "SkillDispID:" + SkillDispID + "," + "SkillType:" + SkillType + "," - + "Desc:" + Desc + "," + "CostMP:" + CostMP + "," + "GCDID:" + GCDID + "," + "SkillCD:" + SkillCD + "," diff --git a/DotNet/Logic/src/Config/GameConfig/item/Item.cs b/DotNet/Logic/src/Config/GameConfig/item/Item.cs index 11d2813a..09c6f618 100644 --- a/DotNet/Logic/src/Config/GameConfig/item/Item.cs +++ b/DotNet/Logic/src/Config/GameConfig/item/Item.cs @@ -17,13 +17,10 @@ public sealed partial class Item : Bright.Config.BeanBase { Id = _buf.ReadInt(); Name = _buf.ReadString(); - Desc = _buf.ReadString(); Price = _buf.ReadInt(); UpgradeToItemId = _buf.ReadInt(); if(_buf.ReadBool()){ ExpireTime = _buf.ReadInt(); } else { ExpireTime = null; } - BatchUseable = _buf.ReadBool(); Quality = (item.EQuality)_buf.ReadInt(); - ExchangeStream = item.ItemExchange.DeserializeItemExchange(_buf); {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);ExchangeList = new System.Collections.Generic.List(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { item.ItemExchange _e0; _e0 = item.ItemExchange.DeserializeItemExchange(_buf); ExchangeList.Add(_e0);}} ExchangeColumn = item.ItemExchange.DeserializeItemExchange(_buf); PostInit(); @@ -43,10 +40,6 @@ public sealed partial class Item : Bright.Config.BeanBase /// public string Name { get; private set; } /// - /// 描述 - /// - public string Desc { get; private set; } - /// /// 价格 /// public int Price { get; private set; } @@ -60,17 +53,9 @@ public sealed partial class Item : Bright.Config.BeanBase /// public int? ExpireTime { get; private set; } /// - /// 能否批量使用 - /// - public bool BatchUseable { get; private set; } - /// /// 品质 /// public item.EQuality Quality { get; private set; } - /// - /// 道具兑换配置 - /// - public item.ItemExchange ExchangeStream { get; private set; } public System.Collections.Generic.List ExchangeList { get; private set; } /// /// 道具兑换配置 @@ -83,7 +68,6 @@ public sealed partial class Item : Bright.Config.BeanBase public void Resolve(Dictionary _tables) { this.UpgradeToItemId_Ref = (_tables["item.TbItem"] as item.TbItem).GetOrDefault(UpgradeToItemId); - ExchangeStream?.Resolve(_tables); foreach(var _e in ExchangeList) { _e?.Resolve(_tables); } ExchangeColumn?.Resolve(_tables); PostResolve(); @@ -91,7 +75,6 @@ public sealed partial class Item : Bright.Config.BeanBase public void TranslateText(System.Func translator) { - ExchangeStream?.TranslateText(translator); foreach(var _e in ExchangeList) { _e?.TranslateText(translator); } ExchangeColumn?.TranslateText(translator); } @@ -101,13 +84,10 @@ public sealed partial class Item : Bright.Config.BeanBase return "{ " + "Id:" + Id + "," + "Name:" + Name + "," - + "Desc:" + Desc + "," + "Price:" + Price + "," + "UpgradeToItemId:" + UpgradeToItemId + "," + "ExpireTime:" + ExpireTime + "," - + "BatchUseable:" + BatchUseable + "," + "Quality:" + Quality + "," - + "ExchangeStream:" + ExchangeStream + "," + "ExchangeList:" + Bright.Common.StringUtil.CollectionToString(ExchangeList) + "," + "ExchangeColumn:" + ExchangeColumn + "," + "}"; diff --git a/Luban/gen_code_bin.bat b/Luban/gen_code_bin.bat deleted file mode 100644 index 5acff3ba..00000000 --- a/Luban/gen_code_bin.bat +++ /dev/null @@ -1,18 +0,0 @@ -cd /d %~dp0 -set WORKSPACE=.. - -set GEN_CLIENT=%WORKSPACE%\Luban\Luban.ClientServer\Luban.ClientServer.exe -set CONF_ROOT=%WORKSPACE%\Luban\Config -set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas - -%GEN_CLIENT% -j cfg --^ - -d %CONF_ROOT%\Defines\__root__.xml ^ - --input_data_dir %CONF_ROOT%\Datas ^ - --output_code_dir %WORKSPACE%/Assets/GameScripts/HotFix/GameProto/GameConfig ^ - --output_data_dir ..\GenerateDatas\bytes ^ - --gen_types code_cs_unity_bin,data_bin ^ - -s all - -echo ======== 生成配置文件结束 ======== - -pause \ No newline at end of file diff --git a/Luban/gen_code_bin_to_project.bat b/Luban/gen_code_bin_to_project.bat index 5d5735e5..57979970 100644 --- a/Luban/gen_code_bin_to_project.bat +++ b/Luban/gen_code_bin_to_project.bat @@ -11,7 +11,7 @@ set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas --output_code_dir %WORKSPACE%/Assets/GameScripts/HotFix/GameProto/GameConfig ^ --output_data_dir %WORKSPACE%/Assets/AssetRaw/Configs/bytes/ ^ --gen_types code_cs_unity_bin,data_bin ^ - -s all + -s client echo ======== 生成配置文件结束 ======== diff --git a/Luban/gen_code_bin_to_server.bat b/Luban/gen_code_bin_to_server.bat index 087aafb9..695cd72f 100644 --- a/Luban/gen_code_bin_to_server.bat +++ b/Luban/gen_code_bin_to_server.bat @@ -11,7 +11,7 @@ set DATA_OUTPUT=%ROOT_PATH%..\GenerateDatas --output_code_dir %WORKSPACE%/DotNet/Logic/src/Config/GameConfig ^ --output_data_dir ..\DotNet\Config\GameConfig ^ --gen_types code_cs_unity_bin,data_bin ^ - -s all + -s server echo ======== 生成配置文件结束 ========