diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index f4bca7837471b4bb39cb4f4fdddf06f2cececf28..ceeb2a5e368961f9fab28374c8124e702a15db76 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -2248,6 +2248,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 582414342988004047, guid: b996060e27da25c498842defc1996d84,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 582414343370059608, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMax.y
@@ -2301,7 +2306,7 @@ PrefabInstance:
- target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_Value
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 861183262417667854, guid: b996060e27da25c498842defc1996d84,
type: 3}
@@ -3700,6 +3705,11 @@ PrefabInstance:
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5131478907638833995, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 5326127390821359603, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
propertyPath: m_IsActive
@@ -4141,7 +4151,7 @@ PrefabInstance:
- target: {fileID: 7000045644623408183, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
propertyPath: m_IsActive
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7000046267743680389, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
diff --git a/Assets/Resources/Prefabs/Task-Character.prefab b/Assets/Resources/Prefabs/Task-Character.prefab
index ab58c3476b77ccbe31c90fff8d851004c0de3018..60cd13fa2156365889ebebf0644d054b927e6379 100644
--- a/Assets/Resources/Prefabs/Task-Character.prefab
+++ b/Assets/Resources/Prefabs/Task-Character.prefab
@@ -638,7 +638,7 @@ BoxCollider:
m_GameObject: {fileID: 6999573640440716754}
m_Material: {fileID: 0}
m_IsTrigger: 0
- m_Enabled: 1
+ m_Enabled: 0
serializedVersion: 2
m_Size: {x: 3, y: 1.7, z: 0.1}
m_Center: {x: 0, y: 0.1, z: 0}
diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
index dd7e4766f1a4b0a706486a5bc2126992f2d1a829..fb29f1ede83fe4cc6efae0471f2aa9274ce898b2 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
@@ -153,6 +153,107 @@ MonoBehaviour:
m_EditorClassIdentifier:
myUI_ID: 20
setValueTo: 0
+--- !u!1 &255069119735572238
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6958676084274145452}
+ - component: {fileID: 8967404916986244373}
+ - component: {fileID: 5410379256444299586}
+ - component: {fileID: 6368433603928293443}
+ m_Layer: 5
+ m_Name: NPCReden_bttn_onoff_0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &6958676084274145452
+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_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 2161880189324873096}
+ m_Father: {fileID: 2725202797239850803}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ 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, 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_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
+MonoBehaviour:
+ 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: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &464427703213787929
GameObject:
m_ObjectHideFlags: 0
@@ -1276,6 +1377,59 @@ MonoBehaviour:
m_EditorClassIdentifier:
myUI_ID: 20
setValueTo: 0
+--- !u!1 &3274525830605418191
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2725202797239850803}
+ - component: {fileID: 8694587518162361668}
+ m_Layer: 0
+ m_Name: NPCReden_Bttn_onoff_
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &2725202797239850803
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3274525830605418191}
+ 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}
+ m_Father: {fileID: 7108271756006176728}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ 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
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3274525830605418191}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3e3281ba7462a8a4dad1ea188ed30a8a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ myself_GObj: {fileID: 3274525830605418191}
+ myUI_ID: 19
+ default_value: 1
--- !u!1 &3592360101499009361
GameObject:
m_ObjectHideFlags: 0
@@ -2209,6 +2363,88 @@ 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
@@ -3135,6 +3371,7 @@ RectTransform:
- {fileID: 1124259054666192576}
- {fileID: 3510664950835701341}
- {fileID: 118299968777129975}
+ - {fileID: 2725202797239850803}
m_Father: {fileID: 3129303587586972547}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3345,7 +3582,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.86200005, y: 0.1971348}
m_AnchorMax: {x: 1, y: 0.338}
- m_AnchoredPosition: {x: 0, y: 0.000030517578}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4153346424924443774
@@ -3607,6 +3844,141 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 22f4bc7d160cd644f9334f0ba4934ec9, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &8504496599915095586
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2161880189324873096}
+ - component: {fileID: 4412756494208005845}
+ - component: {fileID: 5719196485823687432}
+ - component: {fileID: 3301611976134087592}
+ 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 &2161880189324873096
+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_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
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.8463106, y: 0.6064447}
+ m_AnchorMax: {x: 1, y: 0.7222793}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4412756494208005845
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8504496599915095586}
+ m_CullTransparentMesh: 1
+--- !u!114 &5719196485823687432
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8504496599915095586}
+ 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 &3301611976134087592
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8504496599915095586}
+ 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: 5719196485823687432}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 0}
+ m_TargetAssemblyTypeName:
+ m_MethodName:
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName:
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &8646849091251002183
GameObject:
m_ObjectHideFlags: 0
@@ -4295,6 +4667,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 5157949832409022819, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 5165458103479602308, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Enabled
@@ -4310,6 +4687,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6298124033882733649, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 6574055792179816652, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -4330,6 +4712,11 @@ PrefabInstance:
propertyPath: m_ControlPath
value: <Gamepad>/leftStick/up
objectReference: {fileID: 0}
+ - target: {fileID: 7436176577119230325, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 8718522871135096508, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Name
@@ -5107,6 +5494,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5157949832409022819, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 5165458103479602308, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Enabled
@@ -5117,11 +5509,21 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6298124033882733649, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 6574055792179816652, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7436176577119230325, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 8298271169650038834, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -5292,6 +5694,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5157949832409022819, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 5165458103479602308, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Enabled
@@ -5322,11 +5729,21 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6298124033882733649, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 6574055792179816652, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7436176577119230325, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 7664050507038371539, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_PresetInfoIsWorld
diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
index 28652b9400bf439943f3db30810cd7c7788fe9f7..5ab57acaa302eabe3210ada1b00375eb37b6733f 100644
--- a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
@@ -4151,7 +4151,7 @@ RectTransform:
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.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -0.000015259}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &266457294232120517
@@ -6332,6 +6332,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
MCiW_ButtonT: {fileID: 7531123298323220689}
MCiW_ButtonUT: {fileID: 9018472344697824337}
+ IHS_ButtonT: {fileID: 1111993630222663335}
+ IHS_ButtonUT: {fileID: 9018472344697824337}
--- !u!1 &610604573760677482
GameObject:
m_ObjectHideFlags: 0
@@ -7041,6 +7043,87 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+--- !u!1 &1111993630222663335
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7130008919521684271}
+ - component: {fileID: 478297219448785084}
+ - component: {fileID: 234459214611175869}
+ m_Layer: 5
+ m_Name: IHC_t
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7130008919521684271
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1111993630222663335}
+ 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: 6729794129141455034}
+ m_Father: {fileID: 5118840120245823694}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0.8}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: -0.0000076294}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &478297219448785084
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1111993630222663335}
+ m_CullTransparentMesh: 1
+--- !u!114 &234459214611175869
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1111993630222663335}
+ 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: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Mouse keeper
--- !u!1 &1114371742251588745
GameObject:
m_ObjectHideFlags: 0
@@ -7179,6 +7262,7 @@ RectTransform:
- {fileID: 5095609971324922279}
- {fileID: 5080551495676767011}
- {fileID: 6001305604544384156}
+ - {fileID: 5118840120245823694}
m_Father: {fileID: 2317241235488686837}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8982,7 +9066,7 @@ RectTransform:
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.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -0.000015259}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8134887116322628668
@@ -11919,7 +12003,7 @@ RectTransform:
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.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -0.000015259}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5656820628799079737
@@ -12120,6 +12204,86 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4976177809611966447
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6729794129141455034}
+ - component: {fileID: 917049872288583495}
+ - component: {fileID: 8270001342884437261}
+ m_Layer: 5
+ m_Name: IHC_ut
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6729794129141455034
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4976177809611966447}
+ 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: 7130008919521684271}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.083000004}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0.000022888}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &917049872288583495
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4976177809611966447}
+ m_CullTransparentMesh: 1
+--- !u!114 &8270001342884437261
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4976177809611966447}
+ 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: 25
+ m_FontStyle: 2
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 7
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Press for deactivating
--- !u!1 &4998788848932538707
GameObject:
m_ObjectHideFlags: 0
@@ -12521,7 +12685,7 @@ RectTransform:
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.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -0.000015259}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1148821661303242458
@@ -12603,6 +12767,178 @@ RectTransform:
m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5225957422883601773
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5118840120245823694}
+ - component: {fileID: 1125319451174094111}
+ - component: {fileID: 3116098244554376230}
+ - component: {fileID: 1665372670227222879}
+ - component: {fileID: 7259324155492267166}
+ - component: {fileID: 7986184887082207035}
+ m_Layer: 5
+ m_Name: InvertHotbarScrolling_Mode
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5118840120245823694
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225957422883601773}
+ 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: 7130008919521684271}
+ m_Father: {fileID: 4214445693731897739}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.10150002, y: 0.48}
+ m_AnchorMax: {x: 0.5, y: 0.61}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: -0.000061035156}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1125319451174094111
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225957422883601773}
+ m_CullTransparentMesh: 1
+--- !u!114 &3116098244554376230
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225957422883601773}
+ 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: e4f1fee3de32377429fd1348fae62b10, 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 &1665372670227222879
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225957422883601773}
+ 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: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ 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: 3116098244554376230}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 7986184887082207035}
+ m_TargetAssemblyTypeName: ControlOptionsM_Keyboard_mobile, Assembly-CSharp
+ m_MethodName: InvertHotbarScrollDirection
+ 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 &7259324155492267166
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225957422883601773}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a9dbb003859d7394b9dcf6e6e1b3ac20, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ AutoOSreq_ButtonT: {fileID: 0}
+ AutoOSreq_ButtonUT: {fileID: 0}
+ Opsys_ButtonT: {fileID: 1111993630222663335}
+ Opsys_ButtonUT: {fileID: 4976177809611966447}
+ FrameITUI_ButtonT: {fileID: 5861497761551979794}
+ FrameITUI_ButtonUT: {fileID: 4867843466607851529}
+ AutoSettingsAdap_Button: {fileID: 0}
+ AutoSettingsAdap_ButtonUT: {fileID: 0}
+--- !u!114 &7986184887082207035
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5225957422883601773}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d34e9961538012f4397a4e5e991f12e6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ MCiW_ButtonT: {fileID: 1111993630222663335}
+ MCiW_ButtonUT: {fileID: 4976177809611966447}
+ IHS_ButtonT: {fileID: 1111993630222663335}
+ IHS_ButtonUT: {fileID: 4976177809611966447}
--- !u!1 &5262509579923972088
GameObject:
m_ObjectHideFlags: 0
@@ -14037,7 +14373,7 @@ RectTransform:
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.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -0.000015259}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1506140567114488979
@@ -17852,6 +18188,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2317241235488686837}
m_Modifications:
+ - target: {fileID: 1713816319338519064, guid: 386732dae91d6c546ac0f02745d283dc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -0.00012207031
+ objectReference: {fileID: 0}
- target: {fileID: 2546650055070303835, guid: 386732dae91d6c546ac0f02745d283dc,
type: 3}
propertyPath: m_Pivot.x
@@ -17972,6 +18313,16 @@ PrefabInstance:
propertyPath: m_Text
value: Tabulator
objectReference: {fileID: 0}
+ - target: {fileID: 6999102527998034399, guid: 386732dae91d6c546ac0f02745d283dc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8936053076647955382, guid: 386732dae91d6c546ac0f02745d283dc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 9012457569728381634, guid: 386732dae91d6c546ac0f02745d283dc,
type: 3}
propertyPath: m_Name
@@ -17998,6 +18349,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 266457293881304186}
m_Modifications:
+ - target: {fileID: 1355285701250162891, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -1.065918
+ objectReference: {fileID: 0}
- target: {fileID: 6804933134010575746, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
type: 3}
propertyPath: m_Pivot.x
@@ -18128,6 +18484,16 @@ PrefabInstance:
propertyPath: parentM_GObj
value:
objectReference: {fileID: 266457293881304185}
+ - target: {fileID: 6804933135199878348, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -0.024902344
+ objectReference: {fileID: 0}
+ - target: {fileID: 6804933135459908465, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 2.1362305
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2c2cf35f8e593ea44b2050d129ee23a4, type: 3}
--- !u!1 &266457294901600504 stripped
diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity
index 23ff4abd0dd69de17793f824c5792adceb199bb0..bb342d5aa6d6bd3f7053aaf98e7589e9c5cbf8fd 100644
--- a/Assets/Scenes/Menues/LaunchMenue.unity
+++ b/Assets/Scenes/Menues/LaunchMenue.unity
@@ -402,7 +402,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: -0.00024414062, y: -0.000061035156}
+ m_AnchoredPosition: {x: -0.00024414062, y: 0}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &507015558
@@ -1751,7 +1751,7 @@ PrefabInstance:
- target: {fileID: 163386453996020665, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.00012207031
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 166691744853340724, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
@@ -1853,6 +1853,16 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1662363385402635961, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 1.25
+ objectReference: {fileID: 0}
+ - target: {fileID: 1662363385479849139, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1662363385579300209, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -1891,7 +1901,7 @@ PrefabInstance:
- target: {fileID: 1662363386646799568, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -0.000061035156
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1662363386646799568, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
@@ -1903,11 +1913,26 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1662363387129799107, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 2.125
+ objectReference: {fileID: 0}
- target: {fileID: 1662363387162373650, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1662363387338175133, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 1662363387348382210, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1662363387348382220, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -1923,6 +1948,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 1662363387406607998, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1662363387465645999, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 1.25
+ objectReference: {fileID: 0}
- target: {fileID: 1787561126379063534, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_Name
@@ -1981,7 +2016,7 @@ PrefabInstance:
- target: {fileID: 3100971661806590510, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -4.9999695
+ value: -4.999939
objectReference: {fileID: 0}
- target: {fileID: 3102464668348079172, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
@@ -2001,7 +2036,7 @@ PrefabInstance:
- target: {fileID: 3253093900832493534, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.000061035156
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3363358823963176404, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
@@ -2013,6 +2048,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ChangeFrameITUIvers
objectReference: {fileID: 0}
+ - target: {fileID: 3460943667825706423, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3554770188392561805, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -2246,7 +2286,7 @@ PrefabInstance:
- target: {fileID: 4648953805413023611, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 1.9707642
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 4676555279213551107, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
@@ -2846,7 +2886,7 @@ PrefabInstance:
- target: {fileID: 5366996317015339087, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -0.000061035156
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5366996317072312636, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
@@ -2898,16 +2938,31 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6607041489703631481, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6614718976573330457, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6858690975884048166, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.00012207031
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6914020161757597414, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6964820851159365078, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7056707589294987675, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_SizeDelta.x
@@ -2956,7 +3011,7 @@ PrefabInstance:
- target: {fileID: 7460865809762904914, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.93743896
+ value: -0.9375
objectReference: {fileID: 0}
- target: {fileID: 7475751197872360999, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
diff --git a/Assets/Scenes/Worlds/TreeWorld.unity b/Assets/Scenes/Worlds/TreeWorld.unity
index 1796c450f8feb4feb5baeacd9c9fb2e9cf2c9dc4..fc634ae8add616ae241ac410ba97c3b5939844f6 100644
--- a/Assets/Scenes/Worlds/TreeWorld.unity
+++ b/Assets/Scenes/Worlds/TreeWorld.unity
@@ -6949,6 +6949,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 539067468367292139, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 1871548913918342015, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_SizeDelta.y
@@ -7054,6 +7059,21 @@ PrefabInstance:
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
+ - target: {fileID: 3231672574902135807, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3231672574902135807, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3231672574902135807, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3231672575110126845, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Scripts/InteractionEngine/AlignText.cs b/Assets/Scripts/InteractionEngine/AlignText.cs
index 04481fb633e3f38866951791fef0984ffb8b6947..dabac3fa77facfdbc792ed36c9d2bf96763ad54a 100644
--- a/Assets/Scripts/InteractionEngine/AlignText.cs
+++ b/Assets/Scripts/InteractionEngine/AlignText.cs
@@ -1,6 +1,7 @@
using System.Collections;
using UnityEngine;
//using UnityEngine.EventSystems;
+using static UIconfig;
public class AlignText : MonoBehaviour
{
@@ -30,8 +31,9 @@ void Update()
//Not yet the perfect solution
//Problem is the relative rotation of the TextMesh to the Line-Parent
//transform.rotation = Quaternion.Lerp(transform.parent.transform.rotation, Cam.transform.rotation, 0);
-
//if (Moving_GObj) { }
+ if (UIconfig.controlMode == ControlMode.Keyboard) { gameObject.GetComponent<BoxCollider>().enabled = false; }
+ if (UIconfig.controlMode == ControlMode.Mobile) { gameObject.GetComponent<BoxCollider>().enabled = true; }
}
Camera toCamMain()
diff --git a/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs b/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
index 69e82a39fe0b0f90685830d3a59a45aff5dd4bde..319220d0c9c938236e3be6a9d734299a5fa9870d 100644
--- a/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
+++ b/Assets/Scripts/InteractionEngine/Character_Animations/CharacterDialog.cs
@@ -69,8 +69,8 @@ public void nextSentenceBttn_pressed()
numinputtrigger++;
StartCoroutine(slowInput());
//Type Next sentence if player is in the talkinZone around the TaskCharacter AND the player typed the return-Key
- idleTime = 0;
NextSentence();
+ idleTime = 0;
}
}
@@ -92,8 +92,9 @@ private void Update()
if (Input.GetKeyDown(KeyCode.C))
{
//Type Next sentence if player is in the talkinZone around the TaskCharacter AND the player typed the return-Key
- NextSentence();
- idleTime = 0;
+ nextSentenceBttn_pressed();
+ //NextSentence();
+ //idleTime = 0;
//print("CharacterDialogLos1");
}
}
@@ -233,13 +234,11 @@ public void StopGameSucceededSentence()
IEnumerator slowInput()
{
-
+
yield return new WaitForSecondsRealtime(waitingBetweenInputs);
numinputtrigger = 0;
nextDialogPlease = 0;
-
-
yield return null;
}
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs b/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs
index 39dbb095cb19b6509f56983bd13e4544e8ab25b7..4c53f8a4d62209b04c550881bbbd8408e48ab0a7 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.UI;
+using static UIconfig;
public class GadgetBehaviour : MonoBehaviour, ISerializationCallbackReceiver
@@ -140,9 +141,14 @@ void Update()
int offset = 0;
if (Input.GetButtonDown("ToolMode"))
+ {
offset = 1;
+ }
else if (Input.GetAxis("Mouse ScrollWheel") != 0)
- offset = (int)Mathf.Sign(Input.GetAxis("Mouse ScrollWheel"));
+ {
+ offset = (int)Mathf.Sign(Input.GetAxis("Mouse ScrollWheel"))
+ * UIconfig.scrolldirection; //Invert Offset if toggled in Optionsmenue->Controls.
+ }
if (offset != 0)
ActivateGadget(ActiveGadgetInd + offset);
diff --git a/Assets/Scripts/Loading/StreamingAssetLoader.cs b/Assets/Scripts/Loading/StreamingAssetLoader.cs
index cbdebb456225738d6df9988b0a6c120364f693aa..06c1981b4bb1d48ca16b4cd5515bc1483e3ce2fb 100644
--- a/Assets/Scripts/Loading/StreamingAssetLoader.cs
+++ b/Assets/Scripts/Loading/StreamingAssetLoader.cs
@@ -139,12 +139,12 @@ public static void NetworkJSON_Save()
myObject.cursorSize = UIconfig.cursorSize;
myObject.camRotatingSensitivity = UIconfig.camRotatingSensitivity;
myObject.MouseKeepingInWindow = UIconfig.MouseKeepingInWindow;
+ myObject.scrolldirection = UIconfig.scrolldirection;
-
- //Data storage
- SafeCreateDirectory(Path.Combine(Application.persistentDataPath, ConfigDir));
+ //Data storage
+ SafeCreateDirectory(Path.Combine(Application.persistentDataPath, ConfigDir));
//string json = JsonUtility.ToJson(date);
string json = JsonUtility.ToJson(myObject);
StreamWriter Writer = new StreamWriter(Path.Combine(Application.persistentDataPath, ConfigDir, ConfigFile_Network));
@@ -472,6 +472,13 @@ public static void NetworkJSON_Load_x(string path)
{
UIconfig.MouseKeepingInWindow = myObjs.MouseKeepingInWindow;
}
+ if (string.IsNullOrEmpty(myObjsOnlyStrings.scrolldirection))
+ {
+ }
+ else
+ {
+ UIconfig.scrolldirection = myObjs.scrolldirection;
+ }
}
diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs b/Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs
index 65478c8afb0b8efc9a91315358243a917e122459..89786e4127e9c837ed5aa9bc1aafbf4129a4dfbd 100644
--- a/Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs
@@ -9,6 +9,9 @@ public class ControlOptionsM_Keyboard_mobile : MonoBehaviour
public GameObject MCiW_ButtonT;
public GameObject MCiW_ButtonUT;
+ public GameObject IHS_ButtonT;
+ public GameObject IHS_ButtonUT;
+
/*
@@ -56,6 +59,28 @@ void UpdateUI_6()
}
+ switch (UIconfig.scrolldirection)
+ {
+ case -1:
+
+ IHS_ButtonT.GetComponent<Text>().text = "Mousewheel up is left";
+ IHS_ButtonUT.GetComponent<Text>().text = "Press to toggle";
+ break;
+
+ case 1:
+
+ IHS_ButtonT.GetComponent<Text>().text = "Mousewheel up is right";
+ IHS_ButtonUT.GetComponent<Text>().text = "Press to toggle";
+ break;
+
+ default:
+
+ IHS_ButtonT.GetComponent<Text>().text = "Panic??";
+ IHS_ButtonUT.GetComponent<Text>().text = "Press to toggle";
+ break;
+ }
+
+
}
public void ChangeMouseCaptureInWindow()
@@ -80,6 +105,14 @@ public void ChangeMouseCaptureInWindow()
NetworkJSON_Save();
}
+ public void InvertHotbarScrollDirection()
+ {
+ UIconfig.scrolldirection *= -1;
+
+ //updateUIpreview();
+ NetworkJSON_Save();
+ }
+
}
diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs
index baf6412fe71127b82476d9e7fb56102cf8e5223d..eeda1183a6a6278424b4e3ebdcfd2d9e4d62bb33 100644
--- a/Assets/Scripts/UI/UIconfig.cs
+++ b/Assets/Scripts/UI/UIconfig.cs
@@ -70,6 +70,8 @@ public enum ControlMode
public static float TAvisibility = 1;
public static bool MouseKeepingInWindow = true;
+ public static int scrolldirection = -1; //-1: Up==Left, 1: Up==Right
+
//public static List<Tuple<int, Texture2D>> CursorTexture_List_01 = new List<Tuple<int, Texture2D>>();
public static List<(int, Texture2D)> CursorTexture_List_01 = new List<(int, Texture2D)> { };
@@ -117,6 +119,7 @@ public class NetworkJSON
public double cursorSize;
public float camRotatingSensitivity; //Sensitivity to inputs.
public bool MouseKeepingInWindow;
+ public int scrolldirection;
}
public class NetworkJSONonlyString
@@ -141,6 +144,7 @@ public class NetworkJSONonlyString
public string cursorSize;
public string camRotatingSensitivity; //Sensitivity to inputs.
public string MouseKeepingInWindow;
+ public string scrolldirection;
}
//------------------------------------------------------------------------------------------------------
diff --git a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON
index 39fc32397547a594580e93f23681192af7d8fdac..bd80ffd55145e37372fa34381fb828517d59ffd9 100644
--- a/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON
+++ b/Assets/StreamingAssets/StreamToPersistentDataPath/Config/Network.JSON
@@ -18,5 +18,6 @@
"colliderScale_all": 1.200000047683716,
"cursorSize": 0.03125,
"camRotatingSensitivity": 2.0,
- "MouseKeepingInWindow": true
+ "MouseKeepingInWindow": true,
+ "scrolldirection": -1
}
\ No newline at end of file