From 664c3a0326f891269f41225de27f450ae5618973 Mon Sep 17 00:00:00 2001 From: Nadine Ganz Date: Mon, 4 Aug 2025 16:37:18 +0200 Subject: [PATCH] Update Castello, add Keystore --- Keystore/viaggio_pico.keystore | Bin 0 -> 2517 bytes .../Assets/BehaviourTrees/2.6-Castello.bt.txt | 500 +- Viagg-io/Assets/Scenes/2.6-Castello.unity | 5909 +++++------------ Viagg-io/Assets/Scripts/Billboard.cs | 49 + Viagg-io/Assets/Scripts/Billboard.cs.meta | 11 + .../Speech/viaggioSpeechIntents_it.json | 20 +- .../ProjectSettings/EditorBuildSettings.asset | 14 +- .../ProjectSettings/ProjectSettings.asset | 5 +- 8 files changed, 2159 insertions(+), 4349 deletions(-) create mode 100644 Keystore/viaggio_pico.keystore create mode 100644 Viagg-io/Assets/Scripts/Billboard.cs create mode 100644 Viagg-io/Assets/Scripts/Billboard.cs.meta diff --git a/Keystore/viaggio_pico.keystore b/Keystore/viaggio_pico.keystore new file mode 100644 index 0000000000000000000000000000000000000000..5b0cc8f600b8e1d359895a452007ec5c3795f800 GIT binary patch literal 2517 zcma)6c{CJ?8lRmRJ0pxGlOZaak!9>dwk+3{Ye`LGAKOTcovUFegt99cOk~X(Ll?=L zP+4x0C6Ogd*&|DFo%7!5p7+;#=R4o|o$t4NfBvvE_#g-f#?s)4F!-r>)A;W^Kn@^- z29JQy;2}r!bu10q@?R3P0z!k99?``|TL9zwPl_7>1Tkn(!V#&B_5789@?f2?_}d$HYXP%(?%_(P)C|{cu1X0}KJ4 zg78m$OlX)b!q;=sM)B)%tRx5xGQbIhpi{)vjFO{lh%%~RPA-^0+AUk0zgu)=+<T>Au~csKlixMk<$4$jYF3WBVFN?6 zr<&_KZ}x!bjqQ3i#vRZ=kiwR=0m{m$F(X6OE8+zVY=4&iayKG%ICxb0GD)C}yF=~A zEg9FCW!&f=(K5-sJHi;(IaSzdhM=;plI&CexfJ_-1^dIs0NhQrvzn;Hi|O$N1mWCL ztb1+%&!kpZBU`vDYW856!vR^2FAjHYsAFr_sJls*8s8@UFsMKpayxA}RA&fwDBlgf4Yr z>F(&Q4&HuLmB4sI`Dn&=iT3(Eq4kn8cXM}jjjbAXU!g~s^Dein6LCg4+nY9#(Rj@wfRF6;9+A`1k2TRiaWV=Vz_BBw z>4hfJ{V-$4UkIchoQa+4HH7%zt=0`#EBqaG)w{w3n6MpmV*bl!2-hdADTw8W zTV+@N4a}z|ejQr1*-Y$V+q2C1ei5bm)+OOXn!v@sG&P|TYRBX2a_6z{xy!r}P>1?; zb^>E}1tZD_`k zPdu^qW_lpVtH3$Z=K^m~XH?neRC?p7)NVru6>o&kAkcBT7>ZKK+&G7@zPlIn6|Bb9U1YFj&l%Q((vM8Q&f;@bW5KA8Sjq$lB4RC}jwiTa1D8cN()-p_J!AqbQ~)d%wwPr(7&${^y}j$8WOv`^jur6Z{@_xq ze~GIG(X}Ck{c;I|jko<*1`#aADQCFjTsb3tzVrXD#385?kVny^Nu1u@eI@F*}PL9em0QJjdg52G;IqWT)E@f;~bqr3Vt|DADX!E5S}EE;Y{v*QwxkgN!&wkY9gLy zt~>Z;EvNC8*P96C+P&%S=tryugG~P{;s$An>_e+(t!lQ-9!f;jY>(z&y}Q=Lm}z_7CS1;G($)DpRYbr`Pf54ejr3>b-3`;F z2my1QICjN@QI`+=`!V$LFm3*|Pn1Dc#v3~_pEa)~$2G>plTP57)cq$Q)C4R=m{n09}$CX-BP+RK+OTd)L7a2fz25e^ODm{libh z1con@L(b7K-(B;$|U*P+bG zQuKkO?Si4##_Vr1axr%CJqz^<*YU$T(=oUK|K8KROz|z22q*AMOG%|@oMoTBZSgX= z;J$!6*#hAW06O@%-Vin7ZjPOsN~Je=Y418Txm71B$kM?zHgn7~v4)8dOM;8k6o+D| zCc1jPTjMxl>}L?N&e+Rhvaj2wTNG~yPW@mx(tXdrpmUgPFhC>9%a|H=Xw2Vcjk0*d zRlITK%-LD_&3>=+kG$=Chq%H5gzwy=lM}43e|_xO$yr+-pG?e7F2Z+$FFQXc-n@*k z)C$k`Ye9^B``v(G{W^#m#(C*yEc^gIW*9rCXKuoHUTPk{7hKTpX*5MPuPG=xJUs z2n7W|kX1`vC1!utU3p{RightHand}/secondaryButton - objectReference: {fileID: 0} - - target: {fileID: 2969953363054433920, guid: af9043897c84648c183060ba5d1b108f, type: 3} - propertyPath: OnPress.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: 2.7-Slideshow - objectReference: {fileID: 0} - - target: {fileID: 2969953363054433920, guid: af9043897c84648c183060ba5d1b108f, type: 3} - propertyPath: OnPressA.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: 1.0-SBB - objectReference: {fileID: 0} - - target: {fileID: 5404007062645980004, guid: af9043897c84648c183060ba5d1b108f, type: 3} - propertyPath: m_Name - value: NextButton - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: af9043897c84648c183060ba5d1b108f, type: 3} ---- !u!4 &1967877514 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2932410639188632877, guid: af9043897c84648c183060ba5d1b108f, type: 3} - m_PrefabInstance: {fileID: 1967877513} - m_PrefabAsset: {fileID: 0} ---- !u!21 &1973967091 -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 &1985196139 GameObject: m_ObjectHideFlags: 0 @@ -19890,7 +17315,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} propertyPath: m_Name - value: MediaPlayer.VIDEOS.Video + value: MediaPlayer.VIDEOS.CastelliBotoffeneF_FIdle04 objectReference: {fileID: 0} - target: {fileID: 8252953152293453768, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} propertyPath: m_IsActive @@ -19948,8 +17373,8 @@ MonoBehaviour: fadeInTime: 1.5 fadeOutTime: 1.5 videoPath: Videos/Castello/Castelli_di_Bellinzona-Castelli_Bot_offene_Fragen-F-idle-4.mp4 - videoName: Castelli_di_Bellinzona-Castelli_Bot_offene_Fragen-F-idle-4 - _videoActor: {fileID: 0} + videoName: Castelli_Bot_offene_Fragen-F-idle-4 + _videoActor: {fileID: 222750421} --- !u!114 &2084485239 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19965,6 +17390,177 @@ MonoBehaviour: handlers: - {fileID: 2084485238} roomId: VIDEOS + uniqueId: FIdle04 + _name: MediaPlayer.VIDEOS.Video +--- !u!1001 &2104375249 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2122115755} + m_Modifications: + - target: {fileID: 1064606778807215308, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_Name + value: Castelli_di_Bellinzona-Outro-F-1 + objectReference: {fileID: 0} + - target: {fileID: 1064606778807215308, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2165549077798221024, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: target + value: + objectReference: {fileID: 1077492757} + - target: {fileID: 2466982521282103696, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: _loop + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2466982521282103696, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: _autoOpen + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2466982521282103696, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: _autoPlayOnStart + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2466982521282103696, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: _mediaPath._path + value: Castelli_di_Bellinzona-Chatbot_Burgen-F-1.mp4 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalScale.x + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalScale.y + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalScale.z + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalPosition.x + value: 53.34052 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalPosition.y + value: -0.08179951 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalPosition.z + value: 21.76095 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0000002533197 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_Name + value: MediaPlayer.VIDEOS.OutroF1 + objectReference: {fileID: 0} + - target: {fileID: 8252953152293453768, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 8252953152293453768, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + insertIndex: -1 + addedObject: {fileID: 2139337353} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + insertIndex: -1 + addedObject: {fileID: 2104375254} + - targetCorrespondingSourceObject: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + insertIndex: -1 + addedObject: {fileID: 2104375253} + m_SourcePrefab: {fileID: 100100000, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} +--- !u!4 &2104375250 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6269733995156948630, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + m_PrefabInstance: {fileID: 2104375249} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2104375251 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2466982521282103696, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + m_PrefabInstance: {fileID: 2104375249} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104375252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 638c870cac4da414fba921606d504407, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2104375252 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} + m_PrefabInstance: {fileID: 2104375249} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2104375253 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104375252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa9f474abde1d48d2ae77a9cbe255b8b, type: 3} + m_Name: + m_EditorClassIdentifier: + showHelpText: 0 + fadeInTime: 1.5 + fadeOutTime: 1.5 + videoPath: Videos/Castello/Castelli_di_Bellinzona-Outro-F-1.mp4 + videoName: Outro-F-1 + _videoActor: {fileID: 2139337352} +--- !u!114 &2104375254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104375252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab2a8bf28f111456caf08afcd0888bf5, type: 3} + m_Name: + m_EditorClassIdentifier: + handlers: + - {fileID: 2104375253} + roomId: VIDEOS uniqueId: _name: MediaPlayer.VIDEOS.Video --- !u!21 &2109001227 @@ -20068,26 +17664,9 @@ Transform: - {fileID: 1534432462} - {fileID: 406613247} - {fileID: 1069693531} - - {fileID: 18036874} - - {fileID: 529900708} - - {fileID: 1484254246} - - {fileID: 261768588} - - {fileID: 89115062} - - {fileID: 1528803060} - - {fileID: 959719070} - - {fileID: 170620385} - - {fileID: 1496078501} - - {fileID: 1222445505} - - {fileID: 315908085} - - {fileID: 1349369656} - - {fileID: 455857402} - - {fileID: 1258603045} - - {fileID: 635006344} - - {fileID: 1948336433} - - {fileID: 1001639891} - - {fileID: 1158279896} - - {fileID: 1679611406} - - {fileID: 1698812371} + - {fileID: 2104375250} + - {fileID: 737105786} + - {fileID: 904611384} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2125508626 @@ -20359,7 +17938,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} propertyPath: m_Name - value: MediaPlayer.VIDEOS.Video + value: MediaPlayer.VIDEOS.ChatbotBurgenFidle_09 objectReference: {fileID: 0} - target: {fileID: 8252953152293453768, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} propertyPath: m_IsActive @@ -20417,8 +17996,8 @@ MonoBehaviour: fadeInTime: 1.5 fadeOutTime: 1.5 videoPath: Videos/Castello/Castelli_di_Bellinzona-Chatbot_Burgen-F-idle-9.mp4 - videoName: Castelli_di_Bellinzona-Chatbot_Burgen-F-idle-9 - _videoActor: {fileID: 0} + videoName: Chatbot_Burgen-F-idle-9 + _videoActor: {fileID: 1949895254} --- !u!114 &2136401852 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20434,7 +18013,7 @@ MonoBehaviour: handlers: - {fileID: 2136401851} roomId: VIDEOS - uniqueId: + uniqueId: 09 _name: MediaPlayer.VIDEOS.Video --- !u!1001 &2138213556 PrefabInstance: @@ -20526,7 +18105,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7357111416024985209, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} propertyPath: m_Name - value: MediaPlayer.VIDEOS.Video + value: MediaPlayer.VIDEOS.ChatbotBurgenF3 objectReference: {fileID: 0} - target: {fileID: 8252953152293453768, guid: 6cbe3b114f14984419762f5100e9aa16, type: 3} propertyPath: m_IsActive @@ -20584,8 +18163,8 @@ MonoBehaviour: fadeInTime: 1.5 fadeOutTime: 1.5 videoPath: Videos/Castello/Castelli_di_Bellinzona-Chatbot_Burgen-F-3.mp4 - videoName: Castelli_di_Bellinzona-Chatbot_Burgen-F-3 - _videoActor: {fileID: 0} + videoName: Chatbot_Burgen-F-3 + _videoActor: {fileID: 1886850374} --- !u!114 &2138213561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -20603,6 +18182,112 @@ MonoBehaviour: roomId: VIDEOS uniqueId: _name: MediaPlayer.VIDEOS.Video +--- !u!1 &2139337352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2139337353} + - component: {fileID: 2139337356} + - component: {fileID: 2139337355} + - component: {fileID: 2139337354} + m_Layer: 0 + m_Name: video-actor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2139337353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139337352} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.95599985, z: 0} + m_LocalScale: {x: 0.10240383, y: 0.3629188, z: 0.21629229} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2104375250} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &2139337354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139337352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6d1977a52888584496b1acc7e998011, type: 3} + m_Name: + m_EditorClassIdentifier: + _media: {fileID: 2104375251} + _automaticStereoPacking: 1 + _overrideStereoPacking: 0 + _stereoRedGreenTint: 0 + _defaultTexture: {fileID: 0} + _renderer: {fileID: 2139337355} + _materialIndex: -1 + _texturePropertyName: _MainTex + _offset: {x: 0, y: 0} + _scale: {x: 1, y: 1} +--- !u!23 &2139337355 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139337352} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2251b73870fed5b4fb653bb444096303, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2139337356 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2139337352} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &20662621892534453 PrefabInstance: m_ObjectHideFlags: 0 @@ -20923,6 +18608,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 6774188635550615499, guid: 48642628aeee0b3419f3982e15206930, type: 3} m_PrefabInstance: {fileID: 939187572329537253} m_PrefabAsset: {fileID: 0} +--- !u!1 &1299432764830796479 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1299432764967086791, guid: 533729b907ee1354f8dc3bca4ad67ab5, type: 3} + m_PrefabInstance: {fileID: 140746872} + m_PrefabAsset: {fileID: 0} --- !u!33 &1328916133754221458 MeshFilter: m_ObjectHideFlags: 0 @@ -21218,6 +18908,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2717207489786154655, guid: 0125201dc39bf2940b8840e97bddf4f7, type: 3} m_PrefabInstance: {fileID: 2633578870728925530} m_PrefabAsset: {fileID: 0} +--- !u!1 &2855770860578287669 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2855770860446126157, guid: 533729b907ee1354f8dc3bca4ad67ab5, type: 3} + m_PrefabInstance: {fileID: 140746872} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2908069720557529144 PrefabInstance: m_ObjectHideFlags: 0 @@ -22453,6 +20148,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 2579876082735977711, guid: d65a129e673013140b6f3f65dc1593aa, type: 3} m_PrefabInstance: {fileID: 5259105087185012179} m_PrefabAsset: {fileID: 0} +--- !u!1 &5443533871189240667 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5443533871061207843, guid: 533729b907ee1354f8dc3bca4ad67ab5, type: 3} + m_PrefabInstance: {fileID: 140746872} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5716224076197332327 PrefabInstance: m_ObjectHideFlags: 0 @@ -22801,6 +20501,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 4804304746157835685, guid: 3b1d46ca8f5b4494096952b8d8ce679f, type: 3} m_PrefabInstance: {fileID: 5944723314812599007} m_PrefabAsset: {fileID: 0} +--- !u!114 &6360084142359742961 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6360084142219143561, guid: 533729b907ee1354f8dc3bca4ad67ab5, type: 3} + m_PrefabInstance: {fileID: 140746872} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299432764830796479} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6399031414078022490 PrefabInstance: m_ObjectHideFlags: 0 @@ -22999,6 +20710,24 @@ Transform: m_CorrespondingSourceObject: {fileID: 2924589779535750275, guid: 11d03b9b4835c3440ac97a761356f4de, type: 3} m_PrefabInstance: {fileID: 7664781135736088460} m_PrefabAsset: {fileID: 0} +--- !u!4 &8372832698437599337 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8372832698573889553, guid: 533729b907ee1354f8dc3bca4ad67ab5, type: 3} + m_PrefabInstance: {fileID: 140746872} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8372832698437599340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5443533871189240667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83a0fb9fd335d4dd7a8acec20f9a233d, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 5 --- !u!1001 &8782845978833734771 PrefabInstance: m_ObjectHideFlags: 0 @@ -23061,6 +20790,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 1087383246057858964, guid: 2f53453b4502f554ea5fc2dcdfc5867a, type: 3} m_PrefabInstance: {fileID: 8782845978833734771} m_PrefabAsset: {fileID: 0} +--- !u!114 &8820259593682144508 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8820259593818238084, guid: 533729b907ee1354f8dc3bca4ad67ab5, type: 3} + m_PrefabInstance: {fileID: 140746872} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2855770860578287669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8938030056415319496 PrefabInstance: m_ObjectHideFlags: 0 @@ -23182,3 +20922,4 @@ SceneRoots: - {fileID: 1150553667} - {fileID: 2122115755} - {fileID: 1436116768} + - {fileID: 1346289517} diff --git a/Viagg-io/Assets/Scripts/Billboard.cs b/Viagg-io/Assets/Scripts/Billboard.cs new file mode 100644 index 00000000..17ae0973 --- /dev/null +++ b/Viagg-io/Assets/Scripts/Billboard.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Billboard : MonoBehaviour +{ + [Header("Position")] + public float distanceFromCamera = 2.0f; + public Vector3 offset = Vector3.zero; + + [Header("Smoothing")] + [Range(0.01f, 20f)] + public float moveSmoothSpeed = 5f; + [Range(0.01f, 20f)] + public float rotateSmoothSpeed = 5f; + + private Transform mainCamera; + + void Start() + { + if (Camera.main != null) + { + mainCamera = Camera.main.transform; + } + else + { + Debug.LogWarning("Main Camera not found."); + } + } + + void LateUpdate() + { + if (mainCamera == null) return; + + // Calculate target position in field of view + Vector3 targetPosition = mainCamera.position + mainCamera.forward * distanceFromCamera + mainCamera.TransformVector(offset); + + transform.position = Vector3.Lerp(transform.position, targetPosition, moveSmoothSpeed * Time.deltaTime); + + Vector3 directionToCamera = transform.position - mainCamera.position; + directionToCamera.y = 0f; // only horizontal orientation + + if (directionToCamera.sqrMagnitude > 0.001f) + { + Quaternion targetRotation = Quaternion.LookRotation(directionToCamera); + transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, rotateSmoothSpeed * Time.deltaTime); + } + } +} diff --git a/Viagg-io/Assets/Scripts/Billboard.cs.meta b/Viagg-io/Assets/Scripts/Billboard.cs.meta new file mode 100644 index 00000000..f9f63e86 --- /dev/null +++ b/Viagg-io/Assets/Scripts/Billboard.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83a0fb9fd335d4dd7a8acec20f9a233d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json b/Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json index 419de577..ea308a2a 100644 --- a/Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json +++ b/Viagg-io/Assets/Scripts/Speech/viaggioSpeechIntents_it.json @@ -219,10 +219,6 @@ "Sono tristo di non aver conosciuto il mio nonno. " ] }, - { - "intentID": "Castelli_di_Bellinzona-Intro-U-4b", - "intentSentences": [] - }, { "intentID": "Castelli_di_Bellinzona-Intro-U-6", "intentSentences": [ @@ -267,17 +263,17 @@ "intentSentences": [ "No.", "Non so.", - "Non mi interessa." + "Non mi interessa.", + "Non sono sicuro.", + "Non sono sicura." ] }, { "intentID": "Castelli_di_Bellinzona-Geschichte_Castelli-U-4b", "intentSentences": [ - "Ci vuole una fortezza per difendere la citt\u00e0 dai nemici. ", + "Ci vuole una fortezza per difendere la citt\u00e0 dai nemici.", "Potrebbe essere per trovare rifugio.", - "Per la protezione.", - "Non sono sicuro.", - "Non sono sicura." + "Per la protezione." ] }, { @@ -292,7 +288,7 @@ { "intentID": "Castelli_di_Bellinzona-Chatbot_Burgen-U-7", "intentSentences": [ - "Si, certo.", + "S\u00ec, certo.", "Certamente." ] }, @@ -308,7 +304,9 @@ { "intentID": "Castelli_di_Bellinzona-Chatbot_Burgen-U-12a", "intentSentences": [ - "Si." + "S\u00ec.", + "S\u00ec, certo.", + "Certamente." ] }, { diff --git a/Viagg-io/ProjectSettings/EditorBuildSettings.asset b/Viagg-io/ProjectSettings/EditorBuildSettings.asset index 35bdf51f..0e1f7b84 100644 --- a/Viagg-io/ProjectSettings/EditorBuildSettings.asset +++ b/Viagg-io/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/Scenes/0.0-Menu.unity guid: c83d90128ed611646968487737573267 - enabled: 1 @@ -17,25 +17,25 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/2.0-SBB.unity guid: 0492708372646415eb23036f23680178 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/2.2-Geschaeft.unity guid: 498707af75f244daa9eacd8a71c6ee5f - - enabled: 0 + - enabled: 1 path: Assets/Scenes/2.6-Castello.unity guid: 8554de5c9e3d141a1bee7985b31e8313 - enabled: 1 path: Assets/Scenes/3.0-SBB.unity guid: a21f6e13e09234179a685c8f89b0e031 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/3.2-Grotto1.unity guid: b27cb7d9a21e8ee4e840d82d91ef4704 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/3.2-Grotto2.unity guid: 29eb141b9ba0d10498d9c1caf0961359 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/3.2-Grotto3.unity guid: e3d34354680716649befc361ed0ac6df - - enabled: 0 + - enabled: 1 path: Assets/Scenes/4.0-Puschlav.unity guid: d30b9a945a08543918f700fd6e5cd57e m_configObjects: diff --git a/Viagg-io/ProjectSettings/ProjectSettings.asset b/Viagg-io/ProjectSettings/ProjectSettings.asset index 6f2d1e67..40e9759b 100644 --- a/Viagg-io/ProjectSettings/ProjectSettings.asset +++ b/Viagg-io/ProjectSettings/ProjectSettings.asset @@ -146,6 +146,9 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2} + - {fileID: 7708199778347151547, guid: 0f4832b23b368b643bc8a91696fbb473, type: 2} + - {fileID: 11400000, guid: f794167165c214ad18ff9cc20bddcafb, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -268,7 +271,7 @@ PlayerSettings: AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: Y:/FHGR/Viagg-io/01-doku/viaggio_pico.keystore + AndroidKeystoreName: '{inproject}: ../Keystore/viaggio_pico.keystore' AndroidKeyaliasName: viaggio pico AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0