[更新]1. 更新主库的更新适配

AlianBlank · AlianBlank · commit 927bc430ebe7 · 2024-08-04T11:36:55.000+08:00
diff --git a/GameFrameX.Apps/GameFrameX.Apps.csproj b/GameFrameX.Apps/GameFrameX.Apps.csproj
@@ -32,7 +32,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core" Version="1.1.1-beta1" />
-      <PackageReference Include="GameFrameX.Monitor" Version="1.1.1-beta1" />
+      <PackageReference Include="GameFrameX.Core" Version="1.1.1-beta3" />
+      <PackageReference Include="GameFrameX.Monitor" Version="1.1.1-beta3" />
     </ItemGroup>
 </Project>
diff --git a/GameFrameX.Config/GameFrameX.Config.csproj b/GameFrameX.Config/GameFrameX.Config.csproj
@@ -13,8 +13,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.Core.Config" Version="1.1.1-beta1" />
-      <PackageReference Include="GameFrameX.Log" Version="1.1.1-beta1" />
+      <PackageReference Include="GameFrameX.Core.Config" Version="1.1.1-beta3" />
+      <PackageReference Include="GameFrameX.Log" Version="1.1.1-beta3" />
     </ItemGroup>
 
 </Project>
diff --git a/GameFrameX.Hotfix/GameFrameX.Hotfix.csproj b/GameFrameX.Hotfix/GameFrameX.Hotfix.csproj
@@ -26,8 +26,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.NetWork" Version="1.1.1-beta1" />
-      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.1.1-beta1" />
+      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.1.1-beta3" />
       <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
     </ItemGroup>
 
diff --git a/GameFrameX.Hotfix/Logic/Account/Login/LoginComponentAgent.cs b/GameFrameX.Hotfix/Logic/Account/Login/LoginComponentAgent.cs
@@ -18,7 +18,7 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqLogin reqLogin)
                 {
                     ErrCode = (int)ResultCode.Failed
                 };
-                await workChannel.WriteAsync(respErrorCode, reqLogin.UniId, (int)OperationStatusCode.AccountCannotBeNull);
+                await workChannel.WriteAsync(respErrorCode, (int)OperationStatusCode.AccountCannotBeNull);
                 return;
             }
 
@@ -48,7 +48,7 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqLogin reqLogin)
                 Id = loginState.Id,
                 RoleName = Utility.Random.GetRandom(1, 100).ToString(),
             };
-            await workChannel.WriteAsync(respLogin, reqLogin.UniId);
+            await workChannel.WriteAsync(respLogin);
 
             //加入在线玩家
             var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();
diff --git a/GameFrameX.Hotfix/Logic/Role/Login/PlayerComponentAgent.cs b/GameFrameX.Hotfix/Logic/Role/Login/PlayerComponentAgent.cs
@@ -65,7 +65,7 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqPlayerLogin reqLogin)
                     Avatar = playerState.Avatar
                 }
             };
-            await workChannel.WriteAsync(respPlayerLogin, reqLogin.UniId);
+            await workChannel.WriteAsync(respPlayerLogin);
 
             //加入在线玩家
             var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();
@@ -92,7 +92,7 @@ public async Task OnPlayerCreate(INetWorkChannel workChannel, ReqPlayerCreate re
                     Avatar = playerState.Avatar
                 }
             };
-            await workChannel.WriteAsync(respPlayerCreate, reqPlayerCreate.UniId);
+            await workChannel.WriteAsync(respPlayerCreate);
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ public async Task OnGetPlayerList(INetWorkChannel workChannel, ReqPlayerList req
                 }
             }
 
-            await workChannel.WriteAsync(respPlayerList, reqPlayerList.UniId);
+            await workChannel.WriteAsync(respPlayerList);
         }
     }
 }
diff --git a/GameFrameX.Launcher/GameFrameX.Launcher.csproj b/GameFrameX.Launcher/GameFrameX.Launcher.csproj
@@ -36,9 +36,9 @@
 
     <ItemGroup>
       <PackageReference Include="CommandLineParser" Version="2.9.1" />
-      <PackageReference Include="GameFrameX.Core" Version="1.1.1-beta1" />
-      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.1.1-beta1" />
-      <PackageReference Include="GameFrameX.StartUp" Version="1.1.1-beta1" />
+      <PackageReference Include="GameFrameX.Core" Version="1.1.1-beta3" />
+      <PackageReference Include="GameFrameX.NetWork.Message" Version="1.1.1-beta3" />
+      <PackageReference Include="GameFrameX.StartUp" Version="1.1.1-beta3" />
       <PackageReference Include="GameFrameX.SuperSocket.ClientEngine" Version="1.0.1" />
     </ItemGroup>
 </Project>
diff --git a/GameFrameX.Proto/GameFrameX.Proto.csproj b/GameFrameX.Proto/GameFrameX.Proto.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="GameFrameX.NetWork" Version="1.1.1-beta1" />
+      <PackageReference Include="GameFrameX.NetWork" Version="1.1.1-beta3" />
     </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public async Task OnLogin(INetWorkChannel workChannel, ReqPlayerLogin reqLogin)`
`65`	`65`	`Avatar = playerState.Avatar`
`66`	`66`	`}`
`67`	`67`	`};`
`68`		`- await workChannel.WriteAsync(respPlayerLogin, reqLogin.UniId);`
	`68`	`+ await workChannel.WriteAsync(respPlayerLogin);`
`69`	`69`
`70`	`70`	`//加入在线玩家`
`71`	`71`	`var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();`
`@@ -92,7 +92,7 @@ public async Task OnPlayerCreate(INetWorkChannel workChannel, ReqPlayerCreate re`
`92`	`92`	`Avatar = playerState.Avatar`
`93`	`93`	`}`
`94`	`94`	`};`
`95`		`- await workChannel.WriteAsync(respPlayerCreate, reqPlayerCreate.UniId);`
	`95`	`+ await workChannel.WriteAsync(respPlayerCreate);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/// <summary>`
`@@ -125,7 +125,7 @@ public async Task OnGetPlayerList(INetWorkChannel workChannel, ReqPlayerList req`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
`128`		`- await workChannel.WriteAsync(respPlayerList, reqPlayerList.UniId);`
	`128`	`+ await workChannel.WriteAsync(respPlayerList);`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`