Commit f6e67f12 authored by LasseKau's avatar LasseKau
Browse files

troll update, gamemap tweaks

-
parent 2cba0cc0
This diff is collapsed.
......@@ -13,8 +13,9 @@ public class EnemyPhysics : MonoBehaviour
[SerializeField]
private NavMeshAgent nav;
//public GameObject stAmmoDrop, rAmmoDrop;
public GameObject stAmmoDrop, rAmmoDrop;
public GameObject[] ammoDrops;
public GameObject[] SugarDrops;
public float health;
private int score, randomInt;
......@@ -77,10 +78,20 @@ public class EnemyPhysics : MonoBehaviour
GameObject ammoBox = Instantiate(ammoDrops[randomInt], transform.position, Quaternion.identity);
Destroy(ammoBox, 30f);
if (gameObject.tag == "Enemy2" && gnomeHolder != null)
{
GameObject sugarBox = Instantiate(SugarDrops[randomInt], transform.position, Quaternion.identity);
Destroy(sugarBox, 30f);
}
if (gnomeHolder != null)
{
Destroy(gnomeHolder, 3f);
}
}
void setRigidbodyState(bool state)
......
......@@ -77,7 +77,12 @@ MonoBehaviour:
gnomeHolder: {fileID: 7465465110250796635}
gnomeModel: {fileID: 1493864532402464917}
nav: {fileID: 7465465110250796626}
health: 0
stAmmoDrop: {fileID: 0}
rAmmoDrop: {fileID: 0}
ammoDrops:
- {fileID: 8256544470251128086, guid: 827707197b22e3248a2efe0a0342e06b, type: 3}
SugarDrops: []
health: 10
--- !u!54 &1039250134
Rigidbody:
m_ObjectHideFlags: 0
......@@ -854,8 +859,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3eefc5faf810b1d499051aa1f92cd149, type: 3}
m_Name:
m_EditorClassIdentifier:
priority: 2
fieldOfView: 110
priority: 1
fieldOfView: 360
targetTag: Player
--- !u!1 &7465465109843609703
GameObject:
......@@ -946,12 +951,12 @@ GameObject:
- component: {fileID: 7465465110250796626}
- component: {fileID: 7465465110250796627}
- component: {fileID: 7465465110250796624}
- component: {fileID: 7465465110250796625}
- component: {fileID: 7465465110250796630}
- component: {fileID: 7465465110250796631}
- component: {fileID: 1650933834}
m_Layer: 0
m_Name: TrollHolder
m_TagString: Untagged
m_TagString: Enemy2
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -1020,30 +1025,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ccb19f2fad6a0a94db0ef6a67e289bc9, type: 3}
m_Name:
m_EditorClassIdentifier:
normalBehavior: {fileID: 7465465110250796625}
normalBehavior: {fileID: 1650933834}
triggeredBehavior: {fileID: 7465465110250796631}
canRevertFromTriggered: 1
minSecondsInNormalState: 3
minSecondsInTriggeredState: 3
checkTriggersActivatedInterval: 0.5
checkTriggersInactiveInterval: 2
--- !u!114 &7465465110250796625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7465465110250796635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6caaeb297942dec4bac2032cc0483362, type: 3}
m_Name:
m_EditorClassIdentifier:
runSpeed: 5
walkSpeed: 3
turningSpeed: 5
transitionBehaviors: []
anim: {fileID: 733128724}
--- !u!114 &7465465110250796630
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1056,12 +1044,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ea0152313c893044b90054831b3b59e7, type: 3}
m_Name:
m_EditorClassIdentifier:
minAttackDistance: 4
minAttackDistance: 1
allowedTargets:
serializedVersion: 2
m_Bits: 4294967295
anim: {fileID: 733128724}
damage: 1
AttackRate: 1
--- !u!114 &7465465110250796631
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1078,7 +1067,33 @@ MonoBehaviour:
walkSpeed: 3
turningSpeed: 5
transitionBehaviors: []
desiredAttackDistance: 4
desiredAttackDistance: 1
--- !u!114 &1650933834
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7465465110250796635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 02039ddb008730640842aafe79261499, type: 3}
m_Name:
m_EditorClassIdentifier:
runSpeed: 15
walkSpeed: 5
turningSpeed: 10
transitionBehaviors: []
timeMoving:
from: 15
to: 60
timeStill:
from: 1
to: 3
lookAround: 1
distancePerMovement:
from: 50
to: 250
--- !u!1 &7465465111083252919
GameObject:
m_ObjectHideFlags: 0
......@@ -1123,7 +1138,7 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 3
m_Radius: 4.33
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &7465465111083252912
Rigidbody:
......@@ -1153,7 +1168,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6441e9a5a33553946b7855cfd5b6d10c, type: 3}
m_Name:
m_EditorClassIdentifier:
priority: 3
priority: 2
targetTag: Player
--- !u!54 &946003777
Rigidbody:
......@@ -1297,6 +1312,11 @@ PrefabInstance:
propertyPath: m_Name
value: Enemy_Troll
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 8a133033e57107b49910ece0f26825da,
type: 3}
propertyPath: m_TagString
value: Enemy2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a133033e57107b49910ece0f26825da, type: 3}
--- !u!1 &4639143554946306016 stripped
......
......@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 8256544470251128086}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 567.578, y: 85.309, z: 681.217}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children:
- {fileID: 6003203840973708485}
m_Father: {fileID: 0}
......
fileFormatVersion: 2
guid: eb7bb38b5a3a3474b82a0ec2144748ca
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment