Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
Sveske Juice
commit
77a3b7f3fc
File diff suppressed because one or more lines are too long
|
|
@ -117,8 +117,8 @@ Material:
|
|||
- _WorkflowMode: 1
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 0.3803922, g: 0.38431376, b: 0.3921569, a: 1}
|
||||
- _Color: {r: 0.38039213, g: 0.38431373, b: 0.39215687, a: 1}
|
||||
- _BaseColor: {r: 0.3485819, g: 0.39803886, b: 0.4716981, a: 1}
|
||||
- _Color: {r: 0.34858188, g: 0.3980388, b: 0.4716981, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -228,6 +228,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: GreenBoy1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: startHealth
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: MoneyDropOnDeath
|
||||
|
|
|
|||
|
|
@ -442,6 +442,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: GreenBoy2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: startHealth
|
||||
value: 40
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: MoneyDropOnDeath
|
||||
|
|
|
|||
|
|
@ -228,6 +228,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: GreenBoyBoss
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: startHealth
|
||||
value: 200
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: MoneyDropOnDeath
|
||||
|
|
|
|||
|
|
@ -334,6 +334,11 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: GreenBoyJetpack
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 369596802107988542, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: startHealth
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8270377878650669399, guid: eff762e00bcd52a438a5abf98a554a0b,
|
||||
type: 3}
|
||||
propertyPath: MoneyDropOnDeath
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3673129860051646063
|
||||
--- !u!1 &795444204857451935
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -8,9 +8,251 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2304425884159104487}
|
||||
- component: {fileID: 2459575551296835979}
|
||||
- component: {fileID: 8197460053328065102}
|
||||
- component: {fileID: 7937577949470585883}
|
||||
- component: {fileID: 4865491888807387626}
|
||||
- component: {fileID: 8653176890901457852}
|
||||
- component: {fileID: 5097934926166400514}
|
||||
- component: {fileID: 6988623207618188655}
|
||||
- component: {fileID: 1522579193373327773}
|
||||
- component: {fileID: 2237686053475134591}
|
||||
- component: {fileID: 4560076235353107633}
|
||||
m_Layer: 6
|
||||
m_Name: Bullet_Green 1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7937577949470585883
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.3489784, y: 0.393, z: 4.0279284}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 1042283134502228518}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &4865491888807387626
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &8653176890901457852
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: d1bc1e083713a6d4aa7a17a8dc465df2, type: 2}
|
||||
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: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!135 &5097934926166400514
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &6988623207618188655
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &1522579193373327773
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a98521a4b559621438fc196adc605f3b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
bounciness: 1
|
||||
damage: -10
|
||||
wallRebounces: 4
|
||||
comingFrom: {fileID: 0}
|
||||
OnReflect:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
splashPS: {fileID: 8649533898526427972}
|
||||
--- !u!108 &2237686053475134591
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 10
|
||||
m_Type: 2
|
||||
m_Shape: 0
|
||||
m_Color: {r: 0.4401018, g: 0.84276724, b: 0.2040662, a: 1}
|
||||
m_Intensity: 0.1
|
||||
m_Range: 0.54
|
||||
m_SpotAngle: 30
|
||||
m_InnerSpotAngle: 21.80208
|
||||
m_CookieSize: 10
|
||||
m_Shadows:
|
||||
m_Type: 0
|
||||
m_Resolution: -1
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 1
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!114 &4560076235353107633
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 795444204857451935}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Version: 3
|
||||
m_UsePipelineSettings: 1
|
||||
m_AdditionalLightsShadowResolutionTier: 2
|
||||
m_LightLayerMask: 1
|
||||
m_RenderingLayers: 1
|
||||
m_CustomShadowLayers: 0
|
||||
m_ShadowLayerMask: 1
|
||||
m_ShadowRenderingLayers: 1
|
||||
m_LightCookieSize: {x: 1, y: 1}
|
||||
m_LightCookieOffset: {x: 0, y: 0}
|
||||
m_SoftShadowQuality: 0
|
||||
--- !u!1 &994408812866524313
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1042283134502228518}
|
||||
- component: {fileID: 8649533898526427972}
|
||||
- component: {fileID: 6874199975296768604}
|
||||
m_Layer: 6
|
||||
m_Name: Particle System
|
||||
m_TagString: Untagged
|
||||
|
|
@ -18,28 +260,28 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2304425884159104487
|
||||
--- !u!4 &1042283134502228518
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3673129860051646063}
|
||||
m_GameObject: {fileID: 994408812866524313}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 585033784688427358}
|
||||
m_Father: {fileID: 7937577949470585883}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||
--- !u!198 &2459575551296835979
|
||||
--- !u!198 &8649533898526427972
|
||||
ParticleSystem:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3673129860051646063}
|
||||
m_GameObject: {fileID: 994408812866524313}
|
||||
serializedVersion: 8
|
||||
lengthInSec: 5
|
||||
simulationSpeed: 1
|
||||
|
|
@ -4814,14 +5056,14 @@ ParticleSystem:
|
|||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
vectorLabel1_3: W
|
||||
--- !u!199 &8197460053328065102
|
||||
--- !u!199 &6874199975296768604
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3673129860051646063}
|
||||
m_GameObject: {fileID: 994408812866524313}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 0
|
||||
|
|
@ -4888,245 +5130,3 @@ ParticleSystemRenderer:
|
|||
m_MeshWeighting2: 1
|
||||
m_MeshWeighting3: 1
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &4420203067853765648
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 585033784688427358}
|
||||
- component: {fileID: 2673351725200157941}
|
||||
- component: {fileID: 2303435248870534838}
|
||||
- component: {fileID: 8377516070011382787}
|
||||
- component: {fileID: 7594645440043410766}
|
||||
- component: {fileID: 4837369662886257095}
|
||||
- component: {fileID: 8572678539923306418}
|
||||
- component: {fileID: 288835086174434469}
|
||||
m_Layer: 6
|
||||
m_Name: Bullet_Green
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &585033784688427358
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.519, y: 0.38, z: 3.6940956}
|
||||
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 2304425884159104487}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &2673351725200157941
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &2303435248870534838
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -8693172909504858975, guid: e60b24c47552f824b837bfe6ab682658, type: 3}
|
||||
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: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!135 &8377516070011382787
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &7594645440043410766
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &4837369662886257095
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a98521a4b559621438fc196adc605f3b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
bounciness: 1
|
||||
damage: -10
|
||||
wallRebounces: 4
|
||||
comingFrom: {fileID: 0}
|
||||
OnReflect:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
splashPS: {fileID: 2459575551296835979}
|
||||
--- !u!108 &8572678539923306418
|
||||
Light:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 10
|
||||
m_Type: 2
|
||||
m_Shape: 0
|
||||
m_Color: {r: 0.2627663, g: 0.2714128, b: 0.91823894, a: 1}
|
||||
m_Intensity: 0.1
|
||||
m_Range: 0.54
|
||||
m_SpotAngle: 30
|
||||
m_InnerSpotAngle: 21.80208
|
||||
m_CookieSize: 10
|
||||
m_Shadows:
|
||||
m_Type: 0
|
||||
m_Resolution: -1
|
||||
m_CustomResolution: -1
|
||||
m_Strength: 1
|
||||
m_Bias: 0.05
|
||||
m_NormalBias: 0.4
|
||||
m_NearPlane: 0.2
|
||||
m_CullingMatrixOverride:
|
||||
e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 0
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 0
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_UseCullingMatrixOverride: 0
|
||||
m_Cookie: {fileID: 0}
|
||||
m_DrawHalo: 0
|
||||
m_Flare: {fileID: 0}
|
||||
m_RenderMode: 0
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_RenderingLayerMask: 1
|
||||
m_Lightmapping: 4
|
||||
m_LightShadowCasterMode: 0
|
||||
m_AreaSize: {x: 1, y: 1}
|
||||
m_BounceIntensity: 1
|
||||
m_ColorTemperature: 6570
|
||||
m_UseColorTemperature: 0
|
||||
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UseBoundingSphereOverride: 0
|
||||
m_UseViewFrustumForShadowCasterCull: 1
|
||||
m_ShadowRadius: 0
|
||||
m_ShadowAngle: 0
|
||||
--- !u!114 &288835086174434469
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4420203067853765648}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Version: 3
|
||||
m_UsePipelineSettings: 1
|
||||
m_AdditionalLightsShadowResolutionTier: 2
|
||||
m_LightLayerMask: 1
|
||||
m_RenderingLayers: 1
|
||||
m_CustomShadowLayers: 0
|
||||
m_ShadowLayerMask: 1
|
||||
m_ShadowRenderingLayers: 1
|
||||
m_LightCookieSize: {x: 1, y: 1}
|
||||
m_LightCookieOffset: {x: 0, y: 0}
|
||||
m_SoftShadowQuality: 0
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3
|
||||
guid: 74513a3fa9ccae747aec3a617620bf02
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
@ -61,7 +61,7 @@ MeshRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -1020301552483200737, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
|
||||
- {fileID: 2100000, guid: 00ebaf6bd8b3d884289d0e3119d2540f, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -145,7 +145,7 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -6629797300637803691, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
|
||||
- {fileID: 6699446615349125189, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
|
||||
- {fileID: 2100000, guid: 00ebaf6bd8b3d884289d0e3119d2540f, type: 2}
|
||||
- {fileID: -6478536213147159724, guid: 81c113ab4fb3e22748b1f98217139f12, type: 3}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -6478536213147159724, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
|
||||
- {fileID: -3522955778539423533, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
|
||||
- {fileID: 2100000, guid: 9cfe68fa84d8a93408b2ce55a6238145, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -535,8 +535,8 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -6629797300637803691, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
|
||||
- {fileID: 4892006958994659731, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
|
||||
- {fileID: -3522955778539423533, guid: b6f90628eed2fe9e1bbb88db64de5c2a, type: 3}
|
||||
- {fileID: 2100000, guid: 9cfe68fa84d8a93408b2ce55a6238145, type: 2}
|
||||
- {fileID: 2100000, guid: 9cfe68fa84d8a93408b2ce55a6238145, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -1489,7 +1489,7 @@ MonoBehaviour:
|
|||
- Arc: 0
|
||||
Amount: 1
|
||||
Speed: 100
|
||||
bulletPrefab: {fileID: 4420203067853765648, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
bulletPrefab: {fileID: 795444204857451935, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
Burst: 0
|
||||
BurstDelay: 0
|
||||
|
|
|
|||
|
|
@ -788,7 +788,7 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -7198559261415225722, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
|
||||
- {fileID: -2813337366143557646, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
|
||||
- {fileID: 2100000, guid: 34f67e704433d2e41ad99e5ea7b15970, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -993,8 +993,8 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -3846018093981099296, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
|
||||
- {fileID: 4874126678125670354, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
|
||||
- {fileID: -239009726367234950, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
|
||||
- {fileID: 2100000, guid: 34f67e704433d2e41ad99e5ea7b15970, type: 2}
|
||||
- {fileID: 2100000, guid: 34f67e704433d2e41ad99e5ea7b15970, type: 2}
|
||||
- {fileID: -2813467912831258332, guid: 48ecac7381f19af3bab6fef54e6dbadc, type: 3}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ MeshRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
|
||||
- {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -332,7 +332,7 @@ MeshRenderer:
|
|||
m_Materials:
|
||||
- {fileID: 880774007180850119, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
|
||||
- {fileID: -6629797300637803691, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
|
||||
- {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
|
||||
- {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -415,7 +415,7 @@ MeshRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
|
||||
- {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -498,7 +498,7 @@ MeshRenderer:
|
|||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 3016479151454471876, guid: 72980d1326f21c0ffa34ea09162d1234, type: 3}
|
||||
- {fileID: 2100000, guid: 4f667b9e151415f4dbd1d75777858335, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ MeshRenderer:
|
|||
m_Materials:
|
||||
- {fileID: -6478536213147159724, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
|
||||
- {fileID: 4892006958994659731, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
|
||||
- {fileID: 3243688835468109435, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
|
||||
- {fileID: 2100000, guid: 453df639b86494041b3526d57bb2968c, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
@ -572,7 +572,7 @@ MeshRenderer:
|
|||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -6478536213147159724, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
|
||||
- {fileID: 3243688835468109435, guid: eb5e13df78999ef878da1db5c63224e2, type: 3}
|
||||
- {fileID: 2100000, guid: 453df639b86494041b3526d57bb2968c, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -503,16 +503,101 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2106751424727166590, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_Texture
|
||||
value:
|
||||
objectReference: {fileID: 2800000, guid: 0b6e7ae63c5e9544aa7d8d1856b70499, type: 3}
|
||||
- target: {fileID: 3056065669230710374, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MainMenu
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3327343849046281887, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4477108964678118205, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_Camera
|
||||
value:
|
||||
objectReference: {fileID: 1541622504}
|
||||
- target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5683376709369575367, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6061339260787830218, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7045148413652824342, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7849779404840636332, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
|
|
@ -613,6 +698,26 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8703782379942844586, guid: e83880d6526db0243a6f252cb0e828c8,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
|
|||
|
|
@ -123,94 +123,6 @@ NavMeshSettings:
|
|||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1001 &4544275
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.3489784
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.393
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.0279284
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 585033784688427358, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2303435248870534838, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_Materials.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 2100000, guid: d1bc1e083713a6d4aa7a17a8dc465df2, type: 2}
|
||||
- target: {fileID: 4420203067853765648, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Bullet_Green
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8572678539923306418, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_Color.b
|
||||
value: 0.2040662
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8572678539923306418, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_Color.g
|
||||
value: 0.84276724
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8572678539923306418, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3,
|
||||
type: 3}
|
||||
propertyPath: m_Color.r
|
||||
value: 0.4401018
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 46dbe6bde29ed5ae1ad7ca6bf26a30e3, type: 3}
|
||||
--- !u!1 &40153102
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7087,57 +6999,57 @@ PrefabInstance:
|
|||
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.11418807
|
||||
value: -0.13600045
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.07998759
|
||||
value: -0.03067222
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.81104445
|
||||
value: 0.965972
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2465233980315321778, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.5681285
|
||||
value: -0.21785596
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 2.3239155
|
||||
value: 5.735176
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -19.898222
|
||||
value: 11.802399
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 8.089454
|
||||
value: 19.963913
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.11418807
|
||||
value: -0.13506624
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.07998759
|
||||
value: -0.03455485
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.81104445
|
||||
value: 0.9593361
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.5681285
|
||||
value: -0.24543303
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
|
|
@ -7147,17 +7059,17 @@ PrefabInstance:
|
|||
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 1.3805482
|
||||
value: 3.3133156
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -10.5
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.8056316
|
||||
value: 11.533516
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3837216061230793568, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
|
|
@ -7172,22 +7084,22 @@ PrefabInstance:
|
|||
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.11643218
|
||||
value: -0.13506624
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.07668435
|
||||
value: -0.03455485
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.8269835
|
||||
value: 0.9593361
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5753661378891917460, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.5446663
|
||||
value: -0.24543303
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6115888582170302332, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
|
|
@ -7237,22 +7149,22 @@ PrefabInstance:
|
|||
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.11859464
|
||||
value: -0.13401379
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.07329551
|
||||
value: -0.038434636
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.8423433
|
||||
value: 0.9518611
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7348612162646443967, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.52059674
|
||||
value: -0.27299014
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8882344377078016156, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
|
||||
type: 3}
|
||||
|
|
@ -7437,6 +7349,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
towerCam: {fileID: 0}
|
||||
escImg: {fileID: 0}
|
||||
mainCamera: {fileID: 1970787082}
|
||||
layerMask:
|
||||
serializedVersion: 2
|
||||
|
|
@ -7596,6 +7509,74 @@ PrefabInstance:
|
|||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 32921dff6554af324ba0001ca8b56fee, type: 3}
|
||||
--- !u!1001 &4286306891245636772
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 795444204857451935, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Bullet_Green
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.3489784
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.393
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 4.0279284
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7937577949470585883, guid: 74513a3fa9ccae747aec3a617620bf02,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 74513a3fa9ccae747aec3a617620bf02, type: 3}
|
||||
--- !u!1001 &4975074404174323357
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7690,5 +7671,5 @@ SceneRoots:
|
|||
- {fileID: 943665038}
|
||||
- {fileID: 1245152997}
|
||||
- {fileID: 981494313}
|
||||
- {fileID: 4544275}
|
||||
- {fileID: 4286306891245636772}
|
||||
- {fileID: 1431168926}
|
||||
|
|
|
|||
|
|
@ -55,15 +55,10 @@ public class EnemySpawnManager : MonoBehaviour
|
|||
|
||||
void Update()
|
||||
{
|
||||
if (waveQueue.Count <= 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (HasStarted && IsAutoPlaying)
|
||||
time += Time.deltaTime;
|
||||
|
||||
if (waveQueue.Peek().spawnTime < time)
|
||||
if (waveQueue.Count > 0 && waveQueue.Peek().spawnTime < time)
|
||||
{
|
||||
PopWave();
|
||||
}
|
||||
|
|
@ -81,6 +76,10 @@ public class EnemySpawnManager : MonoBehaviour
|
|||
|
||||
void PopWave()
|
||||
{
|
||||
if (waveQueue.Count <= 0)
|
||||
return;
|
||||
|
||||
|
||||
time = 0;
|
||||
WaveNum++;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue