sync

Assets/Scenes/Oasis/Art/Environment/Textures/Cliff_Ramp.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -56,11 +56,17 @@ Texture2D:
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
-  serializedVersion: 2
+  serializedVersion: 4
   m_Width: 64
   m_Height: 1
   m_CompleteImageSize: 508
   m_MipsStripped: 0
+  m_WebStreaming: 0
+  m_PriorityLevel: 0
+  m_UploadedMode: 0
+  m_DataStreamData:
+    size: 0
+    path: 
   m_TextureFormat: 4
   m_MipCount: 7
   m_IsReadable: 1
@@ -91,3 +97,6 @@ Texture2D:
     offset: 0
     size: 0
     path: 
+  m_OriginalWidth: 0
+  m_OriginalHeight: 0
+  m_OriginalAssetGuid: 00000000000000000000000000000000

Assets/Settings/Mobile/Mobile_High.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -29,7 +29,7 @@ MonoBehaviour:
   m_HDRColorBufferPrecision: 0
   m_MSAA: 1
   m_RenderScale: 1
-  m_UpscalingFilter: 0
+  m_UpscalingFilter: 3
   m_FsrOverrideSharpness: 1
   m_FsrSharpness: 1
   m_EnableLODCrossFade: 1

Assets/Settings/Mobile/Mobile_High_Renderer.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &-8576419846133267094
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -127,10 +127,6 @@ MonoBehaviour:
   m_Name: DLSS
   m_EditorClassIdentifier: 
   m_Active: 0
-  quality: 3
-  useOptimalSetting: 1
-  sharpness: 0.126
-  preExposure: 0.214
 --- !u!114 &-194876054633339434
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -179,7 +175,8 @@ MonoBehaviour:
   - {fileID: 4962205925092569722}
   - {fileID: -8576419846133267094}
   - {fileID: -7390778553674367771}
-  m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d122222735d34a93f399f2716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99
+  - {fileID: 4395980931634258890}
+  m_RendererFeatureMap: bc3f630842f2e70dd6a559c442a94bfd4529d15534f2d3de228858dca8d122222735d34a93f399f2716523fbf3439fdb7a327b7bff4bdd446ac59dfa966ffa88e5fca93e10ae6e99ca6373cd5da9013d
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   shaders:
@@ -331,6 +328,20 @@ MonoBehaviour:
       restoreCamera: 1
       offset: {x: 0, y: 0, z: 0, w: 0}
       cameraFieldOfView: 60
+--- !u!114 &4395980931634258890
+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: 74dc463bb029b6b41a2fe66db031c2ae, type: 3}
+  m_Name: MetalFxSpatialUpScale
+  m_EditorClassIdentifier: 
+  m_Active: 0
+  quality: 0
 --- !u!114 &4962205925092569722
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Settings/PC/PC_High_Renderer.asset

@@ -76,9 +76,7 @@ MonoBehaviour:
   - {fileID: 7833122117494664109}
   - {fileID: 3573653513797426673}
   - {fileID: -3751262535411419207}
-  - {fileID: 7635965471217900352}
+  m_RendererFeatureMap: a163f70a5ce289f0ad6b866f10d7b46cf1dd38d0ef2a9831b937925d99d6f0cb
-  - {fileID: 3550966996045925474}
-  m_RendererFeatureMap: a163f70a5ce289f0ad6b866f10d7b46cf1dd38d0ef2a9831b937925d99d6f0cb405b17952366f869620c7448ab914731
   m_UseNativeRenderPass: 1
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   shaders:
@@ -165,20 +163,6 @@ MonoBehaviour:
       normalBlend: 0
   m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
   m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
---- !u!114 &7635965471217900352
-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: 74dc463bb029b6b41a2fe66db031c2ae, type: 3}
-  m_Name: MetalFxSpatialUpScale
-  m_EditorClassIdentifier: 
-  m_Active: 1
-  quality: 3
 --- !u!114 &7833122117494664109
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Settings/VolumeProfiles/LowQualityVolumeProfile.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &-8189118008837629952
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -28,7 +28,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
   m_Name: Bloom
   m_EditorClassIdentifier: 
-  active: 0
+  active: 1
   skipIterations:
     m_OverrideState: 1
     m_Value: 0
@@ -170,7 +170,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3}
   m_Name: Tonemapping
   m_EditorClassIdentifier: 
-  active: 0
+  active: 1
   mode:
     m_OverrideState: 1
     m_Value: 1

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/Plugins/Android/libbindcore.so.meta

@@ -1,81 +0,0 @@
-fileFormatVersion: 2
-guid: 1ca5bd2d305278446bdd07289c7ba929
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      : Any
-    second:
-      enabled: 0
-      settings:
-        Exclude Android: 0
-        Exclude Editor: 1
-        Exclude Linux64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
-        Exclude iOS: 1
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings:
-        AndroidSharedLibraryType: Executable
-        CPU: ARM64
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-        DefaultValueInitialized: true
-        OS: AnyOS
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      Standalone: Win64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      iPhone: iOS
-    second:
-      enabled: 0
-      settings:
-        AddToEmbeddedBinaries: false
-        CPU: AnyCPU
-        CompileFlags: 
-        FrameworkDependencies: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/NatvieHelper/RenderingPlugin.cs

@@ -35,11 +35,6 @@ namespace X.Rendering.Feature
         //#endif
         //        public static extern bool DoFGExtrapolation(IntPtr src, IntPtr data, IntPtr dst);
 
-#if PLATFORM_ANDROID
-        [DllImport("bindcore")]
-        public static extern void BindBigCore();
-#endif
-
         public enum NativeRenderingEvent
         {
             EnableVRS = 1,
@@ -97,11 +92,6 @@ namespace X.Rendering.Feature
                 featureSupports[(GraphicsFeature)i] = GetFeatureSupport(i);
                 UnityEngine.Debug.Log($"feature->{(GraphicsFeature)i}:{featureSupports[(GraphicsFeature)i]}");
             }
-#if PLATFORM_ANDROID && !UNITY_EDITOR
- UnityEngine.Debug.Log("BindBigCore start");
-            BindBigCore();
- UnityEngine.Debug.Log("BindBigCore end");
-#endif
         }
 
         public static bool GetFeatureSupport(GraphicsFeature feature)

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SF/FG.cs

@@ -21,7 +21,7 @@ namespace X.Rendering.Feature
         static RTHandle[] historys = new RTHandle[2];
         static RTHandle presentRt;
         static bool presented = false;
-        public static bool UseFG = true;
+        public static bool UseFG = false;
         
         public static bool CanDoFG => frameIndex > 0 && frameIndex % 3 == 0 && !presented && UseFG;
 

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/DLSS.cs

@@ -6,7 +6,7 @@ namespace X.Rendering.Feature
 {
     public class DLSS : ScriptableRendererFeature, ISuperResolutionFeature
     {
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
         [SerializeField]
         private UnityEngine.NVIDIA.DLSSQuality quality;
         [SerializeField]
@@ -42,7 +42,7 @@ namespace X.Rendering.Feature
 #endif  
         public static bool InitFeature()
         {
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
             if (!UnityEngine.NVIDIA.NVUnityPlugin.IsLoaded())
             {
                 return false;
@@ -71,7 +71,7 @@ namespace X.Rendering.Feature
         bool playInit = false;
         public override void Create()
         {
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
 
             if (gfxDevice != null && playInit)
             {
@@ -89,7 +89,7 @@ namespace X.Rendering.Feature
 #endif
         }
 
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
 
         private void UpdateDlssContext(in CommandBuffer cmd, in DlssStatus dlssStatus)
         {
@@ -114,7 +114,7 @@ namespace X.Rendering.Feature
 #endif
         public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData)
         {
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
 
             using var scp = new ProfilingScope(cmd, profiler);
             ref var cameraData = ref renderingData.cameraData;
@@ -187,7 +187,7 @@ namespace X.Rendering.Feature
 
         public float GetRenderScale()
         {
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
 
             switch (quality)
             {
@@ -216,7 +216,7 @@ namespace X.Rendering.Feature
 
         public void SetSR(ESuperResolution resolution)
         {
-#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS && !UNITY_EDITOR_OSX
+#if !UNITY_ANDROID && !UNITY_IPHONE && !UNITY_IOS  && !UNITY_EDITOR_OSX && !UNITY_OPENHARMONY
             switch (resolution)
             {
                 case ESuperResolution.DLSS1:

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs

@@ -0,0 +1,44 @@
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+
+namespace X.Rendering.Feature
+{
+    public class HuaweiSR : ScriptableRendererFeature, ISuperResolutionFeature
+    {
+        [SerializeField]
+        SrQuality quality;
+        private ProfilingSampler profiler;
+
+        public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData)
+        {
+        }
+
+        public override void Create()
+        {
+            profiler = new ProfilingSampler("HuaweiSR");
+
+        }
+
+        public void DoSR(CommandBuffer cmd, RTHandle source, RTHandle destination, RTHandle motionVector, ref RenderingData renderingData)
+        {
+            if (source.rt == null || destination.rt == null)
+            {
+                return;
+            }
+            using var scp = new ProfilingScope(cmd, profiler);
+
+            //SuperResolutionParamSets.Instance.Set<bool>("NeedJitter", true);
+
+        }
+
+        public float GetRenderScale()
+        {
+            return 1.0f;
+        }
+
+        public void SetSR(ESuperResolution resolution)
+        {
+        }
+    }
+}

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/HuaweiSR.cs.meta

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

Packages/com.unity.render-pipelines.universal@14.0.11/Runtime/SuperRendering/SR/Scripts/MetalFx.cs

@@ -8,7 +8,6 @@ using UnityEngine.Rendering.Universal;
 namespace X.Rendering.Feature
 {
 
-
     internal unsafe class MetalFxSpatialUpScale : ScriptableRendererFeature, ISuperResolutionFeature
     {
         [SerializeField]

Packages/packages-lock.json

@@ -1,14 +1,14 @@
 {
   "dependencies": {
     "com.unity.burst": {
-      "version": "1.8.16",
+      "version": "1.8.17",
       "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.cinemachine": {
       "version": "2.10.1",
@@ -17,28 +17,28 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.31"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.collab-proxy": {
       "version": "2.5.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.editorcoroutines": {
       "version": "1.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.ide.rider": {
       "version": "3.0.31",
@@ -47,7 +47,7 @@
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.ide.visualstudio": {
       "version": "2.0.22",
@@ -56,14 +56,14 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.inputsystem": {
       "version": "1.11.0",
@@ -72,7 +72,7 @@
       "dependencies": {
         "com.unity.modules.uielements": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.learn.iet-framework": {
       "version": "3.1.3",
@@ -82,14 +82,14 @@
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.settings-manager": "1.0.3"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.mathematics": {
       "version": "1.2.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.memoryprofiler": {
       "version": "1.1.1",
@@ -98,7 +98,7 @@
       "dependencies": {
         "com.unity.editorcoroutines": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.recorder": {
       "version": "4.0.3",
@@ -107,7 +107,7 @@
       "dependencies": {
         "com.unity.timeline": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.render-pipelines.core": {
       "version": "14.0.11",
@@ -145,14 +145,14 @@
       "depth": 2,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.settings-manager": {
       "version": "2.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.shadergraph": {
       "version": "14.0.11",
@@ -172,7 +172,7 @@
         "com.unity.mathematics": "1.2.1",
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.test-framework": {
       "version": "1.1.33",
@@ -183,7 +183,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.textmeshpro": {
       "version": "3.0.7",
@@ -192,7 +192,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.timeline": {
       "version": "1.7.6",
@@ -204,7 +204,7 @@
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.tuanjie.cn"
     },
     "com.unity.ugui": {
       "version": "1.0.0",
@@ -237,7 +237,10 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.animation": "1.0.0"
+      }
     },
     "com.unity.modules.audio": {
       "version": "1.0.0",

ProjectSettings/EditorBuildSettings.asset

@@ -1,22 +1,15 @@
 %YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
+%TAG !u! tag:unity3d.com,2011:
 --- !u!1045 &1
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Oasis/OasisScene.scene
+    path: Assets/Scenes/Terminal/TerminalScene.scene
-    guid: 9fa2ba603a3424f9bafa4119f837f2bc
+    guid: 4496a3dbb8d263043a4460bac5382ac5
   m_configObjects:
     Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 290a6e6411d135049940bec2237b8938, type: 2}
     com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2}
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 4c1640683c539c14080cfd43fbeffbda, type: 2}
     xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: 9e9f2958d1b4b4642ace1d0c7770650b, type: 2}
-  m_SlimFeaturesWeixinMiniGame:
-    AllocateOverhead: 1
-    DecompressASTC: 0
-    DecompressDXT: 1
-    DecompressETC: 1
-    FreeTypeSfntPng: 1
-    LightProbe: 2

ProjectSettings/PackageManagerSettings.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 MonoBehaviour:
   m_ObjectHideFlags: 61
@@ -21,7 +21,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.cn
+    m_Url: https://packages.tuanjie.cn
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
@@ -31,6 +31,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -838
+    m_UserModificationsInstanceId: -872
-    m_OriginalInstanceId: -840
+    m_OriginalInstanceId: -874
   m_LoadAssets: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,3 @@
-m_EditorVersion: 2022.3.38f1c1
+m_EditorVersion: 2022.3.48t2
-m_EditorVersionWithRevision: 2022.3.38f1c1 (b17906c7b2b6)
+m_EditorVersionWithRevision: 2022.3.48t2 (635b9f68393f)
+m_TuanjieEditorVersion: 1.3.5

ProjectSettings/ShaderGraphSettings.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 MonoBehaviour:
   m_ObjectHideFlags: 61

ProjectSettings/UnityConnectSettings.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
+%TAG !u! tag:unity3d.com,2011:
 --- !u!310 &1
 UnityConnectSettings:
   m_ObjectHideFlags: 0
@@ -10,6 +10,8 @@ UnityConnectSettings:
   m_EventUrl: https://cdp.tuanjie.cn/v1/events
   m_ConfigUrl: https://config.uca.cloud.tuanjie.cn
   m_DashboardUrl: https://dashboard.tuanjie.cn
+  m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
+  m_CNConfigUrl: https://cdp.cloud.unity.cn/config
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com

UserSettings/EditorUserSettings.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!162 &1
 EditorUserSettings:
   m_ObjectHideFlags: 0
@@ -9,17 +9,32 @@ EditorUserSettings:
       value: 0257020252075b0b5a0b5b2345715a444f4e402b7a2d22667f7c4b35e7b16769
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 01060c075556080e0956597315775b14104e4179282b25662b2c1c31b7b63068
-      flags: 0
-    RecentlyUsedSceneGuid-2:
-      value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d
-      flags: 0
-    RecentlyUsedSceneGuid-3:
       value: 5b00515154055e035459547042705a44154f1e2c2e2e7f677e7d4567e1b9376d
       flags: 0
+    RecentlyUsedSceneGuid-2:
+      value: 5253030556035d5f5b585f7a16760f44144f1c2f2a7023347c7a4432b6b3353b
+      flags: 0
+    RecentlyUsedSceneGuid-3:
+      value: 52035256550d510b5e595e2613700e44454e1a7e7d2b74312b7d1f36b3b03161
+      flags: 0
     RecentlyUsedSceneGuid-4:
+      value: 01060c075556080e0956597315775b14104e4179282b25662b2c1c31b7b63068
+      flags: 0
+    RecentlyUsedSceneGuid-5:
       value: 5a57555407545f0b5e0f5f764277594914161e2b787977692b714e64e4b2363b
       flags: 0
+    RecentlyUsedSceneGuid-6:
+      value: 57050d5004060d590f56087046700f4445164c7e7a7824312e7c4e6bb0e1376d
+      flags: 0
+    UnityEditor.ShaderGraph.Blackboard:
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+      flags: 0
+    UnityEditor.ShaderGraph.FloatingWindowsLayout2:
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
+      flags: 0
+    UnityEditor.ShaderGraph.InspectorWindow:
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0

UserSettings/Layouts/default-2022.dwlt

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Lighting
   m_RootView: {fileID: 10}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -34,23 +34,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 391
+    x: 434
     y: 0
-    width: 1472
+    width: 1632
     height: 770
-  m_MinSize: {x: 102, y: 121}
+  m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 15}
   - {fileID: 19}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -70,12 +70,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1863
+    width: 2066
     height: 770
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 40
+  controlID: 128
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -92,12 +92,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1079
+    x: 1196
     y: 0
-    width: 784
+    width: 870
     height: 529
-  m_MinSize: {x: 102, y: 121}
+  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 20}
@@ -122,12 +122,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 770
-    width: 1863
+    width: 2066
     height: 529
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 65
+  controlID: 161
   draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@@ -153,7 +153,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 144
+  controlID: 126
   draggingID: 0
 --- !u!114 &7
 MonoBehaviour:
@@ -165,23 +165,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: LightingWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1863
+    x: 2066
     y: 0
-    width: 697
+    width: 494
     height: 1299
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 391, y: 411}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 17}
   - {fileID: 14}
-  m_Selected: 0
+  m_Selected: 1
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -199,7 +199,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 391
+    width: 434
     height: 770
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
@@ -225,7 +225,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1079
+    width: 1196
     height: 529
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
@@ -324,12 +324,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1863
+    width: 2066
     height: 1299
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 64
+  controlID: 127
   draggingID: 0
 --- !u!114 &14
 MonoBehaviour:
@@ -351,9 +351,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1863
+    x: 2066
     y: 73
-    width: 696
+    width: 493
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -385,9 +385,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 391
+    x: 434
     y: 73
-    width: 1470
+    width: 1630
     height: 749
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -404,7 +404,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: -171, y: -26}
+      snapOffsetDelta: {x: -179, y: -26}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -721,9 +721,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 23.915308, y: -12.379151, z: -206.87144}
+    m_Target: {x: 0.49164727, y: -7.533593, z: -38.261467}
     speed: 2
-    m_Value: {x: 23.915308, y: -12.379151, z: -206.87144}
+    m_Value: {x: 0.49164727, y: -7.533593, z: -38.261467}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -769,13 +769,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.014979714, y: 0.98480403, z: -0.13256745, w: 0.111246854}
+    m_Target: {x: -0.00022618985, y: 0.9882768, z: -0.15271015, w: -0.0014957726}
     speed: 2
-    m_Value: {x: 0.014812732, y: 0.98499525, z: -0.13108921, w: 0.11126845}
+    m_Value: {x: -0.0002261883, y: 0.98827004, z: -0.15270911, w: -0.0014957625}
   m_Size:
-    m_Target: 35.659737
+    m_Target: 33.820503
     speed: 2
-    m_Value: 34.12415
+    m_Value: 27.608574
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -793,6 +793,8 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
+    m_EnableGDRP: 1
+    m_BackfaceCulling: 0
   m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
@@ -822,7 +824,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 843
-    width: 1078
+    width: 1195
     height: 508
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -843,7 +845,7 @@ MonoBehaviour:
     m_SceneHandles: 
     m_ShowAllHits: 0
     m_SkipHidden: 0
-    m_SearchArea: 1
+    m_SearchArea: 0
     m_Folders:
     - Assets/Settings/Mobile
     m_Globs: []
@@ -860,9 +862,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 607c0100
+    m_SelectedIDs: 44a70000
-    m_LastClickedID: 97376
+    m_LastClickedID: 42820
-    m_ExpandedIDs: 000000000463000016d800003ed8000040d800006cd8000094d8000062d90000aad90000dad90000e6d9000006da00001473010018730100ccb70100dcb70100e2b70100ffffff7f
+    m_ExpandedIDs: 00000000747e0000008100002c810000baa60000bca60000d2a60000d8a6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -890,7 +892,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000016d80000
+    m_ExpandedIDs: 00000000747e0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -921,18 +923,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: c6230000000000005aca0000a6790000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Mobile_High_Renderer
+      m_Name: 
-      m_OriginalName: Mobile_High_Renderer
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 17064
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 9}
     m_CreateAssetUtility:
@@ -966,9 +968,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1863
+    x: 2066
     y: 73
-    width: 696
+    width: 493
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1015,7 +1017,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 390
+    width: 433
     height: 749
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1030,23 +1032,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 9e720000
-      m_LastClickedID: 0
+      m_LastClickedID: 29342
-      m_ExpandedIDs: 2874fcffca32fdff8a3efdff8c3efdffdc4bfdff80cbfdff82cbfdff58dffdff5adffdfffaf5fdfffcf5fdff40f7fdff42f7fdffb419feffb819feffbc19feff7c25feff1426feff8492ffff9a5a0100c65a01009c5b0100045c0100a45d010028780100107901007cb401009cb4010004b501009cc70200bad8020068da0200aaf1020002f702002afd0200a60e0300321c0300
+      m_ExpandedIDs: 3afaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Root
+        m_Name: 
-        m_OriginalName: Root
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 96528
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 8}
       m_SearchString: 
@@ -1076,9 +1078,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 391
+    x: 434
     y: 73
-    width: 1470
+    width: 1630
     height: 749
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1132,23 +1134,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1470
+      width: 1630
       height: 728
     m_Scale: {x: 0.67407405, y: 0.67407405}
-    m_Translation: {x: 735, y: 364}
+    m_Translation: {x: 814.99994, y: 364}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1090.3846
+      x: -1209.0659
       y: -540
-      width: 2180.7693
+      width: 2418.1318
       height: 1080
     m_MinimalGUI: 1
   m_defaultScale: 0.67407405
-  m_LastWindowPixelSize: {x: 1470, y: 749}
+  m_LastWindowPixelSize: {x: 1630, y: 749}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
@@ -1174,9 +1176,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1079
+    x: 1196
     y: 843
-    width: 782
+    width: 868
     height: 508
   m_SerializedDataModeController:
     m_DataMode: 0