diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index 031950c7d58411fa81089040ecc8e24cc9367d7d..8be167d0e88909a41f859bca7eaa9b6633d32fad 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -472,7 +472,7 @@ Camera:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6341032511684407557}
- m_Enabled: 1
+ m_Enabled: 0
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
@@ -1733,12 +1733,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1331047304808510126}
m_PrefabAsset: {fileID: 0}
---- !u!20 &729594253173990396 stripped
-Camera:
- m_CorrespondingSourceObject: {fileID: 1754396572260503890, guid: 1a0e8fc4bd33d48489e21d111c3a57e4,
- type: 3}
- m_PrefabInstance: {fileID: 1331047304808510126}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1279275608347844781 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 268019273589264899, guid: 1a0e8fc4bd33d48489e21d111c3a57e4,
@@ -1751,6 +1745,18 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1331047304808510126}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &4266248851377668361 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 2975778479411491751, guid: 1a0e8fc4bd33d48489e21d111c3a57e4,
+ type: 3}
+ m_PrefabInstance: {fileID: 1331047304808510126}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f9f5830f10fd93c499033f416ccf504e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &6501516846063548396 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5206956559746188610, guid: 1a0e8fc4bd33d48489e21d111c3a57e4,
@@ -2909,6 +2915,26 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 4266248851377668361}
+ - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: changePosition
+ objectReference: {fileID: 0}
+ - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: PointAndClick_changeCam, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 1605864924523844710, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
- target: {fileID: 1611472016343752370, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc,
type: 3}
propertyPath: m_FlexibleHeight
@@ -3611,7 +3637,7 @@ PrefabInstance:
type: 3}
propertyPath: Cam1
value:
- objectReference: {fileID: 729594253173990396}
+ objectReference: {fileID: 7088713184437111127}
- target: {fileID: 6999573640440716764, guid: 8590393c51194934a95cdc2075fc4dec,
type: 3}
propertyPath: Cam2
diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
index 481724a1081855f051847f0bad35a22b46b73844..e31b2c2271febad1e3b8bf51de0193ed6cc88992 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
@@ -385,6 +385,141 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1312545848644489742
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2019108164860055462}
+ - component: {fileID: 812070716982326087}
+ - component: {fileID: 867180513878542349}
+ - component: {fileID: 1605864924523844710}
+ m_Layer: 5
+ m_Name: SwitchCamera_Bttn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2019108164860055462
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1312545848644489742}
+ 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: 9170108318488324908}
+ m_Father: {fileID: 2252479989828166401}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.8463106, y: 0.4064447}
+ m_AnchorMax: {x: 1, y: 0.5222793}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &812070716982326087
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1312545848644489742}
+ m_CullTransparentMesh: 1
+--- !u!114 &867180513878542349
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1312545848644489742}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 30e6e468ea9441348abbb90112b7807d, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1605864924523844710
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1312545848644489742}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34,
+ type: 3}
+ m_PressedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3}
+ m_SelectedSprite: {fileID: 21300000, guid: 56fafe590cdef394b984ca77c5a26f34, type: 3}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 867180513878542349}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 0}
+ m_TargetAssemblyTypeName:
+ m_MethodName:
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName:
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &1709323068994073905
GameObject:
m_ObjectHideFlags: 0
@@ -2073,6 +2208,107 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Button
+--- !u!1 &5064961923267230209
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2252479989828166401}
+ - component: {fileID: 5610515614069067121}
+ - component: {fileID: 3153660507764185559}
+ - component: {fileID: 5400571071174051820}
+ m_Layer: 5
+ m_Name: MathMenue1_bttn_onoff_0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2252479989828166401
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5064961923267230209}
+ 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: 2019108164860055462}
+ m_Father: {fileID: 118299968777129975}
+ 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 &5610515614069067121
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5064961923267230209}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &3153660507764185559
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5064961923267230209}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 1
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 1920, y: 1080}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!114 &5400571071174051820
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5064961923267230209}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &5169543494579483684
GameObject:
m_ObjectHideFlags: 0
@@ -2219,6 +2455,59 @@ MonoBehaviour:
m_Text: 'Pause
'
+--- !u!1 &5594427878834005957
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 118299968777129975}
+ - component: {fileID: 695663164670639176}
+ m_Layer: 0
+ m_Name: MathMenue1_Bttn_onoff_"17"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &118299968777129975
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5594427878834005957}
+ 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: 2252479989828166401}
+ m_Father: {fileID: 7108271756006176728}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -162.86841, y: -202.24045}
+ m_SizeDelta: {x: -1920, y: -1080}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &695663164670639176
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5594427878834005957}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3e3281ba7462a8a4dad1ea188ed30a8a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ myself_GObj: {fileID: 5594427878834005957}
+ myUI_ID: 17
+ default_value: 1
--- !u!1 &6449084213387415065
GameObject:
m_ObjectHideFlags: 0
@@ -2844,6 +3133,7 @@ RectTransform:
- {fileID: 1072986785082259522}
- {fileID: 1124259054666192576}
- {fileID: 3510664950835701341}
+ - {fileID: 118299968777129975}
m_Father: {fileID: 3129303587586972547}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3054,7 +3344,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.86200005, y: 0.1971348}
m_AnchorMax: {x: 1, y: 0.338}
- m_AnchoredPosition: {x: 0, y: 0.000015258789}
+ m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4153346424924443774
@@ -3396,6 +3686,86 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Toolmode
+--- !u!1 &8667786625271979614
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9170108318488324908}
+ - component: {fileID: 210198543683894619}
+ - component: {fileID: 5843960459232639639}
+ m_Layer: 5
+ m_Name: TextUPress
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &9170108318488324908
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8667786625271979614}
+ 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: 2019108164860055462}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &210198543683894619
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8667786625271979614}
+ m_CullTransparentMesh: 1
+--- !u!114 &5843960459232639639
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8667786625271979614}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 80
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 8
+ m_MaxSize: 80
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Camera
--- !u!1 &8841243489745293715
GameObject:
m_ObjectHideFlags: 0
@@ -3989,6 +4359,36 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 80
objectReference: {fileID: 0}
+ - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 173290219472098764, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 676657214403543027, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: m_SizeDelta.x
@@ -4039,6 +4439,41 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -50
objectReference: {fileID: 0}
+ - target: {fileID: 3716020922907832516, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3853195430673864773, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4335843193789688460, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -4049,6 +4484,16 @@ PrefabInstance:
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: FavoritesFilterChanged
objectReference: {fileID: 0}
+ - target: {fileID: 6500467619489830996, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6500467619489830996, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -0.0009765625
+ objectReference: {fileID: 0}
- target: {fileID: 7093782584270134969, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: m_SizeDelta.x
@@ -4064,6 +4509,41 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7849991043249968125, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7849991044057810015, guid: 292834880e6f0e54186b873acc62d3f2,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7989559431199338490, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: m_SizeDelta.y
@@ -4117,7 +4597,7 @@ PrefabInstance:
- target: {fileID: 8004702056709666223, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: m_Value
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8004702057932254674, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
diff --git a/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab b/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab
index 8664a786210f2b88fc6d73476a7016996c8c9709..5b4cc033bf34175f402526254af4d61525fc3af9 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/MainPlayer-Mode_Ctrl.prefab
@@ -3421,14 +3421,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4384881478717095523}
- m_LocalRotation: {x: 0.077691905, y: -0.88292736, z: 0.15754357, w: 0.43541166}
+ m_LocalRotation: {x: 0.04494348, y: -0.95125127, z: 0.25488704, w: 0.16773133}
m_LocalPosition: {x: 1, y: 8, z: 1.16}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6806963106110361545}
m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 20.234, y: -127.5, z: 0}
+ m_LocalEulerAnglesHint: {x: 30, y: -160, z: 0}
--- !u!1 &4513941255093480006
GameObject:
m_ObjectHideFlags: 0
@@ -3556,6 +3556,37 @@ MonoBehaviour:
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
+--- !u!1 &4596250131129813448
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1410994708477547899}
+ m_Layer: 0
+ m_Name: PositionMarker_3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1410994708477547899
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4596250131129813448}
+ m_LocalRotation: {x: -0.02980903, y: -0.9361168, z: 0.08189964, w: -0.3407186}
+ m_LocalPosition: {x: -1, y: 3, z: -1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 6806963106110361545}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 10, y: -220, z: 0}
--- !u!1 &5033669807516141706
GameObject:
m_ObjectHideFlags: 0
@@ -4948,6 +4979,7 @@ Transform:
- {fileID: 2988050584347158257}
- {fileID: 3358465699572459204}
- {fileID: 1224194708071738779}
+ - {fileID: 1410994708477547899}
m_Father: {fileID: 788784678299909003}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5331,6 +5363,7 @@ MonoBehaviour:
myCamera_GObj: {fileID: 7545078084332931977}
Position1_GObj: {fileID: 9090466938236267057}
Position2_GObj: {fileID: 4384881478717095523}
+ Position3_GObj: {fileID: 4596250131129813448}
--- !u!1 &7609179632986660383
GameObject:
m_ObjectHideFlags: 3
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
index 097eef5cee8d4b31a1e8ed51edc90e10d25439a1..b810524624a293cd5ff31d3600a1d53881ee24c1 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
@@ -72,6 +72,7 @@ public enum GadgetIDs
/// <remarks>Set in Inspector or <see cref="Awake"/></remarks>
public float MaxRange = float.NegativeInfinity;
public float MaxHeight = float.NegativeInfinity;
+ private float NewMaxRange = float.NegativeInfinity;
/// <summary>Which sprite to use</summary>
public int ButtonIndx = -1;
@@ -165,8 +166,7 @@ public void Awake()
public void Enable()
{
GadgetBehaviour.Cursor.setLayerMask(~IgnoreLayerMask.value);
- GadgetBehaviour.Cursor.MaxRange = MaxRange;
-
+ _Update_Range();
ResetGadget();
_Enable();
}
@@ -186,7 +186,8 @@ public void Update()
UpdateLineDrawing();
_Update();
- }
+
+}
public void Hit(RaycastHit[] hit)
{
@@ -250,5 +251,7 @@ public void ResetGadget()
protected virtual void _ResetGadget() { }
+ protected virtual void _Update_Range() { NewMaxRange = MaxRange; GadgetBehaviour.Cursor.MaxRange = NewMaxRange; }
+
public class UndefinedGadget : Gadget { }
}
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
index 9e3495458eaf6b8e9dc5f4df463d172cdfe01860..b2746c71c60476ce6ecd0d6187168b3ea75a37d4 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
@@ -54,4 +54,19 @@ protected override void _UpdateLineDrawing()
{
SetPosition(1, GadgetBehaviour.Cursor.transform.position);
}
+
+
+
+ protected override void _Update_Range()
+ {
+ float NewMaxRange = UIconfig.interactingRangeMode switch
+ {
+ UIconfig.InteractingRangeMode.fromObserverView =>
+ UIconfig.cursorMaxRange_fromObeserverView,
+ UIconfig.InteractingRangeMode.fromCharacterView or _ =>
+ MaxRange,
+ };
+ GadgetBehaviour.Cursor.MaxRange = NewMaxRange;
+ Debug.Log("MaxRange :" + NewMaxRange);
+ }
}
\ No newline at end of file
diff --git a/Assets/Scripts/InteractionEngine/WorldCursor.cs b/Assets/Scripts/InteractionEngine/WorldCursor.cs
index 0a2e1c9d4b55a6f6e03d5b4b14a84e70eb4fb5f2..069beae959f5c829208109bcd2803ebdc372d136 100644
--- a/Assets/Scripts/InteractionEngine/WorldCursor.cs
+++ b/Assets/Scripts/InteractionEngine/WorldCursor.cs
@@ -254,7 +254,7 @@ void Update()
//Link to CheckMouseButtonHandler
if (whichCheckMouseButton == 0) { CheckMouseButtons(); }
if (whichCheckMouseButton == 1) { CheckMouseButtons1(); }
-
+
}
@@ -283,6 +283,8 @@ void updateMaxRange()
MaxRange,
};
+ Debug.Log("WorldCursorMaxRange :" + MaxRange_);
+
}
diff --git a/Assets/Scripts/UI/HideUI_mobile.cs b/Assets/Scripts/UI/HideUI_mobile.cs
index ea14e4c2b975d90fb628ea648ff62aca2e06a174..9a023f567881d76d4206a7a2c85da626a2717882 100644
--- a/Assets/Scripts/UI/HideUI_mobile.cs
+++ b/Assets/Scripts/UI/HideUI_mobile.cs
@@ -224,14 +224,25 @@ void CheckUI_Vis_walk()
uiccm = 0;
break;
}
-
-
- UIconfig.CanvasOnOff_Array[11] = uiccm;
- UIconfig.CanvasOnOff_Array[12] = uiccm;
- UIconfig.CanvasOnOff_Array[13] = uiccm;
- UIconfig.CanvasOnOff_Array[15] = uiccm;
- UIconfig.CanvasOnOff_Array[17] = uiccm;
- UIconfig.CanvasOnOff_Array[18] = uiccm;
+
+ switch(GameplayMode){
+ case 2:
+ UIconfig.CanvasOnOff_Array[11] = 0;
+ UIconfig.CanvasOnOff_Array[17] = 1;
+ break;
+ default:
+ UIconfig.CanvasOnOff_Array[11] = uiccm;
+ UIconfig.CanvasOnOff_Array[12] = uiccm;
+ UIconfig.CanvasOnOff_Array[13] = uiccm;
+ UIconfig.CanvasOnOff_Array[15] = uiccm;
+ UIconfig.CanvasOnOff_Array[17] = 0;
+ UIconfig.CanvasOnOff_Array[18] = uiccm;
+
+ break;
+
+
+ }
+
}
void setUI_Vis_walk(int a)
{
diff --git a/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs b/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs
index 9500eb462b171b066454a0fb02e54b7ae83c94c1..c36c306ba8652fc320c5052cecf8d7a665e57fe4 100644
--- a/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs
+++ b/Assets/Scripts/UI/InGame/PointAndClick_changeCam.cs
@@ -21,9 +21,10 @@ public class PointAndClick_changeCam : MonoBehaviour
public GameObject Position1_GObj;
public GameObject Position2_GObj;
+ public GameObject Position3_GObj;
-
+ private int Position=1;
@@ -31,14 +32,36 @@ void Start()
{
myCamera_GObj.transform.position = Position1_GObj.transform.position;
myCamera_GObj.transform.rotation = Position1_GObj.transform.rotation;
+
}
private void Update()
{
- if (GameplayMode==2)
- {
- //Position1_GObj.
+ }
+
+ public void changePosition()
+ {
+ Position++;
+ switch (Position)
+ {
+ case 1:
+ myCamera_GObj.transform.position = Position1_GObj.transform.position;
+ myCamera_GObj.transform.rotation = Position1_GObj.transform.rotation;
+ break;
+ case 2:
+ myCamera_GObj.transform.position = Position2_GObj.transform.position;
+ myCamera_GObj.transform.rotation = Position2_GObj.transform.rotation;
+ break;
+ case 3:
+ myCamera_GObj.transform.position = Position3_GObj.transform.position;
+ myCamera_GObj.transform.rotation = Position3_GObj.transform.rotation;
+ break;
+ default:
+ myCamera_GObj.transform.position = Position1_GObj.transform.position;
+ myCamera_GObj.transform.rotation = Position1_GObj.transform.rotation;
+ Position = 1;
+ break;
}
}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 79deb82ac5dcb444f58d8824d3e6ad23fea8b151..c43cd6932858c8ba843da937193c297ecb1472a5 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -18,10 +18,10 @@ EditorUserSettings:
value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
flags: 0
RecentlyUsedSceneGuid-4:
- value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
+ value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
flags: 0
RecentlyUsedSceneGuid-5:
- value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
+ value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c681f041b1c39631c3435281e1221eee47a2decee22f0