diff --git a/Assets/Prefabs/Collectables.meta b/Assets/Prefabs/Collectables.meta new file mode 100644 index 0000000..6bdfbe2 --- /dev/null +++ b/Assets/Prefabs/Collectables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9cd45d27f29b4e4e68b1d12a2bd112f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Modifications.meta b/Assets/Prefabs/Collectables/Modifications.meta similarity index 100% rename from Assets/Prefabs/Modifications.meta rename to Assets/Prefabs/Collectables/Modifications.meta diff --git a/Assets/Prefabs/Modifications/BorderBuff.asset b/Assets/Prefabs/Collectables/Modifications/BorderBuff.asset similarity index 100% rename from Assets/Prefabs/Modifications/BorderBuff.asset rename to Assets/Prefabs/Collectables/Modifications/BorderBuff.asset diff --git a/Assets/Prefabs/Modifications/BorderBuff.asset.meta b/Assets/Prefabs/Collectables/Modifications/BorderBuff.asset.meta similarity index 100% rename from Assets/Prefabs/Modifications/BorderBuff.asset.meta rename to Assets/Prefabs/Collectables/Modifications/BorderBuff.asset.meta diff --git a/Assets/Prefabs/Modifications/BorderNerf.asset b/Assets/Prefabs/Collectables/Modifications/BorderNerf.asset similarity index 100% rename from Assets/Prefabs/Modifications/BorderNerf.asset rename to Assets/Prefabs/Collectables/Modifications/BorderNerf.asset diff --git a/Assets/Prefabs/Modifications/BorderNerf.asset.meta b/Assets/Prefabs/Collectables/Modifications/BorderNerf.asset.meta similarity index 100% rename from Assets/Prefabs/Modifications/BorderNerf.asset.meta rename to Assets/Prefabs/Collectables/Modifications/BorderNerf.asset.meta diff --git a/Assets/Prefabs/Modifications/Modification.prefab b/Assets/Prefabs/Collectables/Modifications/Modification.prefab similarity index 84% rename from Assets/Prefabs/Modifications/Modification.prefab rename to Assets/Prefabs/Collectables/Modifications/Modification.prefab index 9334bb3..2045766 100644 --- a/Assets/Prefabs/Modifications/Modification.prefab +++ b/Assets/Prefabs/Collectables/Modifications/Modification.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7947935438987891323} - component: {fileID: 7947935438987891317} - component: {fileID: 7947935438987891316} - - component: {fileID: 5272754659973803181} + - component: {fileID: 2362697393472433045} m_Layer: 7 m_Name: Modification m_TagString: Untagged @@ -29,7 +29,7 @@ Transform: 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_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -62,8 +62,8 @@ MonoBehaviour: AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 AutoObjectParentSync: 1 ---- !u!61 &5272754659973803181 -BoxCollider2D: +--- !u!58 &2362697393472433045 +CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -76,15 +76,5 @@ BoxCollider2D: 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: 2, y: 2} - newSize: {x: 2, y: 2} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2, y: 2} - m_EdgeRadius: 0 + m_Radius: 1 diff --git a/Assets/Prefabs/Modifications/Modification.prefab.meta b/Assets/Prefabs/Collectables/Modifications/Modification.prefab.meta similarity index 100% rename from Assets/Prefabs/Modifications/Modification.prefab.meta rename to Assets/Prefabs/Collectables/Modifications/Modification.prefab.meta diff --git a/Assets/Prefabs/Modifications/SpeedBuff.asset b/Assets/Prefabs/Collectables/Modifications/SpeedBuff.asset similarity index 100% rename from Assets/Prefabs/Modifications/SpeedBuff.asset rename to Assets/Prefabs/Collectables/Modifications/SpeedBuff.asset diff --git a/Assets/Prefabs/Modifications/SpeedBuff.asset.meta b/Assets/Prefabs/Collectables/Modifications/SpeedBuff.asset.meta similarity index 100% rename from Assets/Prefabs/Modifications/SpeedBuff.asset.meta rename to Assets/Prefabs/Collectables/Modifications/SpeedBuff.asset.meta diff --git a/Assets/Prefabs/Modifications/SpeedNerf.asset b/Assets/Prefabs/Collectables/Modifications/SpeedNerf.asset similarity index 100% rename from Assets/Prefabs/Modifications/SpeedNerf.asset rename to Assets/Prefabs/Collectables/Modifications/SpeedNerf.asset diff --git a/Assets/Prefabs/Modifications/SpeedNerf.asset.meta b/Assets/Prefabs/Collectables/Modifications/SpeedNerf.asset.meta similarity index 100% rename from Assets/Prefabs/Modifications/SpeedNerf.asset.meta rename to Assets/Prefabs/Collectables/Modifications/SpeedNerf.asset.meta diff --git a/Assets/Prefabs/Modifications/WidthBuff.asset b/Assets/Prefabs/Collectables/Modifications/WidthBuff.asset similarity index 100% rename from Assets/Prefabs/Modifications/WidthBuff.asset rename to Assets/Prefabs/Collectables/Modifications/WidthBuff.asset diff --git a/Assets/Prefabs/Modifications/WidthBuff.asset.meta b/Assets/Prefabs/Collectables/Modifications/WidthBuff.asset.meta similarity index 100% rename from Assets/Prefabs/Modifications/WidthBuff.asset.meta rename to Assets/Prefabs/Collectables/Modifications/WidthBuff.asset.meta diff --git a/Assets/Prefabs/Modifications/WidthNerf.asset b/Assets/Prefabs/Collectables/Modifications/WidthNerf.asset similarity index 100% rename from Assets/Prefabs/Modifications/WidthNerf.asset rename to Assets/Prefabs/Collectables/Modifications/WidthNerf.asset diff --git a/Assets/Prefabs/Modifications/WidthNerf.asset.meta b/Assets/Prefabs/Collectables/Modifications/WidthNerf.asset.meta similarity index 100% rename from Assets/Prefabs/Modifications/WidthNerf.asset.meta rename to Assets/Prefabs/Collectables/Modifications/WidthNerf.asset.meta diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 54495e2..bec77e6 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -590,7 +590,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 34.728683, y: 35} + m_Size: {x: 20.487806, y: 35} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -853,7 +853,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 23.152454 + orthographic size: 21.056911 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -926,11 +926,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 4540566536649322900, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_Size.x - value: 34.728683 + value: 20.487806 objectReference: {fileID: 0} - target: {fileID: 4540566536649322900, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_Size.y - value: 5.6524544 + value: 3.5569115 objectReference: {fileID: 0} - target: {fileID: 4540566536649322901, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_Name @@ -946,7 +946,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4540566536649322903, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_LocalPosition.y - value: -20.326227 + value: -19.278456 objectReference: {fileID: 0} - target: {fileID: 4540566536649322903, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_LocalPosition.z @@ -1068,11 +1068,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 4540566536649322900, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_Size.x - value: 34.728683 + value: 20.487806 objectReference: {fileID: 0} - target: {fileID: 4540566536649322900, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_Size.y - value: 5.6524544 + value: 3.5569115 objectReference: {fileID: 0} - target: {fileID: 4540566536649322901, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_Name @@ -1088,7 +1088,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4540566536649322903, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_LocalPosition.y - value: 20.326227 + value: 19.278456 objectReference: {fileID: 0} - target: {fileID: 4540566536649322903, guid: b4033513367475439bfcd048b5d376a6, type: 3} propertyPath: m_LocalPosition.z diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index f22b55c..a5ffb46 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 5 + m_CurrentQuality: 2 m_QualitySettings: - serializedVersion: 2 name: Very Low