spoerrireto/UP-Viagg-io
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update handmenu in 1.0 SBB

Browse Source
This commit is contained in:
Nadine Ganz 2025-03-06 10:40:41 +01:00
parent d2f72bd8eb
commit 93d873e72e
3 changed files with 92 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt
View File

@ -22,10 +22,14 @@
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Show("GO.HANDMENU.SpeechButton")
BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "Restart")
BTC.Show("GO.HANDMENU.Option1Button")
BTC.Run("NamedEventTrigger.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
}
}
@ -323,6 +327,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
Composite(Sequence) {
// Option 2: Handmenu
Composite(Marathon) {
BTC.Show("GO.HANDMENU.SpeechButton")
BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "picnic")
BTC.Show("GO.HANDMENU.Option1Button")
BTC.Set("TextMeshPro.HANDMENU.Option2Button", "text", "grotto")
@ -340,6 +345,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option2Button")
BTC.Hide("GO.HANDMENU.Option3Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.AbortSpeechEventListener()
@ -358,6 +366,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option2Button")
BTC.Hide("GO.HANDMENU.Option3Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.AbortSpeechEventListener()
@ -375,6 +386,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option2Button")
BTC.Hide("GO.HANDMENU.Option3Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.AbortSpeechEventListener()
@ -428,6 +442,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
Composite(Sequence) {
BTC.CompareBool("handmenu_active")
Composite(Marathon) {
BTC.Show("GO.HANDMENU.SpeechButton")
BTC.Set("TextMeshPro.HANDMENU.Option1Button", "text", "picnic")
BTC.Show("GO.HANDMENU.Option1Button")
BTC.Set("TextMeshPro.HANDMENU.Option2Button", "text", "grotto")
@ -447,6 +462,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option2Button")
BTC.Hide("GO.HANDMENU.Option3Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.AbortSpeechEventListener()
@ -467,6 +485,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option2Button")
BTC.Hide("GO.HANDMENU.Option3Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.AbortSpeechEventListener()
@ -486,6 +507,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.Hide("GO.HANDMENU.Option1Button")
BTC.Hide("GO.HANDMENU.Option2Button")
BTC.Hide("GO.HANDMENU.Option3Button")
BTC.Hide("GO.HANDMENU.SpeechButton")
BTC.Show("GO.HANDMENU.Home")
BTC.Hide("GO.HANDMENU.SpeechOptions")
}
BTC.AbortSpeechEventListener()

73
Viagg-io/Assets/Scenes/1.0-SBB.unity
View File

@ -1187,6 +1187,17 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &279618484 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2185744855848736044, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
m_PrefabInstance: {fileID: 1285877061}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &285859923
PrefabInstance:
m_ObjectHideFlags: 0
@ -3156,6 +3167,28 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &1100519244 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5173265794982869292, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
m_PrefabInstance: {fileID: 1285877061}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1113754320 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1728074381097661315, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
m_PrefabInstance: {fileID: 1285877061}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1148303043
GameObject:
m_ObjectHideFlags: 0
@ -3792,6 +3825,14 @@ PrefabInstance:
propertyPath: uniqueId
value:
objectReference: {fileID: 0}
- target: {fileID: 603058458314117103, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_Name
value: GO.HANDMENU.SpeechOptions
objectReference: {fileID: 0}
- target: {fileID: 612260542996305177, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_Name
value: GO.HANDMENU.SpeechButton
objectReference: {fileID: 0}
- target: {fileID: 696547208031735914, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_Name
value: NamedEventTrigger.HANDMENU.Option1Button
@ -3804,10 +3845,18 @@ PrefabInstance:
propertyPath: uniqueId
value:
objectReference: {fileID: 0}
- target: {fileID: 1728074381097661315, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: uniqueId
value:
objectReference: {fileID: 0}
- target: {fileID: 2050573482378976592, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_Name
value: TextMeshPro.HANDMENU.Option2Button
objectReference: {fileID: 0}
- target: {fileID: 2185744855848736044, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: uniqueId
value:
objectReference: {fileID: 0}
- target: {fileID: 2636888980393329576, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_LocalPosition.x
value: -1.138
@ -3872,6 +3921,10 @@ PrefabInstance:
propertyPath: uniqueId
value:
objectReference: {fileID: 0}
- target: {fileID: 5173265794982869292, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: uniqueId
value:
objectReference: {fileID: 0}
- target: {fileID: 5903078286478072736, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: uniqueId
value:
@ -3896,6 +3949,10 @@ PrefabInstance:
propertyPath: m_Name
value: _HANDMENU
objectReference: {fileID: 0}
- target: {fileID: 8766490206476275678, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_Name
value: GO.HANDMENU.Home
objectReference: {fileID: 0}
- target: {fileID: 8782175979013437306, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
propertyPath: m_Name
value: TextMeshPro.HANDMENU.Option3Button
@ -5457,10 +5514,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
namedObjects:
- {fileID: 1446900329}
- {fileID: 793948253}
- {fileID: 588318124}
- {fileID: 461261029}
- {fileID: 1100519244}
- {fileID: 1113754320}
- {fileID: 279618484}
- {fileID: 2185744855848736044, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
- {fileID: 5173265794982869292, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
- {fileID: 1728074381097661315, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
- {fileID: 240211946506320929, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
- {fileID: 1550598400944840158, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
- {fileID: 3179213291823671039, guid: 90dfe96f41d164a3081b56f73f4214e4, type: 3}
@ -5477,9 +5536,12 @@ MonoBehaviour:
- {fileID: 151452150}
- {fileID: 215796644}
- {fileID: 297001282}
- {fileID: 461261029}
- {fileID: 476894982}
- {fileID: 588318124}
- {fileID: 661559042}
- {fileID: 686188042}
- {fileID: 793948253}
- {fileID: 1009454557}
- {fileID: 1148303046}
- {fileID: 1156450821}
@ -5496,6 +5558,7 @@ MonoBehaviour:
- {fileID: 1285877070}
- {fileID: 1353760950}
- {fileID: 1386910174}
- {fileID: 1446900329}
- {fileID: 1561460987}
- {fileID: 1591353515}
- {fileID: 1832207162}
@ -5526,7 +5589,7 @@ MonoBehaviour:
overrideLogStringDisplay: 0
overrideDebugInternalActive: 0
overrideDebugChangesActive: 0
instanceID: 86944
instanceID: 57132
__behaviourTreeGenerator: {fileID: 0}
taskScripts:
- {fileID: 4900000, guid: e058cb28be8d744b98baf62e50716721, type: 3}

3
Viagg-io/ProjectSettings/EditorBuildSettings.asset
View File

@ -4,7 +4,6 @@
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
<<<<<<< Updated upstream
m_Scenes:
- enabled: 1
path: Assets/Scenes/1.0-SBB.unity
@ -18,9 +17,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/3.2-Grotto.unity
guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
=======
m_Scenes: []
>>>>>>> Stashed changes
m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 0f4832b23b368b643bc8a91696fbb473, type: 2}