Repair spikes add health bar and change vizualization of info about amout of wood and ammo

This commit is contained in:
Kotrba Filip
2020-02-02 04:12:43 +01:00
parent ae9a9b51a0
commit 3e48e0aea5
32 changed files with 12086 additions and 5113 deletions

View File

@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 874380372637160946}
- component: {fileID: 1908658187181555171}
- component: {fileID: 1402357855717081948}
- component: {fileID: -852646611413746892}
m_Layer: 0
m_Name: Barricade
m_TagString: Spikes
@@ -48,7 +49,15 @@ MonoBehaviour:
blockType: 1
health: 100
healthRate: 5
amountModels: []
amountModels:
- {fileID: 6266030662392703044}
- {fileID: 3847955541176867416}
- {fileID: 965572206314881976}
- {fileID: 7799514952860760797}
- {fileID: 256051067918925093}
- {fileID: 3952444572634493808}
- {fileID: 4850250424701318178}
- {fileID: 9095210850575404026}
audioSource: {fileID: 0}
doorSound: {fileID: 0}
--- !u!208 &1402357855717081948
@@ -61,12 +70,25 @@ NavMeshObstacle:
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.5, y: 0.75, z: 1}
m_Extents: {x: 0.5, y: 0.75, z: 0.5}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 0
m_Center: {x: -0.05, y: 0.75, z: 1}
m_Center: {x: -0.05, y: 0.75, z: 0.5}
m_TimeToStationary: 0.5
--- !u!65 &-852646611413746892
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1999182813209888360}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1.5, z: 1}
m_Center: {x: -0.05, y: 0.75, z: 0.5}
--- !u!1001 &8380342326956505725
PrefabInstance:
m_ObjectHideFlags: 0
@@ -215,3 +237,51 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6266030662392703044 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2502203975881118265, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3847955541176867416 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4695666576454475813, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &965572206314881976 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -492420421572216379, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7799514952860760797 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -7462036371361415008, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &256051067918925093 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -594094835925579944, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3952444572634493808 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -4425609515867240179, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4850250424701318178 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -5259225927154676129, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9095210850575404026 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -8470045053010906745, guid: 528f4b131abb8f9498400c1cf4283eca,
type: 3}
m_PrefabInstance: {fileID: 8380342326956505725}
m_PrefabAsset: {fileID: 0}

View File

@@ -88,7 +88,7 @@ NavMeshAgent:
m_Acceleration: 8
avoidancePriority: 50
m_AngularSpeed: 120
m_StoppingDistance: 2
m_StoppingDistance: 0
m_AutoTraverseOffMeshLink: 1
m_AutoBraking: 1
m_AutoRepath: 1

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 92320a40631a69845b70cc43c23a3681
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -179,7 +179,7 @@ ParticleSystem:
startLifetime:
serializedVersion: 2
minMaxState: 0
scalar: 0.2
scalar: 0.5
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -724,7 +724,7 @@ ParticleSystem:
serializedVersion: 6
enabled: 1
type: 4
angle: 25
angle: 15
length: 5
boxThickness: {x: 0, y: 0, z: 0}
radiusThickness: 1

View File

@@ -141,7 +141,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
musicSource: {fileID: 5981860502065413816}
Music: {fileID: 8300000, guid: 2842b38130c2ae343b9372edad7281bf, type: 3}
DayMusic: {fileID: 0}
NightMusic: {fileID: 0}
Sun: {fileID: 0}
--- !u!1 &7985979212931499537
GameObject:
m_ObjectHideFlags: 0
@@ -344,6 +346,7 @@ GameObject:
- component: {fileID: 7985979213387740674}
- component: {fileID: 7985979213387740677}
- component: {fileID: 7985979213387740676}
- component: {fileID: 42642414}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -375,7 +378,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_BackGroundColor: {r: 0.21573514, g: 0.30793875, b: 0.4528302, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -416,3 +419,63 @@ AudioListener:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7985979213387740679}
m_Enabled: 1
--- !u!114 &42642414
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7985979213387740679}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 7985979213387740674}
volumeLayer:
serializedVersion: 2
m_Bits: 1048576
stopNaNPropagation: 1
finalBlitToCameraTarget: 0
antialiasingMode: 1
temporalAntialiasing:
jitterSpread: 0.75
sharpness: 0.25
stationaryBlending: 0.95
motionBlending: 0.85
subpixelMorphologicalAntialiasing:
quality: 2
fastApproximateAntialiasing:
fastMode: 0
keepAlpha: 0
fog:
enabled: 1
excludeSkybox: 1
debugLayer:
lightMeter:
width: 512
height: 256
showCurves: 1
histogram:
width: 512
height: 256
channel: 3
waveform:
exposure: 0.12
height: 256
vectorscope:
size: 256
exposure: 0.12
overlaySettings:
linearDepth: 0
motionColorIntensity: 4
motionGridSize: 64
colorBlindnessType: 0
colorBlindnessStrength: 1
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
m_ShowToolkit: 0
m_ShowCustomSorter: 0
breakBeforeColorGrading: 0
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []

View File

@@ -14,6 +14,22 @@ CapsuleCollider:
m_Height: 60
m_Direction: 2
m_Center: {x: 0, y: 0, z: 29}
--- !u!208 &4623503337842674502
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2104789401984237560}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 1.697, y: 1.697, z: 34.888}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 0, z: 36.371002}
m_TimeToStationary: 0.5
--- !u!1 &7706219202001118132
GameObject:
m_ObjectHideFlags: 0
@@ -24,7 +40,6 @@ GameObject:
m_Component:
- component: {fileID: 6132983532685291387}
- component: {fileID: 792143903499247558}
- component: {fileID: 7073027306475143712}
m_Layer: 0
m_Name: Tree_LOD
m_TagString: Untagged
@@ -95,22 +110,6 @@ LODGroup:
- renderer: {fileID: 3790753686469841987}
- renderer: {fileID: 7477384831301876712}
m_Enabled: 1
--- !u!208 &7073027306475143712
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7706219202001118132}
m_Enabled: 1
serializedVersion: 3
m_Shape: 0
m_Extents: {x: 0.28, y: 2.5, z: 0.28}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 1
m_Center: {x: 0, y: 2.29, z: 0}
m_TimeToStationary: 0.5
--- !u!1001 &6890689231084320501
PrefabInstance:
m_ObjectHideFlags: 0

View File

@@ -119,7 +119,7 @@ MonoBehaviour:
weaponRange: 2
spawnShoot: {fileID: 0}
particleShoot: {fileID: 0}
damage: 50
damage: 25
fireRate: 0.1
animator: {fileID: 562605605}
player: {fileID: 0}

5262
Assets/Prefabs/torch.prefab Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f614b02c1b25fce4ba5bee61a982ff4f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: