diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index 3a8f93eb1f24ab7cf52a039d12d16edf2a453e3e..14d33c022469771358e5c4766351c5d70fcbccd2 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -138,222 +138,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &3273965976878555728
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7004653270010263142}
- - component: {fileID: 6746041492243675796}
- - component: {fileID: 1096777717831870286}
- - component: {fileID: 5238925381100629091}
- - component: {fileID: 4248870205708055095}
- - component: {fileID: 1612370286059394863}
- m_Layer: 9
- m_Name: GadgetBackground
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &7004653270010263142
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3273965976878555728}
- 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: 1
- m_Children:
- - {fileID: 8111165885733284748}
- m_Father: {fileID: 4281382554949472447}
- m_RootOrder: 0
- 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: 0, y: 20}
- m_SizeDelta: {x: 1880, y: 70}
- m_Pivot: {x: 0.5, y: 0}
---- !u!222 &6746041492243675796
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3273965976878555728}
- m_CullTransparentMesh: 1
---- !u!114 &1096777717831870286
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3273965976878555728}
- 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: 0.3882353}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- 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 &5238925381100629091
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3273965976878555728}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
---- !u!114 &4248870205708055095
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3273965976878555728}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 0
- m_VerticalFit: 1
---- !u!114 &1612370286059394863
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3273965976878555728}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 4
- m_Spacing: 0
- m_ChildForceExpandWidth: 0
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 1
- m_ReverseArrangement: 0
---- !u!1 &4741615507104529087
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4402584251377696550}
- - component: {fileID: 5776242835282192889}
- - component: {fileID: 5221765605508384641}
- m_Layer: 0
- m_Name: GadgetCanvas
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4402584251377696550
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4741615507104529087}
- 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: 4261640500407630238}
- m_Father: {fileID: 6938869605920292519}
- m_RootOrder: 1
- 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 &5776242835282192889
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4741615507104529087}
- 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: 10
- m_TargetDisplay: 0
---- !u!114 &5221765605508384641
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4741615507104529087}
- 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!1 &5271626897556190298
GameObject:
m_ObjectHideFlags: 0
@@ -644,190 +428,6 @@ MonoBehaviour:
Fireworks_Animation: {fileID: 680201779562176910, guid: ffb2848bfea6a7748b3e5bd8e6928920,
type: 3}
RainPrefab: {fileID: 160098, guid: 69b40ef7ee16c834c844b3fa26e0fdda, type: 3}
---- !u!1 &5691472882636289111
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8111165885733284748}
- - component: {fileID: 6509660871521492547}
- - component: {fileID: 3980382629164816639}
- - component: {fileID: 5003940091629995415}
- - component: {fileID: 412060302766524416}
- - component: {fileID: 5903588651450781209}
- - component: {fileID: 3438560636170028305}
- - component: {fileID: 8354053535307692309}
- m_Layer: 9
- m_Name: GadgetScroll
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8111165885733284748
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- 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: 1
- m_Children:
- - {fileID: 9035606189865104354}
- m_Father: {fileID: 7004653270010263142}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 940, y: -35}
- m_SizeDelta: {x: 70, y: 70}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &6509660871521492547
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f6c56cda17d48fa47a0c06cea90accba, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _GadgetButton: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- _ParentMe: {fileID: 0}
- _Cursor: {fileID: 0}
- _LineRenderer: {fileID: 0}
- _DataContainerGadgetDict: {fileID: 11400000, guid: 4f083cea1fe36674f8441e41ed95263d,
- type: 2}
---- !u!114 &3980382629164816639
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 0.9392266, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- 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 &5003940091629995415
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
---- !u!114 &412060302766524416
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Content: {fileID: 8111165885733284748}
- m_Horizontal: 1
- m_Vertical: 0
- m_MovementType: 2
- m_Elasticity: 0.1
- m_Inertia: 1
- m_DecelerationRate: 0.135
- m_ScrollSensitivity: 1
- m_Viewport: {fileID: 0}
- m_HorizontalScrollbar: {fileID: 0}
- m_VerticalScrollbar: {fileID: 0}
- m_HorizontalScrollbarVisibility: 0
- m_VerticalScrollbarVisibility: 0
- m_HorizontalScrollbarSpacing: 0
- m_VerticalScrollbarSpacing: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &5903588651450781209
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 10
- m_Right: 10
- m_Top: 10
- m_Bottom: 10
- m_ChildAlignment: 4
- m_Spacing: 10
- m_ChildForceExpandWidth: 0
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
- m_ChildScaleWidth: 1
- m_ChildScaleHeight: 1
- m_ReverseArrangement: 0
---- !u!114 &3438560636170028305
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 1
- m_VerticalFit: 1
---- !u!222 &8354053535307692309
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5691472882636289111}
- m_CullTransparentMesh: 1
--- !u!1 &6341032511684407557
GameObject:
m_ObjectHideFlags: 0
@@ -912,406 +512,191 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
---- !u!1 &7120129368515439807
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4506401771960998261}
- - component: {fileID: 4359856318946903171}
- - component: {fileID: 814600558095670345}
- - component: {fileID: 8468480920999830056}
- - component: {fileID: 6934420333671286807}
- - component: {fileID: 7083599577574220106}
- - component: {fileID: 595428016819350031}
- - component: {fileID: 8469901956183964798}
- m_Layer: 9
- m_Name: GadgetScroll
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4506401771960998261
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- 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: 1
- m_Children:
- - {fileID: 9209458895985960121}
- m_Father: {fileID: 4261640500407630238}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 940, y: -35}
- m_SizeDelta: {x: 70, y: 70}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &4359856318946903171
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f6c56cda17d48fa47a0c06cea90accba, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _GadgetButton: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- _ParentMe: {fileID: 0}
- _Cursor: {fileID: 0}
- _LineRenderer: {fileID: 0}
- _DataContainerGadgetDict: {fileID: 11400000, guid: 4f083cea1fe36674f8441e41ed95263d,
- type: 2}
---- !u!114 &814600558095670345
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 0.9392266, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- 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 &8468480920999830056
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
---- !u!114 &6934420333671286807
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Content: {fileID: 4506401771960998261}
- m_Horizontal: 1
- m_Vertical: 0
- m_MovementType: 2
- m_Elasticity: 0.1
- m_Inertia: 1
- m_DecelerationRate: 0.135
- m_ScrollSensitivity: 1
- m_Viewport: {fileID: 0}
- m_HorizontalScrollbar: {fileID: 0}
- m_VerticalScrollbar: {fileID: 0}
- m_HorizontalScrollbarVisibility: 0
- m_VerticalScrollbarVisibility: 0
- m_HorizontalScrollbarSpacing: 0
- m_VerticalScrollbarSpacing: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &7083599577574220106
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 10
- m_Right: 10
- m_Top: 10
- m_Bottom: 10
- m_ChildAlignment: 4
- m_Spacing: 10
- m_ChildForceExpandWidth: 0
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
- m_ChildScaleWidth: 1
- m_ChildScaleHeight: 1
- m_ReverseArrangement: 0
---- !u!114 &595428016819350031
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 1
- m_VerticalFit: 1
---- !u!222 &8469901956183964798
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7120129368515439807}
- m_CullTransparentMesh: 1
---- !u!1 &7452330807942703591
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4281382554949472447}
- - component: {fileID: 5327187891751999832}
- - component: {fileID: 9100953968195935255}
- m_Layer: 0
- m_Name: GadgetCanvas
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &4281382554949472447
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7452330807942703591}
- 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: 7004653270010263142}
- m_Father: {fileID: 6937359050101973495}
- m_RootOrder: 2
- 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 &5327187891751999832
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7452330807942703591}
- 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: 10
- m_TargetDisplay: 0
---- !u!114 &9100953968195935255
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7452330807942703591}
- 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!1 &7687605579721858054
-GameObject:
+--- !u!1001 &442227395851957050
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 4261640500407630238}
- - component: {fileID: 3416299140994210288}
- - component: {fileID: 8163188200504792532}
- - component: {fileID: 1963416663500246659}
- - component: {fileID: 4337947210850459494}
- - component: {fileID: 6725231944125868077}
- m_Layer: 9
- m_Name: GadgetBackground
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &4261640500407630238
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 6937359050101973495}
+ m_Modifications:
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7010103626960755421, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Name
+ value: GadgetCanvas
+ objectReference: {fileID: 0}
+ - target: {fileID: 7010103626960755421, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 70
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 70
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 70
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 940
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -35
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 35
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -35
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 884ac57de337c364391b247761071fb1, type: 3}
+--- !u!224 &4281382554949472447 stripped
RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7687605579721858054}
- 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: 1
- m_Children:
- - {fileID: 4506401771960998261}
- m_Father: {fileID: 4402584251377696550}
- m_RootOrder: 0
- 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: 0, y: 20}
- m_SizeDelta: {x: 1880, y: 70}
- m_Pivot: {x: 0.5, y: 0}
---- !u!222 &3416299140994210288
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7687605579721858054}
- m_CullTransparentMesh: 1
---- !u!114 &8163188200504792532
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7687605579721858054}
- 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: 0.3882353}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- 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 &1963416663500246659
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7687605579721858054}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
---- !u!114 &4337947210850459494
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7687605579721858054}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 0
- m_VerticalFit: 1
---- !u!114 &6725231944125868077
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ m_PrefabInstance: {fileID: 442227395851957050}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7687605579721858054}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 4
- m_Spacing: 0
- m_ChildForceExpandWidth: 0
- m_ChildForceExpandHeight: 0
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 1
- m_ReverseArrangement: 0
--- !u!1001 &1331047304808510126
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2904,256 +2289,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 2822275412857346440}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &3276201457010936244
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 8111165885733284748}
- m_Modifications:
- - target: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_Name
- value: GadgetButton
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 100
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 100
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 35
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -35
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 4804ff343c7a9724abfb4587ac7da08a, type: 3}
---- !u!224 &9035606189865104354 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- m_PrefabInstance: {fileID: 3276201457010936244}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &3448946130270166767
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 4506401771960998261}
- m_Modifications:
- - target: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_Name
- value: GadgetButton
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMax.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMin.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 100
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 100
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 35
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -35
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 4804ff343c7a9724abfb4587ac7da08a, type: 3}
---- !u!224 &9209458895985960121 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
- type: 3}
- m_PrefabInstance: {fileID: 3448946130270166767}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &4633513391531001248
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3600,6 +2735,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6037608700817923018, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6037608700817923023, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
propertyPath: m_Name
@@ -3748,12 +2888,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d82f42108ed43df44be2ba01f8ffb9fa, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!224 &6938869605920292519 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 2307631664577821447, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
- type: 3}
- m_PrefabInstance: {fileID: 4633513391531001248}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &5244648467689565525
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
index 1375561fd44af532673c8cdfe9bdb56d880e83b2..6df9673ff11325ff54f099ee1ca27efc0639b3a5 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
@@ -517,6 +517,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 2164018782261093781}
- {fileID: 6527117206558925176}
m_Father: {fileID: 7080480936453216874}
m_RootOrder: 1
@@ -702,7 +703,7 @@ RectTransform:
- {fileID: 5106811703022426982}
- {fileID: 1867735786434318953}
m_Father: {fileID: 2307631664577821447}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1033,6 +1034,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 7514359499813093287}
- {fileID: 1801135202064309160}
m_Father: {fileID: 3129303587586972547}
m_RootOrder: 0
@@ -1853,7 +1855,7 @@ RectTransform:
- {fileID: 1301775592380600274}
- {fileID: 1948490027529827225}
m_Father: {fileID: 8290988048086566216}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1903,7 +1905,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &2850686263576843549
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2515,6 +2517,10 @@ MonoBehaviour:
m_Calls: []
m_ActionId: 9fd2707b-e83e-4315-8730-e43d10900229
m_ActionName: UI/TrackedDeviceOrientation
+ - m_PersistentCalls:
+ m_Calls: []
+ m_ActionId: c52bbb33-deae-4385-b534-214efe1a8fab
+ m_ActionName: Actionmap1/Run[/Keyboard/leftShift]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme: Keyboard
m_DefaultActionMap: Actionmap1
@@ -4432,7 +4438,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &8941936774066884200
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4625,6 +4631,131 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 1057245782326959912}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2540520963855926800
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8290988048086566216}
+ m_Modifications:
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7010103626960755421, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Name
+ value: GadgetCanvas
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 884ac57de337c364391b247761071fb1, type: 3}
+--- !u!224 &2164018782261093781 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ m_PrefabInstance: {fileID: 2540520963855926800}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &3170751396342317722
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4757,6 +4888,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051,
+ type: 3}
+ propertyPath: m_Size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051,
+ type: 3}
+ propertyPath: m_Value
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051,
type: 3}
propertyPath: m_AnchorMax.x
@@ -4767,6 +4908,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 9207926681445974865, guid: b162218cc487f1242bd5ac7b4315a051,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 9207926681519240275, guid: b162218cc487f1242bd5ac7b4315a051,
type: 3}
propertyPath: m_AnchorMax.x
@@ -4787,6 +4933,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 9207926681532248490, guid: b162218cc487f1242bd5ac7b4315a051,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b162218cc487f1242bd5ac7b4315a051, type: 3}
--- !u!224 &6037608700817923016 stripped
@@ -4795,6 +4946,186 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 3170751396342317722}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6125392335914277922
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2307631664577821447}
+ m_Modifications:
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7010103626960755421, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_Name
+ value: GadgetCanvas
+ objectReference: {fileID: 0}
+ - target: {fileID: 7428296641755399516, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 940
+ objectReference: {fileID: 0}
+ - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8883333281790640344, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 884ac57de337c364391b247761071fb1, type: 3}
+--- !u!224 &7514359499813093287 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 4416234386712880005, guid: 884ac57de337c364391b247761071fb1,
+ type: 3}
+ m_PrefabInstance: {fileID: 6125392335914277922}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &6783342354546666608
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..1f19e8ec9f0683a3e63136b9b21a5ea495b2d81a
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab
@@ -0,0 +1,527 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3119989367036973418
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7428296641755399516}
+ - component: {fileID: 6610681205053016494}
+ - component: {fileID: 656279785153827956}
+ - component: {fileID: 5663133155728842585}
+ - component: {fileID: 4383163014842122509}
+ - component: {fileID: 1171869674997326869}
+ m_Layer: 9
+ m_Name: GadgetBackground
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7428296641755399516
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3119989367036973418}
+ 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: 1
+ m_Children:
+ - {fileID: 8553388048532215990}
+ m_Father: {fileID: 4416234386712880005}
+ m_RootOrder: 0
+ 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: 0, y: 20}
+ m_SizeDelta: {x: 1880, y: 0}
+ m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &6610681205053016494
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3119989367036973418}
+ m_CullTransparentMesh: 1
+--- !u!114 &656279785153827956
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3119989367036973418}
+ 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: 0.3882353}
+ m_RaycastTarget: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ 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 &5663133155728842585
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3119989367036973418}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 1
+--- !u!114 &4383163014842122509
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3119989367036973418}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 1
+--- !u!114 &1171869674997326869
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3119989367036973418}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 1
+ m_ReverseArrangement: 0
+--- !u!1 &5250976265380185965
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8553388048532215990}
+ - component: {fileID: 6662492270148709753}
+ - component: {fileID: 3539323053919087557}
+ - component: {fileID: 4851092002558883501}
+ - component: {fileID: 258101355384929082}
+ - component: {fileID: 6327234085323537699}
+ - component: {fileID: 2998029383777515051}
+ - component: {fileID: 8488322213608409647}
+ m_Layer: 9
+ m_Name: GadgetScroll
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8553388048532215990
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ 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: 1
+ m_Children:
+ - {fileID: 8883333281790640344}
+ m_Father: {fileID: 7428296641755399516}
+ 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: 940, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6662492270148709753
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f6c56cda17d48fa47a0c06cea90accba, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _GadgetButton: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ _ParentMe: {fileID: 0}
+ _Cursor: {fileID: 0}
+ _LineRenderer: {fileID: 0}
+ _DataContainerGadgetDict: {fileID: 11400000, guid: 4f083cea1fe36674f8441e41ed95263d,
+ type: 2}
+--- !u!114 &3539323053919087557
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0, b: 0.9392266, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ 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 &4851092002558883501
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 1
+--- !u!114 &258101355384929082
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Content: {fileID: 8553388048532215990}
+ m_Horizontal: 1
+ m_Vertical: 0
+ m_MovementType: 2
+ m_Elasticity: 0.1
+ m_Inertia: 1
+ m_DecelerationRate: 0.135
+ m_ScrollSensitivity: 1
+ m_Viewport: {fileID: 0}
+ m_HorizontalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 0}
+ m_HorizontalScrollbarVisibility: 0
+ m_VerticalScrollbarVisibility: 0
+ m_HorizontalScrollbarSpacing: 0
+ m_VerticalScrollbarSpacing: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &6327234085323537699
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 10
+ m_Right: 10
+ m_Top: 10
+ m_Bottom: 10
+ m_ChildAlignment: 4
+ m_Spacing: 10
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 1
+ m_ChildScaleHeight: 1
+ m_ReverseArrangement: 0
+--- !u!114 &2998029383777515051
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 1
+ m_VerticalFit: 1
+--- !u!222 &8488322213608409647
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5250976265380185965}
+ m_CullTransparentMesh: 1
+--- !u!1 &7010103626960755421
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4416234386712880005}
+ - component: {fileID: 5750782609639631458}
+ - component: {fileID: 8677889008639127341}
+ m_Layer: 0
+ m_Name: GadgetCanvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4416234386712880005
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7010103626960755421}
+ 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: 7428296641755399516}
+ m_Father: {fileID: 0}
+ 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 &5750782609639631458
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7010103626960755421}
+ 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: 10
+ m_TargetDisplay: 0
+--- !u!114 &8677889008639127341
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7010103626960755421}
+ 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!1001 &3122257488954702478
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8553388048532215990}
+ m_Modifications:
+ - target: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_Name
+ value: GadgetButton
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4804ff343c7a9724abfb4587ac7da08a, type: 3}
+--- !u!224 &8883333281790640344 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 5770109655396907606, guid: 4804ff343c7a9724abfb4587ac7da08a,
+ type: 3}
+ m_PrefabInstance: {fileID: 3122257488954702478}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab.meta b/Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..6f14b920572239a6747f215f0541f54aeab6e97e
--- /dev/null
+++ b/Assets/Resources/Prefabs/UI/Ingame/GadgetCanvas.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 884ac57de337c364391b247761071fb1
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
index e873e7e0925151ddc4fbb09f4c3d96f77d4de3b0..e6634a067e07e9fa60ba5e2ce7d8fbedba318e69 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
@@ -29,6 +29,7 @@ RectTransform:
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: 9207926679660501330}
m_RootOrder: 4
@@ -129,6 +130,7 @@ RectTransform:
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: 9207926679764137508}
m_Father: {fileID: 9207926679660501330}
@@ -273,6 +275,7 @@ RectTransform:
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: 9207926680522215219}
- {fileID: 9207926679716571142}
@@ -412,6 +415,7 @@ RectTransform:
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: 8948529145529680365}
- {fileID: 9207926679512206245}
@@ -472,7 +476,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 0
+ m_PresetInfoIsWorld: 1
--- !u!114 &9207926679660501331
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -517,6 +521,7 @@ RectTransform:
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: 9207926679628625396}
m_RootOrder: 1
@@ -562,6 +567,7 @@ RectTransform:
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: 9207926680103916033}
m_RootOrder: 3
@@ -696,6 +702,7 @@ RectTransform:
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: 9207926679512206245}
m_RootOrder: 0
@@ -830,6 +837,7 @@ RectTransform:
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: 9207926679628625396}
- {fileID: 9207926681114477459}
@@ -892,6 +900,7 @@ RectTransform:
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: 9207926680777540234}
- {fileID: 9207926681136637869}
@@ -935,6 +944,7 @@ RectTransform:
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: 9207926679660501330}
m_RootOrder: 6
@@ -1040,6 +1050,7 @@ RectTransform:
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: 9207926680480227026}
- {fileID: 9207926679892754396}
@@ -1136,6 +1147,7 @@ RectTransform:
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: 9207926681445974865}
m_Father: {fileID: 9207926681420349739}
@@ -1175,6 +1187,7 @@ RectTransform:
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: 9207926680838069162}
m_Father: {fileID: 9207926680331850712}
@@ -1305,6 +1318,7 @@ RectTransform:
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: 9207926680331850712}
m_Father: {fileID: 9207926679660501330}
@@ -1342,6 +1356,7 @@ RectTransform:
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: 9207926679628625396}
m_RootOrder: 0
@@ -1387,6 +1402,7 @@ RectTransform:
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: 9207926679660501330}
m_RootOrder: 7
@@ -1462,6 +1478,7 @@ RectTransform:
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: 9207926680103916033}
m_RootOrder: 0
@@ -1596,6 +1613,7 @@ RectTransform:
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: 9207926680103916033}
m_RootOrder: 4
@@ -1730,6 +1748,7 @@ RectTransform:
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: 9207926680480227026}
m_RootOrder: 0
@@ -1866,6 +1885,7 @@ RectTransform:
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: 9207926681519240275}
- {fileID: 9207926681420349739}
@@ -1986,6 +2006,7 @@ RectTransform:
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: 9207926680103916033}
m_RootOrder: 1
@@ -2121,6 +2142,7 @@ RectTransform:
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: 9207926680103916033}
m_RootOrder: 2
@@ -2257,6 +2279,7 @@ RectTransform:
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: 9207926680354602340}
m_Father: {fileID: 9207926681114477459}
@@ -2348,8 +2371,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 9207926681445974878}
m_HandleRect: {fileID: 9207926681445974865}
m_Direction: 0
- m_Value: 0
- m_Size: 1
+ m_Value: 1
+ m_Size: 0.4705884
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -2382,6 +2405,7 @@ RectTransform:
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: 9207926681531587060}
m_RootOrder: 0
@@ -2516,6 +2540,7 @@ RectTransform:
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: 9207926680354602340}
m_RootOrder: 0
@@ -2592,6 +2617,7 @@ RectTransform:
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: 9207926681532248490}
m_Father: {fileID: 9207926681114477459}
@@ -2683,6 +2709,7 @@ RectTransform:
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: 9207926681424541638}
m_Father: {fileID: 9207926679660501330}
@@ -2827,13 +2854,14 @@ RectTransform:
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: 9207926681519240275}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: 0.000030517578}
+ m_AnchoredPosition: {x: 1268.6028, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &9207926681532248488
diff --git a/Assets/Scripts/CheckServerPush.cs b/Assets/Scripts/CheckServerPush.cs
index 30c1a19e94e94ad0196d06dda1d1ba59aa378bd0..7d52bbead65b378a367d105903c1b5c0399ca2fc 100644
--- a/Assets/Scripts/CheckServerPush.cs
+++ b/Assets/Scripts/CheckServerPush.cs
@@ -15,16 +15,6 @@ public class CheckServerPush : MonoBehaviour, IPointerDownHandler, IPointerUpHan
public int CheckServer_5;
public int CheckServer_6;
- void Start()
- {
-
- }
-
- private void Update()
- {
-
- }
-
public void OnPointerDown(PointerEventData eventData)
{
CheckServerA[0] = CheckServer_0;
@@ -36,6 +26,7 @@ public void OnPointerDown(PointerEventData eventData)
CheckServerA[6] = CheckServer_6;
}
+
public void OnPointerUp(PointerEventData eventData)
{
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs
index f096094ef1261ce2f4e9973b283c520cf0a140a2..f299c9a513dc429e6284689706856d505a8cb82e 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs
@@ -21,7 +21,7 @@ public static Fact AddFactIfNotFound(Fact fact, out bool exists, bool samestep,
return StageStatic.stage.factState[
StageStatic.stage.factState.Add(
fact, out exists, samestep
- , gadget ?? (scroll_label == null ? GadgetManager.activeGadget.GetType() : null)
+ , gadget ?? (scroll_label == null ? GadgetManager.ActiveGadgetInd.GetType() : null)
, scroll_label
)];
}
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs
index 6fac2c6c4c4e50eacf77e4da49e92f37aa66d485..db02c11bc90c05015e78b956ae2c6876371c6be0 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactOrganizer.cs
@@ -32,13 +32,13 @@ public class FactOrganizer : IJSONsavable<FactOrganizer>
/// - <c>Value</c>: <see cref="meta"/>
/// </summary>
[JsonProperty]
- protected internal Dictionary<string, meta> MetaInf = new Dictionary<string, meta>();
+ protected internal Dictionary<string, meta> MetaInf = new();
/// <summary>
/// Keeps track of insertion/ deletion/ etc. operations for <see cref="undo"/> and <see cref="redo"/>
/// </summary>
[JsonProperty]
- protected internal List<stepnote> Workflow = new List<stepnote>();
+ protected internal List<stepnote> Workflow = new();
/// <summary>
/// Notes position in <see cref="Workflow"/> for <see cref="undo"/> and <see cref="redo"/>; the pointed to element is non-acitve
@@ -85,7 +85,7 @@ public class FactOrganizer : IJSONsavable<FactOrganizer>
/// Stores unused <see cref="Fact.LabelId"/> for <see cref="Fact.generateLabel"/>, wich were freed in <see cref="Fact.freeAutoLabel"/> for later reuse to keep naming space compact.
/// </summary>
[JsonProperty]
- protected internal SortedSet<int> UnusedLabelIds = new SortedSet<int>();
+ protected internal SortedSet<int> UnusedLabelIds = new();
// TODO: put this stuff in Interface
/// @{ <summary>
@@ -247,7 +247,7 @@ public static T ReInitializeFactOrganizer<T>
old_to_new = new Dictionary<string, string>();
// initiate
- T target = new T()
+ T target = new()
{
invoke = invoke,
MaxLabelId = source.MaxLabelId,
@@ -441,20 +441,20 @@ public string Add(Fact value, out bool exists, bool samestep, Type gadget, strin
// no longer needed
value.delete();
+ if (exists = MetaInf[key].active) //Fact in Scene?
+ // desired outcome already achieved
+ return key;
+
if (MetaInf[key].workflow_id >= marker)
// check for zombie-status: everything >= marker will be pruned
{
// protect zombie from beeing pruned
- var zombie = Workflow[MetaInf[key].workflow_id];
- zombie.creation = false; // this meta entry will be deleted, but will not trigger deletion
+ stepnote zombie = Workflow[MetaInf[key].workflow_id];
+ zombie.creation = false; // this stepnote entry will be deleted, but will not trigger deletion
Workflow[MetaInf[key].workflow_id] = zombie;
// set new init location
MetaInf[key] = new meta(marker, true, gadget, scroll_label);
}
- // zombies are undead!
- else if (MetaInf[key].active)
- // desired outcome already achieved
- return key;
}
else
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs b/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs
index 7eeef3abac6518db497d70220b849dc3f3253b14..2882016ce1e429a645844d6b1b6e0244a2082f1d 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/GadgetManager.cs
@@ -25,7 +25,8 @@ public class GadgetManager : MonoBehaviour, ISerializationCallbackReceiver
public static float activeGadgetScaleFactor = 1.5f;
- public static int activeGadget;
+ public static Gadget ActiveGadget { get => gadgets[ActiveGadgetInd]; }
+ public static int ActiveGadgetInd;
public static Gadget[] gadgets;
public static Button[] buttons;
@@ -97,7 +98,7 @@ private void Awake()
void Start()
{
- activeGadget = 0;
+ ActiveGadgetInd = 0;
buttons[0].transform.localScale *= activeGadgetScaleFactor;
OnHit = gadgets[0].Hit;
ActivateGadget(0);
@@ -118,23 +119,23 @@ void Update()
offset = (int) Mathf.Sign(Input.GetAxis("Mouse ScrollWheel"));
if (offset != 0)
- ActivateGadget(activeGadget + offset);
+ ActivateGadget(ActiveGadgetInd + offset);
- gadgets[activeGadget].Update();
+ gadgets[ActiveGadgetInd].Update();
}
void OnDisable()
{
if (this != Singelton) return;
- gadgets[activeGadget].Disable();
+ gadgets[ActiveGadgetInd].Disable();
}
void OnEnable()
{
if (this != Singelton) return;
- gadgets[activeGadget].Enable();
+ gadgets[ActiveGadgetInd].Enable();
}
private void CreateButton(int gid)
@@ -156,10 +157,10 @@ public static void ActivateGadget(int gid)
: gid < 0 ? +gadgets.Length : 0;
//buttons[activeGadget].animator.StopPlayback();
- buttons[activeGadget].transform.localScale /= activeGadgetScaleFactor;
- gadgets[activeGadget].Disable();
+ buttons[ActiveGadgetInd].transform.localScale /= activeGadgetScaleFactor;
+ gadgets[ActiveGadgetInd].Disable();
- activeGadget = gid;
+ ActiveGadgetInd = gid;
//buttons[gid].animator.StartPlayback();
buttons[gid].transform.localScale *= activeGadgetScaleFactor;
gadgets[gid].Enable();
diff --git a/Assets/Scripts/InteractionEngine/WorldCursor.cs b/Assets/Scripts/InteractionEngine/WorldCursor.cs
index 4740647fb3055aeb98758302ae09a697b8a5d51c..c34a6e4003bd832c22b8a7db1eb786ce6aff5495 100644
--- a/Assets/Scripts/InteractionEngine/WorldCursor.cs
+++ b/Assets/Scripts/InteractionEngine/WorldCursor.cs
@@ -23,21 +23,21 @@ public class WorldCursor : MonoBehaviour
private void Awake()
{
- this.layerMask = LayerMask.GetMask("Player", "TalkingZone");
//Ignore player and TalkingZone
- this.layerMask = ~this.layerMask;
+ this.layerMask = ~LayerMask.GetMask("Player", "TalkingZone");
}
void Start()
{
Cam = Camera.main;
//Set MarkPointMode as the default ActiveToolMode
- // ActiveToolMode = ToolMode.ExtraMode;//ToolMode.MarkPointMode;
- // CommunicationEvents.ToolModeChangedEvent.Invoke(activeGadget.id);
+ // ActiveToolMode = ToolMode.ExtraMode;//ToolMode.MarkPointMode;
+ // CommunicationEvents.ToolModeChangedEvent.Invoke(activeGadget.id);
CultureInfo.CurrentCulture = new CultureInfo("en-US");
}
- public void setLayerMask(int layerMask) {
+ public void setLayerMask(int layerMask)
+ {
this.layerMask = layerMask;
}
@@ -46,7 +46,7 @@ void Update()
updateMaxRange();
Cam = Camera.main; //WARN: Should not called every Update;
- Vector3 mousePos = new Vector3(0, 0, 0);
+ Vector3 mousePos = new(0, 0, 0);
//************************************************
if (UIconfig.InputManagerVersion == 1)
{
@@ -73,53 +73,31 @@ void Update()
transform.up = Cam.transform.forward;
transform.position = ray.GetPoint(GlobalBehaviour.GadgetPhysicalDistance);
- int rayCastMask = 0;
//************************************************
- bool a = false;
- if (UIconfig.InputManagerVersion == 1)
- {
- //print("123 "+ this.deactivateSnapKey); ToggleCurserSnap leftCtrl
- if (Input.GetButton(this.deactivateSnapKey))
- {
- a = true;
- }
- }
- if (UIconfig.InputManagerVersion == 2 || UIconfig.InputManagerVersion == 3)
- {
- if (Input.GetButton(this.deactivateSnapKey))
- {
- a = true;
- }
- }
-
- if (a)
+ int rayCastMask = this.layerMask;
- rayCastMask = this.layerMask & ~this.snapLayerMask.value;
- else
- rayCastMask = this.layerMask;
+ if (Input.GetButton(this.deactivateSnapKey)
+ && UIconfig.InputManagerVersion >= 1 && UIconfig.InputManagerVersion <= 3)
+ rayCastMask &= ~this.snapLayerMask.value;
//************************************************
if (Physics.Raycast(ray, out Hit, MaxRange_, rayCastMask)
|| (MaxRange_ <= GlobalBehaviour.GadgetPhysicalDistance
&& Physics.Raycast(transform.position, Vector3.down, out Hit, GlobalBehaviour.GadgetPhysicalDistance, rayCastMask)))
{
- Boolean deactSnapKey=false;
+ bool deactSnapKey = false;
if (UIconfig.InputManagerVersion == 1)
{
Input.GetButton(this.deactivateSnapKey);
}
-
+
if ((Hit.collider.transform.CompareTag("SnapZone") || Hit.collider.transform.CompareTag("Selectable"))
- && !deactSnapKey )
- {
- if (Hit.collider.gameObject.layer == LayerMask.NameToLayer("Ray")
- || Hit.collider.gameObject.layer == LayerMask.NameToLayer("Line"))
+ && !deactSnapKey)
+ if (Hit.transform.TryGetComponent<FactObject>(out var obj)
+ && StageStatic.stage.factState[obj.URI] is AbstractLineFact lineFact)
{
- var id = Hit.collider.gameObject.GetComponent<FactObject>().URI;
- AbstractLineFact lineFact = StageStatic.stage.factState[id] as AbstractLineFact;
PointFact p1 = StageStatic.stage.factState[lineFact.Pid1] as PointFact;
-
Hit.point = Math3d.ProjectPointOnLine(p1.Point, lineFact.Dir, Hit.point);
}
else
@@ -128,86 +106,50 @@ void Update()
Hit.normal = Vector3.up;
}
- transform.position = Hit.point;
- transform.up = Hit.normal;
-
- }
- else
- {
- transform.position = Hit.point;
- transform.up = Hit.normal;
- transform.position += .01f * Hit.normal;
- }
+ transform.up = Hit.normal;
+ transform.position = Hit.point + .01f * Hit.normal;
//Link to CheckMouseButtonHandler
- if(whichCheckMouseButton==0){ CheckMouseButtons(); }
- if(whichCheckMouseButton==1){ CheckMouseButtons1(); }
+ if (whichCheckMouseButton == 0) { CheckMouseButtons(); }
+ if (whichCheckMouseButton == 1) { CheckMouseButtons1(); }
}
-
- //for Debugging:
- //print("Maus: ");
- //print(Cursor.lockState);
-
}
void updateMaxRange()
{
- switch (UIconfig.GameplayMode) {
+ switch (UIconfig.GameplayMode)
+ {
case 2:
UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView;
break;
-
case 5:
- UIconfig.interactingRangeMode = InteractingRangeMode.fromCharacterView;
- break;
case 6:
UIconfig.interactingRangeMode = InteractingRangeMode.fromCharacterView;
break;
-
-
default:
break;
-
}
- switch (UIconfig.interactingRangeMode)
+ MaxRange_ = UIconfig.interactingRangeMode switch
{
- case InteractingRangeMode.fromCharacterView:
- MaxRange_ = MaxRange;
- break;
- case InteractingRangeMode.fromObserverView:
- MaxRange_ = cursorMaxRange_fromObeserverView;
- break;
- default:
- //MaxRange_ = cursorMaxRange_fromFirstPersonView
- MaxRange_ = MaxRange;
- break;
-
-
-
-
-
- }
-
-
+ InteractingRangeMode.fromObserverView =>
+ cursorMaxRange_fromObeserverView,
+ InteractingRangeMode.fromCharacterView or _ =>
+ MaxRange,
+ };
}
//Check if left Mouse-Button was pressed and handle it
void CheckMouseButtons()
{
- if (Input.GetMouseButtonDown(0))
- {
- if (EventSystem.current.IsPointerOverGameObject() //this prevents rays from shooting through ui
- || Hit.transform.gameObject.layer == LayerMask.NameToLayer("Water")) // not allowed to meassure on water
- return;
-
+ if (Input.GetMouseButtonDown(0)
+ && !EventSystem.current.IsPointerOverGameObject() //this prevents rays from shooting through ui
+ && Hit.transform.gameObject.layer != LayerMask.NameToLayer("Water")) // not allowed to meassure on water
CommunicationEvents.TriggerEvent.Invoke(Hit);
- }
}
-
//Check if left Mouse-Button was pressed and handle it
//Alternative Version
void CheckMouseButtons1(bool OnSnap = false, bool onLine = false)
@@ -215,7 +157,7 @@ void CheckMouseButtons1(bool OnSnap = false, bool onLine = false)
if (Input.GetMouseButtonDown(0) && checkClickPermission())
{
//other Things todo first?
- if (Hit.collider.transform.CompareTag("NPC1_text") && nextDialogPlease<2)
+ if (Hit.collider.transform.CompareTag("NPC1_text") && nextDialogPlease < 2)
{
nextDialogPlease++;
}
@@ -229,7 +171,7 @@ void CheckMouseButtons1(bool OnSnap = false, bool onLine = false)
{
CommunicationEvents.TriggerEvent.Invoke(Hit);
}
- else if (GadgetManager.activeGadget.GetType() == typeof(UnityEngine.InputSystem.Pointer))
+ else if (GadgetManager.ActiveGadget is Pointer)
{
if (!onLine) Hit.collider.enabled = false;
CommunicationEvents.TriggerEvent.Invoke(Hit);
@@ -239,31 +181,26 @@ void CheckMouseButtons1(bool OnSnap = false, bool onLine = false)
}
private bool checkLayerAndTags()
- {
- if (Hit.transform.gameObject.layer == LayerMask.NameToLayer("Water")) return false; // not allowed to meassure on water
- if (Hit.collider.transform.CompareTag("NPC1_text")) return false; // not allowed to meassure on textfields
-
- return true;
- }
-
+ => Hit.transform.gameObject.layer != LayerMask.NameToLayer("Water") // not allowed to meassure on water
+ && !Hit.collider.transform.CompareTag("NPC1_text"); // not allowed to meassure on textfields
private bool IsPointerOverUIObject()
{
- PointerEventData eventDataCurrentPosition = new PointerEventData(EventSystem.current);
- eventDataCurrentPosition.position = new Vector2(Input.mousePosition.x, Input.mousePosition.y);
- List<RaycastResult> results = new List<RaycastResult>();
+ PointerEventData eventDataCurrentPosition = new(EventSystem.current)
+ {
+ position = new Vector2(Input.mousePosition.x, Input.mousePosition.y)
+ };
+ List<RaycastResult> results = new();
EventSystem.current.RaycastAll(eventDataCurrentPosition, results);
return results.Count > 0;
}
- public bool checkClickPermission()
- {
- if (UIconfig.CanvasOnOff_Array[14] > 0)
- {
- return true;
- }
- //return false; //todo
- return true;
- }
+ public bool checkClickPermission() => true;
+ //{
+ // if (UIconfig.CanvasOnOff_Array[14] > 0)
+ // return true;
+ // //return false; //todo
+ // return true;
+ //}
}
diff --git a/Assets/Scripts/Loading/Loader.cs b/Assets/Scripts/Loading/Loader.cs
index 6ebc2bc5483ff6e4529d4dbb39c58aec787de8ac..5dba6d61f38870bc2c7aeb3b51dac35daab4ecfc 100644
--- a/Assets/Scripts/Loading/Loader.cs
+++ b/Assets/Scripts/Loading/Loader.cs
@@ -24,13 +24,9 @@ public static float progress {
}
/// <summary>
- /// <c>return <see cref="loadingscene"/> == null ? <see langword="true"/> : <see cref="loadingscene"/>.isDone;</c>
+ /// <c>return <see cref="loadingscene"/> == null || <see cref="loadingscene"/>.isDone;</c>
/// </summary>
- public static bool isDone {
- get {
- return loadingscene == null ? true : loadingscene.isDone;
- }
- }
+ public static bool isDone { get => loadingscene == null || loadingscene.isDone; }
/// <summary>
/// Tries to init (via <see cref="StageStatic.LoadInitStage(string, bool, bool, GameObject)"/>) defined <see cref="Stage"/> and load it (via <see cref="LoadScene(string)"/>).
diff --git a/Assets/Scripts/UI/InGame/ToolmodeSelector_bttn_mobile.cs b/Assets/Scripts/UI/InGame/ToolmodeSelector_bttn_mobile.cs
index f8e76e04439b129a9def059695ae3cfa7496914c..7f3d44dd84e37f54317e03604165358bbccda1e3 100644
--- a/Assets/Scripts/UI/InGame/ToolmodeSelector_bttn_mobile.cs
+++ b/Assets/Scripts/UI/InGame/ToolmodeSelector_bttn_mobile.cs
@@ -8,8 +8,8 @@
public class ToolmodeSelector_bttn_mobile : MonoBehaviour
{
public void Tool_nextright()
- => GadgetManager.ActivateGadget(GadgetManager.activeGadget + 1);
+ => GadgetManager.ActivateGadget(GadgetManager.ActiveGadgetInd + 1);
public void Tool_nextleft()
- => GadgetManager.ActivateGadget(GadgetManager.activeGadget - 1);
+ => GadgetManager.ActivateGadget(GadgetManager.ActiveGadgetInd - 1);
}
\ No newline at end of file
diff --git a/GlobalSuppressions.cs b/GlobalSuppressions.cs
index 879fd3ed36a1f9db19e5c78e22104632606c243d..30971bbbc8611210ece112be43d8142be06bb5cf 100644
--- a/GlobalSuppressions.cs
+++ b/GlobalSuppressions.cs
@@ -7,9 +7,8 @@
//Global
[assembly: SuppressMessage("Style", "IDE1006:Benennungsstile", Justification = "<Ausstehend>")]
-[assembly: SuppressMessage("Style", "IDE0090:\"new(...)\" verwenden", Justification = "Unity will fail")]
+[assembly: SuppressMessage("Style", "IDE0034:Simplify 'default' expression", Justification = "Readabilty")]
//Local
[assembly: SuppressMessage("Style", "IDE0018:Inlinevariablendeklaration", Justification = "Readability", Scope = "member", Target = "~M:Math3d.GetLineSplineIntersections(UnityEngine.Vector2[],UnityEngine.Vector2[])")]
[assembly: SuppressMessage("Style", "IDE0018:Inlinevariablendeklaration", Justification = "Readability", Scope = "member", Target = "~M:Math3d.AreLineSegmentsCrossing(UnityEngine.Vector3,UnityEngine.Vector3,UnityEngine.Vector3,UnityEngine.Vector3)~System.Boolean")]
-[assembly: SuppressMessage("Style", "IDE0075:Bedingten Ausdruck vereinfachen", Justification = "Readability", Scope = "member", Target = "~P:Loader.isDone")]
diff --git a/GlobalSuppressions2.cs b/GlobalSuppressions2.cs
deleted file mode 100644
index 496b77e3fcf2119ba29c360ed0c3bf213256f33d..0000000000000000000000000000000000000000
--- a/GlobalSuppressions2.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is used by Code Analysis to maintain SuppressMessage
-// attributes that are applied to this project.
-// Project-level suppressions either have no target or are given
-// a specific target and scoped to a namespace, type, member, etc.
-
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage("Style", "IDE0034:Simplify 'default' expression", Justification = "Readabilty", Scope = "member", Target = "~M:IJSONsavable`1.load(System.Collections.Generic.List{CommunicationEvents.Directories},System.String,`0@,System.Boolean,System.Boolean,System.Boolean)~System.Boolean")]
-[assembly: SuppressMessage("Style", "IDE0034:Simplify 'default' expression", Justification = "<Pending>", Scope = "member", Target = "~M:JSONsavable.ReadFromJsonFile``1(``0@,System.String)~System.Boolean")]