From 6152a68a3d1bd00517f5c7c44a105750d0b4992f Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 13 Aug 2015 13:12:57 -0400 Subject: [PATCH] - Updated Zombie and vampire prefabs. - Added Squad scene (not complete) --- Assets/Prefabs/Vampire.prefab | 52 ++-- Assets/Prefabs/Vampire.prefab.meta | 2 +- Assets/Prefabs/Zombie.prefab | 63 ++-- Assets/Prefabs/Zombie.prefab.meta | 2 +- Assets/Scenes/sam_squad.unity | 475 +++++++++++++++++++++++++++++ Assets/Scenes/sam_squad.unity.meta | 8 + ProjectSettings/ProjectVersion.txt | 2 +- 7 files changed, 550 insertions(+), 54 deletions(-) create mode 100644 Assets/Scenes/sam_squad.unity create mode 100644 Assets/Scenes/sam_squad.unity.meta diff --git a/Assets/Prefabs/Vampire.prefab b/Assets/Prefabs/Vampire.prefab index ea32cd8..f556d73 100644 --- a/Assets/Prefabs/Vampire.prefab +++ b/Assets/Prefabs/Vampire.prefab @@ -1,20 +1,20 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &187446 +--- !u!1 &159974 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 468564} - - 33: {fileID: 3301454} - - 65: {fileID: 6509530} - - 23: {fileID: 2318356} - - 143: {fileID: 14379242} - - 54: {fileID: 5406164} - - 135: {fileID: 13556996} - - 114: {fileID: 11499964} + - 4: {fileID: 421072} + - 33: {fileID: 3345050} + - 65: {fileID: 6571312} + - 23: {fileID: 2386094} + - 143: {fileID: 14373948} + - 54: {fileID: 5460952} + - 135: {fileID: 13577474} + - 114: {fileID: 11449880} m_Layer: 0 m_Name: Vampire m_TagString: VampirePlayer @@ -22,24 +22,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &468564 +--- !u!4 &421072 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!23 &2318356 +--- !u!23 &2386094 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -58,19 +58,19 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!33 &3301454 +--- !u!33 &3345050 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!54 &5406164 +--- !u!54 &5460952 Rigidbody: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} serializedVersion: 2 m_Mass: 1 m_Drag: 0 @@ -80,24 +80,24 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 112 m_CollisionDetection: 0 ---- !u!65 &6509530 +--- !u!65 &6571312 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &11499964 +--- !u!114 &11449880 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c1cd93867b8a1d7459a4fb92cac63854, type: 3} @@ -105,24 +105,24 @@ MonoBehaviour: m_EditorClassIdentifier: defaultHp: 250 defaultAttack: 100 ---- !u!135 &13556996 +--- !u!135 &13577474 SphereCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 3 m_Center: {x: 0, y: 0, z: 0} ---- !u!143 &14379242 +--- !u!143 &14373948 CharacterController: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187446} + m_GameObject: {fileID: 159974} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -143,5 +143,5 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 187446} + m_RootGameObject: {fileID: 159974} m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Vampire.prefab.meta b/Assets/Prefabs/Vampire.prefab.meta index 70589c4..33d5a42 100644 --- a/Assets/Prefabs/Vampire.prefab.meta +++ b/Assets/Prefabs/Vampire.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 55aad163f90cc4e40b686a69ba29569d -timeCreated: 1439399579 +timeCreated: 1439485958 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Prefabs/Zombie.prefab b/Assets/Prefabs/Zombie.prefab index 2ce29d0..3ec996d 100644 --- a/Assets/Prefabs/Zombie.prefab +++ b/Assets/Prefabs/Zombie.prefab @@ -1,19 +1,20 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &143762 +--- !u!1 &196328 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 430604} - - 33: {fileID: 3313646} - - 65: {fileID: 6512362} - - 23: {fileID: 2355530} - - 143: {fileID: 14379552} - - 54: {fileID: 5491960} - - 114: {fileID: 11446458} + - 4: {fileID: 417792} + - 33: {fileID: 3364134} + - 65: {fileID: 6599406} + - 23: {fileID: 2356068} + - 143: {fileID: 14336446} + - 54: {fileID: 5469938} + - 135: {fileID: 13574734} + - 114: {fileID: 11458372} m_Layer: 0 m_Name: Zombie m_TagString: ZombiePlayer @@ -21,24 +22,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &430604 +--- !u!4 &417792 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 5, z: 15} + m_LocalPosition: {x: 0, y: 5, z: 41.8800011} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!23 &2355530 +--- !u!23 &2356068 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -57,19 +58,19 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!33 &3313646 +--- !u!33 &3364134 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!54 &5491960 +--- !u!54 &5469938 Rigidbody: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} serializedVersion: 2 m_Mass: 1 m_Drag: 0 @@ -77,26 +78,26 @@ Rigidbody: m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 0 + m_Constraints: 112 m_CollisionDetection: 0 ---- !u!65 &6512362 +--- !u!65 &6599406 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &11446458 +--- !u!114 &11458372 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9346fd84c59bd7d42a27381aeed17dbf, type: 3} @@ -104,12 +105,24 @@ MonoBehaviour: m_EditorClassIdentifier: defaultHp: 250 defaultAttack: 100 ---- !u!143 &14379552 +--- !u!135 &13574734 +SphereCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 196328} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 3 + m_Center: {x: 0, y: 0, z: 0} +--- !u!143 &14336446 CharacterController: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 143762} + m_GameObject: {fileID: 196328} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -130,5 +143,5 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 143762} + m_RootGameObject: {fileID: 196328} m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Zombie.prefab.meta b/Assets/Prefabs/Zombie.prefab.meta index d854283..7a95113 100644 --- a/Assets/Prefabs/Zombie.prefab.meta +++ b/Assets/Prefabs/Zombie.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8d6d640df84c10549b99d9ccf6b349d9 -timeCreated: 1439399581 +timeCreated: 1439485960 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Scenes/sam_squad.unity b/Assets/Scenes/sam_squad.unity new file mode 100644 index 0000000..a5f8a9b --- /dev/null +++ b/Assets/Scenes/sam_squad.unity @@ -0,0 +1,475 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: .25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogMode: 3 + m_FogDensity: .00999999978 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} + m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} + m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: .5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!127 &3 +LevelGameManager: + m_ObjectHideFlags: 0 +--- !u!157 &4 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_LightmapSnapshot: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &5 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: .5 + agentHeight: 2 + agentSlope: 45 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: .166666672 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &272569008 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 272569013} + - 20: {fileID: 272569012} + - 92: {fileID: 272569011} + - 124: {fileID: 272569010} + - 81: {fileID: 272569009} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &272569009 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 272569008} + m_Enabled: 1 +--- !u!124 &272569010 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 272569008} + m_Enabled: 1 +--- !u!92 &272569011 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 272569008} + m_Enabled: 1 +--- !u!20 &272569012 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 272569008} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: .300000012 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: .0219999999 + m_StereoMirrorMode: 0 +--- !u!4 &272569013 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 272569008} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &550371263 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 550371265} + - 108: {fileID: 550371264} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &550371264 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550371263} + m_Enabled: 1 + serializedVersion: 6 + m_Type: 1 + m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_Strength: 1 + m_Bias: .0500000007 + m_NormalBias: .400000006 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_BounceIntensity: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_AreaSize: {x: 1, y: 1} +--- !u!4 &550371265 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 550371263} + m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1001 &1196959011 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalPosition.z + value: 41.8800011 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417792, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 8d6d640df84c10549b99d9ccf6b349d9, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1292635515 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalPosition.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 421072, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 55aad163f90cc4e40b686a69ba29569d, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1679803543 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1679803546} + - 218: {fileID: 1679803545} + - 154: {fileID: 1679803544} + m_Layer: 0 + m_Name: Terrain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!154 &1679803544 +TerrainCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1679803543} + m_Material: {fileID: 0} + m_Enabled: 1 + m_TerrainData: {fileID: 15600000, guid: cc285f3696aa7d5449dcd631a7166155, type: 2} + m_EnableTreeColliders: 1 +--- !u!218 &1679803545 +Terrain: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1679803543} + m_Enabled: 1 + serializedVersion: 3 + m_TerrainData: {fileID: 15600000, guid: cc285f3696aa7d5449dcd631a7166155, type: 2} + m_TreeDistance: 5000 + m_TreeBillboardDistance: 50 + m_TreeCrossFadeLength: 5 + m_TreeMaximumFullLODCount: 50 + m_DetailObjectDistance: 80 + m_DetailObjectDensity: 1 + m_HeightmapPixelError: 5 + m_SplatMapDistance: 1000 + m_HeightmapMaximumLOD: 0 + m_CastShadows: 1 + m_DrawHeightmap: 1 + m_DrawTreesAndFoliage: 1 + m_ReflectionProbeUsage: 1 + m_MaterialType: 0 + m_LegacySpecular: + serializedVersion: 2 + rgba: 4286545791 + m_LegacyShininess: .078125 + m_MaterialTemplate: {fileID: 0} + m_BakeLightProbesForTrees: 1 + m_ScaleInLightmap: .0511999987 + m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} +--- !u!4 &1679803546 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1679803543} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.63000011, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 +--- !u!1 &1740025638 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1740025643} + - 33: {fileID: 1740025642} + - 65: {fileID: 1740025641} + - 23: {fileID: 1740025640} + - 114: {fileID: 1740025639} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1740025639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1740025638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03db9d7aaef4ee545971f18bb90ceadb, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultHp: 250 + defaultAttack: 100 +--- !u!23 &1740025640 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1740025638} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!65 &1740025641 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1740025638} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1740025642 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1740025638} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1740025643 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1740025638} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 diff --git a/Assets/Scenes/sam_squad.unity.meta b/Assets/Scenes/sam_squad.unity.meta new file mode 100644 index 0000000..82cc5ae --- /dev/null +++ b/Assets/Scenes/sam_squad.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 398b09915292f6a4dbcc525a2c02bd51 +timeCreated: 1439485922 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8c353d8..2a285eb 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.1.0f3 m_StandardAssetsVersion: 0