From f69e89a10677ab13edf22a75632a818082cd47e5 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Fri, 24 Jan 2025 17:55:26 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=9D=B4=EC=8A=A4=ED=8B=B1=20?= =?UTF-8?q?=EB=8F=99=EC=9E=91=20=EC=95=A1=EC=85=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gameton-06/Assets/Gameton/Art/square.png | 3 + Gameton-06/Assets/Gameton/Art/square.png.meta | 127 +++ .../Assets/Gameton/Resources/EventSystem.meta | 8 + .../Resources/EventSystem/Prefabs.meta | 8 + .../Prefabs/TON.EventSystem.prefab | 70 ++ .../Prefabs/TON.EventSystem.prefab.meta | 7 + .../Assets/Gameton/Resources/GameData.meta | 8 + .../UI/Prefabs/UI.ControllerUI.prefab | 924 ++++++++++++++++++ .../UI/Prefabs/UI.ControllerUI.prefab.meta | 7 + .../dev_jinjoo/Edit_Ingame.unity | 521 ++++++++-- .../Scripts/Character/CharacterController.cs | 11 + .../Character/CharacterController.cs.meta | 11 + .../Scripts/Common/EventSystemManager.cs | 11 + .../Scripts/Common/EventSystemManager.cs.meta | 11 + .../Assets/Gameton/Scripts/Common/UIBase.cs | 1 + .../Assets/Gameton/Scripts/Common/UIList.cs | 1 + .../Assets/Gameton/Scripts/Joystick.meta | 8 + .../Gameton/Scripts/Joystick/Joystick.cs | 153 +++ .../Gameton/Scripts/Joystick/Joystick.cs.meta | 11 + .../Scripts/Joystick/VariableJoystick.cs | 63 ++ .../Scripts/Joystick/VariableJoystick.cs.meta | 11 + .../Assets/Gameton/Scripts/UI/ControllerUI.cs | 17 + .../Gameton/Scripts/UI/ControllerUI.cs.meta | 11 + .../Scripts/Joysticks/VariableJoystick.cs | 97 +- .../ProjectSettings/ProjectSettings.asset | 4 +- 25 files changed, 1978 insertions(+), 126 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Art/square.png create mode 100644 Gameton-06/Assets/Gameton/Art/square.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/EventSystem.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab create mode 100644 Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/GameData.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab create mode 100644 Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/Joystick.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs.meta create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs create mode 100644 Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs.meta diff --git a/Gameton-06/Assets/Gameton/Art/square.png b/Gameton-06/Assets/Gameton/Art/square.png new file mode 100644 index 00000000..4c829a3d --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/square.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6b32b64a79aed81382d4248ce3717a11a983d171690446afee9499f615a9637 +size 99 diff --git a/Gameton-06/Assets/Gameton/Art/square.png.meta b/Gameton-06/Assets/Gameton/Art/square.png.meta new file mode 100644 index 00000000..fc33054c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/square.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7155d9d3c459a1945a29adc40045dc25 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/EventSystem.meta b/Gameton-06/Assets/Gameton/Resources/EventSystem.meta new file mode 100644 index 00000000..d9ea7cf6 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/EventSystem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 766c4f514e7e28e4998e3c71fe3cd156 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs.meta b/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs.meta new file mode 100644 index 00000000..fe03c9a9 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5598af63aa42271408432868c6ee0854 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab b/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab new file mode 100644 index 00000000..1a5a2c45 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab @@ -0,0 +1,70 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1200285979204940387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3618225626109934976} + - component: {fileID: 4262754626881180371} + - component: {fileID: 396054446032748345} + m_Layer: 0 + m_Name: TON.EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3618225626109934976 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1200285979204940387} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4262754626881180371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1200285979204940387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!114 &396054446032748345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1200285979204940387} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab.meta b/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab.meta new file mode 100644 index 00000000..d4e40f93 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/EventSystem/Prefabs/TON.EventSystem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9bd7d8d0778bcdc419d52f5d5d2bf8a9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/GameData.meta b/Gameton-06/Assets/Gameton/Resources/GameData.meta new file mode 100644 index 00000000..0976f041 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/GameData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d397fc05fc70ed4788da34e9e847947 +folderAsset: yes +DefaultImporter: + 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 new file mode 100644 index 00000000..5ab00f4d --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab @@ -0,0 +1,924 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1508238593265001016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5417560988456393388} + - component: {fileID: 2253230105054395557} + - component: {fileID: 1999542893006455819} + - component: {fileID: 9014748679960086459} + - component: {fileID: -4577297331876422106} + m_Layer: 5 + m_Name: UI.ControllerUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5417560988456393388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508238593265001016} + 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: 2676530321349970973} + - {fileID: 2166821633958283099} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &2253230105054395557 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508238593265001016} + 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_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1999542893006455819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508238593265001016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 1 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &9014748679960086459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508238593265001016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 0 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &-4577297331876422106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508238593265001016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3675204183f70fb48a77841d2b9055f4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2053873117425800803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7988244304223542701} + - component: {fileID: 2181821370028179420} + - component: {fileID: 6487152096551839214} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7988244304223542701 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2053873117425800803} + 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: 2450234044475161637} + 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 &2181821370028179420 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2053873117425800803} + m_CullTransparentMesh: 1 +--- !u!114 &6487152096551839214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2053873117425800803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Jump + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4292735707319933072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2947670855469478816} + - component: {fileID: 2511609967701569318} + - component: {fileID: 790267721355862019} + - component: {fileID: 4810385648785570979} + m_Layer: 5 + m_Name: Attack Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2947670855469478816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4292735707319933072} + 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: 7707870300419360746} + m_Father: {fileID: 2166821633958283099} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -126.99994, y: 388.00006} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 1, y: 1} +--- !u!222 &2511609967701569318 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4292735707319933072} + m_CullTransparentMesh: 1 +--- !u!114 &790267721355862019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4292735707319933072} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4810385648785570979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4292735707319933072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 790267721355862019} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6698720259494018033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2450234044475161637} + - component: {fileID: 4938549978599767961} + - component: {fileID: 2198211765074557333} + - component: {fileID: 2942518814555541681} + m_Layer: 5 + m_Name: Jump Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2450234044475161637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6698720259494018033} + 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: 7988244304223542701} + m_Father: {fileID: 2166821633958283099} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -441, y: 388} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 1, y: 1} +--- !u!222 &4938549978599767961 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6698720259494018033} + m_CullTransparentMesh: 1 +--- !u!114 &2198211765074557333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6698720259494018033} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2942518814555541681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6698720259494018033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2198211765074557333} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7098794055699103870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7707870300419360746} + - component: {fileID: 4820413750309060246} + - component: {fileID: 9074215401110746708} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7707870300419360746 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098794055699103870} + 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: 2947670855469478816} + 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 &4820413750309060246 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098794055699103870} + m_CullTransparentMesh: 1 +--- !u!114 &9074215401110746708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7098794055699103870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Attack + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8296493774891888372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2166821633958283099} + m_Layer: 5 + m_Name: Button Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2166821633958283099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8296493774891888372} + 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: 2450234044475161637} + - {fileID: 2947670855469478816} + m_Father: {fileID: 5417560988456393388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 960, y: 1080} + m_Pivot: {x: 1, y: 0} +--- !u!1001 &1222893248214870697 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5417560988456393388} + m_Modifications: + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, 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} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_SizeDelta.x + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, 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} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3881087803549984436, guid: ec536a7718376554185e4a856d5ae230, 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} + propertyPath: m_Name + value: Variable 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_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 +RectTransform: + m_CorrespondingSourceObject: {fileID: 3881087804030458062, guid: ec536a7718376554185e4a856d5ae230, type: 3} + m_PrefabInstance: {fileID: 1222893248214870697} + 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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2676530321349970972} + 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/Resources/UI/Prefabs/UI.ControllerUI.prefab.meta b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab.meta new file mode 100644 index 00000000..fc962661 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dfba43d4c3ff3d4439db025ccd05e6eb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 2ca3f8bb..8f6be2e5 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 @@ -122,50 +122,136 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &265027070 +--- !u!1 &116971769 GameObject: - m_ObjectHideFlags: 3 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 265027071} - - component: {fileID: 265027072} + - component: {fileID: 116971771} + - component: {fileID: 116971770} + - component: {fileID: 116971772} m_Layer: 0 - m_Name: cm + m_Name: 2D Level m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &265027071 -Transform: - m_ObjectHideFlags: 3 +--- !u!212 &116971770 +SpriteRenderer: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 265027070} + m_GameObject: {fileID: 116971769} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 7155d9d3c459a1945a29adc40045dc25, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &116971771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 116971769} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 10} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.65, y: -4.02, z: 0} + m_LocalScale: {x: 140.32188, y: 18.625, z: 0} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1185367604} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &265027072 -MonoBehaviour: - m_ObjectHideFlags: 3 +--- !u!61 &116971772 +BoxCollider2D: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 265027070} + m_GameObject: {fileID: 116971769} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.1, y: 0.1} + newSize: {x: 0.1, y: 0.1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.1, y: 0.1} + m_EdgeRadius: 0 --- !u!1 &535565208 GameObject: m_ObjectHideFlags: 0 @@ -181,7 +267,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &535565209 Transform: m_ObjectHideFlags: 0 @@ -191,7 +277,7 @@ Transform: m_GameObject: {fileID: 535565208} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -212,7 +298,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &718284631 Transform: m_ObjectHideFlags: 0 @@ -222,13 +308,13 @@ Transform: m_GameObject: {fileID: 718284630} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1185367601 +--- !u!1 &1128113572 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -236,23 +322,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1185367604} - - component: {fileID: 1185367603} - - component: {fileID: 1185367605} + - component: {fileID: 1128113573} + m_Layer: 0 + m_Name: ---------------------------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1128113573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128113572} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1152094950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1152094951} + - component: {fileID: 1152094953} + - component: {fileID: 1152094952} m_Layer: 0 m_Name: Main Camera - m_TagString: MainCamera + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!20 &1185367603 +--- !u!4 &1152094951 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152094950} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!81 &1152094952 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152094950} + m_Enabled: 0 +--- !u!20 &1152094953 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1185367601} + m_GameObject: {fileID: 1152094950} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -281,8 +421,8 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 540 - m_Depth: -1 + orthographic size: 5 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -297,61 +437,284 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &1185367604 +--- !u!1 &1268941402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1268941405} + - component: {fileID: 1268941404} + - component: {fileID: 1268941403} + m_Layer: 0 + m_Name: 2D Level (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1268941403 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268941402} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.1, y: 0.1} + newSize: {x: 0.1, y: 0.1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.1, y: 0.1} + m_EdgeRadius: 0 +--- !u!212 &1268941404 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268941402} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 7155d9d3c459a1945a29adc40045dc25, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1268941405 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1185367601} + m_GameObject: {fileID: 1268941402} serializedVersion: 2 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_LocalPosition: {x: 9.15, y: -4.08, z: 0} + m_LocalScale: {x: 67.625, y: 18.625, z: 0} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 265027071} - m_Father: {fileID: 1986734011} + m_Children: [] + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1185367605 -MonoBehaviour: +--- !u!1 &1631563207 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1185367601} + serializedVersion: 6 + m_Component: + - component: {fileID: 1631563211} + - component: {fileID: 1631563210} + - component: {fileID: 1631563209} + - component: {fileID: 1631563208} + m_Layer: 0 + m_Name: TON.Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!50 &1631563208 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631563207} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!70 &1631563209 +CapsuleCollider2D: + 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: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 265027071} + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 0.2, y: 0.2} + m_Direction: 0 +--- !u!212 &1631563210 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631563207} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.2, y: 0.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1631563211 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631563207} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.29, y: -1.47, z: 0} + m_LocalScale: {x: 5, y: 5, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1795290567 GameObject: m_ObjectHideFlags: 0 @@ -377,7 +740,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795290567} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.34585175, y: 0.61144084, z: 10.801609} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -425,7 +788,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1185367604} + - {fileID: 1152094951} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2135657550 @@ -531,3 +894,7 @@ SceneRoots: - {fileID: 718284631} - {fileID: 2135657552} - {fileID: 535565209} + - {fileID: 116971771} + - {fileID: 1268941405} + - {fileID: 1128113573} + - {fileID: 1631563211} diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs new file mode 100644 index 00000000..54a46396 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class CharacterController : MonoBehaviour + { + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs.meta new file mode 100644 index 00000000..eaa51852 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b1e5d5ec74000134290431a712ebd683 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs b/Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs new file mode 100644 index 00000000..158a6067 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class EventSystemManager : MonoBehaviour + { + + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs.meta new file mode 100644 index 00000000..ae1339d1 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/EventSystemManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab66d818efcc9d44da8900e18fef96e0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs index 205033fa..f3e42ad8 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIBase.cs @@ -8,6 +8,7 @@ namespace TON { public virtual void Show() { + Instantiate(Resources.Load("EventSystem/Prefabs/TON.EventSystem")); gameObject.SetActive(true); } diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs index d569e515..9be53f10 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/UIList.cs @@ -10,6 +10,7 @@ namespace TON TitleUI, IngameUI, + ControllerUI, LogUI, diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick.meta b/Gameton-06/Assets/Gameton/Scripts/Joystick.meta new file mode 100644 index 00000000..d3eeed4f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd3d417ffc2079a4d93186904952ddd9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs b/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs new file mode 100644 index 00000000..805a79d8 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs @@ -0,0 +1,153 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace TON +{ + public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler + { + public float Horizontal { get { return (snapX) ? SnapFloat(input.x, AxisOptions.Horizontal) : input.x; } } + public float Vertical { get { return (snapY) ? SnapFloat(input.y, AxisOptions.Vertical) : input.y; } } + public Vector2 Direction { get { return new Vector2(Horizontal, Vertical); } } + + public float HandleRange + { + get { return handleRange; } + set { handleRange = Mathf.Abs(value); } + } + + public float DeadZone + { + get { return deadZone; } + set { deadZone = Mathf.Abs(value); } + } + + public AxisOptions AxisOptions { get { return AxisOptions; } set { axisOptions = value; } } + public bool SnapX { get { return snapX; } set { snapX = value; } } + public bool SnapY { get { return snapY; } set { snapY = value; } } + + [SerializeField] private float handleRange = 1; + [SerializeField] private float deadZone = 0; + [SerializeField] private AxisOptions axisOptions = AxisOptions.Both; + [SerializeField] private bool snapX = false; + [SerializeField] private bool snapY = false; + + [SerializeField] protected RectTransform background = null; + [SerializeField] private RectTransform handle = null; + private RectTransform baseRect = null; + + private Canvas canvas; + private Camera cam; + + private Vector2 input = Vector2.zero; + + protected virtual void Start() + { + HandleRange = handleRange; + DeadZone = deadZone; + baseRect = GetComponent(); + canvas = GetComponentInParent(); + if (canvas == null) + Debug.LogError("The Joystick is not placed inside a canvas"); + + Vector2 center = new Vector2(0.5f, 0.5f); + background.pivot = center; + handle.anchorMin = center; + handle.anchorMax = center; + handle.pivot = center; + handle.anchoredPosition = Vector2.zero; + } + + public virtual void OnPointerDown(PointerEventData eventData) + { + OnDrag(eventData); + } + + public void OnDrag(PointerEventData eventData) + { + cam = null; + if (canvas.renderMode == RenderMode.ScreenSpaceCamera) + cam = canvas.worldCamera; + + Vector2 position = RectTransformUtility.WorldToScreenPoint(cam, background.position); + Vector2 radius = background.sizeDelta / 2; + input = (eventData.position - position) / (radius * canvas.scaleFactor); + FormatInput(); + HandleInput(input.magnitude, input.normalized, radius, cam); + handle.anchoredPosition = input * radius * handleRange; + } + + protected virtual void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam) + { + if (magnitude > deadZone) + { + if (magnitude > 1) + input = normalised; + } + else + input = Vector2.zero; + } + + private void FormatInput() + { + if (axisOptions == AxisOptions.Horizontal) + input = new Vector2(input.x, 0f); + else if (axisOptions == AxisOptions.Vertical) + input = new Vector2(0f, input.y); + } + + private float SnapFloat(float value, AxisOptions snapAxis) + { + if (value == 0) + return value; + + if (axisOptions == AxisOptions.Both) + { + float angle = Vector2.Angle(input, Vector2.up); + if (snapAxis == AxisOptions.Horizontal) + { + if (angle < 22.5f || angle > 157.5f) + return 0; + else + return (value > 0) ? 1 : -1; + } + else if (snapAxis == AxisOptions.Vertical) + { + if (angle > 67.5f && angle < 112.5f) + return 0; + else + return (value > 0) ? 1 : -1; + } + return value; + } + else + { + if (value > 0) + return 1; + if (value < 0) + return -1; + } + return 0; + } + + public virtual void OnPointerUp(PointerEventData eventData) + { + input = Vector2.zero; + handle.anchoredPosition = Vector2.zero; + } + + protected Vector2 ScreenPointToAnchoredPosition(Vector2 screenPosition) + { + Vector2 localPoint = Vector2.zero; + if (RectTransformUtility.ScreenPointToLocalPointInRectangle(baseRect, screenPosition, cam, out localPoint)) + { + Vector2 pivotOffset = baseRect.pivot * baseRect.sizeDelta; + return localPoint - (background.anchorMax * baseRect.sizeDelta) + pivotOffset; + } + return Vector2.zero; + } + } + + public enum AxisOptions { Both, Horizontal, Vertical } +} \ No newline at end of file diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs.meta new file mode 100644 index 00000000..ad9cab23 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick/Joystick.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b5efeced8004470438cbd7c383b2a09e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs b/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs new file mode 100644 index 00000000..c22c3424 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +public class VariableJoystick : Joystick +{ + public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } } + + [SerializeField] private float moveThreshold = 1; + [SerializeField] private JoystickType joystickType = JoystickType.Fixed; + + private Vector2 fixedPosition = Vector2.zero; + + public void SetMode(JoystickType joystickType) + { + this.joystickType = joystickType; + if (joystickType == JoystickType.Fixed) + { + background.anchoredPosition = fixedPosition; + background.gameObject.SetActive(true); + } + else + background.gameObject.SetActive(false); + } + + protected override void Start() + { + base.Start(); + fixedPosition = background.anchoredPosition; + SetMode(joystickType); + } + + public override void OnPointerDown(PointerEventData eventData) + { + if (joystickType != JoystickType.Fixed) + { + background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); + background.gameObject.SetActive(true); + } + base.OnPointerDown(eventData); + } + + public override void OnPointerUp(PointerEventData eventData) + { + if (joystickType != JoystickType.Fixed) + background.gameObject.SetActive(false); + + base.OnPointerUp(eventData); + } + + protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam) + { + if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold) + { + Vector2 difference = normalised * (magnitude - moveThreshold) * radius; + background.anchoredPosition += difference; + } + base.HandleInput(magnitude, normalised, radius, cam); + } +} + +public enum JoystickType { Fixed, Floating, Dynamic } \ No newline at end of file diff --git a/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs.meta new file mode 100644 index 00000000..73ae7b49 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Joystick/VariableJoystick.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e4c9f0304835c834382ad094ec9ab02a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs new file mode 100644 index 00000000..e46922e7 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace TON +{ + public class ControllerUI : UIBase + { + public static ControllerUI Instance => UIManager.Singleton.GetUI(UIList.ControllerUI); + + private void Start() + { + + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs.meta b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs.meta new file mode 100644 index 00000000..74d0e99c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3675204183f70fb48a77841d2b9055f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Joystick Pack/Scripts/Joysticks/VariableJoystick.cs b/Gameton-06/Assets/Joystick Pack/Scripts/Joysticks/VariableJoystick.cs index c22c3424..3a0aee65 100644 --- a/Gameton-06/Assets/Joystick Pack/Scripts/Joysticks/VariableJoystick.cs +++ b/Gameton-06/Assets/Joystick Pack/Scripts/Joysticks/VariableJoystick.cs @@ -3,61 +3,64 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; -public class VariableJoystick : Joystick +namespace TON { - public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } } - - [SerializeField] private float moveThreshold = 1; - [SerializeField] private JoystickType joystickType = JoystickType.Fixed; - - private Vector2 fixedPosition = Vector2.zero; - - public void SetMode(JoystickType joystickType) + public class VariableJoystick : Joystick { - this.joystickType = joystickType; - if (joystickType == JoystickType.Fixed) + public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } } + + [SerializeField] private float moveThreshold = 1; + [SerializeField] private JoystickType joystickType = JoystickType.Fixed; + + private Vector2 fixedPosition = Vector2.zero; + + public void SetMode(JoystickType joystickType) { - background.anchoredPosition = fixedPosition; - background.gameObject.SetActive(true); + this.joystickType = joystickType; + if (joystickType == JoystickType.Fixed) + { + background.anchoredPosition = fixedPosition; + background.gameObject.SetActive(true); + } + else + background.gameObject.SetActive(false); } - else - background.gameObject.SetActive(false); - } - protected override void Start() - { - base.Start(); - fixedPosition = background.anchoredPosition; - SetMode(joystickType); - } - - public override void OnPointerDown(PointerEventData eventData) - { - if (joystickType != JoystickType.Fixed) + protected override void Start() { - background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); - background.gameObject.SetActive(true); + base.Start(); + fixedPosition = background.anchoredPosition; + SetMode(joystickType); } - base.OnPointerDown(eventData); - } - public override void OnPointerUp(PointerEventData eventData) - { - if (joystickType != JoystickType.Fixed) - background.gameObject.SetActive(false); - - base.OnPointerUp(eventData); - } - - protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam) - { - if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold) + public override void OnPointerDown(PointerEventData eventData) { - Vector2 difference = normalised * (magnitude - moveThreshold) * radius; - background.anchoredPosition += difference; + if (joystickType != JoystickType.Fixed) + { + background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); + background.gameObject.SetActive(true); + } + base.OnPointerDown(eventData); } - base.HandleInput(magnitude, normalised, radius, cam); - } -} -public enum JoystickType { Fixed, Floating, Dynamic } \ No newline at end of file + public override void OnPointerUp(PointerEventData eventData) + { + if (joystickType != JoystickType.Fixed) + background.gameObject.SetActive(false); + + base.OnPointerUp(eventData); + } + + protected override void HandleInput(float magnitude, Vector2 normalised, Vector2 radius, Camera cam) + { + if (joystickType == JoystickType.Dynamic && magnitude > moveThreshold) + { + Vector2 difference = normalised * (magnitude - moveThreshold) * radius; + background.anchoredPosition += difference; + } + base.HandleInput(magnitude, normalised, radius, cam); + } + } + + public enum JoystickType { Fixed, Floating, Dynamic } +} \ No newline at end of file diff --git a/Gameton-06/ProjectSettings/ProjectSettings.asset b/Gameton-06/ProjectSettings/ProjectSettings.asset index 03967595..21e6b53a 100644 --- a/Gameton-06/ProjectSettings/ProjectSettings.asset +++ b/Gameton-06/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed65b7fa102efb7cde84c026008a0fe27302c70555a9bccd43a81bdce8a6c6e3 -size 21866 +oid sha256:326b0067663bf33afcb0baec2276c1300e014de76ff1134f5ce5908a790ccf7f +size 23577