diff --git a/Assets/Prefabs/Enemies/Advanced Enemy.prefab b/Assets/Prefabs/Enemies/Advanced Enemy.prefab new file mode 100644 index 0000000..d36dc12 --- /dev/null +++ b/Assets/Prefabs/Enemies/Advanced Enemy.prefab @@ -0,0 +1,430 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &204632724861940951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8982578637896279064} + - component: {fileID: 6106641039752435111} + - component: {fileID: 7019269918067109340} + - component: {fileID: 3298396436480561959} + - component: {fileID: 9093693903318130491} + - component: {fileID: 2885408193262179595} + - component: {fileID: 9133510821041460886} + - component: {fileID: 4043203721006489305} + - component: {fileID: 9197488311964383076} + - component: {fileID: 2964327480768693548} + - component: {fileID: 435001957072118475} + - component: {fileID: 1527323237162929931} + - component: {fileID: 3779661959168575914} + m_Layer: 7 + m_Name: Advanced Enemy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8982578637896279064 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5090722024082631022} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &6106641039752435111 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.87, y: 0.78} + m_EdgeRadius: 0 +--- !u!50 &7019269918067109340 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 60 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &3298396436480561959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44b572240c4243c9954bd19967bfeb64, type: 3} + m_Name: + m_EditorClassIdentifier: + attributes: + health: 20 + maxHealth: 20 + moveSpeed: 4 + luck: 0 + armor: 5 + level: 1 + experience: 0 + baseExperienceToLevelUp: 100 + damage: 1 + rangedDamage: 1 + meleeDamage: 1 + attackRange: 1 + attackSpeed: 2 +--- !u!114 &9093693903318130491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9139aea24fd54a5eb0f5fc1556478cb6, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3298396436480561959} + initialHealth: 60 +--- !u!114 &2885408193262179595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fa2924c6ed8486bbfa95c439bf9e421, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3298396436480561959} + deathBehavior: + _implementer: {fileID: 9133510821041460886} + health: {fileID: 9093693903318130491} +--- !u!114 &9133510821041460886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73900af7351645fdb19d016d621feb35, type: 3} + m_Name: + m_EditorClassIdentifier: + expReward: 10 + coinReward: 10 +--- !u!114 &4043203721006489305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4ff53f671604189b15fac28115b2b70, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponStats: + damage: 8 + attackSpeed: 1.5 + range: 0.9 + damageType: 0 + character: {fileID: 3298396436480561959} + targetMask: + serializedVersion: 2 + m_Bits: 64 +--- !u!114 &9197488311964383076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + drawGizmos: 1 + detailedGizmos: 0 + startEndModifier: + addPoints: 0 + exactStartPoint: 3 + exactEndPoint: 3 + useRaycasting: 0 + mask: + serializedVersion: 2 + m_Bits: 4294967295 + useGraphRaycasting: 0 + traversableTags: -1 + tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + graphMask: + value: -1 +--- !u!114 &2964327480768693548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radius: 0.5 + height: 1.09 + canMove: 1 + maxSpeed: 1 + gravity: {x: 0, y: 0, z: 0} + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + endReachedDistance: 0.6 + whenCloseToDestination: 0 + rvoDensityBehavior: + enabled: 1 + densityThreshold: 0.5 + returnAfterBeingPushedAway: 0 + progressAverage: 0 + lastJobDensityResult: 0 + repathRateCompatibility: NaN + canSearchCompability: 0 + orientation: 1 + enableRotation: 1 + autoRepath: + mode: 2 + period: 0.5 + sensitivity: 10 + maximumPeriod: 2 + visualizeSensitivity: 0 + maxAcceleration: -2.5 + rotationSpeed: 360 + slowdownDistance: 0.6 + pickNextWaypointDist: 2 + alwaysDrawGizmos: 0 + slowWhenNotFacingTarget: 1 + preventMovingBackwards: 0 + constrainInsideGraph: 0 +--- !u!114 &435001957072118475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 560112f876f5746c780eca0d404e7139, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radiusBackingField: 0.5 + heightBackingField: 2 + centerBackingField: 1 + locked: 0 + lockWhenNotMoving: 0 + agentTimeHorizon: 2 + obstacleTimeHorizon: 0.5 + maxNeighbours: 10 + layer: 1 + collidesWith: -1 + wallAvoidForce: 1 + wallAvoidFalloff: 1 + priority: 0.5 + debug: 0 +--- !u!114 &1527323237162929931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 032c4d53d6b340fc994192cc0d24a061, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3298396436480561959} + aiPath: {fileID: 2964327480768693548} + target: {fileID: 0} +--- !u!114 &3779661959168575914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858b89cbe8774ee4a74182a9c4195c67, type: 3} + m_Name: + m_EditorClassIdentifier: + flashDuration: 0.1 + flashColor: {r: 1.8443027, g: 1.8443027, b: 1.8443027, a: 1} + health: {fileID: 9093693903318130491} + spriteRenderer: {fileID: 987872320002065258} +--- !u!1 &3667932760953165253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5090722024082631022} + - component: {fileID: 987872320002065258} + m_Layer: 7 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5090722024082631022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667932760953165253} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8982578637896279064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &987872320002065258 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667932760953165253} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0c6402377b097ca3992a420467f72056, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 8798316271258456706, guid: 300802c327db1b39f94d8a241e26db32, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Enemies/Advanced Enemy.prefab.meta b/Assets/Prefabs/Enemies/Advanced Enemy.prefab.meta new file mode 100644 index 0000000..1de2859 --- /dev/null +++ b/Assets/Prefabs/Enemies/Advanced Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b00136274fd417af18bc2ba9111a054c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemies/Basic Enemy.prefab b/Assets/Prefabs/Enemies/Basic Enemy.prefab index 7ec52e9..11e369c 100644 --- a/Assets/Prefabs/Enemies/Basic Enemy.prefab +++ b/Assets/Prefabs/Enemies/Basic Enemy.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 7019269918067109340} - component: {fileID: 3298396436480561959} - component: {fileID: 9093693903318130491} - - component: {fileID: 3179741077809616033} - component: {fileID: 2885408193262179595} - component: {fileID: 9133510821041460886} - component: {fileID: 4043203721006489305} @@ -22,7 +21,7 @@ GameObject: - component: {fileID: 435001957072118475} - component: {fileID: 1527323237162929931} - component: {fileID: 3779661959168575914} - m_Layer: 0 + m_Layer: 7 m_Name: Basic Enemy m_TagString: Enemy m_Icon: {fileID: 0} @@ -131,8 +130,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: attributes: - health: 40 - maxHealth: 40 + health: 10 + maxHealth: 10 moveSpeed: 2 luck: 0 armor: 0 @@ -157,21 +156,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: character: {fileID: 3298396436480561959} - initialHealth: 100 ---- !u!114 &3179741077809616033 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 204632724861940951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9139aea24fd54a5eb0f5fc1556478cb6, type: 3} - m_Name: - m_EditorClassIdentifier: - character: {fileID: 3298396436480561959} - initialHealth: 100 + initialHealth: 40 --- !u!114 &2885408193262179595 MonoBehaviour: m_ObjectHideFlags: 0 @@ -366,7 +351,7 @@ GameObject: m_Component: - component: {fileID: 5090722024082631022} - component: {fileID: 987872320002065258} - m_Layer: 0 + m_Layer: 7 m_Name: Square m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Enemies/Elite Enemy.prefab b/Assets/Prefabs/Enemies/Elite Enemy.prefab new file mode 100644 index 0000000..71b96cf --- /dev/null +++ b/Assets/Prefabs/Enemies/Elite Enemy.prefab @@ -0,0 +1,499 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &204632724861940951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8982578637896279064} + - component: {fileID: 6106641039752435111} + - component: {fileID: 7019269918067109340} + - component: {fileID: 3298396436480561959} + - component: {fileID: 9093693903318130491} + - component: {fileID: 2885408193262179595} + - component: {fileID: 9133510821041460886} + - component: {fileID: 4043203721006489305} + - component: {fileID: 9197488311964383076} + - component: {fileID: 2964327480768693548} + - component: {fileID: 435001957072118475} + - component: {fileID: 1527323237162929931} + - component: {fileID: 3779661959168575914} + - component: {fileID: 3900501397662715204} + - component: {fileID: 8117923829659132086} + m_Layer: 7 + m_Name: Elite Enemy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8982578637896279064 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5090722024082631022} + - {fileID: 4665778829147842035} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &6106641039752435111 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.87, y: 0.78} + m_EdgeRadius: 0 +--- !u!50 &7019269918067109340 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 60 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &3298396436480561959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44b572240c4243c9954bd19967bfeb64, type: 3} + m_Name: + m_EditorClassIdentifier: + attributes: + health: 30 + maxHealth: 30 + moveSpeed: 6 + luck: 0 + armor: 10 + level: 1 + experience: 0 + baseExperienceToLevelUp: 100 + damage: 1 + rangedDamage: 1 + meleeDamage: 1 + attackRange: 1 + attackSpeed: 2 +--- !u!114 &9093693903318130491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9139aea24fd54a5eb0f5fc1556478cb6, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3298396436480561959} + initialHealth: 60 +--- !u!114 &2885408193262179595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fa2924c6ed8486bbfa95c439bf9e421, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3298396436480561959} + deathBehavior: + _implementer: {fileID: 9133510821041460886} + health: {fileID: 9093693903318130491} +--- !u!114 &9133510821041460886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73900af7351645fdb19d016d621feb35, type: 3} + m_Name: + m_EditorClassIdentifier: + expReward: 25 + coinReward: 15 +--- !u!114 &4043203721006489305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4ff53f671604189b15fac28115b2b70, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponStats: + damage: 12 + attackSpeed: 3 + range: 1 + damageType: 0 + character: {fileID: 3298396436480561959} + targetMask: + serializedVersion: 2 + m_Bits: 64 +--- !u!114 &9197488311964383076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + drawGizmos: 1 + detailedGizmos: 0 + startEndModifier: + addPoints: 0 + exactStartPoint: 3 + exactEndPoint: 3 + useRaycasting: 0 + mask: + serializedVersion: 2 + m_Bits: 4294967295 + useGraphRaycasting: 0 + traversableTags: -1 + tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + graphMask: + value: -1 +--- !u!114 &2964327480768693548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radius: 0.5 + height: 1.09 + canMove: 1 + maxSpeed: 1 + gravity: {x: 0, y: 0, z: 0} + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + endReachedDistance: 0.6 + whenCloseToDestination: 0 + rvoDensityBehavior: + enabled: 1 + densityThreshold: 0.5 + returnAfterBeingPushedAway: 0 + progressAverage: 0 + lastJobDensityResult: 0 + repathRateCompatibility: NaN + canSearchCompability: 0 + orientation: 1 + enableRotation: 1 + autoRepath: + mode: 2 + period: 0.5 + sensitivity: 10 + maximumPeriod: 2 + visualizeSensitivity: 0 + maxAcceleration: -2.5 + rotationSpeed: 360 + slowdownDistance: 0.6 + pickNextWaypointDist: 2 + alwaysDrawGizmos: 0 + slowWhenNotFacingTarget: 1 + preventMovingBackwards: 0 + constrainInsideGraph: 0 +--- !u!114 &435001957072118475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 560112f876f5746c780eca0d404e7139, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1073741824 + radiusBackingField: 0.5 + heightBackingField: 2 + centerBackingField: 1 + locked: 0 + lockWhenNotMoving: 0 + agentTimeHorizon: 2 + obstacleTimeHorizon: 0.5 + maxNeighbours: 10 + layer: 1 + collidesWith: -1 + wallAvoidForce: 1 + wallAvoidFalloff: 1 + priority: 0.5 + debug: 0 +--- !u!114 &1527323237162929931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 032c4d53d6b340fc994192cc0d24a061, type: 3} + m_Name: + m_EditorClassIdentifier: + character: {fileID: 3298396436480561959} + aiPath: {fileID: 2964327480768693548} + target: {fileID: 0} +--- !u!114 &3779661959168575914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 858b89cbe8774ee4a74182a9c4195c67, type: 3} + m_Name: + m_EditorClassIdentifier: + flashDuration: 0.1 + flashColor: {r: 1.8443027, g: 1.8443027, b: 1.8443027, a: 1} + health: {fileID: 9093693903318130491} + spriteRenderer: {fileID: 987872320002065258} +--- !u!114 &3900501397662715204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fd9cdb55272f45ab9c60a948a56e01f5, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponStats: + damage: 10 + attackSpeed: 1 + range: 0 + damageType: 1 + character: {fileID: 3298396436480561959} + projectilePrefab: {fileID: 6885276120120059828, guid: 384ebad50ab3d71fca9ff79cd767f236, type: 3} + firePoint: {fileID: 4665778829147842035} +--- !u!114 &8117923829659132086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 204632724861940951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5523bce9a0d94d6fafb3fc09e3bf9cc6, type: 3} + m_Name: + m_EditorClassIdentifier: + weapons: + - {fileID: 3900501397662715204} + target: {fileID: 0} +--- !u!1 &1056111720871478268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4665778829147842035} + m_Layer: 7 + m_Name: Fire point + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4665778829147842035 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056111720871478268} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.003, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8982578637896279064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3667932760953165253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5090722024082631022} + - component: {fileID: 987872320002065258} + m_Layer: 7 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5090722024082631022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667932760953165253} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8982578637896279064} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &987872320002065258 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3667932760953165253} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 0c6402377b097ca3992a420467f72056, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -7912482150894176273, guid: d0ed5ab162aa1e509ae8de10f1e4f89c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Enemies/Elite Enemy.prefab.meta b/Assets/Prefabs/Enemies/Elite Enemy.prefab.meta new file mode 100644 index 0000000..91a5a8c --- /dev/null +++ b/Assets/Prefabs/Enemies/Elite Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7fa59d6ff3e88b18aa11e191ce9c40f8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Shop UI.prefab b/Assets/Prefabs/UI/Shop UI.prefab index a9c6a3b..afd3fd5 100644 --- a/Assets/Prefabs/UI/Shop UI.prefab +++ b/Assets/Prefabs/UI/Shop UI.prefab @@ -303,7 +303,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 850} + m_SizeDelta: {x: 0, y: 820.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2792772072994430032 MonoBehaviour: @@ -325,7 +325,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 320, y: 500} + m_CellSize: {x: 300, y: 500} m_Spacing: {x: 8, y: 8} m_Constraint: 1 m_ConstraintCount: 6 @@ -737,6 +737,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3919155557447596313 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8353455806774839399} + - component: {fileID: 1327557472726232217} + - component: {fileID: 4920371442973375772} + m_Layer: 5 + m_Name: Coins + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8353455806774839399 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919155557447596313} + 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: 5142495539293951432} + 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: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1327557472726232217 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919155557447596313} + m_CullTransparentMesh: 1 +--- !u!114 &4920371442973375772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3919155557447596313} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Coins {0} + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4985729667885723412 GameObject: m_ObjectHideFlags: 0 @@ -856,8 +992,25 @@ MonoBehaviour: shopUI: {fileID: 8862046629599886533} inventoryManager: {fileID: 0} itemsPerShop: 4 - possibleItems: [] - possibleWeapons: [] + possibleItems: + - {fileID: 11400000, guid: 62526676dc2201d0f969be5bf43a94d5, type: 2} + - {fileID: 11400000, guid: bcacab83b7f39aab5a6518ce234218c7, type: 2} + - {fileID: 11400000, guid: 541d3f3ae588b0ea2863bb2ae56fcd7d, type: 2} + - {fileID: 11400000, guid: 2205d44251efdfdc6b38ef2feb11c7bc, type: 2} + - {fileID: 11400000, guid: c9668138a6bceb3ee9a36798c210a7ec, type: 2} + - {fileID: 11400000, guid: beabba089016cec7cbc6f6f148a2a159, type: 2} + - {fileID: 11400000, guid: fef35d02fe29afb858026ca3ab83f3f5, type: 2} + - {fileID: 11400000, guid: b0b06478ab3e2aea8815a78861d48238, type: 2} + - {fileID: 11400000, guid: 86d260ae7c5ae78589176b4f5654045a, type: 2} + - {fileID: 11400000, guid: 45f434241590936078685f80ca2d6137, type: 2} + - {fileID: 11400000, guid: 708bdb39e5d655310a4c74efdbc89afb, type: 2} + - {fileID: 11400000, guid: 69b951547b3c8a5c7a7c41e109d98665, type: 2} + - {fileID: 11400000, guid: 80b9021e19df89d888ce03165cb3f9ca, type: 2} + - {fileID: 11400000, guid: 005dbea6609f1eb6a83b00f45637f418, type: 2} + - {fileID: 11400000, guid: 5366536d04e61959f911fa119df9eca4, type: 2} + - {fileID: 11400000, guid: f4c9e4a81f95eb220987ed7334bafa34, type: 2} + possibleWeapons: + - {fileID: 11400000, guid: b950dd0b0d131df60b0be02373005b2b, type: 2} --- !u!114 &8862046629599886533 MonoBehaviour: m_ObjectHideFlags: 0 @@ -875,6 +1028,7 @@ MonoBehaviour: weaponSlotParent: {fileID: 8381921428845315272} slotPrefab: {fileID: 4938801432288702521, guid: 2834ed9a1cd2ea8a9947e86517910bb6, type: 3} roundsText: {fileID: 759292745662732244} + coinsText: {fileID: 4920371442973375772} --- !u!1 &7663623208645004839 GameObject: m_ObjectHideFlags: 0 @@ -1041,6 +1195,7 @@ RectTransform: m_Children: - {fileID: 4567329713039532410} - {fileID: 5200376552900448965} + - {fileID: 8353455806774839399} - {fileID: 8381921428845315272} - {fileID: 5210823007245714808} - {fileID: 5207083978762949642} diff --git a/Assets/Prefabs/Weapons/Elite Enemy Projetile.prefab b/Assets/Prefabs/Weapons/Elite Enemy Projetile.prefab new file mode 100644 index 0000000..3d3adf6 --- /dev/null +++ b/Assets/Prefabs/Weapons/Elite Enemy Projetile.prefab @@ -0,0 +1,212 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6885276120120059828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618924498601056688} + - component: {fileID: 6129280278992346914} + - component: {fileID: 4677435575099866603} + - component: {fileID: 9209553851344386497} + m_Layer: 9 + m_Name: Elite Enemy Projetile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &618924498601056688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 982386912657826799} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &6129280278992346914 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 4 +--- !u!114 &4677435575099866603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d5fcee922b049d1b9db7b49711ce562, type: 3} + m_Name: + m_EditorClassIdentifier: + rb: {fileID: 6129280278992346914} + speed: 10 + lifeTime: 5 +--- !u!61 &9209553851344386497 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6885276120120059828} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0.00050985813, y: 0.0005098283} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.114934325, y: 0.2649578} + m_EdgeRadius: 0 +--- !u!1 &7527772782055463159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 982386912657826799} + - component: {fileID: 1733185684803924580} + m_Layer: 9 + m_Name: tileset_28 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &982386912657826799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527772782055463159} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 618924498601056688} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1733185684803924580 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7527772782055463159} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 325748843, guid: 669e3ba4383a707eb951cae82a9ea538, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Weapons/Elite Enemy Projetile.prefab.meta b/Assets/Prefabs/Weapons/Elite Enemy Projetile.prefab.meta new file mode 100644 index 0000000..8e04c92 --- /dev/null +++ b/Assets/Prefabs/Weapons/Elite Enemy Projetile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 384ebad50ab3d71fca9ff79cd767f236 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index 6fcbd6d..4ebf90a 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -7805,6 +7805,63 @@ Transform: m_Children: [] m_Father: {fileID: 54233099} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1642425552 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 204632724861940951, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_Name + value: Advanced Enemy + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalPosition.x + value: -7.170298 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalPosition.y + value: 3.3622494 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8982578637896279064, guid: b00136274fd417af18bc2ba9111a054c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b00136274fd417af18bc2ba9111a054c, type: 3} --- !u!114 &1767717491 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} @@ -8468,98 +8525,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: itemsPerShop - value: 4 - objectReference: {fileID: 0} - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: inventoryManager value: objectReference: {fileID: 1261447609} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: possibleItems.Array.size - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: possibleWeapons.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[0]' - value: - objectReference: {fileID: 11400000, guid: 62526676dc2201d0f969be5bf43a94d5, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[1]' - value: - objectReference: {fileID: 11400000, guid: bcacab83b7f39aab5a6518ce234218c7, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[2]' - value: - objectReference: {fileID: 11400000, guid: 541d3f3ae588b0ea2863bb2ae56fcd7d, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[3]' - value: - objectReference: {fileID: 11400000, guid: 2205d44251efdfdc6b38ef2feb11c7bc, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[4]' - value: - objectReference: {fileID: 11400000, guid: c9668138a6bceb3ee9a36798c210a7ec, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[5]' - value: - objectReference: {fileID: 11400000, guid: beabba089016cec7cbc6f6f148a2a159, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[6]' - value: - objectReference: {fileID: 11400000, guid: fef35d02fe29afb858026ca3ab83f3f5, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[7]' - value: - objectReference: {fileID: 11400000, guid: b0b06478ab3e2aea8815a78861d48238, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[8]' - value: - objectReference: {fileID: 11400000, guid: 86d260ae7c5ae78589176b4f5654045a, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[9]' - value: - objectReference: {fileID: 11400000, guid: 45f434241590936078685f80ca2d6137, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[10]' - value: - objectReference: {fileID: 11400000, guid: 708bdb39e5d655310a4c74efdbc89afb, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[11]' - value: - objectReference: {fileID: 11400000, guid: 69b951547b3c8a5c7a7c41e109d98665, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[12]' - value: - objectReference: {fileID: 11400000, guid: 80b9021e19df89d888ce03165cb3f9ca, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[13]' - value: - objectReference: {fileID: 11400000, guid: 005dbea6609f1eb6a83b00f45637f418, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[14]' - value: - objectReference: {fileID: 11400000, guid: 5366536d04e61959f911fa119df9eca4, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleItems.Array.data[15]' - value: - objectReference: {fileID: 11400000, guid: f4c9e4a81f95eb220987ed7334bafa34, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleWeapons.Array.data[0]' - value: - objectReference: {fileID: 11400000, guid: b950dd0b0d131df60b0be02373005b2b, type: 2} - - target: {fileID: 1501730282976965803, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: 'possibleWeapons.Array.data[1]' - value: - objectReference: {fileID: 11400000, guid: b950dd0b0d131df60b0be02373005b2b, type: 2} - - target: {fileID: 2792772072994430032, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: m_CellSize.x - value: 300 - objectReference: {fileID: 0} - target: {fileID: 4567329713039532410, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -8584,10 +8553,6 @@ PrefabInstance: propertyPath: m_Name value: Shop UI objectReference: {fileID: 0} - - target: {fileID: 4985729667885723412, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5200376552900448965, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -8648,9 +8613,25 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6312224718360856168, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} - propertyPath: m_BlockingMask.m_Bits - value: 247 + - target: {fileID: 8353455806774839399, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8353455806774839399, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8353455806774839399, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8353455806774839399, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8353455806774839399, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 8381921428845315272, guid: 4d1c30f952fa59fb9b0cc1a987f40ad8, type: 3} propertyPath: m_AnchorMax.y @@ -8696,3 +8677,4 @@ SceneRoots: - {fileID: 1368041001} - {fileID: 1953393769} - {fileID: 1265960068} + - {fileID: 1642425552} diff --git a/Assets/Scripts/AI/Chaser.cs b/Assets/Scripts/AI/Chaser.cs index 5623a79..86af3c9 100644 --- a/Assets/Scripts/AI/Chaser.cs +++ b/Assets/Scripts/AI/Chaser.cs @@ -33,6 +33,8 @@ namespace AI private void SetTarget() { + if (!GameManager.Instance.Player) return; + target = GameManager.Instance.Player.transform; } } diff --git a/Assets/Scripts/Shop/ShopUI.cs b/Assets/Scripts/Shop/ShopUI.cs index 832dae5..978b6de 100644 --- a/Assets/Scripts/Shop/ShopUI.cs +++ b/Assets/Scripts/Shop/ShopUI.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using Inventory; using Systems; @@ -13,6 +14,7 @@ namespace Shop [SerializeField] private Transform weaponSlotParent; [SerializeField] private ShopSlotUI slotPrefab; [SerializeField] private TextMeshProUGUI roundsText; + [SerializeField] private TextMeshProUGUI coinsText; private List currentSlots = new(); @@ -26,6 +28,11 @@ namespace Shop GameManager.Instance.OnRoundEnd -= UpdateRoundText; } + private void Update() + { + coinsText.text = $"Coins: {GameManager.Instance.Coins}"; + } + public void Show(List items, List weapons, ShopManager shopManager) { GameManager.Instance.StoreIsClosed = false; diff --git a/Assets/Scripts/Systems/EnemyWeaponTargetSetter.cs b/Assets/Scripts/Systems/EnemyWeaponTargetSetter.cs index a1e0735..de4fbc7 100644 --- a/Assets/Scripts/Systems/EnemyWeaponTargetSetter.cs +++ b/Assets/Scripts/Systems/EnemyWeaponTargetSetter.cs @@ -19,6 +19,11 @@ namespace Systems private void Update() { + if (!target) + { + AquirePlayerTarget(); + } + if (!target || weapons.Count == 0) return; foreach (var weapon in weapons) @@ -26,5 +31,11 @@ namespace Systems weapon.Target = target.position; } } + + private void AquirePlayerTarget() + { + var player = GameManager.Instance.Player; + target = player ? player.transform : null; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Systems/GameManager.cs b/Assets/Scripts/Systems/GameManager.cs index 988303c..f4c220c 100644 --- a/Assets/Scripts/Systems/GameManager.cs +++ b/Assets/Scripts/Systems/GameManager.cs @@ -37,7 +37,7 @@ namespace Systems if (Instance == null) { Instance = this; - DontDestroyOnLoad(gameObject); + // DontDestroyOnLoad(gameObject); } else { diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 2bdb399..4d76ec9 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 - m_LayerCollisionMatrix: f7ffffffffffffffffffffff46fffffff7fffffff7fffffffffefffff7ffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffefffffffdffffbfffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 6cfcdda..a35c12f 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,12 +3,12 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 6 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 m_PositionIterations: 3 - m_VelocityThreshold: 1 + m_BounceThreshold: 1 m_MaxLinearCorrection: 0.2 m_MaxAngularCorrection: 8 m_MaxTranslationSpeed: 100 @@ -19,6 +19,7 @@ Physics2DSettings: m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 m_DefaultContactOffset: 0.01 + m_ContactThreshold: 0 m_JobOptions: serializedVersion: 2 useMultithreading: 0 @@ -39,18 +40,17 @@ Physics2DSettings: m_IslandSolverBodiesPerJob: 50 m_IslandSolverContactsPerJob: 50 m_SimulationMode: 0 + m_SimulationLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxSubStepCount: 4 + m_MinSubStepFPS: 30 + m_UseSubStepping: 0 + m_UseSubStepContacts: 0 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_CallbacksOnDisable: 1 m_ReuseCollisionCallbacks: 1 m_AutoSyncTransforms: 0 - m_AlwaysShowColliders: 0 - m_ShowColliderSleep: 1 - m_ShowColliderContacts: 0 - m_ShowColliderAABB: 0 - m_ContactArrowScale: 0.2 - m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} - m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} - m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} - m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_GizmoOptions: 10 + m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffefffffffdffffbfffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 621bcdb..e1704b4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - Player - Enemy - Player Projectile - - + - Enemy Projectile - - -