兼容mono打包,方便在pc上快速打包测试

修复加载ui ab包错误

Unity/Assets/Res/UniversalRenderPipelineAsset.asset

@@ -82,33 +82,33 @@ MonoBehaviour:
   m_Textures:
     blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
     bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
-  m_PrefilteringModeMainLightShadows: 1
-  m_PrefilteringModeAdditionalLight: 4
-  m_PrefilteringModeAdditionalLightShadows: 1
-  m_PrefilterXRKeywords: 0
-  m_PrefilteringModeForwardPlus: 1
-  m_PrefilteringModeDeferredRendering: 1
-  m_PrefilteringModeScreenSpaceOcclusion: 1
-  m_PrefilterDebugKeywords: 0
-  m_PrefilterWriteRenderingLayers: 0
-  m_PrefilterHDROutput: 0
-  m_PrefilterSSAODepthNormals: 0
-  m_PrefilterSSAOSourceDepthLow: 0
-  m_PrefilterSSAOSourceDepthMedium: 0
-  m_PrefilterSSAOSourceDepthHigh: 0
-  m_PrefilterSSAOInterleaved: 0
-  m_PrefilterSSAOBlueNoise: 0
-  m_PrefilterSSAOSampleCountLow: 0
-  m_PrefilterSSAOSampleCountMedium: 0
-  m_PrefilterSSAOSampleCountHigh: 0
-  m_PrefilterDBufferMRT1: 0
-  m_PrefilterDBufferMRT2: 0
-  m_PrefilterDBufferMRT3: 0
-  m_PrefilterSoftShadowsQualityLow: 0
-  m_PrefilterSoftShadowsQualityMedium: 0
-  m_PrefilterSoftShadowsQualityHigh: 0
+  m_PrefilteringModeMainLightShadows: 3
+  m_PrefilteringModeAdditionalLight: 3
+  m_PrefilteringModeAdditionalLightShadows: 0
+  m_PrefilterXRKeywords: 1
+  m_PrefilteringModeForwardPlus: 0
+  m_PrefilteringModeDeferredRendering: 0
+  m_PrefilteringModeScreenSpaceOcclusion: 0
+  m_PrefilterDebugKeywords: 1
+  m_PrefilterWriteRenderingLayers: 1
+  m_PrefilterHDROutput: 1
+  m_PrefilterSSAODepthNormals: 1
+  m_PrefilterSSAOSourceDepthLow: 1
+  m_PrefilterSSAOSourceDepthMedium: 1
+  m_PrefilterSSAOSourceDepthHigh: 1
+  m_PrefilterSSAOInterleaved: 1
+  m_PrefilterSSAOBlueNoise: 1
+  m_PrefilterSSAOSampleCountLow: 1
+  m_PrefilterSSAOSampleCountMedium: 1
+  m_PrefilterSSAOSampleCountHigh: 1
+  m_PrefilterDBufferMRT1: 1
+  m_PrefilterDBufferMRT2: 1
+  m_PrefilterDBufferMRT3: 1
+  m_PrefilterSoftShadowsQualityLow: 1
+  m_PrefilterSoftShadowsQualityMedium: 1
+  m_PrefilterSoftShadowsQualityHigh: 1
   m_PrefilterSoftShadows: 0
-  m_PrefilterScreenCoord: 0
-  m_PrefilterNativeRenderPass: 0
+  m_PrefilterScreenCoord: 1
+  m_PrefilterNativeRenderPass: 1
   m_ShaderVariantLogLevel: 0
   m_ShadowCascades: 0

Unity/Assets/Resources/BuildinFileManifest.asset

@@ -0,0 +1,75 @@
+%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: 71b02dfa7aa9d4545b3417a18477fbee, type: 3}
+  m_Name: BuildinFileManifest
+  m_EditorClassIdentifier: 
+  BuildinFiles:
+  - PackageName: DefaultPackage
+    FileName: 19011859f343c2fea9e04ea125ef602b.bundle
+    FileCRC32: b32a60ca
+  - PackageName: DefaultPackage
+    FileName: 196c3d053da3a5e016b1f7cd661ab961.bundle
+    FileCRC32: 1b592b75
+  - PackageName: DefaultPackage
+    FileName: 30238b1ddc07e6b4791d7413fbefdb42.bundle
+    FileCRC32: f562ff3c
+  - PackageName: DefaultPackage
+    FileName: 364c3f8454c061e5c42e0c271ccb3e0f.bundle
+    FileCRC32: 75acb12b
+  - PackageName: DefaultPackage
+    FileName: 4cfa15a564daef84ce86ac7fc45bfd05.bundle
+    FileCRC32: bce36a5d
+  - PackageName: DefaultPackage
+    FileName: 51286ce6eccc116674b09c42f2ebe130.bundle
+    FileCRC32: 9ddec74b
+  - PackageName: DefaultPackage
+    FileName: 5bd37f703d32a9398e75c4fb9fd4c9f6.bundle
+    FileCRC32: 0546176c
+  - PackageName: DefaultPackage
+    FileName: 5fd34587ef15b5989ef9debab778f31f.bundle
+    FileCRC32: f8334aa7
+  - PackageName: DefaultPackage
+    FileName: 610d4110f25b6d35fe4b76d5f22506df.bundle
+    FileCRC32: 79d3918c
+  - PackageName: DefaultPackage
+    FileName: 62fa8fb5a192b003293e96e1798c132c.bundle
+    FileCRC32: 7a48e197
+  - PackageName: DefaultPackage
+    FileName: 6ca9c2deb8662ae77cfc4333aca3c654.bundle
+    FileCRC32: 165f4809
+  - PackageName: DefaultPackage
+    FileName: 6d3782bdafdad3a863ffef4f6ca8cb63.bundle
+    FileCRC32: 5afb7abb
+  - PackageName: DefaultPackage
+    FileName: 7f86baccd134a81ab2c72ad6204597f9.bundle
+    FileCRC32: 9dcdd265
+  - PackageName: DefaultPackage
+    FileName: a828f4e2fb5ce9bb47bb5d4d54502ae6.bundle
+    FileCRC32: e63ffd15
+  - PackageName: DefaultPackage
+    FileName: b2df62001a828bd7819d63846697dfa4.bundle
+    FileCRC32: d7827b1b
+  - PackageName: DefaultPackage
+    FileName: b7c6f1ac02eb25e658c1d323187db31b.bundle
+    FileCRC32: 07d756f8
+  - PackageName: DefaultPackage
+    FileName: c41861dfd64e34eed6be4745a6f0838d.bundle
+    FileCRC32: 9ae530ac
+  - PackageName: DefaultPackage
+    FileName: eaab4be8c78f5032bf316a02aca03bb7.bundle
+    FileCRC32: 0e2ed44e
+  - PackageName: DefaultPackage
+    FileName: f01a4eaa6eb6a9aa89391b4ae5ea42b2.bundle
+    FileCRC32: b67fbe7d
+  - PackageName: DefaultPackage
+    FileName: f9aa9ead849eeb8c1b7232660699165d.bundle
+    FileCRC32: b0585d5a

Unity/Assets/Resources/BuildinFileManifest.asset.meta

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

Unity/Assets/Scenes/Init.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.12731715, g: 0.13414735, b: 0.121078536, a: 1}
+  m_IndirectSpecularColor: {r: 0.12731716, g: 0.13414738, b: 0.121078566, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

Unity/Assets/Scripts/Editor/EntitySerializePlugin/EntityMonoBehaviourEditor.cs

@@ -6,7 +6,7 @@ namespace ET
     [CustomEditor(typeof(EntityMonoBehaviour))]
     public class EntityMonoBehaviourEditor : Editor
     {
-        [MenuItem("ET/Test _F8", false)]
+        //[MenuItem("ET/Test _F8", false)]
         static void MenuItemOfCompile()
         {
             Unit unit = new Unit();

Unity/Assets/Scripts/HotfixView/Client/Demo/StateSync/UI/UIHelp/UIHelpEvent.cs

@@ -10,7 +10,7 @@ namespace ET.Client
         {
 	        try
 	        {
-		        string assetsName = $"Assets/Bundles/UI/Demo/{UIType.UIHelp}.prefab";
+		        string assetsName = $"Assets/Bundles/UI/StateSync/{UIType.UIHelp}.prefab";
 		        GameObject bundleGameObject = await uiComponent.Scene().GetComponent<ResourcesLoaderComponent>().LoadAssetAsync<GameObject>(assetsName);
 		        GameObject gameObject = UnityEngine.Object.Instantiate(bundleGameObject, uiComponent.UIGlobalComponent.GetLayer((int)uiLayer));
 		        UI ui = uiComponent.AddChild<UI, string, GameObject>(UIType.UIHelp, gameObject);

Unity/Assets/Scripts/HotfixView/Client/Demo/StateSync/UI/UILobby/UILobbyEvent.cs

@@ -8,7 +8,7 @@ namespace ET.Client
         public override async ETTask<UI> OnCreate(UIComponent uiComponent, UILayer uiLayer)
         {
             await ETTask.CompletedTask;
-            string assetsName = $"Assets/Bundles/UI/Demo/{UIType.UILobby}.prefab";
+            string assetsName = $"Assets/Bundles/UI/StateSync/{UIType.UILobby}.prefab";
             GameObject bundleGameObject = await uiComponent.Scene().GetComponent<ResourcesLoaderComponent>().LoadAssetAsync<GameObject>(assetsName);
             GameObject gameObject = UnityEngine.Object.Instantiate(bundleGameObject, uiComponent.UIGlobalComponent.GetLayer((int)uiLayer));
             UI ui = uiComponent.AddChild<UI, string, GameObject>(UIType.UILobby, gameObject);

Unity/Assets/Scripts/HotfixView/Client/Demo/StateSync/UI/UILogin/UILoginEvent.cs

@@ -8,7 +8,7 @@ namespace ET.Client
     {
         public override async ETTask<UI> OnCreate(UIComponent uiComponent, UILayer uiLayer)
         {
-            string assetsName = $"Assets/Bundles/UI/Demo/{UIType.UILogin}.prefab";
+            string assetsName = $"Assets/Bundles/UI/StateSync/{UIType.UILogin}.prefab";
             GameObject bundleGameObject = await uiComponent.Scene().GetComponent<ResourcesLoaderComponent>().LoadAssetAsync<GameObject>(assetsName);
             GameObject gameObject = UnityEngine.Object.Instantiate(bundleGameObject, uiComponent.UIGlobalComponent.GetLayer((int)uiLayer));
             UI ui = uiComponent.AddChild<UI, string, GameObject>(UIType.UILogin, gameObject);

Unity/Assets/Scripts/Loader/CodeLoader.cs

@@ -26,7 +26,10 @@ namespace ET
             if (!Define.IsEditor)
             {
                 this.dlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/Code/Unity.Model.dll.bytes");
-                this.aotDlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/AotDlls/mscorlib.dll.bytes");
+                if (Define.EnableIL2CPP)
+                {
+                    this.aotDlls = await ResourcesComponent.Instance.LoadAllAssetsAsync<TextAsset>($"Assets/Bundles/AotDlls/mscorlib.dll.bytes");
+                }
             }
         }
 

Unity/Assets/Scripts/Model/Generate/Client/Ignore.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eed6afbe9c6c5394ca8cb3fa60e929e0
+guid: abf87b325fcfc404db57f14ef3874291
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

Unity/ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 3
+  m_CurrentQuality: 0
   m_QualitySettings:
   - serializedVersion: 3
     name: Fastest