灯光更改为烘焙光

Assets/OtherProject/Artworks/MeiGongZiYuan/Models/DaoJu/JinJiPenLingQi/Materials/PLQ_Tie.mat

@@ -70,7 +70,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 1
     - _GlossyReflections: 1
-    - _Metallic: 0.681
+    - _Metallic: 0.305
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

Assets/Plugins/Sirenix/Assemblies/AOT.meta

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

Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: dbc76371245052247a6a00a94327cde2
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Sirenix/Assemblies/AOT/link.xml

@@ -1,3 +0,0 @@
-<linker>
-       <assembly fullname="Sirenix.Serialization.AOTGenerated" preserve="all"/>
-</linker>

Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.meta

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

Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset

@@ -16,11 +16,15 @@ MonoBehaviour:
   deleteDllAfterBuilds: 1
   AutomateForAllAOTPlatforms: 1
   automateForPlatforms: 0900000014000000
-  lastScan: 638315169427075152
+  lastScan: 638322055491964378
   supportSerializedTypes:
   - TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
     IsCustom: 0
     Emit: 1
+  - TypeName: UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
+      Unity.ResourceManager
+    IsCustom: 0
+    Emit: 1
   - TypeName: PMaker.Await.AwaitTimeline, Assembly-CSharp
     IsCustom: 0
     Emit: 1
@@ -31,6 +35,14 @@ MonoBehaviour:
       Assembly-CSharp],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
+      Unity.ResourceManager]], mscorlib
+    IsCustom: 0
+    Emit: 1
+  - TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.GameObject,
+      UnityEngine.CoreModule]], mscorlib
+    IsCustom: 0
+    Emit: 1
   - TypeName: System.Collections.Generic.Dictionary`2[[ObjectItem, Assembly-CSharp],[System.String[],
       mscorlib]], mscorlib
     IsCustom: 0
@@ -59,6 +71,14 @@ MonoBehaviour:
       Assembly-CSharp]], mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
+      mscorlib]], mscorlib
+    IsCustom: 0
+    Emit: 1
+  - TypeName: System.Collections.Generic.Dictionary`2[[TMPro.TMP_FontAsset, Unity.TextMeshPro],[System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI,
+      Unity.TextMeshPro]], mscorlib]], mscorlib
+    IsCustom: 0
+    Emit: 1
   - TypeName: System.Collections.Generic.EnumEqualityComparer`1[[UnityTest.ZXL.DialogueType,
       Assembly-CSharp]], mscorlib
     IsCustom: 0
@@ -79,6 +99,10 @@ MonoBehaviour:
       mscorlib]], mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: System.Collections.Generic.HashSet`1[[System.Collections.Generic.Dictionary`2[[System.String,
+      mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
+    IsCustom: 0
+    Emit: 1
   - TypeName: System.Collections.Generic.IEqualityComparer`1[[UnityTest.ZXL.DialogueType,
       Assembly-CSharp]], mscorlib
     IsCustom: 0
@@ -95,6 +119,10 @@ MonoBehaviour:
       mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: System.Collections.Generic.IEqualityComparer`1[[TMPro.TMP_FontAsset,
+      Unity.TextMeshPro]], mscorlib
+    IsCustom: 0
+    Emit: 1
   - TypeName: System.Int32, mscorlib
     IsCustom: 0
     Emit: 1
@@ -106,6 +134,17 @@ MonoBehaviour:
       UnityEngine.DirectorModule]], mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: System.Collections.Generic.List`1[[QuestionDatabase+Data, Assembly-CSharp]],
+      mscorlib
+    IsCustom: 0
+    Emit: 1
+  - TypeName: System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib
+    IsCustom: 0
+    Emit: 1
+  - TypeName: System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI, Unity.TextMeshPro]],
+      mscorlib
+    IsCustom: 0
+    Emit: 1
   - TypeName: UnityTest.ZXL.ObjectComponent, Assembly-CSharp
     IsCustom: 0
     Emit: 1
@@ -113,6 +152,10 @@ MonoBehaviour:
       mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: System.Collections.Generic.ObjectEqualityComparer`1[[TMPro.TMP_FontAsset,
+      Unity.TextMeshPro]], mscorlib
+    IsCustom: 0
+    Emit: 1
   - TypeName: ObjectItem, Assembly-CSharp
     IsCustom: 0
     Emit: 1
@@ -125,9 +168,27 @@ MonoBehaviour:
   - TypeName: UnityTest.ZXL.ProcessType, Assembly-CSharp
     IsCustom: 0
     Emit: 1
+  - TypeName: QuestionDatabase+Data, Assembly-CSharp
+    IsCustom: 0
+    Emit: 1
+  - TypeName: QuestionDatabase+Option, Assembly-CSharp
+    IsCustom: 0
+    Emit: 1
+  - TypeName: QuestionDatabase+QusetionType, Assembly-CSharp
+    IsCustom: 0
+    Emit: 1
+  - TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
+    IsCustom: 0
+    Emit: 1
   - TypeName: System.String, mscorlib
     IsCustom: 0
     Emit: 1
   - TypeName: System.String[], mscorlib
     IsCustom: 0
     Emit: 1
+  - TypeName: TMPro.TextMeshProUGUI, Unity.TextMeshPro
+    IsCustom: 0
+    Emit: 1
+  - TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
+    IsCustom: 0
+    Emit: 1

Assets/UnityTest/Common/Scripts/Scene/SceneLoader.cs

@@ -54,6 +54,8 @@ public class SceneLoader : SingletonMonobehaviour
             var handle = sceneReferences[index].LoadSceneAsync(loadSceneMode, true);
             _cache[index] = handle;
             await handle;
+            var sceneInstance = await handle;
+            SceneManager.SetActiveScene(sceneInstance.Scene);
             last = index;
         }
         await UniTask.WaitUntil(() => IoC.GetSingleton<SceneLoadMark>() == true);
@@ -92,7 +94,8 @@ public class SceneLoader : SingletonMonobehaviour
         {
             var handle = sceneReferences[index].LoadSceneAsync(loadSceneMode, true);
             _cache[index] = handle;
-            await handle;
+            var sceneInstance = await handle;
+            SceneManager.SetActiveScene(sceneInstance.Scene);
             last = index;
         }
         await UniTask.WaitUntil(() => IoC.GetSingleton<SceneLoadMark>() == true);

Assets/UnityTest/ZXL/Scene/Main/ReflectionProbe-1.exr.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 2991d8e481cd22c4290f3caba7c0ac2b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 1
+  seamlessCubemap: 1
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 2
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 100
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/PackageManagerSettings.asset

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.unity.com
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7

ProjectSettings/ProjectSettings.asset

@@ -149,7 +149,6 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: 11400000, guid: 377fab9146e60364fa298d388667a056, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1