diff --git a/Assets/Blender/animal.blend b/Assets/Blender/animal.blend new file mode 100644 index 0000000000000000000000000000000000000000..0986d11c1b21301da1f93927631d5e4a1d8b809a Binary files /dev/null and b/Assets/Blender/animal.blend differ diff --git a/Assets/Blender/animal.blend.meta b/Assets/Blender/animal.blend.meta new file mode 100644 index 0000000000000000000000000000000000000000..d2b307db2036eb711a94d59c6ee25fef3070131a --- /dev/null +++ b/Assets/Blender/animal.blend.meta @@ -0,0 +1,95 @@ +fileFormatVersion: 2 +guid: 2dad08ec3f509bc4294a2abf5817728a +ModelImporter: + serializedVersion: 26 + internalIDToNameTable: [] + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Blender/animal.blend1 b/Assets/Blender/animal.blend1 new file mode 100644 index 0000000000000000000000000000000000000000..f70a80834529943bd446166f172af90e5e5d67a2 Binary files /dev/null and b/Assets/Blender/animal.blend1 differ diff --git a/Assets/Blender/animal.blend1.meta b/Assets/Blender/animal.blend1.meta new file mode 100644 index 0000000000000000000000000000000000000000..62a93937073f72f3fb2a85bb48a3bddfd319a081 --- /dev/null +++ b/Assets/Blender/animal.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea19c0851f7f37b408b2ec798a9cd616 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Blender/animal.fbx b/Assets/Blender/animal.fbx new file mode 100644 index 0000000000000000000000000000000000000000..d1f824ef2087a3c010f4b97775a17b5204914011 Binary files /dev/null and b/Assets/Blender/animal.fbx differ diff --git a/Assets/Blender/animal.fbx.meta b/Assets/Blender/animal.fbx.meta new file mode 100644 index 0000000000000000000000000000000000000000..1763f0f7785a66a4a13d88e791aa9d3066958ffa --- /dev/null +++ b/Assets/Blender/animal.fbx.meta @@ -0,0 +1,223 @@ +fileFormatVersion: 2 +guid: 65bffeca4df9ec1479d5f6f7675e049d +ModelImporter: + serializedVersion: 26 + internalIDToNameTable: + - first: + 74: 4723146814002874508 + second: Armature|Attack + - first: + 74: 6059336001588132254 + second: Armature|Die + - first: + 74: -8945691123924629249 + second: Armature|Idle + - first: + 74: 8349542763059015795 + second: Armature|Walk + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Armature|Attack + takeName: Armature|Attack + internalID: 4723146814002874508 + firstFrame: 0 + lastFrame: 31 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|Die + takeName: Armature|Die + internalID: 6059336001588132254 + firstFrame: 0 + lastFrame: 30 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|Idle + takeName: Armature|Idle + internalID: -8945691123924629249 + firstFrame: 0 + lastFrame: 86 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|Walk + takeName: Armature|Walk + internalID: 8349542763059015795 + firstFrame: 0 + lastFrame: 20 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Blender/animalAnimatorControler.controller b/Assets/Blender/animalAnimatorControler.controller new file mode 100644 index 0000000000000000000000000000000000000000..96964e01544649af87a52f8c9d2ad64afcd09db8 --- /dev/null +++ b/Assets/Blender/animalAnimatorControler.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: animalAnimatorControler + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Blender/animalAnimatorControler.controller.meta b/Assets/Blender/animalAnimatorControler.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..c88a3db7cb9550170f16612c3a2fe109c4c9523b --- /dev/null +++ b/Assets/Blender/animalAnimatorControler.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 922b5c0531a0acc479e9a28002696ff6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Blender/rock1.fbx b/Assets/Blender/rock1.fbx index cbf214d1f76499a8dbda8b52316da07c52850a80..8e012afa6c37ee61ad48493c386ed8f83f266fcc 100644 Binary files a/Assets/Blender/rock1.fbx and b/Assets/Blender/rock1.fbx differ diff --git a/Assets/Blender/rock2.fbx b/Assets/Blender/rock2.fbx index ef35adcbb0fd09768fa7212c0b5d608b8debdea6..61af21b4bd93dcc7018dacdad15531d204917935 100644 Binary files a/Assets/Blender/rock2.fbx and b/Assets/Blender/rock2.fbx differ diff --git a/Assets/Blender/rock3.fbx b/Assets/Blender/rock3.fbx index db90afc00809762141aace84a06fcd4eedb1acd0..fd67447cd1e4cacbbab0592be3fca55e546071e8 100644 Binary files a/Assets/Blender/rock3.fbx and b/Assets/Blender/rock3.fbx differ diff --git a/Assets/Blender/rocks.blend b/Assets/Blender/rocks.blend index ce9e8be57fd43b1cec64ba06adb7631f0264a2cc..9cc2d411b6b19ed08fe60e894ae7db7de8f8dfc1 100644 Binary files a/Assets/Blender/rocks.blend and b/Assets/Blender/rocks.blend differ diff --git a/Assets/Blender/rocks.blend1 b/Assets/Blender/rocks.blend1 new file mode 100644 index 0000000000000000000000000000000000000000..f5c4bee3f617840f01ab4b052275f56696270789 Binary files /dev/null and b/Assets/Blender/rocks.blend1 differ diff --git a/Assets/Blender/rocks.blend1.meta b/Assets/Blender/rocks.blend1.meta new file mode 100644 index 0000000000000000000000000000000000000000..6a78db39287f48c15ba89e875a860e7d7b8e667f --- /dev/null +++ b/Assets/Blender/rocks.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 410edc20ecb4580429712e67696f6132 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/animalSpawner Variant.prefab b/Assets/Prefabs/animalSpawner Variant.prefab new file mode 100644 index 0000000000000000000000000000000000000000..2af94c88de7a2fb9ed7e639c793b6cc39fa2726d --- /dev/null +++ b/Assets/Prefabs/animalSpawner Variant.prefab @@ -0,0 +1,275 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1795219250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795219251} + m_Layer: 0 + m_Name: Spawnpoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1795219251 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795219250} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.006, y: -0.0077, z: -0.001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 433492765613927625} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1438761813 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485586580736821615} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.024635516, y: 0.03370318, z: 0.033169694} + m_Center: {x: -0.000000006519258, y: 0.016069984, z: -0.0036805188} +--- !u!195 &1438761811 +NavMeshAgent: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485586580736821615} + m_Enabled: 1 + m_AgentTypeID: 0 + m_Radius: 0.02 + m_Speed: 0.7 + m_Acceleration: 8 + avoidancePriority: 50 + m_AngularSpeed: 500 + m_StoppingDistance: 0 + m_AutoTraverseOffMeshLink: 1 + m_AutoBraking: 1 + m_AutoRepath: 1 + m_Height: 0.03 + m_BaseOffset: 0 + m_WalkableMask: 4294967295 + m_ObstacleAvoidanceType: 4 +--- !u!114 &1438761812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3485586580736821615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81148b8144718ee4899ecbbce4f98d9f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_spawnPoint: {fileID: 1795219250} + m_squareRadius: 1.5 + m_sqrAttackDistance: 2 + m_attackDamage: 10 + m_attackWaitTime: 1.5 + m_fullnessTime: 8 +--- !u!1001 &4863508889398085587 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_Name + value: animalSpawner + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.44294876 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.286 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.66570073 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalScale.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + propertyPath: m_LocalScale.z + value: 15 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 985ea245f3670f64c9dc3d0ca6215866, type: 3} +--- !u!4 &433492765613927625 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 985ea245f3670f64c9dc3d0ca6215866, + type: 3} + m_PrefabInstance: {fileID: 4863508889398085587} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4863508890775490662 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 433492765613927625} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_Name + value: animal + objectReference: {fileID: 0} + - target: {fileID: -6057140222963153312, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 922b5c0531a0acc479e9a28002696ff6, type: 2} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.0034 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.010400002 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.0171 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalScale.x + value: 0.26666668 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalScale.y + value: 0.26666668 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + propertyPath: m_LocalScale.z + value: -0.2666667 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 65bffeca4df9ec1479d5f6f7675e049d, type: 3} +--- !u!1 &3485586580736821615 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 65bffeca4df9ec1479d5f6f7675e049d, + type: 3} + m_PrefabInstance: {fileID: 4863508890775490662} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/animalSpawner Variant.prefab.meta b/Assets/Prefabs/animalSpawner Variant.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..a544180936f203417c25c6725dd637407cf9306b --- /dev/null +++ b/Assets/Prefabs/animalSpawner Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dbb0d66fa2082ff4699575e166a3018a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/rock1 Variant.prefab b/Assets/Prefabs/rock1 Variant.prefab new file mode 100644 index 0000000000000000000000000000000000000000..cedb1d950db23755b8ef0b84da7c22a62405decc --- /dev/null +++ b/Assets/Prefabs/rock1 Variant.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &893203079023456205 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_Name + value: rock1 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.631 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.366 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.2277355 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 467583d4ee8d9564bacf5bde7844a76d, + type: 3} + propertyPath: m_LocalScale.z + value: 25 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 467583d4ee8d9564bacf5bde7844a76d, type: 3} diff --git a/Assets/Prefabs/rock1 Variant.prefab.meta b/Assets/Prefabs/rock1 Variant.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..37cc75dc23acea5e33ae5ba5de20c2e9edaf715f --- /dev/null +++ b/Assets/Prefabs/rock1 Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe0832bfda4f00843b1a285da1594f4f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/rock2 Variant.prefab b/Assets/Prefabs/rock2 Variant.prefab new file mode 100644 index 0000000000000000000000000000000000000000..aaa430e1d644815666205faeab25facb9cb00327 --- /dev/null +++ b/Assets/Prefabs/rock2 Variant.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3794118443023541155 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_Name + value: rock2 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.29 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.46 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.2215939 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalScale.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalScale.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: bb2f2814cef1cbb48838b5133254dcda, + type: 3} + propertyPath: m_LocalScale.z + value: 40 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb2f2814cef1cbb48838b5133254dcda, type: 3} diff --git a/Assets/Prefabs/rock2 Variant.prefab.meta b/Assets/Prefabs/rock2 Variant.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..628ab32fb9be56f70f2e5e5455d6c58ea3952900 --- /dev/null +++ b/Assets/Prefabs/rock2 Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e31f2b77102dafc40946b72fe7410a0e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/rock3 Variant.prefab b/Assets/Prefabs/rock3 Variant.prefab new file mode 100644 index 0000000000000000000000000000000000000000..b40afae8842df53cf970ed2566867feede2df01f --- /dev/null +++ b/Assets/Prefabs/rock3 Variant.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1939015279618006724 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -927199367670048503, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_Name + value: rock3 + objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.546661 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.5020213 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalScale.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalScale.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: -4216859302048453862, guid: 4e407914474352f4891daebe8ee14418, + type: 3} + propertyPath: m_LocalScale.z + value: 20 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e407914474352f4891daebe8ee14418, type: 3} diff --git a/Assets/Prefabs/rock3 Variant.prefab.meta b/Assets/Prefabs/rock3 Variant.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..e0e63e617262617bfe2cd06719c479e4c5c283f7 --- /dev/null +++ b/Assets/Prefabs/rock3 Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a7ce680883bc3743be2a8a793333673 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Altarick/test2/NavMesh.asset b/Assets/Scenes/Altarick/test2/NavMesh.asset index b1b9b0339e1c03364594aee4624bb3a78db525be..0ebabb34a872b7f7419af65bdb482f84e6a76a6e 100644 Binary files a/Assets/Scenes/Altarick/test2/NavMesh.asset and b/Assets/Scenes/Altarick/test2/NavMesh.asset differ diff --git a/Assets/Scripts/Animal.cs b/Assets/Scripts/Animal.cs index 98f209f928b1b43a8426fe00268a4aa51745e6f1..ae90bafe8d38bfe2216223aa816fa6f105fb99f6 100644 --- a/Assets/Scripts/Animal.cs +++ b/Assets/Scripts/Animal.cs @@ -23,6 +23,10 @@ public class Animal : MonoBehaviour protected bool m_modeFull = false; protected int m_frameCounter = 0; protected GameObject target = null; + NavMeshAgent agent ; + private Animator anim; + + private LifeScript m_life; public GameObject FindClosestHuman() { @@ -46,14 +50,15 @@ public class Animal : MonoBehaviour void Start() { - NavMeshAgent agent = GetComponent<NavMeshAgent>(); + anim = GetComponent<Animator>(); + m_life = GetComponent<LifeScript>(); + agent = GetComponent<NavMeshAgent>(); agent.destination = new Vector3(Random.Range(m_spawnPoint.transform.position.x-m_squareRadius,m_spawnPoint.transform.position.x+m_squareRadius),m_spawnPoint.transform.position.y,Random.Range(m_spawnPoint.transform.position.z-m_squareRadius,m_spawnPoint.transform.position.z+m_squareRadius)); } // Update is called once per frame void FixedUpdate() { - NavMeshAgent agent = GetComponent<NavMeshAgent>(); if(m_modeWander && (transform.position-agent.destination).sqrMagnitude<0.3f) { agent.destination = new Vector3(Random.Range(m_spawnPoint.transform.position.x-m_squareRadius,m_spawnPoint.transform.position.x+m_squareRadius),m_spawnPoint.transform.position.y,Random.Range(m_spawnPoint.transform.position.z-m_squareRadius,m_spawnPoint.transform.position.z+m_squareRadius)); @@ -64,6 +69,11 @@ public class Animal : MonoBehaviour m_modeWander = true; m_modeIdle = false; agent.speed = 0.7f; + anim.SetBool("Walk",true); + anim.CrossFade("Walk",0.1f); + anim.SetBool("Idle",false); + anim.SetBool("Die",false); + anim.SetBool("Attack",false); } if(m_modeFight) { @@ -74,12 +84,18 @@ public class Animal : MonoBehaviour agent.destination = new Vector3(Random.Range(m_spawnPoint.transform.position.x-m_squareRadius,m_spawnPoint.transform.position.x+m_squareRadius),m_spawnPoint.transform.position.y,Random.Range(m_spawnPoint.transform.position.z-m_squareRadius,m_spawnPoint.transform.position.z+m_squareRadius)); m_modeWander = true; m_modeFight = false; + agent.speed = 0.7f; } if((transform.position-agent.destination).sqrMagnitude<0.2f) { target.GetComponent<LifeScript>().TakeDamage(m_attackDamage); + anim.SetBool("Attack",true); + anim.CrossFade("Attack",0.1f); + anim.SetBool("Walk",false); + anim.SetBool("Die",false); + anim.SetBool("Idle",true); target = null; m_attackStamp = Time.fixedTime; m_modeIdle = true; @@ -98,7 +114,7 @@ public class Animal : MonoBehaviour { m_modeFull = false; } - else if(!m_modeFull && m_frameCounter == 7) + else if(!m_modeFull && m_frameCounter >= 7) { m_frameCounter = 0; if((transform.position-m_spawnPoint.transform.position).sqrMagnitude < 1.2*m_squareRadius*m_squareRadius)