修改shader的位置

Assets/FrameWork.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: framework
+  assetBundleName: 
   assetBundleVariant: 

Assets/BlurScreen/GaussianBlur/UIBlurHQ.shader → Assets/FrameWork/UIBlurHQ.shader

@@ -26,7 +26,7 @@ Shader "UI/Blur/UIBlurHQ" {
 		_StencilWriteMask ("Stencil Write Mask", Float) = 255
 		[HideInInspector]
 		_StencilReadMask ("Stencil Read Mask", Float) = 255
-
+          _MainTex("Base(RGB)",2D) = "White"{}
     }
  
     Category {

Assets/HotUpdate/GameInit.cs

@@ -19,7 +19,7 @@ public class GameInit : MonoBehaviour
     void Start()
     {
         text.text = "ÕýÔÚÏÂÔØÖ÷Òª×ÊÔ´";
-        this.transform.parent = OpenXRCamera.Instance.head.transform;
+        this.transform.SetParent(OpenXRCamera.Instance.head.transform);
         this.transform.localPosition = Vector3.zero;
         this.transform.localEulerAngles = Vector3.zero;
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/FollowCameraSaoMiao.cs

@@ -6,7 +6,7 @@ public class FollowCameraSaoMiao : MonoSingleton<FollowCameraSaoMiao>
 {
     private void OnEnable()
     {
-        this.transform.parent = OpenXRCamera.Instance.head;
+        this.transform.SetParent(OpenXRCamera.Instance.head);
         this.transform.position = OpenXRCamera.Instance.head.forward * 2;
         this.transform.localEulerAngles = Vector3.zero;
     }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowModelManager.cs

@@ -39,11 +39,11 @@ public class ShowModelManager : MonoBehaviour
             ac.RootGameObject.transform.localPosition = Vector3.zero;
             Bounds bounds = GetAllBounds.GetRendererBounds(root);
             GameObject obj = new GameObject("Test");
-            obj.transform.parent = ac.RootGameObject.transform;
+            obj.transform.SetParent(ac.RootGameObject.transform);
             obj.transform.position = bounds.center;
             float bizhi = 0.4f / bounds.size.x;
             ac.RootGameObject.transform.localScale = Vector3.one*bizhi;
-            ac.RootGameObject.transform.parent = this.transform;
+            ac.RootGameObject.transform.SetParent(this.transform);
             ac.RootGameObject.transform.localPosition = Vector3.zero- obj.transform.position * 1000;
             ac.RootGameObject.SetActive(true);
         }, (AssetLoaderContext ac, float f) => {

Assets/HotUpdate/Scripts/Scripts/Scripts/DianYunManager.cs

@@ -44,7 +44,7 @@ public class DianYunManager : MonoSingleton<DianYunManager>
             TestGo = new GameObject();
         }
         SDK = GameObject.Instantiate(WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "SDK"));
-        SDK.transform.parent = this.transform;
+        SDK.transform.SetParent(this.transform);
         SDK.transform.localPosition = Vector3.zero;
         SDK.transform.localEulerAngles = Vector3.zero;
         maps = SDK.GetComponentInChildren<ARSpace>();

Assets/HotUpdate/Scripts/Scripts/ShowInfoTipManager.cs

@@ -15,7 +15,7 @@ public class ShowInfoTipManager : MonoSingleton<ShowInfoTipManager>
         {
             if (WindowsManager.Instance.tipInfoGameObject != null && GSXR_Transform.position != null)
             {
-                WindowsManager.Instance.tipInfoGameObject.transform.parent = GSXR_Transform;
+                WindowsManager.Instance.tipInfoGameObject.transform.SetParent(GSXR_Transform);
                 WindowsManager.Instance.tipInfoGameObject.transform.position = GSXR_Transform.position;
                 WindowsManager.Instance.tipInfoGameObject.transform.LookAt(OpenXRCamera.Instance.head);
             }
@@ -24,7 +24,7 @@ public class ShowInfoTipManager : MonoSingleton<ShowInfoTipManager>
         {
             if (WindowsManager.Instance.tipInfoGameObject != null && GSXR_Transform.position != null)
             {
-                WindowsManager.Instance.tipInfoGameObject.transform.parent = OpenXRCamera.Instance.head;
+                WindowsManager.Instance.tipInfoGameObject.transform.SetParent( OpenXRCamera.Instance.head);
                 WindowsManager.Instance.tipInfoGameObject.transform.localPosition = new Vector3(0, 0, 1.5f);
                 WindowsManager.Instance.tipInfoGameObject.transform.localEulerAngles = new Vector3(0,180,0);
              //   WindowsManager.Instance.tipInfoGameObject.transform.LookAt(OpenXRCamera.Instance.head);

Assets/HotUpdate/Scripts/UserManager.cs

@@ -32,7 +32,7 @@ public class UserManager :Singleton<UserManager>
     {
         if (Instance!=null&&Instance.NowChooseGo != null)
         {
-            Instance.NowChooseGo.transform.parent = t;
+            Instance.NowChooseGo.transform.SetParent(t);
             Instance.NowChooseGo.transform.localEulerAngles = Vector3.zero;
             Instance.NowChooseGo.transform.localScale = Vector3.one;
             Instance.NowChooseGo.transform.DOLocalMove(v3, 0.5f).OnComplete(() => {

Assets/HotUpdate/Tools/CameraFollowerEdustry.cs

@@ -76,7 +76,7 @@ namespace SC.XR.Unity
                 }
                 else
                 {
-                    Cam.transform.parent = null;
+                    Cam.transform.SetParent(null);
                     Cam.transform.position = OpenXRCamera.Instance.head.position;
                     Cam.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.transform.eulerAngles.y, 0);
                 }
@@ -86,7 +86,7 @@ namespace SC.XR.Unity
                 InstantFollow();
             }else
             {
-                Cam.transform.parent = null;
+                Cam.transform.SetParent(null);
                 Cam.transform.position = OpenXRCamera.Instance.head.position;
                 Cam.transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.transform.eulerAngles.y, 0);
             }

Assets/HybridCLRGenerate/link.xml

@@ -264,6 +264,7 @@
     <type fullname="System.Collections.Generic.Dictionary`2/Enumerator" preserve="all" />
     <type fullname="System.Collections.Generic.Dictionary`2/KeyCollection" preserve="all" />
     <type fullname="System.Collections.Generic.Dictionary`2/KeyCollection/Enumerator" preserve="all" />
+    <type fullname="System.Collections.Generic.ICollection`1" preserve="all" />
     <type fullname="System.Collections.Generic.IComparer`1" preserve="all" />
     <type fullname="System.Collections.Generic.IDictionary`2" preserve="all" />
     <type fullname="System.Collections.Generic.IEnumerable`1" preserve="all" />

Assets/LocalAsset/LocalAsset.prefab.meta

@@ -3,5 +3,5 @@ guid: 4a3da7bb0173eb44db488cafe5da8c60
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: localasset
   assetBundleVariant: 

Assets/Main/LoadDll.cs

@@ -23,7 +23,7 @@ public class LoadDll : MonoBehaviour
     }
     void Start()
     {
-        this.transform.parent = OpenXRCamera.Instance.head.transform;
+        this.transform.SetParent(OpenXRCamera.Instance.head.transform);
         this.transform.localPosition = Vector3.zero;
         this.transform.localEulerAngles = Vector3.zero;
 

Assets/Plugins/RenderHeads/AVProMovieCapture/Runtime/Scripts/Components/CaptureFromCamera360ODS.cs

@@ -446,7 +446,7 @@ namespace RenderHeads.Media.AVProMovieCapture
 			if (_cameraGroup == null)
 			{
 				GameObject go = new GameObject("OdsCameraGroup");
-				go.transform.parent = this.gameObject.transform;
+				go.transform.SetParent(this.gameObject.transform);
 				// NOTE: We copy the hideFlags otherwise when instantiated by the Movie Capture window which has the DontSave flag
 				// Unity throws an error about destroying transforms when coming out of play mode.
 				go.hideFlags = this.gameObject.hideFlags;

Assets/Scenes/Edustry.unity

@@ -358,6 +358,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
+--- !u!1 &299976110 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8240336528491331399, guid: c2bba08c58147f6428b068597dde0286, type: 3}
+  m_PrefabInstance: {fileID: 160595370}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &564325001
 GameObject:
   m_ObjectHideFlags: 0
@@ -916,8 +921,8 @@ CanvasRenderer:
 --- !u!1 &1812144309
 GameObject:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 801210153980711210, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-  m_PrefabInstance: {fileID: 801210153376936351}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
@@ -934,8 +939,8 @@ GameObject:
 --- !u!114 &1812144310
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 801210153980711209, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-  m_PrefabInstance: {fileID: 801210153376936351}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1812144309}
   m_Enabled: 0
@@ -947,8 +952,8 @@ MonoBehaviour:
 --- !u!114 &1812144311
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 801210153980711208, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-  m_PrefabInstance: {fileID: 801210153376936351}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1812144309}
   m_Enabled: 1
@@ -956,15 +961,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 20fd932914f92c744ac4bc0a2095a203, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  EditorGame: {fileID: 0}
+  EditorGame: {fileID: 299976110}
   text: {fileID: 1918649013}
   text2: {fileID: 147821187}
   slider: {fileID: 592517423}
 --- !u!4 &1812144312
 Transform:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-  m_PrefabInstance: {fileID: 801210153376936351}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1812144309}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -1132,68 +1137,3 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2146134883}
   m_CullTransparentMesh: 1
---- !u!1001 &801210153376936351
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711207, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711209, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711210, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_Name
-      value: Load
-      objectReference: {fileID: 0}
-    - target: {fileID: 801210153980711210, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4592e66f10af3cf4ca8a4dbc86269eaa, type: 3}

Assets/TextMesh Pro/Examples & Extras/Scripts/TMPro_InstructionOverlay.cs

@@ -30,7 +30,7 @@ namespace TMPro.Examples
 
             GameObject frameCounter = new GameObject("Frame Counter");
             m_frameCounter_transform = frameCounter.transform;
-            m_frameCounter_transform.parent = m_camera.transform;
+            m_frameCounter_transform.SetParent(m_camera.transform);
             m_frameCounter_transform.localRotation = Quaternion.identity;