Forráskód Böngészése

ET9 WEBGL项目加入YIUI成功

hexiaojie 5 napja
szülő
commit
9267db18ca
100 módosított fájl, 1384 hozzáadás és 565 törlés
  1. 8 0
      Assets/GameRes.meta
  2. 8 0
      Assets/GameRes/YIUI.meta
  3. 8 0
      Assets/ProjectSettings.meta
  4. 31 0
      Assets/ProjectSettings/UIEffectProjectSettings.asset
  5. 8 0
      Assets/ProjectSettings/UIEffectProjectSettings.asset.meta
  6. 16 0
      Assets/ProjectSettings/UIParticleProjectSettings.asset
  7. 8 0
      Assets/ProjectSettings/UIParticleProjectSettings.asset.meta
  8. 30 30
      ET.sln
  9. 1 1
      Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.AssemblyInfo.cs
  10. 1 1
      Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.AssemblyInfoInputs.cache
  11. BIN
      Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.csproj.AssemblyReference.cache
  12. 1 1
      Packages/cn.etetet.core/DotNet~/obj/rider.project.model.nuget.info
  13. 1 1
      Packages/cn.etetet.core/DotNet~/obj/rider.project.restore.info
  14. 1 1
      Packages/cn.etetet.core/Scripts/Core/Share/World/EventSystem/EventSystem.cs
  15. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.dll.bytes
  16. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.dll.bytes.meta
  17. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.pdb.bytes
  18. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.pdb.bytes.meta
  19. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.dll.bytes
  20. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.dll.bytes.meta
  21. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.pdb.bytes
  22. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.pdb.bytes.meta
  23. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.Model.dll.bytes
  24. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.Model.dll.bytes.meta
  25. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.Model.pdb.bytes
  26. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.Model.pdb.bytes.meta
  27. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.dll.bytes
  28. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.dll.bytes.meta
  29. BIN
      Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.pdb.bytes
  30. 7 0
      Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.pdb.bytes.meta
  31. 1 1
      Packages/cn.etetet.loader/DotNet~/obj/Debug/ET.Loader.AssemblyInfo.cs
  32. 1 1
      Packages/cn.etetet.loader/DotNet~/obj/Debug/ET.Loader.AssemblyInfoInputs.cache
  33. BIN
      Packages/cn.etetet.loader/DotNet~/obj/Debug/ET.Loader.csproj.AssemblyReference.cache
  34. 1 1
      Packages/cn.etetet.loader/DotNet~/obj/rider.project.model.nuget.info
  35. 1 1
      Packages/cn.etetet.loader/DotNet~/obj/rider.project.restore.info
  36. 25 12
      Packages/cn.etetet.loader/Res/UniversalRenderPipelineAsset_Renderer.asset
  37. 287 411
      Packages/cn.etetet.loader/Scenes/Init.unity
  38. 1 1
      Packages/cn.etetet.mathematics/DotNet~/obj/Debug/ET.Mathematics.AssemblyInfo.cs
  39. 1 1
      Packages/cn.etetet.mathematics/DotNet~/obj/Debug/ET.Mathematics.AssemblyInfoInputs.cache
  40. 1 1
      Packages/cn.etetet.mathematics/DotNet~/obj/rider.project.model.nuget.info
  41. 1 1
      Packages/cn.etetet.mathematics/DotNet~/obj/rider.project.restore.info
  42. 1 1
      Packages/cn.etetet.proto/DotNet~/obj/Debug/ET.Proto2CS.AssemblyInfo.cs
  43. 1 1
      Packages/cn.etetet.proto/DotNet~/obj/Debug/ET.Proto2CS.AssemblyInfoInputs.cache
  44. BIN
      Packages/cn.etetet.proto/DotNet~/obj/Debug/ET.Proto2CS.csproj.AssemblyReference.cache
  45. 1 1
      Packages/cn.etetet.proto/DotNet~/obj/rider.project.model.nuget.info
  46. 1 1
      Packages/cn.etetet.proto/DotNet~/obj/rider.project.restore.info
  47. 1 1
      Packages/cn.etetet.recast/DotNet~/obj/Debug/ET.Recast.AssemblyInfo.cs
  48. 1 1
      Packages/cn.etetet.recast/DotNet~/obj/Debug/ET.Recast.AssemblyInfoInputs.cache
  49. 1 1
      Packages/cn.etetet.recast/DotNet~/obj/rider.project.model.nuget.info
  50. 1 1
      Packages/cn.etetet.recast/DotNet~/obj/rider.project.restore.info
  51. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/Debug/ET.SourceGenerator.AssemblyInfo.cs
  52. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/Debug/ET.SourceGenerator.AssemblyInfoInputs.cache
  53. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/rider.project.model.nuget.info
  54. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/rider.project.restore.info
  55. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/Debug/ET.SourceGeneratorAttribute.AssemblyInfo.cs
  56. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/Debug/ET.SourceGeneratorAttribute.AssemblyInfoInputs.cache
  57. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/rider.project.model.nuget.info
  58. 1 1
      Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/rider.project.restore.info
  59. 1 1
      Packages/cn.etetet.statesync/DotNet~/App/obj/Debug/ET.App.AssemblyInfo.cs
  60. 1 1
      Packages/cn.etetet.statesync/DotNet~/App/obj/Debug/ET.App.AssemblyInfoInputs.cache
  61. BIN
      Packages/cn.etetet.statesync/DotNet~/App/obj/Debug/ET.App.csproj.AssemblyReference.cache
  62. 1 1
      Packages/cn.etetet.statesync/DotNet~/App/obj/rider.project.model.nuget.info
  63. 1 1
      Packages/cn.etetet.statesync/DotNet~/App/obj/rider.project.restore.info
  64. 1 1
      Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/Debug/ET.Hotfix.AssemblyInfo.cs
  65. 1 1
      Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/Debug/ET.Hotfix.AssemblyInfoInputs.cache
  66. BIN
      Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/Debug/ET.Hotfix.csproj.AssemblyReference.cache
  67. 1 1
      Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/rider.project.model.nuget.info
  68. 1 1
      Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/rider.project.restore.info
  69. 5 0
      Packages/cn.etetet.statesync/DotNet~/Model/ET.Model.csproj
  70. 1 1
      Packages/cn.etetet.statesync/DotNet~/Model/obj/Debug/ET.Model.AssemblyInfo.cs
  71. 1 1
      Packages/cn.etetet.statesync/DotNet~/Model/obj/Debug/ET.Model.AssemblyInfoInputs.cache
  72. BIN
      Packages/cn.etetet.statesync/DotNet~/Model/obj/Debug/ET.Model.csproj.AssemblyReference.cache
  73. 1 1
      Packages/cn.etetet.statesync/DotNet~/Model/obj/rider.project.model.nuget.info
  74. 1 1
      Packages/cn.etetet.statesync/DotNet~/Model/obj/rider.project.restore.info
  75. 3 1
      Packages/cn.etetet.statesync/Runtime/HotfixView/ET.HotfixView.asmdef
  76. 3 1
      Packages/cn.etetet.statesync/Runtime/ModelView/ET.ModelView.asmdef
  77. 22 22
      Packages/cn.etetet.statesync/Scripts/HotfixView/Client/EntryEvent3_InitClient.cs
  78. 12 11
      Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs
  79. 12 11
      Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs
  80. 12 11
      Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs
  81. 12 11
      Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs
  82. 87 2
      Packages/cn.etetet.statesync/Settings/AssetBundleCollectorSetting.asset
  83. 1 1
      Packages/cn.etetet.ui/Scripts/HotfixView/Client/UIComponentSystem.cs
  84. 31 0
      Packages/cn.etetet.yiui3ddisplay/.github/workflows/release-package.yml
  85. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets.meta
  86. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes.meta
  87. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI.meta
  88. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay.meta
  89. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model.meta
  90. 9 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani.meta
  91. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials.meta
  92. 135 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D.mat
  93. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D.mat.meta
  94. 135 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D1.mat
  95. 8 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D1.mat.meta
  96. BIN
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Skeleton@Idle.FBX
  97. 195 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Skeleton@Idle.FBX.meta
  98. 9 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Character.meta
  99. 9 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Character/Materials.meta
  100. 102 0
      Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Character/Materials/skeleton_D.mat

+ 8 - 0
Assets/GameRes.meta

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

+ 8 - 0
Assets/GameRes/YIUI.meta

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

+ 8 - 0
Assets/ProjectSettings.meta

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

+ 31 - 0
Assets/ProjectSettings/UIEffectProjectSettings.asset

@@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &-795522981733850468
+ShaderVariantCollection:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShaderVariants
+  m_Shaders: {}
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d43f626d9b5f4d729097092ded48bdb, type: 3}
+  m_Name: UIEffectProjectSettings
+  m_EditorClassIdentifier: 
+  m_TransformSensitivity: 1
+  m_RuntimePresets: []
+  m_UseHDRColorPicker: 1
+  m_ShaderVariantCollection: {fileID: 0}
+  m_ShaderVariantRegistry:
+    m_OptionalShaders: []
+    m_Asset: {fileID: -795522981733850468}
+    m_ErrorOnUnregisteredVariant: 0
+    m_UnregisteredVariants: []

+ 8 - 0
Assets/ProjectSettings/UIEffectProjectSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 62f07e754c8c48349b34c4bd8b6b2dc3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 16 - 0
Assets/ProjectSettings/UIParticleProjectSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f22a23b9d98e440478697f4adf30e61c, type: 3}
+  m_Name: UIParticleProjectSettings
+  m_EditorClassIdentifier: 
+  m_EnableLinearToGamma: 1
+  m_HideGeneratedObjects: 1

+ 8 - 0
Assets/ProjectSettings/UIParticleProjectSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed51afcaa2ef2154991fbcfc4012d955
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 30 - 30
ET.sln

@@ -47,16 +47,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.SourceGeneratorAttribute
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.SourceGeneratorAttribute", "ET.SourceGeneratorAttribute.csproj", "{5E1B6EBA-FB66-A2AB-F74C-651931E8F8A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ExcelExporter", "Packages\cn.etetet.excel\DotNet~\ET.ExcelExporter.csproj", "{B62663F3-87CD-4FE5-892D-2FA15017CC01}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Proto2CS", "Packages\cn.etetet.proto\DotNet~\ET.Proto2CS.csproj", "{BCC88832-608F-4D7E-AFF7-4EED50D5792C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Proto.Editor", "ET.Proto.Editor.csproj", "{AD2911DA-1407-E041-BC8E-81A8F3A453CD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.StateSync.Editor", "ET.StateSync.Editor.csproj", "{05055170-2AAF-5EFE-13F5-061F10E24E87}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Excel.Editor", "ET.Excel.Editor.csproj", "{40F080E2-1F06-1013-AB14-67E667E9CFEF}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.HybridCLR.Editor", "ET.HybridCLR.Editor.csproj", "{C2034659-2D54-17D7-0888-91B326856A8C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.PackageManager.Editor", "ET.PackageManager.Editor.csproj", "{10B09A45-FE82-0C3D-8220-4D900161B77C}"
@@ -73,6 +69,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.Core", "Packages\cn.etet
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.ReferenceCollector", "ET.ReferenceCollector.csproj", "{D5DA2CE8-12C4-8C94-16BA-300EA9A943E1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.YIUIFramework", "ET.YIUIFramework.csproj", "{CB51C051-17D2-B67B-256D-C93AE9D79B60}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ET.YIUIFramework.Editor", "ET.YIUIFramework.Editor.csproj", "{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -323,18 +323,6 @@ Global
 		{5E1B6EBA-FB66-A2AB-F74C-651931E8F8A1}.Release|x64.Build.0 = Debug|Any CPU
 		{5E1B6EBA-FB66-A2AB-F74C-651931E8F8A1}.Release|x86.ActiveCfg = Debug|Any CPU
 		{5E1B6EBA-FB66-A2AB-F74C-651931E8F8A1}.Release|x86.Build.0 = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Debug|x64.Build.0 = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Debug|x86.Build.0 = Debug|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Release|x64.ActiveCfg = Release|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Release|x64.Build.0 = Release|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Release|x86.ActiveCfg = Release|Any CPU
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01}.Release|x86.Build.0 = Release|Any CPU
 		{BCC88832-608F-4D7E-AFF7-4EED50D5792C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCC88832-608F-4D7E-AFF7-4EED50D5792C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BCC88832-608F-4D7E-AFF7-4EED50D5792C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -371,18 +359,6 @@ Global
 		{05055170-2AAF-5EFE-13F5-061F10E24E87}.Release|x64.Build.0 = Debug|Any CPU
 		{05055170-2AAF-5EFE-13F5-061F10E24E87}.Release|x86.ActiveCfg = Debug|Any CPU
 		{05055170-2AAF-5EFE-13F5-061F10E24E87}.Release|x86.Build.0 = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Debug|x86.Build.0 = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Release|x64.ActiveCfg = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Release|x64.Build.0 = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Release|x86.ActiveCfg = Debug|Any CPU
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF}.Release|x86.Build.0 = Debug|Any CPU
 		{C2034659-2D54-17D7-0888-91B326856A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2034659-2D54-17D7-0888-91B326856A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2034659-2D54-17D7-0888-91B326856A8C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -479,6 +455,30 @@ Global
 		{D5DA2CE8-12C4-8C94-16BA-300EA9A943E1}.Release|x64.Build.0 = Debug|Any CPU
 		{D5DA2CE8-12C4-8C94-16BA-300EA9A943E1}.Release|x86.ActiveCfg = Debug|Any CPU
 		{D5DA2CE8-12C4-8C94-16BA-300EA9A943E1}.Release|x86.Build.0 = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Debug|x86.Build.0 = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Release|x64.ActiveCfg = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Release|x64.Build.0 = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Release|x86.ActiveCfg = Debug|Any CPU
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60}.Release|x86.Build.0 = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Release|x64.ActiveCfg = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Release|x64.Build.0 = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Release|x86.ActiveCfg = Debug|Any CPU
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -504,11 +504,9 @@ Global
 		{27C202EB-9E1D-4BDD-8AB3-B48646BD63BF} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{405111D0-13AE-45E6-A15D-95F341904DD7} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{5E1B6EBA-FB66-A2AB-F74C-651931E8F8A1} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{B62663F3-87CD-4FE5-892D-2FA15017CC01} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{BCC88832-608F-4D7E-AFF7-4EED50D5792C} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{AD2911DA-1407-E041-BC8E-81A8F3A453CD} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{05055170-2AAF-5EFE-13F5-061F10E24E87} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
-		{40F080E2-1F06-1013-AB14-67E667E9CFEF} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{C2034659-2D54-17D7-0888-91B326856A8C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{10B09A45-FE82-0C3D-8220-4D900161B77C} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 		{C372A850-105F-E609-3280-A9A3131336BD} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
@@ -517,6 +515,8 @@ Global
 		{8C08102D-FCCB-4153-AE81-7EFE85A97A62} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{04397D8D-77BB-47E8-9DEE-C886A1826EB4} = {46008B91-6EC0-448B-8D1A-D8C6D2EEBEF4}
 		{D5DA2CE8-12C4-8C94-16BA-300EA9A943E1} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{CB51C051-17D2-B67B-256D-C93AE9D79B60} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
+		{F7CBC555-82A2-17DD-40EF-D66A4353BAC0} = {914C77C9-212A-4DD0-8D9A-074620E77FAA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EABC01E3-3EB5-47EF-B46E-AAD8BB3585F1}

+ 1 - 1
Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-9df296c35a6b4542c835e29d32e7a039acc49be50474b7f1da3d4e8fef1ce1d8
+8cdb1a811736e639a40764ce357ff672f28708e21a478907ceb46983875ced0f

BIN
Packages/cn.etetet.core/DotNet~/obj/Debug/ET.Core.csproj.AssemblyReference.cache


+ 1 - 1
Packages/cn.etetet.core/DotNet~/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921356263296
+17684603516200820

+ 1 - 1
Packages/cn.etetet.core/DotNet~/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427110168038
+17684603516200820

+ 1 - 1
Packages/cn.etetet.core/Scripts/Core/Share/World/EventSystem/EventSystem.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace ET
 {
     [CodeProcess]
-    public class EventSystem: Singleton<EventSystem>, ISingletonAwake
+    public partial class EventSystem: Singleton<EventSystem>, ISingletonAwake
     {
         private class EventInfo
         {

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.dll.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d36296cbd8f529e439fadc8a1f51feb2
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.pdb.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.Hotfix.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: caa7a7c958b7b1e42ba79e8fd9e05338
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.dll.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: da3b14a7cc8c70448ac820be5733da06
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.pdb.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.HotfixView.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6f1d233f639d49d41850c96ee05ca596
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.Model.dll.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.Model.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: aefcdcba00b82d64aa5d602c31d94583
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.Model.pdb.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.Model.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 606bdaa59840a3c42865ad2be72e89bd
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.dll.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7fffe824c7728f141a4b4422f1437386
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.pdb.bytes


+ 7 - 0
Packages/cn.etetet.loader/Bundles/Code/ET.ModelView.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2cbaafcb3c938174098bb821cb46d4a0
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Packages/cn.etetet.loader/DotNet~/obj/Debug/ET.Loader.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Loader")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Loader")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Loader")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.loader/DotNet~/obj/Debug/ET.Loader.AssemblyInfoInputs.cache

@@ -1 +1 @@
-10c180634495371b76a22904276bc871fc2ff9fdbb4e8568398f20bcedaf1a58
+8d2501fdc29b5dd5603828be8f4590739e88a9909ecde79196435374da18e05f

BIN
Packages/cn.etetet.loader/DotNet~/obj/Debug/ET.Loader.csproj.AssemblyReference.cache


+ 1 - 1
Packages/cn.etetet.loader/DotNet~/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921368126985
+17684603516200820

+ 1 - 1
Packages/cn.etetet.loader/DotNet~/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427110168038
+17684603516200820

+ 25 - 12
Packages/cn.etetet.loader/Res/UniversalRenderPipelineAsset_Renderer.asset

@@ -16,20 +16,35 @@ MonoBehaviour:
     debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
       type: 3}
     hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
-    probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
-      type: 3}
-  probeVolumeResources:
-    probeVolumeDebugShader: {fileID: 0}
-    probeVolumeFragmentationDebugShader: {fileID: 0}
-    probeVolumeOffsetDebugShader: {fileID: 0}
-    probeVolumeSamplingDebugShader: {fileID: 0}
-    probeSamplingDebugMesh: {fileID: 0}
-    probeSamplingDebugTexture: {fileID: 0}
-    probeVolumeBlendStatesCS: {fileID: 0}
   m_RendererFeatures: []
   m_RendererFeatureMap: 
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  shaders:
+    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
+    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+    screenSpaceShadowPS: {fileID: 0}
+    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
+    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
+    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
+    coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
+    coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b,
+      type: 3}
+    blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
+    cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf,
+      type: 3}
+    objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
+      type: 3}
+    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+      type: 3}
+    terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144,
+      type: 3}
+    terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1,
+      type: 3}
+    terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90,
+      type: 3}
   m_AssetVersion: 2
   m_OpaqueLayerMask:
     serializedVersion: 2
@@ -48,7 +63,5 @@ MonoBehaviour:
   m_RenderingMode: 0
   m_DepthPrimingMode: 0
   m_CopyDepthMode: 0
-  m_DepthAttachmentFormat: 0
-  m_DepthTextureFormat: 0
   m_AccurateGbufferNormals: 0
   m_IntermediateTextureMode: 0

+ 287 - 411
Packages/cn.etetet.loader/Scenes/Init.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 9
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -38,12 +38,13 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 1
+  serializedVersion: 12
+  m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -66,6 +67,9 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 1024
     m_ReflectionCompression: 2
     m_MixedBakeMode: 1
     m_BakeBackend: 0
@@ -93,8 +97,7 @@ LightmapSettings:
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: e257c1ea6419d4639a659657f0d61590,
-    type: 2}
+  m_LightingDataAsset: {fileID: 0}
   m_LightingSettings: {fileID: 1972482029}
 --- !u!196 &4
 NavMeshSettings:
@@ -120,7 +123,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &251107983
+--- !u!1 &568653146
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -128,43 +131,43 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 251107984}
-  - component: {fileID: 251107987}
-  - component: {fileID: 251107986}
-  - component: {fileID: 251107985}
+  - component: {fileID: 568653147}
+  - component: {fileID: 568653150}
+  - component: {fileID: 568653149}
+  - component: {fileID: 568653148}
   m_Layer: 0
-  m_Name: Low
+  m_Name: Hidden
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &251107984
+--- !u!224 &568653147
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251107983}
+  m_GameObject: {fileID: 568653146}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1784017108}
+  m_Father: {fileID: 1637747976}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &251107985
+--- !u!114 &568653148
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251107983}
+  m_GameObject: {fileID: 568653146}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@@ -174,14 +177,14 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &251107986
+    m_Bits: 823
+--- !u!114 &568653149
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251107983}
+  m_GameObject: {fileID: 568653146}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@@ -198,17 +201,17 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
---- !u!223 &251107987
+--- !u!223 &568653150
 Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 251107983}
+  m_GameObject: {fileID: 568653146}
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 1
-  m_Camera: {fileID: 1245951406}
+  m_Camera: {fileID: 0}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -221,175 +224,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!1 &429867060
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 429867063}
-  - component: {fileID: 429867062}
-  - component: {fileID: 429867061}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &429867061
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 429867060}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &429867062
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 429867060}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 5
---- !u!4 &429867063
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 429867060}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 575235020}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &493985069
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 493985070}
-  - component: {fileID: 493985073}
-  - component: {fileID: 493985072}
-  - component: {fileID: 493985071}
-  m_Layer: 0
-  m_Name: Mid
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &493985070
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 493985069}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1784017108}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &493985071
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 493985069}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &493985072
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 493985069}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &493985073
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 493985069}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 1
-  m_Camera: {fileID: 1245951406}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 10
-  m_TargetDisplay: 0
 --- !u!1 &575235018
 GameObject:
   m_ObjectHideFlags: 0
@@ -421,12 +255,11 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 429867063}
   - {fileID: 1984349697}
-  - {fileID: 1245951402}
-  - {fileID: 1784017108}
+  - {fileID: 1637747976}
   - {fileID: 630054496}
   - {fileID: 590194895}
+  - {fileID: 1348115857}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &575235022
@@ -518,7 +351,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 575235020}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &872594939
+--- !u!1 &1070595751
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -526,43 +359,43 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 872594940}
-  - component: {fileID: 872594943}
-  - component: {fileID: 872594942}
-  - component: {fileID: 872594941}
+  - component: {fileID: 1070595752}
+  - component: {fileID: 1070595755}
+  - component: {fileID: 1070595754}
+  - component: {fileID: 1070595753}
   m_Layer: 0
-  m_Name: Hidden
+  m_Name: High
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &872594940
+--- !u!224 &1070595752
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 872594939}
+  m_GameObject: {fileID: 1070595751}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1784017108}
+  m_Father: {fileID: 1637747976}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &872594941
+--- !u!114 &1070595753
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 872594939}
+  m_GameObject: {fileID: 1070595751}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@@ -572,14 +405,14 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &872594942
+    m_Bits: 823
+--- !u!114 &1070595754
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 872594939}
+  m_GameObject: {fileID: 1070595751}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@@ -596,17 +429,17 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
---- !u!223 &872594943
+--- !u!223 &1070595755
 Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 872594939}
+  m_GameObject: {fileID: 1070595751}
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 1
-  m_Camera: {fileID: 1245951406}
+  m_Camera: {fileID: 0}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -617,9 +450,94 @@ Canvas:
   m_AdditionalShaderChannelsFlag: 0
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 20
   m_TargetDisplay: 0
---- !u!1 &1245951401
+--- !u!1001 &1348115856
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 575235020}
+    m_Modifications:
+    - target: {fileID: 1482325649894782617, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_CameraType
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5386563787761468503, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_Name
+      value: YIUIRoot
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 10000
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 10000
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4200f826ed726d4478d4d19000af33c4, type: 3}
+--- !u!4 &1348115857 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6045290631660329121, guid: 4200f826ed726d4478d4d19000af33c4,
+    type: 3}
+  m_PrefabInstance: {fileID: 1348115856}
+  m_PrefabAsset: {fileID: 0}
+--- !u!20 &1348115858 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 7867612178704196340, guid: 4200f826ed726d4478d4d19000af33c4,
+    type: 3}
+  m_PrefabInstance: {fileID: 1348115856}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1637747975
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -627,145 +545,56 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1245951402}
-  - component: {fileID: 1245951406}
-  - component: {fileID: 1245951405}
-  - component: {fileID: 1245951403}
-  - component: {fileID: 1245951404}
+  - component: {fileID: 1637747976}
+  - component: {fileID: 1637747977}
   m_Layer: 0
-  m_Name: UICamera
+  m_Name: UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1245951402
+--- !u!4 &1637747976
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1245951401}
+  m_GameObject: {fileID: 1637747975}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 568653147}
+  - {fileID: 1984398456}
+  - {fileID: 1707334244}
+  - {fileID: 1070595752}
   m_Father: {fileID: 575235020}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!81 &1245951403
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1245951401}
-  m_Enabled: 0
---- !u!114 &1245951404
+--- !u!114 &1637747977
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1245951401}
+  m_GameObject: {fileID: 1637747975}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Script: {fileID: 11500000, guid: 502d8cafd6a5a0447ab1db9a24cdcb10, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 1
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
---- !u!124 &1245951405
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1245951401}
-  m_Enabled: 1
---- !u!20 &1245951406
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1245951401}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 4
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 32
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 0
-  m_AllowMSAA: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!1 &1439952248
+  data:
+  - key: Hidden
+    gameObject: {fileID: 568653146}
+  - key: Low
+    gameObject: {fileID: 1984398455}
+  - key: Mid
+    gameObject: {fileID: 1707334243}
+  - key: High
+    gameObject: {fileID: 1070595751}
+--- !u!1 &1707334243
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -773,43 +602,43 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1439952249}
-  - component: {fileID: 1439952252}
-  - component: {fileID: 1439952251}
-  - component: {fileID: 1439952250}
+  - component: {fileID: 1707334244}
+  - component: {fileID: 1707334247}
+  - component: {fileID: 1707334246}
+  - component: {fileID: 1707334245}
   m_Layer: 0
-  m_Name: High
+  m_Name: Mid
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1439952249
+--- !u!224 &1707334244
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1439952248}
+  m_GameObject: {fileID: 1707334243}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1784017108}
+  m_Father: {fileID: 1637747976}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &1439952250
+--- !u!114 &1707334245
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1439952248}
+  m_GameObject: {fileID: 1707334243}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
@@ -819,14 +648,14 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &1439952251
+    m_Bits: 823
+--- !u!114 &1707334246
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1439952248}
+  m_GameObject: {fileID: 1707334243}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
@@ -843,17 +672,17 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
---- !u!223 &1439952252
+--- !u!223 &1707334247
 Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1439952248}
+  m_GameObject: {fileID: 1707334243}
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 1
-  m_Camera: {fileID: 1245951406}
+  m_Camera: {fileID: 0}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -864,65 +693,8 @@ Canvas:
   m_AdditionalShaderChannelsFlag: 0
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 20
+  m_SortingOrder: 10
   m_TargetDisplay: 0
---- !u!1 &1784017107
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1784017108}
-  - component: {fileID: 1784017109}
-  m_Layer: 0
-  m_Name: UI
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1784017108
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1784017107}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 872594940}
-  - {fileID: 251107984}
-  - {fileID: 493985070}
-  - {fileID: 1439952249}
-  m_Father: {fileID: 575235020}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1784017109
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1784017107}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 502d8cafd6a5a0447ab1db9a24cdcb10, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - key: Hidden
-    gameObject: {fileID: 872594939}
-  - key: Low
-    gameObject: {fileID: 251107983}
-  - key: Mid
-    gameObject: {fileID: 493985069}
-  - key: High
-    gameObject: {fileID: 1439952248}
 --- !u!850595691 &1972482029
 LightingSettings:
   m_ObjectHideFlags: 0
@@ -930,7 +702,8 @@ LightingSettings:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Settings.lighting
-  serializedVersion: 9
+  serializedVersion: 6
+  m_GIWorkflowMode: 0
   m_EnableBakedLightmaps: 1
   m_EnableRealtimeLightmaps: 1
   m_RealtimeEnvironmentLighting: 1
@@ -938,10 +711,8 @@ LightingSettings:
   m_AlbedoBoost: 1
   m_IndirectOutputScale: 1
   m_UsingShadowmask: 0
-  m_BakeBackend: 2
+  m_BakeBackend: 1
   m_LightmapMaxSize: 1024
-  m_LightmapSizeFixed: 0
-  m_UseMipmapLimits: 1
   m_BakeResolution: 40
   m_Padding: 2
   m_LightmapCompression: 2
@@ -955,11 +726,13 @@ LightingSettings:
   m_FilterMode: 1
   m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
   m_ExportTrainingData: 0
-  m_EnableWorkerProcessBaking: 1
   m_TrainingDataDestination: TrainingData
   m_RealtimeResolution: 2
   m_ForceWhiteAlbedo: 0
   m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 1024
+  m_FinalGatherFiltering: 1
   m_PVRCulling: 1
   m_PVRSampling: 1
   m_PVRDirectSampleCount: 32
@@ -983,6 +756,8 @@ LightingSettings:
   m_PVRFilteringAtrousPositionSigmaDirect: 0.5
   m_PVRFilteringAtrousPositionSigmaIndirect: 2
   m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
   m_RespectSceneVisibilityWhenBakingGI: 0
 --- !u!1 &1984349696
 GameObject:
@@ -1035,7 +810,7 @@ MonoBehaviour:
   m_RequiresOpaqueTextureOption: 2
   m_CameraType: 0
   m_Cameras:
-  - {fileID: 1245951406}
+  - {fileID: 1348115858}
   m_RendererIndex: -1
   m_VolumeLayerMask:
     serializedVersion: 2
@@ -1057,12 +832,12 @@ MonoBehaviour:
   m_RequiresColorTexture: 0
   m_Version: 2
   m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
+    quality: 3
+    frameInfluence: 0.1
+    jitterScale: 1
+    mipBias: 0
+    varianceClampScale: 0.9
+    contrastAdaptiveSharpening: 0
 --- !u!81 &1984349699
 AudioListener:
   m_ObjectHideFlags: 0
@@ -1122,6 +897,107 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
+--- !u!1 &1984398455
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1984398456}
+  - component: {fileID: 1984398459}
+  - component: {fileID: 1984398458}
+  - component: {fileID: 1984398457}
+  m_Layer: 0
+  m_Name: Low
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1984398456
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1984398455}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1637747976}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1984398457
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1984398455}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 823
+--- !u!114 &1984398458
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1984398455}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &1984398459
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1984398455}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

+ 1 - 1
Packages/cn.etetet.mathematics/DotNet~/obj/Debug/ET.Mathematics.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Mathematics")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Mathematics")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Mathematics")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.mathematics/DotNet~/obj/Debug/ET.Mathematics.AssemblyInfoInputs.cache

@@ -1 +1 @@
-185d030aa0bcfcee88c4201081b9b033784ade48437f46e85c7dfe10e92fd217
+db138ddfd17af4bbe68e61087542179effa9d19bf645e1b098f922140f6f9249

+ 1 - 1
Packages/cn.etetet.mathematics/DotNet~/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921369027133
+17684603468697413

+ 1 - 1
Packages/cn.etetet.mathematics/DotNet~/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427097221963
+17684603468697413

+ 1 - 1
Packages/cn.etetet.proto/DotNet~/obj/Debug/ET.Proto2CS.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Proto2CS")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Proto2CS")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Proto2CS")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.proto/DotNet~/obj/Debug/ET.Proto2CS.AssemblyInfoInputs.cache

@@ -1 +1 @@
-117bdac1c7045109854f57ec803ad8dc06f15e2ae2335809d80fdb26e7ebadc1
+02904585be5ceabfb39ec40b2068b03f3f8994240c53d8f8a47d9110cc757cfc

BIN
Packages/cn.etetet.proto/DotNet~/obj/Debug/ET.Proto2CS.csproj.AssemblyReference.cache


+ 1 - 1
Packages/cn.etetet.proto/DotNet~/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921372965901
+17684603516573680

+ 1 - 1
Packages/cn.etetet.proto/DotNet~/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427141055966
+17684603516573680

+ 1 - 1
Packages/cn.etetet.recast/DotNet~/obj/Debug/ET.Recast.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Recast")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Recast")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Recast")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.recast/DotNet~/obj/Debug/ET.Recast.AssemblyInfoInputs.cache

@@ -1 +1 @@
-d6a3ae0ab71f5b953c9508ecd85fbd06b0091cea85c9f4cdb501365f127d6733
+1680e4bbc36f97f4c1f22d23c0e6243fbfc0c46ae9c59f7997c30611eff1339d

+ 1 - 1
Packages/cn.etetet.recast/DotNet~/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921373165904
+17684603468697413

+ 1 - 1
Packages/cn.etetet.recast/DotNet~/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427097272154
+17684603468697413

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/Debug/ET.SourceGenerator.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.SourceGenerator")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.SourceGenerator")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.SourceGenerator")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/Debug/ET.SourceGenerator.AssemblyInfoInputs.cache

@@ -1 +1 @@
-9bc067030d7802cb9ad8d5afb513df2298a907f4fa67616deb3e967868220859
+ed1e77af7b0e5b30ba9203d164aece23565ba146ce44feb193aec79668ea9fe9

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921375135898
+17684603516164819

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGenerator/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427118167104
+17684603516164819

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/Debug/ET.SourceGeneratorAttribute.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.SourceGeneratorAttribute")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.SourceGeneratorAttribute")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.SourceGeneratorAttribute")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/Debug/ET.SourceGeneratorAttribute.AssemblyInfoInputs.cache

@@ -1 +1 @@
-76bdad020a218a409e6fe07fe38e51fa74ebb6f93939dde3e08cee666760220e
+74bad27f7ea3c1e12edf3c9ab16845dee12ad620b2e2a06d7043ead8a6e2f822

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921375195899
+17684603516114647

+ 1 - 1
Packages/cn.etetet.sourcegenerator/DotNet~/ET.SourceGeneratorAttribute/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427106094512
+17684603516114647

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/App/obj/Debug/ET.App.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.App")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.App")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.App")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/App/obj/Debug/ET.App.AssemblyInfoInputs.cache

@@ -1 +1 @@
-bb8a1adef57383a787f355a499446a428b1616ed57c6cd5d4dc06411ddda4511
+2bd72c68cf5c2fc4f168f99b76f0aa67a7280e251a573db70fff052f32a666a9

BIN
Packages/cn.etetet.statesync/DotNet~/App/obj/Debug/ET.App.csproj.AssemblyReference.cache


+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/App/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921375525930
+17684603516523559

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/App/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427110188065
+17684603516523559

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/Debug/ET.Hotfix.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Hotfix")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Hotfix")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Hotfix")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/Debug/ET.Hotfix.AssemblyInfoInputs.cache

@@ -1 +1 @@
-e0269b123c77050d102cc7f1d144c496d5c369ebe50584b976ea147d9e784659
+17567e7d6b5a3ad9772aae9cc5b177cfd2a8073caf7d75ed51ed74ae2c170b1e

BIN
Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/Debug/ET.Hotfix.csproj.AssemblyReference.cache


+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921375645933
+17684603516417372

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Hotfix/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427110188065
+17684603516417372

+ 5 - 0
Packages/cn.etetet.statesync/DotNet~/Model/ET.Model.csproj

@@ -60,4 +60,9 @@
     <ItemGroup>
         <CompilerVisibleProperty Include="DotNetAssembly" />
     </ItemGroup>
+    <ItemGroup>
+      <Reference Include="Sirenix.OdinInspector.Attributes">
+        <HintPath>..\..\..\..\Assets\Plugins\Sirenix\Assemblies\Sirenix.OdinInspector.Attributes.dll</HintPath>
+      </Reference>
+    </ItemGroup>
 </Project>

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Model/obj/Debug/ET.Model.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ET.Model")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d152e67ba54cb4474d62b6198e077835158f549a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bd88571fae0b45a573a3d630168e4be2e68daf22")]
 [assembly: System.Reflection.AssemblyProductAttribute("ET.Model")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ET.Model")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Model/obj/Debug/ET.Model.AssemblyInfoInputs.cache

@@ -1 +1 @@
-925fc7341ca72eac71689c1975565b93128b41ff1fe5c89d9cd4795838a78118
+a8c8b2baa6eedf5b46812fb988f1d0a936ccf412672ec21cee1dedd8dfcf060e

BIN
Packages/cn.etetet.statesync/DotNet~/Model/obj/Debug/ET.Model.csproj.AssemblyReference.cache


+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Model/obj/rider.project.model.nuget.info

@@ -1 +1 @@
-17683921375754823
+17684603516301251

+ 1 - 1
Packages/cn.etetet.statesync/DotNet~/Model/obj/rider.project.restore.info

@@ -1 +1 @@
-17684427110188065
+17684603516301251

+ 3 - 1
Packages/cn.etetet.statesync/Runtime/HotfixView/ET.HotfixView.asmdef

@@ -12,8 +12,10 @@
         "ET.ReferenceCollector",
         "ET.SourceGeneratorAttribute",
         "ET.UI",
+        "ET.YIUIFramework",
         "ET.YooAssets",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "Unity.TextMeshPro"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 3 - 1
Packages/cn.etetet.statesync/Runtime/ModelView/ET.ModelView.asmdef

@@ -9,8 +9,10 @@
         "ET.ReferenceCollector",
         "ET.SourceGeneratorAttribute",
         "ET.UI",
+        "ET.YIUIFramework",
         "ET.YooAssets",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "Unity.TextMeshPro"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 22 - 22
Packages/cn.etetet.statesync/Scripts/HotfixView/Client/EntryEvent3_InitClient.cs

@@ -1,22 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace ET.Client
-{
-    [Event(SceneType.StateSync)]
-    public class EntryEvent3_InitClient: AEvent<Scene, EntryEvent3>
-    {
-        protected override async ETTask Run(Scene root, EntryEvent3 args)
-        {
-            root.AddComponent<GlobalComponent>();
-            root.AddComponent<UIGlobalComponent>();
-            root.AddComponent<UIComponent>();
-            root.AddComponent<ResourcesLoaderComponent>();
-            root.AddComponent<PlayerComponent>();
-            root.AddComponent<CurrentScenesComponent>();
-            
-            await EventSystem.Instance.PublishAsync(root, new AppStartInitFinish());
-        }
-    }
-}
+/*// using System;
+// using System.Collections.Generic;
+// using System.IO;
+//
+// namespace ET.Client
+// {
+//     [Event(SceneType.StateSync)]
+//     public class EntryEvent3_InitClient: AEvent<Scene, EntryEvent3>
+//     {
+//         protected override async ETTask Run(Scene root, EntryEvent3 args)
+//         {
+//             root.AddComponent<GlobalComponent>();
+//             root.AddComponent<UIGlobalComponent>();
+//             root.AddComponent<UIComponent>();
+//             root.AddComponent<ResourcesLoaderComponent>();
+//             root.AddComponent<PlayerComponent>();
+//             root.AddComponent<CurrentScenesComponent>();
+//             
+//             await EventSystem.Instance.PublishAsync(root, new AppStartInitFinish());
+//         }
+//     }
+// }*/

+ 12 - 11
Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UIHelp/SceneChangeFinishEvent_CreateUIHelp.cs

@@ -1,11 +1,12 @@
-namespace ET.Client
-{
-    [Event(SceneType.Current)]
-    public class SceneChangeFinishEvent_CreateUIHelp : AEvent<Scene, SceneChangeFinish>
-    {
-        protected override async ETTask Run(Scene scene, SceneChangeFinish args)
-        {
-            await UIHelper.Create(scene, UIType.UIHelp, UILayer.Mid);
-        }
-    }
-}
+/*// namespace ET.Client
+// {
+//     [Event(SceneType.Current)]
+//     public class SceneChangeFinishEvent_CreateUIHelp : AEvent<Scene, SceneChangeFinish>
+//     {
+//         protected override async ETTask Run(Scene scene, SceneChangeFinish args)
+//         {
+//             await UIHelper.Create(scene, UIType.UIHelp, UILayer.Mid);
+//         }
+//     }
+// }
+*/

+ 12 - 11
Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs

@@ -1,11 +1,12 @@
-namespace ET.Client
-{
-	[Event(SceneType.StateSync)]
-	public class LoginFinish_CreateLobbyUI: AEvent<Scene, LoginFinish>
-	{
-		protected override async ETTask Run(Scene scene, LoginFinish args)
-		{
-			await UIHelper.Create(scene, UIType.UILobby, UILayer.Mid);
-		}
-	}
-}
+/*// namespace ET.Client
+// {
+// 	[Event(SceneType.StateSync)]
+// 	public class LoginFinish_CreateLobbyUI: AEvent<Scene, LoginFinish>
+// 	{
+// 		protected override async ETTask Run(Scene scene, LoginFinish args)
+// 		{
+// 			await UIHelper.Create(scene, UIType.UILobby, UILayer.Mid);
+// 		}
+// 	}
+// }
+*/

+ 12 - 11
Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs

@@ -1,11 +1,12 @@
-namespace ET.Client
-{
-	[Event(SceneType.StateSync)]
-	public class AppStartInitFinish_CreateLoginUI: AEvent<Scene, AppStartInitFinish>
-	{
-		protected override async ETTask Run(Scene root, AppStartInitFinish args)
-		{
-			await UIHelper.Create(root, UIType.UILogin, UILayer.Mid);
-		}
-	}
-}
+/*// namespace ET.Client
+// {
+// 	[Event(SceneType.StateSync)]
+// 	public class AppStartInitFinish_CreateLoginUI: AEvent<Scene, AppStartInitFinish>
+// 	{
+// 		protected override async ETTask Run(Scene root, AppStartInitFinish args)
+// 		{
+// 			await UIHelper.Create(root, UIType.UILogin, UILayer.Mid);
+// 		}
+// 	}
+// }
+*/

+ 12 - 11
Packages/cn.etetet.statesync/Scripts/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs

@@ -1,11 +1,12 @@
-namespace ET.Client
-{
-	[Event(SceneType.StateSync)]
-	public class LoginFinish_RemoveLoginUI: AEvent<Scene, LoginFinish>
-	{
-		protected override async ETTask Run(Scene scene, LoginFinish args)
-		{
-			await UIHelper.Remove(scene, UIType.UILogin);
-		}
-	}
-}
+/*// namespace ET.Client
+// {
+// 	[Event(SceneType.StateSync)]
+// 	public class LoginFinish_RemoveLoginUI: AEvent<Scene, LoginFinish>
+// 	{
+// 		protected override async ETTask Run(Scene scene, LoginFinish args)
+// 		{
+// 			await UIHelper.Remove(scene, UIType.UILogin);
+// 		}
+// 	}
+// }
+*/

+ 87 - 2
Packages/cn.etetet.statesync/Settings/AssetBundleCollectorSetting.asset

@@ -18,11 +18,11 @@ MonoBehaviour:
   Packages:
   - PackageName: DefaultPackage
     PackageDesc: 
-    EnableAddressable: 0
+    EnableAddressable: 1
     LocationToLower: 0
     IncludeAssetGUID: 0
-    IgnoreDefaultType: 1
     AutoCollectShaders: 1
+    IgnoreRuleName: NormalIgnoreRule
     Groups:
     - GroupName: AotDlls
       GroupDesc: 
@@ -102,3 +102,88 @@ MonoBehaviour:
         FilterRuleName: CollectPrefab
         AssetTags: 
         UserData: 
+    - GroupName: YIUI
+      GroupDesc: 
+      AssetTags: 
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Packages/cn.etetet.yiuigm/Assets/GameRes/YIUI/GM
+        CollectorGUID: 402b4d6cf6e56a34f86fb9b173431056
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: YIUIFilterRule
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiuireddot/Assets/GameRes/YIUI/RedDot
+        CollectorGUID: 064901bcbdeacd040a95ac689b59f03b
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: YIUIFilterRule
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiuireddot/Assets/GameRes/RedDot
+        CollectorGUID: 482fe48fe3ff5de42a40efdbc9e4d9f4
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiuitips/Assets/GameRes/YIUI/Tips
+        CollectorGUID: cb1c91773e8a26749a29d3d8d2283b09
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: YIUIFilterRule
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiuistatesync/Assets/GameRes/YIUI
+        CollectorGUID: 38aff9b4b3f3ca0459417ed8f1416685
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: YIUIFilterRule
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/GameRes/YIUI
+        CollectorGUID: 7df93ffc8327ee443a9ffadd3c94bd53
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: YIUIFilterRule
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI
+        CollectorGUID: fc254c93445b7b044924c9b531f8e1a2
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectPrefab
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiuiloopscrollrectasync/Assets/GameRes/YIUI/LoopScrollRectDemo
+        CollectorGUID: 9881c6d802eddfa46a3521cc088d1ba2
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Packages/cn.etetet.yiuiframework/Assets/GameRes/YIUI/YIUI
+        CollectorGUID: 390e2414befd53e4e83c786dc51e17eb
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/GameRes/YIUI/YIUISettings
+        CollectorGUID: 24e5acacda0e6884c9c09e92cc5cfc81
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 

+ 1 - 1
Packages/cn.etetet.ui/Scripts/HotfixView/Client/UIComponentSystem.cs

@@ -11,7 +11,7 @@ namespace ET.Client
 		[EntitySystem]
 		private static void Awake(this UIComponent self)
 		{
-			self.UIGlobalComponent = self.Root().GetComponent<UIGlobalComponent>();
+			//self.UIGlobalComponent = self.Root().GetComponent<UIGlobalComponent>();
 		}
 		
 		public static async ETTask<UI> Create(this UIComponent self, string uiType, UILayer uiLayer)

+ 31 - 0
Packages/cn.etetet.yiui3ddisplay/.github/workflows/release-package.yml

@@ -0,0 +1,31 @@
+name: ET Package
+
+on:
+  workflow_dispatch:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+          registry-url: https://npm.pkg.github.com/
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets.meta

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

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes.meta

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

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI.meta

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

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay.meta

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

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model.meta

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

+ 9 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0d2b083b6ac214e43b575bed97cf0e88
+folderAsset: yes
+timeCreated: 1506157957
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials.meta

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

+ 135 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D.mat

@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7528734187053378799
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: skeleton_D
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
+    - _Color: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0467fa2a8d6eb9f4fb046fe5736b87dc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 135 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D1.mat

@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: skeleton_D1
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
+    - _Color: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &346456081340982573
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9

+ 8 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Materials/skeleton_D1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 985e671519dfc744fb119bb092300302
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Skeleton@Idle.FBX


+ 195 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Ani/Skeleton@Idle.FBX.meta

@@ -0,0 +1,195 @@
+fileFormatVersion: 2
+guid: 25826fda47159ec40b7d2fd0c57f1f72
+timeCreated: 18446744011573954816
+ModelImporter:
+  serializedVersion: 21
+  fileIDToRecycleName:
+    100000: Bip001
+    100002: Bip001 Footsteps
+    100004: Bip001 Head
+    100006: Bip001 L Calf
+    100008: Bip001 L Clavicle
+    100010: Bip001 L Finger0
+    100012: Bip001 L Finger01
+    100014: Bip001 L Finger02
+    100016: Bip001 L Finger1
+    100018: Bip001 L Finger11
+    100020: Bip001 L Finger12
+    100022: Bip001 L Foot
+    100024: Bip001 L Forearm
+    100026: Bip001 L Hand
+    100028: Bip001 L Thigh
+    100030: Bip001 L Toe0
+    100032: Bip001 L UpperArm
+    100034: Bip001 Neck
+    100036: Bip001 Pelvis
+    100038: Bip001 Prop1
+    100040: Bip001 R Calf
+    100042: Bip001 R Clavicle
+    100044: Bip001 R Finger0
+    100046: Bip001 R Finger01
+    100048: Bip001 R Finger02
+    100050: Bip001 R Finger1
+    100052: Bip001 R Finger11
+    100054: Bip001 R Finger12
+    100056: Bip001 R Foot
+    100058: Bip001 R Forearm
+    100060: Bip001 R Hand
+    100062: Bip001 R Thigh
+    100064: Bip001 R Toe0
+    100066: Bip001 R UpperArm
+    100068: Bip001 Spine
+    100070: Bip001 Spine1
+    100072: Bone001
+    100074: Object01
+    100076: Object02
+    100078: //RootNode
+    400000: Bip001
+    400002: Bip001 Footsteps
+    400004: Bip001 Head
+    400006: Bip001 L Calf
+    400008: Bip001 L Clavicle
+    400010: Bip001 L Finger0
+    400012: Bip001 L Finger01
+    400014: Bip001 L Finger02
+    400016: Bip001 L Finger1
+    400018: Bip001 L Finger11
+    400020: Bip001 L Finger12
+    400022: Bip001 L Foot
+    400024: Bip001 L Forearm
+    400026: Bip001 L Hand
+    400028: Bip001 L Thigh
+    400030: Bip001 L Toe0
+    400032: Bip001 L UpperArm
+    400034: Bip001 Neck
+    400036: Bip001 Pelvis
+    400038: Bip001 Prop1
+    400040: Bip001 R Calf
+    400042: Bip001 R Clavicle
+    400044: Bip001 R Finger0
+    400046: Bip001 R Finger01
+    400048: Bip001 R Finger02
+    400050: Bip001 R Finger1
+    400052: Bip001 R Finger11
+    400054: Bip001 R Finger12
+    400056: Bip001 R Foot
+    400058: Bip001 R Forearm
+    400060: Bip001 R Hand
+    400062: Bip001 R Thigh
+    400064: Bip001 R Toe0
+    400066: Bip001 R UpperArm
+    400068: Bip001 Spine
+    400070: Bip001 Spine1
+    400072: Bone001
+    400074: Object01
+    400076: Object02
+    400078: //RootNode
+    4300000: Object02
+    4300002: Object01
+    7400000: Idle
+    9500000: //RootNode
+    13700000: Object01
+    13700002: Object02
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Idle
+      takeName: Take 001
+      firstFrame: 0
+      lastFrame: 170
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 1
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 0.01
+    meshCompression: 0
+    addColliders: 0
+    importVisibility: 0
+    importBlendShapes: 1
+    importCameras: 0
+    importLights: 0
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 4
+    normalCalculationMode: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 0
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 2
+  humanoidOversampling: 1
+  additionalBone: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Character.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6a53b3216381b404fa31c48dd4ec0975
+folderAsset: yes
+timeCreated: 1506157957
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Character/Materials.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8ad04460eae1a904d8d8fd55c83dca51
+folderAsset: yes
+timeCreated: 1506157957
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 102 - 0
Packages/cn.etetet.yiui3ddisplay/Assets/GameRes/YIUI/ModelDisplay/Model/Character/Materials/skeleton_D.mat

@@ -0,0 +1,102 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2014171297911900331
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: skeleton_D
+  m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 943f3c476130c4f4f8ae55ef3ccd38ba, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 943f3c476130c4f4f8ae55ef3ccd38ba, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _GlossinessSource: 0
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Shininess: 0
+    - _Smoothness: 0.5
+    - _SmoothnessSource: 0
+    - _SpecSource: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott