Przeglądaj źródła

Hotfix放到Unity中,利用asmdef自动生成Hotfix.dll, 带来巨大方便:
1.不用再处理Hotfix工程的引用了
2.ILRuntime宏只需要修改Unity中的就行了
3.不必要每次都去编译Hotfix了
4.log双击利用Console插件能够方便的跳到Hotfix的代码中
5.Unity2018兼容应该十分简单了

tanghai 7 lat temu
rodzic
commit
807c5f7055
100 zmienionych plików z 733 dodań i 248 usunięć
  1. 45 75
      Client-Server.sln
  2. 1 1
      Server/Hotfix/Server.Hotfix.csproj
  3. 100 100
      Server/Model/Server.Model.csproj
  4. 51 21
      Server/ThirdParty/Google.Protobuf/Google.Protobuf.csproj
  5. 5 3
      Server/ThirdParty/Libs/KcpLib.csproj
  6. 42 29
      Unity/Assets/Editor/BuildEditor/BuildHotifxEditor.cs
  7. 3 3
      Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs
  8. 10 0
      Unity/Assets/Editor/Unity.Editor.asmdef
  9. 7 0
      Unity/Assets/Editor/Unity.Editor.asmdef.meta
  10. 1 1
      Unity/Assets/Hotfix.meta
  11. 1 1
      Unity/Assets/Hotfix/Base.meta
  12. 8 0
      Unity/Assets/Hotfix/Base/Event.meta
  13. 0 0
      Unity/Assets/Hotfix/Base/Event/EventIdType.cs
  14. 2 3
      Unity/Assets/Hotfix/Base/Event/EventIdType.cs.meta
  15. 0 0
      Unity/Assets/Hotfix/Base/Event/IEvent.cs
  16. 2 3
      Unity/Assets/Hotfix/Base/Event/IEvent.cs.meta
  17. 8 0
      Unity/Assets/Hotfix/Base/Helper.meta
  18. 0 0
      Unity/Assets/Hotfix/Base/Helper/ArrayHelper.cs
  19. 11 0
      Unity/Assets/Hotfix/Base/Helper/ArrayHelper.cs.meta
  20. 0 0
      Unity/Assets/Hotfix/Base/Helper/AssetBundleHelper.cs
  21. 11 0
      Unity/Assets/Hotfix/Base/Helper/AssetBundleHelper.cs.meta
  22. 0 0
      Unity/Assets/Hotfix/Base/Helper/ExceptionHelper.cs
  23. 11 0
      Unity/Assets/Hotfix/Base/Helper/ExceptionHelper.cs.meta
  24. 0 0
      Unity/Assets/Hotfix/Base/Helper/JsonHelper.cs
  25. 11 0
      Unity/Assets/Hotfix/Base/Helper/JsonHelper.cs.meta
  26. 0 0
      Unity/Assets/Hotfix/Base/Helper/Log.cs
  27. 11 0
      Unity/Assets/Hotfix/Base/Helper/Log.cs.meta
  28. 8 0
      Unity/Assets/Hotfix/Base/Object.meta
  29. 0 0
      Unity/Assets/Hotfix/Base/Object/Component.cs
  30. 11 0
      Unity/Assets/Hotfix/Base/Object/Component.cs.meta
  31. 0 0
      Unity/Assets/Hotfix/Base/Object/ComponentFactory.cs
  32. 11 0
      Unity/Assets/Hotfix/Base/Object/ComponentFactory.cs.meta
  33. 0 0
      Unity/Assets/Hotfix/Base/Object/ComponentWithId.cs
  34. 11 0
      Unity/Assets/Hotfix/Base/Object/ComponentWithId.cs.meta
  35. 0 0
      Unity/Assets/Hotfix/Base/Object/Entity.cs
  36. 11 0
      Unity/Assets/Hotfix/Base/Object/Entity.cs.meta
  37. 0 0
      Unity/Assets/Hotfix/Base/Object/EntityType.cs
  38. 11 0
      Unity/Assets/Hotfix/Base/Object/EntityType.cs.meta
  39. 0 0
      Unity/Assets/Hotfix/Base/Object/EventSystem.cs
  40. 11 0
      Unity/Assets/Hotfix/Base/Object/EventSystem.cs.meta
  41. 0 0
      Unity/Assets/Hotfix/Base/Object/IAwakeSystem.cs
  42. 11 0
      Unity/Assets/Hotfix/Base/Object/IAwakeSystem.cs.meta
  43. 0 0
      Unity/Assets/Hotfix/Base/Object/IChangeSystem.cs
  44. 11 0
      Unity/Assets/Hotfix/Base/Object/IChangeSystem.cs.meta
  45. 0 0
      Unity/Assets/Hotfix/Base/Object/IComponentSerialize.cs
  46. 11 0
      Unity/Assets/Hotfix/Base/Object/IComponentSerialize.cs.meta
  47. 0 0
      Unity/Assets/Hotfix/Base/Object/IDestroySystem.cs
  48. 11 0
      Unity/Assets/Hotfix/Base/Object/IDestroySystem.cs.meta
  49. 0 0
      Unity/Assets/Hotfix/Base/Object/ILateUpdateSystem.cs
  50. 11 0
      Unity/Assets/Hotfix/Base/Object/ILateUpdateSystem.cs.meta
  51. 0 0
      Unity/Assets/Hotfix/Base/Object/ILoadSystem.cs
  52. 11 0
      Unity/Assets/Hotfix/Base/Object/ILoadSystem.cs.meta
  53. 0 0
      Unity/Assets/Hotfix/Base/Object/ISerializeToEntity.cs
  54. 11 0
      Unity/Assets/Hotfix/Base/Object/ISerializeToEntity.cs.meta
  55. 0 0
      Unity/Assets/Hotfix/Base/Object/IStartSystem.cs
  56. 11 0
      Unity/Assets/Hotfix/Base/Object/IStartSystem.cs.meta
  57. 0 0
      Unity/Assets/Hotfix/Base/Object/IUpdateSystem.cs
  58. 11 0
      Unity/Assets/Hotfix/Base/Object/IUpdateSystem.cs.meta
  59. 0 0
      Unity/Assets/Hotfix/Base/Object/Object.cs
  60. 11 0
      Unity/Assets/Hotfix/Base/Object/Object.cs.meta
  61. 0 0
      Unity/Assets/Hotfix/Base/Object/ObjectPool.cs
  62. 11 0
      Unity/Assets/Hotfix/Base/Object/ObjectPool.cs.meta
  63. 8 0
      Unity/Assets/Hotfix/Entity.meta
  64. 8 0
      Unity/Assets/Hotfix/Entity/Config.meta
  65. 0 0
      Unity/Assets/Hotfix/Entity/Config/UnitConfig.cs
  66. 11 0
      Unity/Assets/Hotfix/Entity/Config/UnitConfig.cs.meta
  67. 0 0
      Unity/Assets/Hotfix/Entity/Game.cs
  68. 11 0
      Unity/Assets/Hotfix/Entity/Game.cs.meta
  69. 0 0
      Unity/Assets/Hotfix/Entity/Scene.cs
  70. 11 0
      Unity/Assets/Hotfix/Entity/Scene.cs.meta
  71. 0 0
      Unity/Assets/Hotfix/Init.cs
  72. 11 0
      Unity/Assets/Hotfix/Init.cs.meta
  73. 8 0
      Unity/Assets/Hotfix/Module.meta
  74. 8 0
      Unity/Assets/Hotfix/Module/Config.meta
  75. 0 0
      Unity/Assets/Hotfix/Module/Config/ACategory.cs
  76. 2 3
      Unity/Assets/Hotfix/Module/Config/ACategory.cs.meta
  77. 0 0
      Unity/Assets/Hotfix/Module/Config/ConfigComponent.cs
  78. 2 2
      Unity/Assets/Hotfix/Module/Config/ConfigComponent.cs.meta
  79. 0 0
      Unity/Assets/Hotfix/Module/Config/ConfigHelper.cs
  80. 2 3
      Unity/Assets/Hotfix/Module/Config/ConfigHelper.cs.meta
  81. 0 0
      Unity/Assets/Hotfix/Module/Config/IConfig.cs
  82. 11 0
      Unity/Assets/Hotfix/Module/Config/IConfig.cs.meta
  83. 8 0
      Unity/Assets/Hotfix/Module/FrameSync.meta
  84. 0 0
      Unity/Assets/Hotfix/Module/FrameSync/Actor_CreateUnitsHandler.cs
  85. 11 0
      Unity/Assets/Hotfix/Module/FrameSync/Actor_CreateUnitsHandler.cs.meta
  86. 0 0
      Unity/Assets/Hotfix/Module/FrameSync/Actor_TestHandler.cs
  87. 11 0
      Unity/Assets/Hotfix/Module/FrameSync/Actor_TestHandler.cs.meta
  88. 0 0
      Unity/Assets/Hotfix/Module/FrameSync/Frame_ClickMapHandler.cs
  89. 11 0
      Unity/Assets/Hotfix/Module/FrameSync/Frame_ClickMapHandler.cs.meta
  90. 0 0
      Unity/Assets/Hotfix/Module/FrameSync/G2C_TestHotfixHandler.cs
  91. 11 0
      Unity/Assets/Hotfix/Module/FrameSync/G2C_TestHotfixHandler.cs.meta
  92. 0 0
      Unity/Assets/Hotfix/Module/FrameSync/OperaComponent.cs
  93. 11 0
      Unity/Assets/Hotfix/Module/FrameSync/OperaComponent.cs.meta
  94. 0 0
      Unity/Assets/Hotfix/Module/FrameSync/TestHotfixSubscribMonoEvent_LogString.cs
  95. 11 0
      Unity/Assets/Hotfix/Module/FrameSync/TestHotfixSubscribMonoEvent_LogString.cs.meta
  96. 8 0
      Unity/Assets/Hotfix/Module/Message.meta
  97. 0 0
      Unity/Assets/Hotfix/Module/Message/AMHandler.cs
  98. 11 0
      Unity/Assets/Hotfix/Module/Message/AMHandler.cs.meta
  99. 0 0
      Unity/Assets/Hotfix/Module/Message/HotfixMessage.cs
  100. 11 0
      Unity/Assets/Hotfix/Module/Message/HotfixMessage.cs.meta

+ 45 - 75
Client-Server.sln

@@ -3,22 +3,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Plugins", "Unity\Unity.Plugins.csproj", "{D1FDB199-0FB7-099D-3771-C6A942E4E326}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity", "Unity\Unity.csproj", "{CF118143-7E37-744F-BE45-3F55345FEC40}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Hotfix\Unity.Hotfix.csproj", "{40533600-4E69-4F7D-A924-E1A3B4127255}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{914C77C9-212A-4DD0-8D9A-074620E77FAA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{78640FA0-9F11-412D-A639-61F03D02407A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor.Plugins", "Unity\Unity.Editor.Plugins.csproj", "{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.App", "Server\App\Server.App.csproj", "{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.Model", "Server\Model\Server.Model.csproj", "{EE38E3D2-3D2A-4061-BD50-AE8568126C7D}"
@@ -37,6 +27,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf", "Server\T
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KcpLib", "Server\ThirdParty\Libs\KcpLib.csproj", "{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{6396AEEA-8EF9-9740-4CEF-891CC997106C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{350246F3-F094-675F-855B-FB9B18C2B23E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Editor", "Unity\Unity.Editor.csproj", "{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,66 +43,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x64.Build.0 = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Debug|x86.Build.0 = Debug|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x64.ActiveCfg = Release|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x64.Build.0 = Release|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x86.ActiveCfg = Release|Any CPU
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326}.Release|x86.Build.0 = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x64.Build.0 = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Debug|x86.Build.0 = Debug|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x64.ActiveCfg = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x64.Build.0 = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x86.ActiveCfg = Release|Any CPU
-		{CF118143-7E37-744F-BE45-3F55345FEC40}.Release|x86.Build.0 = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x64.Build.0 = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Debug|x86.Build.0 = Debug|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x64.ActiveCfg = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x64.Build.0 = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x86.ActiveCfg = Release|Any CPU
-		{40533600-4E69-4F7D-A924-E1A3B4127255}.Release|x86.Build.0 = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.Build.0 = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.Build.0 = Debug|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.ActiveCfg = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.Build.0 = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.ActiveCfg = Release|Any CPU
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.Build.0 = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x64.Build.0 = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Debug|x86.Build.0 = Debug|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x64.ActiveCfg = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x64.Build.0 = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x86.ActiveCfg = Release|Any CPU
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C}.Release|x86.Build.0 = Release|Any CPU
 		{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{69F1AA11-D05A-4843-B0DD-56B5E2E212A8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -203,17 +139,48 @@ Global
 		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x64.Build.0 = Release|Any CPU
 		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x86.ActiveCfg = Release|Any CPU
 		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F}.Release|x86.Build.0 = Release|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x64.Build.0 = Debug|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Debug|x86.Build.0 = Debug|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x64.ActiveCfg = Release|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x64.Build.0 = Release|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x86.ActiveCfg = Release|Any CPU
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C}.Release|x86.Build.0 = Release|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x64.Build.0 = Debug|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Debug|x86.Build.0 = Debug|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x64.ActiveCfg = Release|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x64.Build.0 = Release|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x86.ActiveCfg = Release|Any CPU
+		{350246F3-F094-675F-855B-FB9B18C2B23E}.Release|x86.Build.0 = Release|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x64.Build.0 = Debug|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Debug|x86.Build.0 = Debug|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.ActiveCfg = Release|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x64.Build.0 = Release|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.ActiveCfg = Release|Any CPU
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D1FDB199-0FB7-099D-3771-C6A942E4E326} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{CF118143-7E37-744F-BE45-3F55345FEC40} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{40533600-4E69-4F7D-A924-E1A3B4127255} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{78640FA0-9F11-412D-A639-61F03D02407A} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{81A6E58E-BFF2-F1C8-1C4E-6316985F642C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{69F1AA11-D05A-4843-B0DD-56B5E2E212A8} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{EE38E3D2-3D2A-4061-BD50-AE8568126C7D} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{C305ED5B-8425-47A1-BEE1-85830CADC27A} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
@@ -223,6 +190,9 @@ Global
 		{831276B2-B7EB-4FD0-93E5-4D2109C78950} = {4940CE10-6652-4AC6-9D30-CF200A217643}
 		{BC06C46E-79F3-4AB6-800E-FA080CA54A0B} = {78640FA0-9F11-412D-A639-61F03D02407A}
 		{B055A8CF-EF01-4100-A73F-9A26CBBBC57F} = {78640FA0-9F11-412D-A639-61F03D02407A}
+		{6396AEEA-8EF9-9740-4CEF-891CC997106C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{350246F3-F094-675F-855B-FB9B18C2B23E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{C17F48D3-964E-E97C-3D2E-966F7A6C6D93} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 1 - 1
Server/Hotfix/Server.Hotfix.csproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Other\**" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\NetOuterComponentSystem.cs">
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\NetOuterComponentSystem.cs">
       <Link>Module\Message\NetOuterComponentSystem.cs</Link>
     </Compile>
     <EmbeddedResource Remove="Other\**" />

+ 100 - 100
Server/Model/Server.Model.csproj

@@ -17,122 +17,122 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Libs\**" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IClientActorMessage.cs">
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\IClientActorMessage.cs">
       <Link>Module\Message\IClientActorMessage.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\MessagePool.cs">
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\MessagePool.cs">
       <Link>Module\Message\MessagePool\ETModel\MessagePool.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\NetOuterComponent.cs">
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\NetOuterComponent.cs">
       <Link>Module\Message\NetOuterComponent.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\WebSocket\WChannel.cs">
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\WebSocket\WChannel.cs">
       <Link>Module\Message\Network\WebSocket\WChannel.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\WebSocket\WService.cs">
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\WebSocket\WService.cs">
       <Link>Module\Message\Network\WebSocket\WService.cs</Link>
     </Compile>
-    <Compile Include="..\..\Unity\Hotfix\Module\Message\MessagePool.cs">
+    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\MessagePool.cs">
       <Link>Module\Message\MessagePool\ETHotfix\MessagePool.cs</Link>
     </Compile>
     <EmbeddedResource Remove="Libs\**" />
     <None Remove="Libs\**" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\DoubleMap.cs" Link="Base\DoubleMap.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Event\Env.cs" Link="Base\Event\Env.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Event\EnvKey.cs" Link="Base\Event\EnvKey.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Event\EventAttribute.cs" Link="Base\Event\EventAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Event\IEvent.cs" Link="Base\Event\IEvent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\ByteHelper.cs" Link="Base\Helper\ByteHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\EnumHelper.cs" Link="Base\Helper\EnumHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\FileHelper.cs" Link="Base\Helper\FileHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\IdGenerater.cs" Link="Base\Helper\IdGenerater.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\MD5Helper.cs" Link="Base\Helper\MD5Helper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\MethodInfoHelper.cs" Link="Base\Helper\MethodInfoHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\NetHelper.cs" Link="Base\Helper\NetHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\ObjectHelper.cs" Link="Base\Helper\ObjectHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\RandomHelper.cs" Link="Base\Helper\RandomHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\StringHelper.cs" Link="Base\Helper\StringHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\TimeHelper.cs" Link="Base\Helper\TimeHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Helper\ZipHelper.cs" Link="Base\Helper\ZipHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\MultiMap.cs" Link="Base\MultiMap.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\BaseAttribute.cs" Link="Base\Base\BaseAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\Component.cs" Link="Base\Base\Component.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ComponentFactory.cs" Link="Base\Base\ComponentFactory.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ComponentWithId.cs" Link="Base\Base\ComponentWithId.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\Entity.cs" Link="Base\Base\Entity.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\EntityEventAttribute.cs" Link="Base\Base\EntityEventAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\EventProxy.cs" Link="Base\Base\EventProxy.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\EventSystem.cs" Link="Base\Base\EventSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\IAwakeSystem.cs" Link="Base\Base\IAwakeSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\IChangeSystem.cs" Link="Base\Base\IChangeSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\IComponentSerialize.cs" Link="Base\Base\IComponentSerialize.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\IDestroySystem.cs" Link="Base\Base\IDestroySystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ILateUpdateSystem.cs" Link="Base\Base\ILateUpdateSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ILoadSystem.cs" Link="Base\Base\ILoadSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ISerializeToEntity.cs" Link="Base\Base\ISerializeToEntity.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\IStartSystem.cs" Link="Base\Base\IStartSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\IUpdateSystem.cs" Link="Base\Base\IUpdateSystem.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\Object.cs" Link="Base\Base\Object.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ObjectPool.cs" Link="Base\Base\ObjectPool.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\Object\ObjectSystemAttribute.cs" Link="Base\Base\ObjectSystemAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\OneThreadSynchronizationContext.cs" Link="Base\OneThreadSynchronizationContext.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\QueueDictionary.cs" Link="Base\QueueDictionary.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\RecyclableMemoryStream\Events.cs" Link="Base\RecyclableMemoryStream\Events.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\RecyclableMemoryStream\RecyclableMemoryStream.cs" Link="Base\RecyclableMemoryStream\RecyclableMemoryStream.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\RecyclableMemoryStream\RecyclableMemoryStreamManager.cs" Link="Base\RecyclableMemoryStream\RecyclableMemoryStreamManager.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\TryLocker.cs" Link="Base\TryLocker.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Base\UnOrderMultiMap.cs" Link="Base\UnOrderMultiMap.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\ClientConfig.cs" Link="Component\Config\ClientConfig.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\DBConfig.cs" Link="Module\DB\DBConfig.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\HttpConfig.cs" Link="Module\Http\HttpConfig.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\InnerConfig.cs" Link="Module\Message\InnerConfig.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\OuterConfig.cs" Link="Module\Message\OuterConfig.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Component\TimerComponent.cs" Link="Component\TimerComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ACategory.cs" Link="Module\Config\ACategory.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ConfigAttribute.cs" Link="Module\Config\ConfigAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\IConfig.cs" Link="Module\Config\IConfig.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\FrameSync\FrameMessage.cs" Link="Module\FrameSync\FrameMessage.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\FrameSync\FrameOpcode.cs" Link="Module\FrameSync\FrameOpcode.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\AMHandler.cs" Link="Module\Message\AMHandler.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\ErrorCode.cs" Link="Module\Message\ErrorCode.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IActorMessage.cs" Link="Module\Message\IActorMessage.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IMessage.cs" Link="Module\Message\IMessage.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IMessageDispatcher.cs" Link="Module\Message\IMessageDispatcher.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IMessagePacker.cs" Link="Module\Message\IMessagePacker.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\IMHandler.cs" Link="Module\Message\IMHandler.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\MessageAttribute.cs" Link="Module\Message\MessageAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\MessageHandlerAttribute.cs" Link="Module\Message\MessageHandlerAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\MessageInfo.cs" Link="Module\Message\MessageInfo.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\NetworkComponent.cs" Link="Module\Message\NetworkComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\AChannel.cs" Link="Module\Message\Network\AChannel.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\AService.cs" Link="Module\Message\Network\AService.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\Circularbuffer.cs" Link="Module\Message\Network\Circularbuffer.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\KCP\KChannel.cs" Link="Module\Message\Network\KCP\KChannel.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\KCP\KService.cs" Link="Module\Message\Network\KCP\KService.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\NetworkHelper.cs" Link="Module\Message\Network\NetworkHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\TCP\PacketParser.cs" Link="Module\Message\Network\TCP\PacketParser.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\TCP\TChannel.cs" Link="Module\Message\Network\TCP\TChannel.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Network\TCP\TService.cs" Link="Module\Message\Network\TCP\TService.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Opcode.cs" Link="Module\Message\Opcode.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\OpcodeHelper.cs" Link="Module\Message\OpcodeHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\OpcodeTypeComponent.cs" Link="Module\Message\OpcodeTypeComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\OuterMessage.cs" Link="Module\Message\OuterMessage.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\OuterOpcode.cs" Link="Module\Message\OuterOpcode.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\ProtobufHelper.cs" Link="Module\Message\ProtobufHelper.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\ProtobufPacker.cs" Link="Module\Message\ProtobufPacker.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\RpcException.cs" Link="Module\Message\RpcException.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Session.cs" Link="Module\Message\Session.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\INumericWatcher.cs" Link="Module\Numeric\INumericWatcher.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" Link="Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericComponent.cs" Link="Module\Numeric\NumericComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericType.cs" Link="Module\Numeric\NumericType.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericWatcherAttribute.cs" Link="Module\Numeric\NumericWatcherAttribute.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericWatcherComponent.cs" Link="Module\Numeric\NumericWatcherComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Other\AppType.cs" Link="Other\AppType.cs" />
-    <Compile Include="..\..\Unity\Hotfix\Module\Message\HotfixMessage.cs" Link="Module\Message\HotfixMessage.cs" />
-    <Compile Include="..\..\Unity\Hotfix\Module\Message\HotfixOpcode.cs" Link="Module\Message\HotfixOpcode.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\DoubleMap.cs" Link="Base\DoubleMap.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Event\Env.cs" Link="Base\Event\Env.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Event\EnvKey.cs" Link="Base\Event\EnvKey.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Event\EventAttribute.cs" Link="Base\Event\EventAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Event\IEvent.cs" Link="Base\Event\IEvent.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\ByteHelper.cs" Link="Base\Helper\ByteHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\EnumHelper.cs" Link="Base\Helper\EnumHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\FileHelper.cs" Link="Base\Helper\FileHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\IdGenerater.cs" Link="Base\Helper\IdGenerater.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\MD5Helper.cs" Link="Base\Helper\MD5Helper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\MethodInfoHelper.cs" Link="Base\Helper\MethodInfoHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\NetHelper.cs" Link="Base\Helper\NetHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\ObjectHelper.cs" Link="Base\Helper\ObjectHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\RandomHelper.cs" Link="Base\Helper\RandomHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\StringHelper.cs" Link="Base\Helper\StringHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\TimeHelper.cs" Link="Base\Helper\TimeHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Helper\ZipHelper.cs" Link="Base\Helper\ZipHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\MultiMap.cs" Link="Base\MultiMap.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\BaseAttribute.cs" Link="Base\Base\BaseAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\Component.cs" Link="Base\Base\Component.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ComponentFactory.cs" Link="Base\Base\ComponentFactory.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ComponentWithId.cs" Link="Base\Base\ComponentWithId.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\Entity.cs" Link="Base\Base\Entity.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\EntityEventAttribute.cs" Link="Base\Base\EntityEventAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\EventProxy.cs" Link="Base\Base\EventProxy.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\EventSystem.cs" Link="Base\Base\EventSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\IAwakeSystem.cs" Link="Base\Base\IAwakeSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\IChangeSystem.cs" Link="Base\Base\IChangeSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\IComponentSerialize.cs" Link="Base\Base\IComponentSerialize.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\IDestroySystem.cs" Link="Base\Base\IDestroySystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ILateUpdateSystem.cs" Link="Base\Base\ILateUpdateSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ILoadSystem.cs" Link="Base\Base\ILoadSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ISerializeToEntity.cs" Link="Base\Base\ISerializeToEntity.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\IStartSystem.cs" Link="Base\Base\IStartSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\IUpdateSystem.cs" Link="Base\Base\IUpdateSystem.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\Object.cs" Link="Base\Base\Object.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ObjectPool.cs" Link="Base\Base\ObjectPool.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\Object\ObjectSystemAttribute.cs" Link="Base\Base\ObjectSystemAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\OneThreadSynchronizationContext.cs" Link="Base\OneThreadSynchronizationContext.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\QueueDictionary.cs" Link="Base\QueueDictionary.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\RecyclableMemoryStream\Events.cs" Link="Base\RecyclableMemoryStream\Events.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\RecyclableMemoryStream\RecyclableMemoryStream.cs" Link="Base\RecyclableMemoryStream\RecyclableMemoryStream.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\RecyclableMemoryStream\RecyclableMemoryStreamManager.cs" Link="Base\RecyclableMemoryStream\RecyclableMemoryStreamManager.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\TryLocker.cs" Link="Base\TryLocker.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Base\UnOrderMultiMap.cs" Link="Base\UnOrderMultiMap.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Component\Config\ClientConfig.cs" Link="Component\Config\ClientConfig.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Component\Config\DBConfig.cs" Link="Module\DB\DBConfig.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Component\Config\HttpConfig.cs" Link="Module\Http\HttpConfig.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Component\Config\InnerConfig.cs" Link="Module\Message\InnerConfig.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Component\Config\OuterConfig.cs" Link="Module\Message\OuterConfig.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Component\TimerComponent.cs" Link="Component\TimerComponent.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Config\ACategory.cs" Link="Module\Config\ACategory.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Config\ConfigAttribute.cs" Link="Module\Config\ConfigAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Config\IConfig.cs" Link="Module\Config\IConfig.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\FrameSync\FrameMessage.cs" Link="Module\FrameSync\FrameMessage.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\FrameSync\FrameOpcode.cs" Link="Module\FrameSync\FrameOpcode.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\AMHandler.cs" Link="Module\Message\AMHandler.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\ErrorCode.cs" Link="Module\Message\ErrorCode.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\IActorMessage.cs" Link="Module\Message\IActorMessage.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\IMessage.cs" Link="Module\Message\IMessage.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\IMessageDispatcher.cs" Link="Module\Message\IMessageDispatcher.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\IMessagePacker.cs" Link="Module\Message\IMessagePacker.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\IMHandler.cs" Link="Module\Message\IMHandler.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageAttribute.cs" Link="Module\Message\MessageAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageHandlerAttribute.cs" Link="Module\Message\MessageHandlerAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageInfo.cs" Link="Module\Message\MessageInfo.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\NetworkComponent.cs" Link="Module\Message\NetworkComponent.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\AChannel.cs" Link="Module\Message\Network\AChannel.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\AService.cs" Link="Module\Message\Network\AService.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\Circularbuffer.cs" Link="Module\Message\Network\Circularbuffer.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\KCP\KChannel.cs" Link="Module\Message\Network\KCP\KChannel.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\KCP\KService.cs" Link="Module\Message\Network\KCP\KService.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\NetworkHelper.cs" Link="Module\Message\Network\NetworkHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\TCP\PacketParser.cs" Link="Module\Message\Network\TCP\PacketParser.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\TCP\TChannel.cs" Link="Module\Message\Network\TCP\TChannel.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Network\TCP\TService.cs" Link="Module\Message\Network\TCP\TService.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Opcode.cs" Link="Module\Message\Opcode.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\OpcodeHelper.cs" Link="Module\Message\OpcodeHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\OpcodeTypeComponent.cs" Link="Module\Message\OpcodeTypeComponent.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\OuterMessage.cs" Link="Module\Message\OuterMessage.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\OuterOpcode.cs" Link="Module\Message\OuterOpcode.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\ProtobufHelper.cs" Link="Module\Message\ProtobufHelper.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\ProtobufPacker.cs" Link="Module\Message\ProtobufPacker.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\RpcException.cs" Link="Module\Message\RpcException.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Message\Session.cs" Link="Module\Message\Session.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Numeric\INumericWatcher.cs" Link="Module\Numeric\INumericWatcher.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" Link="Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Numeric\NumericComponent.cs" Link="Module\Numeric\NumericComponent.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Numeric\NumericType.cs" Link="Module\Numeric\NumericType.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Numeric\NumericWatcherAttribute.cs" Link="Module\Numeric\NumericWatcherAttribute.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Module\Numeric\NumericWatcherComponent.cs" Link="Module\Numeric\NumericWatcherComponent.cs" />
+    <Compile Include="..\..\Unity\Assets\Model\Other\AppType.cs" Link="Other\AppType.cs" />
+    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\HotfixMessage.cs" Link="Module\Message\HotfixMessage.cs" />
+    <Compile Include="..\..\Unity\Assets\Hotfix\Module\Message\HotfixOpcode.cs" Link="Module\Message\HotfixOpcode.cs" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.2.1" />

+ 51 - 21
Server/ThirdParty/Google.Protobuf/Google.Protobuf.csproj

@@ -15,29 +15,59 @@
     <OutputPath>..\..\..\Bin\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ByteArray.cs" Link="ByteArray.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ByteString.cs" Link="ByteString.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\CodedInputStream.cs" Link="CodedInputStream.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\CodedOutputStream.ComputeSize.cs" Link="CodedOutputStream.ComputeSize.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\CodedOutputStream.cs" Link="CodedOutputStream.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\Collections\RepeatedField.cs" Link="Collections\RepeatedField.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\Compatibility\PropertyInfoExtensions.cs" Link="Compatibility\PropertyInfoExtensions.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\Compatibility\StreamExtensions.cs" Link="Compatibility\StreamExtensions.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\FieldCodec.cs" Link="FieldCodec.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ICustomDiagnosticMessage.cs" Link="ICustomDiagnosticMessage.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\IMessage.cs" Link="IMessage.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\InvalidProtocolBufferException.cs" Link="InvalidProtocolBufferException.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\LimitedInputStream.cs" Link="LimitedInputStream.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\MessageExtensions.cs" Link="MessageExtensions.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\MessageParser.cs" Link="MessageParser.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\ProtoPreconditions.cs" Link="ProtoPreconditions.cs" />
-    <Compile Include="..\..\..\Unity\Assets\ThirdParty\Google.Protobuf\WireFormat.cs" Link="WireFormat.cs" />
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ByteArray.cs">
+      <Link>ByteArray.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ByteString.cs">
+      <Link>ByteString.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\CodedInputStream.cs">
+      <Link>CodedInputStream.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\CodedOutputStream.ComputeSize.cs">
+      <Link>CodedOutputStream.ComputeSize.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\CodedOutputStream.cs">
+      <Link>CodedOutputStream.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\FieldCodec.cs">
+      <Link>FieldCodec.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ICustomDiagnosticMessage.cs">
+      <Link>ICustomDiagnosticMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\IMessage.cs">
+      <Link>IMessage.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\InvalidProtocolBufferException.cs">
+      <Link>InvalidProtocolBufferException.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\LimitedInputStream.cs">
+      <Link>LimitedInputStream.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\MessageExtensions.cs">
+      <Link>MessageExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\MessageParser.cs">
+      <Link>MessageParser.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\PropertyInfoExtensions.cs">
+      <Link>PropertyInfoExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\ProtoPreconditions.cs">
+      <Link>ProtoPreconditions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\RepeatedField.cs">
+      <Link>RepeatedField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\StreamExtensions.cs">
+      <Link>StreamExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\..\..\Unity\Assets\Model\ThirdParty\Google.Protobuf\WireFormat.cs">
+      <Link>WireFormat.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MongodbDriver\DotNetCoreDriver\MongoDB.Bson\MongoDB.Bson.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Collections\" />
-    <Folder Include="Compatibility\" />
-  </ItemGroup>
 </Project>

+ 5 - 3
Server/ThirdParty/Libs/KcpLib.csproj

@@ -11,9 +11,6 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <OutputPath>..\..\..\Bin\</OutputPath>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\..\Unity\Assets\Scripts\Module\Message\Network\KCP\Kcp.cs" Link="Kcp.cs" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\Unity\Assets\Plugins\x86_64\kcp.dll" Link="kcp.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -27,4 +24,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\Unity\Assets\Model\Module\Message\Network\KCP\Kcp.cs">
+      <Link>Kcp.cs</Link>
+    </Compile>
+  </ItemGroup>
 </Project>

+ 42 - 29
Unity/Assets/Editor/BuildEditor/BuildHotifxEditor.cs

@@ -1,35 +1,48 @@
 using System.Diagnostics;
+using System.IO;
+using ETModel;
 using UnityEditor;
-using UnityEngine;
 
 namespace ETEditor
 {
-//#if !ASYNC && !ILRUNTIME
-//    public class BuildHotifxEditor
-//    {
-//        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad )]
-//        private static void BeforeSceneLoad ()
-//        {
-//            string batPath = $"../Tools/DevAutoCompile.bat";
-//
-//            ProcessStartInfo info = new ProcessStartInfo
-//            {
-//                FileName = batPath,
-//                WindowStyle = ProcessWindowStyle.Hidden,
-//                ErrorDialog = true,
-//                UseShellExecute = Application.platform == RuntimePlatform.WindowsEditor,
-//                Arguments = $"\"{MSBuildPath}\" \"{HotfixPath}\""
-//            };
-//
-//            Process p = Process.Start ( info );
-//            p.WaitForExit ();
-//
-//            AssetDatabase.Refresh ();
-//        }
-//
-//        private const string MSBuildPath = "D:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools\\VsDevCmd.bat";
-//
-//        private const string HotfixPath = "D:\\Projects\\Unity Project\\TDGo\\Client\\Trunk\\Client\\Hotfix\\Unity.Hotfix.csproj";
-//    }
-//#endif
+    [InitializeOnLoad]
+    public class Startup
+    {
+        private const string ScriptAssembliesDir = "Library/ScriptAssemblies";
+        private const string DebugDir = "Temp/UnityVS_bin/Debug";
+        private const string CodeDir = "Assets/Res/Code/";
+        private const string HotfixDll = "Unity.Hotfix.dll";
+        private const string HotfixPdb = "Unity.Hotfix.pdb";
+        private const string HotfixMdb = "Unity.Hotfix.dll.mdb";
+
+        static Startup()
+        {
+            string batPath = $"Tools{Path.DirectorySeparatorChar}pdb2mdb.exe";
+            
+            ProcessStartInfo info = new ProcessStartInfo
+            {
+                FileName = batPath,
+                WindowStyle = ProcessWindowStyle.Hidden,
+                ErrorDialog = true,
+                UseShellExecute = true,
+                Arguments = Path.Combine(ScriptAssembliesDir, HotfixDll)
+            };
+            
+            Process p = Process.Start ( info );
+            p.WaitForExit ();
+            
+
+            if (File.Exists(Path.Combine(DebugDir, HotfixPdb)))
+            {
+                File.Copy(Path.Combine(DebugDir, HotfixPdb), Path.Combine(CodeDir, "Hotfix.pdb.bytes"), true);
+                Log.Info($"复制Hotfix.pdb到Res/Code完成");
+            }
+            
+            File.Copy(Path.Combine(ScriptAssembliesDir, HotfixDll), Path.Combine(CodeDir, "Hotfix.dll.bytes"), true);
+            File.Copy(Path.Combine(ScriptAssembliesDir, HotfixMdb), Path.Combine(CodeDir, "Hotfix.mdb.bytes"), true);
+
+            Log.Info($"复制Hotfix.dll, Hotfix.mdb到Res/Code完成");
+            AssetDatabase.Refresh ();
+        }
+    }
 }

+ 3 - 3
Unity/Assets/Editor/Proto2CsEditor/Proto2CSEditor.cs

@@ -17,8 +17,8 @@ namespace ETEditor
 	public class Proto2CSEditor : EditorWindow
 	{
 		private const string protoPath = "../Proto/";
-		private const string clientMessagePath = "Assets/Scripts/Module/Message/";
-		private const string hotfixMessagePath = "Hotfix/Module/Message/";
+		private const string clientMessagePath = "Assets/Model/Module/Message/";
+		private const string hotfixMessagePath = "Assets/Hotfix/Module/Message/";
 		private static readonly char[] splitChars = { ' ', '\t' };
 		private static readonly List<OpcodeInfo> msgOpcode = new List<OpcodeInfo>();
 		
@@ -32,7 +32,7 @@ namespace ETEditor
 			Proto2CS("ETModel", "OuterMessage.proto", clientMessagePath, "OuterOpcode", 100);
 			
 			msgOpcode.Clear();
-			Proto2CS("ETModel", "FrameMessage.proto", "Assets/Scripts/Module/FrameSync/", "FrameOpcode", 10);
+			Proto2CS("ETModel", "FrameMessage.proto", "Assets/Model/Module/FrameSync/", "FrameOpcode", 10);
 
 			msgOpcode.Clear();
 			Proto2CS("ETHotfix", "HotfixMessage.proto", hotfixMessagePath, "HotfixOpcode", 10000);

+ 10 - 0
Unity/Assets/Editor/Unity.Editor.asmdef

@@ -0,0 +1,10 @@
+{
+    "name": "Unity.Editor",
+    "references": [
+        "Unity.Model"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": []
+}

+ 7 - 0
Unity/Assets/Editor/Unity.Editor.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 000a53018e5e7c14aa75273e1f7be8e2
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Unity/Assets/ThirdParty/Google.Protobuf/Collections.meta → Unity/Assets/Hotfix.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a10213e3b8b8c674b9390af03e71deb8
+guid: 5218b2e5df5649645b404a334d5aad62
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
Unity/Assets/ThirdParty/Google.Protobuf/Compatibility.meta → Unity/Assets/Hotfix/Base.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cfb7fc188ca11b7408a21d310543397c
+guid: b486b6f59b25fa642aee6aa32d28f5c4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 8 - 0
Unity/Assets/Hotfix/Base/Event.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5753701719ff2449bc647ac7a31fe34
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Event/EventIdType.cs → Unity/Assets/Hotfix/Base/Event/EventIdType.cs


+ 2 - 3
Unity/Hotfix/Module/Config/AConfig.cs.meta → Unity/Assets/Hotfix/Base/Event/EventIdType.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: af363bf85da8f694796a3438be6df56b
-timeCreated: 1474947006
-licenseType: Pro
+guid: 471b16be87d827f4389d4f55212aa81a
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

+ 0 - 0
Unity/Hotfix/Base/Event/IEvent.cs → Unity/Assets/Hotfix/Base/Event/IEvent.cs


+ 2 - 3
Unity/Hotfix/Module/Config/ConfigAttribute.cs.meta → Unity/Assets/Hotfix/Base/Event/IEvent.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: f3b8997482f68c0418b3982ed475def2
-timeCreated: 1475898829
-licenseType: Pro
+guid: c32ba0eec527e664badf3a7a29d8b894
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

+ 8 - 0
Unity/Assets/Hotfix/Base/Helper.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0cabbc334226763498eaba87eafba590
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Helper/ArrayHelper.cs → Unity/Assets/Hotfix/Base/Helper/ArrayHelper.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Helper/ArrayHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f2a6005fcdb22f42be4ac21e53d6bee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Helper/AssetBundleHelper.cs → Unity/Assets/Hotfix/Base/Helper/AssetBundleHelper.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Helper/AssetBundleHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f7f36b13193378e4aa88091093cd8121
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Helper/ExceptionHelper.cs → Unity/Assets/Hotfix/Base/Helper/ExceptionHelper.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Helper/ExceptionHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c7d82afb13a6ed042a9ec8a424b09637
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Helper/JsonHelper.cs → Unity/Assets/Hotfix/Base/Helper/JsonHelper.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Helper/JsonHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7cfdf084c7e13ca4f96a7a642fe59fd6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Helper/Log.cs → Unity/Assets/Hotfix/Base/Helper/Log.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Helper/Log.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 10f3df1a26afb3949bd7977673de9712
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Base/Object.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 326628f9cad8d714e999eaf89d7f9041
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/Component.cs → Unity/Assets/Hotfix/Base/Object/Component.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/Component.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c96c5a8a96fa26346b787c9c93326ccc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/ComponentFactory.cs → Unity/Assets/Hotfix/Base/Object/ComponentFactory.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/ComponentFactory.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c64e254e31a2d6d4eae9a8bf702a3411
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/ComponentWithId.cs → Unity/Assets/Hotfix/Base/Object/ComponentWithId.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/ComponentWithId.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e995f2e3932b56545828011138d084bf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/Entity.cs → Unity/Assets/Hotfix/Base/Object/Entity.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/Entity.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8b636cc8b4ed2884ab14e6fbb43cefd4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/EntityType.cs → Unity/Assets/Hotfix/Base/Object/EntityType.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/EntityType.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ea832b9e31d126945a46cc3647845351
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/EventSystem.cs → Unity/Assets/Hotfix/Base/Object/EventSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/EventSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c14736bcd1c414343ba1f641e8b49d24
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/IAwakeSystem.cs → Unity/Assets/Hotfix/Base/Object/IAwakeSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/IAwakeSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e443784a49d795e419c961a06ca9d77f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/IChangeSystem.cs → Unity/Assets/Hotfix/Base/Object/IChangeSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/IChangeSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 42f42a84140bc6e40a4f15a8a776fd9f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/IComponentSerialize.cs → Unity/Assets/Hotfix/Base/Object/IComponentSerialize.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/IComponentSerialize.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f4c02bef60f3a024eb86be6cbe51eefe
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/IDestroySystem.cs → Unity/Assets/Hotfix/Base/Object/IDestroySystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/IDestroySystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5f6f4fcc01146734980248904ec6b718
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/ILateUpdateSystem.cs → Unity/Assets/Hotfix/Base/Object/ILateUpdateSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/ILateUpdateSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 28ee4e0e85f6ebe4cba7f2e9641b810e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/ILoadSystem.cs → Unity/Assets/Hotfix/Base/Object/ILoadSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/ILoadSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 54f66da55f7fd6d4baddafe5a2aca486
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/ISerializeToEntity.cs → Unity/Assets/Hotfix/Base/Object/ISerializeToEntity.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/ISerializeToEntity.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2a8e85aac06cc0647b9c3bed19f63a98
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/IStartSystem.cs → Unity/Assets/Hotfix/Base/Object/IStartSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/IStartSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 42bd58ac809b44d42b22c62ae42b7a1b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/IUpdateSystem.cs → Unity/Assets/Hotfix/Base/Object/IUpdateSystem.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/IUpdateSystem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a73c3b31bae6f24292e7fedc5139461
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/Object.cs → Unity/Assets/Hotfix/Base/Object/Object.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/Object.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3dd57844f3c0abc419d98a2609816055
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Base/Object/ObjectPool.cs → Unity/Assets/Hotfix/Base/Object/ObjectPool.cs


+ 11 - 0
Unity/Assets/Hotfix/Base/Object/ObjectPool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f9e092aa1d82fb145ba5bb4ab80220c0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Entity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce148fd41ef597f448d8f59df8d6f581
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Entity/Config.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccf31d544df569945bd2d44bf8481e1e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Entity/Config/UnitConfig.cs → Unity/Assets/Hotfix/Entity/Config/UnitConfig.cs


+ 11 - 0
Unity/Assets/Hotfix/Entity/Config/UnitConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3ef42703c36d4014280636b1365af539
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Entity/Game.cs → Unity/Assets/Hotfix/Entity/Game.cs


+ 11 - 0
Unity/Assets/Hotfix/Entity/Game.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6e09ac15182253a4b9ea9921731125a8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Entity/Scene.cs → Unity/Assets/Hotfix/Entity/Scene.cs


+ 11 - 0
Unity/Assets/Hotfix/Entity/Scene.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cc53bf1b1d3d3ba4c953ecadc273e3d0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Init.cs → Unity/Assets/Hotfix/Init.cs


+ 11 - 0
Unity/Assets/Hotfix/Init.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3e3d9517be262a747aa77f82dd3d98f0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Module.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7d9f2f9e14522b3449495e87afa43556
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Module/Config.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f4fbb37865d0c8546be6f607c67f1713
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/Config/ACategory.cs → Unity/Assets/Hotfix/Module/Config/ACategory.cs


+ 2 - 3
Unity/Hotfix/Module/Config/ACategory.cs.meta → Unity/Assets/Hotfix/Module/Config/ACategory.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 2f769b2838d3a384e88c8b0627564a46
-timeCreated: 1474947006
-licenseType: Pro
+guid: b089511a75c4772478c74f4cfcfd6830
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

+ 0 - 0
Unity/Hotfix/Module/Config/ConfigComponent.cs → Unity/Assets/Hotfix/Module/Config/ConfigComponent.cs


+ 2 - 2
Unity/Hotfix/Module/Config/ConfigComponent.cs.meta → Unity/Assets/Hotfix/Module/Config/ConfigComponent.cs.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: c38338e46c7049bdbfaf34a0ab31cb52
-timeCreated: 1505111255
+guid: 737b42cafca02ea4ba4e091eb6f7046e
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

+ 0 - 0
Unity/Hotfix/Module/Config/ConfigHelper.cs → Unity/Assets/Hotfix/Module/Config/ConfigHelper.cs


+ 2 - 3
Unity/Hotfix/Module/Config/ConfigHelper.cs.meta → Unity/Assets/Hotfix/Module/Config/ConfigHelper.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 0e19c00909caacf4bb8cdd8e39e2e365
-timeCreated: 1477905905
-licenseType: Pro
+guid: 7a76756cd2171544bbeb6de7347f444f
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0

+ 0 - 0
Unity/Hotfix/Module/Config/IConfig.cs → Unity/Assets/Hotfix/Module/Config/IConfig.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/Config/IConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c0f4a497c0c232744a787132a1b766d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Module/FrameSync.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa155af0657177d48bf7f1f42ef761b8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/FrameSync/Actor_CreateUnitsHandler.cs → Unity/Assets/Hotfix/Module/FrameSync/Actor_CreateUnitsHandler.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/FrameSync/Actor_CreateUnitsHandler.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 14ada40722b476047abbee1b87e7a544
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/FrameSync/Actor_TestHandler.cs → Unity/Assets/Hotfix/Module/FrameSync/Actor_TestHandler.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/FrameSync/Actor_TestHandler.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 363688f81ea32cb408447cb42b3b63bf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/FrameSync/Frame_ClickMapHandler.cs → Unity/Assets/Hotfix/Module/FrameSync/Frame_ClickMapHandler.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/FrameSync/Frame_ClickMapHandler.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cac18a6c9f68dac48ae4d71734e4c52a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/FrameSync/G2C_TestHotfixHandler.cs → Unity/Assets/Hotfix/Module/FrameSync/G2C_TestHotfixHandler.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/FrameSync/G2C_TestHotfixHandler.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3d7de456f78088243b135cb59f29214b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/FrameSync/OperaComponent.cs → Unity/Assets/Hotfix/Module/FrameSync/OperaComponent.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/FrameSync/OperaComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 37047d194cf0dc44692d280313f97928
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/FrameSync/TestHotfixSubscribMonoEvent_LogString.cs → Unity/Assets/Hotfix/Module/FrameSync/TestHotfixSubscribMonoEvent_LogString.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/FrameSync/TestHotfixSubscribMonoEvent_LogString.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 66df6afb34c860445b47e7d3c62eb862
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Unity/Assets/Hotfix/Module/Message.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2fb16f2a21fc4bc4f8a2173116f4db7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/Message/AMHandler.cs → Unity/Assets/Hotfix/Module/Message/AMHandler.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/Message/AMHandler.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c833478da9922b94a8280054b3ad824d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Module/Message/HotfixMessage.cs → Unity/Assets/Hotfix/Module/Message/HotfixMessage.cs


+ 11 - 0
Unity/Assets/Hotfix/Module/Message/HotfixMessage.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a97c23c7b3ee24a46934af9d77541948
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików