From 726c2a9d1f388c58f9b43ebf60ee9c5d075f6d37 Mon Sep 17 00:00:00 2001
From: Stefan Richter <o-s-r1993@web.de>
Date: Tue, 28 Nov 2023 01:35:56 +0100
Subject: [PATCH] GUI Button for Talking, is now visible only if an NPC is in
the near.
---
Assets/Resources/Prefabs/Stage_Default.prefab | 7 +-
.../Prefabs/UI/Ingame/FrameITUI_mobile.prefab | 586 +++++++++---------
.../Character_Animations/CharacterDialog.cs | 1 +
.../Scripts/UI/InGame/TalkingButton_mobile.cs | 64 ++
.../UI/InGame/TalkingButton_mobile.cs.meta | 11 +
Assets/Scripts/UI/UIconfig.cs | 3 +
6 files changed, 385 insertions(+), 287 deletions(-)
create mode 100644 Assets/Scripts/UI/InGame/TalkingButton_mobile.cs
create mode 100644 Assets/Scripts/UI/InGame/TalkingButton_mobile.cs.meta
diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index ceeb2a5e..21d9cd69 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -3395,6 +3395,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 3274525830605418191, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_Name
+ value: NPCReden_Bttn_onoff_"20"
+ objectReference: {fileID: 0}
- target: {fileID: 3347217609657819155, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -4151,7 +4156,7 @@ PrefabInstance:
- target: {fileID: 7000045644623408183, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7000046267743680389, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
index fb29f1ed..7d7b9664 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
@@ -153,7 +153,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
myUI_ID: 20
setValueTo: 0
---- !u!1 &255069119735572238
+--- !u!1 &231468725338963851
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -161,99 +161,80 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6958676084274145452}
- - component: {fileID: 8967404916986244373}
- - component: {fileID: 5410379256444299586}
- - component: {fileID: 6368433603928293443}
+ - component: {fileID: 3561851270179611487}
+ - component: {fileID: 7273036899712377655}
+ - component: {fileID: 7881962068261868245}
m_Layer: 5
- m_Name: NPCReden_bttn_onoff_0
+ m_Name: TextUPress
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &6958676084274145452
+ m_IsActive: 1
+--- !u!224 &3561851270179611487
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 255069119735572238}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_GameObject: {fileID: 231468725338963851}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 2161880189324873096}
- m_Father: {fileID: 2725202797239850803}
+ m_Children: []
+ m_Father: {fileID: 2851121237061830928}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0, y: 0}
---- !u!223 &8967404916986244373
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 255069119735572238}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 0
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!114 &5410379256444299586
-MonoBehaviour:
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7273036899712377655
+CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 255069119735572238}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UiScaleMode: 1
- m_ReferencePixelsPerUnit: 100
- m_ScaleFactor: 1
- m_ReferenceResolution: {x: 1920, y: 1080}
- m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
- m_PhysicalUnit: 3
- m_FallbackScreenDPI: 96
- m_DefaultSpriteDPI: 96
- m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 0
---- !u!114 &6368433603928293443
+ m_GameObject: {fileID: 231468725338963851}
+ m_CullTransparentMesh: 1
+--- !u!114 &7881962068261868245
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 255069119735572238}
+ m_GameObject: {fileID: 231468725338963851}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 80
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 8
+ m_MaxSize: 80
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: 'Reden
+
+'
--- !u!1 &464427703213787929
GameObject:
m_ObjectHideFlags: 0
@@ -407,6 +388,141 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!1 &1135305490045255321
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2851121237061830928}
+ - component: {fileID: 5058651675726567628}
+ - component: {fileID: 44920345262912474}
+ - component: {fileID: 4573408952055986094}
+ m_Layer: 5
+ m_Name: NPCReden_Bttn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2851121237061830928
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1135305490045255321}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 3561851270179611487}
+ m_Father: {fileID: 2867785381658098717}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.8463106, y: 0.3064447}
+ m_AnchorMax: {x: 1, y: 0.4222793}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5058651675726567628
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1135305490045255321}
+ m_CullTransparentMesh: 1
+--- !u!114 &44920345262912474
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1135305490045255321}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4573408952055986094
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1135305490045255321}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34,
+ type: 3}
+ m_PressedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3}
+ m_SelectedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 44920345262912474}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 7494554937716974035}
+ m_TargetAssemblyTypeName: TalkingButton_mobile, Assembly-CSharp
+ m_MethodName: Talk_Bttn
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &1154389453406316508
GameObject:
m_ObjectHideFlags: 0
@@ -521,8 +637,8 @@ RectTransform:
m_Father: {fileID: 2252479989828166401}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.8463106, y: 0.4064447}
- m_AnchorMax: {x: 1, y: 0.5222793}
+ m_AnchorMin: {x: 0.8463106, y: 0.4564447}
+ m_AnchorMax: {x: 1, y: 0.5722793}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@@ -1377,7 +1493,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
myUI_ID: 20
setValueTo: 0
---- !u!1 &3274525830605418191
+--- !u!1 &3355135420768414498
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1385,28 +1501,28 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2725202797239850803}
- - component: {fileID: 8694587518162361668}
+ - component: {fileID: 1253101560500222693}
+ - component: {fileID: 3885070909480080524}
m_Layer: 0
- m_Name: NPCReden_Bttn_onoff_
+ m_Name: NPCReden_Bttn_onoff_"13"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &2725202797239850803
+ m_IsActive: 1
+--- !u!224 &1253101560500222693
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3274525830605418191}
+ m_GameObject: {fileID: 3355135420768414498}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 6958676084274145452}
+ - {fileID: 2867785381658098717}
m_Father: {fileID: 7108271756006176728}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1415,20 +1531,20 @@ RectTransform:
m_AnchoredPosition: {x: -162.86841, y: -202.24045}
m_SizeDelta: {x: -1920, y: -1080}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &8694587518162361668
+--- !u!114 &3885070909480080524
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3274525830605418191}
- m_Enabled: 0
+ m_GameObject: {fileID: 3355135420768414498}
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3e3281ba7462a8a4dad1ea188ed30a8a, type: 3}
m_Name:
m_EditorClassIdentifier:
- myself_GObj: {fileID: 3274525830605418191}
- myUI_ID: 19
+ myself_GObj: {fileID: 3355135420768414498}
+ myUI_ID: 13
default_value: 1
--- !u!1 &3592360101499009361
GameObject:
@@ -2363,88 +2479,6 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Button
---- !u!1 &4978253438185736737
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7559363183916480229}
- - component: {fileID: 5663771014929180362}
- - component: {fileID: 4631192531370356002}
- m_Layer: 5
- m_Name: TextUPress
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7559363183916480229
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4978253438185736737}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2161880189324873096}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5663771014929180362
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4978253438185736737}
- m_CullTransparentMesh: 1
---- !u!114 &4631192531370356002
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4978253438185736737}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 80
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 8
- m_MaxSize: 80
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: 'Reden
-
-'
--- !u!1 &5064961923267230209
GameObject:
m_ObjectHideFlags: 0
@@ -3371,7 +3405,7 @@ RectTransform:
- {fileID: 1124259054666192576}
- {fileID: 3510664950835701341}
- {fileID: 118299968777129975}
- - {fileID: 2725202797239850803}
+ - {fileID: 1253101560500222693}
m_Father: {fileID: 3129303587586972547}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3696,7 +3730,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
myUI_ID: 20
setValueTo: 1
---- !u!1 &8472433583862988861
+--- !u!1 &8135621160287869436
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3704,147 +3738,114 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 7257061746134228551}
- - component: {fileID: 8619632592527049851}
- - component: {fileID: 410118011459698638}
- - component: {fileID: 6491428441843545170}
- - component: {fileID: 5651049434045843528}
+ - component: {fileID: 2867785381658098717}
+ - component: {fileID: 657633038684211938}
+ - component: {fileID: 7746547737774154854}
+ - component: {fileID: 7747932886417893920}
+ - component: {fileID: 7494554937716974035}
m_Layer: 5
- m_Name: ToolRight_Bttn
+ m_Name: NPCReden_bttn_onoff_0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &7257061746134228551
+--- !u!224 &2867785381658098717
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8472433583862988861}
+ m_GameObject: {fileID: 8135621160287869436}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 8126708137660190776}
- m_Father: {fileID: 1867735786434318953}
- m_RootOrder: 2
+ - {fileID: 2851121237061830928}
+ m_Father: {fileID: 1253101560500222693}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.85, y: 0}
- m_AnchorMax: {x: 0.98, y: 0.2}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8619632592527049851
-CanvasRenderer:
+ m_Pivot: {x: 0, y: 0}
+--- !u!223 &657633038684211938
+Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8472433583862988861}
- m_CullTransparentMesh: 1
---- !u!114 &410118011459698638
+ m_GameObject: {fileID: 8135621160287869436}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &7746547737774154854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8472433583862988861}
+ m_GameObject: {fileID: 8135621160287869436}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: bbbdb01879f45cd44a8f2077a016ab90, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!114 &6491428441843545170
+ m_UiScaleMode: 1
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 1920, y: 1080}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!114 &7747932886417893920
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8472433583862988861}
+ m_GameObject: {fileID: 8135621160287869436}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 2
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 21300000, guid: 85a554ebec9c33f4ba25c2e98e0fbeb4,
- type: 3}
- m_PressedSprite: {fileID: 21300000, guid: 85a554ebec9c33f4ba25c2e98e0fbeb4, type: 3}
- m_SelectedSprite: {fileID: 21300000, guid: 85a554ebec9c33f4ba25c2e98e0fbeb4, type: 3}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 410118011459698638}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 5651049434045843528}
- m_TargetAssemblyTypeName: ToolmodeSelector_bttn_mobile, Assembly-CSharp
- m_MethodName: Tool_nextright
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &5651049434045843528
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &7494554937716974035
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8472433583862988861}
+ m_GameObject: {fileID: 8135621160287869436}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 22f4bc7d160cd644f9334f0ba4934ec9, type: 3}
+ m_Script: {fileID: 11500000, guid: fd022af7fcd02ff4f8bff3e3ef5702a0, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &8504496599915095586
+ myself_GObj: {fileID: 8135621160287869436}
+--- !u!1 &8472433583862988861
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3852,53 +3853,54 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2161880189324873096}
- - component: {fileID: 4412756494208005845}
- - component: {fileID: 5719196485823687432}
- - component: {fileID: 3301611976134087592}
+ - component: {fileID: 7257061746134228551}
+ - component: {fileID: 8619632592527049851}
+ - component: {fileID: 410118011459698638}
+ - component: {fileID: 6491428441843545170}
+ - component: {fileID: 5651049434045843528}
m_Layer: 5
- m_Name: NPCReden_Bttn
+ m_Name: ToolRight_Bttn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!224 &2161880189324873096
+--- !u!224 &7257061746134228551
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8504496599915095586}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_GameObject: {fileID: 8472433583862988861}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 7559363183916480229}
- m_Father: {fileID: 6958676084274145452}
- m_RootOrder: 0
+ - {fileID: 8126708137660190776}
+ m_Father: {fileID: 1867735786434318953}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.8463106, y: 0.6064447}
- m_AnchorMax: {x: 1, y: 0.7222793}
+ m_AnchorMin: {x: 0.85, y: 0}
+ m_AnchorMax: {x: 0.98, y: 0.2}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4412756494208005845
+--- !u!222 &8619632592527049851
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8504496599915095586}
+ m_GameObject: {fileID: 8472433583862988861}
m_CullTransparentMesh: 1
---- !u!114 &5719196485823687432
+--- !u!114 &410118011459698638
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8504496599915095586}
+ m_GameObject: {fileID: 8472433583862988861}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -3912,8 +3914,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: bbbdb01879f45cd44a8f2077a016ab90, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3922,13 +3924,13 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!114 &3301611976134087592
+--- !u!114 &6491428441843545170
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8504496599915095586}
+ m_GameObject: {fileID: 8472433583862988861}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -3941,7 +3943,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
- m_Transition: 1
+ m_Transition: 2
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -3951,10 +3953,10 @@ MonoBehaviour:
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
- m_HighlightedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34,
+ m_HighlightedSprite: {fileID: 21300000, guid: 85a554ebec9c33f4ba25c2e98e0fbeb4,
type: 3}
- m_PressedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3}
- m_SelectedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3}
+ m_PressedSprite: {fileID: 21300000, guid: 85a554ebec9c33f4ba25c2e98e0fbeb4, type: 3}
+ m_SelectedSprite: {fileID: 21300000, guid: 85a554ebec9c33f4ba25c2e98e0fbeb4, type: 3}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
@@ -3963,22 +3965,34 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
- m_TargetGraphic: {fileID: 5719196485823687432}
+ m_TargetGraphic: {fileID: 410118011459698638}
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 0}
- m_TargetAssemblyTypeName:
- m_MethodName:
+ - m_Target: {fileID: 5651049434045843528}
+ m_TargetAssemblyTypeName: ToolmodeSelector_bttn_mobile, Assembly-CSharp
+ m_MethodName: Tool_nextright
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName:
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+--- !u!114 &5651049434045843528
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8472433583862988861}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 22f4bc7d160cd644f9334f0ba4934ec9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &8646849091251002183
GameObject:
m_ObjectHideFlags: 0
@@ -4985,7 +4999,7 @@ PrefabInstance:
- target: {fileID: 8004702056709666223, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: m_Value
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 8004702057932254674, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
diff --git a/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs b/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
index 319220d0..6cc44174 100644
--- a/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
+++ b/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
@@ -83,6 +83,7 @@ private void Update()
if (!gameSucceeded && CharakterAnimation.getPlayerInTalkingZone())
{
+ UIconfig.numberOfTalkingTargets++;
//print("InTalkingZone");
//print("CharacterDialog" + gameSucceeded + " && " + CharakterAnimation.getPlayerInTalkingZone());
diff --git a/Assets/Scripts/UI/InGame/TalkingButton_mobile.cs b/Assets/Scripts/UI/InGame/TalkingButton_mobile.cs
new file mode 100644
index 00000000..67013f6e
--- /dev/null
+++ b/Assets/Scripts/UI/InGame/TalkingButton_mobile.cs
@@ -0,0 +1,64 @@
+using UnityEngine;
+//using static StreamingAssetLoader;
+//using static CheckServer;
+//using static CommunicationEvents;
+
+
+public class TalkingButton_mobile : MonoBehaviour
+{
+
+ public GameObject myself_GObj;
+
+
+ void Start()
+ {
+
+ }
+
+ private void Update()
+ {
+ if (UIconfig.numberOfTalkingTargets > 0)
+ {
+ ActivateUIC();
+ }
+ else
+ {
+ ClearUIC();
+
+ }
+ UIconfig.numberOfTalkingTargets = 0;
+ }
+
+
+ public void Talk_Bttn()
+ {
+ UIconfig.nextDialogPlease++;
+ }
+
+ /// <summary>
+ /// Deactivates all Pages.
+ /// </summary>
+ private void ActivateUIC()
+ {
+
+ for (int i = 0; i < myself_GObj.transform.childCount; i++)
+ {
+ myself_GObj.transform.GetChild(i).gameObject.SetActive(true);
+ }
+ }
+
+
+ /// <summary>
+ /// Deactivates all Pages.
+ /// </summary>
+ private void ClearUIC()
+ {
+
+ for (int i = 0; i < myself_GObj.transform.childCount; i++)
+ {
+ myself_GObj.transform.GetChild(i).gameObject.SetActive(false);
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/Assets/Scripts/UI/InGame/TalkingButton_mobile.cs.meta b/Assets/Scripts/UI/InGame/TalkingButton_mobile.cs.meta
new file mode 100644
index 00000000..5ec4cc28
--- /dev/null
+++ b/Assets/Scripts/UI/InGame/TalkingButton_mobile.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fd022af7fcd02ff4f8bff3e3ef5702a0
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs
index eeda1183..664e7577 100644
--- a/Assets/Scripts/UI/UIconfig.cs
+++ b/Assets/Scripts/UI/UIconfig.cs
@@ -64,6 +64,9 @@ public enum ControlMode
}
+ public static int numberOfTalkingTargets =0;
+
+
public static int touchControlMode = 1; //1=buttons, 2, 3
--
GitLab