diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Joystick.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Joystick.prefab new file mode 100644 index 00000000..4d337e52 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Joystick.prefab @@ -0,0 +1,251 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5426365777429535361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5426365777429535360} + - component: {fileID: 5426365777429535365} + - component: {fileID: 5426365777429535362} + - component: {fileID: 814810301664960626} + m_Layer: 5 + m_Name: Joystick + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5426365777429535360 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777429535361} + 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: 5426365777701013243} + m_Father: {fileID: 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: 960, y: 1080} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5426365777429535365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777429535361} + m_CullTransparentMesh: 0 +--- !u!114 &5426365777429535362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777429535361} + 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} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &814810301664960626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777429535361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4c9f0304835c834382ad094ec9ab02a, type: 3} + m_Name: + m_EditorClassIdentifier: + handleRange: 1 + deadZone: 0 + axisOptions: 0 + snapX: 0 + snapY: 0 + background: {fileID: 5426365777701013243} + handle: {fileID: 5426365777628538106} + moveThreshold: 1 + joystickType: 0 +--- !u!1 &5426365777628538107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5426365777628538106} + - component: {fileID: 5426365777628538108} + - component: {fileID: 5426365777628538109} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5426365777628538106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777628538107} + 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: 5426365777701013243} + 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: 0, y: 0} + m_SizeDelta: {x: 128, y: 128} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5426365777628538108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777628538107} + m_CullTransparentMesh: 0 +--- !u!114 &5426365777628538109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777628538107} + 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: 010a6e5305fa7004f89c5d317b7b47d4, 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!1 &5426365777701013240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5426365777701013243} + - component: {fileID: 5426365777701013245} + - component: {fileID: 5426365777701013242} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5426365777701013243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777701013240} + 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: 5426365777628538106} + m_Father: {fileID: 5426365777429535360} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 256, y: 256} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5426365777701013245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777701013240} + m_CullTransparentMesh: 0 +--- !u!114 &5426365777701013242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5426365777701013240} + 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: 5b56d9fa0e8bd6e409ed188db38a692c, 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 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Joystick.prefab.meta b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Joystick.prefab.meta new file mode 100644 index 00000000..918eda66 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Joystick.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74ca7c3222561dd4dab5958919043890 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab index 5ab00f4d..d77615de 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab @@ -116,6 +116,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3675204183f70fb48a77841d2b9055f4, type: 3} m_Name: m_EditorClassIdentifier: + joystick: {fileID: 7288066023221573359} --- !u!1 &2053873117425800803 GameObject: m_ObjectHideFlags: 0 @@ -665,7 +666,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 960, y: 1080} m_Pivot: {x: 1, y: 0} ---- !u!1001 &1222893248214870697 +--- !u!1001 &7956348480403183261 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -673,252 +674,113 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5417560988456393388} m_Modifications: - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 814810301664960626, guid: 74ca7c3222561dd4dab5958919043890, type: 3} + propertyPath: snapX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_SizeDelta.x value: 960 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_SizeDelta.y value: 1080 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087803549984437, guid: ec536a7718376554185e4a856d5ae230, type: 3} + - target: {fileID: 5426365777429535361, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_Name - value: Variable Joystick + value: Joystick objectReference: {fileID: 0} - - target: {fileID: 3881087803549984437, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087803549984439, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115470, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 5b56d9fa0e8bd6e409ed188db38a692c, type: 3} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_SizeDelta.x - value: 256 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_SizeDelta.y - value: 256 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchoredPosition.x - value: 256 - objectReference: {fileID: 0} - - target: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchoredPosition.y - value: 256 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_SizeDelta.x - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_SizeDelta.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5426365777429535363, guid: 74ca7c3222561dd4dab5958919043890, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3881087803549984437, guid: ec536a7718376554185e4a856d5ae230, type: 3} - insertIndex: -1 - addedObject: {fileID: 7288066023221573359} - m_SourcePrefab: {fileID: 100100000, guid: ec536a7718376554185e4a856d5ae230, type: 3} ---- !u!224 &2676530321025151591 stripped + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74ca7c3222561dd4dab5958919043890, type: 3} +--- !u!224 &2676530321349970973 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} - m_PrefabInstance: {fileID: 1222893248214870697} + m_CorrespondingSourceObject: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} + m_PrefabInstance: {fileID: 7956348480403183261} m_PrefabAsset: {fileID: 0} ---- !u!224 &2676530321080586342 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3881087803815115471, guid: ec536a7718376554185e4a856d5ae230, type: 3} - m_PrefabInstance: {fileID: 1222893248214870697} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2676530321349970972 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3881087803549984437, guid: ec536a7718376554185e4a856d5ae230, type: 3} - m_PrefabInstance: {fileID: 1222893248214870697} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7288066023221573359 +--- !u!114 &7288066023221573359 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 814810301664960626, guid: 74ca7c3222561dd4dab5958919043890, type: 3} + m_PrefabInstance: {fileID: 7956348480403183261} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2676530321349970972} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4c9f0304835c834382ad094ec9ab02a, type: 3} m_Name: m_EditorClassIdentifier: - handleRange: 1 - deadZone: 0 - axisOptions: 0 - snapX: 0 - snapY: 0 - background: {fileID: 2676530321080586342} - handle: {fileID: 2676530321025151591} - moveThreshold: 1 - joystickType: 0 ---- !u!224 &2676530321349970973 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} - m_PrefabInstance: {fileID: 1222893248214870697} - m_PrefabAsset: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity index 8f6be2e5..d35b561b 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity @@ -579,9 +579,11 @@ GameObject: - component: {fileID: 1631563210} - component: {fileID: 1631563209} - component: {fileID: 1631563208} + - component: {fileID: 1631563212} + - component: {fileID: 1631563213} m_Layer: 0 m_Name: TON.Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -715,6 +717,36 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1631563212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631563207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1e5d5ec74000134290431a712ebd683, type: 3} + m_Name: + m_EditorClassIdentifier: + groundLayer: + serializedVersion: 2 + m_Bits: 0 +--- !u!114 &1631563213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631563207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 163a5df0eeadca842adba0310b08b93e, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 10 + joystick: {fileID: 0} + rb: {fileID: 1631563208} --- !u!1 &1795290567 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs new file mode 100644 index 00000000..a25d4c93 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class CharacterBase : MonoBehaviour + { + public float speed; + public VariableJoystick joystick; + public Rigidbody2D rb; + + public void Start() + { + joystick = ControllerUI.Instance.joystick; + } + + public void FixedUpdate() + { + if (joystick != null) + { + Debug.Log($"Horizontal Input: {joystick.input.x}, {joystick.input.y}"); + Debug.Log($"Horizontal Horizontal: {joystick.Horizontal}"); + Debug.Log($"Horizontal Direction: {joystick.Direction}"); + + // 조이스틱의 Horizontal 값 가져오기 + float horizontalInput = joystick.Horizontal; + + // 입력값이 0이 아닐 때만 처리 + if (Mathf.Abs(horizontalInput) > 0.0f) + { + // 현재 위치 가져오기 + Vector2 currentPosition = rb.position; + + // 새로운 X 위치 계산 + float newXPosition = currentPosition.x + horizontalInput * speed * Time.fixedDeltaTime; + + // Rigidbody2D의 위치 업데이트 + rb.MovePosition(new Vector2(newXPosition, currentPosition.y)); + } + } + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs.meta new file mode 100644 index 00000000..83d163c9 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 163a5df0eeadca842adba0310b08b93e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs index 54a46396..67d8b399 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs @@ -6,6 +6,14 @@ namespace TON { public class CharacterController : MonoBehaviour { - + private CharacterBase linkedCharactor; + + public LayerMask groundLayer; + + private void Awake() + { + linkedCharactor = GetComponent(); + } + } } diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs index 857035e4..ef25afbd 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIManager.cs @@ -6,6 +6,7 @@ namespace TON { public class UIManager : SingletonBase { + public VariableJoystick joystick; // Joystick 컴포넌트를 참조 public static T Show(UIList uiName) where T : UIBase { var targetUI = Singleton.GetUI(uiName); diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs b/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs index 805a79d8..1526c597 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs @@ -40,7 +40,7 @@ namespace TON private Canvas canvas; private Camera cam; - private Vector2 input = Vector2.zero; + public Vector2 input = Vector2.zero; protected virtual void Start() { diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs b/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs index ffb7ad22..3a0aee65 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs @@ -3,10 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; - namespace TON { - public class VariableJoystick : Joystick { public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs index e46922e7..04dfb866 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs @@ -9,6 +9,7 @@ namespace TON { public static ControllerUI Instance => UIManager.Singleton.GetUI(UIList.ControllerUI); + public VariableJoystick joystick; private void Start() {