diff --git a/Assets/InputSystem.inputsettings.asset b/Assets/InputSystem.inputsettings.asset deleted file mode 100644 index 94bee7f..0000000 --- a/Assets/InputSystem.inputsettings.asset +++ /dev/null @@ -1,38 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3} - m_Name: InputSystem.inputsettings - m_EditorClassIdentifier: - m_SupportedDevices: - - Keyboard - m_UpdateMode: 1 - m_MaxEventBytesPerUpdate: 5242880 - m_MaxQueuedEventsPerUpdate: 1000 - m_CompensateForScreenOrientation: 1 - m_BackgroundBehavior: 2 - m_EditorInputBehaviorInPlayMode: 2 - m_InputActionPropertyDrawerMode: 0 - m_DefaultDeadzoneMin: 0.125 - m_DefaultDeadzoneMax: 0.925 - m_DefaultButtonPressPoint: 0.5 - m_ButtonReleaseThreshold: 0.75 - m_DefaultTapTime: 0.2 - m_DefaultSlowTapTime: 0.5 - m_DefaultHoldTime: 0.4 - m_TapRadius: 5 - m_MultiTapDelayTime: 0.75 - m_DisableRedundantEventsMerging: 0 - m_ShortcutKeysConsumeInputs: 0 - m_iOSSettings: - m_MotionUsage: - m_Enabled: 0 - m_Description: diff --git a/Assets/InputSystem.inputsettings.asset.meta b/Assets/InputSystem.inputsettings.asset.meta deleted file mode 100644 index ac8914a..0000000 --- a/Assets/InputSystem.inputsettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4fb944d3176519740b2e4652ac4d684b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ee9d7ae..641b6ba 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -308,81 +308,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 22602887} m_CullTransparentMesh: 1 ---- !u!1 &130793812 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 130793813} - - component: {fileID: 130793815} - - component: {fileID: 130793814} - m_Layer: 5 - m_Name: Frame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &130793813 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 130793812} - 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: 311490072} - 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!114 &130793814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 130793812} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1ec77a70539278b488dd5262540deb2f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &130793815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 130793812} - m_CullTransparentMesh: 1 --- !u!1 &294743247 GameObject: m_ObjectHideFlags: 0 @@ -615,7 +540,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 130793813} - {fileID: 588163040} - {fileID: 1318041771} m_Father: {fileID: 0} @@ -722,7 +646,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -7.7998962} + m_AnchoredPosition: {x: 0, y: -7.7999268} m_SizeDelta: {x: 122.1659, y: 51.509} m_Pivot: {x: 0, y: 1} --- !u!114 &379057222 @@ -858,8 +782,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -8.399963, y: -7.7999573} - m_SizeDelta: {x: 51.5091, y: 51.5091} + m_AnchoredPosition: {x: -15, y: -15} + m_SizeDelta: {x: 32.0768, y: 32.0768} m_Pivot: {x: 1, y: 1} --- !u!114 &439702001 MonoBehaviour: @@ -937,7 +861,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1574780254, guid: 3b8257aaa5713c0418d61d2f53c25940, type: 3} + m_Sprite: {fileID: 21300000, guid: 3b8257aaa5713c0418d61d2f53c25940, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1030,8 +954,8 @@ Camera: m_GameObject: {fileID: 501733675} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.5686275, g: 0.57254905, b: 0.5686275, a: 1} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.5686275, g: 0.57254905, b: 0.5686275, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -1062,7 +986,7 @@ Camera: serializedVersion: 2 m_Bits: 4294967295 m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 00322339cc07f814294f60d607f27abf, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 @@ -1635,15 +1559,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 0.5019608} + m_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, 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: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 39c7e8e048c1e7a46889e4803529ac27, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1651,7 +1575,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.5 --- !u!222 &921683581 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1695,8 +1619,8 @@ RectTransform: 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: 202.4, y: 63.146} - m_SizeDelta: {x: 51.5091, y: 51.5091} + m_AnchoredPosition: {x: 196.7619, y: 57.5079} + m_SizeDelta: {x: 32.0768, y: 32.0768} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &928064089 MonoBehaviour: @@ -1762,7 +1686,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 1574780254, guid: 3b8257aaa5713c0418d61d2f53c25940, type: 3} + m_Sprite: {fileID: 21300000, guid: 3b8257aaa5713c0418d61d2f53c25940, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2026,8 +1950,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 9dca820dba0742c4abe8c4dcf257ea4d, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2079,7 +2003,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -1} - m_SizeDelta: {x: 445.3355, y: 267.2014} + m_SizeDelta: {x: 478.92, y: 287.3493} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1127832730 MonoBehaviour: @@ -2450,8 +2374,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 9dca820dba0742c4abe8c4dcf257ea4d, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2662,8 +2586,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 9dca820dba0742c4abe8c4dcf257ea4d, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2715,9 +2639,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 62.660004, y: 63.36} - m_SizeDelta: {x: 52.0566, y: 52.0566} - m_Pivot: {x: 1, y: 1} + m_AnchoredPosition: {x: 15, y: 13} + m_SizeDelta: {x: 32.0768, y: 32.0768} + m_Pivot: {x: 0, y: 0} --- !u!114 &1640794864 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2782,7 +2706,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -488282498, guid: 0306401fdfd15764f8f935df0d9ea685, type: 3} + m_Sprite: {fileID: 21300000, guid: 0306401fdfd15764f8f935df0d9ea685, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3489,8 +3413,8 @@ SceneRoots: m_Roots: - {fileID: 501733678} - {fileID: 311490072} + - {fileID: 1050150012} - {fileID: 1333164888} - {fileID: 1652443528} - - {fileID: 1050150012} - {fileID: 902566663} - {fileID: 4783506} diff --git a/Assets/Sprites/UI/UI_CheckOff.png b/Assets/Sprites/UI/UI_CheckOff.png new file mode 100644 index 0000000..040ae2d Binary files /dev/null and b/Assets/Sprites/UI/UI_CheckOff.png differ diff --git a/Assets/Sprites/UI/UI_MainFrame.png.meta b/Assets/Sprites/UI/UI_CheckOff.png.meta similarity index 88% rename from Assets/Sprites/UI/UI_MainFrame.png.meta rename to Assets/Sprites/UI/UI_CheckOff.png.meta index ff7d203..b889702 100644 --- a/Assets/Sprites/UI/UI_MainFrame.png.meta +++ b/Assets/Sprites/UI/UI_CheckOff.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ec77a70539278b488dd5262540deb2f +guid: 9dca820dba0742c4abe8c4dcf257ea4d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -80,19 +80,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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 diff --git a/Assets/Sprites/UI/UI_CloseButton.png b/Assets/Sprites/UI/UI_CloseButton.png index 5c1a030..8b7914c 100644 Binary files a/Assets/Sprites/UI/UI_CloseButton.png and b/Assets/Sprites/UI/UI_CloseButton.png differ diff --git a/Assets/Sprites/UI/UI_CloseButton.png.meta b/Assets/Sprites/UI/UI_CloseButton.png.meta index ee14210..aba56ad 100644 --- a/Assets/Sprites/UI/UI_CloseButton.png.meta +++ b/Assets/Sprites/UI/UI_CloseButton.png.meta @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/Sprites/UI/UI_MainFrame.png b/Assets/Sprites/UI/UI_MainFrame.png deleted file mode 100644 index 9a8c94d..0000000 Binary files a/Assets/Sprites/UI/UI_MainFrame.png and /dev/null differ diff --git a/Assets/Sprites/UI/UI_MainTitle.png b/Assets/Sprites/UI/UI_MainTitle.png index 0df0e14..5463b69 100644 Binary files a/Assets/Sprites/UI/UI_MainTitle.png and b/Assets/Sprites/UI/UI_MainTitle.png differ diff --git a/Assets/Sprites/UI/UI_OptionsButton.png b/Assets/Sprites/UI/UI_OptionsButton.png index b27e6ab..774e399 100644 Binary files a/Assets/Sprites/UI/UI_OptionsButton.png and b/Assets/Sprites/UI/UI_OptionsButton.png differ diff --git a/Assets/Sprites/UI/UI_OptionsButton.png.meta b/Assets/Sprites/UI/UI_OptionsButton.png.meta index 5af1528..1bffcdd 100644 --- a/Assets/Sprites/UI/UI_OptionsButton.png.meta +++ b/Assets/Sprites/UI/UI_OptionsButton.png.meta @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/Sprites/UI/UI_OptionsFrame.png b/Assets/Sprites/UI/UI_OptionsFrame.png new file mode 100644 index 0000000..608b248 Binary files /dev/null and b/Assets/Sprites/UI/UI_OptionsFrame.png differ diff --git a/Assets/Sprites/UI/UI_OptionsFrame.png.meta b/Assets/Sprites/UI/UI_OptionsFrame.png.meta new file mode 100644 index 0000000..b4d925d --- /dev/null +++ b/Assets/Sprites/UI/UI_OptionsFrame.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 39c7e8e048c1e7a46889e4803529ac27 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + 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: 80, y: 80, z: 80, w: 80} + 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: Server + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: