feat: 适配国服6.3

Lotlab · May 9, 2023 · 6127a88 · 6127a88
1 parent 1830ec2
commit 6127a88
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/HousingCheck/Config.cs b/HousingCheck/Config.cs
@@ -11,10 +11,10 @@ public class Config
         /// <summary>
         /// 国服 Opcode
         /// </summary>
-        public const int OPCODE_WARD_INFO = 198;
-        public const int OPCODE_LAND_INFO = 621;
-        public const int OPCODE_SALE_INFO = 517;
-        public const int OPCODE_CLIENT_TRIGGER = 177;
+        public const int OPCODE_WARD_INFO = 332;
+        public const int OPCODE_LAND_INFO = 322;
+        public const int OPCODE_SALE_INFO = 201;
+        public const int OPCODE_CLIENT_TRIGGER = 227;
 
         /// <summary>
         /// 上报API版本

diff --git a/HousingCheck/HousingCheck.cs b/HousingCheck/HousingCheck.cs
@@ -329,6 +329,7 @@ void NetworkSent(string connection, long epoch, byte[] message)
                 if (!config.EnableOpcodeGuess) return;
 
                 var ipc = parser.ParseIPCHeader(message);
+                if (ipc == null) return;
                 var guessOpcode = ipc.Value.type;
                 if (message.Length == Marshal.SizeOf<FFXIVIpcClientTrigger>())
                 {
@@ -376,6 +377,8 @@ void NetworkReceived(string connection, long epoch, byte[] message)
                 if (!config.EnableOpcodeGuess) return;
 
                 var ipc = parser.ParseIPCHeader(message);
+                if (ipc == null) return;
+
                 var guessOpcode = ipc.Value.type;
                 if (message.Length == Marshal.SizeOf<FFXIVIpcHousingWardInfo>())
                 {

diff --git a/HousingCheck/HousingCheck.csproj b/HousingCheck/HousingCheck.csproj
@@ -3,8 +3,8 @@
     <RootNamespace>HousingCheck</RootNamespace>
     <AssemblyName>HousingCheck</AssemblyName>
     <TargetFramework>net472</TargetFramework>
-    <Version>1.7.2</Version>
-    <Copyright>Copyright ©2021 Bluefissure, Hyperzlib. Copyright ©2021-2022 Lotlab</Copyright>
+    <Version>1.7.3</Version>
+    <Copyright>Copyright ©2021 Bluefissure, Hyperzlib. Copyright ©2021-2023 Lotlab</Copyright>
     <ILMergeDebugInfo>false</ILMergeDebugInfo>
     <Platforms>x64;anycpu</Platforms>
   </PropertyGroup>

diff --git a/HousingCheck/LandSaleInfo.cs b/HousingCheck/LandSaleInfo.cs
@@ -8,7 +8,7 @@ public class LandSaleInfo : IPCPacketBase<FFXIVIpcLandSaleInfo>
     {
         public override string ToString()
         {
-            return $"LandSaleInfo: {Value.purchase_type}, {Value.region_type}, {Value.status}. {Value.persons} participated, {Value.winner} win, ends at {DateTimeOffset.FromUnixTimeSeconds(Value.endTime).LocalDateTime}";
+            return $"LandSaleInfo: {Value.purchase_type}, {Value.region_type}, {Value.status} ({Value.unknown0},{Value.unknown1},{Value.unknown3}). {Value.persons} participated, {Value.winner} win, ends at {DateTimeOffset.FromUnixTimeSeconds(Value.endTime).LocalDateTime}";
         }
     }
 
@@ -27,14 +27,19 @@ public struct FFXIVIpcLandSaleInfo
         public HousePurchaseType purchase_type;
         public HouseRegionType region_type;
         public LandStatus status;
+        public byte unknown0;
+        public byte unknown1;
+
+        public byte padding0;
         public byte padding1;
+        public byte padding2;
 
         public UInt32 endTime;
-        public UInt32 padding2;
+        public UInt32 unknown3;
         public UInt32 persons;
         public UInt32 winner;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
         public byte[] unknown;
     }