diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower.meta b/RWM-P2-TEAM-C/Assets/Animations/Follower.meta new file mode 100644 index 0000000..0394416 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a898ee15f48b03458290f95b7d49a79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Flying.anim b/RWM-P2-TEAM-C/Assets/Animations/Follower/Flying.anim new file mode 100644 index 0000000..90fb4cb --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Flying.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flying + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -658488818849062040, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 0.25 + value: {fileID: 5257445025754109575, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 0.5 + value: {fileID: -3489701935167146205, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 0.75 + value: {fileID: -658488818849062040, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -658488818849062040, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: 5257445025754109575, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: -3489701935167146205, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: -658488818849062040, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.76666665 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Flying.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Follower/Flying.anim.meta new file mode 100644 index 0000000..d8ec727 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Flying.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb8109cc87968334c886491b487ec082 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Follower.controller b/RWM-P2-TEAM-C/Assets/Animations/Follower/Follower.controller new file mode 100644 index 0000000..d5088be --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Follower.controller @@ -0,0 +1,185 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-2669772734411088429 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: unfurl + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -659894985565329916} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-857291959124273021 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5432238139017678534} + m_Position: {x: 260, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -659894985565329916} + m_Position: {x: 540, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7196125910429643183} + m_Position: {x: 420, y: 230, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 5432238139017678534} +--- !u!1102 &-659894985565329916 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unfurl + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1303715482359583461} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 03a66964e9132da4d9a2c262aa86fbf8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Follower + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: unfurl + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -857291959124273021} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1303715482359583461 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7196125910429643183} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75409836 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5432238139017678534 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Furl + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2669772734411088429} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fcf78a58de963304f8e5635df086dfe9, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &7196125910429643183 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flying + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: bb8109cc87968334c886491b487ec082, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Follower.controller.meta b/RWM-P2-TEAM-C/Assets/Animations/Follower/Follower.controller.meta new file mode 100644 index 0000000..8286437 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Follower.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c6be22b1a5ba1f43a8634df94e8c14a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Furl.anim b/RWM-P2-TEAM-C/Assets/Animations/Follower/Furl.anim new file mode 100644 index 0000000..9ad3dc8 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Furl.anim @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Furl + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 4445250453518211759, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 4445250453518211759, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Furl.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Follower/Furl.anim.meta new file mode 100644 index 0000000..e7e19bb --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Furl.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcf78a58de963304f8e5635df086dfe9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Unfurl.anim b/RWM-P2-TEAM-C/Assets/Animations/Follower/Unfurl.anim new file mode 100644 index 0000000..1a06a93 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Unfurl.anim @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Unfurl + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -6786234795808346097, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 0.25 + value: {fileID: 3525683147706804216, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 0.5 + value: {fileID: 7951964856068429064, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 0.75 + value: {fileID: 319393445605257926, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - time: 1 + value: {fileID: 319393445605257926, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -6786234795808346097, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: 3525683147706804216, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: 7951964856068429064, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: 319393445605257926, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + - {fileID: 319393445605257926, guid: e3f4f20cb93d3f24ea0b363feff84dd7, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/RWM-P2-TEAM-C/Assets/Animations/Follower/Unfurl.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Follower/Unfurl.anim.meta new file mode 100644 index 0000000..42c8e22 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Animations/Follower/Unfurl.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03a66964e9132da4d9a2c262aa86fbf8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Bomb.prefab b/RWM-P2-TEAM-C/Assets/Prefabs/Bomb.prefab new file mode 100644 index 0000000..4736b71 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Bomb.prefab @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5901618009943190603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5901618009943190606} + - component: {fileID: 5901618009943190607} + - component: {fileID: 5901618009943190600} + - component: {fileID: 5901618009943190601} + - component: {fileID: 5901618009943190602} + m_Layer: 0 + m_Name: Bomb + m_TagString: Bomb + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5901618009943190606 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901618009943190603} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 14, y: 5, z: 0} + m_LocalScale: {x: 10, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5901618009943190607 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901618009943190603} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 4377828469143043286, guid: 9ec9039fbb64f574b82c4c585d966b38, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &5901618009943190600 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901618009943190603} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &5901618009943190601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901618009943190603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb2ea9669a40a2545933cb5388567d57, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 1 + dropped: 0 + cracked: {fileID: -4641593119166046098, guid: 9ec9039fbb64f574b82c4c585d966b38, + type: 3} + ShrapnelPassed: {fileID: 3322553872814111815, guid: e25f02ecd66fa094e826c58f7570ceca, + type: 3} +--- !u!61 &5901618009943190602 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5901618009943190603} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.13, y: 0.1} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.13, y: 0.1} + m_EdgeRadius: 0 diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Bomb.prefab.meta b/RWM-P2-TEAM-C/Assets/Prefabs/Bomb.prefab.meta new file mode 100644 index 0000000..e6262f9 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Bomb.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1fb843f44354d3f44b2d683be981be46 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Bomber.prefab b/RWM-P2-TEAM-C/Assets/Prefabs/Bomber.prefab new file mode 100644 index 0000000..76f0689 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Bomber.prefab @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1622205576178837872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1622205576178837883} + - component: {fileID: 1622205576178837876} + - component: {fileID: 1622205576178837877} + - component: {fileID: 1622205576178837878} + - component: {fileID: 1622205576178837879} + m_Layer: 0 + m_Name: Bomber + m_TagString: Bomber + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1622205576178837883 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1622205576178837872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12, y: 3, z: 0} + m_LocalScale: {x: 10, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1622205576178837876 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1622205576178837872} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 1899764433161736106, guid: 9ec9039fbb64f574b82c4c585d966b38, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &1622205576178837877 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1622205576178837872} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1622205576178837878 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1622205576178837872} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.18, y: 0.16} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.18, y: 0.16} + m_EdgeRadius: 0 +--- !u!114 &1622205576178837879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1622205576178837872} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e37872d9033aa2a4fb96bac04a312cc9, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 5 + speed: 5 + player: {fileID: 0} + range: 5 + bombPassed: {fileID: 5901618009943190603, guid: 1fb843f44354d3f44b2d683be981be46, + type: 3} diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Bomber.prefab.meta b/RWM-P2-TEAM-C/Assets/Prefabs/Bomber.prefab.meta new file mode 100644 index 0000000..9034f45 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Bomber.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dec1a0501962ae04bb32201805ca78c3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Follower.prefab b/RWM-P2-TEAM-C/Assets/Prefabs/Follower.prefab new file mode 100644 index 0000000..613fcce --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Follower.prefab @@ -0,0 +1,184 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2581665534947295289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2581665534947295293} + - component: {fileID: 2581665534947295292} + - component: {fileID: 2581665534947295295} + - component: {fileID: 706482267211386185} + - component: {fileID: 2581665534947295294} + - component: {fileID: 8250944791375136935} + - component: {fileID: -7828016613961019964} + m_Layer: 0 + m_Name: Follower + m_TagString: Follower + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2581665534947295293 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: 3, z: 0} + m_LocalScale: {x: 10, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2581665534947295292 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 4445250453518211759, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &2581665534947295295 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &706482267211386185 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.24} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.16, y: 0.24} + m_EdgeRadius: 0 +--- !u!114 &2581665534947295294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03f5bc1338360634abf1eb068e7667cf, type: 3} + m_Name: + m_EditorClassIdentifier: + maxHealth: 5 + speed: 2 + player: {fileID: 0} + invincible: 1 + stateDist: 5 +--- !u!114 &8250944791375136935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cd2d100fab8a0e428d958a0e097baf7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &-7828016613961019964 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2581665534947295289} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0c6be22b1a5ba1f43a8634df94e8c14a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Follower.prefab.meta b/RWM-P2-TEAM-C/Assets/Prefabs/Follower.prefab.meta new file mode 100644 index 0000000..227b337 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Follower.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ab170db3611677469f6a9fdb39cc557 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Shrapnel.prefab b/RWM-P2-TEAM-C/Assets/Prefabs/Shrapnel.prefab new file mode 100644 index 0000000..c02a7a7 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Shrapnel.prefab @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3322553872814111815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3322553872814111867} + - component: {fileID: 3322553872814111866} + - component: {fileID: 3322553872814111865} + - component: {fileID: 3322553872814111864} + - component: {fileID: 6800375758628227533} + m_Layer: 0 + m_Name: Shrapnel + m_TagString: Shrapnel + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3322553872814111867 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322553872814111815} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 15, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3322553872814111866 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322553872814111815} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -156469589758702178, guid: 9ec9039fbb64f574b82c4c585d966b38, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &3322553872814111865 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322553872814111815} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &3322553872814111864 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322553872814111815} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.08, y: 0.08} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.08, y: 0.08} + m_EdgeRadius: 0 +--- !u!114 &6800375758628227533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322553872814111815} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 160db39886ea9a847894af84986b1059, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/RWM-P2-TEAM-C/Assets/Prefabs/Shrapnel.prefab.meta b/RWM-P2-TEAM-C/Assets/Prefabs/Shrapnel.prefab.meta new file mode 100644 index 0000000..ac877f2 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Prefabs/Shrapnel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e25f02ecd66fa094e826c58f7570ceca +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Scenes/AITestScene.unity b/RWM-P2-TEAM-C/Assets/Scenes/AITestScene.unity index 3c6a990..7b20abc 100644 --- a/RWM-P2-TEAM-C/Assets/Scenes/AITestScene.unity +++ b/RWM-P2-TEAM-C/Assets/Scenes/AITestScene.unity @@ -121,428 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &202349139 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 202349144} - - component: {fileID: 202349143} - - component: {fileID: 202349142} - - component: {fileID: 202349141} - - component: {fileID: 202349140} - m_Layer: 0 - m_Name: Bomber - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &202349140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202349139} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e37872d9033aa2a4fb96bac04a312cc9, type: 3} - m_Name: - m_EditorClassIdentifier: - maxHealth: 5 - speed: 5 - player: {fileID: 1289308188} - range: 5 ---- !u!61 &202349141 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202349139} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.16, y: 0.16} - newSize: {x: 0.16, y: 0.16} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.16, y: 0.16} - m_EdgeRadius: 0 ---- !u!50 &202349142 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202349139} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!212 &202349143 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202349139} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.9433962, g: 0.92069924, b: 0, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &202349144 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 202349139} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12, y: 3, z: 0} - m_LocalScale: {x: 5, y: 5, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &516862376 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 516862381} - - component: {fileID: 516862380} - - component: {fileID: 516862379} - - component: {fileID: 516862378} - - component: {fileID: 516862377} - m_Layer: 0 - m_Name: Bomb - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &516862377 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516862376} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.16, y: 0.16} - newSize: {x: 0.16, y: 0.16} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.16, y: 0.16} - m_EdgeRadius: 0 ---- !u!114 &516862378 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516862376} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb2ea9669a40a2545933cb5388567d57, type: 3} - m_Name: - m_EditorClassIdentifier: - maxHealth: 1 - dropped: 0 ---- !u!50 &516862379 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516862376} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!212 &516862380 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516862376} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.79215693, g: 0.7725491, b: 0, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &516862381 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 516862376} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 14, y: 5, z: 0} - m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &517616223 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 517616227} - - component: {fileID: 517616226} - - component: {fileID: 517616225} - - component: {fileID: 517616224} - m_Layer: 0 - m_Name: Shrapnel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &517616224 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517616223} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0.049999997, y: 0.049999997, z: 0.049999997, w: 0.049999997} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.16, y: 0.16} - newSize: {x: 0.16, y: 0.16} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.16, y: 0.16} - m_EdgeRadius: 0 ---- !u!50 &517616225 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517616223} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!212 &517616226 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517616223} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.79215693, g: 0.7725491, b: 0, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &517616227 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 517616223} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1289308188 GameObject: m_ObjectHideFlags: 0 @@ -575,6 +153,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65acb87fefd0f8042a3f8602ebf90a79, type: 3} m_Name: m_EditorClassIdentifier: + _timeBetweenShots: 0 + direction: -1 --- !u!95 &1289308190 Animator: serializedVersion: 3 @@ -675,13 +255,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1289308188} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.05, y: 1.17, z: 0} + m_LocalPosition: {x: -0.16, y: -0.2, z: 0} m_LocalScale: {x: 10, y: 10, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1384308573 +--- !u!1 &1302880525 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -689,9 +269,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1384308576} - - component: {fileID: 1384308575} - - component: {fileID: 1384308574} + - component: {fileID: 1302880528} + - component: {fileID: 1302880527} + - component: {fileID: 1302880526} m_Layer: 0 m_Name: Ground m_TagString: Ground @@ -699,13 +279,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!61 &1384308574 +--- !u!61 &1302880526 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1384308573} + m_GameObject: {fileID: 1302880525} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -725,13 +305,13 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.1321254, y: 0.13416772} m_EdgeRadius: 0 ---- !u!212 &1384308575 +--- !u!212 &1302880527 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1384308573} + m_GameObject: {fileID: 1302880525} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -775,140 +355,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1384308576 +--- !u!4 &1302880528 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1384308573} + m_GameObject: {fileID: 1302880525} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.18, y: -3.7, z: 0} + m_LocalPosition: {x: 0.18, y: -4.17, z: 0} m_LocalScale: {x: 180, y: 30, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1647845331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1647845335} - - component: {fileID: 1647845334} - - component: {fileID: 1647845333} - - component: {fileID: 1647845332} - m_Layer: 0 - m_Name: Follower - m_TagString: Follower - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1647845332 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647845331} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03f5bc1338360634abf1eb068e7667cf, type: 3} - m_Name: - m_EditorClassIdentifier: - maxHealth: 5 - speed: 2 - player: {fileID: 1289308188} - invincible: 1 - stateDist: 5 ---- !u!50 &1647845333 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647845331} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!212 &1647845334 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647845331} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1647845335 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647845331} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5, y: 3, z: 0} - m_LocalScale: {x: 5, y: 5, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1947760573 GameObject: @@ -993,3 +452,279 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1622205576379609891 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1622205576178837872, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_Name + value: Bomber + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837876, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 1899764433161736106, guid: 9ec9039fbb64f574b82c4c585d966b38, + type: 3} + - target: {fileID: 1622205576178837876, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837876, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837876, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837877, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_BodyType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837878, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_Size.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837878, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_SpriteTilingProperty.border.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837878, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_SpriteTilingProperty.border.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837878, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_SpriteTilingProperty.border.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837878, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_SpriteTilingProperty.border.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837878, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.18 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837879, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: range + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837879, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1289308188} + - target: {fileID: 1622205576178837879, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: bombPassed + value: + objectReference: {fileID: 5901618009943190603, guid: 1fb843f44354d3f44b2d683be981be46, + type: 3} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalPosition.x + value: 9.77 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalPosition.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1622205576178837883, guid: dec1a0501962ae04bb32201805ca78c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dec1a0501962ae04bb32201805ca78c3, type: 3} +--- !u!1001 &2581665535450095594 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -7828016613961019964, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 0c6be22b1a5ba1f43a8634df94e8c14a, type: 2} + - target: {fileID: 2581665534947295289, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Name + value: Follower + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295292, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 4445250453518211759, guid: e3f4f20cb93d3f24ea0b363feff84dd7, + type: 3} + - target: {fileID: 2581665534947295292, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295292, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295292, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalPosition.x + value: -7.73 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.46 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295293, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295294, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1289308188} + - target: {fileID: 2581665534947295295, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_BodyType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295295, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_Simulated + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2581665534947295295, guid: 9ab170db3611677469f6a9fdb39cc557, + type: 3} + propertyPath: m_CollisionDetection + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9ab170db3611677469f6a9fdb39cc557, type: 3} diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Bomb.cs b/RWM-P2-TEAM-C/Assets/Scripts/Bomb.cs index 1ad9b0f..9a3162f 100644 --- a/RWM-P2-TEAM-C/Assets/Scripts/Bomb.cs +++ b/RWM-P2-TEAM-C/Assets/Scripts/Bomb.cs @@ -9,7 +9,7 @@ public class Bomb : MonoBehaviour // Bomber's GameObject private GameObject bomber; - // Shrapnel GameObject + // Temporary Shrapnel GameObject private GameObject shrapnel; // player gameobject private GameObject player; @@ -17,17 +17,22 @@ public class Bomb : MonoBehaviour public float maxHealth = 1.0f; // Current Health private float health; + // Shell visible timer + private float timer = 0; // Controls id the bomb is dropped; public bool dropped = false; + // cracked egg sprite + public Sprite cracked; + // shrapnel object + public GameObject ShrapnelPassed; // Start is called before the first frame update void Start() { rb = gameObject.GetComponent(); - player = GameObject.Find("Player"); + player = GameObject.FindGameObjectWithTag("Player"); health = maxHealth; - bomber = GameObject.Find("Bomber"); - rb.velocity = new Vector2(-bomber.GetComponent().speed, rb.velocity.y); + rb.velocity = new Vector2(-this.GetComponentInParent().speed, rb.velocity.y); } // Update is called once per frame @@ -39,24 +44,37 @@ void Update() } } - void OnCollisionEnter2D(Collision2D col) + void OnTriggerEnter2D(Collider2D col) { - if(col.gameObject.name == "Ground") + Debug.Log(col.gameObject.tag); + timer = Time.deltaTime + 2.0f; + if (col.gameObject.tag == "Ground") { + gameObject.GetComponent().sprite = cracked; for (int i = 0; i < 3; i++) { - shrapnel = Instantiate(GameObject.Find("Shrapnel"), new Vector3(rb.position.x, rb.position.y + i, 0), Quaternion.identity); + shrapnel = Instantiate(ShrapnelPassed, new Vector3(rb.position.x, rb.position.y + i, 0), Quaternion.identity); if(rb.position.x < player.GetComponent().position.x) { - shrapnel.GetComponent().velocity = new Vector2(bomber.GetComponent().speed, rb.velocity.y); + shrapnel.GetComponent().velocity = new Vector2(this.GetComponentInParent().speed, 0.0f); + shrapnel.GetComponent().localScale = new Vector3(shrapnel.GetComponent().localScale.x * -1, shrapnel.GetComponent().localScale.y, shrapnel.GetComponent().localScale.z); } else if(rb.position.x > player.GetComponent().position.x) { - shrapnel.GetComponent().velocity = new Vector2(-bomber.GetComponent().speed, rb.velocity.y); + shrapnel.GetComponent().velocity = new Vector2(-this.GetComponentInParent().speed, 0.0f); } } + + while (timer < 2.0f) + { + Destroy(this.gameObject); + timer += Time.deltaTime; + } + } + else + { + Destroy(this.gameObject); } - Destroy(this.gameObject); } public void Damage(float damage) diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Bomber.cs b/RWM-P2-TEAM-C/Assets/Scripts/Bomber.cs index 8412efb..84d3491 100644 --- a/RWM-P2-TEAM-C/Assets/Scripts/Bomber.cs +++ b/RWM-P2-TEAM-C/Assets/Scripts/Bomber.cs @@ -23,6 +23,9 @@ public class Bomber : MonoBehaviour private bool armed = true; + // Passed in Bomb Object + public GameObject bombPassed; + // Start is called before the first frame update void Start() { @@ -30,8 +33,12 @@ void Start() health = maxHealth; // Movement rb.velocity = new Vector2(-speed, rb.velocity.y); - bomb = Instantiate(GameObject.Find("Bomb"), new Vector3(rb.position.x, rb.position.y - 0.75f, 0), Quaternion.identity); + bomb = Instantiate(bombPassed, new Vector3(rb.position.x, rb.position.y - 1.5f, 0), Quaternion.identity); bomb.transform.parent = this.transform; + if (!player) + { + player = GameObject.FindGameObjectWithTag("Player"); + } } // Update is called once per frame diff --git a/RWM-P2-TEAM-C/Assets/Scripts/FollowerAnimationController.cs b/RWM-P2-TEAM-C/Assets/Scripts/FollowerAnimationController.cs new file mode 100644 index 0000000..ec44d48 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/FollowerAnimationController.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FollowerAnimationController : MonoBehaviour +{ + private Animator animator; + + // Start is called before the first frame update + void Start() + { + animator = this.GetComponent(); + } + + // Update is called once per frame + void Update() + { + if(!gameObject.GetComponent().invincible) + { + animator.SetBool("unfurl", true); + } + } +} diff --git a/RWM-P2-TEAM-C/Assets/Scripts/FollowerAnimationController.cs.meta b/RWM-P2-TEAM-C/Assets/Scripts/FollowerAnimationController.cs.meta new file mode 100644 index 0000000..c170c3a --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/FollowerAnimationController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5cd2d100fab8a0e428d958a0e097baf7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Scripts.asmdef b/RWM-P2-TEAM-C/Assets/Scripts/Scripts.asmdef index e34763a..08f9125 100644 --- a/RWM-P2-TEAM-C/Assets/Scripts/Scripts.asmdef +++ b/RWM-P2-TEAM-C/Assets/Scripts/Scripts.asmdef @@ -2,7 +2,8 @@ "name": "Scripts", "references": [ "GUID:28314eb239536d44d86d9f25b43aba90", - "GUID:5ce4408d21b19b646bcde9fb5825ffc0" + "GUID:5ce4408d21b19b646bcde9fb5825ffc0", + "GUID:67bd6da67c4326e45be01f23d78d9323" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Shrapnel.cs b/RWM-P2-TEAM-C/Assets/Scripts/Shrapnel.cs new file mode 100644 index 0000000..4e4a22b --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/Shrapnel.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Shrapnel : MonoBehaviour +{ + // player gameobject + private GameObject player; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + void OnTriggerEnter2D(Collider2D col) + { + if (col.gameObject.tag == "Player" || col.gameObject.tag == "Bullet") + { + Destroy(this.gameObject); + } + } +} diff --git a/RWM-P2-TEAM-C/Assets/Scripts/Shrapnel.cs.meta b/RWM-P2-TEAM-C/Assets/Scripts/Shrapnel.cs.meta new file mode 100644 index 0000000..72772db --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Scripts/Shrapnel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 160db39886ea9a847894af84986b1059 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Sprites/Batton.png b/RWM-P2-TEAM-C/Assets/Sprites/Batton.png new file mode 100644 index 0000000..1f91813 Binary files /dev/null and b/RWM-P2-TEAM-C/Assets/Sprites/Batton.png differ diff --git a/RWM-P2-TEAM-C/Assets/Sprites/Batton.png.meta b/RWM-P2-TEAM-C/Assets/Sprites/Batton.png.meta new file mode 100644 index 0000000..a28de16 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Sprites/Batton.png.meta @@ -0,0 +1,332 @@ +fileFormatVersion: 2 +guid: e3f4f20cb93d3f24ea0b363feff84dd7 +TextureImporter: + internalIDToNameTable: + - first: + 213: 4445250453518211759 + second: Batton_0 + - first: + 213: -6786234795808346097 + second: Batton_1 + - first: + 213: 3525683147706804216 + second: Batton_2 + - first: + 213: 7951964856068429064 + second: Batton_3 + - first: + 213: 319393445605257926 + second: Batton_4 + - first: + 213: -658488818849062040 + second: Batton_5 + - first: + 213: 5257445025754109575 + second: Batton_6 + - first: + 213: -3489701935167146205 + second: Batton_7 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Batton_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 24 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: faad89b4cb3b0bd30800000000000000 + internalID: 4445250453518211759 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_1 + rect: + serializedVersion: 2 + x: 25 + y: 0 + width: 18 + height: 24 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f00b271886372d1a0800000000000000 + internalID: -6786234795808346097 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_2 + rect: + serializedVersion: 2 + x: 58 + y: 0 + width: 18 + height: 24 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8f725a9942ebde030800000000000000 + internalID: 3525683147706804216 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_3 + rect: + serializedVersion: 2 + x: 88 + y: 0 + width: 24 + height: 18 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8055950c7ed0b5e60800000000000000 + internalID: 7951964856068429064 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_4 + rect: + serializedVersion: 2 + x: 118 + y: 0 + width: 30 + height: 20 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6c2b3e485a6be6400800000000000000 + internalID: 319393445605257926 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_5 + rect: + serializedVersion: 2 + x: 151 + y: 4 + width: 30 + height: 20 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8636fe778e39cd6f0800000000000000 + internalID: -658488818849062040 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_6 + rect: + serializedVersion: 2 + x: 187 + y: 6 + width: 24 + height: 18 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 786d732556236f840800000000000000 + internalID: 5257445025754109575 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Batton_7 + rect: + serializedVersion: 2 + x: 223 + y: 5 + width: 18 + height: 19 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3277e564496129fc0800000000000000 + internalID: -3489701935167146205 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Sprites/pipi copipi spritesheet.png b/RWM-P2-TEAM-C/Assets/Sprites/pipi copipi spritesheet.png new file mode 100644 index 0000000..8520282 Binary files /dev/null and b/RWM-P2-TEAM-C/Assets/Sprites/pipi copipi spritesheet.png differ diff --git a/RWM-P2-TEAM-C/Assets/Sprites/pipi copipi spritesheet.png.meta b/RWM-P2-TEAM-C/Assets/Sprites/pipi copipi spritesheet.png.meta new file mode 100644 index 0000000..97b24cb --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Sprites/pipi copipi spritesheet.png.meta @@ -0,0 +1,260 @@ +fileFormatVersion: 2 +guid: 9ec9039fbb64f574b82c4c585d966b38 +TextureImporter: + internalIDToNameTable: + - first: + 213: 1899764433161736106 + second: pipi copipi spritesheet_0 + - first: + 213: 4377828469143043286 + second: pipi copipi spritesheet_1 + - first: + 213: -4641593119166046098 + second: pipi copipi spritesheet_2 + - first: + 213: 8465016602186098253 + second: pipi copipi spritesheet_3 + - first: + 213: -156469589758702178 + second: pipi copipi spritesheet_4 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + 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: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: pipi copipi spritesheet_0 + rect: + serializedVersion: 2 + x: 1 + y: 1 + width: 18 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: aafc683cfa15d5a10800000000000000 + internalID: 1899764433161736106 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pipi copipi spritesheet_1 + rect: + serializedVersion: 2 + x: 20 + y: 4 + width: 13 + height: 10 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6dcfcd64ccb21cc30800000000000000 + internalID: 4377828469143043286 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pipi copipi spritesheet_2 + rect: + serializedVersion: 2 + x: 34 + y: 4 + width: 15 + height: 10 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e60e53c76afb59fb0800000000000000 + internalID: -4641593119166046098 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pipi copipi spritesheet_3 + rect: + serializedVersion: 2 + x: 50 + y: 4 + width: 8 + height: 8 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d46261700c7c97570800000000000000 + internalID: 8465016602186098253 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: pipi copipi spritesheet_4 + rect: + serializedVersion: 2 + x: 59 + y: 4 + width: 8 + height: 8 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e9d0844bcbb14ddf0800000000000000 + internalID: -156469589758702178 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Tests/BomberTests.cs b/RWM-P2-TEAM-C/Assets/Tests/BomberTests.cs index ec0a015..89418d1 100644 --- a/RWM-P2-TEAM-C/Assets/Tests/BomberTests.cs +++ b/RWM-P2-TEAM-C/Assets/Tests/BomberTests.cs @@ -33,7 +33,7 @@ public void TearDown() [UnityTest] public IEnumerator MovementTest() { - Enemy = GameObject.Find("Bomber"); + Enemy = GameObject.FindGameObjectWithTag("Bomber"); float initialPos = Enemy.GetComponent().position.x; yield return new WaitForSeconds(0.5f); Assert.Less(Enemy.GetComponent().position.x, initialPos); @@ -42,7 +42,7 @@ public IEnumerator MovementTest() [UnityTest] public IEnumerator BombSpawnTest() { - bomb = GameObject.Find("Bomb"); + bomb = GameObject.FindGameObjectWithTag("Bomb"); yield return new WaitForSeconds(0.5f); Assert.IsNotNull(bomb); } @@ -50,7 +50,7 @@ public IEnumerator BombSpawnTest() [UnityTest] public IEnumerator BombCarryingTest() { - bomb = GameObject.Find("Bomb"); + bomb = GameObject.FindGameObjectWithTag("Bomb"); float initialPos = bomb.GetComponent().position.x; yield return new WaitForSeconds(0.5f); Assert.Less(bomb.GetComponent().position.x, initialPos); @@ -59,28 +59,28 @@ public IEnumerator BombCarryingTest() [UnityTest] public IEnumerator BombDropTest() { - bomb = GameObject.Find("Bomb"); - Player = GameObject.Find("Player"); + bomb = GameObject.FindGameObjectWithTag("Bomb"); + Player = GameObject.FindGameObjectWithTag("Player"); Player.transform.position = new Vector3(bomb.transform.position.x - 3, bomb.transform.position.y - 1, Player.transform.position.z); float initialPos = bomb.GetComponent().position.x; - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(0.1f); Assert.Less(bomb.GetComponent().position.y, initialPos); } [UnityTest] public IEnumerator BombExplosionTest() { - bomb = GameObject.Find("Bomb"); + bomb = GameObject.FindGameObjectWithTag("Bomb"); bomb.GetComponent().dropped = true; - shrapnel = GameObject.Find("Shrapnel"); - yield return new WaitForSeconds(2.0f); + yield return new WaitForSeconds(1.0f); + shrapnel = GameObject.FindGameObjectWithTag("Shrapnel"); Assert.IsNotNull(shrapnel); } [UnityTest] public IEnumerator BombDamageTest() { - bomb = GameObject.Find("Bomb"); + bomb = GameObject.FindGameObjectWithTag("Bomb"); float initialHealth = bomb.GetComponent().getHealth(); bomb.GetComponent().Damage(0.5f); yield return new WaitForSeconds(0.1f); @@ -90,11 +90,20 @@ public IEnumerator BombDamageTest() [UnityTest] public IEnumerator BomberDamageTest() { - Enemy = GameObject.Find("Bomber"); + Enemy = GameObject.FindGameObjectWithTag("Bomber"); float initialHealth = Enemy.GetComponent().getHealth(); Enemy.GetComponent().Damage(0.5f); yield return new WaitForSeconds(0.1f); Assert.Less(Enemy.GetComponent().getHealth(), initialHealth); } + + [UnityTest] + public IEnumerator EggCrackTest() + { + bomb = GameObject.FindGameObjectWithTag("Bomb"); + bomb.GetComponent().dropped = true; + yield return new WaitForSeconds(0.94f); + Assert.AreEqual("pipi copipi spritesheet_2", bomb.GetComponent().sprite.name); + } } } diff --git a/RWM-P2-TEAM-C/Assets/Tests/FollowerAnimationTests.cs b/RWM-P2-TEAM-C/Assets/Tests/FollowerAnimationTests.cs new file mode 100644 index 0000000..39138b8 --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Tests/FollowerAnimationTests.cs @@ -0,0 +1,66 @@ +using System.Collections; +using System.Collections.Generic; +using NUnit.Framework; +using UnityEngine; +using UnityEngine.TestTools; +using UnityEngine.SceneManagement; + +namespace Tests +{ + public class FollowerAnimationTests + { + private GameObject Player; + private GameObject Enemy; + private Animator EnemyAnimator; + private FlyingFollower Follower; + private FollowerAnimationController FollowerController; + + [SetUp] + public void SetUp() + { + SceneManager.LoadScene("AITestScene", LoadSceneMode.Single); + } + + [TearDown] + public void Teardown() + { + SceneManager.UnloadSceneAsync("AITestScene"); + } + + private void setUpEnemy() + { + Enemy = GameObject.FindGameObjectWithTag("Follower"); + EnemyAnimator = Enemy.GetComponent(); + Follower = Enemy.GetComponent(); + FollowerController = Enemy.GetComponent(); + } + + [UnityTest] + public IEnumerator FurledTest() + { + setUpEnemy(); + yield return new WaitForSeconds(0.5f); + Assert.AreEqual(false, EnemyAnimator.GetBool("Unfurl")); + } + + [UnityTest] + public IEnumerator UnfurledTest() + { + setUpEnemy(); + Player = GameObject.FindGameObjectWithTag("Player"); + Player.GetComponent().position = new Vector2(Enemy.GetComponent().position.x - 2, Enemy.GetComponent().position.y - 2); + yield return new WaitForSeconds(1.0f); + Assert.AreEqual("Unfurl", EnemyAnimator.GetCurrentAnimatorClipInfo(0)[0].clip.name); + } + + [UnityTest] + public IEnumerator FlyingTest() + { + setUpEnemy(); + Player = GameObject.FindGameObjectWithTag("Player"); + Player.GetComponent().position = new Vector2(Enemy.GetComponent().position.x - 2, Enemy.GetComponent().position.y - 2); + yield return new WaitForSeconds(1.5f); + Assert.AreEqual("Flying", EnemyAnimator.GetCurrentAnimatorClipInfo(0)[0].clip.name); + } + } +} diff --git a/RWM-P2-TEAM-C/Assets/Tests/FollowerAnimationTests.cs.meta b/RWM-P2-TEAM-C/Assets/Tests/FollowerAnimationTests.cs.meta new file mode 100644 index 0000000..afba91b --- /dev/null +++ b/RWM-P2-TEAM-C/Assets/Tests/FollowerAnimationTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c87ed3ef996debe429fbf918fba227f3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RWM-P2-TEAM-C/Assets/Tests/Tests.asmdef b/RWM-P2-TEAM-C/Assets/Tests/Tests.asmdef index fab0b18..4068f03 100644 --- a/RWM-P2-TEAM-C/Assets/Tests/Tests.asmdef +++ b/RWM-P2-TEAM-C/Assets/Tests/Tests.asmdef @@ -5,7 +5,8 @@ "UnityEditor.TestRunner", "Scripts", "2DM", - "ScreenTransition" + "ScreenTransition", + "PlatformerEnemyBehaviour" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset b/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset index dba0405..cab493c 100644 --- a/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset +++ b/RWM-P2-TEAM-C/ProjectSettings/TagManager.asset @@ -9,6 +9,9 @@ TagManager: - Bullet - Ledge - Boundary + - Bomb + - Bomber + - Shrapnel layers: - Default - TransparentFX