Add routing from Puschlav; clean up SBB Scenes

Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt

@@ -11,12 +11,24 @@
                 BTC.SetBool("error")
             }
 
+            Composite(Selector) {
+                Composite(Sequence) {
+                    // Check Minigame SBB
+                    BTC.CheckEntryLevel(0)
+
+                    BTC.Run("MediaPlayer.VIDEOS.IntroFidle1")
+                    BTC.ResetEntryLevel(0)
+                    BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")
+                    RunTree("10_SBB_Zugabteil_Szenenwahl")
+                }
+
                 Composite(Sequence) {
                     BTC.Run("MediaPlayer.VIDEOS.IntroFidle1")
                     BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")
                     RunTree("10_SBB_Zugabteil_Intro")
                 }
             }
+        }
 
         Composite(Sequence) {
             BTC.CompareBool("error")
@@ -201,6 +213,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
         Composite(Marathon) {
             BTC.Hide("MediaPlayer.VIDEOS.RepetitionIntroAFi_2")
             BTC.Hide("MediaPlayer.VIDEOS.RepetitionIntroBFi_2")
+            BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
         }
         BTC.Run("MediaPlayer.VIDEOS.SzenenwahlF1")
         BTC.Run("MediaPlayer.VIDEOS.SzenenwahlFidle2")
@@ -263,10 +276,17 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
             // VR Brille nehmen
             Composite(Sequence) {
                 BTC.Run("NamedGrabEvent.INTERACTABLES.VRBrille")
+                Composite(Marathon) {
+                    BTC.SetEntryLevel(0)
+                    BTC.AbortEventListener("NamedEventTrigger.HANDMENU.Option2Button")
+                    BTC.AbortEventListener("NamedEventTrigger.HANDMENU.Option1Button")
+                    BTC.Hide("GO.HANDMENU.Option1Button")
+                    BTC.Hide("GO.HANDMENU.Option2Button")
+                    BTC.Hide("GO.HANDMENU.SpeechButton")
+                    BTC.Hide("GO.HANDMENU.SpeechOptions")
+                }
                 BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                 BTC.Run("LoadScene.NEXT.40Puschlav")
-                // TODO: Minigame starten
-                // Nach Minigame: zuruck zu Szenenwahl
             }
 
             // Szenenwahl per Handmenu

Viagg-io/Assets/BehaviourTrees/3.2-Grotto1.bt.txt

@@ -13,24 +13,7 @@
 
             Composite(Selector) {
                 Composite(Sequence) {
-                    // Check Abbruch Kochen
+                    // Check Puschlav Grotto / Abbruch Kueche
-                    BTC.CheckEntryLevel(2)
-
-                    // Initialization
-                    Composite(Marathon) {
-                        BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -3.573, 0, -12.124)
-                        BTC.SetPosition("GO.HANDMENU", -3.573, 0, -12.124)
-                        BTC.RotateToAngle("GO.XRInteractionHandsSetup.XROrigin", 0.0)
-                        BTC.RotateToAngle("GO.HANDMENU", 0.0)
-                        BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")
-                    }
-                    BTC.Wait(5)
-                    BTC.ResetEntryLevel(2)
-                    RunTree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto_Teil2")
-                }
-
-                Composite(Sequence) {
-                    // Check Puschlav Grotto
                     BTC.CheckEntryLevel(1)
 
                     // Initialization
@@ -551,6 +534,7 @@ Tree("32_Grotto_Story_B_Grotto_Antwort_Nonna_Grotto") {
 
             Composite(Sequence) {
                 BTC.Run("NamedGrabEvent.INTERACTABLES.VRBrille")
+                BTC.SetEntryLevel(1)
                 BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                 BTC.Run("LoadScene.NEXT.40Puschlav")
             }

Viagg-io/Assets/BehaviourTrees/3.2-Grotto2.bt.txt

@@ -164,7 +164,7 @@ Tree("32_Grotto_Kueche_Intro") {
                     }
                 }
 
-                BTC.SetEntryLevel(2)
+                BTC.SetEntryLevel(1)
                 BTC.Run("LoadScene.NEXT.32Grotto1")
             }
         }

Viagg-io/Assets/BehaviourTrees/4.0-Puschlav.bt.txt

@@ -87,13 +87,20 @@ Tree("40_Puschlav_Story_C_Puschlav") {
                             Composite(Sequence) {
                                 BTC.CompareIntentID("Story_C_Puschlav-1-9099_bahnhof-U-2")
                                 BTC.ClearPossbileSpeechIntents()
-                                // TODO: Jump point definieren
+                                
                                 Composite(Marathon) {
                                     BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav1")
                                     BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 }
+
+                                Composite(Selector) {
+                                    Composite(Sequence) {
+                                        BTC.CheckEntryLevel(0)
                                         BTC.Run("LoadScene.NEXT.10SBB")
                                     }
+                                    BTC.Run("LoadScene.NEXT.32Grotto1")
+                                }
+                            }
                         }
                     }
 
@@ -133,13 +140,20 @@ Tree("40_Puschlav_Story_C_Puschlav") {
                                     Composite(Sequence) {
                                         BTC.CompareIntentID("Story_C_Puschlav-1-9099_bahnhof-U-2")
                                         BTC.ClearPossbileSpeechIntents()
-                                        // TODO: Jump point definieren
+
                                         Composite(Marathon) {
                                             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav1")
                                             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                         }
+
+                                        Composite(Selector) {
+                                            Composite(Sequence) {
+                                                BTC.CheckEntryLevel(0)
                                                 BTC.Run("LoadScene.NEXT.10SBB")
                                             }
+                                            BTC.Run("LoadScene.NEXT.32Grotto1")
+                                        }
+                                    }
                                 }
                             }
 
@@ -210,13 +224,20 @@ Tree("40_Puschlav_Story_C_Puschlav") {
                             Composite(Sequence) {
                                 BTC.CompareIntentID("Story_C_Puschlav-2-9119_schild-U-2c")
                                 BTC.ClearPossbileSpeechIntents()
-                                // TODO: Jump point definieren
+
                                 Composite(Marathon) {
                                     BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav2")
                                     BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 }
+
+                                Composite(Selector) {
+                                    Composite(Sequence) {
+                                        BTC.CheckEntryLevel(0)
                                         BTC.Run("LoadScene.NEXT.10SBB")
                                     }
+                                    BTC.Run("LoadScene.NEXT.32Grotto1")
+                                }
+                            }
                         }
                     }
 
@@ -263,13 +284,20 @@ Tree("40_Puschlav_Story_C_Puschlav") {
                                     Composite(Sequence) {
                                         BTC.CompareIntentID("Story_C_Puschlav-2-9119_schild-U-2c")
                                         BTC.ClearPossbileSpeechIntents()
-                                        // TODO: Jump point definieren
+
                                         Composite(Marathon) {
                                             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav2")
                                             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                         }
+
+                                        Composite(Selector) {
+                                            Composite(Sequence) {
+                                                BTC.CheckEntryLevel(0)
                                                 BTC.Run("LoadScene.NEXT.10SBB")
                                             }
+                                            BTC.Run("LoadScene.NEXT.32Grotto1")
+                                        }
+                                    }
                                 }
                             }
 
@@ -295,15 +323,20 @@ Tree("40_Puschlav_Story_C_Puschlav") {
         }
 
         // Ende
-        // ToDo: Jump Point definieren
         Composite(Marathon) {
             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav5a")
             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav5b")
             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
         }
 
+        Composite(Selector) {
+            Composite(Sequence) {
+                BTC.CheckEntryLevel(0)
                 BTC.Run("LoadScene.NEXT.10SBB")
             }
+            BTC.Run("LoadScene.NEXT.32Grotto1")
+        }
+    }
 }
 
 Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") {
@@ -347,13 +380,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") {
                             Composite(Sequence) {
                                 BTC.CompareIntentID("Story_C_Puschlav-3a-8927_trichter1-U-2c")
                                 BTC.ClearPossbileSpeechIntents()
-                                // TODO: Jump point definieren
+
                                 Composite(Marathon) {
                                     BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav3a")
                                     BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 }
+
+                                Composite(Selector) {
+                                    Composite(Sequence) {
+                                        BTC.CheckEntryLevel(0)
                                         BTC.Run("LoadScene.NEXT.10SBB")
                                     }
+                                    BTC.Run("LoadScene.NEXT.32Grotto1")
+                                }
+                            }
                         }
                     }
 
@@ -393,13 +433,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") {
                                     Composite(Sequence) {
                                         BTC.CompareIntentID("Story_C_Puschlav-3a-8927_trichter1-U-2c")
                                         BTC.ClearPossbileSpeechIntents()
-                                        // TODO: Jump point definieren
+
                                         Composite(Marathon) {
                                             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav3a")
                                             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                         }
+
+                                        Composite(Selector) {
+                                            Composite(Sequence) {
+                                                BTC.CheckEntryLevel(0)
                                                 BTC.Run("LoadScene.NEXT.10SBB")
                                             }
+                                            BTC.Run("LoadScene.NEXT.32Grotto1")
+                                        }
+                                    }
                                 }
                             }
 
@@ -461,13 +508,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") {
                             Composite(Sequence) {
                                 BTC.CompareIntentID("Story_C_Puschlav-4a-8975_trichter2-U-2c")
                                 BTC.ClearPossbileSpeechIntents()
-                                // TODO: Jump point definieren
+
                                 Composite(Marathon) {
                                     BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav4a")
                                     BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 }
+
+                                Composite(Selector) {
+                                    Composite(Sequence) {
+                                        BTC.CheckEntryLevel(0)
                                         BTC.Run("LoadScene.NEXT.10SBB")
                                     }
+                                    BTC.Run("LoadScene.NEXT.32Grotto1")
+                                }
+                            }
                         }
                     }
 
@@ -507,13 +561,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3A_Gletschergarten") {
                                     Composite(Sequence) {
                                         BTC.CompareIntentID("Story_C_Puschlav-4a-8975_trichter2-U-2c")
                                         BTC.ClearPossbileSpeechIntents()
-                                        // TODO: Jump point definieren
+
                                         Composite(Marathon) {
                                             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav4a")
                                             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                         }
+
+                                        Composite(Selector) {
+                                            Composite(Sequence) {
+                                                BTC.CheckEntryLevel(0)
                                                 BTC.Run("LoadScene.NEXT.10SBB")
                                             }
+                                            BTC.Run("LoadScene.NEXT.32Grotto1")
+                                        }
+                                    }
                                 }
                             }
 
@@ -657,13 +718,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") {
                             Composite(Sequence) {
                                 BTC.CompareIntentID("Story_C_Puschlav-3b-8595_alpenrosen-U-2")
                                 BTC.ClearPossbileSpeechIntents()
-                                // TODO: Jump point definieren
+
                                 Composite(Marathon) {
                                     BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav3b")
                                     BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 }
+
+                                Composite(Selector) {
+                                    Composite(Sequence) {
+                                        BTC.CheckEntryLevel(0)
                                         BTC.Run("LoadScene.NEXT.10SBB")
                                     }
+                                    BTC.Run("LoadScene.NEXT.32Grotto1")
+                                }
+                            }
                         }
                     }
 
@@ -703,13 +771,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") {
                                     Composite(Sequence) {
                                         BTC.CompareIntentID("Story_C_Puschlav-3b-8595_alpenrosen-U-2")
                                         BTC.ClearPossbileSpeechIntents()
-                                        // TODO: Jump point definieren
+
                                         Composite(Marathon) {
                                             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav3b")
                                             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                         }
+
+                                        Composite(Selector) {
+                                            Composite(Sequence) {
+                                                BTC.CheckEntryLevel(0)
                                                 BTC.Run("LoadScene.NEXT.10SBB")
                                             }
+                                            BTC.Run("LoadScene.NEXT.32Grotto1")
+                                        }
+                                    }
                                 }
                             }
 
@@ -771,13 +846,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") {
                             Composite(Sequence) {
                                 BTC.CompareIntentID("Story_C_Puschlav-4b-8623_schafe-U-2")
                                 BTC.ClearPossbileSpeechIntents()
-                                // TODO: Jump point definieren
+
                                 Composite(Marathon) {
                                     BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav4b")
                                     BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                 }
+
+                                Composite(Selector) {
+                                    Composite(Sequence) {
+                                        BTC.CheckEntryLevel(0)
                                         BTC.Run("LoadScene.NEXT.10SBB")
                                     }
+                                    BTC.Run("LoadScene.NEXT.32Grotto1")
+                                }
+                            }
                         }
                     }
 
@@ -817,13 +899,20 @@ Tree("40_Puschlav_Story_C_Puschlav_3B_Alpgruem") {
                                     Composite(Sequence) {
                                         BTC.CompareIntentID("Story_C_Puschlav-4b-8623_schafe-U-2")
                                         BTC.ClearPossbileSpeechIntents()
-                                        // TODO: Jump point definieren
+
                                         Composite(Marathon) {
                                             BTC.StopSound("StudioEventEmitter.XRInteractionHandsSetup.Puschlav4b")
                                             BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
                                         }
+
+                                        Composite(Selector) {
+                                            Composite(Sequence) {
+                                                BTC.CheckEntryLevel(0)
                                                 BTC.Run("LoadScene.NEXT.10SBB")
                                             }
+                                            BTC.Run("LoadScene.NEXT.32Grotto1")
+                                        }
+                                    }
                                 }
                             }
 

Viagg-io/Assets/Scenes/4.0-Puschlav.unity

@@ -123,47 +123,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!21 &2379763
+--- !u!21 &8212070
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &11313552
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -534,7 +494,7 @@ MonoBehaviour:
   roomId: XRInteractionHandsSetup
   uniqueId: 
   _name: StudioEventEmitter.XRInteractionHandsSetup.FMODAudio
---- !u!21 &80243549
+--- !u!21 &82808062
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -655,15 +615,15 @@ PrefabInstance:
       objectReference: {fileID: 1282194744}
     - target: {fileID: 5649109579377763916, guid: 23016bb1f9755411a82e6afddfee4016, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.464
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5649109579377763916, guid: 23016bb1f9755411a82e6afddfee4016, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.187
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5649109579377763916, guid: 23016bb1f9755411a82e6afddfee4016, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: -0.443
       objectReference: {fileID: 0}
     - target: {fileID: 5649109579377763916, guid: 23016bb1f9755411a82e6afddfee4016, type: 3}
       propertyPath: m_LocalRotation.w
@@ -1542,6 +1502,46 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!21 &249836757
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &319696528
 GameObject:
   m_ObjectHideFlags: 0
@@ -1707,6 +1707,46 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!21 &322014500
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
 --- !u!114 &349650855 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6514177060466835402, guid: 23016bb1f9755411a82e6afddfee4016, type: 3}
@@ -1994,6 +2034,46 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!21 &464026090
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &478938930
 GameObject:
   m_ObjectHideFlags: 0
@@ -2104,7 +2184,7 @@ MonoBehaviour:
   overrideLogStringDisplay: 0
   overrideDebugInternalActive: 0
   overrideDebugChangesActive: 0
-  instanceID: 83676
+  instanceID: 1216370
   __behaviourTreeGenerator: {fileID: 0}
   taskScripts:
   - {fileID: 4900000, guid: 36780e00eead045f596f95dc169f59d0, type: 3}
@@ -2299,47 +2379,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!21 &594253350
+--- !u!21 &552867941
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &610223943
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -3070,7 +3110,87 @@ MonoBehaviour:
   roomId: XRInteractionHandsSetup
   uniqueId: 
   _name: StudioEventEmitter.XRInteractionHandsSetup.FMODAudio
---- !u!21 &995805394
+--- !u!21 &1013662766
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
+--- !u!21 &1021072630
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
+--- !u!21 &1021735203
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -3410,46 +3530,6 @@ Material:
     - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
   m_BuildTextureStacks: []
 --- !u!21 &1282194744
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &1305054862
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -3870,6 +3950,86 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!21 &1410291256
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
+--- !u!21 &1425115206
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1001 &1438540714
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4073,6 +4233,46 @@ MonoBehaviour:
   - Videos/Slideshow/5a-9003.JPG
   - Videos/Slideshow/5b-8511.JPG
   _imgList: []
+--- !u!21 &1443835639
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UI/RoundedCorners/RoundedCorners
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _ColorMask: 15
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
+    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
+  m_BuildTextureStacks: []
 --- !u!1 &1450407266
 GameObject:
   m_ObjectHideFlags: 0
@@ -4238,7 +4438,7 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!21 &1502626485
+--- !u!21 &1514801317
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -4725,46 +4925,6 @@ MonoBehaviour:
   uniqueId: 
   _name: GO.UI.GoXY
 --- !u!21 &1694779931
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &1696086499
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0
@@ -4969,46 +5129,6 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!21 &1700912710
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
 --- !u!114 &1714886241 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6313271181203162305, guid: 23016bb1f9755411a82e6afddfee4016, type: 3}
@@ -5317,46 +5437,6 @@ MonoBehaviour:
   roomId: XRInteractionHandsSetup
   uniqueId: 
   _name: StudioEventEmitter.XRInteractionHandsSetup.FMODAudio
---- !u!21 &1765359438
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
 --- !u!1 &1814113887
 GameObject:
   m_ObjectHideFlags: 0
@@ -5632,46 +5712,6 @@ MonoBehaviour:
   roomId: STATIC
   uniqueId: 
   _name: GO.STATIC.GoXY
---- !u!21 &1865419539
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
 --- !u!4 &1867083648 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2097120032753052321, guid: ea46eac23ee4041d08d72ff651ddc3d2, type: 3}
@@ -6460,46 +6500,6 @@ MonoBehaviour:
   uniqueId: 
   _name: StudioEventEmitter.XRInteractionHandsSetup.FMODAudio
 --- !u!21 &2100399307
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: UI/RoundedCorners/RoundedCorners
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _ColorMask: 15
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UseUIAlphaClip: 0
-    m_Colors:
-    - _OuterUV: {r: 0, g: 0, b: 1, a: 1}
-    - _WidthHeightRadius: {r: 100, g: 22, b: 17, a: 0}
-  m_BuildTextureStacks: []
---- !u!21 &2130787475
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 0