Compare commits

..

No commits in common. "682225dc41e06749f0c144828dd77c0dd1e59ca4" and "8ce40e7cc134153fc38540ca55531f3fa111ed8e" have entirely different histories.

35 changed files with 2147 additions and 460114 deletions

View File

@ -11,7 +11,7 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7443357409726444941} m_State: {fileID: 7443357409726444941}
m_Position: {x: 390, y: -60, z: 0} m_Position: {x: 513.932, y: 26.747574, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

View File

@ -594,7 +594,25 @@ MonoBehaviour:
m_RotationOrder: 4 m_RotationOrder: 4
m_MixOutCurve: m_MixOutCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: [] m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
@ -621,13 +639,49 @@ MonoBehaviour:
m_BlendOutDuration: 1.2166666666666668 m_BlendOutDuration: 1.2166666666666668
m_MixInCurve: m_MixInCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: [] m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_MixOutCurve: m_MixOutCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: [] m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
@ -654,7 +708,25 @@ MonoBehaviour:
m_BlendOutDuration: -1 m_BlendOutDuration: -1
m_MixInCurve: m_MixInCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: [] m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4

View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 4096 maxTextureSize: 1024
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1

View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 4096 maxTextureSize: 1024
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1

View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 4096 maxTextureSize: 1024
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1

View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 4096 maxTextureSize: 1024
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1

View File

@ -69,7 +69,7 @@ TextureImporter:
platformSettings: platformSettings:
- serializedVersion: 3 - serializedVersion: 3
buildTarget: DefaultTexturePlatform buildTarget: DefaultTexturePlatform
maxTextureSize: 4096 maxTextureSize: 1024
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 1 textureCompression: 1

View File

@ -550,9 +550,9 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "Auf deinem virtuellen Viagg-io-Handy kannst Du auf den Men\xFC-Button m_text: "Strecken Sie mit der Hand, in der Sie das virtuelle Handy halten, den
(weisser Button mit drei schwarzen Linien) dr\xFCcken und von dort gelangst Du Zeigefinger und den Daumen aus. Dann erscheint unter dem Handy ein \u201CMen\xFC\u201D-Button.
zum Button \"Level w\xE4hlen\".\r" Damit gelangen Sie ins Men\xFC und k\xF6nnen dort ein Level ausw\xE4hlen.\r"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
@ -2297,7 +2297,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &2392976769948144681 --- !u!224 &2392976769948144681
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2384,12 +2384,9 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "F\xFChre die Reset-Geste durch, indem Du zuerst die Hand mit ausgestreckten m_text: "So lange den Zeigefinger und Daumen der rechten Hand zusammenhalten, sodass
Fingern und der Handinnenfl\xE4che nach oben vor dich hinh\xE4ltst und dann langsam das Meta-Symbol (Unendlichkeitssymbol) erscheint, und der Kreis darum gef\xFCllt
die Faust ballst. Dann sollte ein Symbol mit Kreis oben an deiner Faust erscheinen. ist.\r"
Drehe dann die Faust, so dass der Handr\xFCcken nach oben zeigt und strecke die
Finger wieder. Sobald ein Ton erklingt, kannst Du die Hand wieder wegnehmen.
Deine Position wird korrigiert."
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
@ -2511,7 +2508,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &8174554898201046203 --- !u!224 &8174554898201046203
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2802,8 +2799,6 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
jumpPointGrottoEssen: GrottoEssen jumpPointGrottoEssen: GrottoEssen
jumpPointGrottoKueche: GrottoKueche jumpPointGrottoKueche: GrottoKueche
fadeDuration: 2
_fadeScreenObj: {fileID: 0}
levels: levels:
- levelButton: {fileID: 3574905379413314231} - levelButton: {fileID: 3574905379413314231}
sceneName: 0.5-Tutorial sceneName: 0.5-Tutorial
@ -2905,10 +2900,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "Auf deinem virtuellen Viagg-io-Handy kannst Du auf den Men\xFC-Button m_text: "Taste \"<-\" auf dem Handy.\r"
(weisser Button mit drei schwarzen Linien) dr\xFCcken und von dort gelangst Du
zum Button \"Level w\xE4hlen\". Dort dr\xFCckst Du auf das Level, das Du gerade
spielst. So startest Du es neu."
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
@ -4770,7 +4762,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: Wie kann ich ein Level neu starten? m_text: "Wie kann ich eine Sequenz neu starten?\r"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2} m_fontAsset: {fileID: 11400000, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2}
m_sharedMaterial: {fileID: -2574710329927910322, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2} m_sharedMaterial: {fileID: -2574710329927910322, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2}
@ -5822,9 +5814,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "Auf deinem virtuellen Viagg-io-Handy kannst Du auf den Men\xFC-Button m_text: "Zweimal mit dem Finger auf das kleine Loch rechts an der Quest tippen.\r"
(weisser Button mit drei schwarzen Linien) dr\xFCcken und dort findest Du den
Button \"Hauptmen\xFC\"."
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
@ -6380,7 +6370,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "Wie komme ich zur\xFCck in das Hauptmen\xFC?\r" m_text: "Wie komme ich zur\xFCck in das Quest-Men\xFC?\r"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2} m_fontAsset: {fileID: 11400000, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2}
m_sharedMaterial: {fileID: -2574710329927910322, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2} m_sharedMaterial: {fileID: -2574710329927910322, guid: 0d97ed6259f90444b8da67a4e5872245, type: 2}
@ -9710,8 +9700,8 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "Halte deine H\xE4nde offen mit der Handinnenseite ausgestreckt vor dein m_text: "H\xE4nde offen mit der Handinnenseite ausgestreckt vor das Gesicht (Headset)
Gesicht (Headset)." halten.\r"
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_fontAsset: {fileID: 11400000, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2} m_sharedMaterial: {fileID: -4487658187511886541, guid: 7ae87b11983549545be4afc3e9b69820, type: 2}
@ -10041,7 +10031,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &216112930981640311 --- !u!224 &216112930981640311
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 KiB

After

Width:  |  Height:  |  Size: 570 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 KiB

After

Width:  |  Height:  |  Size: 400 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 KiB

After

Width:  |  Height:  |  Size: 370 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 KiB

After

Width:  |  Height:  |  Size: 309 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 464 KiB

After

Width:  |  Height:  |  Size: 464 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 KiB

After

Width:  |  Height:  |  Size: 279 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

File diff suppressed because it is too large Load Diff

View File

@ -10,9 +10,6 @@ public class AxisConstrainedLookAt : MonoBehaviour
[Header("Which local axis should point at the target?")] [Header("Which local axis should point at the target?")]
public LocalAxis lookAxis = LocalAxis.Z; public LocalAxis lookAxis = LocalAxis.Z;
[Tooltip("Invert the direction of the chosen local axis")]
public bool invertDirection = false;
[Header("Allow rotation only around this world axis")] [Header("Allow rotation only around this world axis")]
public RotationAxis allowedRotationAxis = RotationAxis.Y; public RotationAxis allowedRotationAxis = RotationAxis.Y;
@ -28,10 +25,6 @@ public class AxisConstrainedLookAt : MonoBehaviour
Vector3 projectedDirection = ProjectDirection(toTarget.normalized, allowedRotationAxis); Vector3 projectedDirection = ProjectDirection(toTarget.normalized, allowedRotationAxis);
if (projectedDirection.sqrMagnitude < 0.0001f) return; if (projectedDirection.sqrMagnitude < 0.0001f) return;
// Invert the direction if the toggle is on
if (invertDirection)
projectedDirection = -projectedDirection;
// Get the desired rotation to look at the projected target direction // Get the desired rotation to look at the projected target direction
Quaternion targetRotation = Quaternion.LookRotation(projectedDirection, Vector3.up); Quaternion targetRotation = Quaternion.LookRotation(projectedDirection, Vector3.up);