diff --git a/Galagan/Assets/Asteroid.prefab b/Galagan/Assets/Asteroid.prefab index 27a464f..39a8334 100644 --- a/Galagan/Assets/Asteroid.prefab +++ b/Galagan/Assets/Asteroid.prefab @@ -91,21 +91,18 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: 0, y: 0.70699924, z: 0} - - {x: 0.3509171, y: 0.7881727, z: 0} - - {x: 0.7542169, y: 0.67909986, z: 0} - - {x: 0.98979205, y: 0.3216029, z: 0} - - {x: 1.1571201, y: -0.12161828, z: 0} - - {x: 1.0185931, y: -0.58808506, z: 0} - - {x: 0.73758, y: -1.015192, z: 0} - - {x: 0.2546847, y: -1.1981977, z: 0} - - {x: -0.26037762, y: -1.2249796, z: 0} - - {x: -0.7671195, y: -1.0558498, z: 0} - - {x: -1.024633, y: -0.591572, z: 0} - - {x: -1.0892882, y: -0.11448866, z: 0} - - {x: -1.0272045, y: 0.33375913, z: 0} - - {x: -0.76707876, y: 0.69068104, z: 0} - - {x: -0.44296572, y: 0.99491775, z: 0} + - {x: 0, y: 0.77753407, z: 0} + - {x: 0.40416953, y: 0.7000421, z: 0} + - {x: 0.7256834, y: 0.41897345, z: 0} + - {x: 0.88420004, y: -0.00000003864961, z: 0} + - {x: 0.8879781, y: -0.51267445, z: 0} + - {x: 0.5559476, y: -0.96292937, z: 0} + - {x: -0.000000103296486, y: -1.1815741, z: 0} + - {x: -0.6193416, y: -1.0727313, z: 0} + - {x: -1.0964466, y: -0.6330336, z: 0} + - {x: -1.1883162, y: 0.000000014170529, z: 0} + - {x: -1.0780969, y: 0.6224394, z: 0} + - {x: -0.5824014, y: 1.0087484, z: 0} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -209,22 +206,19 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 0, y: 0.70699924} - - {x: 0.3509171, y: 0.7881727} - - {x: 0.7542169, y: 0.67909986} - - {x: 0.98979205, y: 0.3216029} - - {x: 1.1571201, y: -0.12161828} - - {x: 1.0185931, y: -0.58808506} - - {x: 0.73758, y: -1.015192} - - {x: 0.2546847, y: -1.1981977} - - {x: -0.26037762, y: -1.2249796} - - {x: -0.7671195, y: -1.0558498} - - {x: -1.024633, y: -0.591572} - - {x: -1.0892882, y: -0.11448866} - - {x: -1.0272045, y: 0.33375913} - - {x: -0.76707876, y: 0.69068104} - - {x: -0.44296572, y: 0.99491775} - - {x: 0, y: 0.70699924} + - - {x: 0, y: 0.77753407} + - {x: 0.40416953, y: 0.7000421} + - {x: 0.7256834, y: 0.41897345} + - {x: 0.88420004, y: -0.00000003864961} + - {x: 0.8879781, y: -0.51267445} + - {x: 0.5559476, y: -0.96292937} + - {x: -0.000000103296486, y: -1.1815741} + - {x: -0.6193416, y: -1.0727313} + - {x: -1.0964466, y: -0.6330336} + - {x: -1.1883162, y: 0.000000014170529} + - {x: -1.0780969, y: 0.6224394} + - {x: -0.5824014, y: 1.0087484} + - {x: 0, y: 0.77753407} m_UseDelaunayMesh: 0 --- !u!50 &7202568895458539576 Rigidbody2D: diff --git a/Galagan/Assets/Point.prefab b/Galagan/Assets/Point.prefab index e7d6d29..0f92333 100644 --- a/Galagan/Assets/Point.prefab +++ b/Galagan/Assets/Point.prefab @@ -80,32 +80,23 @@ LineRenderer: m_SortingOrder: 0 m_Positions: - {x: 0, y: 0.1, z: 0} - - {x: 0.023061587, y: 0.097304486, z: 0} - - {x: 0.04487992, y: 0.08936327, z: 0} + - {x: 0.034202013, y: 0.09396926, z: 0} - {x: 0.06427876, y: 0.07660445, z: 0} - - {x: 0.08021232, y: 0.059715863, z: 0} - - {x: 0.09182161, y: 0.039607972, z: 0} + - {x: 0.086602546, y: 0.049999997, z: 0} - {x: 0.098480776, y: 0.017364822, z: 0} - - {x: 0.09983082, y: -0.0058144825, z: 0} - - {x: 0.095798954, y: -0.028680325, z: 0} + - {x: 0.098480776, y: -0.01736482, z: 0} - {x: 0.08660254, y: -0.05000001, z: 0} - - {x: 0.07273736, y: -0.06862417, z: 0} - - {x: 0.054950904, y: -0.08354878, z: 0} + - {x: 0.06427877, y: -0.07660445, z: 0} - {x: 0.03420202, y: -0.09396926, z: 0} - - {x: 0.011609296, y: -0.09932383, z: 0} - - {x: -0.01160929, y: -0.09932383, z: 0} + - {x: -0.000000008742278, y: -0.1, z: 0} - {x: -0.034202017, y: -0.09396926, z: 0} - - {x: -0.054950904, y: -0.08354878, z: 0} - - {x: -0.07273737, y: -0.06862416, z: 0} + - {x: -0.06427876, y: -0.07660445, z: 0} - {x: -0.086602546, y: -0.049999993, z: 0} - - {x: -0.095798954, y: -0.02868033, z: 0} - - {x: -0.09983082, y: -0.0058144648, z: 0} + - {x: -0.09848078, y: -0.017364813, z: 0} - {x: -0.098480776, y: 0.017364815, z: 0} - - {x: -0.09182162, y: 0.039607957, z: 0} - - {x: -0.08021232, y: 0.059715863, z: 0} + - {x: -0.086602546, y: 0.049999993, z: 0} - {x: -0.064278774, y: 0.07660443, z: 0} - - {x: -0.04487991, y: 0.08936327, z: 0} - - {x: -0.023061596, y: 0.097304486, z: 0} + - {x: -0.034202036, y: 0.093969256, z: 0} m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -210,32 +201,23 @@ PolygonCollider2D: m_Points: m_Paths: - - {x: 0, y: 0.1} - - {x: 0.023061587, y: 0.097304486} - - {x: 0.04487992, y: 0.08936327} + - {x: 0.034202013, y: 0.09396926} - {x: 0.06427876, y: 0.07660445} - - {x: 0.08021232, y: 0.059715863} - - {x: 0.09182161, y: 0.039607972} + - {x: 0.086602546, y: 0.049999997} - {x: 0.098480776, y: 0.017364822} - - {x: 0.09983082, y: -0.0058144825} - - {x: 0.095798954, y: -0.028680325} + - {x: 0.098480776, y: -0.01736482} - {x: 0.08660254, y: -0.05000001} - - {x: 0.07273736, y: -0.06862417} - - {x: 0.054950904, y: -0.08354878} + - {x: 0.06427877, y: -0.07660445} - {x: 0.03420202, y: -0.09396926} - - {x: 0.011609296, y: -0.09932383} - - {x: -0.01160929, y: -0.09932383} + - {x: -0.000000008742278, y: -0.1} - {x: -0.034202017, y: -0.09396926} - - {x: -0.054950904, y: -0.08354878} - - {x: -0.07273737, y: -0.06862416} + - {x: -0.06427876, y: -0.07660445} - {x: -0.086602546, y: -0.049999993} - - {x: -0.095798954, y: -0.02868033} - - {x: -0.09983082, y: -0.0058144648} + - {x: -0.09848078, y: -0.017364813} - {x: -0.098480776, y: 0.017364815} - - {x: -0.09182162, y: 0.039607957} - - {x: -0.08021232, y: 0.059715863} + - {x: -0.086602546, y: 0.049999993} - {x: -0.064278774, y: 0.07660443} - - {x: -0.04487991, y: 0.08936327} - - {x: -0.023061596, y: 0.097304486} + - {x: -0.034202036, y: 0.093969256} - {x: 0, y: 0.1} m_UseDelaunayMesh: 0 --- !u!50 &7202568895458539576 diff --git a/Galagan/Assets/Scenes/GameScene.unity b/Galagan/Assets/Scenes/GameScene.unity index 4b9ea0d..deabd86 100644 --- a/Galagan/Assets/Scenes/GameScene.unity +++ b/Galagan/Assets/Scenes/GameScene.unity @@ -394,6 +394,7 @@ GameObject: m_Component: - component: {fileID: 1378039851} - component: {fileID: 1378039852} + - component: {fileID: 1378039853} m_Layer: 0 m_Name: GameLoop m_TagString: Untagged @@ -432,6 +433,102 @@ MonoBehaviour: pointPrefab: {fileID: -3182654130105329171, guid: b40f9156fb4df0248be458b9411131a9, type: 3} inset: 0.8 scoreText: {fileID: 0} +--- !u!82 &1378039853 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378039850} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &1645791523 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Galagan/Assets/Scenes/MenuScene.unity b/Galagan/Assets/Scenes/MenuScene.unity index b5ba9b3..801b8a3 100644 --- a/Galagan/Assets/Scenes/MenuScene.unity +++ b/Galagan/Assets/Scenes/MenuScene.unity @@ -147,7 +147,7 @@ AudioListener: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 39709457} - m_Enabled: 1 + m_Enabled: 0 --- !u!20 &39709459 Camera: m_ObjectHideFlags: 0 @@ -158,7 +158,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Galagan/Assets/Scripts/MenuController.cs b/Galagan/Assets/Scripts/MenuController.cs new file mode 100644 index 0000000..c791d0e --- /dev/null +++ b/Galagan/Assets/Scripts/MenuController.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MenuController : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Galagan/Assets/Scripts/MenuController.cs.meta b/Galagan/Assets/Scripts/MenuController.cs.meta new file mode 100644 index 0000000..f7f514a --- /dev/null +++ b/Galagan/Assets/Scripts/MenuController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a073689d4ec30f9479271d7c86ba4374 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Galagan/ProjectSettings/EditorBuildSettings.asset b/Galagan/ProjectSettings/EditorBuildSettings.asset index 82ab0f5..cfd46d8 100644 --- a/Galagan/ProjectSettings/EditorBuildSettings.asset +++ b/Galagan/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,9 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity + path: Assets/Scenes/GameScene.unity guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 1 + path: Assets/Scenes/MenuScene.unity + guid: 9593d5c3cb9152f4090e875b85ffc259 m_configObjects: {} diff --git a/Galagan/ProjectSettings/EditorSettings.asset b/Galagan/ProjectSettings/EditorSettings.asset index e6f57fd..ce486a2 100644 --- a/Galagan/ProjectSettings/EditorSettings.asset +++ b/Galagan/ProjectSettings/EditorSettings.asset @@ -3,14 +3,16 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_SerializationMode: 2 m_LineEndingsForNewScripts: 0 m_DefaultBehaviorMode: 1 m_PrefabRegularEnvironment: {fileID: 0} m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 5 + m_SpritePackerCacheSize: 10 m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 @@ -19,18 +21,20 @@ EditorSettings: m_ProjectGenerationRootNamespace: m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 m_AsyncShaderCompilation: 1 - m_CachingShaderPreprocessor: 1 m_PrefabModeAllowAutoSave: 1 m_EnterPlayModeOptionsEnabled: 0 m_EnterPlayModeOptions: 3 m_GameObjectNamingDigits: 1 m_GameObjectNamingScheme: 0 m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 m_UseLegacyProbeSampleCount: 0 m_SerializeInlineMappingsOnOneLine: 1 m_DisableCookiesInLightmapper: 1 m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 m_CacheServerMode: 0 m_CacheServerEndpoint: m_CacheServerNamespacePrefix: default @@ -38,3 +42,6 @@ EditorSettings: m_CacheServerEnableUpload: 1 m_CacheServerEnableAuth: 0 m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0