diff --git a/Config/Json/configs.json b/Config/Json/configs.json index 1de7a89..a0de76b 100644 --- a/Config/Json/configs.json +++ b/Config/Json/configs.json @@ -80,7 +80,7 @@ }, { "Id": 30004, - "Model": "rods/syberia/spin_10034/spin_10034_S60H", + "Model": "rods/syberia/carp_10046/carp_10046_360H", "Type": 0, "Quality": 4, "Brand": 0, @@ -92,7 +92,7 @@ }, { "Id": 30005, - "Model": "rods/syberia/spin_10034/spin_10034_S60H", + "Model": "rods/syberia/cast_10018/cast_10018_CST60MH", "Type": 0, "Quality": 5, "Brand": 0, @@ -104,7 +104,7 @@ }, { "Id": 30006, - "Model": "rods/syberia/spin_10034/spin_10034_S60H", + "Model": "rods/syberia/feeder_10048/feeder_10048_FD390", "Type": 0, "Quality": 4, "Brand": 0, @@ -116,7 +116,7 @@ }, { "Id": 30007, - "Model": "rods/syberia/spin_10034/spin_10034_S60H", + "Model": "rods/syberia/jerk_10043/jerk_10043_JR60XH", "Type": 0, "Quality": 3, "Brand": 0, @@ -126,6 +126,54 @@ "AutoUse": 0, "Deal": 0 }, + { + "Id": 30008, + "Model": "rods/syberia/mark_10168/mark_10168_3LB", + "Type": 0, + "Quality": 0, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 30009, + "Model": "rods/syberia/match_10025/match_10025_M130H", + "Type": 0, + "Quality": 0, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 30010, + "Model": "rods/syberia/picker_10052/picker_10052_P300-MH", + "Type": 0, + "Quality": 0, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, + { + "Id": 30011, + "Model": "rods/syberia/spod_10133/spod_10133_3LB", + "Type": 0, + "Quality": 0, + "Brand": 0, + "Weight": 0, + "Length": 0, + "Max": 0, + "AutoUse": 0, + "Deal": 0 + }, { "Id": 40001, "Model": "reels/syberia/spin_5002/spin_5002", @@ -1114,6 +1162,7 @@ "ReelConfig": [ { "Id": 40001, + "ReelType": 1, "GearRatio": [ "7" ], @@ -1121,10 +1170,59 @@ }, { "Id": 40002, + "ReelType": 1, "GearRatio": [ "5" ], "Strength": 40 + }, + { + "Id": 40003, + "ReelType": 2, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40004, + "ReelType": 2, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40005, + "ReelType": 3, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40006, + "ReelType": 3, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40007, + "ReelType": 1, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40008, + "ReelType": 1, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40009, + "ReelType": 3, + "GearRatio": [], + "Strength": 0 + }, + { + "Id": 40010, + "ReelType": 3, + "GearRatio": [], + "Strength": 0 } ], "LineConfig": [ @@ -1164,6 +1262,7 @@ "RodConfig": [ { "Id": 30001, + "RodType": 1, "Ring": 0, "Strength": 40, "MaxRange": 67, @@ -1171,6 +1270,7 @@ }, { "Id": 30002, + "RodType": 3, "Ring": 2, "Strength": 40, "MaxRange": 30, @@ -1178,6 +1278,7 @@ }, { "Id": 30003, + "RodType": 2, "Ring": 1, "Strength": 40, "MaxRange": 30, @@ -1185,6 +1286,7 @@ }, { "Id": 30004, + "RodType": 1, "Ring": 1, "Strength": 40, "MaxRange": 30, @@ -1192,6 +1294,7 @@ }, { "Id": 30005, + "RodType": 2, "Ring": 1, "Strength": 40, "MaxRange": 30, @@ -1199,6 +1302,7 @@ }, { "Id": 30006, + "RodType": 2, "Ring": 1, "Strength": 40, "MaxRange": 30, @@ -1206,6 +1310,39 @@ }, { "Id": 30007, + "RodType": 2, + "Ring": 1, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30008, + "RodType": 2, + "Ring": 1, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30009, + "RodType": 2, + "Ring": 1, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30010, + "RodType": 2, + "Ring": 1, + "Strength": 40, + "MaxRange": 30, + "ConstructionType": 0 + }, + { + "Id": 30011, + "RodType": 2, "Ring": 1, "Strength": 40, "MaxRange": 30, @@ -1304,6 +1441,22 @@ "Id": 30007, "Amount": 1 }, + { + "Id": 30008, + "Amount": 1 + }, + { + "Id": 30009, + "Amount": 1 + }, + { + "Id": 30010, + "Amount": 1 + }, + { + "Id": 30011, + "Amount": 1 + }, { "Id": 40001, "Amount": 1 diff --git a/Entity/Generate/ConfigTable/Entity/ReelConfig.cs b/Entity/Generate/ConfigTable/Entity/ReelConfig.cs index b824471..2ea450c 100644 --- a/Entity/Generate/ConfigTable/Entity/ReelConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/ReelConfig.cs @@ -17,8 +17,10 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public float[] GearRatio { get; set; } = Array.Empty(); // 组件比 + public uint ReelType { get; set; } // 鱼轮类型 [ProtoMember(3)] + public float[] GearRatio { get; set; } = Array.Empty(); // 组件比 + [ProtoMember(4)] 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 4266ee6..72659d8 100644 --- a/Entity/Generate/ConfigTable/Entity/RodConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/RodConfig.cs @@ -17,12 +17,14 @@ namespace NBF [ProtoMember(1)] public uint Id { get; set; } // Id [ProtoMember(2)] - public uint Ring { get; set; } // 导线圈 + public uint RodType { get; set; } // 鱼竿类型 [ProtoMember(3)] - public uint Strength { get; set; } // 强度 + public uint Ring { get; set; } // 导线圈 [ProtoMember(4)] - public uint MaxRange { get; set; } // 最大范围 + public uint Strength { get; set; } // 强度 [ProtoMember(5)] + public uint MaxRange { get; set; } // 最大范围 + [ProtoMember(6)] public uint ConstructionType { get; set; } // 结构类型 [ProtoIgnore] public uint Key => Id; diff --git a/Tools/NBConfigBuilder/config.json b/Tools/NBConfigBuilder/config.json index c1f0aeb..ab52864 100644 --- a/Tools/NBConfigBuilder/config.json +++ b/Tools/NBConfigBuilder/config.json @@ -1,10 +1,10 @@ { - "ExcelPath": "D:\\myself\\Games\\Fishing2\\Config", - "ClientPath": "D:\\myself\\Games\\Fishing2\\Assets\\Scripts\\Generate\\Config", - "ClientJsonPath": "D:\\myself\\Games\\Fishing2\\Assets\\Resources\\config", - "ServerPath": "D:\\myself\\Games\\Fishing2Server\\Entity\\Generate\\ConfigTable\\Entity", - "ServerJsonPath": "D:\\myself\\Games\\Fishing2Server\\Config\\Json", + "ExcelPath": "..\\..\\..\\Fishing2\\Config", + "ClientPath": "..\\..\\..\\Fishing2\\Assets\\Scripts\\Generate\\Config", + "ClientJsonPath": "..\\..\\..\\Fishing2\\Assets\\Resources\\config", + "ServerPath": "..\\..\\..\\Fishing2Server\\Entity\\Generate\\ConfigTable\\Entity", + "ServerJsonPath": "..\\..\\..\\Fishing2Server\\Config\\Json", "GenClient": true, "GenServer": true, - "ExcelVersionPath": "D:\\myself\\Games\\Fishing2\\Config\\Version.txt" + "ExcelVersionPath": "..\\..\\..\\Fishing2\\Config\\Version.txt" } \ No newline at end of file