From 4c4ad432dfc3466c7f984b71d41135ecb1dc1235 Mon Sep 17 00:00:00 2001 From: esteb Date: Wed, 25 Jan 2023 09:47:28 +0100 Subject: [PATCH] test --- Assets/AnimatorController/CardDownToUp.anim | 71 +- Assets/AnimatorController/CardUpToDown.anim | 8 +- Assets/Scenes/SceneUnity.unity | 691 +++++++++++++++++++- Assets/Scripts/SwipeManagementScript.cs | 34 +- Assets/Scripts/UIRotation.cs | 31 + Assets/Scripts/UIRotation.cs.meta | 11 + 6 files changed, 814 insertions(+), 32 deletions(-) create mode 100644 Assets/Scripts/UIRotation.cs create mode 100644 Assets/Scripts/UIRotation.cs.meta diff --git a/Assets/AnimatorController/CardDownToUp.anim b/Assets/AnimatorController/CardDownToUp.anim index 1a3a8b6..8477438 100644 --- a/Assets/AnimatorController/CardDownToUp.anim +++ b/Assets/AnimatorController/CardDownToUp.anim @@ -41,7 +41,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -850 + value: -821 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -50,7 +50,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -251 + value: -551.6248 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -120,6 +120,34 @@ AnimationClip: path: StepUp classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -549.50073 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -532.75037 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: Card + classID: 224 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -149,6 +177,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3055957997 + attribute: 38095219 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 - serializedVersion: 2 path: 3055957997 attribute: 1460864421 @@ -202,7 +237,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -850 + value: -821 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -211,7 +246,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -251 + value: -551.6248 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -281,6 +316,34 @@ AnimationClip: path: StepUp classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -549.50073 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -532.75037 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: Card + classID: 224 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/AnimatorController/CardUpToDown.anim b/Assets/AnimatorController/CardUpToDown.anim index d9edc00..620463b 100644 --- a/Assets/AnimatorController/CardUpToDown.anim +++ b/Assets/AnimatorController/CardUpToDown.anim @@ -41,7 +41,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -248 + value: -560 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -50,7 +50,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -612 + value: -821 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -132,7 +132,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -248 + value: -560 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -141,7 +141,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -612 + value: -821 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Scenes/SceneUnity.unity b/Assets/Scenes/SceneUnity.unity index d2e04cd..1437347 100644 --- a/Assets/Scenes/SceneUnity.unity +++ b/Assets/Scenes/SceneUnity.unity @@ -123,6 +123,82 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &18785786 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 18785787} + - component: {fileID: 18785789} + - component: {fileID: 18785788} + m_Layer: 0 + m_Name: Card + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &18785787 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 18785786} + 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: 1485738204} + 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.0010986328, y: -676} + m_SizeDelta: {x: -0.0018921, y: -549.50073} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &18785788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 18785786} + 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: 29b9fed20a1cffc42b9321066b39b4f1, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &18785789 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 18785786} + m_CullTransparentMesh: 1 --- !u!1 &66997302 GameObject: m_ObjectHideFlags: 0 @@ -245,6 +321,82 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &146266205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 146266206} + - component: {fileID: 146266208} + - component: {fileID: 146266207} + m_Layer: 5 + m_Name: Image1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &146266206 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146266205} + 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: 1991921275} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.3209, y: -189} + m_SizeDelta: {x: 250, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &146266207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146266205} + 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: 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: 078f09d39f9c5974a9650c48b34501df, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &146266208 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146266205} + m_CullTransparentMesh: 1 --- !u!1 &158481925 GameObject: m_ObjectHideFlags: 0 @@ -422,6 +574,94 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 160980503} m_PrefabAsset: {fileID: 0} +--- !u!1 &163827375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 163827376} + - component: {fileID: 163827378} + - component: {fileID: 163827377} + m_Layer: 5 + m_Name: Image6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &163827376 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163827375} + 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: 1991921275} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.3209, y: -189} + m_SizeDelta: {x: 250, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &163827377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163827375} + 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: 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: efa14bf87b9554f4b8cc84f358f8d957, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &163827378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163827375} + m_CullTransparentMesh: 1 +--- !u!114 &345733488 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5821719086914230126, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + m_PrefabInstance: {fileID: 1991921274} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &653685966 PrefabInstance: m_ObjectHideFlags: 0 @@ -432,7 +672,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 7f57bc202b3859e4bb66a78bbf3b8f0c, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 7f57bc202b3859e4bb66a78bbf3b8f0c, type: 3} @@ -552,8 +792,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.0009765625, y: -896} - m_SizeDelta: {x: -0.00177, y: -625.70996} + m_AnchoredPosition: {x: -0.0010986328, y: -676} + m_SizeDelta: {x: -0.0018921, y: -549.50073} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &662304528 MonoBehaviour: @@ -758,7 +998,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1951036952} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!212 &696063653 SpriteRenderer: @@ -924,6 +1164,82 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &758029550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 758029551} + - component: {fileID: 758029553} + - component: {fileID: 758029552} + m_Layer: 5 + m_Name: Image9 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &758029551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758029550} + 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: 1991921275} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.3209, y: -189} + m_SizeDelta: {x: 250, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &758029552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758029550} + 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: 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: 8a209369adf5d65468616d69706e216a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &758029553 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758029550} + m_CullTransparentMesh: 1 --- !u!1 &758280431 GameObject: m_ObjectHideFlags: 0 @@ -2223,6 +2539,108 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1485738203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1485738204} + - component: {fileID: 1485738208} + - component: {fileID: 1485738207} + - component: {fileID: 1485738206} + m_Layer: 0 + m_Name: Canvas2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1485738204 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485738203} + 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: 18785787} + - {fileID: 1991921275} + m_Father: {fileID: 1951036952} + 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!114 &1485738206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485738203} + 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!114 &1485738207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485738203} + 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: 800, y: 480} + m_ScreenMatchMode: 1 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1485738208 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485738203} + 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: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1510216485 GameObject: m_ObjectHideFlags: 0 @@ -2350,6 +2768,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!1 &1551230297 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5821719087081207328, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + m_PrefabInstance: {fileID: 2109574964} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1552380353 PrefabInstance: m_ObjectHideFlags: 0 @@ -2470,12 +2894,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1668576296} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -122.5, y: -200.59996, z: -441.00012} + m_LocalPosition: {x: -122.5, y: -200.59998, z: -441.0001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1951036952} - m_RootOrder: 1 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1668576298 MonoBehaviour: @@ -2491,6 +2915,10 @@ MonoBehaviour: m_EditorClassIdentifier: header: {fileID: 2012859549} textSteps: {fileID: 2109574969} + textNumber: {fileID: 2109574965} + header2: {fileID: 1839626739} + textSteps2: {fileID: 2064593167} + textNumber2: {fileID: 345733488} lengths: - {fileID: 7258324625842614780, guid: 4ead936c2f2085d48b81defe274f569a, type: 3} - {fileID: 0} @@ -2514,11 +2942,8 @@ MonoBehaviour: arrowXY: {fileID: 160980505} arrowHB: {fileID: 1885323132} arrowPause: {fileID: 966995047} - circleXY: {fileID: 0} - circleHB: {fileID: 0} warning: {fileID: 696063651} m_Animator: {fileID: 1799515030} - textNumber: {fileID: 2109574965} images: 010000000600000009000000 --- !u!1 &1688187131 GameObject: @@ -2711,6 +3136,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1839626739 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5821719087894395799, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + m_PrefabInstance: {fileID: 1991921274} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1885323130 PrefabInstance: m_ObjectHideFlags: 0 @@ -2823,7 +3260,8 @@ GameObject: - component: {fileID: 1951036952} - component: {fileID: 1951036951} - component: {fileID: 1951036950} - - component: {fileID: 1951036953} + - component: {fileID: 1951036954} + - component: {fileID: 1951036955} m_Layer: 0 m_Name: ImageTargetQR m_TagString: Untagged @@ -2901,7 +3339,7 @@ MonoBehaviour: mMotionHint: 1 mTrackingOptimization: 0 mTrackingOptimizationNeedsUpgrade: 0 - mPreview: {fileID: 1951036953} + mPreview: {fileID: 1951036954} --- !u!4 &1951036952 Transform: m_ObjectHideFlags: 0 @@ -2915,17 +3353,18 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1799515034} - - {fileID: 1668576297} - - {fileID: 653685967} + - {fileID: 1485738204} - {fileID: 696063652} + - {fileID: 653685967} - {fileID: 2097548653} - {fileID: 160980504} - {fileID: 1885323131} - {fileID: 966995046} + - {fileID: 1668576297} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1951036953 +--- !u!114 &1951036954 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2944,6 +3383,212 @@ MonoBehaviour: mCastedBehaviour: {fileID: 1951036951} mMeshFilter: {fileID: 0} mMeshRenderer: {fileID: 0} +--- !u!114 &1951036955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951036948} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb7cf8eb89ab2f04abd56e9f96fcc1d5, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas1: {fileID: 1799515029} + canvas2: {fileID: 1485738203} + stepup1: {fileID: 1551230297} + card1: {fileID: 18785786} +--- !u!1001 &1991921274 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1485738204} + m_Modifications: + - target: {fileID: 5821719086244079849, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -179 + objectReference: {fileID: 0} + - target: {fileID: 5821719086660221787, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -184 + objectReference: {fileID: 0} + - target: {fileID: 5821719086914230127, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -283 + objectReference: {fileID: 0} + - target: {fileID: 5821719086914230127, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -44 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207328, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_Name + value: StepUp + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207328, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_SizeDelta.x + value: -0.00012207 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_SizeDelta.y + value: 317.14502 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.001953125 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 53 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5821719087894395792, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 5821719087894395799, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_fontSize + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 5821719087894395799, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_margin.x + value: -131.9449 + objectReference: {fileID: 0} + - target: {fileID: 5821719087894395799, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_margin.z + value: -165.66415 + objectReference: {fileID: 0} + - target: {fileID: 5821719087894395799, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_fontSizeBase + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 5821719088261255317, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_fontSize + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5821719088261255317, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_fontSizeBase + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5821719088261255318, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -184 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cdb3b2e138a04d04ca68c043935c30f0, type: 3} +--- !u!224 &1991921275 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + m_PrefabInstance: {fileID: 1991921274} + m_PrefabAsset: {fileID: 0} --- !u!114 &2012859549 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5821719087894395799, guid: cdb3b2e138a04d04ca68c043935c30f0, @@ -2956,6 +3601,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &2064593167 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5821719088261255317, guid: cdb3b2e138a04d04ca68c043935c30f0, + type: 3} + m_PrefabInstance: {fileID: 1991921274} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2097548652 PrefabInstance: m_ObjectHideFlags: 0 @@ -3137,7 +3794,7 @@ PrefabInstance: - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, type: 3} propertyPath: m_SizeDelta.y - value: 0.000061035 + value: 317.14502 objectReference: {fileID: 0} - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, type: 3} @@ -3177,12 +3834,12 @@ PrefabInstance: - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.0019226074 + value: -0.001953125 objectReference: {fileID: 0} - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -156 objectReference: {fileID: 0} - target: {fileID: 5821719087081207335, guid: cdb3b2e138a04d04ca68c043935c30f0, type: 3} diff --git a/Assets/Scripts/SwipeManagementScript.cs b/Assets/Scripts/SwipeManagementScript.cs index 9b44ea3..5da63c3 100644 --- a/Assets/Scripts/SwipeManagementScript.cs +++ b/Assets/Scripts/SwipeManagementScript.cs @@ -9,6 +9,12 @@ public class SwipeManagementScript : MonoBehaviour { public TMP_Text header; public TMP_Text textSteps; + public TMP_Text textNumber; + + public TMP_Text header2; + public TMP_Text textSteps2; + public TMP_Text textNumber2; + public List lengths; public int numberImage; public int lengthTexts; @@ -22,14 +28,10 @@ public class SwipeManagementScript : MonoBehaviour public GameObject arrowHB; public GameObject arrowPause; - public GameObject circleXY; - public GameObject circleHB; - public GameObject warning; public Animator m_Animator; - public TMP_Text textNumber; public List images; @@ -37,15 +39,17 @@ public class SwipeManagementScript : MonoBehaviour private Vector2 endTouchPosition; private GameObject image; - private Image imageUI; // Start is called before the first frame update void Start() { header.text = "Allumer la Speedy 100"; + header2.text = "Allumer la Speedy 100"; textSteps.text = lengths[0].text; + textSteps2.text = lengths[0].text; textNumber.text = "Step 1/" + (lengthTexts+1); + textNumber2.text = "Step 1/" + (lengthTexts+1); arrowLeft.gameObject.SetActive(false); } @@ -62,63 +66,73 @@ public class SwipeManagementScript : MonoBehaviour }else{ PreviousText(); } - if(endTouchPosition.y + 100 < startTouchPosition.y){ + if(endTouchPosition.y + 80 < startTouchPosition.y){ SwipeDown(); } - if(endTouchPosition.y - 100 > startTouchPosition.y){ + if(endTouchPosition.y - 80 > startTouchPosition.y){ SwipeUp(); } } if(numberImage == 1){ header.text = "Pour rappel : "; + header2.text = "Pour rappel : "; arrow.SetActive(true); warning.SetActive(false); } if(numberImage == 2) { header.text = "Initialisation : Sécurité"; + header2.text = "Initialisation : Sécurité"; arrow.SetActive(false); warning.SetActive(true); } if(numberImage == 3) { header.text = "Initialisation : Positionnement automatique"; + header2.text = "Initialisation : Positionnement automatique"; warning.SetActive(false); } if(numberImage == 4) { header.text = "Placer la pièce à graver"; + header2.text = "Placer la pièce à graver"; arrowGravure.SetActive(true); arrowXY.SetActive(false); } if(numberImage == 5) { header.text = "Mise au point : Tête de traitement"; + header2.text = "Mise au point : Tête de traitement"; arrowGravure.SetActive(false); arrowXY.SetActive(true); } if(numberImage == 7) { header.text = "Mise au point : Outil focal"; + header2.text = "Mise au point : Outil focal"; arrowXY.SetActive(false); arrowHB.SetActive(false); } if(numberImage == 8){ header.text = "Mise au point : Table de gravure"; + header2.text = "Mise au point : Table de gravure"; arrowHB.SetActive(true); } if(numberImage == 10){ header.text = "Mise au point : Position du laser"; + header2.text = "Mise au point : Position du laser"; arrowHB.SetActive(false); arrowXY.SetActive(true); } if(numberImage == 11){ header.text = "Procédure sur ordinateur"; + header2.text = "Procédure sur ordinateur"; arrowXY.SetActive(false); arrowPause.SetActive(false); } if(numberImage == 12){ header.text = "Suivre la découpe"; + header2.text = "Suivre la découpe"; arrowPause.SetActive(true); } } @@ -142,7 +156,9 @@ public class SwipeManagementScript : MonoBehaviour SetImageStep(); }else{ textSteps.text = lengths[numberImage].text; + textSteps2.text = lengths[numberImage].text; textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); + textNumber2.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); } } } @@ -165,7 +181,9 @@ public class SwipeManagementScript : MonoBehaviour SetImageStep(); }else{ textSteps.text = lengths[numberImage].text; + textSteps2.text = lengths[numberImage].text; textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); + textNumber2.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); } } } @@ -181,7 +199,9 @@ public class SwipeManagementScript : MonoBehaviour private void SetImageStep(){ textSteps.text = ""; + textSteps2.text = ""; textNumber.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); + textNumber2.text = "Step" + (numberImage+1) + "/" + (lengthTexts+1); image = GameObject.Find("Image"+ numberImage); imageUI = image.GetComponent(); imageUI.enabled = true; diff --git a/Assets/Scripts/UIRotation.cs b/Assets/Scripts/UIRotation.cs new file mode 100644 index 0000000..14e4021 --- /dev/null +++ b/Assets/Scripts/UIRotation.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UIRotation : MonoBehaviour +{ + public GameObject canvas1; + public GameObject canvas2; + public GameObject stepup1; + public GameObject card1; + // Start is called before the first frame update + void Start() + { + } + + // Update is called once per frame + void Update() + { + + if(Input.deviceOrientation == DeviceOrientation.LandscapeLeft || Input.deviceOrientation == DeviceOrientation.LandscapeRight) { + canvas1.SetActive(false); + canvas2.SetActive(true); + } else if(Input.deviceOrientation == DeviceOrientation.Portrait) { + canvas1.SetActive(true); + card1.SetActive(true); + stepup1.SetActive(false); + canvas2.SetActive(false); + } + } +} diff --git a/Assets/Scripts/UIRotation.cs.meta b/Assets/Scripts/UIRotation.cs.meta new file mode 100644 index 0000000..14412eb --- /dev/null +++ b/Assets/Scripts/UIRotation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fb7cf8eb89ab2f04abd56e9f96fcc1d5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: