Kaynağa Gözat

工程全部改成ET开头

tanghai 1 yıl önce
ebeveyn
işleme
53895bd735
43 değiştirilmiş dosya ile 284 ekleme ve 290 silme
  1. 142 142
      ET.sln
  2. 5 6
      Unity/Assets/Scripts/Hotfix/ET.Hotfix.asmdef
  3. 0 0
      Unity/Assets/Scripts/Hotfix/ET.Hotfix.asmdef.meta
  4. 7 8
      Unity/Assets/Scripts/HotfixView/ET.HotfixView.asmdef
  5. 0 0
      Unity/Assets/Scripts/HotfixView/ET.HotfixView.asmdef.meta
  6. 4 4
      Unity/Assets/Scripts/Model/ET.Model.asmdef
  7. 0 0
      Unity/Assets/Scripts/Model/ET.Model.asmdef.meta
  8. 4 5
      Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef
  9. 0 0
      Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef.meta
  10. 1 1
      Unity/Packages/com.et.core/Editor/AsmdefEditor.meta
  11. 14 7
      Unity/Packages/com.et.core/Editor/AsmdefEditor/AsmdefEditor.cs
  12. 0 0
      Unity/Packages/com.et.core/Editor/AsmdefEditor/AsmdefEditor.cs.meta
  13. 3 3
      Unity/Packages/com.et.core/Editor/ET.Core.Editor.asmdef
  14. 0 0
      Unity/Packages/com.et.core/Editor/ET.Core.Editor.asmdef.meta
  15. BIN
      Unity/Packages/com.et.core/Plugins/Share.SourceGenerator.dll
  16. 1 1
      Unity/Packages/com.et.core/Runtime/ET.Core.asmdef
  17. 0 0
      Unity/Packages/com.et.core/Runtime/ET.Core.asmdef.meta
  18. 2 2
      Unity/Packages/com.et.core/Runtime~/Hotfix/ET.Hotfix.asmdef
  19. 12 0
      Unity/Packages/com.et.core/Runtime~/HotfixView/ET.HotfixView.asmdef
  20. 0 13
      Unity/Packages/com.et.core/Runtime~/HotfixView/Unity.HotfixView.asmdef
  21. 1 2
      Unity/Packages/com.et.core/Runtime~/Model/ET.Model.asmdef
  22. 3 3
      Unity/Packages/com.et.core/Runtime~/ModelView/ET.ModelView.asmdef
  23. 0 10
      Unity/Packages/com.et.core/Runtime~/ModelView/Unity.ModelView.asmdef
  24. 1 1
      Unity/Packages/com.et.dotrecast/Runtime/ET.DotRecast.asmdef
  25. 0 0
      Unity/Packages/com.et.dotrecast/Runtime/ET.DotRecast.asmdef.meta
  26. 1 1
      Unity/Packages/com.et.loader/Editor/Assembly/AssemblyTool.cs
  27. 5 5
      Unity/Packages/com.et.loader/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs
  28. 6 6
      Unity/Packages/com.et.loader/Editor/ET.Loader.Editor.asmdef
  29. 0 0
      Unity/Packages/com.et.loader/Editor/ET.Loader.Editor.asmdef.meta
  30. 26 26
      Unity/Packages/com.et.loader/Runtime/CodeLoader.cs
  31. 3 3
      Unity/Packages/com.et.loader/Runtime/ET.Loader.asmdef
  32. 0 0
      Unity/Packages/com.et.loader/Runtime/ET.Loader.asmdef.meta
  33. 10 0
      Unity/Packages/com.et.statesync/Runtime~/Hotfix/ET.Hotfix.asmdef
  34. 0 10
      Unity/Packages/com.et.statesync/Runtime~/Hotfix/Unity.Hotfix.asmdef
  35. 13 0
      Unity/Packages/com.et.statesync/Runtime~/HotfixView/ET.HotfixView.asmdef
  36. 0 13
      Unity/Packages/com.et.statesync/Runtime~/HotfixView/Unity.HotfixView.asmdef
  37. 2 3
      Unity/Packages/com.et.statesync/Runtime~/Model/ET.Model.asmdef
  38. 9 0
      Unity/Packages/com.et.statesync/Runtime~/ModelView/ET.ModelView.asmdef
  39. 4 4
      Unity/Packages/com.et.yooassets/Runtime/ET.YooAssets.asmdef
  40. 0 0
      Unity/Packages/com.et.yooassets/Runtime/ET.YooAssets.asmdef.meta
  41. 0 11
      Unity/Packages/com.et.yooassets/Runtime/ResourcesLoaderComponent.cs.meta
  42. 0 0
      Unity/Packages/com.et.yooassets/Runtime~/ModelView/Client/ResourcesLoaderComponent.cs
  43. 5 0
      Unity/Packages/com.et.yooassets/Runtime~/ModelView/ET.ModelView.asmdef

+ 142 - 142
ET.sln

@@ -23,29 +23,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Share.Tool", "Share\Tool\Sh
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNet.Loader", "DotNet\Loader\DotNet.Loader.csproj", "{1D5E890A-C9D5-45DF-B098-73DBE39EB311}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core", "Unity\Unity.Core.csproj", "{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{36C32B5A-D491-4AD9-8E46-C8FB33880952}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader", "Unity\Unity.Loader.csproj", "{32B76B98-B8F4-F864-D1F9-50CF255042D8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.SourceGenerator", "Share\SourceGenerator\Share.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Model", "Unity\Unity.Model.csproj", "{9498BFB4-D9F5-C441-13E3-3F26F7700E29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Unity\ET.Core.csproj", "{357275F9-23B5-ED06-A723-291680D452AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Hotfix", "Unity\Unity.Hotfix.csproj", "{52F66610-896A-C4D1-9881-1A19DF7AB80E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core.Editor", "Unity\ET.Core.Editor.csproj", "{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.ModelView", "Unity\Unity.ModelView.csproj", "{C109842F-01DA-64D4-DBF2-00C6449E459E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.DotRecast", "Unity\ET.DotRecast.csproj", "{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.HotfixView", "Unity\Unity.HotfixView.csproj", "{DE4513D3-889B-5C52-8E9C-744C99AE7509}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.YooAssets", "Unity\ET.YooAssets.csproj", "{7BE873E5-6C09-7F6F-D436-69F223C79329}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.ThirdParty", "DotNet\ThirdParty\DotNet.ThirdParty.csproj", "{36C32B5A-D491-4AD9-8E46-C8FB33880952}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader", "Unity\ET.Loader.csproj", "{7426908B-F33B-16FE-D8E3-0A19FFDA947F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Loader.Editor", "Unity\Unity.Loader.Editor.csproj", "{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Loader.Editor", "Unity\ET.Loader.Editor.csproj", "{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Share.SourceGenerator", "Share\SourceGenerator\Share.SourceGenerator.csproj", "{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Model", "Unity\ET.Model.csproj", "{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.YooAssets", "Unity\Unity.YooAssets.csproj", "{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Hotfix", "Unity\ET.Hotfix.csproj", "{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.Core.Editor", "Unity\Unity.Core.Editor.csproj", "{F0862CDB-B856-8D29-9197-5F73E6754E3A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.HotfixView", "Unity\ET.HotfixView.csproj", "{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.DotRecast", "Unity\Unity.DotRecast.csproj", "{272DFC1D-7896-1A26-40B1-310C03278670}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ModelView", "Unity\ET.ModelView.csproj", "{18FC8021-2861-97B8-C06F-E793AD2027C2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -141,78 +141,6 @@ Global
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x64.Build.0 = Release|Any CPU
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x86.ActiveCfg = Release|Any CPU
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311}.Release|x86.Build.0 = Release|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x64.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Debug|x86.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x64.Build.0 = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.ActiveCfg = Debug|Any CPU
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA}.Release|x86.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x64.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Debug|x86.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x64.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x64.Build.0 = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x86.ActiveCfg = Debug|Any CPU
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8}.Release|x86.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x64.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Debug|x86.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x64.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x64.Build.0 = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x86.ActiveCfg = Debug|Any CPU
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29}.Release|x86.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x64.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Debug|x86.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x64.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x64.Build.0 = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x86.ActiveCfg = Debug|Any CPU
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E}.Release|x86.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x64.Build.0 = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.ActiveCfg = Debug|Any CPU
-		{C109842F-01DA-64D4-DBF2-00C6449E459E}.Release|x86.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x64.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x64.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x64.Build.0 = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x86.ActiveCfg = Debug|Any CPU
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509}.Release|x86.Build.0 = Debug|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -225,18 +153,6 @@ Global
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x64.Build.0 = Release|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x86.ActiveCfg = Release|Any CPU
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952}.Release|x86.Build.0 = Release|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|x64.Build.0 = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Debug|x86.Build.0 = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Release|x64.ActiveCfg = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Release|x64.Build.0 = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Release|x86.ActiveCfg = Debug|Any CPU
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3}.Release|x86.Build.0 = Debug|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -249,42 +165,126 @@ Global
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x64.Build.0 = Release|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x86.ActiveCfg = Release|Any CPU
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1}.Release|x86.Build.0 = Release|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x64.Build.0 = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Debug|x86.Build.0 = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x64.ActiveCfg = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x64.Build.0 = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x86.ActiveCfg = Debug|Any CPU
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4}.Release|x86.Build.0 = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Debug|x64.Build.0 = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Release|x64.ActiveCfg = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Release|x64.Build.0 = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Release|x86.ActiveCfg = Debug|Any CPU
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A}.Release|x86.Build.0 = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Debug|x64.Build.0 = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Debug|x86.Build.0 = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Release|x64.ActiveCfg = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Release|x64.Build.0 = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Release|x86.ActiveCfg = Debug|Any CPU
-		{272DFC1D-7896-1A26-40B1-310C03278670}.Release|x86.Build.0 = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|x64.Build.0 = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Debug|x86.Build.0 = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Release|x64.ActiveCfg = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Release|x64.Build.0 = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Release|x86.ActiveCfg = Debug|Any CPU
+		{357275F9-23B5-ED06-A723-291680D452AA}.Release|x86.Build.0 = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x64.ActiveCfg = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x64.Build.0 = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x86.ActiveCfg = Debug|Any CPU
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A}.Release|x86.Build.0 = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x64.ActiveCfg = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x64.Build.0 = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x86.ActiveCfg = Debug|Any CPU
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5}.Release|x86.Build.0 = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|x64.Build.0 = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Debug|x86.Build.0 = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Release|x64.ActiveCfg = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Release|x64.Build.0 = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Release|x86.ActiveCfg = Debug|Any CPU
+		{7BE873E5-6C09-7F6F-D436-69F223C79329}.Release|x86.Build.0 = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Debug|x64.Build.0 = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Debug|x86.Build.0 = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Release|x64.ActiveCfg = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Release|x64.Build.0 = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Release|x86.ActiveCfg = Debug|Any CPU
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F}.Release|x86.Build.0 = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Release|x64.ActiveCfg = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Release|x64.Build.0 = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Release|x86.ActiveCfg = Debug|Any CPU
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1}.Release|x86.Build.0 = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Debug|x64.Build.0 = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Debug|x86.Build.0 = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Release|x64.ActiveCfg = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Release|x64.Build.0 = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Release|x86.ActiveCfg = Debug|Any CPU
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C}.Release|x86.Build.0 = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Debug|x64.Build.0 = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Debug|x86.Build.0 = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Release|x64.ActiveCfg = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Release|x64.Build.0 = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Release|x86.ActiveCfg = Debug|Any CPU
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679}.Release|x86.Build.0 = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Debug|x64.Build.0 = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Debug|x86.Build.0 = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Release|x64.ActiveCfg = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Release|x64.Build.0 = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Release|x86.ActiveCfg = Debug|Any CPU
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83}.Release|x86.Build.0 = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Debug|x64.Build.0 = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Debug|x86.Build.0 = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x64.ActiveCfg = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x64.Build.0 = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x86.ActiveCfg = Debug|Any CPU
+		{18FC8021-2861-97B8-C06F-E793AD2027C2}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -297,18 +297,18 @@ Global
 		{FCB2EF97-BA34-49F7-B859-68E1AC98877E} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{1D028A2B-515C-49E2-923B-094CBD89BE5A} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
 		{1D5E890A-C9D5-45DF-B098-73DBE39EB311} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{770E9BEB-B313-3761-FAA2-76DAF4B34ADA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{32B76B98-B8F4-F864-D1F9-50CF255042D8} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{9498BFB4-D9F5-C441-13E3-3F26F7700E29} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{52F66610-896A-C4D1-9881-1A19DF7AB80E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{C109842F-01DA-64D4-DBF2-00C6449E459E} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{DE4513D3-889B-5C52-8E9C-744C99AE7509} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{36C32B5A-D491-4AD9-8E46-C8FB33880952} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
-		{D1A1550C-3FFD-4E4B-0C5C-7C3C432548C3} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{7053CEF4-1559-47C5-80FF-FBE7B02E50E1} = {1272AF7B-A962-4BA4-8A9C-FFA7E131A0AC}
-		{200AF2E9-4594-CE27-E3C1-E8C7A27AEDA4} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{F0862CDB-B856-8D29-9197-5F73E6754E3A} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{272DFC1D-7896-1A26-40B1-310C03278670} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{357275F9-23B5-ED06-A723-291680D452AA} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{3A94C6B6-82E5-A1A2-A312-9D8E905E8F4A} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{54AF951E-F0E6-1FFF-E0CF-41046D67CCB5} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{7BE873E5-6C09-7F6F-D436-69F223C79329} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{7426908B-F33B-16FE-D8E3-0A19FFDA947F} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{BF9559A9-174A-DAF1-DF5F-03BEE8EBF4F1} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{C3758BE1-78D5-CA86-C48D-CB9EE0875B9C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{A245516C-DF9D-4DF9-B6CB-B8E99D56D679} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{4755D7E6-9C18-87F7-9FB0-AA8AF1801E83} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{18FC8021-2861-97B8-C06F-E793AD2027C2} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 5 - 6
Unity/Assets/Scripts/Hotfix/Unity.Hotfix.asmdef → Unity/Assets/Scripts/Hotfix/ET.Hotfix.asmdef

@@ -1,14 +1,13 @@
 {
-    "name": "Unity.Hotfix",
+    "name": "ET.Hotfix",
     "rootNamespace": "ET",
     "references": [
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
         "MemoryPack",
-        "Unity.Model",
-        "Unity.ThirdParty",
-        "Unity.Loader",
-        "Unity.DotRecast"
+        "ET.Model",
+        "ET.Loader",
+        "ET.DotRecast"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 0
Unity/Assets/Scripts/Hotfix/Unity.Hotfix.asmdef.meta → Unity/Assets/Scripts/Hotfix/ET.Hotfix.asmdef.meta


+ 7 - 8
Unity/Assets/Scripts/HotfixView/Unity.HotfixView.asmdef → Unity/Assets/Scripts/HotfixView/ET.HotfixView.asmdef

@@ -1,17 +1,16 @@
 {
-    "name": "Unity.HotfixView",
+    "name": "ET.HotfixView",
     "rootNamespace": "ET",
     "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
-        "Unity.Loader",
+        "ET.Loader",
         "MemoryPack",
-        "Unity.Model",
-        "Unity.Hotfix",
-        "Unity.ModelView",
+        "ET.Model",
+        "ET.Hotfix",
+        "ET.ModelView",
         "YooAsset",
-        "Unity.YooAssets"
+        "ET.YooAssets"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 0
Unity/Assets/Scripts/HotfixView/Unity.HotfixView.asmdef.meta → Unity/Assets/Scripts/HotfixView/ET.HotfixView.asmdef.meta


+ 4 - 4
Unity/Assets/Scripts/Model/Unity.Model.asmdef → Unity/Assets/Scripts/Model/ET.Model.asmdef

@@ -1,12 +1,12 @@
 {
-    "name": "Unity.Model",
+    "name": "ET.Model",
     "rootNamespace": "ET",
     "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
         "MemoryPack",
-        "Unity.DotRecast"
+        "ET.DotRecast",
+        "YooAsset"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 0
Unity/Assets/Scripts/Model/Unity.Model.asmdef.meta → Unity/Assets/Scripts/Model/ET.Model.asmdef.meta


+ 4 - 5
Unity/Assets/Scripts/ModelView/Unity.ModelView.asmdef → Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef

@@ -1,12 +1,11 @@
 {
-    "name": "Unity.ModelView",
+    "name": "ET.ModelView",
     "rootNamespace": "ET",
     "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
-        "Unity.Loader",
-        "Unity.Model",
+        "ET.Loader",
+        "ET.Model",
         "YooAsset"
     ],
     "includePlatforms": [],

+ 0 - 0
Unity/Assets/Scripts/ModelView/Unity.ModelView.asmdef.meta → Unity/Assets/Scripts/ModelView/ET.ModelView.asmdef.meta


+ 1 - 1
Unity/Packages/com.et.loader/Editor/AsmdefEditor.meta → Unity/Packages/com.et.core/Editor/AsmdefEditor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c95794299f33df0429cfc7fa63bf5223
+guid: 29360096fda48a142a3af69d1a2a1db4
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 14 - 7
Unity/Packages/com.et.loader/Editor/AsmdefEditor/AsmdefEditor.cs → Unity/Packages/com.et.core/Editor/AsmdefEditor/AsmdefEditor.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using UnityEditor;
@@ -55,18 +56,24 @@ namespace ET.Loader
                 {
                     foreach (string assName in AssNames)
                     {
-                        string p = Path.Combine(directory, "Runtime~/" + assName + "/Unity." + assName + ".asmdef");
+                        string p = Path.Combine(directory, "Runtime~/" + assName + "/ET." + assName + ".asmdef");
                         if (!File.Exists(p))
                         {
                             continue;
                         }
 
                         string json = File.ReadAllText(p);
-                        AssemblyDefinitionAsset assemblyDefinitionAsset = JsonUtility.FromJson<AssemblyDefinitionAsset>(json);
-
-                        foreach (string reference in assemblyDefinitionAsset.references)
+                        try
+                        {
+                            AssemblyDefinitionAsset assemblyDefinitionAsset = JsonUtility.FromJson<AssemblyDefinitionAsset>(json);
+                            foreach (string reference in assemblyDefinitionAsset.references)
+                            {
+                                allRefInfo.References[assName].Add(reference);
+                            }
+                        }
+                        catch (Exception e)
                         {
-                            allRefInfo.References[assName].Add(reference);
+                            throw new Exception($"parse json error: {p} {json}");
                         }
                     }
                 }
@@ -74,7 +81,7 @@ namespace ET.Loader
 
             foreach (string assName in AssNames)
             {
-                string p = Path.Combine("Assets/Scripts/" + assName + "/Unity." + assName + ".asmdef");
+                string p = Path.Combine("Assets/Scripts/" + assName + "/ET." + assName + ".asmdef");
                 if (!File.Exists(p))
                 {
                     continue;

+ 0 - 0
Unity/Packages/com.et.loader/Editor/AsmdefEditor/AsmdefEditor.cs.meta → Unity/Packages/com.et.core/Editor/AsmdefEditor/AsmdefEditor.cs.meta


+ 3 - 3
Unity/Packages/com.et.core/Editor/Unity.Core.Editor.asmdef → Unity/Packages/com.et.core/Editor/ET.Core.Editor.asmdef

@@ -1,10 +1,10 @@
 {
-    "name": "Unity.Core.Editor",
+    "name": "ET.Core.Editor",
     "rootNamespace": "ET",
     "references": [
         "MemoryPack",
-        "Unity.Core",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "ET.Core"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 0
Unity/Packages/com.et.core/Editor/Unity.Core.Editor.asmdef.meta → Unity/Packages/com.et.core/Editor/ET.Core.Editor.asmdef.meta


BIN
Unity/Packages/com.et.core/Plugins/Share.SourceGenerator.dll


+ 1 - 1
Unity/Packages/com.et.core/Runtime/Unity.Core.asmdef → Unity/Packages/com.et.core/Runtime/ET.Core.asmdef

@@ -1,5 +1,5 @@
 {
-    "name": "Unity.Core",
+    "name": "ET.Core",
     "rootNamespace": "ET",
     "references": [
         "MemoryPack"

+ 0 - 0
Unity/Packages/com.et.core/Runtime/Unity.Core.asmdef.meta → Unity/Packages/com.et.core/Runtime/ET.Core.asmdef.meta


+ 2 - 2
Unity/Packages/com.et.statesync/Runtime~/Model/Unity.Model.asmdef → Unity/Packages/com.et.core/Runtime~/Hotfix/ET.Hotfix.asmdef

@@ -1,8 +1,8 @@
 {
     "references": [
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
         "MemoryPack",
-        "Unity.DotRecast"
+        "ET.Model"
     ]
 }

+ 12 - 0
Unity/Packages/com.et.core/Runtime~/HotfixView/ET.HotfixView.asmdef

@@ -0,0 +1,12 @@
+{
+    "references": [
+        "ET.Core",
+        "Unity.Mathematics",
+        "ET.Loader",
+        "MemoryPack",
+        "ET.Model",
+        "ET.Hotfix",
+        "ET.ModelView",
+        "YooAsset"
+    ]
+}

+ 0 - 13
Unity/Packages/com.et.core/Runtime~/HotfixView/Unity.HotfixView.asmdef

@@ -1,13 +0,0 @@
-{
-    "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
-        "Unity.Mathematics",
-        "Unity.Loader",
-        "MemoryPack",
-        "Unity.Model",
-        "Unity.Hotfix",
-        "Unity.ModelView",
-        "YooAsset"
-    ]
-}

+ 1 - 2
Unity/Packages/com.et.core/Runtime~/Model/Unity.Model.asmdef → Unity/Packages/com.et.core/Runtime~/Model/ET.Model.asmdef

@@ -1,7 +1,6 @@
 {
     "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
         "MemoryPack"
     ]

+ 3 - 3
Unity/Packages/com.et.statesync/Runtime~/ModelView/Unity.ModelView.asmdef → Unity/Packages/com.et.core/Runtime~/ModelView/ET.ModelView.asmdef

@@ -1,9 +1,9 @@
 {
     "references": [
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
-        "Unity.Loader",
-        "Unity.Model",
+        "ET.Loader",
+        "ET.Model",
         "YooAsset"
     ]
 }

+ 0 - 10
Unity/Packages/com.et.core/Runtime~/ModelView/Unity.ModelView.asmdef

@@ -1,10 +0,0 @@
-{
-    "references": [
-        "Unity.ThirdParty",
-        "Unity.Core",
-        "Unity.Mathematics",
-        "Unity.Loader",
-        "Unity.Model",
-        "YooAsset"
-    ]
-}

+ 1 - 1
Unity/Packages/com.et.dotrecast/Runtime/Unity.DotRecast.asmdef → Unity/Packages/com.et.dotrecast/Runtime/ET.DotRecast.asmdef

@@ -1,5 +1,5 @@
 {
-    "name": "Unity.DotRecast",
+    "name": "ET.DotRecast",
     "rootNamespace": "",
     "references": [],
     "includePlatforms": [],

+ 0 - 0
Unity/Packages/com.et.dotrecast/Runtime/Unity.DotRecast.asmdef.meta → Unity/Packages/com.et.dotrecast/Runtime/ET.DotRecast.asmdef.meta


+ 1 - 1
Unity/Packages/com.et.loader/Editor/Assembly/AssemblyTool.cs

@@ -16,7 +16,7 @@ namespace ET
         /// <summary>
         /// 程序集名字数组
         /// </summary>
-        public static readonly string[] DllNames = { "Unity.Hotfix", "Unity.HotfixView", "Unity.Model", "Unity.ModelView" };
+        public static readonly string[] DllNames = { "ET.Hotfix", "ET.HotfixView", "ET.Model", "ET.ModelView" };
 
         [InitializeOnLoadMethod]
         static void Initialize()

+ 5 - 5
Unity/Packages/com.et.loader/Editor/AssetPostProcessor/OnGenerateCSProjectProcessor.cs

@@ -24,26 +24,26 @@ namespace ET
                 content = content.Replace(";DEBUG;", ";");
             }
 
-            if (path.EndsWith("Unity.Core.csproj"))
+            if (path.EndsWith("ET.Core.csproj"))
             {
                 return GenerateCustomProject(content, globalConfig.CodeMode);
             }
 
-            if (path.EndsWith("Unity.Model.csproj"))
+            if (path.EndsWith("ET.Model.csproj"))
             {
                 return GenerateCustomProject(content, globalConfig.CodeMode, "Model");
             }
             
-            if (path.EndsWith("Unity.Hotfix.csproj"))
+            if (path.EndsWith("ET.Hotfix.csproj"))
             {
                 return GenerateCustomProject(content, globalConfig.CodeMode, "Hotfix");
             }
 
-            if (path.EndsWith("Unity.ModelView.csproj"))
+            if (path.EndsWith("ET.ModelView.csproj"))
             {
                 return GenerateCustomProject(content, globalConfig.CodeMode, "ModelView");
             }
-            if (path.EndsWith("Unity.HotfixView.csproj"))
+            if (path.EndsWith("ET.HotfixView.csproj"))
             {
                 return GenerateCustomProject(content, globalConfig.CodeMode, "HotfixView");
             }

+ 6 - 6
Unity/Packages/com.et.loader/Editor/Unity.Loader.Editor.asmdef → Unity/Packages/com.et.loader/Editor/ET.Loader.Editor.asmdef

@@ -1,14 +1,14 @@
 {
-    "name": "Unity.Loader.Editor",
-    "rootNamespace": "",
+    "name": "ET.Loader.Editor",
+    "rootNamespace": "ET",
     "references": [
-        "Unity.Core",
-        "Unity.Loader",
+        "ET.Core",
         "HybridCLR.Runtime",
         "HybridCLR.Editor",
         "YooAsset",
-        "Unity.Core.Editor",
-        "Unity.YooAssets"
+        "ET.YooAssets",
+        "ET.Core.Editor",
+        "ET.Loader"
     ],
     "includePlatforms": [
         "Editor"

+ 0 - 0
Unity/Packages/com.et.loader/Editor/Unity.Loader.Editor.asmdef.meta → Unity/Packages/com.et.loader/Editor/ET.Loader.Editor.asmdef.meta


+ 26 - 26
Unity/Packages/com.et.loader/Runtime/CodeLoader.cs

@@ -23,7 +23,7 @@ namespace ET
         {
             if (!Define.IsEditor)
             {
-                this.dlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/Code/Unity.Model.dll.bytes");
+                this.dlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/Code/ET.Model.dll.bytes");
                 if (Define.EnableIL2CPP)
                 {
                     this.aotDlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/AotDlls/mscorlib.dll.bytes");
@@ -37,15 +37,15 @@ namespace ET
             
             if (!Define.IsEditor)
             {
-                byte[] modelAssBytes = this.dlls["Unity.Model.dll"].bytes;
-                byte[] modelPdbBytes = this.dlls["Unity.Model.pdb"].bytes;
-                byte[] modelViewAssBytes = this.dlls["Unity.ModelView.dll"].bytes;
-                byte[] modelViewPdbBytes = this.dlls["Unity.ModelView.pdb"].bytes;
-                // 如果需要测试,可替换成下面注释的代码直接加载Assets/Bundles/Code/Unity.Model.dll.bytes,但真正打包时必须使用上面的代码
-                //modelAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Model.dll.bytes"));
-                //modelPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Model.pdb.bytes"));
-                //modelViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.ModelView.dll.bytes"));
-                //modelViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.ModelView.pdb.bytes"));
+                byte[] modelAssBytes = this.dlls["ET.Model.dll"].bytes;
+                byte[] modelPdbBytes = this.dlls["ET.Model.pdb"].bytes;
+                byte[] modelViewAssBytes = this.dlls["ET.ModelView.dll"].bytes;
+                byte[] modelViewPdbBytes = this.dlls["ET.ModelView.pdb"].bytes;
+                // 如果需要测试,可替换成下面注释的代码直接加载Assets/Bundles/Code/ET.Model.dll.bytes,但真正打包时必须使用上面的代码
+                //modelAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Model.dll.bytes"));
+                //modelPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Model.pdb.bytes"));
+                //modelViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.ModelView.dll.bytes"));
+                //modelViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.ModelView.pdb.bytes"));
 
                 if (Define.EnableIL2CPP)
                 {
@@ -60,10 +60,10 @@ namespace ET
             }
             else
             {
-                byte[] modelAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Model.dll.bytes"));
-                byte[] modelPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Model.pdb.bytes"));
-                byte[] modelViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.ModelView.dll.bytes"));
-                byte[] modelViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.ModelView.pdb.bytes"));
+                byte[] modelAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Model.dll.bytes"));
+                byte[] modelPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Model.pdb.bytes"));
+                byte[] modelViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.ModelView.dll.bytes"));
+                byte[] modelViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.ModelView.pdb.bytes"));
                 this.modelAssembly = Assembly.Load(modelAssBytes, modelPdbBytes);
                 this.modelViewAssembly = Assembly.Load(modelViewAssBytes, modelViewPdbBytes);
             }
@@ -90,24 +90,24 @@ namespace ET
             Assembly hotfixViewAssembly = null;
             if (!Define.IsEditor)
             {
-                hotfixAssBytes = this.dlls["Unity.Hotfix.dll"].bytes;
-                hotfixPdbBytes = this.dlls["Unity.Hotfix.pdb"].bytes;
-                hotfixViewAssBytes = this.dlls["Unity.HotfixView.dll"].bytes;
-                hotfixViewPdbBytes = this.dlls["Unity.HotfixView.pdb"].bytes;
+                hotfixAssBytes = this.dlls["ET.Hotfix.dll"].bytes;
+                hotfixPdbBytes = this.dlls["ET.Hotfix.pdb"].bytes;
+                hotfixViewAssBytes = this.dlls["ET.HotfixView.dll"].bytes;
+                hotfixViewPdbBytes = this.dlls["ET.HotfixView.pdb"].bytes;
                 // 如果需要测试,可替换成下面注释的代码直接加载Assets/Bundles/Code/Hotfix.dll.bytes,但真正打包时必须使用上面的代码
-                //hotfixAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Hotfix.dll.bytes"));
-                //hotfixPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Hotfix.pdb.bytes"));
-                //hotfixViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.HotfixView.dll.bytes"));
-                //hotfixViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.HotfixView.pdb.bytes"));
+                //hotfixAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Hotfix.dll.bytes"));
+                //hotfixPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Hotfix.pdb.bytes"));
+                //hotfixViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.HotfixView.dll.bytes"));
+                //hotfixViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.HotfixView.pdb.bytes"));
                 hotfixAssembly = Assembly.Load(hotfixAssBytes, hotfixPdbBytes);
                 hotfixViewAssembly = Assembly.Load(hotfixViewAssBytes, hotfixViewPdbBytes);
             }
             else
             {
-                hotfixAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Hotfix.dll.bytes"));
-                hotfixPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.Hotfix.pdb.bytes"));
-                hotfixViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.HotfixView.dll.bytes"));
-                hotfixViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "Unity.HotfixView.pdb.bytes"));
+                hotfixAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Hotfix.dll.bytes"));
+                hotfixPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.Hotfix.pdb.bytes"));
+                hotfixViewAssBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.HotfixView.dll.bytes"));
+                hotfixViewPdbBytes = File.ReadAllBytes(Path.Combine(Define.CodeDir, "ET.HotfixView.pdb.bytes"));
                 hotfixAssembly = Assembly.Load(hotfixAssBytes, hotfixPdbBytes);
                 hotfixViewAssembly = Assembly.Load(hotfixViewAssBytes, hotfixViewPdbBytes);
             }

+ 3 - 3
Unity/Packages/com.et.loader/Runtime/Unity.Loader.asmdef → Unity/Packages/com.et.loader/Runtime/ET.Loader.asmdef

@@ -1,13 +1,13 @@
 {
-    "name": "Unity.Loader",
+    "name": "ET.Loader",
     "rootNamespace": "ET",
     "references": [
-        "Unity.Core",
+        "ET.Core",
         "HybridCLR.Runtime",
         "MemoryPack",
         "YooAsset",
         "YooAsset.Editor",
-        "Unity.YooAssets"
+        "ET.YooAssets"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 0
Unity/Packages/com.et.loader/Runtime/Unity.Loader.asmdef.meta → Unity/Packages/com.et.loader/Runtime/ET.Loader.asmdef.meta


+ 10 - 0
Unity/Packages/com.et.statesync/Runtime~/Hotfix/ET.Hotfix.asmdef

@@ -0,0 +1,10 @@
+{
+    "references": [
+        "ET.Core",
+        "Unity.Mathematics",
+        "ET.Loader",
+        "MemoryPack",
+        "ET.Model",
+        "ET.DotRecast"
+    ]
+}

+ 0 - 10
Unity/Packages/com.et.statesync/Runtime~/Hotfix/Unity.Hotfix.asmdef

@@ -1,10 +0,0 @@
-{
-    "references": [
-        "Unity.Core",
-        "Unity.Mathematics",
-        "Unity.Loader",
-        "MemoryPack",
-        "Unity.Model",
-        "Unity.DotRecast"
-    ]
-}

+ 13 - 0
Unity/Packages/com.et.statesync/Runtime~/HotfixView/ET.HotfixView.asmdef

@@ -0,0 +1,13 @@
+{
+    "references": [
+        "ET.Core",
+        "Unity.Mathematics",
+        "ET.Loader",
+        "MemoryPack",
+        "ET.Model",
+        "ET.Hotfix",
+        "ET.ModelView",
+        "ET.YooAssets",
+        "YooAsset"
+    ]
+}

+ 0 - 13
Unity/Packages/com.et.statesync/Runtime~/HotfixView/Unity.HotfixView.asmdef

@@ -1,13 +0,0 @@
-{
-    "references": [
-        "Unity.Core",
-        "Unity.Mathematics",
-        "Unity.Loader",
-        "MemoryPack",
-        "Unity.Model",
-        "Unity.Hotfix",
-        "Unity.ModelView",
-        "Unity.YooAssets",
-        "YooAsset"
-    ]
-}

+ 2 - 3
Unity/Packages/com.et.core/Runtime~/Hotfix/Unity.Hotfix.asmdef → Unity/Packages/com.et.statesync/Runtime~/Model/ET.Model.asmdef

@@ -1,9 +1,8 @@
 {
     "references": [
-        "Unity.Core",
+        "ET.Core",
         "Unity.Mathematics",
         "MemoryPack",
-        "Unity.Model",
-        "Unity.ThirdParty"
+        "ET.DotRecast"
     ]
 }

+ 9 - 0
Unity/Packages/com.et.statesync/Runtime~/ModelView/ET.ModelView.asmdef

@@ -0,0 +1,9 @@
+{
+    "references": [
+        "ET.Core",
+        "Unity.Mathematics",
+        "ET.Loader",
+        "ET.Model",
+        "YooAsset"
+    ]
+}

+ 4 - 4
Unity/Packages/com.et.yooassets/Runtime/Unity.YooAssets.asmdef → Unity/Packages/com.et.yooassets/Runtime/ET.YooAssets.asmdef

@@ -1,10 +1,10 @@
 {
-    "name": "Unity.YooAssets",
+    "name": "ET.YooAssets",
     "rootNamespace": "",
     "references": [
-        "GUID:e34a5702dd353724aa315fb8011f08c3",
-        "GUID:9ef2053bcf13a254ab3940a767f7b1a5",
-        "GUID:4d1926c9df5b052469a1c63448b7609a"
+        "YooAsset",
+        "ET.Core",
+        "YooAsset.Editor"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 0 - 0
Unity/Packages/com.et.yooassets/Runtime/Unity.YooAssets.asmdef.meta → Unity/Packages/com.et.yooassets/Runtime/ET.YooAssets.asmdef.meta


+ 0 - 11
Unity/Packages/com.et.yooassets/Runtime/ResourcesLoaderComponent.cs.meta

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

+ 0 - 0
Unity/Packages/com.et.yooassets/Runtime/ResourcesLoaderComponent.cs → Unity/Packages/com.et.yooassets/Runtime~/ModelView/Client/ResourcesLoaderComponent.cs


+ 5 - 0
Unity/Packages/com.et.yooassets/Runtime~/ModelView/ET.ModelView.asmdef

@@ -0,0 +1,5 @@
+{
+    "references": [
+        "YooAsset"
+    ]
+}