diff --git a/Assets/Sprites/Textures.meta b/Assets/Materials/Textures.meta similarity index 100% rename from Assets/Sprites/Textures.meta rename to Assets/Materials/Textures.meta diff --git a/Assets/Sprites/Textures/Ground003_2K_Color.jpg b/Assets/Materials/Textures/Ground003_2K_Color.jpg similarity index 100% rename from Assets/Sprites/Textures/Ground003_2K_Color.jpg rename to Assets/Materials/Textures/Ground003_2K_Color.jpg diff --git a/Assets/Sprites/Textures/Ground003_2K_Color.jpg.meta b/Assets/Materials/Textures/Ground003_2K_Color.jpg.meta similarity index 100% rename from Assets/Sprites/Textures/Ground003_2K_Color.jpg.meta rename to Assets/Materials/Textures/Ground003_2K_Color.jpg.meta diff --git a/Assets/Sprites/Textures/Ground057_2K_Color.jpg b/Assets/Materials/Textures/Ground057_2K_Color.jpg similarity index 100% rename from Assets/Sprites/Textures/Ground057_2K_Color.jpg rename to Assets/Materials/Textures/Ground057_2K_Color.jpg diff --git a/Assets/Sprites/Textures/Ground057_2K_Color.jpg.meta b/Assets/Materials/Textures/Ground057_2K_Color.jpg.meta similarity index 100% rename from Assets/Sprites/Textures/Ground057_2K_Color.jpg.meta rename to Assets/Materials/Textures/Ground057_2K_Color.jpg.meta diff --git a/Assets/Sprites/Textures/Leather027_2K_Color.jpg b/Assets/Materials/Textures/Leather027_2K_Color.jpg similarity index 100% rename from Assets/Sprites/Textures/Leather027_2K_Color.jpg rename to Assets/Materials/Textures/Leather027_2K_Color.jpg diff --git a/Assets/Sprites/Textures/Leather027_2K_Color.jpg.meta b/Assets/Materials/Textures/Leather027_2K_Color.jpg.meta similarity index 100% rename from Assets/Sprites/Textures/Leather027_2K_Color.jpg.meta rename to Assets/Materials/Textures/Leather027_2K_Color.jpg.meta diff --git a/Assets/Sprites/Textures/Metal027_2K_Color.jpg b/Assets/Materials/Textures/Metal027_2K_Color.jpg similarity index 100% rename from Assets/Sprites/Textures/Metal027_2K_Color.jpg rename to Assets/Materials/Textures/Metal027_2K_Color.jpg diff --git a/Assets/Sprites/Textures/Metal027_2K_Color.jpg.meta b/Assets/Materials/Textures/Metal027_2K_Color.jpg.meta similarity index 100% rename from Assets/Sprites/Textures/Metal027_2K_Color.jpg.meta rename to Assets/Materials/Textures/Metal027_2K_Color.jpg.meta diff --git a/Assets/Sprites/Textures/Metal046B_2K_Color.jpg b/Assets/Materials/Textures/Metal046B_2K_Color.jpg similarity index 100% rename from Assets/Sprites/Textures/Metal046B_2K_Color.jpg rename to Assets/Materials/Textures/Metal046B_2K_Color.jpg diff --git a/Assets/Sprites/Textures/Metal046B_2K_Color.jpg.meta b/Assets/Materials/Textures/Metal046B_2K_Color.jpg.meta similarity index 100% rename from Assets/Sprites/Textures/Metal046B_2K_Color.jpg.meta rename to Assets/Materials/Textures/Metal046B_2K_Color.jpg.meta diff --git a/Assets/Materials/Textures/groundtexture.png b/Assets/Materials/Textures/groundtexture.png new file mode 100644 index 0000000..8452cec Binary files /dev/null and b/Assets/Materials/Textures/groundtexture.png differ diff --git a/Assets/Materials/Textures/groundtexture.png.meta b/Assets/Materials/Textures/groundtexture.png.meta new file mode 100644 index 0000000..502fd47 --- /dev/null +++ b/Assets/Materials/Textures/groundtexture.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 25a36c7e8494dd240813121694c2892e +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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: 0 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Textures/tree_air.png b/Assets/Materials/Textures/tree_air.png similarity index 100% rename from Assets/Sprites/Textures/tree_air.png rename to Assets/Materials/Textures/tree_air.png diff --git a/Assets/Sprites/Textures/tree_air.png.meta b/Assets/Materials/Textures/tree_air.png.meta similarity index 88% rename from Assets/Sprites/Textures/tree_air.png.meta rename to Assets/Materials/Textures/tree_air.png.meta index f875f14..8bcc7d2 100644 --- a/Assets/Sprites/Textures/tree_air.png.meta +++ b/Assets/Materials/Textures/tree_air.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9aa3539871d22ba4da05ae6c01419d2a +guid: 2d8b9471475840547b389b6f65fd4102 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -101,18 +101,6 @@ TextureImporter: overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/Textures/tree_earth.png b/Assets/Materials/Textures/tree_earth.png similarity index 100% rename from Assets/Sprites/Textures/tree_earth.png rename to Assets/Materials/Textures/tree_earth.png diff --git a/Assets/Sprites/Textures/tree_earth.png.meta b/Assets/Materials/Textures/tree_earth.png.meta similarity index 88% rename from Assets/Sprites/Textures/tree_earth.png.meta rename to Assets/Materials/Textures/tree_earth.png.meta index 3742465..816af1f 100644 --- a/Assets/Sprites/Textures/tree_earth.png.meta +++ b/Assets/Materials/Textures/tree_earth.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 15ff37416bd2d214f921e8ad3564fe56 +guid: d25be8b9bdbdd7b4f91b66b7669cfdc2 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -101,18 +101,6 @@ TextureImporter: overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/Textures/tree_fire.png b/Assets/Materials/Textures/tree_fire.png similarity index 100% rename from Assets/Sprites/Textures/tree_fire.png rename to Assets/Materials/Textures/tree_fire.png diff --git a/Assets/Sprites/Textures/tree_fire.png.meta b/Assets/Materials/Textures/tree_fire.png.meta similarity index 88% rename from Assets/Sprites/Textures/tree_fire.png.meta rename to Assets/Materials/Textures/tree_fire.png.meta index 1c2f40b..84adf38 100644 --- a/Assets/Sprites/Textures/tree_fire.png.meta +++ b/Assets/Materials/Textures/tree_fire.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91721d6b8264ab648bfbb43ec32e7fc4 +guid: 4c5f61d43e4b29e42b1574c766e9d52b TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -101,18 +101,6 @@ TextureImporter: overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/Textures/tree_water.png b/Assets/Materials/Textures/tree_water.png similarity index 100% rename from Assets/Sprites/Textures/tree_water.png rename to Assets/Materials/Textures/tree_water.png diff --git a/Assets/Sprites/Textures/tree_water.png.meta b/Assets/Materials/Textures/tree_water.png.meta similarity index 88% rename from Assets/Sprites/Textures/tree_water.png.meta rename to Assets/Materials/Textures/tree_water.png.meta index 3a6ca33..8fa3174 100644 --- a/Assets/Sprites/Textures/tree_water.png.meta +++ b/Assets/Materials/Textures/tree_water.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ea335a176a5fbf4788ca846f1c836d7 +guid: fe284baa5b1d0c14bbadcdd0fb824c2d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -45,7 +45,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -101,18 +101,6 @@ TextureImporter: overridden: 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Prefabs/ChargeIcon.prefab b/Assets/Prefabs/ChargeIcon.prefab deleted file mode 100644 index 96dc5cb..0000000 --- a/Assets/Prefabs/ChargeIcon.prefab +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &647327799610026706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 647327799610026707} - - component: {fileID: 647327799610026709} - - component: {fileID: 647327799610026708} - m_Layer: 5 - m_Name: ChargeIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &647327799610026707 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647327799610026706} - 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_RootOrder: 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.5, y: 0.5} ---- !u!222 &647327799610026709 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647327799610026706} - m_CullTransparentMesh: 1 ---- !u!114 &647327799610026708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647327799610026706} - 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: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/Enemies/FSM Test.prefab.meta b/Assets/Prefabs/Enemies/FSM Test.prefab.meta index aa8c36d..48524c6 100644 --- a/Assets/Prefabs/Enemies/FSM Test.prefab.meta +++ b/Assets/Prefabs/Enemies/FSM Test.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b3765ad42efc38a45a739a663e72a9c9 +guid: c048c7a22f5f2e64c943ab0d0a612ebd PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/PrimaryAbilities.meta b/Assets/Prefabs/PrimaryAbilities.meta new file mode 100644 index 0000000..4e898da --- /dev/null +++ b/Assets/Prefabs/PrimaryAbilities.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Prefabs/PrimaryAbilities.meta +guid: 8d7fb160ad7474f4fae4e50e77942681 +======== +guid: 23bc49dd5614f7c43b52309c07d652b5 +>>>>>>>> main:Assets/Scripts/Enemy/RangedEnemyStateMachine.meta +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PrimaryAbilities/Cum Shot.asset b/Assets/Prefabs/PrimaryAbilities/Cum Shot.asset new file mode 100644 index 0000000..1774cd8 --- /dev/null +++ b/Assets/Prefabs/PrimaryAbilities/Cum Shot.asset @@ -0,0 +1,29 @@ +%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: f61da909e33d4694e94b81a69ac2528e, type: 3} + m_Name: Cum Shot + m_EditorClassIdentifier: + element: 1 + icon: {fileID: 0} + descrption: + projectilePrefab: {fileID: 5514849272783740179, guid: ad513c4529097b947bb237d3e677cce6, type: 3} + damage: 5 + knockback: 3 + maxAmmo: 6 + fireRate: 0.25 + reloadDur: 0.75 + projectileSpeed: 7 + projectileRange: 15 + projectileSize: 1 + projectiles: 1 + spreadAngle: 0 + piercing: 0 diff --git a/Assets/Scripts/PostProcessing/Custom_ZaWarudo.mat.meta b/Assets/Prefabs/PrimaryAbilities/Cum Shot.asset.meta similarity index 64% rename from Assets/Scripts/PostProcessing/Custom_ZaWarudo.mat.meta rename to Assets/Prefabs/PrimaryAbilities/Cum Shot.asset.meta index 30d25ca..a0c0870 100644 --- a/Assets/Scripts/PostProcessing/Custom_ZaWarudo.mat.meta +++ b/Assets/Prefabs/PrimaryAbilities/Cum Shot.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 59469dbf2e89bb843b5944fa36dbbca3 +guid: a4d5939606bbc4d4b8f2fc2f5885e5a4 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/Player Projectiles/Cumshot.prefab b/Assets/Prefabs/PrimaryAbilities/Cumshot.prefab similarity index 100% rename from Assets/Prefabs/Player Projectiles/Cumshot.prefab rename to Assets/Prefabs/PrimaryAbilities/Cumshot.prefab diff --git a/Assets/Prefabs/Player Projectiles/Cumshot.prefab.meta b/Assets/Prefabs/PrimaryAbilities/Cumshot.prefab.meta similarity index 100% rename from Assets/Prefabs/Player Projectiles/Cumshot.prefab.meta rename to Assets/Prefabs/PrimaryAbilities/Cumshot.prefab.meta diff --git a/Assets/Prefabs/Player Projectiles.meta b/Assets/Prefabs/SecondaryAbilities.meta similarity index 77% rename from Assets/Prefabs/Player Projectiles.meta rename to Assets/Prefabs/SecondaryAbilities.meta index 05a7b6d..be8954f 100644 --- a/Assets/Prefabs/Player Projectiles.meta +++ b/Assets/Prefabs/SecondaryAbilities.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78625f6a995e8c04f9e12d48f2efb855 +guid: 5965da7b8a3c91d46a1000ebfd837f6b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Prefabs/Player Projectiles/Weapon.prefab b/Assets/Prefabs/SecondaryAbilities/WindDash.prefab similarity index 59% rename from Assets/Prefabs/Player Projectiles/Weapon.prefab rename to Assets/Prefabs/SecondaryAbilities/WindDash.prefab index 0690762..f174fd1 100644 --- a/Assets/Prefabs/Player Projectiles/Weapon.prefab +++ b/Assets/Prefabs/SecondaryAbilities/WindDash.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3620316338873583146 +--- !u!1 &1777243582170073701 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,22 +8,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3620316338873583144} - - component: {fileID: 3620316338873583145} + - component: {fileID: 1777243582170073700} + - component: {fileID: 1777243582170073703} m_Layer: 0 - m_Name: Weapon + m_Name: WindDash m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3620316338873583144 +--- !u!4 &1777243582170073700 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3620316338873583146} + m_GameObject: {fileID: 1777243582170073701} 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} @@ -32,27 +32,20 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3620316338873583145 +--- !u!114 &1777243582170073703 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3620316338873583146} + m_GameObject: {fileID: 1777243582170073701} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e3bb3b2a62f8f6e4fa14e85f9a723799, type: 3} + m_Script: {fileID: 11500000, guid: 341a9d60f7d160d4a8903ee180ffbef0, type: 3} m_Name: m_EditorClassIdentifier: - projectilePrefab: {fileID: 5514849272783740179, guid: ad513c4529097b947bb237d3e677cce6, type: 3} - damage: 10 - knockback: 3 - maxAmmo: 6 - fireRate: 0.25 - reloadDur: 0.75 - projectileSpeed: 10 - projectileRange: 20 - projectileSize: 1 - projectiles: 1 - spreadAngle: 0 - piercing: 0 + element: 0 + icon: {fileID: 21300000, guid: ddf6a8f037daba0499a55611a31b1ecc, type: 3} + cooldown: 7 + dashSpeed: 5 + dashDur: 0.3 diff --git a/Assets/Prefabs/Player Projectiles/Weapon.prefab.meta b/Assets/Prefabs/SecondaryAbilities/WindDash.prefab.meta similarity index 74% rename from Assets/Prefabs/Player Projectiles/Weapon.prefab.meta rename to Assets/Prefabs/SecondaryAbilities/WindDash.prefab.meta index fd22479..84bbfc1 100644 --- a/Assets/Prefabs/Player Projectiles/Weapon.prefab.meta +++ b/Assets/Prefabs/SecondaryAbilities/WindDash.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c79e638cc8493f94cb8bc087f634b053 +guid: 78ce441a30b1b8c4e97e0475b254569d PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Tree.prefab b/Assets/Prefabs/Tree.prefab index 04a4aa3..ca4e435 100644 --- a/Assets/Prefabs/Tree.prefab +++ b/Assets/Prefabs/Tree.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 5408959970718934390} - component: {fileID: 5408959970718934389} - component: {fileID: 5408959970718934388} - - component: {fileID: 9128095857155091393} m_Layer: 0 m_Name: Tree m_TagString: Untagged @@ -28,7 +27,7 @@ Transform: m_GameObject: {fileID: 5408959970718934411} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 250, y: 250, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -99,15 +98,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: sr: {fileID: 5408959970718934389} ---- !u!114 &9128095857155091393 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5408959970718934411} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4bd45e2b5cbe3544ca427b7c3b641adf, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index df56381..323a35d 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -487,7 +487,7 @@ SpriteRenderer: m_SortingLayerID: 1087963019 m_SortingLayer: -1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 5ff0ff7a1c794404c9db5db6188b625d, type: 3} + m_Sprite: {fileID: 21300000, guid: 25a36c7e8494dd240813121694c2892e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -1234,6 +1234,8 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +<<<<<<< HEAD +======= --- !u!111 &828537379 Animation: m_ObjectHideFlags: 0 @@ -1353,6 +1355,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +>>>>>>> main --- !u!1 &1152402137 GameObject: m_ObjectHideFlags: 0 @@ -1945,6 +1948,8 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: +<<<<<<< HEAD +======= - target: {fileID: 9103264971355901553, guid: 6018beeab07cecf41935eb0fbd910f1e, type: 3} propertyPath: m_Mass value: 0.0001 @@ -1957,6 +1962,7 @@ PrefabInstance: propertyPath: m_Simulated value: 1 objectReference: {fileID: 0} +>>>>>>> main - target: {fileID: 9103264971355901554, guid: 6018beeab07cecf41935eb0fbd910f1e, type: 3} propertyPath: m_RootOrder value: 5 @@ -2001,15 +2007,23 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} +<<<<<<< HEAD +======= - target: {fileID: 9103264971355901557, guid: 6018beeab07cecf41935eb0fbd910f1e, type: 3} propertyPath: m_IsTrigger value: 0 objectReference: {fileID: 0} +>>>>>>> main - target: {fileID: 9103264971355901566, guid: 6018beeab07cecf41935eb0fbd910f1e, type: 3} propertyPath: xp value: 5 objectReference: {fileID: 0} - target: {fileID: 9103264971355901566, guid: 6018beeab07cecf41935eb0fbd910f1e, type: 3} +<<<<<<< HEAD + propertyPath: element + value: 0 + objectReference: {fileID: 0} +======= propertyPath: range value: 2 objectReference: {fileID: 0} @@ -2025,6 +2039,7 @@ PrefabInstance: propertyPath: detectRange value: 8 objectReference: {fileID: 0} +>>>>>>> main - target: {fileID: 9103264971355901567, guid: 6018beeab07cecf41935eb0fbd910f1e, type: 3} propertyPath: m_Name value: Slime diff --git a/Assets/Scenes/coom.unity b/Assets/Scenes/coom.unity index 3b6b52c..6f24a27 100644 --- a/Assets/Scenes/coom.unity +++ b/Assets/Scenes/coom.unity @@ -72,21 +72,21 @@ LightmapSettings: m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 - m_BakeBackend: 0 + m_BakeBackend: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 + m_PVRSampleCount: 512 m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentSampleCount: 256 m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 + m_PVREnvironmentMIS: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &7601562 +--- !u!1 &296804848 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,270 +131,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7601564} - - component: {fileID: 7601563} - - component: {fileID: 7601567} - - component: {fileID: 7601565} - m_Layer: 0 - m_Name: VoronoiMap - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &7601563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7601562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d25d0a2d23a835e499463157550b87dc, type: 3} - m_Name: - m_EditorClassIdentifier: - map: {fileID: 1158679626} - biomeGrid: 50 - noiseMult: 500 - noiseDist: 5 - seed: 0 - biomes: - - {fileID: 11400000, guid: 351789d4a25bc9d4a979847a8b259191, type: 2} - - {fileID: 11400000, guid: e81b045534d590f49a93de431c65f2b4, type: 2} - - {fileID: 11400000, guid: eb359e20aa3ffb94aa2c681d73c6e098, type: 2} - - {fileID: 11400000, guid: cec124e5b1c2dc84eac226aa72194478, type: 2} - - {fileID: 11400000, guid: b58a46e76c005f949bb34bdad2406787, type: 2} - - {fileID: 11400000, guid: 37916d8183dce3448ac36ef86d1ff1fc, type: 2} - - {fileID: 11400000, guid: b0753266f3683d44180257e7dde4ea02, type: 2} - - {fileID: 11400000, guid: 86133294e3610c749b4c883f794a9e08, type: 2} - - {fileID: 11400000, guid: c82f2a352f95fff4a9aeb7ee6ddc79d5, type: 2} - mapSize: - x: 0 - y: 0 - width: 500 - height: 500 - autoUpdate: 0 - isGened: 1 - biomeBlendScalar: 0.25 ---- !u!4 &7601564 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7601562} - 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: 1158679629} - - {fileID: 636982202} - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7601565 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7601562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0618d18ca76b5b458ce10389bdf226f, type: 3} - m_Name: - m_EditorClassIdentifier: - seed: 0 ---- !u!114 &7601567 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7601562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ddd52f07ca91c84ab480547f3fd7ffd, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 25 - regionSize: {x: 500, y: 500} - rejectionSamples: 30 - displayRadius: 2 - treePrefab: {fileID: 5408959970718934388, guid: a9b3661511720474e8d108bb10854f07, type: 3} ---- !u!1 &115503835 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 115503838} - - component: {fileID: 115503837} - - component: {fileID: 115503836} - m_Layer: 5 - m_Name: Cooldown count - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &115503836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115503835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 128 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 128 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 69 ---- !u!222 &115503837 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115503835} - m_CullTransparentMesh: 1 ---- !u!224 &115503838 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 115503835} - 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: 1215726940} - m_RootOrder: 1 - 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!1 &137488758 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 137488759} - - component: {fileID: 137488761} - - component: {fileID: 137488760} - m_Layer: 5 - m_Name: Portrait - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &137488759 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 137488758} - 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: 1314167580} - m_Father: {fileID: 741608938} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -120, y: 120} - m_SizeDelta: {x: 240, y: 240} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &137488760 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 137488758} - 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: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &137488761 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 137488758} - m_CullTransparentMesh: 1 ---- !u!1 &519420028 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 519420032} - - component: {fileID: 519420031} - - component: {fileID: 519420029} - - component: {fileID: 519420033} - - component: {fileID: 519420034} - - component: {fileID: 519420035} + - component: {fileID: 296804851} + - component: {fileID: 296804850} + - component: {fileID: 296804849} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -402,25 +141,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &519420029 +--- !u!81 &296804849 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} + m_GameObject: {fileID: 296804848} m_Enabled: 1 ---- !u!20 &519420031 +--- !u!20 &296804850 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} + m_GameObject: {fileID: 296804848} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -445,671 +184,31 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 - m_TargetEye: 0 + m_TargetEye: 3 m_HDR: 1 - m_AllowMSAA: 0 + m_AllowMSAA: 1 m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 - m_OcclusionCulling: 0 + m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!4 &519420032 +--- !u!4 &296804851 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - 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: 1672777498} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &519420033 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 0 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &519420034 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1bcf22d2c4b55584e8403be23f6a29e6, type: 3} - m_Name: - m_EditorClassIdentifier: - shader: {fileID: 4800000, guid: 299d1e655a9398845b7e53b9c8ee8adc, type: 3} - falloff: 25 - power: 0.25 - maxPower: 0.25 - minPower: -0.25 ---- !u!114 &519420035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4453be4f3c43a6a4ba204afc4746e5f9, type: 3} - m_Name: - m_EditorClassIdentifier: - shader: {fileID: 4800000, guid: 52b8b39aa914cf7418ab40a6459351d5, type: 3} - state: 0 - timeInterp: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 1 - outSlope: 1 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 1 - tangentMode: 34 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - time: 0 - duration: 1 ---- !u!1 &591857751 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 591857754} - - component: {fileID: 591857753} - - component: {fileID: 591857752} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &591857752 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 591857751} - 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 ---- !u!114 &591857753 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 591857751} - 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!4 &591857754 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 591857751} - 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_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &636982200 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 636982202} - - component: {fileID: 636982201} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &636982201 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 636982200} - 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: 1087963019 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 5ff0ff7a1c794404c9db5db6188b625d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 2 - m_Size: {x: 500, y: 500} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &636982202 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 636982200} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 250, y: 250, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7601564} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &647132919 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 647132920} - - component: {fileID: 647132921} - - component: {fileID: 647132922} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &647132920 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647132919} - 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: 702414624} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 0.25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &647132921 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647132919} - m_CullTransparentMesh: 1 ---- !u!114 &647132922 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 647132919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} - 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: 60337729713d1e549b2ce458c7408060, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!21 &647299143 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: MultTilemap (Instance) (Instance) (Instance) (Instance) - m_Shader: {fileID: 4800000, guid: 87817c82c23dcf5469ccb1f94117c33b, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 1416786691} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Texture: - m_Texture: {fileID: 2800000, guid: a6835f91d2df3704ca0d2f625e7bf445, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0.15686275} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] ---- !u!1 &657868761 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 657868765} - - component: {fileID: 657868764} - - component: {fileID: 657868763} - - component: {fileID: 657868762} - m_Layer: 0 - m_Name: AudioManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &657868762 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 657868761} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 3943073439568897341, guid: ee16103207bf13a42b709f8327ab76c9, type: 2} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - 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!82 &657868763 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 657868761} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -8216069637900250059, guid: ee16103207bf13a42b709f8327ab76c9, type: 2} - 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!114 &657868764 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 657868761} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad4019e7547fed458a3b43df22323f0, type: 3} - m_Name: - m_EditorClassIdentifier: - mixer: {fileID: 24100000, guid: ee16103207bf13a42b709f8327ab76c9, type: 2} - musicSource: {fileID: 657868763} - soundSource: {fileID: 657868762} ---- !u!4 &657868765 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 657868761} + m_GameObject: {fileID: 296804848} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +<<<<<<< HEAD +======= --- !u!1 &702414622 GameObject: m_ObjectHideFlags: 0 @@ -2590,3 +1689,4 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3765ad42efc38a45a739a663e72a9c9, type: 3} +>>>>>>> main diff --git a/Assets/Scenes/coom.unity.meta b/Assets/Scenes/coom.unity.meta index 3e6a231..6b10457 100644 --- a/Assets/Scenes/coom.unity.meta +++ b/Assets/Scenes/coom.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25188f8c9d2ff7547a25de7cf870fdb7 +guid: ab736a4e6bcf7b54f89060bf6c5a2818 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scriptable objects.meta b/Assets/Scriptable objects.meta index 1b7e884..047ce7c 100644 --- a/Assets/Scriptable objects.meta +++ b/Assets/Scriptable objects.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aefd36979a1420541b193ad882b2696d +guid: beccda42072ea05478e784cf8c4ee6a9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Primary Upgrades.meta b/Assets/Scriptable objects/Primary Upgrades.meta index 1abbffa..3df7d6c 100644 --- a/Assets/Scriptable objects/Primary Upgrades.meta +++ b/Assets/Scriptable objects/Primary Upgrades.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 41c5f27eaffe2f943a31ef3f67d28a55 +guid: 76869e9b508a3fa4ca2ae3fbc493ef27 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth.meta b/Assets/Scriptable objects/Primary Upgrades/Earth.meta index 3f69fac..0da0092 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fa6f6b45572064741980f5a7364dbb5e +guid: 2639979aaed82b24b9624f3db1263297 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Dog.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Dog.asset.meta index ffc2405..39f2b5a 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Dog.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Dog.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 633198057e1ad7b4b8d5851d1fe67eb9 +guid: bd5a1dbb9f931ff4ea6ed1248cd06f17 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 1.asset.meta index 5a6caf9..cb02ff3 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 74062d465ee94fd4ca6c0876f6b384e4 +guid: e0b5b708210af2943abac9879ab1b009 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 2.asset.meta index c1107ee..7a9ab21 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 99dc89a28182b8148afe20c90196fc60 +guid: d21770898fb43684792652dd4aa0715a NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 3.asset.meta index 4e31355..93d8d38 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0776adf30f163564f9b2f47a05f991dd +guid: 6b6f464f94711154abbbc1aba7984087 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 4.asset.meta index c5bfe24..93632b1 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 6baf59306496b85488cb099b0e16bdb4 +guid: 4524162153310f04a96e432c76e7735d NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 5.asset.meta index b357b99..a379980 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Shockwave 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 869f5b89f00c4c549bf08427c817b368 +guid: d6ca7caef5fd86048b19c96ef55d815a NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 1.asset.meta index 409e1d3..4aaa250 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 21e736ccd3d1ea540b7b2736be236f5a +guid: f93e515b4ab78464f82458234aa6021b NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 2.asset.meta index 72fd919..8cc03c3 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b14a0d3877279964d8ced5a76c57317a +guid: 18d7c79f43bc37d44ab33be34ab9337c NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 3.asset.meta index f6fd468..ccfdb5d 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 70677e2848421d4478556b1209ec42e5 +guid: f844fe52b97511a4c8c0441643bca291 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 4.asset.meta index ef2075d..0373938 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c8d7d2c122492b24b816b39a8dbff783 +guid: 35f0853088ee1c244bbd44d9d9aac4c2 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 5.asset.meta index 37fa127..df38341 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Earth/Stagger 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 2bfd40a322b5554418b949d81ebd0194 +guid: 540f83f3f58e9a94789ea68f7f1aef97 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire.meta b/Assets/Scriptable objects/Primary Upgrades/Fire.meta index 2a052db..496fde2 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 270be2f85fbefcd43b5515bc33571534 +guid: 38130b8728371b0468d4fd239a639316 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Combustion.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Combustion.asset.meta index 5afb392..26ab950 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Combustion.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Combustion.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 09509d64aa1c4d0449fa4669817c5102 +guid: ee218073b004f31428888d82cbc521fa NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 1.asset.meta index a17f9ad..92584b0 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3846d21ca30c1cd468d823f65e75a3ee +guid: 2ca96c0b71c5cef4ea9198f7765703f8 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 2.asset.meta index 1b21200..0608307 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 6fded33af9df10b45b02dcae69d92c57 +guid: 090b9315bde3e684ead45fba3056c6b8 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 3.asset.meta index b41942a..09517e2 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 89a0384bf920f63488ed5a0c1e654e48 +guid: 48e58c9d75c207946b24b5949b4bb23c NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 4.asset.meta index b69dcb9..61ae417 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4cc1c6022c26f264991704ea13fe7376 +guid: e8a8546c1b4a4264cb08396d5424ab7f NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 5.asset.meta index ac93c69..8775d0a 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromancy 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3e77bd58685feaa479cab04ed7818d48 +guid: 8cc8e60da0fc89341997ff13f083119c NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 1.asset.meta index 9c77353..2fa418d 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 441579b234501ef489e7fc03cbc3507e +guid: bd02a0d2d2e2ab44885dd232f0c0b1c7 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 2.asset.meta index ece62ee..8285e82 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 6bfeb48c92fb5a7409cd0e8811c4c860 +guid: 72d5e9c5f91d4e7419ab2623e1d6a25d NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 3.asset.meta index e69a632..9816146 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4e6461992ec9744448b6da414a141209 +guid: 6d4aaedfaf2c05648be8fabbfeb66f6a NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 4.asset.meta index 6d5113e..ecd148a 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 2c42ced79296de643a62fc4945618626 +guid: 1d8b3aea081e6174e81f9e411093e8e0 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 5.asset.meta index 8f1b2de..069d599 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Fire/Pyromaniac 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 104e3a85b17d3ca4ab98c0de06449802 +guid: 6398619de76107b409269bdf22692bf5 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water.meta b/Assets/Scriptable objects/Primary Upgrades/Water.meta index f52c058..95d3d16 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1619e705bcd18d845b9ff2514afd328f +guid: 19b5f29c7dbb4d2488730392a8845db7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 1.asset.meta index b45db10..65bb52a 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: f4d319fb8cc71794aaf4ace71d5ead7b +guid: b68894c0894a96545afc538a3dcd1252 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 2.asset.meta index ee813ee..d53fbf1 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e435a6b80244a7840bd81448260d681a +guid: dc5ce21526cc4794cbc1c4ba1c4c7b6d NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 3.asset.meta index 09b30e3..7ba854a 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 7f6699b456cbbcb4d877cffbd58ba331 +guid: b23b4ef3544e2c14abc673f10f28ff8f NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 4.asset.meta index a79d1b0..e8765e3 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 30c4f79549880cb48b2376831ef6e0e1 +guid: 644c453a1bfb1ca4ba42223d2f020914 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 5.asset.meta index 0419059..b98d1fe 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Frost 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Frost 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: a08479fb1155f28498a2ac950f73a842 +guid: 1fa0fa73cf8a4644faefec75d040edc9 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Holy Water.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Holy Water.asset.meta index ebe4908..eebac74 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Holy Water.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Holy Water.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: ad7c564d9cf44e84095ffbcfe13e8d4b +guid: 2f02bbb78c9572d409e4d4f51fd2c5c8 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 1.asset.meta index e82ac1b..9d0bb82 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 2c4ea0cdfac5e6442bdaa9bda1afe5d3 +guid: c67b4d1e8754fd44d8feb0b91ef603a8 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 2.asset.meta index d2e9853..5bd1a0a 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 52c37ed3f650d434aa1d0bacc90c227b +guid: ebed087809153654aa18a118f128dc91 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 3.asset.meta index 7a26b61..dd98b19 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 2c61bc5798729ef4981637162013114f +guid: 515add8fec9788941813bdc1cb593fa3 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 4.asset.meta index 063a4d0..1fbe890 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e7112d377baa86c46aeef3fcbe00806f +guid: 121b112c74167654bbd743b2281c5aad NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 5.asset.meta index a568b3d..994aa45 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Water/Pierce 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 6f436d07a9d619c4594e2a2f7cd06c79 +guid: f7c582ac9d6692248938e06c5aec9362 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind.meta b/Assets/Scriptable objects/Primary Upgrades/Wind.meta index 6d97190..88bfd73 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2adad8a08025fe344b7bc62236695edf +guid: 9b42a3f07c6e4fa409cce1311ee5b58c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 1.asset.meta index eae3acc..a2e106c 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: e45f46f38830fb7408c27f04caa2fb8b +guid: 394e38549fdfcaa47bbf3b6cf63f357e NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 2.asset.meta index a682769..55d0469 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 579421fd1b7c1ee4ab1346b132e5613f +guid: b4c0b9c19790f9e4b9d0d805841e925b NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 3.asset.meta index badc0d6..1e6124c 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: f341514cf920c374bb2ac9f71b36bebc +guid: 596966b51c0cbe2449aa4c00a9a8881f NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 4.asset.meta index 6103a68..1e4f836 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 3af1aab34e243354baa239a84ffcb061 +guid: 6ff6ddaf50b572541b3035adcad09080 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 5.asset.meta index 264b6a3..b6edba6 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Multishot 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 25fac8eb4b1682843ba6834018194727 +guid: c8376500db7bf6c4486886e719c83d9e NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 1.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 1.asset.meta index c7c5918..f956e0d 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 1.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 1f92cd181a7e1d9478673665c685d8d9 +guid: 2336af2245545f444838101af1249151 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 2.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 2.asset.meta index 0e3c9ac..eab5d73 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 2.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 1e89ef96a2d187649ba7acdd9ba34e86 +guid: 6de49c9ec10f67b41b5649fd9cd67609 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 3.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 3.asset.meta index 93657a3..b76c0cb 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 3.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 3.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 85c5ed8f85cd86940b6f0cab85e9ab5d +guid: fffb3ccc602ce474b96784425647024f NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 4.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 4.asset.meta index 50db238..4ffbca6 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 4.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 4.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 747ed34a5b98f0b42a1086dc4af447c3 +guid: bae940f2a33dd0548b3bb581345c7be9 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 5.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 5.asset.meta index af6e5b8..145dfde 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 5.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Swiftshot 5.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: fa57358152cf47a458f30eb5a2a50c7d +guid: 49411c38a9e59a04d8320bcbcdcf96de NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Primary Upgrades/Wind/Tailwind.asset.meta b/Assets/Scriptable objects/Primary Upgrades/Wind/Tailwind.asset.meta index 3f99c81..75692f1 100644 --- a/Assets/Scriptable objects/Primary Upgrades/Wind/Tailwind.asset.meta +++ b/Assets/Scriptable objects/Primary Upgrades/Wind/Tailwind.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 59425e22596107845b6667a006591388 +guid: 9f63a44ccf04745469c325487416eb30 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Secondary Upgrades.meta b/Assets/Scriptable objects/Secondary Upgrades.meta index be8954f..9680fc4 100644 --- a/Assets/Scriptable objects/Secondary Upgrades.meta +++ b/Assets/Scriptable objects/Secondary Upgrades.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5965da7b8a3c91d46a1000ebfd837f6b +guid: 77a898ba7a2a13c45b43d48088a320bf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 1.asset.meta b/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 1.asset.meta index 8566797..ed119df 100644 --- a/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 1.asset.meta +++ b/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 1.asset.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 70da05f170b951f4fbe32bb7ed0e4d3e -NativeFormatImporter: +guid: beda328b60131364ab111874ba5bfc8b +PrefabImporter: externalObjects: {} - mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 2.asset.meta b/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 2.asset.meta index d864052..8ae765d 100644 --- a/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 2.asset.meta +++ b/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 2.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 83da448c10eef264ead923df15c21125 -NativeFormatImporter: +guid: 5eb990581dd136e4dadf47c26aced663 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 3.asset.meta b/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 3.asset.meta index e2aaf03..b08625a 100644 --- a/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 3.asset.meta +++ b/Assets/Scriptable objects/Secondary Upgrades/Wind Dash 3.asset.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 8d75c2a23ba4b074698055098bdcd21b -NativeFormatImporter: +guid: 3f9972bf4c0a58c41bcb74344b9302f3 +PrefabImporter: externalObjects: {} - mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/AssetDB.cs b/Assets/Scripts/AssetDB.cs index 0f5e883..908f9be 100644 --- a/Assets/Scripts/AssetDB.cs +++ b/Assets/Scripts/AssetDB.cs @@ -4,8 +4,12 @@ using System.IO; using UnityEngine; +<<<<<<< HEAD +public enum Element: uint { Fire, Wind, Earth, Water }; +======= public enum Element: uint { Fire, Wind, Earth, Water, Neutral }; public enum StatusType { Burn, Frost, Frostbite, Shockwave }; +>>>>>>> main public class Region { public Biome biome; @@ -17,6 +21,7 @@ public class Affinity public float[] baseRatio; public Color colourProfile; } + [System.Serializable] public class StatusEffect { diff --git a/Assets/Scripts/Entities/BaseState.cs b/Assets/Scripts/BaseState.cs similarity index 100% rename from Assets/Scripts/Entities/BaseState.cs rename to Assets/Scripts/BaseState.cs diff --git a/Assets/Scripts/Entities/BaseState.cs.meta b/Assets/Scripts/BaseState.cs.meta similarity index 100% rename from Assets/Scripts/Entities/BaseState.cs.meta rename to Assets/Scripts/BaseState.cs.meta diff --git a/Assets/Scripts/MapGen/Biome.cs b/Assets/Scripts/Biome.cs similarity index 100% rename from Assets/Scripts/MapGen/Biome.cs rename to Assets/Scripts/Biome.cs diff --git a/Assets/Scripts/MapGen/Biome.cs.meta b/Assets/Scripts/Biome.cs.meta similarity index 100% rename from Assets/Scripts/MapGen/Biome.cs.meta rename to Assets/Scripts/Biome.cs.meta diff --git a/Assets/Scripts/Editor/VoronoiMapGeneratorEditor.cs b/Assets/Scripts/Editor/VoronoiMapGeneratorEditor.cs index cccd1e8..ad4eacf 100644 --- a/Assets/Scripts/Editor/VoronoiMapGeneratorEditor.cs +++ b/Assets/Scripts/Editor/VoronoiMapGeneratorEditor.cs @@ -3,44 +3,20 @@ using UnityEditor; using ProcGen; -[CustomEditor(typeof(VoronoiMapGen))] -public class VoronoiMapGeneratorEditor : Editor -{ - public override void OnInspectorGUI() - { - VoronoiMapGen mapGen = (VoronoiMapGen)target; - - if (DrawDefaultInspector()) - { - if (mapGen.autoUpdate) - { - mapGen.GenerateMap(); - } - } - - if (GUILayout.Button("Generate")) - { - mapGen.GenerateMap(); - } - } -} +[CustomEditor (typeof (VoronoiMapGen))] +public class VoronoiMapGeneratorEditor : Editor { + public override void OnInspectorGUI() { + VoronoiMapGen mapGen = (VoronoiMapGen)target; -[CustomEditor(typeof(MapManager))] -public class MapManagerEditor : Editor -{ - public override void OnInspectorGUI() - { - MapManager mapGen = (MapManager)target; - - if (DrawDefaultInspector()) - { - } + if (DrawDefaultInspector ()) { + if (mapGen.autoUpdate) { + mapGen.GenerateMap (); + } + } - if (GUILayout.Button("Generate")) - { - mapGen.Generate(); - } - } + if (GUILayout.Button ("Generate")) { + mapGen.GenerateMap (); + } + } } - diff --git a/Assets/Scripts/Enemy/Enemy.cs b/Assets/Scripts/Enemy/Enemy.cs index 8311901..a2a6806 100644 --- a/Assets/Scripts/Enemy/Enemy.cs +++ b/Assets/Scripts/Enemy/Enemy.cs @@ -9,16 +9,12 @@ public enum Element{FIRE, WATER, EARTH, WIND}; public int HP = 100; public float range; public float speed; - public float detectRange; public Element element; public Enemy(){ HP = 100; + this.element = Element.FIRE; //Debug.Log("Default enemy created"); } - public void TakeDamage(int dmg){ - this.HP -= dmg; - } - } diff --git a/Assets/Scripts/Enemy/Enemy.cs.meta b/Assets/Scripts/Enemy/Enemy.cs.meta index 1e86472..4f4649a 100644 --- a/Assets/Scripts/Enemy/Enemy.cs.meta +++ b/Assets/Scripts/Enemy/Enemy.cs.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Scripts/UI.cs.meta -guid: a5a0fbbafcebe3d4cb227173d5150f65 -======== guid: ef5873f779bccdf419f1dc0735d62958 ->>>>>>>> main:Assets/Scripts/Enemy/Enemy.cs.meta MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Enemy/EnemyBaseState.cs b/Assets/Scripts/Enemy/EnemyBaseState.cs new file mode 100644 index 0000000..d027d21 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyBaseState.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +public abstract class EnemyBaseState : MonoBehaviour{ + public abstract void OnEnter(EnemyStateManager esm); + + public abstract void OnUpdate(EnemyStateManager esm); + + public abstract void OnExit(EnemyStateManager esm); + + public abstract void OnCollide(EnemyStateManager esm, Collision2D col); +} diff --git a/Assets/Scripts/SpriteReorderer.cs.meta b/Assets/Scripts/Enemy/EnemyBaseState.cs.meta similarity index 51% rename from Assets/Scripts/SpriteReorderer.cs.meta rename to Assets/Scripts/Enemy/EnemyBaseState.cs.meta index e4aa8b9..58dfafb 100644 --- a/Assets/Scripts/SpriteReorderer.cs.meta +++ b/Assets/Scripts/Enemy/EnemyBaseState.cs.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Scripts/SpriteReorderer.cs.meta -guid: 4bd45e2b5cbe3544ca427b7c3b641adf -======== -guid: f4c3230a76299c94da801780ab60649b ->>>>>>>> main:Assets/Scripts/Enemy/Slime.cs.meta +guid: 41348d25c1a7fca4dbc0ec012ee25f03 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Enemy/EnemyDashState.cs b/Assets/Scripts/Enemy/EnemyDashState.cs new file mode 100644 index 0000000..7f86850 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyDashState.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyDashState : EnemyBaseState +{ + private GameObject player; + private Transform pos; + private Slime slime; + private bool dashComplete = false; + + IEnumerator Dash(Transform pos, Vector3 target){ + + // Animate precharge + yield return new WaitForSeconds(.5f); + // Animate charge + while(pos.position != target){ + pos.position = Vector2.MoveTowards(pos.position, target, slime.speed * 3 * Time.deltaTime); + } + dashComplete = true; + } + + public override void OnEnter(EnemyStateManager esm){ + player = GameObject.Find("Player"); + pos = esm.GetComponent(); + slime = esm.GetComponent(); + dashComplete = false; + StartCoroutine(Dash(pos, player.transform.position)); + } + + public override void OnUpdate(EnemyStateManager esm){ + if(dashComplete){ + esm.SwitchState(esm.RetreatState); + } + } + + public override void OnExit(EnemyStateManager esm){ + + } + + public override void OnCollide(EnemyStateManager esm, Collision2D col){ + switch(col.gameObject.layer){ + case 6: + //col.gameObject.TakeDamage(10); IDK how you implementing that + break; + case 7: + slime.HP -= 10; + break; + } + } +} diff --git a/Assets/Scripts/Enemy/EnemyDashState.cs.meta b/Assets/Scripts/Enemy/EnemyDashState.cs.meta new file mode 100644 index 0000000..64331f7 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyDashState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a91a3f3a6dff89548b5c2b8844a899ba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyFollowState.cs b/Assets/Scripts/Enemy/EnemyFollowState.cs new file mode 100644 index 0000000..5482a7f --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyFollowState.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyFollowState : EnemyBaseState +{ + public GameObject player; + public Transform pos; + public Slime slime; + + public override void OnEnter(EnemyStateManager esm){ + player = GameObject.Find("Player"); + slime = esm.GetComponent(); + pos = esm.GetComponent(); + } + + public override void OnUpdate(EnemyStateManager esm){ + float dist = Vector2.Distance(pos.position, player.transform.position); + if (dist >= slime.range){ + pos.position = Vector2.MoveTowards(pos.position, player.transform.position, slime.speed * Time.deltaTime); + }else{ + esm.SwitchState(esm.DashState); + } + } + + public override void OnExit(EnemyStateManager esm){ + + } + + public override void OnCollide(EnemyStateManager esm, Collision2D col){ + switch(col.gameObject.layer){ + case 6: + //col.gameObject.TakeDamage(10); IDK how you implementing that + break; + case 7: + slime.HP -= 10; + break; + } + } +} diff --git a/Assets/Scripts/Enemy/EnemyFollowState.cs.meta b/Assets/Scripts/Enemy/EnemyFollowState.cs.meta new file mode 100644 index 0000000..2419cab --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyFollowState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3028d0899ddf5134a9845d15070637f8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyIdleState.cs b/Assets/Scripts/Enemy/EnemyIdleState.cs new file mode 100644 index 0000000..1549ed5 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyIdleState.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyIdleState : EnemyBaseState +{ + public Slime slime; + bool move = false; + + IEnumerator waiter(){ + //play idle anim + yield return new WaitForSeconds(1); + move = true; + } + + public override void OnEnter(EnemyStateManager esm){ + slime = esm.GetComponent(); + StartCoroutine(waiter()); + } + + public override void OnUpdate(EnemyStateManager esm){ + if(move){ + esm.SwitchState(esm.FollowState); + } + } + + public override void OnExit(EnemyStateManager esm){ + + } + + public override void OnCollide(EnemyStateManager esm, Collision2D col){ + switch(col.gameObject.layer){ + case 6: + //col.gameObject.TakeDamage(10); IDK how you implementing that + break; + case 7: + slime.HP -= 10; + break; + } + } +} diff --git a/Assets/Scripts/Enemy/EnemyIdleState.cs.meta b/Assets/Scripts/Enemy/EnemyIdleState.cs.meta new file mode 100644 index 0000000..0ee3b95 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyIdleState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6de990e004f953c47bdb26d25433fb47 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyProjectile.cs.meta b/Assets/Scripts/Enemy/EnemyProjectile.cs.meta index 7a90afd..7479172 100644 --- a/Assets/Scripts/Enemy/EnemyProjectile.cs.meta +++ b/Assets/Scripts/Enemy/EnemyProjectile.cs.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs.meta +guid: 5d36d81d1146b3446b440c2d202701ec +======== guid: 186adcc09f528114b8058dae85bbe4e9 +>>>>>>>> main:Assets/Scripts/Enemy/EnemyProjectile.cs.meta MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Enemy/EnemyRetreatState.cs b/Assets/Scripts/Enemy/EnemyRetreatState.cs new file mode 100644 index 0000000..b9841f4 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyRetreatState.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyRetreatState : EnemyBaseState +{ + public GameObject player; + public Transform pos; + public Slime slime; + public Vector3 retreatSpot; + private bool retreatComplete; + + private Vector3 GetRetreatSpot(){ + Vector3 retreatSpot = player.transform.position + new Vector3(Random.Range(-8, 8), Random.Range(-8, 8), 0); + return retreatSpot; + } + + public override void OnEnter(EnemyStateManager esm){ + player = GameObject.Find("Player"); + slime = esm.GetComponent(); + pos = esm.GetComponent(); + retreatSpot = GetRetreatSpot(); + } + + public override void OnUpdate(EnemyStateManager esm){ + float dist = Vector2.Distance(pos.position, player.transform.position); + + if(pos.position != retreatSpot){ + pos.position = Vector2.MoveTowards(pos.position, retreatSpot, slime.speed * Time.deltaTime); + }else{ + if(dist > 4){ + esm.SwitchState(esm.FollowState); + }else{ + retreatSpot += retreatSpot; + } + } + } + + public override void OnExit(EnemyStateManager esm){ + + } + + public override void OnCollide(EnemyStateManager esm, Collision2D col){ + switch(col.gameObject.layer){ + case 7: + slime.HP -= 10; + break; + } + } +} diff --git a/Assets/Scripts/Enemy/EnemyRetreatState.cs.meta b/Assets/Scripts/Enemy/EnemyRetreatState.cs.meta new file mode 100644 index 0000000..fcc1043 --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyRetreatState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c8bf2007639e956479894ac8d3ed4cf2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/EnemyStateManager.cs b/Assets/Scripts/Enemy/EnemyStateManager.cs new file mode 100644 index 0000000..601e3ec --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyStateManager.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyStateManager : MonoBehaviour +{ + [Header("Current State")] + public EnemyBaseState currentState; + + public EnemyIdleState IdleState = new EnemyIdleState(); + public EnemyFollowState FollowState = new EnemyFollowState(); + public EnemyRetreatState RetreatState = new EnemyRetreatState(); + public EnemyDashState DashState = new EnemyDashState(); + + void Start(){ + currentState = IdleState; + + currentState.OnEnter(this); + } + + public void Update(){ + currentState.OnUpdate(this); + } + + public void OnCollision(Collision2D col){ + currentState.OnCollide(this, col); + } + + public void SwitchState(EnemyBaseState state){ + currentState = state; + currentState.OnEnter(this); + } +} diff --git a/Assets/Scripts/Enemy/EnemyStateManager.cs.meta b/Assets/Scripts/Enemy/EnemyStateManager.cs.meta new file mode 100644 index 0000000..5967ede --- /dev/null +++ b/Assets/Scripts/Enemy/EnemyStateManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 199b2c687ff6205479875e6196d94928 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Enemy/RangedEnemyStateMachine.meta b/Assets/Scripts/Enemy/RangedEnemyStateMachine.meta index ba1038c..374a46c 100644 --- a/Assets/Scripts/Enemy/RangedEnemyStateMachine.meta +++ b/Assets/Scripts/Enemy/RangedEnemyStateMachine.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Prefabs/PrimaryAbilities.meta +guid: b990faeae29d6ce40a32fc24ce0dc73f +======== guid: 23bc49dd5614f7c43b52309c07d652b5 +>>>>>>>> main:Assets/Scripts/Enemy/RangedEnemyStateMachine.meta folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Enemy/Slime.cs b/Assets/Scripts/Enemy/Slime.cs index 6d1d1b5..e73fa3a 100644 --- a/Assets/Scripts/Enemy/Slime.cs +++ b/Assets/Scripts/Enemy/Slime.cs @@ -6,17 +6,11 @@ public class Slime : Enemy { [Header("Components")] public GameObject Player; // Can probably change datatype back to transform - private Player player; private Rigidbody2D rb; public SlimeStateManager ssm; - void setElement(Element e){ - this.element = e; - } - void Awake(){ Player = GameObject.Find("Player"); - player = Player.GetComponent(); rb = gameObject.GetComponent(); ssm = gameObject.GetComponent(); } @@ -27,15 +21,11 @@ void Update() ssm.Update(); if(this.HP <= 0){ - Destroy(gameObject); // I should probably do a dying state + Destroy(gameObject); } } void OnCollisionEnter2D(Collision2D col){ - if (col.gameObject.layer==6) Debug.Log("Player damaged"); //player.TakeDamage(); - } - - void TakeDamage(int dmg){ - this.HP -= dmg; - } + esm.OnCollision(col); + } } diff --git a/Assets/Scripts/Enemy/Slime.cs.meta b/Assets/Scripts/Enemy/Slime.cs.meta index 95ca4a2..5c2942b 100644 --- a/Assets/Scripts/Enemy/Slime.cs.meta +++ b/Assets/Scripts/Enemy/Slime.cs.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Scripts/SpriteReorderer.cs.meta -guid: 1106e3fb77908554182058115819edcf -======== guid: f4c3230a76299c94da801780ab60649b ->>>>>>>> main:Assets/Scripts/Enemy/Slime.cs.meta MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities.meta b/Assets/Scripts/Entities.meta index 444ae7e..56e4212 100644 --- a/Assets/Scripts/Entities.meta +++ b/Assets/Scripts/Entities.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a562a5f55a68104e9364322b87445eb +guid: b94b4b8af3d4d7d4d956983f9c777317 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Entities/Enemies.meta b/Assets/Scripts/Entities/Enemies.meta index d8ce74e..38139fd 100644 --- a/Assets/Scripts/Entities/Enemies.meta +++ b/Assets/Scripts/Entities/Enemies.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 514075bff56a68b4d999f9fb04d82c3b +guid: 394ba64f67aeb4349b68be6142f92322 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Entities/Enemies/BaseEnemy.cs.meta b/Assets/Scripts/Entities/Enemies/BaseEnemy.cs.meta index eb5eeb6..79fe505 100644 --- a/Assets/Scripts/Entities/Enemies/BaseEnemy.cs.meta +++ b/Assets/Scripts/Entities/Enemies/BaseEnemy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2b33ce41d31e634fa47e2e67e2dc810 +guid: 8622f3757457afb43b308aa0409be1a9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities/Player.meta b/Assets/Scripts/Entities/Player.meta index e67c3c5..d96cc7c 100644 --- a/Assets/Scripts/Entities/Player.meta +++ b/Assets/Scripts/Entities/Player.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a6d9717e14d2b04783b2ded43a3eb12 +guid: f1cb96c7cb5730e45a19740b2437bb16 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Entities/Player/Player.cs.meta b/Assets/Scripts/Entities/Player/Player.cs.meta index a872101..f195e0e 100644 --- a/Assets/Scripts/Entities/Player/Player.cs.meta +++ b/Assets/Scripts/Entities/Player/Player.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 76452218f938d9946a6e9cc54964c047 +guid: 36bb74faa1b713148a5d3b5b4a46139c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities.meta b/Assets/Scripts/Entities/Player/PrimaryAbilities.meta index c47dfa8..ab29051 100644 --- a/Assets/Scripts/Entities/Player/PrimaryAbilities.meta +++ b/Assets/Scripts/Entities/Player/PrimaryAbilities.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5981a1a1d83096b489b7059b0b1b5c5f +guid: 54392570cdd15cf4bb245fed7aedc7ce folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PrimaryWeapon.cs.meta b/Assets/Scripts/Entities/Player/PrimaryAbilities/PrimaryWeapon.cs.meta index 59d6c1b..2bba1d5 100644 --- a/Assets/Scripts/Entities/Player/PrimaryAbilities/PrimaryWeapon.cs.meta +++ b/Assets/Scripts/Entities/Player/PrimaryAbilities/PrimaryWeapon.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e3bb3b2a62f8f6e4fa14e85f9a723799 +guid: e27cef312b4d2254ebdcf05f75c882b1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities/Player/SecondaryAbilities.meta b/Assets/Scripts/Entities/Player/SecondaryAbilities.meta index 76b6936..4feb139 100644 --- a/Assets/Scripts/Entities/Player/SecondaryAbilities.meta +++ b/Assets/Scripts/Entities/Player/SecondaryAbilities.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 89795082198ede34f8fed706e1fad78d +guid: c40f80533d7e2b645ab324bdd24bf230 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Entities/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta b/Assets/Scripts/Entities/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta index 03274e6..dbc274c 100644 --- a/Assets/Scripts/Entities/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta +++ b/Assets/Scripts/Entities/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7379ec4a4304e2142bb88227e61cddbf +guid: 6513353c27481d44696bed560d09870a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities/Player/Upgrade.cs.meta b/Assets/Scripts/Entities/Player/Upgrade.cs.meta index 34fa5ef..f4c7fbe 100644 --- a/Assets/Scripts/Entities/Player/Upgrade.cs.meta +++ b/Assets/Scripts/Entities/Player/Upgrade.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 761dc54da5c3a21488ed82bc0bfae898 +guid: cfc1f08e0e28a47458cbacb1d7cb8368 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities/Player/UpgradeDB.cs.meta b/Assets/Scripts/Entities/Player/UpgradeDB.cs.meta index 01480ce..95861dc 100644 --- a/Assets/Scripts/Entities/Player/UpgradeDB.cs.meta +++ b/Assets/Scripts/Entities/Player/UpgradeDB.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5af71fbbbea77a44eafbae52b74e7065 +guid: bb38cb69853fdc64f94024e24ec1f4e1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Entities/StatusManager.cs.meta b/Assets/Scripts/Entities/StatusManager.cs.meta index 0923b9c..c3e3262 100644 --- a/Assets/Scripts/Entities/StatusManager.cs.meta +++ b/Assets/Scripts/Entities/StatusManager.cs.meta @@ -1,11 +1,11 @@ fileFormatVersion: 2 -guid: ee1b27235dd2fac43b7344c7e5e2748c +guid: 9d930e9f40e3ecf48af7d5557535c6c8 MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {instanceID: 0} + icon: {fileID: 2800000, guid: ddf6a8f037daba0499a55611a31b1ecc, type: 3} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 56d64bf..38b7272 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -6,6 +6,16 @@ public class GameManager : MonoBehaviour { public static GameManager instance; private Player _player; +<<<<<<< HEAD + public static Player Player + { + get { return instance._player; } + } + public static void SetPlayer(Player player) + { + instance._player = player; + } +======= private float _tickRate = 0.4f; // Tickrate for DoT and status effects private float _timeScale = 1; // Player stuff are not affected but everything else should be private bool _isPaused = false; @@ -17,7 +27,14 @@ public class GameManager : MonoBehaviour public static bool IsPaused { get => instance._isPaused; set { instance._isPaused = value; } } +>>>>>>> main public AudioClip bgm; + private bool isPaused = false; + public static bool IsPaused + { + get { return instance.isPaused; } + set { instance.isPaused = value; } + } private void Awake() { diff --git a/Assets/Scriptable objects/Biomes.meta b/Assets/Scripts/MapGen/Biomes.meta similarity index 100% rename from Assets/Scriptable objects/Biomes.meta rename to Assets/Scripts/MapGen/Biomes.meta diff --git a/Assets/Scriptable objects/Biomes/Earth Nation 1.asset b/Assets/Scripts/MapGen/Biomes/Earth Nation 1.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Earth Nation 1.asset rename to Assets/Scripts/MapGen/Biomes/Earth Nation 1.asset index 1b46ee8..4409920 100644 --- a/Assets/Scriptable objects/Biomes/Earth Nation 1.asset +++ b/Assets/Scripts/MapGen/Biomes/Earth Nation 1.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 15ff37416bd2d214f921e8ad3564fe56, type: 3} + - {fileID: 21300000, guid: cbb2072a170ee334995250aec2a79e78, type: 3} + - {fileID: 21300000, guid: 2c57019f71cd23942b8ace56dd449b08, type: 3} + - {fileID: 21300000, guid: f70a84ed15f507c4eaf9474fbe9ffaeb, type: 3} + - {fileID: 21300000, guid: 61984cf72f1e60b478c4e20a5fb343cb, type: 3} + - {fileID: 21300000, guid: cb921dc048977714ebc79ee59bb1cae6, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Earth Nation 1.asset.meta b/Assets/Scripts/MapGen/Biomes/Earth Nation 1.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Earth Nation 1.asset.meta rename to Assets/Scripts/MapGen/Biomes/Earth Nation 1.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Earth Nation.asset b/Assets/Scripts/MapGen/Biomes/Earth Nation.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Earth Nation.asset rename to Assets/Scripts/MapGen/Biomes/Earth Nation.asset index 32f55d8..54c6b9a 100644 --- a/Assets/Scriptable objects/Biomes/Earth Nation.asset +++ b/Assets/Scripts/MapGen/Biomes/Earth Nation.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 15ff37416bd2d214f921e8ad3564fe56, type: 3} + - {fileID: 21300000, guid: 9791c838fd703384dba494defc9bf920, type: 3} + - {fileID: 21300000, guid: 8c7fea4fbf8d3eb4baa7ea1e576575e6, type: 3} + - {fileID: 21300000, guid: 92c3ce41969d2424aa5b36a2fce72d98, type: 3} + - {fileID: 21300000, guid: e2d2a3e311cd8cd4394817d7f0aed8e2, type: 3} + - {fileID: 21300000, guid: 26621bbe89d56e54a86ca6a6d4b370e0, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Earth Nation.asset.meta b/Assets/Scripts/MapGen/Biomes/Earth Nation.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Earth Nation.asset.meta rename to Assets/Scripts/MapGen/Biomes/Earth Nation.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Fire Nation 1.asset b/Assets/Scripts/MapGen/Biomes/Fire Nation 1.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Fire Nation 1.asset rename to Assets/Scripts/MapGen/Biomes/Fire Nation 1.asset index 2664ac8..5e87419 100644 --- a/Assets/Scriptable objects/Biomes/Fire Nation 1.asset +++ b/Assets/Scripts/MapGen/Biomes/Fire Nation 1.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 91721d6b8264ab648bfbb43ec32e7fc4, type: 3} + - {fileID: 21300000, guid: 57750e1f5a599d5498d1dfa042dd3b29, type: 3} + - {fileID: 21300000, guid: f73b42c3f865dae4ca41af288a4ca4ea, type: 3} + - {fileID: 21300000, guid: 342bfa07dfaca1d42aff3405dc9d2627, type: 3} + - {fileID: 21300000, guid: 1a4affc6b8c48ff40be3daa1bf699c98, type: 3} + - {fileID: 21300000, guid: a7407a96bb69be84baf96ab17b2e59cb, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Fire Nation 1.asset.meta b/Assets/Scripts/MapGen/Biomes/Fire Nation 1.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Fire Nation 1.asset.meta rename to Assets/Scripts/MapGen/Biomes/Fire Nation 1.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Fire Nation.asset b/Assets/Scripts/MapGen/Biomes/Fire Nation.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Fire Nation.asset rename to Assets/Scripts/MapGen/Biomes/Fire Nation.asset index 3a62d2a..d257049 100644 --- a/Assets/Scriptable objects/Biomes/Fire Nation.asset +++ b/Assets/Scripts/MapGen/Biomes/Fire Nation.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 91721d6b8264ab648bfbb43ec32e7fc4, type: 3} + - {fileID: 21300000, guid: da20de41677398447a703472faea34d7, type: 3} + - {fileID: 21300000, guid: 0827c8bdb8873904f9fdb5e5262e3b42, type: 3} + - {fileID: 21300000, guid: 11a9ed08860bbcc46842ceb996099d2f, type: 3} + - {fileID: 21300000, guid: 59c3161e67c423641a293908fc1494c8, type: 3} + - {fileID: 21300000, guid: d55b88684f2a54146b4b60e614075a91, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Fire Nation.asset.meta b/Assets/Scripts/MapGen/Biomes/Fire Nation.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Fire Nation.asset.meta rename to Assets/Scripts/MapGen/Biomes/Fire Nation.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Imagi Nation.asset b/Assets/Scripts/MapGen/Biomes/Imagi Nation.asset similarity index 73% rename from Assets/Scriptable objects/Biomes/Imagi Nation.asset rename to Assets/Scripts/MapGen/Biomes/Imagi Nation.asset index 17a5265..e21eec3 100644 --- a/Assets/Scriptable objects/Biomes/Imagi Nation.asset +++ b/Assets/Scripts/MapGen/Biomes/Imagi Nation.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f010236f43b5d49815df47044d448f, type: 3} m_Name: Imagi Nation m_EditorClassIdentifier: - element: 4 + element: 1 colour: {r: 1, g: 1, b: 1, a: 1} elementSpawnRate: serializedVersion: 2 @@ -43,4 +43,9 @@ MonoBehaviour: m_Mode: 1 m_NumColorKeys: 4 m_NumAlphaKeys: 2 - treeSprites: [] + treeSprites: + - {fileID: 21300000, guid: c92d16a4ae0639847b627d9b16556f09, type: 3} + - {fileID: 21300000, guid: c88cc5c75cdd5c748af1249b4576a9a1, type: 3} + - {fileID: 21300000, guid: ffcbb9d3afa6ff942be09af0e494f1ce, type: 3} + - {fileID: 21300000, guid: 25859693308bde143bd9015b7d0df1c6, type: 3} + - {fileID: 21300000, guid: 16c0bc259d248c149aa497deb1ad22fa, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Imagi Nation.asset.meta b/Assets/Scripts/MapGen/Biomes/Imagi Nation.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Imagi Nation.asset.meta rename to Assets/Scripts/MapGen/Biomes/Imagi Nation.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Water Nation 1.asset b/Assets/Scripts/MapGen/Biomes/Water Nation 1.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Water Nation 1.asset rename to Assets/Scripts/MapGen/Biomes/Water Nation 1.asset index fa196a5..6558556 100644 --- a/Assets/Scriptable objects/Biomes/Water Nation 1.asset +++ b/Assets/Scripts/MapGen/Biomes/Water Nation 1.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 3ea335a176a5fbf4788ca846f1c836d7, type: 3} + - {fileID: 21300000, guid: 6f5e8d2d10ea0e0429b0d115809742d6, type: 3} + - {fileID: 21300000, guid: f7de4c7160dac034699b3d2551826dfc, type: 3} + - {fileID: 21300000, guid: 7e098e5dd8edd604f94e4819ae86646f, type: 3} + - {fileID: 21300000, guid: feb06b9fcde29b641b0ae34ac7a361c5, type: 3} + - {fileID: 21300000, guid: ed0a73be873f5d54196e66f10fa2c02a, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Water Nation 1.asset.meta b/Assets/Scripts/MapGen/Biomes/Water Nation 1.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Water Nation 1.asset.meta rename to Assets/Scripts/MapGen/Biomes/Water Nation 1.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Water Nation.asset b/Assets/Scripts/MapGen/Biomes/Water Nation.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Water Nation.asset rename to Assets/Scripts/MapGen/Biomes/Water Nation.asset index daef403..920e38a 100644 --- a/Assets/Scriptable objects/Biomes/Water Nation.asset +++ b/Assets/Scripts/MapGen/Biomes/Water Nation.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 3ea335a176a5fbf4788ca846f1c836d7, type: 3} + - {fileID: 21300000, guid: ac7082fb14a6cfc4484e1c5825f26593, type: 3} + - {fileID: 21300000, guid: 89ef23dee3dbf044ea4ae28b6dd31676, type: 3} + - {fileID: 21300000, guid: 8498f24168e79c44096c50792812b5e0, type: 3} + - {fileID: 21300000, guid: 2fed07a5688d9aa439709b6b42b661cd, type: 3} + - {fileID: 21300000, guid: d0656eff1fb115644acaf914bdd3af88, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Water Nation.asset.meta b/Assets/Scripts/MapGen/Biomes/Water Nation.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Water Nation.asset.meta rename to Assets/Scripts/MapGen/Biomes/Water Nation.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Wind Nation 1.asset b/Assets/Scripts/MapGen/Biomes/Wind Nation 1.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Wind Nation 1.asset rename to Assets/Scripts/MapGen/Biomes/Wind Nation 1.asset index 73b54ae..74ecba4 100644 --- a/Assets/Scriptable objects/Biomes/Wind Nation 1.asset +++ b/Assets/Scripts/MapGen/Biomes/Wind Nation 1.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 9aa3539871d22ba4da05ae6c01419d2a, type: 3} + - {fileID: 21300000, guid: 24d4393ecabec844b8e52dd6c955b0ce, type: 3} + - {fileID: 21300000, guid: eca41c943d5af984e9497fe31b54c130, type: 3} + - {fileID: 21300000, guid: 3798072f067820949bc4a130196b9601, type: 3} + - {fileID: 21300000, guid: c6e25ad5d3e075f4ebacc006ca05e552, type: 3} + - {fileID: 21300000, guid: fe24897a918b75447826df70a44edc4d, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Wind Nation 1.asset.meta b/Assets/Scripts/MapGen/Biomes/Wind Nation 1.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Wind Nation 1.asset.meta rename to Assets/Scripts/MapGen/Biomes/Wind Nation 1.asset.meta diff --git a/Assets/Scriptable objects/Biomes/Wind Nation.asset b/Assets/Scripts/MapGen/Biomes/Wind Nation.asset similarity index 75% rename from Assets/Scriptable objects/Biomes/Wind Nation.asset rename to Assets/Scripts/MapGen/Biomes/Wind Nation.asset index 2426d6a..7c04268 100644 --- a/Assets/Scriptable objects/Biomes/Wind Nation.asset +++ b/Assets/Scripts/MapGen/Biomes/Wind Nation.asset @@ -44,4 +44,8 @@ MonoBehaviour: m_NumColorKeys: 4 m_NumAlphaKeys: 2 treeSprites: - - {fileID: 21300000, guid: 9aa3539871d22ba4da05ae6c01419d2a, type: 3} + - {fileID: 21300000, guid: fe24897a918b75447826df70a44edc4d, type: 3} + - {fileID: 21300000, guid: 1eaf3fb329752274084367ed1502d4d0, type: 3} + - {fileID: 21300000, guid: ed3231251e429ef4ca32eb43ea8336b7, type: 3} + - {fileID: 21300000, guid: 696581e7547e5f14ab2f14da6ef83656, type: 3} + - {fileID: 21300000, guid: 43f49254bc073064083abf0d919b3aa0, type: 3} diff --git a/Assets/Scriptable objects/Biomes/Wind Nation.asset.meta b/Assets/Scripts/MapGen/Biomes/Wind Nation.asset.meta similarity index 100% rename from Assets/Scriptable objects/Biomes/Wind Nation.asset.meta rename to Assets/Scripts/MapGen/Biomes/Wind Nation.asset.meta diff --git a/Assets/Scripts/MapGen/MapManager.cs b/Assets/Scripts/MapGen/MapManager.cs index c2cf9a4..d360e91 100644 --- a/Assets/Scripts/MapGen/MapManager.cs +++ b/Assets/Scripts/MapGen/MapManager.cs @@ -18,20 +18,15 @@ public class MapManager : MonoBehaviour private void Awake() { _ = this; + mapGen = GetComponent(); + treeGen = GetComponent(); } private void Start() { - Generate(); - } - public void Generate() - { - mapGen = GetComponent(); - treeGen = GetComponent(); seed = Random.Range(0, int.MaxValue); mapGen.seed = seed; mapGen.GenerateMap(); treeGen.SpawnTrees(); - } } } \ No newline at end of file diff --git a/Assets/Scriptable objects/Utility Upgrades.meta b/Assets/Scripts/MapGen/PerlinGen.meta similarity index 77% rename from Assets/Scriptable objects/Utility Upgrades.meta rename to Assets/Scripts/MapGen/PerlinGen.meta index d1c7e36..ad348fc 100644 --- a/Assets/Scriptable objects/Utility Upgrades.meta +++ b/Assets/Scripts/MapGen/PerlinGen.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c57936581f8e1142971830beee4ba3f +guid: 4e46ce0ac0a31984593e44af708c96d3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/MapGen/Poisson disc sampling/TreeGen.cs b/Assets/Scripts/MapGen/Poisson disc sampling/TreeGen.cs index 96725ad..73e3909 100644 --- a/Assets/Scripts/MapGen/Poisson disc sampling/TreeGen.cs +++ b/Assets/Scripts/MapGen/Poisson disc sampling/TreeGen.cs @@ -21,11 +21,8 @@ public void SpawnTrees() { var region = MapManager.GetRegion(points[i]); if (region == null) continue; - if (region.biome.treeSprites.Length > 0) - { - Tree tree = Instantiate(treePrefab, points[i], Quaternion.identity); - tree.sr.sprite = region.biome.treeSprites.RandomElement(); - } + Tree tree = Instantiate(treePrefab, points[i], Quaternion.identity); + tree.sr.sprite = region.biome.treeSprites.RandomElement(); } } diff --git a/Assets/Scripts/MapGen/Voroinoi Gen/VoronoiMapGen.cs b/Assets/Scripts/MapGen/Voroinoi Gen/VoronoiMapGen.cs index d4c0862..d732c3d 100644 --- a/Assets/Scripts/MapGen/Voroinoi Gen/VoronoiMapGen.cs +++ b/Assets/Scripts/MapGen/Voroinoi Gen/VoronoiMapGen.cs @@ -63,7 +63,7 @@ public void GenerateMap() //This algo of voronoi generation will make center always be in top right or bottom left quadrants of the gridCell int centerScalar = SeedRandom.Get(gridX, gridY) % biomeGrid; veci2 center = new veci2(centerScalar + gridX * biomeGrid, centerScalar + gridY * biomeGrid); - Biome selectedBiome = biomes[math.abs( SeedRandom.Get(gridX, -gridY)) % biomes.Length]; + Biome selectedBiome = biomes[SeedRandom.Get(gridX, gridY) % biomes.Length]; var region = new Region() { biome = selectedBiome, Center = center }; regionGrid.Add(gridVec, region); } diff --git a/Assets/Prefabs/ChargeIcon.prefab.meta b/Assets/Scripts/Player.meta similarity index 57% rename from Assets/Prefabs/ChargeIcon.prefab.meta rename to Assets/Scripts/Player.meta index 2d9afeb..e67c3c5 100644 --- a/Assets/Prefabs/ChargeIcon.prefab.meta +++ b/Assets/Scripts/Player.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: f70a17a446ee2444db2aecc2064bb89f -PrefabImporter: +guid: 0a6d9717e14d2b04783b2ded43a3eb12 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs new file mode 100644 index 0000000..fc05732 --- /dev/null +++ b/Assets/Scripts/Player/Player.cs @@ -0,0 +1,116 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using PlayerStates; + +public class Player : StateMachine +{ + internal Rigidbody2D rb; + internal SpriteRenderer sr; + internal Vector2 moveDir; + internal Vector2 lookDir; + Camera cam; + [Header("Components")] + public Slider reloadBar; + public BasePrimaryAbility primary; + public BaseSecondaryAbility secondary; + public override BaseState DefaultState() => new StopState(this); + internal virtual BasePrimary PrimaryAbility() => primary.PrimaryState(); + internal virtual BaseSecondary SecondaryAbility() => secondary.SecondaryState(); + protected internal bool FirePrimary => Input.GetMouseButton(0) && currentAmmo > 0; + protected internal bool FireSecondary => Input.GetMouseButton(1) && currentCooldown <= 0; + [Header("Player Stats")] + public float moveSpeed = 4f; + public float attackMoveSpeedMultiplier = 0.75f; + protected internal int currentAmmo; + protected internal float currentCooldown; + float reloadTimer; + protected override void Awake() + { + base.Awake(); + rb = GetComponent(); + sr = GetComponent(); + cam = Camera.main; + } + protected override void Start() + { + base.Start(); + GameManager.SetPlayer(this); + InitAbilities(); + } + protected override void Update() + { + base.Update(); + Vector2 mousePos = cam.ScreenToWorldPoint(Input.mousePosition); + lookDir = (mousePos - (Vector2)transform.position).normalized; + Vector2 moveInput = new Vector2(Input.GetAxisRaw("Horizontal"), Input.GetAxisRaw("Vertical")); + moveDir = moveInput.magnitude > 1e-7 ? moveInput.normalized : Vector2.zero; + ReloadAmmo(); + RechargeCooldown(); + + if (currentState is BaseIdle && FirePrimary) + ChangeState(PrimaryAbility()); + if (currentState is not BaseSecondary && FireSecondary) + ChangeState(SecondaryAbility()); + if (currentState.bufferPoint) + { + if (FirePrimary) + bufferedState = PrimaryAbility(); + if (FireSecondary) + bufferedState = SecondaryAbility(); + } + Region currentReg = ProcGen.MapManager.GetRegion(transform.position); + if (currentReg == null) return; + print($"Currently in {currentReg.biome.name}"); + + } + public void ActivatePrimary(Vector2 targetDir, bool piercing) + { + var attack = Instantiate(primary.projectilePrefab, transform.position, Quaternion.identity); + attack.targetDir = targetDir; + attack.range = primary.projectileRange; + attack.speed = primary.projectileSpeed; + attack.transform.localScale = Vector3.one * primary.projectileSize; + attack.piercing = piercing; + attack.Init(); + } + public void ActivateSecondary() + { + currentCooldown = secondary.cooldown; + } + public void ReloadAmmo() + { + if (currentState is BasePrimary || currentState is BaseSecondary || currentAmmo >= primary.maxAmmo) + { + reloadBar.gameObject.SetActive(false); + reloadTimer = 0; + } + else + { + reloadBar.gameObject.SetActive(true); + reloadTimer += Time.deltaTime; + reloadBar.value = reloadTimer / primary.reloadDur; + if (reloadTimer >= primary.reloadDur) + { + currentAmmo = primary.maxAmmo; + reloadTimer = 0; + } + } + } + public void RechargeCooldown() + { + if (currentCooldown > 0) + { + currentCooldown -= Time.deltaTime; + // Do some ui shit here + } + } + public void InitAbilities() + { + primary.player = this; + secondary.player = this; + currentAmmo = primary.maxAmmo; + currentCooldown = 0; + } +} diff --git a/Assets/Scripts/Player/Player.cs.meta b/Assets/Scripts/Player/Player.cs.meta new file mode 100644 index 0000000..a872101 --- /dev/null +++ b/Assets/Scripts/Player/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 76452218f938d9946a6e9cc54964c047 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Entities/Player/PlayerProjectile.cs b/Assets/Scripts/Player/PlayerProjectile.cs similarity index 82% rename from Assets/Scripts/Entities/Player/PlayerProjectile.cs rename to Assets/Scripts/Player/PlayerProjectile.cs index 3ead40f..d3c87a7 100644 --- a/Assets/Scripts/Entities/Player/PlayerProjectile.cs +++ b/Assets/Scripts/Player/PlayerProjectile.cs @@ -8,7 +8,7 @@ public class PlayerProjectile : MonoBehaviour public Vector2 targetDir; public float speed; public float range; - public int pierce; + public bool piercing; float age; private void Awake() { @@ -16,6 +16,7 @@ private void Awake() } public void Init() { + rb.velocity = speed * targetDir; } private void Update() { @@ -23,16 +24,10 @@ private void Update() if (age > range) // despawn when proj reaches distance limit Despawn(); } - private void FixedUpdate() - { - rb.velocity = speed * targetDir; - } private void OnTriggerEnter2D(Collider2D collision) { - if (pierce <= 0 && collision.CompareTag("Mob")) + if (!piercing && collision.CompareTag("Mob")) Despawn(); - else - pierce--; } public void Despawn() { diff --git a/Assets/Scripts/Entities/Player/PlayerProjectile.cs.meta b/Assets/Scripts/Player/PlayerProjectile.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PlayerProjectile.cs.meta rename to Assets/Scripts/Player/PlayerProjectile.cs.meta diff --git a/Assets/Scripts/Entities/Player/PlayerStates.cs b/Assets/Scripts/Player/PlayerStates.cs similarity index 82% rename from Assets/Scripts/Entities/Player/PlayerStates.cs rename to Assets/Scripts/Player/PlayerStates.cs index 1113b24..4b64292 100644 --- a/Assets/Scripts/Entities/Player/PlayerStates.cs +++ b/Assets/Scripts/Player/PlayerStates.cs @@ -64,27 +64,25 @@ public override void Update() #region Primary Attack States public class BasePrimary : BasePlayerState { - protected readonly PrimaryWeapon weapon; - public BasePrimary(Player sm) : base(sm) - { - weapon = player.primary; - } + public BasePrimary(Player sm) : base(sm) { } } - public class ShootState : BasePrimary + public class WindShotState : BasePrimary { - public ShootState(Player sm) : base(sm) + protected readonly WindShotAbility ability; + public WindShotState(Player sm) : base(sm) { - duration = weapon.fireRate; + ability = sm.primary as WindShotAbility; + duration = ability.fireRate; bufferPoint = false; } public override void OnEnter() { base.OnEnter(); - weapon.currentAmmo--; - for (int i = 0; i < weapon.projectiles; i++) + player.currentAmmo--; + for (int i = 0; i < ability.projectiles; i++) { - float angle = weapon.spreadAngle == 0 ? 0 : KongrooUtils.RemapRange(i, 0, weapon.projectiles - 1, -weapon.spreadAngle / 2, weapon.spreadAngle / 2); - weapon.ActivatePrimary(player.lookDir.Vector2Rotate(angle)); + float angle = ability.spreadAngle == 0 ? 0 : KongrooUtils.RemapRange(i, 0, ability.projectiles - 1, -ability.spreadAngle / 2, ability.spreadAngle / 2); + player.ActivatePrimary(player.lookDir.Vector2Rotate(angle), ability.piercing); } } public override void Update() @@ -108,17 +106,17 @@ public class WindDashState : BaseSecondary { Vector2 dashDir; float currentSpeed; - protected readonly WindDashAbility ability; + protected readonly WindDash ability; public WindDashState(Player sm) : base(sm) { - ability = sm.secondary as WindDashAbility; + ability = sm.secondary as WindDash; duration = ability.dashDur; bufferPoint = false; } public override void OnEnter() { base.OnEnter(); - ability.ActivateSecondary(); + player.ActivateSecondary(); dashDir = player.moveDir == Vector2.zero ? player.lookDir : player.moveDir; } public override void Update() diff --git a/Assets/Scripts/Entities/Player/PlayerStates.cs.meta b/Assets/Scripts/Player/PlayerStates.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PlayerStates.cs.meta rename to Assets/Scripts/Player/PlayerStates.cs.meta diff --git a/Assets/Scripts/Player/PrimaryAbilities.meta b/Assets/Scripts/Player/PrimaryAbilities.meta new file mode 100644 index 0000000..c47dfa8 --- /dev/null +++ b/Assets/Scripts/Player/PrimaryAbilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5981a1a1d83096b489b7059b0b1b5c5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PrimaryAbilities/BasePrimaryAbility.cs b/Assets/Scripts/Player/PrimaryAbilities/BasePrimaryAbility.cs new file mode 100644 index 0000000..8ac9e4c --- /dev/null +++ b/Assets/Scripts/Player/PrimaryAbilities/BasePrimaryAbility.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using PlayerStates; + +public class BasePrimaryAbility : ScriptableObject +{ + internal Player player; + public Element element; + public Sprite icon; + public string descrption; + public PlayerProjectile projectilePrefab; + public virtual BasePrimary PrimaryState() { return new BasePrimary(player); } + [Header("Stats")] + public int damage; + public float knockback; + public int maxAmmo; + public float fireRate; + public float reloadDur; + public float projectileSpeed; + public float projectileRange; + public float projectileSize; +} diff --git a/Assets/Scripts/Player/PrimaryAbilities/BasePrimaryAbility.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/BasePrimaryAbility.cs.meta new file mode 100644 index 0000000..59d6c1b --- /dev/null +++ b/Assets/Scripts/Player/PrimaryAbilities/BasePrimaryAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e3bb3b2a62f8f6e4fa14e85f9a723799 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/FrostUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/FrostUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/FrostUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/FrostUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/FrostUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/FrostUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/FrostUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/FrostUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/MultishotUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/MultishotUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/MultishotUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/MultishotUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/MultishotUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/MultishotUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/MultishotUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/MultishotUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PierceUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/PierceUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/PierceUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/PierceUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PierceUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/PierceUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/PierceUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/PierceUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PyromancyUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/PyromancyUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/PyromancyUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/PyromancyUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PyromancyUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/PyromancyUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/PyromancyUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/PyromancyUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PyromaniacUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/PyromaniacUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/PyromaniacUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/PyromaniacUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/PyromaniacUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/PyromaniacUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/PyromaniacUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/PyromaniacUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/ShockwaveUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/ShockwaveUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/ShockwaveUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/ShockwaveUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/ShockwaveUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/ShockwaveUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/ShockwaveUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/ShockwaveUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/StaggerUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/StaggerUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/StaggerUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/StaggerUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/StaggerUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/StaggerUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/StaggerUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/StaggerUpgrade.cs.meta diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/SwiftshotUpgrade.cs b/Assets/Scripts/Player/PrimaryAbilities/SwiftshotUpgrade.cs similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/SwiftshotUpgrade.cs rename to Assets/Scripts/Player/PrimaryAbilities/SwiftshotUpgrade.cs diff --git a/Assets/Scripts/Entities/Player/PrimaryAbilities/SwiftshotUpgrade.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/SwiftshotUpgrade.cs.meta similarity index 100% rename from Assets/Scripts/Entities/Player/PrimaryAbilities/SwiftshotUpgrade.cs.meta rename to Assets/Scripts/Player/PrimaryAbilities/SwiftshotUpgrade.cs.meta diff --git a/Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs b/Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs new file mode 100644 index 0000000..a11dfbd --- /dev/null +++ b/Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using PlayerStates; +[CreateAssetMenu(fileName = "WindShotAbility.asset", menuName = "PrimaryAbilities/WindshotAbility")] +public class WindShotAbility : BasePrimaryAbility +{ + public override BasePrimary PrimaryState() => new WindShotState(player); + public int projectiles = 1; + public float spreadAngle = 0; + public bool piercing = false; +} \ No newline at end of file diff --git a/Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs.meta b/Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs.meta new file mode 100644 index 0000000..7bdd53b --- /dev/null +++ b/Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs.meta @@ -0,0 +1,15 @@ +fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Scripts/Player/PrimaryAbilities/WindShotAbility.cs.meta +guid: f61da909e33d4694e94b81a69ac2528e +======== +guid: 186adcc09f528114b8058dae85bbe4e9 +>>>>>>>> main:Assets/Scripts/Enemy/EnemyProjectile.cs.meta +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/SecondaryAbilities.meta b/Assets/Scripts/Player/SecondaryAbilities.meta new file mode 100644 index 0000000..76b6936 --- /dev/null +++ b/Assets/Scripts/Player/SecondaryAbilities.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89795082198ede34f8fed706e1fad78d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/SecondaryAbilities/BaseSecondaryAbility.cs b/Assets/Scripts/Player/SecondaryAbilities/BaseSecondaryAbility.cs new file mode 100644 index 0000000..6612d9c --- /dev/null +++ b/Assets/Scripts/Player/SecondaryAbilities/BaseSecondaryAbility.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using PlayerStates; +public class BaseSecondaryAbility : MonoBehaviour +{ + internal Player player; + public Element element; + public Sprite icon; + public virtual BaseSecondary SecondaryState() { return new BaseSecondary(player); } + [Header("Stats")] + public float cooldown; +} diff --git a/Assets/Scripts/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta b/Assets/Scripts/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta new file mode 100644 index 0000000..03274e6 --- /dev/null +++ b/Assets/Scripts/Player/SecondaryAbilities/BaseSecondaryAbility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7379ec4a4304e2142bb88227e61cddbf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs b/Assets/Scripts/Player/SecondaryAbilities/WindDash.cs similarity index 84% rename from Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs rename to Assets/Scripts/Player/SecondaryAbilities/WindDash.cs index 437515a..49a911a 100644 --- a/Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs +++ b/Assets/Scripts/Player/SecondaryAbilities/WindDash.cs @@ -2,12 +2,14 @@ using System.Collections.Generic; using UnityEngine; using PlayerStates; -[CreateAssetMenu(fileName = "WindDashAbility.asset", menuName = "Upgrades/Wind/WindDashAbility")] -public class WindDashAbility : SecondaryAbility +public class WindDash : BaseSecondaryAbility { public override BaseSecondary SecondaryState() => new WindDashState(player); public float dashSpeed; public float dashDur; +<<<<<<< HEAD:Assets/Scripts/Player/SecondaryAbilities/WindDash.cs +} +======= public int charges; internal int currentCharges; internal override bool CanActivate => currentCharges > 0; @@ -39,4 +41,5 @@ public override void RechargeCooldown() currentCooldown = cooldown; } } -} \ No newline at end of file +} +>>>>>>> main:Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs diff --git a/Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs.meta b/Assets/Scripts/Player/SecondaryAbilities/WindDash.cs.meta similarity index 71% rename from Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs.meta rename to Assets/Scripts/Player/SecondaryAbilities/WindDash.cs.meta index 8a9857f..851d64a 100644 --- a/Assets/Scripts/Entities/Player/SecondaryAbilities/WindDashAbility.cs.meta +++ b/Assets/Scripts/Player/SecondaryAbilities/WindDash.cs.meta @@ -5,7 +5,7 @@ MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 - icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} + icon: {fileID: 2800000, guid: ddf6a8f037daba0499a55611a31b1ecc, type: 3} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/PostProcessing/Custom_ZaWarudo.mat b/Assets/Scripts/PostProcessing/Custom_ZaWarudo.mat deleted file mode 100644 index 8bccdf1..0000000 --- a/Assets/Scripts/PostProcessing/Custom_ZaWarudo.mat +++ /dev/null @@ -1,33 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Custom_ZaWarudo - m_Shader: {fileID: 4800000, guid: 52b8b39aa914cf7418ab40a6459351d5, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 9791c838fd703384dba494defc9bf920, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Falloff: 0.5 - - _Power: 0.25 - - iTime: 0.04 - m_Colors: [] - m_BuildTextureStacks: [] diff --git a/Assets/Scripts/PostProcessing/ZAWARUDO.shader b/Assets/Scripts/PostProcessing/ZAWARUDO.shader deleted file mode 100644 index 89044b1..0000000 --- a/Assets/Scripts/PostProcessing/ZAWARUDO.shader +++ /dev/null @@ -1,148 +0,0 @@ -Shader "Custom/ZaWarudo" -{ - //https://www.shadertoy.com/view/llj3Dz - //https://www.shadertoy.com/view/4lSGRw - Properties - { - _MainTex("tex2D", 2D) = "" {} - iTime("Time", float) = 0 - } - - SubShader - { - Pass - { - ZTest Always Cull Off ZWrite Off - //Post processing shaders cant be transparent otherwise it doesnt refresh screen ans tears - // Blend SrcAlpha OneMinusSrcAlpha - CGPROGRAM - //This is a default for vertex buffer I guess - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - - - float2 computeUV(float2 uv, float k, float kcube) - { - - float2 t = uv - .5; - float r2 = t.x * t.x + t.y * t.y; - float f = 0.; - - if (kcube == 0.0) - { - f = 1. + r2 * k; - } - else - { - f = 1. + r2 * (k + kcube * sqrt(r2)); - } - - float2 nUv = f * t + .5; - nUv.y = 1. - nUv.y; - - return nUv; - - } - - //half4 ripple() - //{ - // //Sawtooth function to pulse from centre. - // float offset = (iTime - floor(iTime)) / iTime; - // float CurrentTime = (iTime) * (offset); - - // //z == wavethickness - // vec3 WaveParams = vec3(10.0, 0.8, 0.01); - - // float ratio = iResolution.y / iResolution.x; - - // //Use this if you want to place the centre with the mouse instead - // //vec2 WaveCentre = vec2( iMouse.xy / iResolution.xy ); - - // vec2 WaveCentre = vec2(0.5, 0.5); - // WaveCentre.y *= ratio; - - // vec2 texCoord = fragCoord.xy / iResolution.xy; - // texCoord.y *= ratio; - // float Dist = distance(texCoord, WaveCentre); - - - // vec4 Color = tex2D(iChannel0, texCoord); - - // //Only distort the pixels within the parameter distance from the centre - // if ((Dist <= ((CurrentTime)+(WaveParams.z))) && - // (Dist >= ((CurrentTime)-(WaveParams.z)))) - // { - // //The pixel offset distance based on the input parameters - // float Diff = (Dist - CurrentTime); - // float ScaleDiff = (1.0 - pow(abs(Diff * WaveParams.x), WaveParams.y)); - // float DiffTime = (Diff * ScaleDiff); - - // //The direction of the distortion - // vec2 DiffTexCoord = normalize(texCoord - WaveCentre); - - // //Perform the distortion and reduce the effect over time - // texCoord += ((DiffTexCoord * DiffTime) / (CurrentTime * Dist * 40.0)); - // Color = tex2D(iChannel0, texCoord); - - // //Blow out the color and reduce the effect over time - // Color += (Color * ScaleDiff) / (CurrentTime * Dist * 40.0); - // } - - // fragColor = Color; - - //} - - struct appdata - { - float4 vertex : POSITION; - float2 uv : TEXCOORD0; - }; - - //the data thats passed from the vertex to the fragment shader and interpolated by the rasterizer - struct v2f - { - float4 position : SV_POSITION; - float2 uv : TEXCOORD0; - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - float iTime; - - v2f vert(appdata v) - { - v2f o; - //convert the vertex positions from object space to clip space so they can be rendered correctly - o.position = UnityObjectToClipPos(v.vertex); - //apply the texture transforms to the UV coordinates and pass them to the v2f struct - o.uv = TRANSFORM_TEX(v.uv, _MainTex); - return o; - } - - fixed4 frag(v2f_img i) : SV_Target - { - - float2 uv = i.uv; - uv.y = 1- uv.y; - float k = 2.0 * sin(iTime * .9); - float kcube = .5 * sin(iTime); - - float offset = .1 * sin(iTime * .5); - - float red = tex2D(_MainTex, computeUV(uv, k + offset, kcube)).r; - float green = tex2D(_MainTex, computeUV(uv, k, kcube)).g; - float blue = tex2D(_MainTex, computeUV(uv, k - offset, kcube)).b; - - //fixed4 col = tex2D(_MainTex, uv); - //return col; - //return fixed4(1, 1, 1, 1); - return fixed4(red, green, blue, 1.0); - } - - - ENDCG - } - } -} diff --git a/Assets/Scripts/PostProcessing/ZAWARUDO.shader.meta b/Assets/Scripts/PostProcessing/ZAWARUDO.shader.meta deleted file mode 100644 index 39275d4..0000000 --- a/Assets/Scripts/PostProcessing/ZAWARUDO.shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 52b8b39aa914cf7418ab40a6459351d5 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - preprocessorOverride: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PostProcessing/Zawarudo.cs.meta b/Assets/Scripts/PostProcessing/Zawarudo.cs.meta index ea33032..89e501a 100644 --- a/Assets/Scripts/PostProcessing/Zawarudo.cs.meta +++ b/Assets/Scripts/PostProcessing/Zawarudo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4453be4f3c43a6a4ba204afc4746e5f9 +guid: ae8969515563fda439096a6a7f72a74c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/SpriteReorderer.cs b/Assets/Scripts/SpriteReorderer.cs deleted file mode 100644 index 7606fdf..0000000 --- a/Assets/Scripts/SpriteReorderer.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class SpriteReorderer : MonoBehaviour -{ - SpriteRenderer sr; - private void Awake() - { - sr = GetComponent(); - } - void Update() - { - // Make sure sprite is sorted on bottom - sr.sortingOrder = Mathf.FloorToInt(transform.position.y * -100); - } -} diff --git a/Assets/Scripts/Entities/StateMachine.cs b/Assets/Scripts/StateMachine.cs similarity index 100% rename from Assets/Scripts/Entities/StateMachine.cs rename to Assets/Scripts/StateMachine.cs diff --git a/Assets/Scripts/Entities/StateMachine.cs.meta b/Assets/Scripts/StateMachine.cs.meta similarity index 100% rename from Assets/Scripts/Entities/StateMachine.cs.meta rename to Assets/Scripts/StateMachine.cs.meta diff --git a/Assets/Scripts/Tools/EditorCustomCommands.cs.meta b/Assets/Scripts/Tools/EditorCustomCommands.cs.meta index 0472a24..0182938 100644 --- a/Assets/Scripts/Tools/EditorCustomCommands.cs.meta +++ b/Assets/Scripts/Tools/EditorCustomCommands.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0ef12db05fea547479cd9387d3e5a449 +guid: 0b7f7c58afff9d74b9c6d107deca9077 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/UI.cs.meta b/Assets/Scripts/UI.cs.meta index 6759e05..0d4a7f1 100644 --- a/Assets/Scripts/UI.cs.meta +++ b/Assets/Scripts/UI.cs.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Scripts/UI.cs.meta -guid: 446dcda377f2c40439b672d80e3ae1e8 -======== -guid: ef5873f779bccdf419f1dc0735d62958 ->>>>>>>> main:Assets/Scripts/Enemy/Enemy.cs.meta +guid: f7c80d3cdfa05334cad5cf1206fef99b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/XpCompute/XpPooler.cs b/Assets/Scripts/XpCompute/XpPooler.cs index 1bb2575..50f9e91 100644 --- a/Assets/Scripts/XpCompute/XpPooler.cs +++ b/Assets/Scripts/XpCompute/XpPooler.cs @@ -109,7 +109,7 @@ void Update() { var n = readbackRequest.GetData().ToArray(); // This only goes up to uint max, use a timer to update in player script to check for xp changes - //print($"partcletypes consumed: {n[0]}, {n[1]}, {n[2]}, {n[3]}"); + print($"partcletypes consumed: {n[0]}, {n[1]}, {n[2]}, {n[3]}"); //Debug.Log(n + " / " + totalParticles + " " + (n / (float)totalParticles) * 100 + "%"); RequestAsyncReadback(); } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 1f77f19..a726273 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,11 @@ MonoBehaviour: m_MinSize: {x: 400, y: 300} m_MaxSize: {x: 32384, y: 24288} vertical: 0 +<<<<<<< HEAD + controlID: 29122 +======= controlID: 146 +>>>>>>> main --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -33,6 +37,8 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 +<<<<<<< HEAD +======= m_EditorHideFlags: 0 m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: @@ -286,6 +292,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 +>>>>>>> main m_EditorHideFlags: 1 m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} m_Name: @@ -298,10 +305,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< HEAD + x: 234 + y: 73 + width: 702 + height: 543 +======= x: 345.6 y: 73.6 width: 675.6 height: 403.8 +>>>>>>> main m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -377,7 +391,11 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 +<<<<<<< HEAD + snapOffset: {x: 0, y: 0} +======= snapOffset: {x: 0, y: -171.2} +>>>>>>> main snapOffsetDelta: {x: 0, y: 0} snapCorner: 2 id: unity-transform-toolbar @@ -525,9 +543,15 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: +<<<<<<< HEAD + m_Target: {x: 236.94302, y: 219.67992, z: 22.592516} + speed: 2 + m_Value: {x: 236.94302, y: 219.67992, z: 22.592516} +======= m_Target: {x: 249.55916, y: 251.63387, z: -0.027117195} speed: 2 m_Value: {x: 249.55916, y: 251.63387, z: -0.027117195} +>>>>>>> main m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -578,9 +602,15 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: +<<<<<<< HEAD + m_Target: 228.58678 + speed: 2 + m_Value: 228.58678 +======= m_Target: 4.4017353 speed: 2 m_Value: 4.4017353 +>>>>>>> main m_Ortho: m_Target: 1 speed: 2 @@ -602,36 +632,10 @@ MonoBehaviour: m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: - m_SceneVisActive: 1 + m_SceneVisActive: 0 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1023.2 - y: 0 - width: 126.39996 - height: 424.8 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} - m_Panes: - - {fileID: 2} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -640,24 +644,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 - y: 424.8 - width: 1149.6 - height: 205.60004 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 11} - m_Panes: - - {fileID: 11} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 + y: 0 + width: 1556 + height: 947 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 1 + controlID: 29123 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -666,138 +669,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: + m_Children: + - {fileID: 5} + - {fileID: 7} + - {fileID: 9} + m_Position: serializedVersion: 2 x: 0 - y: 498.4 - width: 1148.6 - height: 184.60004 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scripts/Enemy - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 74 - m_LastFolders: - - Assets/Scripts/Enemy - m_LastFoldersGridSize: 74 - m_LastProjectPath: C:\Users\Clement Leow\Documents\Gamecraft2022 - m_LockTracker: - m_IsLocked: 1 - m_FolderTreeState: - scrollPos: {x: 0, y: 115.39996} - m_SelectedIDs: d2630000 - m_LastClickedID: 25554 - m_ExpandedIDs: 00000000c0630000c263000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 72430000 - m_LastClickedID: 0 - m_ExpandedIDs: 00000000c0630000c2630000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: d2630000 - m_LastClickedInstanceID: 25554 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 74 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 328.8 ---- !u!114 &12 + y: 0 + width: 1556 + height: 564 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 8096} + vertical: 0 + controlID: 29124 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -807,23 +696,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: SceneHierarchyWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 630.4 - width: 1149.6 - height: 100.39996 - m_MinSize: {x: 101, y: 121} + y: 0 + width: 234 + height: 564 + m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 6} m_Panes: - - {fileID: 13} + - {fileID: 6} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -831,30 +720,56 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 704 - width: 1148.6 - height: 79.39996 + y: 73 + width: 233 + height: 543 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -1266 ---- !u!114 &14 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 0efbffff70610000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 5} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -862,13 +777,908 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 + x: 234 + y: 0 + width: 704 + height: 564 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + - {fileID: 8} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 +<<<<<<< HEAD + x: 416 + y: 73 + width: 499 + height: 630 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 210869312466797011, guid: d4db5be247b1344c49bd3956d062d190, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: d4db5be247b1344c49bd3956d062d190, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 210869312466797011, guid: d4db5be247b1344c49bd3956d062d190, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &9 +======= + x: 1023.2 + y: 0 + width: 126.39996 + height: 424.8 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &10 +>>>>>>> main +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 +<<<<<<< HEAD + x: 938 + y: 0 + width: 618 + height: 564 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 10} + m_Panes: + - {fileID: 10} +======= + x: 0 + y: 424.8 + width: 1149.6 + height: 205.60004 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 11} + m_Panes: + - {fileID: 11} +>>>>>>> main + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 938 + y: 73 + width: 616 + height: 543 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 616, y: 346} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -308 + m_HBaseRangeMax: 308 + m_VBaseRangeMin: -173 + m_VBaseRangeMax: 173 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 616 + height: 522 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 308, y: 261} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -308 + y: -261 + width: 616 + height: 522 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 616, y: 543} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 +<<<<<<< HEAD + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 12} + - {fileID: 14} + - {fileID: 16} + m_Position: + serializedVersion: 2 + x: 0 + y: 564 + width: 1556 + height: 383 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 8096} + vertical: 0 + controlID: 29082 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 217 + height: 383 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 +======= +>>>>>>> main + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 +<<<<<<< HEAD + y: 637 + width: 216 + height: 362 +======= + y: 498.4 + width: 1148.6 + height: 184.60004 +>>>>>>> main + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 +<<<<<<< HEAD + m_Folders: [] + m_Globs: [] + m_OriginalText: + m_ViewMode: 0 + m_StartGridSize: 64 + m_LastFolders: [] + m_LastFoldersGridSize: 64 + m_LastProjectPath: D:\Unity Projects\Gamecraft2022 + m_LockTracker: + m_IsLocked: 1 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: f2690000 + m_LastClickedID: 27122 + m_ExpandedIDs: ffffffff000000007e62000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff000000007e62000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 12} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 110 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 217 + y: 0 + width: 648 + height: 383 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 217 + y: 637 + width: 646 + height: 362 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scripts/MapGen/Biomes + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 67 + m_LastFolders: + - Assets/Scripts/MapGen/Biomes + m_LastFoldersGridSize: 67 + m_LastProjectPath: D:\Unity Projects\Gamecraft2022 + m_LockTracker: + m_IsLocked: 1 + m_FolderTreeState: + scrollPos: {x: 0, y: 10} + m_SelectedIDs: ae860000 + m_LastClickedID: 34478 + m_ExpandedIDs: ffffffff000000007e6200008c6200009262000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff000000007e62000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 14} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 67 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 167 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 865 + y: 0 + width: 691 + height: 383 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 17} + - {fileID: 18} + - {fileID: 19} + m_Selected: 2 + m_LastSelected: 0 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 865 + y: 637 + width: 689 + height: 362 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Prefabs +======= + m_Folders: + - Assets/Scripts/Enemy +>>>>>>> main + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 74 + m_LastFolders: +<<<<<<< HEAD + - Assets/Prefabs +======= + - Assets/Scripts/Enemy +>>>>>>> main + m_LastFoldersGridSize: 74 + m_LastProjectPath: C:\Users\Clement Leow\Documents\Gamecraft2022 + m_LockTracker: + m_IsLocked: 1 + m_FolderTreeState: +<<<<<<< HEAD + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 88620000 + m_LastClickedID: 25224 + m_ExpandedIDs: ffffffff000000007e62000000ca9a3b +======= + scrollPos: {x: 0, y: 115.39996} + m_SelectedIDs: d2630000 + m_LastClickedID: 25554 + m_ExpandedIDs: 00000000c0630000c263000000ca9a3b +>>>>>>> main + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 72430000 + m_LastClickedID: 0 +<<<<<<< HEAD + m_ExpandedIDs: ffffffff000000007e62000000ca9a3b +======= + m_ExpandedIDs: 00000000c0630000c2630000 +>>>>>>> main + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: +<<<<<<< HEAD + m_SelectedInstanceIDs: 70610000 + m_LastClickedInstanceID: 24944 +======= + m_SelectedInstanceIDs: d2630000 + m_LastClickedInstanceID: 25554 +>>>>>>> main + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 74 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 328.8 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 630.4 + width: 1149.6 + height: 100.39996 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 +<<<<<<< HEAD + x: 865 + y: 637 + width: 689 + height: 362 +======= + x: 0 + y: 704 + width: 1148.6 + height: 79.39996 +>>>>>>> main + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 +<<<<<<< HEAD + m_LastSelectedObjectID: 24944 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 865 + y: 637 + width: 689 + height: 362 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &20 +======= + m_LastSelectedObjectID: -1266 +--- !u!114 &14 +>>>>>>> main +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 +<<<<<<< HEAD + x: 1556 + y: 0 + width: 364 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 21} +======= x: 1149.6 y: 0 width: 386.40002 @@ -876,6 +1686,7 @@ MonoBehaviour: m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} +>>>>>>> main m_Panes: - {fileID: 15} - {fileID: 16} @@ -901,10 +1712,17 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 +<<<<<<< HEAD + x: 1556 + y: 73 + width: 363 + height: 926 +======= x: 1149.6 y: 73.6 width: 385.40002 height: 709.8 +>>>>>>> main m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 7baf9a5..20b62cc 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 43.2 - width: 1536 - height: 780.8 + x: 8 + y: 51 + width: 1904 + height: 981 m_ShowMode: 4 - m_Title: Animation - m_RootView: {fileID: 3} + m_Title: Project + m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -32,24 +32,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 9} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 - y: 524.8 - width: 1149.6 - height: 206 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 + y: 30 + width: 1904 + height: 931 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 190 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -59,25 +58,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 6} - - {fileID: 5} + m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 1518 y: 0 - width: 1536 - height: 780.8 - m_MinSize: {x: 875, y: 300} - m_MaxSize: {x: 10000, y: 10000} - m_UseTopView: 1 - m_TopViewHeight: 30 - m_UseBottomView: 1 - m_BottomViewHeight: 20 + width: 386 + height: 931 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -87,7 +84,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] @@ -95,11 +92,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 - height: 30 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: + width: 376 + height: 563 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -109,18 +110,24 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 760.8 - width: 1536 - height: 20 - m_MinSize: {x: 0, y: 0} - m_MaxSize: {x: 0, y: 0} + y: 563 + width: 1518 + height: 368 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + - {fileID: 18} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -130,22 +137,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 13} + - {fileID: 2} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 - y: 30 - width: 1536 - height: 730.8 - m_MinSize: {x: 400, y: 300} - m_MaxSize: {x: 32384, y: 24288} - vertical: 0 - controlID: 5913 + y: 0 + width: 1904 + height: 981 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -154,24 +164,20 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 12} - - {fileID: 2} + m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1149.6 - height: 730.8 - m_MinSize: {x: 300, y: 300} - m_MaxSize: {x: 24288, y: 24288} - vertical: 1 - controlID: 5918 + width: 1904 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -180,24 +186,19 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 9} - - {fileID: 10} - - {fileID: 11} + m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 0 - width: 1149.6 - height: 424.8 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 8096} - vertical: 0 - controlID: 5919 + y: 961 + width: 1904 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,24 +207,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneHierarchyWindow + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 345.6 - height: 424.8 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 0 + width: 1518 + height: 931 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 156 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -232,24 +232,23 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 - x: 345.6 + x: 0 y: 0 - width: 677.6 - height: 424.8 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 + width: 1518 + height: 563 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 157 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -258,24 +257,26 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1023.2 + x: 376 y: 0 - width: 126.39996 - height: 424.8 - m_MinSize: {x: 102, y: 121} + width: 1142 + height: 563 + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} + - {fileID: 16} + - {fileID: 17} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -284,24 +285,26 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_EditorHideFlags: 1 + m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 2048, y: 2048} + m_TitleContent: + m_Text: Asset Store + m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 - x: 0 - y: 424.8 - width: 1149.6 - height: 100 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 + x: 468 + y: 181 + width: 973 + height: 501 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -311,24 +314,137 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 - x: 1149.6 - y: 0 - width: 386.40002 - height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - - {fileID: 20} - m_Selected: 0 - m_LastSelected: 1 + x: 8 + y: 644 + width: 1517 + height: 347 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scenes + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scenes + m_LastFoldersGridSize: -1 + m_LastProjectPath: D:\Gamecraft2022 + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: d2600000 + m_LastClickedID: 24786 + m_ExpandedIDs: 00000000ca60000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000ca60000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 115 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -337,90 +453,39 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1023.2 - y: 73.6 - width: 124.39996 - height: 403.8 + x: 1526 + y: 81 + width: 385 + height: 910 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 124.39996, y: 70} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -49.759987 - m_HBaseRangeMax: 49.759987 - m_VBaseRangeMin: -28 - m_VBaseRangeMax: 28 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 124.39996 - height: 382.8 - m_Scale: {x: 1.2298738, y: 1.2298738} - m_Translation: {x: 62.19998, y: 191.4} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -50.57428 - y: -155.62572 - width: 101.14856 - height: 311.25143 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 155.49995, y: 504.75} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -437,14 +502,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 19 - width: 344.6 - height: 403.8 + x: 8 + y: 81 + width: 375 + height: 542 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -452,9 +517,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e4610000 - m_LastClickedID: 25060 - m_ExpandedIDs: 10fbffff9e610000 + m_SelectedIDs: 04640000 + m_LastClickedID: 0 + m_ExpandedIDs: 58f7ffff9cf7ffffe0f7ffff24f8ffff68f8ffffacf8ffff70f9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -470,14 +535,14 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 4c969a2b90040154d917609493e03593 + m_WindowGUID: 3fb7263d079f2394a9d0b9a19bb5df8c --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -494,14 +559,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 345.6 - y: 73.6 - width: 675.6 - height: 403.8 + x: 384 + y: 81 + width: 1140 + height: 542 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -511,8 +576,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -100, y: -25.600006} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} snapCorner: 3 id: Tool Settings index: 0 @@ -533,7 +598,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -550,47 +615,36 @@ MonoBehaviour: id: unity-search-toolbar index: 1 layout: 1 - - dockPosition: 1 - containerId: overlay-toolbar__top - floating: 0 - collapsed: 0 - displayed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: Scene View/Open Tile Palette - index: 2 - layout: 4 - - dockPosition: 1 - containerId: overlay-toolbar__top + - dockPosition: 0 + containerId: overlay-container--left floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 - id: Scene View/Tilemap Focus - index: 3 - layout: 4 + id: unity-transform-toolbar + index: 0 + layout: 2 - dockPosition: 0 containerId: overlay-container--left floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: -171.2} + snapOffset: {x: 0, y: 197} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 2 - id: unity-transform-toolbar - index: 0 + snapCorner: 0 + id: unity-component-tools + index: 1 layout: 2 - dockPosition: 0 containerId: overlay-container--right floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -34.099976, y: 86} + snapOffset: {x: 67.5, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 0 id: Orientation index: 0 layout: 4 @@ -715,8 +769,52 @@ MonoBehaviour: id: Scene View/Particles index: 10 layout: 4 - m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + m_WindowGUID: 95b680487ce8fc64e924873609950d98 + m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -725,9 +823,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 249.45193, y: 250.05624, z: 0.010518711} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 249.47752, y: 250.04506, z: 0.010793516} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -761,16 +859,16 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} - m_ShowGrid: 0 + m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: @@ -778,17 +876,17 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.63815373 + m_Target: 10 speed: 2 - m_Value: 0.6106734 + m_Value: 10 m_Ortho: m_Target: 1 speed: 2 m_Value: 1 m_CameraSettings: - m_Speed: 1.0005 - m_SpeedNormalized: 0.49999997 - m_SpeedMin: 0.001 + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.01 m_SpeedMax: 2 m_EasingEnabled: 1 m_EasingDuration: 0.4 @@ -806,177 +904,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 498.4 - width: 1148.6 - height: 79 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Sprites - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 74 - m_LastFolders: - - Assets/Sprites - m_LastFoldersGridSize: 74 - m_LastProjectPath: C:\Users\Clement Leow\Documents\Gamecraft2022 - m_LockTracker: - m_IsLocked: 1 - m_FolderTreeState: - scrollPos: {x: 0, y: 109.79999} - m_SelectedIDs: dc630000 - m_LastClickedID: 25564 - m_ExpandedIDs: 000000008e63000090630000ce63000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 72430000 - m_LastClickedID: 0 - m_ExpandedIDs: 000000008e6300009063000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 12} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 74 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 328.8 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 598.4 - width: 1148.6 - height: 185 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 25060 ---- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -985,39 +912,90 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} + m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1149.6 - y: 73.6 - width: 385.40002 - height: 709.8 + x: 507 + y: 94 + width: 1532 + height: 790 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: -160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &20 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1532, y: 769} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -766 + m_HBaseRangeMax: 766 + m_VBaseRangeMin: -384.5 + m_VBaseRangeMax: 384.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1532 + height: 769 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 766, y: 384.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -766 + y: -384.5 + width: 1532 + height: 769 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1532, y: 790} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1025,7 +1003,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -1033,14 +1011,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1149.6 - y: 73.6 - width: 385.40002 - height: 709.8 + x: 8 + y: 718 + width: 1366 + height: 308 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default