diff --git a/Assets/Prefabs/Reisen.prefab b/Assets/Prefabs/Reisen.prefab index 6cb6fb9..1473fc0 100644 --- a/Assets/Prefabs/Reisen.prefab +++ b/Assets/Prefabs/Reisen.prefab @@ -1,5 +1,87 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3703793765329398476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1755284922926355219} + - component: {fileID: 7014475143959636119} + - component: {fileID: 5842194869372379965} + m_Layer: 8 + m_Name: EntityDetection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1755284922926355219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3703793765329398476} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.0905, y: -0.26199996, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1849759059644475718} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &7014475143959636119 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3703793765329398476} + 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, y: 0} + m_Radius: 6 +--- !u!114 &5842194869372379965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3703793765329398476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c400f563d8deda32ebf80ab7262922f3, type: 3} + m_Name: + m_EditorClassIdentifier: + thisEntity: {fileID: 8547430362287369941} --- !u!1 &3714680567868833155 GameObject: m_ObjectHideFlags: 0 @@ -9,7 +91,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2243782250480228875} - - component: {fileID: 4897167667714073556} m_Layer: 6 m_Name: Center m_TagString: Untagged @@ -33,61 +114,6 @@ Transform: - {fileID: 6298566175391005934} m_Father: {fileID: 1849759059644475718} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4897167667714073556 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3714680567868833155} - 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: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, 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 --- !u!1 &4860917236126221086 GameObject: m_ObjectHideFlags: 0 @@ -195,7 +221,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.2, y: 1} m_EdgeRadius: 0 --- !u!1 &6582811960690098071 GameObject: @@ -240,8 +266,8 @@ GameObject: - component: {fileID: 5359122752217294183} - component: {fileID: 1522197336905991381} - component: {fileID: 707193740762801077} - - component: {fileID: 7249280586437786251} - component: {fileID: 8547430362287369941} + - component: {fileID: 7249280586437786251} - component: {fileID: 6505873975486236506} m_Layer: 7 m_Name: Reisen @@ -260,9 +286,10 @@ Transform: 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_LocalScale: {x: 2, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1755284922926355219} - {fileID: 2243782250480228875} - {fileID: 6047872402331640471} - {fileID: 5727125788773421239} @@ -313,8 +340,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.819457, g: 0.5707547, b: 1, a: 1} + m_Sprite: {fileID: 3089812527112269012, guid: ef71f592ce7ea4ee59a15bfd360ea4ce, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -362,13 +389,13 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 0.3970588, y: 1} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 0.2, y: 1} m_EdgeRadius: 0 --- !u!50 &707193740762801077 Rigidbody2D: @@ -397,23 +424,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!114 &7249280586437786251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7051425899434579382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d4ea4a5fe3d2523039e302c010b04daf, type: 3} - m_Name: - m_EditorClassIdentifier: - stats: {fileID: 6505873975486236506} - abilities: [] - entitiesInRange: [] - closestEntity: {fileID: 0} - cam: {fileID: 0} --- !u!114 &8547430362287369941 MonoBehaviour: m_ObjectHideFlags: 0 @@ -427,7 +437,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stats: {fileID: 6505873975486236506} - abilities: [] entitiesInRange: [] closestEntity: {fileID: 0} maxTargettingRange: 0 @@ -436,9 +445,25 @@ MonoBehaviour: wallDetectors: [] wallLayer: serializedVersion: 2 - m_Bits: 0 + m_Bits: 8 player: {fileID: 0} playerMinDistance: 0 +--- !u!114 &7249280586437786251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7051425899434579382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4ea4a5fe3d2523039e302c010b04daf, type: 3} + m_Name: + m_EditorClassIdentifier: + stats: {fileID: 6505873975486236506} + entitiesInRange: [] + closestEntity: {fileID: 0} + cam: {fileID: 0} --- !u!114 &6505873975486236506 MonoBehaviour: m_ObjectHideFlags: 0 @@ -456,13 +481,18 @@ MonoBehaviour: maxHealth: 100 speed: 4 jumpPower: 6 + isStalled: 0 groundCheck: {fileID: 6047872402331640471} groundLayer: serializedVersion: 2 m_Bits: 8 attackOriginPoint: {fileID: 6298566175391005934} attackOriginCenter: {fileID: 2243782250480228875} + abilities: + - {fileID: 6641646259750344106} rb: {fileID: 707193740762801077} + sprite: {fileID: 5359122752217294183} + isFacingRight: 0 --- !u!1 &8370658841612952375 GameObject: m_ObjectHideFlags: 0 @@ -561,3 +591,14 @@ Transform: m_CorrespondingSourceObject: {fileID: 6610207326853905583, guid: 303f1513a3d6002c7a0b7b3fcc807afd, type: 3} m_PrefabInstance: {fileID: 5635527811715805373} m_PrefabAsset: {fileID: 0} +--- !u!114 &6641646259750344106 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1305679653731509527, guid: 303f1513a3d6002c7a0b7b3fcc807afd, type: 3} + m_PrefabInstance: {fileID: 5635527811715805373} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2e841223273eee80837e20d27430787, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Youmu.prefab b/Assets/Prefabs/Youmu.prefab index 122692f..12aac0a 100644 --- a/Assets/Prefabs/Youmu.prefab +++ b/Assets/Prefabs/Youmu.prefab @@ -137,6 +137,7 @@ GameObject: - component: {fileID: 3940513499368174321} - component: {fileID: 2276909637052643796} - component: {fileID: 2047881652295913413} + - component: {fileID: 6187681838506810731} - component: {fileID: 8821502866947698626} - component: {fileID: 2168594295468567769} m_Layer: 7 @@ -296,6 +297,22 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 +--- !u!114 &6187681838506810731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7036878528139897633} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4ea4a5fe3d2523039e302c010b04daf, type: 3} + m_Name: + m_EditorClassIdentifier: + stats: {fileID: 2168594295468567769} + entitiesInRange: [] + closestEntity: {fileID: 0} + cam: {fileID: 0} --- !u!114 &8821502866947698626 MonoBehaviour: m_ObjectHideFlags: 0 @@ -309,8 +326,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stats: {fileID: 2168594295468567769} - abilities: - - {fileID: 5774395727869586210} entitiesInRange: [] closestEntity: {fileID: 0} maxTargettingRange: 20 @@ -341,13 +356,18 @@ MonoBehaviour: maxHealth: 100 speed: 4 jumpPower: 6 + isStalled: 0 groundCheck: {fileID: 9142662567367472658} groundLayer: serializedVersion: 2 m_Bits: 8 attackOriginPoint: {fileID: 5196447376297042405} attackOriginCenter: {fileID: 462469376723332893} + abilities: + - {fileID: 5774395727869586210} rb: {fileID: 2047881652295913413} + sprite: {fileID: 3940513499368174321} + isFacingRight: 0 --- !u!1 &7227609801905333812 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index f31ef95..6d6f0a2 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -246,12 +246,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105960746} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.05, y: -3.06, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 10.152428, y: -0.5428512, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &300183056 GameObject: @@ -380,12 +380,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 300183056} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.78, y: -4.05, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 26.88243, y: -1.5328515, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &348374383 GameObject: @@ -514,12 +514,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348374383} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 26.389, y: -3.155, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 30.491428, y: -0.63785124, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &503651302 GameObject: @@ -602,12 +602,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 503651302} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.02, y: -5.01, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.122428, y: -2.4928515, z: -0.0049692346} m_LocalScale: {x: 80, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &503651305 BoxCollider2D: @@ -874,7 +874,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.834, y: -2.99, z: -10} + m_LocalPosition: {x: 1.799, y: -2.47, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1155,12 +1155,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 709669656} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 30.260002, y: -4.0800004, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 34.36243, y: -1.5628517, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &720092141 GameObject: @@ -1289,12 +1289,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 720092141} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.24, y: -4.01, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.862428, y: -1.4928515, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &741584341 GameObject: @@ -1454,12 +1454,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 827870557} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 30.296, y: -3.134, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 34.398426, y: -0.61685133, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &903554437 GameObject: @@ -1588,12 +1588,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 903554437} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 28.372, y: -3.14, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 32.474426, y: -0.6228514, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &970316200 GameObject: @@ -1722,24 +1722,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970316200} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.18, y: -4.01, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 9.282428, y: -1.4928515, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &977671504 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6641646259750344106, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} - m_PrefabInstance: {fileID: 6873119575921479500} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2e841223273eee80837e20d27430787, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1002049188 GameObject: m_ObjectHideFlags: 0 @@ -1867,12 +1856,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1002049188} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 28.42, y: -4.05, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 32.522427, y: -1.5328515, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1045992233 GameObject: @@ -2001,22 +1990,33 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045992233} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.02, y: -4.05, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.122428, y: -1.5328515, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1214889688 stripped +--- !u!114 &1074741171 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5774395727869586210, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} + m_CorrespondingSourceObject: {fileID: 8821502866947698626, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} m_PrefabInstance: {fileID: 4684006860967165701} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2e841223273eee80837e20d27430787, type: 3} + m_Script: {fileID: 11500000, guid: 88cc3202b26534d78b932ebaf49077f4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1074741177 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6187681838506810731, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} + m_PrefabInstance: {fileID: 4684006860967165701} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4ea4a5fe3d2523039e302c010b04daf, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1219161079 @@ -2177,11 +2177,59 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1269025663} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 32.100002, y: -4.06, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 36.20243, y: -1.5428512, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] + m_Father: {fileID: 1367263754} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1367263753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1367263754} + m_Layer: 0 + m_Name: Environment + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1367263754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367263753} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.102428, y: -2.5171487, z: 0.0049692346} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 503651304} + - {fileID: 720092144} + - {fileID: 970316203} + - {fileID: 2023669386} + - {fileID: 903554440} + - {fileID: 2051055017} + - {fileID: 300183059} + - {fileID: 1655039423} + - {fileID: 709669659} + - {fileID: 105960749} + - {fileID: 1045992236} + - {fileID: 1002049191} + - {fileID: 827870560} + - {fileID: 1685424802} + - {fileID: 1854930185} + - {fileID: 348374386} + - {fileID: 1269025666} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1522071290 @@ -2333,6 +2381,56 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1646850946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1646850948} + - component: {fileID: 1646850947} + m_Layer: 0 + m_Name: PlaayerSwitcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1646850947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646850946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3db97897f8dc0482a9a25edd2d1ef4a0, type: 3} + m_Name: + m_EditorClassIdentifier: + cam: {fileID: 2119366495} + player1: {fileID: 6873119575921479501} + player1AI: {fileID: 6873119575921479510} + player2: {fileID: 1074741177} + player2AI: {fileID: 1074741171} + switchCooldown: 2 +--- !u!4 &1646850948 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1646850946} + 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: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1655039420 GameObject: m_ObjectHideFlags: 0 @@ -2460,12 +2558,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1655039420} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 24.554, y: -3.175, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 28.65643, y: -0.6578512, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1685424799 GameObject: @@ -2594,12 +2692,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1685424799} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 35.9, y: -4.0800004, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 40.00243, y: -1.5628517, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1854930182 GameObject: @@ -2728,12 +2826,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1854930182} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 24.62, y: -4.0299997, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 28.72243, y: -1.512851, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2007610691 GameObject: @@ -2944,12 +3042,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023669383} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 26.58, y: -4.04, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 30.682428, y: -1.5228512, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2038292821 GameObject: @@ -3156,12 +3254,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2051055014} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 34.06, y: -4.07, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 38.16243, y: -1.5528514, z: -0.0049692346} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1367263754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119366494 GameObject: @@ -3233,7 +3331,7 @@ Transform: m_GameObject: {fileID: 2119366494} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.834, y: -2.99, z: -10} + m_LocalPosition: {x: 1.799, y: -2.47, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3310,14 +3408,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2168594295468567769, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} - propertyPath: abilities.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2168594295468567769, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} - propertyPath: 'abilities.Array.data[0]' - value: - objectReference: {fileID: 1214889688} - target: {fileID: 4893125162624080007, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} propertyPath: m_LocalPosition.x value: -10.382 @@ -3358,6 +3448,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6187681838506810731, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} + propertyPath: cam + value: + objectReference: {fileID: 519420031} - target: {fileID: 7036878528139897633, guid: 109c16c8c32ec1d5a831de3f8cbbfc4b, type: 3} propertyPath: m_Name value: Youmu @@ -3436,11 +3530,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1849759059644475718, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} propertyPath: m_LocalPosition.x - value: 1.834 + value: 1.799 objectReference: {fileID: 0} - target: {fileID: 1849759059644475718, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} propertyPath: m_LocalPosition.y - value: -3.99 + value: -3.47 objectReference: {fileID: 0} - target: {fileID: 1849759059644475718, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} propertyPath: m_LocalPosition.z @@ -3474,14 +3568,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6505873975486236506, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} - propertyPath: abilities.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6505873975486236506, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} - propertyPath: 'abilities.Array.data[0]' + - target: {fileID: 5842194869372379965, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} + propertyPath: thisEntity value: - objectReference: {fileID: 977671504} + objectReference: {fileID: 6873119575921479510} - target: {fileID: 7051425899434579382, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} propertyPath: m_Name value: Reisen @@ -3490,14 +3580,14 @@ PrefabInstance: propertyPath: cam value: objectReference: {fileID: 519420031} - - target: {fileID: 7249280586437786251, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} - propertyPath: abilities.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7249280586437786251, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} - propertyPath: 'abilities.Array.data[0]' + - target: {fileID: 8547430362287369941, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} + propertyPath: player value: - objectReference: {fileID: 977671504} + objectReference: {fileID: 1074741177} + - target: {fileID: 8547430362287369941, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3519,6 +3609,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 1849759059644475718, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} m_PrefabInstance: {fileID: 6873119575921479500} m_PrefabAsset: {fileID: 0} +--- !u!114 &6873119575921479510 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8547430362287369941, guid: d79cfe0fe733d409a8fe68dede44bd2a, type: 3} + m_PrefabInstance: {fileID: 6873119575921479500} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88cc3202b26534d78b932ebaf49077f4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!50 &7332886677051986745 Rigidbody2D: serializedVersion: 5 @@ -3633,6 +3734,7 @@ MonoBehaviour: maxHealth: 10 speed: 3 jumpPower: 6 + isStalled: 0 groundCheck: {fileID: 741584342} groundLayer: serializedVersion: 2 @@ -3641,6 +3743,8 @@ MonoBehaviour: attackOriginCenter: {fileID: 631591844} abilities: [] rb: {fileID: 7332886677051986745} + sprite: {fileID: 5694705184433450509} + isFacingRight: 0 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3651,20 +3755,5 @@ SceneRoots: - {fileID: 6873119575921479500} - {fileID: 4684006860967165701} - {fileID: 4201844704003245179} - - {fileID: 503651304} - - {fileID: 720092144} - - {fileID: 970316203} - - {fileID: 2023669386} - - {fileID: 903554440} - - {fileID: 2051055017} - - {fileID: 300183059} - - {fileID: 1655039423} - - {fileID: 709669659} - - {fileID: 105960749} - - {fileID: 1045992236} - - {fileID: 1002049191} - - {fileID: 827870560} - - {fileID: 1685424802} - - {fileID: 1854930185} - - {fileID: 348374386} - - {fileID: 1269025666} + - {fileID: 1367263754} + - {fileID: 1646850948} diff --git a/Assets/Scripts/AutomatedPlayer.cs b/Assets/Scripts/AutomatedPlayer.cs index eaa342c..ebaa827 100644 --- a/Assets/Scripts/AutomatedPlayer.cs +++ b/Assets/Scripts/AutomatedPlayer.cs @@ -21,22 +21,26 @@ public class AutomatedPlayer : AutoControlledEntity private void FixedUpdate() { - Vector2 direction = new Vector2(0, stats.rb.linearVelocityY); - Entity target = player; - if (!closestEntity && Vector3.Distance(player.transform.position, transform.position) <= playerMinDistance) + if (!stats.isStalled) { - stats.rb.linearVelocity = direction; //repeated code sucks but it works in this case i guess - return; //do not bother running any more code lol you're already next to the player and no enemies nearby + Vector2 direction = new Vector2(0, stats.rb.linearVelocityY); + Entity target = player; + if (!closestEntity && Vector3.Distance(player.transform.position, transform.position) <= playerMinDistance) + { + stats.rb.linearVelocity = direction; //repeated code sucks but it works in this case i guess + return; //do not bother running any more code lol you're already next to the player and no enemies nearby + } + if (closestEntity && Vector3.Distance(closestEntity.transform.position, transform.position) < maxTargettingRange) + { + target = closestEntity; + } + direction.x = (target.transform.position - transform.position).normalized.x * stats.speed; + if (/*(target.transform.position.y - transform.position.y > maxHeightDifference ||*/ (DetectWalls() && Vector3.Distance(target.transform.position, transform.position) > minTargetJumpDistance)/*)*/ && stats.OnGround()) + { + direction.y = stats.jumpPower; + } + FlipSprite(direction); + stats.rb.linearVelocity = direction; } - if (closestEntity && Vector3.Distance(closestEntity.transform.position, transform.position) < maxTargettingRange) - { - target = closestEntity; - } - direction.x = (target.transform.position - transform.position).normalized.x * stats.speed; - if ((target.transform.position.y - transform.position.y > maxHeightDifference || (DetectWalls() && Vector3.Distance(target.transform.position, transform.position) > minTargetJumpDistance)) && stats.OnGround()) - { - direction.y = stats.jumpPower; - } - stats.rb.linearVelocity = direction; } } diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 0dd64f4..af6bf25 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -5,16 +5,20 @@ public class Enemy : AutoControlledEntity { private void FixedUpdate() { - Vector2 direction = new Vector2(0, stats.rb.linearVelocityY); - if (closestEntity && Vector3.Distance(closestEntity.transform.position, transform.position) < maxTargettingRange) + if (!stats.isStalled) { - direction.x = (closestEntity.transform.position - transform.position).normalized.x * stats.speed; - if ((closestEntity.transform.position.y - transform.position.y > maxHeightDifference || (DetectWalls() && Vector3.Distance(closestEntity.transform.position, transform.position) > minTargetJumpDistance)) && stats.OnGround()) + Vector2 direction = new Vector2(0, stats.rb.linearVelocityY); + if (closestEntity && Vector3.Distance(closestEntity.transform.position, transform.position) < maxTargettingRange) { - direction.y = stats.jumpPower; + direction.x = (closestEntity.transform.position - transform.position).normalized.x * stats.speed; + if ((closestEntity.transform.position.y - transform.position.y > maxHeightDifference || (DetectWalls() && Vector3.Distance(closestEntity.transform.position, transform.position) > minTargetJumpDistance)) && stats.OnGround()) + { + direction.y = stats.jumpPower; + } } + FlipSprite(direction); + stats.rb.linearVelocity = direction; } - stats.rb.linearVelocity = direction; } public override void OnDeath() diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index 491b947..b98af6c 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -14,4 +14,18 @@ public class Entity : MonoBehaviour { } + protected void FlipSprite(Vector2 lookDirection) + { + if (lookDirection.x > 0f && stats.isFacingRight) + { + stats.sprite.flipX = true; + stats.isFacingRight = !stats.isFacingRight; + } + else if (lookDirection.x < 0f && !stats.isFacingRight) + { + stats.sprite.flipX = false; + stats.isFacingRight = !stats.isFacingRight; + } + } + } diff --git a/Assets/Scripts/EntityStats.cs b/Assets/Scripts/EntityStats.cs index 1928e04..f363b70 100644 --- a/Assets/Scripts/EntityStats.cs +++ b/Assets/Scripts/EntityStats.cs @@ -11,6 +11,8 @@ public class EntityStats : MonoBehaviour [Header("Stats")] public float speed; public float jumpPower; + [Header("State")] + public bool isStalled; [Header("Ground Detection")] [SerializeField] private Transform groundCheck; [SerializeField] private LayerMask groundLayer; @@ -21,6 +23,8 @@ public class EntityStats : MonoBehaviour public List abilities = new(); [Header("Cache")] public Rigidbody2D rb; + public SpriteRenderer sprite; + public bool isFacingRight; public void TakeDamage(float damage) { health -= damage; diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 2539c2d..b8f5216 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -16,11 +16,15 @@ public class Player : Entity private void FixedUpdate() { - Vector2 movement = new Vector2(Input.GetAxis("Horizontal") * stats.speed, stats.rb.linearVelocityY); - if (Input.GetKeyDown(KeyCode.Space) && stats.OnGround()) + if (!stats.isStalled) { - movement.y = stats.jumpPower; + Vector2 movement = new Vector2(Input.GetAxis("Horizontal") * stats.speed, stats.rb.linearVelocityY); + if (Input.GetKeyDown(KeyCode.Space) && stats.OnGround()) + { + movement.y = stats.jumpPower; + } + FlipSprite(movement); + stats.rb.linearVelocity = movement; } - stats.rb.linearVelocity = movement; } } diff --git a/Assets/Scripts/PlayerSwitcher.cs b/Assets/Scripts/PlayerSwitcher.cs index 2a291d9..7bbeae1 100644 --- a/Assets/Scripts/PlayerSwitcher.cs +++ b/Assets/Scripts/PlayerSwitcher.cs @@ -1,38 +1,49 @@ using System; +using Unity.Cinemachine; using UnityEngine; public class PlayerSwitcher : MonoBehaviour { + [SerializeField] private CinemachineCamera cam; + [Header("Players")] [SerializeField] private Player player1; [SerializeField] private AutomatedPlayer player1AI; [SerializeField] private Player player2; [SerializeField] private AutomatedPlayer player2AI; + [Header("Switch Cooldowns")] + [SerializeField] private float switchCooldown; + private float currentSwitchCooldown; + + private void Update() { - if(Input.GetKeyDown(KeyCode.E)) + if (Input.GetKeyDown(KeyCode.E) && currentSwitchCooldown <= 0f) { - SwitchPlayers(); + if (player1.isActiveAndEnabled) + { + SwitchPlayers(player1, player1AI, player2, player2AI); + } + else + { + SwitchPlayers(player2, player2AI, player1, player1AI); + } + currentSwitchCooldown = switchCooldown; + } + + if (currentSwitchCooldown > 0f) + { + currentSwitchCooldown -= Time.deltaTime; } } - public void SwitchPlayers() //i bet if i made it a parameter i wouldn't have to make an if statement. but it's literally 5 am and i'm lazy + public void SwitchPlayers(Player playerA, AutomatedPlayer playerAAI, Player playerB, AutomatedPlayer playerBAI) { - if (player1.enabled) - { - player1AI.enabled = true; - player1.enabled = false; - player2.enabled = true; - player2AI.enabled = false; - (player2.transform.position, player1AI.transform.position) = (player1AI.transform.position, player2.transform.position); - } - else - { - player2AI.enabled = true; - player2.enabled = false; - player1.enabled = true; - player1AI.enabled = false; - (player1.transform.position, player2AI.transform.position) = (player2AI.transform.position, player1.transform.position); - } + cam.Follow = playerB.transform; + playerAAI.enabled = true; + playerA.enabled = false; + playerB.enabled = true; + playerBAI.enabled = false; + (playerB.transform.position, playerAAI.transform.position) = (playerAAI.transform.position, playerB.transform.position); } } diff --git a/Assets/Sprites/reisensprite.png b/Assets/Sprites/reisensprite.png new file mode 100644 index 0000000..5cc6960 Binary files /dev/null and b/Assets/Sprites/reisensprite.png differ diff --git a/Assets/Sprites/reisensprite.png.meta b/Assets/Sprites/reisensprite.png.meta new file mode 100644 index 0000000..4d97c4f --- /dev/null +++ b/Assets/Sprites/reisensprite.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: ef71f592ce7ea4ee59a15bfd360ea4ce +TextureImporter: + internalIDToNameTable: + - first: + 213: 3089812527112269012 + second: reisensprite_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 68 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: reisensprite_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 27 + height: 68 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4dc24157f1831ea20800000000000000 + internalID: 3089812527112269012 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + reisensprite_0: 3089812527112269012 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: