diff --git a/Config/Json/configs.json b/Config/Json/configs.json index 298f81c..fbec799 100644 --- a/Config/Json/configs.json +++ b/Config/Json/configs.json @@ -1,289 +1,444 @@ { - "WeightConfig": [ - { - "Id": 100001, - "Model": "Weights/Weight2_5g", - "Icon": "", - "Type": 0, - "Weight": 3 - } - ], - "RingConfig": [ - { - "Id": 120001, - "Model": "rod_rings/rumoi/rumoi_oxiline_spin", - "Icon": "" - }, - { - "Id": 120002, - "Model": "rod_rings/smt/smt_pure_ceramic_bolo", - "Icon": "" - } - ], "LureConfig": [ { "Id": 80001, - "Model": "lures/express_fishing/crankbaits_1/775/crankbaits_775", - "Icon": "", "Hook": [ 700102 ], - "EfficacyBase": 50, - "Length": 0, - "Weight": 250 + "EfficacyBase": 50 }, { "Id": 80002, - "Model": "lures/express_fishing/poppers_1/poppers_590/poppers_590", - "Icon": "", "Hook": [ 700102 ], - "EfficacyBase": 50, - "Length": 0, - "Weight": 120 + "EfficacyBase": 50 }, { "Id": 80003, - "Model": "lures/express_fishing/softplastic/ef_supergrab_6/softplastic_g_1622", - "Icon": "", "Hook": [ 0 ], - "EfficacyBase": 50, - "Length": 0, - "Weight": 120 + "EfficacyBase": 50 }, { "Id": 80004, - "Model": "lures/express_fishing/softplastic/ef_superminnow_6/softplastic_m_1634", - "Icon": "", "Hook": [ 0 ], - "EfficacyBase": 50, - "Length": 0, - "Weight": 120 + "EfficacyBase": 50 } ], "ItemConfig": [ { - "Id": 20001, - "Model": "", - "Icon": "", + "Id": 30001, + "Model": "rods/syberia/tele_10037/tele_10037_t13", "Type": 1, + "Quality": 1, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20002, - "Model": "", - "Icon": "", + "Id": 30002, + "Model": "rods/syberia/bolo_10021/bolo_10021_LB400", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20003, - "Model": "", - "Icon": "", + "Id": 30003, + "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, + "Quality": 3, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20004, - "Model": "", - "Icon": "", + "Id": 30004, + "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, + "Quality": 4, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20005, - "Model": "", - "Icon": "", + "Id": 30005, + "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, + "Quality": 5, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20006, - "Model": "", - "Icon": "", + "Id": 30006, + "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, + "Quality": 4, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20007, - "Model": "", - "Icon": "", + "Id": 30007, + "Model": "rods/syberia/spin_10034/spin_10034_S60H", "Type": 0, + "Quality": 3, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20008, - "Model": "", - "Icon": "", + "Id": 40001, + "Model": "reels/syberia/spin_5002/spin_5002", "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20009, - "Model": "", - "Icon": "", + "Id": 40002, + "Model": "reels/syberia/spin_5036/spin_5036", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20010, - "Model": "", - "Icon": "", + "Id": 50001, + "Model": "bobbers/expressfishing/bob_25003/bob_25003", "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20011, - "Model": "", - "Icon": "", + "Id": 50002, + "Model": "bobbers/expressfishing/bob_25162_25163/bob_25162", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20012, - "Model": "", - "Icon": "", + "Id": 50003, + "Model": "bobbers/expressfishing/bob_25166_25167/bob_25166", "Type": 0, + "Quality": 3, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20013, - "Model": "", - "Icon": "", + "Id": 50004, + "Model": "bobbers/expressfishing/bob_25001/bob_25001", "Type": 0, + "Quality": 4, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20014, - "Model": "", - "Icon": "", + "Id": 60001, + "Model": "Lines/UFE Mono/UFE monoClear", "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20015, - "Model": "", - "Icon": "", + "Id": 60002, + "Model": "rods/syberia/bolo_10021/bolo_10021_LB400", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20016, - "Model": "", - "Icon": "", + "Id": 70001, + "Model": "baits/worm_01/worm_01", "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20017, - "Model": "", - "Icon": "", + "Id": 70002, + "Model": "baits/fly/fly", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20018, - "Model": "", - "Icon": "", + "Id": 70003, + "Model": "baits/black_leech/black_leech", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20019, - "Model": "", - "Icon": "", + "Id": 70004, + "Model": "baits/bread/bread", "Type": 0, + "Quality": 3, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20020, - "Model": "", - "Icon": "", + "Id": 80001, + "Model": "lures/express_fishing/crankbaits_1/775/crankbaits_775", "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20021, - "Model": "", - "Icon": "", + "Id": 80002, + "Model": "lures/express_fishing/poppers_1/poppers_590/poppers_590", "Type": 0, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 }, { - "Id": 20022, - "Model": "", - "Icon": "", + "Id": 80003, + "Model": "lures/express_fishing/softplastic/ef_supergrab_6/softplastic_g_1622", "Type": 0, + "Quality": 3, + "Brand": 0, + "Weight": 0, + "Length": 0, "Max": 0, - "AutoUse": 0 + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 80004, + "Model": "lures/express_fishing/softplastic/ef_superminnow_6/softplastic_m_1634", + "Type": 0, + "Quality": 4, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 90001, + "Model": "hooks/alliance/c_hook_20789_20794/c_hook_20789", + "Type": 1, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 90002, + "Model": "hooks/berserk_hooks/triple_20569_20577/triple_20569", + "Type": 1, + "Quality": 2, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 90003, + "Model": "hooks/berserk_hooks/triple_20569_20577/triple_20569", + "Type": 1, + "Quality": 3, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 90004, + "Model": "hooks/berserk_hooks/triple_20569_20577/triple_20569", + "Type": 1, + "Quality": 4, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 90005, + "Model": "hooks/berserk_hooks/triple_20569_20577/triple_20569", + "Type": 1, + "Quality": 5, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 100001, + "Model": "Weights/Weight2_5g", + "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 110001, + "Model": "Feeders/Feeder 1/FeedTrash 1", + "Type": 0, + "Quality": 1, + "Brand": 1, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 120001, + "Model": "rod_rings/rumoi/rumoi_oxiline_spin", + "Type": 0, + "Quality": 1, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 120002, + "Model": "rod_rings/smt/smt_pure_ceramic_bolo", + "Type": 0, + "Quality": 1, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 } ], "ReelConfig": [ { "Id": 40001, - "Model": "reels/syberia/spin_5002/spin_5002", - "Icon": "", - "Type": 0, "GearRatio": [ "7" ], - "Size": 250, "Strength": 40 }, { "Id": 40002, - "Model": "reels/syberia/spin_5036/spin_5036", - "Icon": "", - "Type": 0, "GearRatio": [ "5" ], - "Size": 120, "Strength": 40 } ], "LineConfig": [ { "Id": 60001, - "Model": "Lines/UFE Mono/UFE monoClear", - "Icon": "", - "Type": 0, - "Length": 7, "Strength": 40, "Size": 1 }, { "Id": 60002, - "Model": "rods/syberia/bolo_10021/bolo_10021_LB400", - "Icon": "", - "Type": 0, - "Length": 5, "Strength": 40, "Size": 1 } @@ -291,56 +446,71 @@ "HookConfig": [ { "Id": 90001, - "Model": "hooks/alliance/c_hook_20789_20794/c_hook_20789", - "Icon": "", - "Type": 1, - "Zadzior": 1, - "Length": 0, - "Weight": 1 + "Zadzior": 1 }, { "Id": 90002, - "Model": "hooks/berserk_hooks/triple_20569_20577/triple_20569", - "Icon": "", - "Type": 1, - "Zadzior": 1, - "Length": 0, - "Weight": 1 + "Zadzior": 1 + }, + { + "Id": 90003, + "Zadzior": 1 + }, + { + "Id": 90004, + "Zadzior": 1 + }, + { + "Id": 90005, + "Zadzior": 1 } ], "RodConfig": [ { "Id": 30001, - "Model": "rods/syberia/tele_10037/tele_10037_t13", - "Icon": "", - "Type": 1, "Ring": 0, - "Length": 7, - "Weight": 250, "Strength": 40, "MaxRange": 67, "ConstructionType": 0 }, { "Id": 30002, - "Model": "rods/syberia/bolo_10021/bolo_10021_LB400", - "Icon": "", - "Type": 0, "Ring": 1100002, - "Length": 5, - "Weight": 120, "Strength": 40, "MaxRange": 30, "ConstructionType": 0 }, { "Id": 30003, - "Model": "rods/syberia/spin_10034/spin_10034_S60H", - "Icon": "", - "Type": 0, "Ring": 1100001, - "Length": 5, - "Weight": 120, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30004, + "Ring": 1100001, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30005, + "Ring": 1100001, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30006, + "Ring": 1100001, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30007, + "Ring": 1100001, "Strength": 40, "MaxRange": 30, "ConstructionType": 0 @@ -496,37 +666,21 @@ "BobberConfig": [ { "Id": 50001, - "Model": "bobbers/expressfishing/bob_25003/bob_25003", - "Icon": "", - "Type": 2, - "Weight": 1, "Displacement": 40, "NightLight": 0 }, { "Id": 50002, - "Model": "bobbers/expressfishing/bob_25162_25163/bob_25162", - "Icon": "", - "Type": 0, - "Weight": 1, "Displacement": 40, "NightLight": 0 }, { "Id": 50003, - "Model": "bobbers/expressfishing/bob_25166_25167/bob_25166", - "Icon": "", - "Type": 0, - "Weight": 1, "Displacement": 40, "NightLight": 0 }, { "Id": 50004, - "Model": "bobbers/expressfishing/bob_25001/bob_25001", - "Icon": "", - "Type": 0, - "Weight": 1, "Displacement": 40, "NightLight": 0 } @@ -534,9 +688,6 @@ "FeederConfig": [ { "Id": 110001, - "Model": "Feeders/Feeder 1/FeedTrash 1", - "Icon": "", - "Type": 0, "Capacity": 100, "Weight": 5 } @@ -544,11 +695,7 @@ "BaitConfig": [ { "Id": 70001, - "Model": "baits/worm_01/worm_01", - "Icon": "", "EfficacyBase": 15, - "Length": 0, - "Weight": 250, "Arr": [ 250, 1, @@ -564,11 +711,7 @@ }, { "Id": 70002, - "Model": "baits/fly/fly", - "Icon": "", "EfficacyBase": 15, - "Length": 0, - "Weight": 120, "Arr": [ 120, 4, @@ -582,11 +725,7 @@ }, { "Id": 70003, - "Model": "baits/black_leech/black_leech", - "Icon": "", "EfficacyBase": 15, - "Length": 0, - "Weight": 120, "Arr": [ 120 ], @@ -596,11 +735,7 @@ }, { "Id": 70004, - "Model": "baits/bread/bread", - "Icon": "", "EfficacyBase": 15, - "Length": 0, - "Weight": 120, "Arr": [ 120 ], diff --git a/Entity/Generate/ConfigTable/Entity/BaitConfig.cs b/Entity/Generate/ConfigTable/Entity/BaitConfig.cs index 0c48369..a38b53c 100644 --- a/Entity/Generate/ConfigTable/Entity/BaitConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/BaitConfig.cs @@ -17,18 +17,10 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] public uint EfficacyBase { get; set; } // 吸引力 - [ProtoMember(5)] - public uint Length { get; set; } // 长度(毫米) - [ProtoMember(6)] - public uint Weight { get; set; } // 重量(克) - [ProtoMember(7)] + [ProtoMember(3)] public uint[] Arr { get; set; } = Array.Empty(); // 重量(克) - [ProtoMember(8)] + [ProtoMember(4)] public string[] ArrStr { get; set; } = Array.Empty(); // 重量(克) [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/BobberConfig.cs b/Entity/Generate/ConfigTable/Entity/BobberConfig.cs index 92aa20a..d6ca6db 100644 --- a/Entity/Generate/ConfigTable/Entity/BobberConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/BobberConfig.cs @@ -17,16 +17,8 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] - public uint Type { get; set; } // 类型 - [ProtoMember(5)] - public uint Weight { get; set; } // 重量(克) - [ProtoMember(6)] public uint Displacement { get; set; } // 位移 - [ProtoMember(7)] + [ProtoMember(3)] public uint NightLight { get; set; } // 是否夜光 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/FeederConfig.cs b/Entity/Generate/ConfigTable/Entity/FeederConfig.cs index 484d7b1..efab711 100644 --- a/Entity/Generate/ConfigTable/Entity/FeederConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/FeederConfig.cs @@ -17,14 +17,8 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] - public uint Type { get; set; } // 类型 - [ProtoMember(5)] public uint Capacity { get; set; } // 能力 - [ProtoMember(6)] + [ProtoMember(3)] public uint Weight { get; set; } // 重量(克) [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/HookConfig.cs b/Entity/Generate/ConfigTable/Entity/HookConfig.cs index 7d6f956..4fc28ce 100644 --- a/Entity/Generate/ConfigTable/Entity/HookConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/HookConfig.cs @@ -17,17 +17,7 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] - public uint Type { get; set; } // 类型 - [ProtoMember(5)] - public uint Zadzior { get; set; } // 长钉 - [ProtoMember(6)] - public uint Length { get; set; } // 长度(毫米) - [ProtoMember(7)] - public uint Weight { get; set; } // 重量(克) + public uint Zadzior { get; set; } // 长钉 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/ItemConfig.cs b/Entity/Generate/ConfigTable/Entity/ItemConfig.cs index 5a008ac..89302f0 100644 --- a/Entity/Generate/ConfigTable/Entity/ItemConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/ItemConfig.cs @@ -19,13 +19,21 @@ namespace NBF [ProtoMember(2)] public string Model { get; set; } // 模型 [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] public uint Type { get; set; } // 类型 + [ProtoMember(4)] + public uint Quality { get; set; } // 品质 [ProtoMember(5)] - public uint Max { get; set; } // 最大堆叠数量 + public uint Brand { get; set; } // 品牌 [ProtoMember(6)] - public uint AutoUse { get; set; } // 获得自动使用 + public uint Weight { get; set; } // 重量(克) + [ProtoMember(7)] + public uint Length { get; set; } // 长度(毫米) + [ProtoMember(8)] + public uint Max { get; set; } // 最大堆叠数量 + [ProtoMember(9)] + public uint AutoUse { get; set; } // 获得自动使用 + [ProtoMember(10)] + public uint Deal { get; set; } // 交易类型 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/LineConfig.cs b/Entity/Generate/ConfigTable/Entity/LineConfig.cs index 77ca0d9..0ab44c7 100644 --- a/Entity/Generate/ConfigTable/Entity/LineConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/LineConfig.cs @@ -17,16 +17,8 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] - public uint Type { get; set; } // 类型 - [ProtoMember(5)] - public uint Length { get; set; } // 长度(毫米) - [ProtoMember(6)] public uint Strength { get; set; } // 强度 - [ProtoMember(7)] + [ProtoMember(3)] public uint Size { get; set; } // 尺寸 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/LureConfig.cs b/Entity/Generate/ConfigTable/Entity/LureConfig.cs index 2a33084..0b733e2 100644 --- a/Entity/Generate/ConfigTable/Entity/LureConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/LureConfig.cs @@ -17,17 +17,9 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] public uint[] Hook { get; set; } = Array.Empty(); // 勾 - [ProtoMember(5)] - public uint EfficacyBase { get; set; } // 吸引力 - [ProtoMember(6)] - public uint Length { get; set; } // 长度(毫米) - [ProtoMember(7)] - public uint Weight { get; set; } // 重量(克) + [ProtoMember(3)] + public uint EfficacyBase { get; set; } // 吸引力 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/ReelConfig.cs b/Entity/Generate/ConfigTable/Entity/ReelConfig.cs index 9af4d96..b824471 100644 --- a/Entity/Generate/ConfigTable/Entity/ReelConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/ReelConfig.cs @@ -17,16 +17,8 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] - public uint Type { get; set; } // 类型 - [ProtoMember(5)] public float[] GearRatio { get; set; } = Array.Empty(); // 组件比 - [ProtoMember(6)] - public uint Size { get; set; } // 尺寸 - [ProtoMember(7)] + [ProtoMember(3)] public uint Strength { get; set; } // 强度 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/ConfigTable/Entity/RodConfig.cs b/Entity/Generate/ConfigTable/Entity/RodConfig.cs index 8b6a2ce..4266ee6 100644 --- a/Entity/Generate/ConfigTable/Entity/RodConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/RodConfig.cs @@ -17,22 +17,12 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public string Model { get; set; } // 模型 - [ProtoMember(3)] - public string Icon { get; set; } // 图标 - [ProtoMember(4)] - public uint Type { get; set; } // 类型 - [ProtoMember(5)] public uint Ring { get; set; } // 导线圈 - [ProtoMember(6)] - public uint Length { get; set; } // 长度(毫米) - [ProtoMember(7)] - public uint Weight { get; set; } // 重量(克) - [ProtoMember(8)] + [ProtoMember(3)] public uint Strength { get; set; } // 强度 - [ProtoMember(9)] + [ProtoMember(4)] public uint MaxRange { get; set; } // 最大范围 - [ProtoMember(10)] + [ProtoMember(5)] public uint ConstructionType { get; set; } // 结构类型 [ProtoIgnore] public uint Key => Id; diff --git a/Main/Program.cs b/Main/Program.cs index 82cfcb4..e56ef4f 100644 --- a/Main/Program.cs +++ b/Main/Program.cs @@ -8,18 +8,18 @@ using Fantasy.Platform.Net; // 设置ID生成规则 IdFactoryHelper.Initialize(IdFactoryType.World); -// 获取配置文件 -// 比如通过远程获取这个配置文件,这样可以多组服务器共享一套配置了 -var machineConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/MachineConfigData.Json"); -var processConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/ProcessConfigData.Json"); -var worldConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/WorldConfigData.Json"); -var sceneConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/SceneConfigData.Json"); -// 初始化配置文件 -// 如果重复初始化方法会覆盖掉上一次的数据,非常适合热重载时使用 -MachineConfigData.Initialize(machineConfigText); -ProcessConfigData.Initialize(processConfigText); -WorldConfigData.Initialize(worldConfigText); -SceneConfigData.Initialize(sceneConfigText); +// // 获取配置文件 +// // 比如通过远程获取这个配置文件,这样可以多组服务器共享一套配置了 +// var machineConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/MachineConfigData.Json"); +// var processConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/ProcessConfigData.Json"); +// var worldConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/WorldConfigData.Json"); +// var sceneConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/Server/SceneConfigData.Json"); +// // 初始化配置文件 +// // 如果重复初始化方法会覆盖掉上一次的数据,非常适合热重载时使用 +// MachineConfigData.Initialize(machineConfigText); +// ProcessConfigData.Initialize(processConfigText); +// WorldConfigData.Initialize(worldConfigText); +// SceneConfigData.Initialize(sceneConfigText); //解析配置文件 var gameConfigText = await FileHelper.GetTextByRelativePath("../../../Config/Json/configs.Json"); diff --git a/Server.sln.DotSettings.user b/Server.sln.DotSettings.user index 077f693..c0de287 100644 --- a/Server.sln.DotSettings.user +++ b/Server.sln.DotSettings.user @@ -22,6 +22,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded