Update 2.2 und 3.2

Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt

@@ -12,8 +12,8 @@
             }
 
             Composite(Sequence) {
-                //RunTree("22_Geschaeft_Story_A_Picknicken_Intro")
+                RunTree("22_Geschaeft_Story_A_Picknicken_Intro")
-                RunTree("22_Geschaeft_Baeckerei_Outro")
+                //RunTree("22_Geschaeft_Baeckerei_Outro")
             }
         }
 
@@ -202,12 +202,13 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
 
         // ToDo: Bezahlung mit Handy User
         Composite(Race) {
-            // ToDo: Collide handy mit Payment device
+            Composite(Sequence) {
-            BTC.GetKeyDown("Return")
+                BTC.Set("Collider.STATIC.Kartenlesegeraet", "otherTag", "Smartphone")
+                BTC.Run("Collider.STATIC.Kartenlesegeraet")
+            }
 
             Composite(Sequence) {
                 BTC.Wait(5)
-                // Collide Aktion abbrechen?
 
                 // --- Story A Picknicken - Nachfrage Bezahlung ---
                 BTC.Show("Depthkit.VIDEOS.NachfrageBezahlung_01")
@@ -215,12 +216,13 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
                 BTC.Hide("Depthkit.VIDEOS.NachfrageBezahlung_01")
 
                 Composite(Race) {
-                    // ToDo: Collide handy mit Payment device
+                    Composite(Sequence) {
-                    BTC.GetKeyDown("Return")
+                        BTC.Set("Collider.STATIC.Kartenlesegeraet", "otherTag", "Smartphone")
+                        BTC.Run("Collider.STATIC.Kartenlesegeraet")
+                    }
 
                     Composite(Sequence) {
                         BTC.Wait(5)
-                        // Collide aktion abbrechen?
 
                         BTC.Show("Depthkit.VIDEOS.NachfrageBezahlung_03")
                         BTC.Run("Depthkit.VIDEOS.NachfrageBezahlung_03")
@@ -230,6 +232,9 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
             }
         }
 
+        BTC.Hide("Depthkit.VIDEOS.NachfrageBezahlung_01")
+        BTC.Hide("Depthkit.VIDEOS.NachfrageBezahlung_03")
+
         // --- Story A Picknicken - Dank Einkauf ---
         BTC.Show("Depthkit.VIDEOS.DankEinkauf1StoryA")
         BTC.Run("Depthkit.VIDEOS.DankEinkauf1StoryA")
@@ -312,8 +317,8 @@ Tree("22_Geschaeft_Baeckerei_Outro") {
 // --- Baeckerei Outro ---
     Composite(Sequence) {
         Composite(Marathon) {
-            BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -3.068, 0, 1.6)
+            BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -3.068, 0, 1.3)
-            BTC.SetPosition("GO.HANDMENU", -3.068, 0, 1.6)
+            BTC.SetPosition("GO.HANDMENU", -3.068, 0, 1.3)
             BTC.RotateToAngle("GO.XRInteractionHandsSetup.XROrigin", 0.0)
             BTC.RotateToAngle("GO.HANDMENU", 0.0)
         }

Viagg-io/Assets/Prefabs/UI/_HANDMENU.prefab

@@ -6948,6 +6948,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 9
       objectReference: {fileID: 0}
+    - target: {fileID: 6781773395061731843, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
+      propertyPath: m_TagString
+      value: Smartphone
+      objectReference: {fileID: 0}
     - target: {fileID: 6784721238716308929, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
       propertyPath: m_Layer
       value: 9
@@ -7012,13 +7016,46 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 9
       objectReference: {fileID: 0}
+    - target: {fileID: 8053129705982354576, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
+      propertyPath: m_TagString
+      value: Untagged
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 6781773395061731843, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1216428378211298260}
   m_SourcePrefab: {fileID: 100100000, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
 --- !u!4 &107801045539344950 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 7244504408015846954, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
   m_PrefabInstance: {fileID: 7347440387281185820}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4317519251148217887 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6781773395061731843, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
+  m_PrefabInstance: {fileID: 7347440387281185820}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &1216428378211298260
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4317519251148217887}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.06910706, y: 0.010000088, z: 0.14613198}
+  m_Center: {x: 0.00038537793, y: 0.0012356478, z: -0.00044285215}

Viagg-io/ProjectSettings/TagManager.asset

@@ -19,6 +19,8 @@ TagManager:
   - Topf
   - Messer
   - SlicedZwiebel
+  - PlacedObject
+  - Smartphone
   layers:
   - Default
   - TransparentFX