Преглед изворни кода

调整代码目录,更新运行指南

tanghai пре 3 година
родитељ
комит
09f5b90fb6
41 измењених фајлова са 7 додато и 8 уклоњено
  1. 1 1
      Apps/Hotfix/Apps.Hotfix.csproj
  2. 0 0
      Apps/Hotfix/Server/Gate/C2G_EnterMapHandler.cs
  3. 0 0
      Apps/Hotfix/Server/Gate/C2G_LoginGateHandler.cs
  4. 0 0
      Apps/Hotfix/Server/Gate/C2G_PingHandler.cs
  5. 0 0
      Apps/Hotfix/Server/Gate/GateSessionKeyComponentSystem.cs
  6. 0 0
      Apps/Hotfix/Server/Gate/PlayerComponentSystem.cs
  7. 0 0
      Apps/Hotfix/Server/Gate/PlayerSystem.cs
  8. 0 0
      Apps/Hotfix/Server/Gate/R2G_GetLoginKeyHandler.cs
  9. 0 0
      Apps/Hotfix/Server/Gate/SessionPlayerComponentSystem.cs
  10. 0 0
      Apps/Hotfix/Server/Helper/InnerMessageDispatcherHelper.cs
  11. 0 0
      Apps/Hotfix/Server/Helper/MessageHelper.cs
  12. 0 0
      Apps/Hotfix/Server/Helper/SceneFactory.cs
  13. 0 0
      Apps/Hotfix/Server/Helper/SessionStreamDispatcherServerInner.cs
  14. 0 0
      Apps/Hotfix/Server/Helper/SessionStreamDispatcherServerOuter.cs
  15. 0 0
      Apps/Hotfix/Server/Map/AOI/ChangePosition_NotifyAOI.cs
  16. 0 0
      Apps/Hotfix/Server/Map/C2M_TestRobotCaseHandler.cs
  17. 0 0
      Apps/Hotfix/Server/Map/G2M_SessionDisconnectHandler.cs
  18. 0 0
      Apps/Hotfix/Server/Map/Move/C2M_PathfindingResultHandler.cs
  19. 0 0
      Apps/Hotfix/Server/Map/Move/C2M_StopHandler.cs
  20. 0 0
      Apps/Hotfix/Server/Map/Move/MoveHelper.cs
  21. 0 0
      Apps/Hotfix/Server/Map/Transfer/C2M_TransferMapHandler.cs
  22. 0 0
      Apps/Hotfix/Server/Map/Transfer/M2M_UnitTransferRequestHandler.cs
  23. 0 0
      Apps/Hotfix/Server/Map/Transfer/TransferHelper.cs
  24. 0 0
      Apps/Hotfix/Server/Map/Unit/UnitEnterSightRange_NotifyClient.cs
  25. 0 0
      Apps/Hotfix/Server/Map/Unit/UnitFactory.cs
  26. 0 0
      Apps/Hotfix/Server/Map/Unit/UnitGateComponentSystem.cs
  27. 0 0
      Apps/Hotfix/Server/Map/Unit/UnitHelper.cs
  28. 0 0
      Apps/Hotfix/Server/Map/Unit/UnitLeaveSightRange_NotifyClient.cs
  29. 0 0
      Apps/Hotfix/Server/Realm/C2R_LoginHandler.cs
  30. 0 0
      Apps/Hotfix/Server/Realm/RealmGateAddressHelper.cs
  31. 3 0
      Apps/Model/Apps.Model.csproj
  32. 0 0
      Apps/Model/Server/Gate/GateMapComponent.cs
  33. 0 0
      Apps/Model/Server/Gate/GateSessionKeyComponent.cs
  34. 0 0
      Apps/Model/Server/Gate/Player.cs
  35. 0 0
      Apps/Model/Server/Gate/PlayerComponent.cs
  36. 0 0
      Apps/Model/Server/Gate/SessionInfoComponent.cs
  37. 0 0
      Apps/Model/Server/Gate/SessionPlayerComponent.cs
  38. 0 0
      Apps/Model/Server/Map/Recast/RecastFileReader.cs
  39. 0 0
      Apps/Model/Server/Map/Unit/UnitGateComponent.cs
  40. 3 7
      Book/1.1运行指南.md
  41. 0 0
      Unity/Codes/Model/Module/ETTask/ETCancelationTokenHelper.cs

+ 1 - 1
Apps/Hotfix/Apps.Hotfix.csproj

@@ -30,7 +30,7 @@
         </Compile>
 
         <Compile Include="..\..\Unity\Codes\Hotfix\Share\**\*.cs">
-            <Link>Share\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>Share\%(RecursiveDir)%(FileName)%(Extension)</Link> 
         </Compile>
     </ItemGroup>
     <ItemGroup>

+ 0 - 0
Apps/Hotfix/Server/C2G_EnterMapHandler.cs → Apps/Hotfix/Server/Gate/C2G_EnterMapHandler.cs


+ 0 - 0
Apps/Hotfix/Server/C2G_LoginGateHandler.cs → Apps/Hotfix/Server/Gate/C2G_LoginGateHandler.cs


+ 0 - 0
Apps/Hotfix/Server/C2G_PingHandler.cs → Apps/Hotfix/Server/Gate/C2G_PingHandler.cs


+ 0 - 0
Apps/Hotfix/Server/GateSessionKeyComponentSystem.cs → Apps/Hotfix/Server/Gate/GateSessionKeyComponentSystem.cs


+ 0 - 0
Apps/Hotfix/Server/PlayerComponentSystem.cs → Apps/Hotfix/Server/Gate/PlayerComponentSystem.cs


+ 0 - 0
Apps/Hotfix/Server/PlayerSystem.cs → Apps/Hotfix/Server/Gate/PlayerSystem.cs


+ 0 - 0
Apps/Hotfix/Server/R2G_GetLoginKeyHandler.cs → Apps/Hotfix/Server/Gate/R2G_GetLoginKeyHandler.cs


+ 0 - 0
Apps/Hotfix/Server/SessionPlayerComponentSystem.cs → Apps/Hotfix/Server/Gate/SessionPlayerComponentSystem.cs


+ 0 - 0
Apps/Hotfix/Server/Session/InnerMessageDispatcherHelper.cs → Apps/Hotfix/Server/Helper/InnerMessageDispatcherHelper.cs


+ 0 - 0
Apps/Hotfix/Server/MessageHelper.cs → Apps/Hotfix/Server/Helper/MessageHelper.cs


+ 0 - 0
Apps/Hotfix/Server/Scene/SceneFactory.cs → Apps/Hotfix/Server/Helper/SceneFactory.cs


+ 0 - 0
Apps/Hotfix/Server/Session/SessionStreamDispatcherServerInner.cs → Apps/Hotfix/Server/Helper/SessionStreamDispatcherServerInner.cs


+ 0 - 0
Apps/Hotfix/Server/Session/SessionStreamDispatcherServerOuter.cs → Apps/Hotfix/Server/Helper/SessionStreamDispatcherServerOuter.cs


+ 0 - 0
Apps/Hotfix/Server/AOI/ChangePosition_NotifyAOI.cs → Apps/Hotfix/Server/Map/AOI/ChangePosition_NotifyAOI.cs


+ 0 - 0
Apps/Hotfix/Server/C2M_TestRobotCaseHandler.cs → Apps/Hotfix/Server/Map/C2M_TestRobotCaseHandler.cs


+ 0 - 0
Apps/Hotfix/Server/G2M_SessionDisconnectHandler.cs → Apps/Hotfix/Server/Map/G2M_SessionDisconnectHandler.cs


+ 0 - 0
Apps/Hotfix/Server/C2M_PathfindingResultHandler.cs → Apps/Hotfix/Server/Map/Move/C2M_PathfindingResultHandler.cs


+ 0 - 0
Apps/Hotfix/Server/C2M_StopHandler.cs → Apps/Hotfix/Server/Map/Move/C2M_StopHandler.cs


+ 0 - 0
Apps/Hotfix/Server/Move/MoveHelper.cs → Apps/Hotfix/Server/Map/Move/MoveHelper.cs


+ 0 - 0
Apps/Hotfix/Server/Scene/C2M_TransferMapHandler.cs → Apps/Hotfix/Server/Map/Transfer/C2M_TransferMapHandler.cs


+ 0 - 0
Apps/Hotfix/Server/M2M_UnitTransferRequestHandler.cs → Apps/Hotfix/Server/Map/Transfer/M2M_UnitTransferRequestHandler.cs


+ 0 - 0
Apps/Hotfix/Server/Transfer/TransferHelper.cs → Apps/Hotfix/Server/Map/Transfer/TransferHelper.cs


+ 0 - 0
Apps/Hotfix/Server/Unit/UnitEnterSightRange_NotifyClient.cs → Apps/Hotfix/Server/Map/Unit/UnitEnterSightRange_NotifyClient.cs


+ 0 - 0
Apps/Hotfix/Server/Unit/UnitFactory.cs → Apps/Hotfix/Server/Map/Unit/UnitFactory.cs


+ 0 - 0
Apps/Hotfix/Server/Unit/UnitGateComponentSystem.cs → Apps/Hotfix/Server/Map/Unit/UnitGateComponentSystem.cs


+ 0 - 0
Apps/Hotfix/Server/Unit/UnitHelper.cs → Apps/Hotfix/Server/Map/Unit/UnitHelper.cs


+ 0 - 0
Apps/Hotfix/Server/Unit/UnitLeaveSightRange_NotifyClient.cs → Apps/Hotfix/Server/Map/Unit/UnitLeaveSightRange_NotifyClient.cs


+ 0 - 0
Apps/Hotfix/Server/C2R_LoginHandler.cs → Apps/Hotfix/Server/Realm/C2R_LoginHandler.cs


+ 0 - 0
Apps/Hotfix/Server/RealmGateAddressHelper.cs → Apps/Hotfix/Server/Realm/RealmGateAddressHelper.cs


+ 3 - 0
Apps/Model/Apps.Model.csproj

@@ -44,4 +44,7 @@
         <ProjectReference Include="..\ThirdParty\Apps.ThirdParty.csproj" />
         <ProjectReference Include="..\..\Share\Analyzer\Share.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Server\Map" />
+    </ItemGroup>
 </Project>

+ 0 - 0
Apps/Model/Server/Scene/GateMapComponent.cs → Apps/Model/Server/Gate/GateMapComponent.cs


+ 0 - 0
Apps/Model/Server/GateSessionKeyComponent.cs → Apps/Model/Server/Gate/GateSessionKeyComponent.cs


+ 0 - 0
Apps/Model/Server/Player.cs → Apps/Model/Server/Gate/Player.cs


+ 0 - 0
Apps/Model/Server/PlayerComponent.cs → Apps/Model/Server/Gate/PlayerComponent.cs


+ 0 - 0
Apps/Model/Server/SessionInfoComponent.cs → Apps/Model/Server/Gate/SessionInfoComponent.cs


+ 0 - 0
Apps/Model/Server/SessionPlayerComponent.cs → Apps/Model/Server/Gate/SessionPlayerComponent.cs


+ 0 - 0
Apps/Model/Server/Recast/RecastFileReader.cs → Apps/Model/Server/Map/Recast/RecastFileReader.cs


+ 0 - 0
Apps/Model/Server/Unit/UnitGateComponent.cs → Apps/Model/Server/Map/Unit/UnitGateComponent.cs


+ 3 - 7
Book/1.1运行指南.md

@@ -7,13 +7,13 @@
      - 需要安装"使用Unity的游戏开发"扩展。
      - 需要在"工具-选项-适用于Unity的工具-常规"里,把杂项里的禁止完整生成项目改为False,否则导致你Codes目录里的代码报错。
 
-2. 使用Rider2021.2.2(更新到最新版), 需要安装以下内容:
+2. 使用Rider2021.1.2(更新到最新版), 需要安装以下内容:
    - Rider的Unity插件  
    - 安装 .net6  
    - 2021.2.2 会报".NET SDK 6.0.101 is not fully supported in Rider",但实际不影响编译(2021.12.21)
    - 2021.3.x 完全支持 .net6
 
-3. master分支需要unity2020.3版(用到了C#8的语法)  
+3. master分支需要unity2021.3版(用到了C#10的语法)  
 
 4. 启动Unity, 菜单 File -> Open Project... -> Open 选中ET/Unity文件夹,点击选择文件夹按钮。  
 
@@ -21,11 +21,7 @@
 
 6. 运行Unity菜单上的 Tools->BuildCode,这一步将编译客户端代码  
 
-7. 用Rider打开 ET/Client-Server.sln 编译(**一定要全部工程编译,右键VS解决方案,全部编译**)
-   这里报红发现引用错误,是因为Unity的库还没编译到Unity/Temp/Debug目录下面,一般不用管,必须保证Unity是开启的,然后只需要直接编译Client-Server即可,
-   Client-Server会编译Unity.Mono。Unity.Mono会把自己依赖的Unity的库复制到Unity/Temp/Debug中。Unity.Model Unity.Hotfix 
-   Unity.ModelView UnityHotfix.View都会依赖Unity/Temp/Debug下的库。如果还是爆红,关闭vs或者rider,先打开unity,再打开Client-Server.sln,再
-   编译Client-Server   
+7. 用Rider打开 ET/ET.sln 编译(**一定要全部工程编译,右键VS解决方案,全部编译**)  
 
 8.  导表工具,编译完成后Unity菜单 Tools->ExcelExporter  
 

+ 0 - 0
Unity/Codes/Model/Share/ETCancelationTokenHelper.cs → Unity/Codes/Model/Module/ETTask/ETCancelationTokenHelper.cs