diff --git a/Assets/Resources/Prefabs/FrameITUI.prefab b/Assets/Resources/Prefabs/FrameITUI.prefab
index 00b44bbae23b07dffc02647e43b5da9582e07b02..6e8e960823a13c3fcbe61740faf70ee34fa02560 100644
--- a/Assets/Resources/Prefabs/FrameITUI.prefab
+++ b/Assets/Resources/Prefabs/FrameITUI.prefab
@@ -189,8 +189,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: 0, y: 55}
- m_SizeDelta: {x: 0, y: 110}
+ m_AnchoredPosition: {x: 0, y: 75}
+ m_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &293934904593747525
MonoBehaviour:
@@ -334,7 +334,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 137.5, y: 350}
+ m_AnchoredPosition: {x: 137.5, y: 400}
m_SizeDelta: {x: 275, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &293934904949885390
@@ -1543,8 +1543,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: 0, y: 55}
- m_SizeDelta: {x: 0, y: 110}
+ m_AnchoredPosition: {x: 0, y: 75}
+ m_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &293934906431221844
CanvasRenderer:
@@ -1932,7 +1932,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 137.5, y: 150}
+ m_AnchoredPosition: {x: 137.5, y: 175}
m_SizeDelta: {x: 275, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &798194301124356648
@@ -2461,7 +2461,7 @@ PrefabInstance:
- target: {fileID: 8894159310465802589, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 74261.02
+ value: 130637.695
objectReference: {fileID: 0}
- target: {fileID: 8894159311577423771, guid: efd7037a57100574780bb26bea0c0683,
type: 3}
diff --git a/Assets/Resources/Prefabs/Task-Character.prefab b/Assets/Resources/Prefabs/Task-Character.prefab
index 445cfc05b816957224f76d573787d5f645c16480..9cf774735ea668d9c00573a923ba4fee090cf697 100644
--- a/Assets/Resources/Prefabs/Task-Character.prefab
+++ b/Assets/Resources/Prefabs/Task-Character.prefab
@@ -1,5 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!136 &6999573641307799759
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6395946166520416390}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_Enabled: 1
+ m_Radius: 0.5000001
+ m_Height: 2
+ m_Direction: 1
+ m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!1 &6998737061253813773
GameObject:
m_ObjectHideFlags: 0
@@ -399,6 +413,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -410,6 +425,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
@@ -453,6 +469,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -561,20 +578,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Cam: {fileID: 0}
---- !u!136 &6999573641307799759
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6395946166520416390}
- m_Material: {fileID: 0}
- m_IsTrigger: 1
- m_Enabled: 1
- m_Radius: 0.5000001
- m_Height: 2
- m_Direction: 1
- m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!1 &6999573642288568594
GameObject:
m_ObjectHideFlags: 0
@@ -628,6 +631,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -639,6 +643,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
@@ -682,10 +687,11 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: Press Enter for Talking
+ m_text: Press C-Key for Talking
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: dc000ff84823e7045bac15e87d6da9b2, type: 2}
@@ -994,6 +1000,7 @@ MonoBehaviour:
walkAroundObject: {fileID: 0}
player: {fileID: 0}
radiusAroundObject: 10
+ talkingZoneDistance: 0
--- !u!1 &7000046267743680389
GameObject:
m_ObjectHideFlags: 0
@@ -1040,6 +1047,7 @@ SkinnedMeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -1051,6 +1059,7 @@ SkinnedMeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
@@ -2924,15 +2933,15 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7002030793187184893}
m_Modifications:
- - target: {fileID: 4170768672499845195, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ - target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
- propertyPath: m_Name
- value: TalkingZone
- objectReference: {fileID: 0}
- - target: {fileID: 4170768672499845195, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: d24faa9ba77ab91459039238ad17d83c, type: 2}
+ - target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
- propertyPath: m_Layer
- value: 14
+ propertyPath: m_DynamicOccludee
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
@@ -2989,15 +2998,15 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ - target: {fileID: 4170768672499845195, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: d24faa9ba77ab91459039238ad17d83c, type: 2}
- - target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ propertyPath: m_Name
+ value: TalkingZone
+ objectReference: {fileID: 0}
+ - target: {fileID: 4170768672499845195, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
- propertyPath: m_DynamicOccludee
- value: 0
+ propertyPath: m_Layer
+ value: 14
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1324548122521590688, guid: 72d2303fcd9b9b6468855dae77047a1b, type: 3}
diff --git a/Assets/Scenes/Release/TreeWorld_Release_02.unity b/Assets/Scenes/Release/TreeWorld_Release_02.unity
index 7401e3242fdcbb02f5c9e3d3df8a1c01d4d8af9c..30a748d65beaea0c03b491c529787e0ee52c4864 100644
--- a/Assets/Scenes/Release/TreeWorld_Release_02.unity
+++ b/Assets/Scenes/Release/TreeWorld_Release_02.unity
@@ -44003,12 +44003,12 @@ PrefabInstance:
- target: {fileID: 293934904593747524, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 52.000122
+ value: 75
objectReference: {fileID: 0}
- target: {fileID: 293934904949885392, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 350
+ value: 400
objectReference: {fileID: 0}
- target: {fileID: 293934905664952486, guid: b996060e27da25c498842defc1996d84,
type: 3}
@@ -44138,7 +44138,7 @@ PrefabInstance:
- target: {fileID: 798194301124356650, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 150
+ value: 175
objectReference: {fileID: 0}
- target: {fileID: 798194301354804433, guid: b996060e27da25c498842defc1996d84,
type: 3}
diff --git a/Assets/Scenes/TreeWorld.unity b/Assets/Scenes/TreeWorld.unity
index 980c4b08331034c43585a08f3f34c37f08430c5b..5c3aaff2d7016b76773378e29e82b1938163663e 100644
--- a/Assets/Scenes/TreeWorld.unity
+++ b/Assets/Scenes/TreeWorld.unity
@@ -44301,7 +44301,7 @@ PrefabInstance:
- target: {fileID: 293934904593747524, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 55
+ value: 75
objectReference: {fileID: 0}
- target: {fileID: 293934904593747524, guid: b996060e27da25c498842defc1996d84,
type: 3}
@@ -44323,6 +44323,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 293934904593747524, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 150
+ objectReference: {fileID: 0}
+ - target: {fileID: 293934904949885392, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 400
+ objectReference: {fileID: 0}
- target: {fileID: 293934905101627533, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_IsActive
@@ -44476,7 +44486,12 @@ PrefabInstance:
- target: {fileID: 293934906431221846, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 55
+ value: 75
+ objectReference: {fileID: 0}
+ - target: {fileID: 293934906431221846, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 150
objectReference: {fileID: 0}
- target: {fileID: 798194300310305303, guid: b996060e27da25c498842defc1996d84,
type: 3}
@@ -44498,6 +44513,21 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5237843606108538431, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5237843606108538431, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5237843606108538431, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 7917866473204990377, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs b/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
index e9a48adfce5f8827d0b1f8c801803d645812a416..f6a3cfd8e4988f2853576fb3021c194d12851fa2 100644
--- a/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
+++ b/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
@@ -35,7 +35,7 @@ private void Update()
{
TypeFkt();
- if(!gameSucceeded && Input.GetKeyDown(KeyCode.Return) && TaskCharakterAnimation.getPlayerInTalkingZone())
+ if(!gameSucceeded && Input.GetKeyDown(KeyCode.C) && TaskCharakterAnimation.getPlayerInTalkingZone())
{
//Type Next sentence if player is in the talkinZone around the TaskCharacter AND the player typed the return-Key
NextSentence();
diff --git a/Assets/Scripts/ToolModeSelector.cs b/Assets/Scripts/ToolModeSelector.cs
index f89c4eb60663b34191fde1ab708cf23bcf1e2166..54885b9f43fc20b2b0d4bffc92a4baad17ea9873 100644
--- a/Assets/Scripts/ToolModeSelector.cs
+++ b/Assets/Scripts/ToolModeSelector.cs
@@ -11,6 +11,7 @@ public class ToolModeSelector : MonoBehaviour
private HideUI UIManager;
private Canvas ParentCanvas;
private bool Showing = false;
+ private float activeGadgetScaleFactor = 1.5f;
// Start is called before the first frame update
void Start()
@@ -29,7 +30,7 @@ void Start()
}
- Buttons[GadgetManager.activeGadget.id].transform.localScale *= 2;
+ Buttons[GadgetManager.activeGadget.id].transform.localScale *= activeGadgetScaleFactor;
UIManager = GetComponentInParent<HideUI>();
}
@@ -39,9 +40,9 @@ public void Select(int id)
ParentCanvas.enabled = true;
- Buttons[GadgetManager.activeGadget.id].transform.localScale /= 1.5f;
+ Buttons[GadgetManager.activeGadget.id].transform.localScale /= activeGadgetScaleFactor;
CommunicationEvents.ToolModeChangedEvent.Invoke(id);
- Buttons[GadgetManager.activeGadget.id].transform.localScale *= 1.5f;
+ Buttons[GadgetManager.activeGadget.id].transform.localScale *= activeGadgetScaleFactor;
StartCoroutine(HideRoutine());
}