1

Assets/Res/Timelines/00_timeline.playable

@@ -449,7 +449,7 @@ MonoBehaviour:
     m_Start: 80.56666666666666
     m_ClipIn: 0
     m_Asset: {fileID: 4674024635053442591}
-    m_Duration: 54.33333333333334
+    m_Duration: 51.900000000000006
     m_TimeScale: 1
     m_ParentTrack: {fileID: -4150429269391175459}
     m_EaseInDuration: 0

Assets/Scenes/Scene_01.unity

@@ -16229,6 +16229,12 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!1 &703723834 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2359261607925189143, guid: 154719aa83efcef49b859eb86977282b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8656849485540867627}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &708009310
 GameObject:
   m_ObjectHideFlags: 0
@@ -18582,6 +18588,18 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1056383156}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1086195537 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4135912580292953789, guid: 154719aa83efcef49b859eb86977282b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8656849485540867627}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1086195538 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2064708109821860159, guid: 154719aa83efcef49b859eb86977282b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8656849485540867627}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1089755614
 GameObject:
   m_ObjectHideFlags: 0
@@ -18700,6 +18718,12 @@ Transform:
   m_Children: []
   m_Father: {fileID: 124334116}
   m_LocalEulerAnglesHint: {x: -26.771, y: -14.142, z: 2.782}
+--- !u!1 &1116001750 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3256529114706604393, guid: 154719aa83efcef49b859eb86977282b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8656849485540867627}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1122967490
 GameObject:
   m_ObjectHideFlags: 0
@@ -26264,6 +26288,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1122967491}
     m_Modifications:
+    - target: {fileID: 43193150393775829, guid: 154719aa83efcef49b859eb86977282b,
+        type: 3}
+      propertyPath: childAnimator
+      value: 
+      objectReference: {fileID: 1086195538}
     - target: {fileID: 94064733036519553, guid: 154719aa83efcef49b859eb86977282b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -26384,6 +26413,11 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0.053486332
       objectReference: {fileID: 0}
+    - target: {fileID: 1452385352095355107, guid: 154719aa83efcef49b859eb86977282b,
+        type: 3}
+      propertyPath: childAnimator
+      value: 
+      objectReference: {fileID: 703723834}
     - target: {fileID: 1454986559232768067, guid: 154719aa83efcef49b859eb86977282b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -26459,6 +26493,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3378037153121026329, guid: 154719aa83efcef49b859eb86977282b,
+        type: 3}
+      propertyPath: childAnimator
+      value: 
+      objectReference: {fileID: 1116001750}
     - target: {fileID: 3478131284429568785, guid: 154719aa83efcef49b859eb86977282b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -26569,6 +26608,11 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0.02283363
       objectReference: {fileID: 0}
+    - target: {fileID: 6089756856306655189, guid: 154719aa83efcef49b859eb86977282b,
+        type: 3}
+      propertyPath: childAnimator
+      value: 
+      objectReference: {fileID: 1086195537}
     - target: {fileID: 6174040849317479917, guid: 154719aa83efcef49b859eb86977282b,
         type: 3}
       propertyPath: m_Name

Assets/Scenes/Scene_02.unity

@@ -3133,6 +3133,11 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1723237086}
     m_Modifications:
+    - target: {fileID: 3386296520863442132, guid: 803f747bbe53e8c44b1c196a2723993c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7325674796581826738, guid: 803f747bbe53e8c44b1c196a2723993c,
         type: 3}
       propertyPath: m_Name
@@ -3188,7 +3193,9 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 4985012908240385617, guid: 803f747bbe53e8c44b1c196a2723993c, type: 3}
+    - {fileID: 1943828513129854157, guid: 803f747bbe53e8c44b1c196a2723993c, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []

Assets/Scenes/Scene_04.unity

@@ -187,11 +187,51 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4542853647431772424, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[0]
+      value: 
+      objectReference: {fileID: 1920220787}
+    - target: {fileID: 4542853647431772424, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[1]
+      value: 
+      objectReference: {fileID: 1920220786}
+    - target: {fileID: 4542853647431772424, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[2]
+      value: 
+      objectReference: {fileID: 1920220785}
+    - target: {fileID: 4542853647431772424, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[3]
+      value: 
+      objectReference: {fileID: 1920220784}
     - target: {fileID: 6560290179737207316, guid: 24a91d9a67655f144b82e0add7998d26,
         type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7125131765417500380, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[0]
+      value: 
+      objectReference: {fileID: 1920220787}
+    - target: {fileID: 7125131765417500380, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[1]
+      value: 
+      objectReference: {fileID: 1920220786}
+    - target: {fileID: 7125131765417500380, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[2]
+      value: 
+      objectReference: {fileID: 1920220785}
+    - target: {fileID: 7125131765417500380, guid: 24a91d9a67655f144b82e0add7998d26,
+        type: 3}
+      propertyPath: childAnimator.Array.data[3]
+      value: 
+      objectReference: {fileID: 1920220784}
     - target: {fileID: 8674344223236799108, guid: 24a91d9a67655f144b82e0add7998d26,
         type: 3}
       propertyPath: m_Name
@@ -14251,6 +14291,30 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 1207905033}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1920220784 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5820905329968995068, guid: 24a91d9a67655f144b82e0add7998d26,
+    type: 3}
+  m_PrefabInstance: {fileID: 1098178}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1920220785 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7431356492870136072, guid: 24a91d9a67655f144b82e0add7998d26,
+    type: 3}
+  m_PrefabInstance: {fileID: 1098178}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1920220786 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6459135894530526320, guid: 24a91d9a67655f144b82e0add7998d26,
+    type: 3}
+  m_PrefabInstance: {fileID: 1098178}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1920220787 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4279271958034961754, guid: 24a91d9a67655f144b82e0add7998d26,
+    type: 3}
+  m_PrefabInstance: {fileID: 1098178}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1923781958 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7202189229376878002, guid: 23951a5da0e0b65468ea6459acff8251,

Assets/Scenes/Scene_05.unity

@@ -5527,13 +5527,31 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5962209728210216713, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
+        type: 3}
+      propertyPath: InitialModule.maxNumParticles
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6300795867342810639, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
         type: 3}
       propertyPath: m_Name
       value: Static
       objectReference: {fileID: 0}
+    - target: {fileID: 8726855694445176297, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
+        type: 3}
+      propertyPath: InitialModule.maxNumParticles
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9090325644223692649, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
+        type: 3}
+      propertyPath: InitialModule.maxNumParticles
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
+    m_RemovedGameObjects:
+    - {fileID: 7554358525611081384, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb, type: 3}
+    - {fileID: 5642468550914532076, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb, type: 3}
+    - {fileID: 7782897695481330183, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb, type: 3}
     m_AddedGameObjects:
     - targetCorrespondingSourceObject: {fileID: 461394519014796449, guid: 2f10be5c6a4b2b04dbce56430d3cd5fb,
         type: 3}
@@ -8016,6 +8034,21 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1182538979}
     m_Modifications:
+    - target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.62
+      objectReference: {fileID: 0}
+    - target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.02
+      objectReference: {fileID: 0}
+    - target: {fileID: 41330033827983655, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 344456212405456365, guid: 2de3bf9ac390ec74fb7966c1afa122f5,
         type: 3}
       propertyPath: m_IsActive

Assets/Scripts/HandCatch/GrabItem.cs

@@ -188,7 +188,7 @@ public class GrabItem : MonoBehaviour
     {
         if (childAnimator != null)
         {
-            childAnimator.transform.localScale = Vector3.zero;
+            Destroy(childAnimator);
         }
     }
    

Assets/Scripts/Scene_02/RayCtr.cs

@@ -3,6 +3,7 @@ using BigSpace.XRCore.Event;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class RayCtr : MonoBehaviour
 {
@@ -72,9 +73,18 @@ public class RayCtr : MonoBehaviour
             if (starRay)
             {
                 Debug.DrawRay(transform.position, transform.forward * rayLength, Color.red);
+                Ray ray;
+                if (SceneMgr.Instance.nowSceneId == 2)
+                {
+                    ray = new Ray(transform.position, transform.forward);
+                }
+                else
+                {
+                    var Cam = Camera.main;
+                    ray = new Ray(Cam.transform.position, Cam.transform.forward);
 
+                }
                 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB><EFBFBD><EFBFBD>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-                Ray ray = new Ray(transform.position, transform.forward);
                 RaycastHit hit; // <20>洢<EFBFBD><E6B4A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ײ<EFBFBD><D7B2>Ϣ
                                 //Debug.Log("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>......<2E><>1<EFBFBD><31>");
                 if (Physics.Raycast(ray, out hit, rayLength, detectionLayer))