use correct bullets

This commit is contained in:
Sveske Juice 2024-04-21 03:36:14 +02:00
parent d60ab75afb
commit eb233df679
11 changed files with 125 additions and 143 deletions

View File

@ -13,7 +13,7 @@ MonoBehaviour:
m_Name: AudioLib
m_EditorClassIdentifier:
Clips:
- {fileID: 8300000, guid: ea208a46b2ab9bc45b936d5d7e0455cf, type: 3}
- {fileID: 8300000, guid: 866ac77aa3587de4aa79a63029d631e6, type: 3}
- {fileID: 8300000, guid: 58d0fae7e12873e4293f7e9bce59fcdc, type: 3}
- {fileID: 8300000, guid: 1d08abd4771cf954a92649be9eaa32da, type: 3}
- {fileID: 8300000, guid: fe1f2d7ea272e2d47aa2140b739f93fa, type: 3}

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.1

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.1
@ -90,7 +90,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.001
globalScale: 0.1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.1
@ -90,7 +90,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.001
globalScale: 0.1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.1
@ -90,7 +90,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.001
globalScale: 0.1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.1
@ -90,7 +90,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.001
globalScale: 0.1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

View File

@ -32,7 +32,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 0.1
@ -90,7 +90,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.001
globalScale: 0.1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0

View File

@ -11,8 +11,7 @@ GameObject:
- component: {fileID: 5074286193465566833}
- component: {fileID: 622750128577529191}
- component: {fileID: 6351475726872690782}
- component: {fileID: 599986095408968252}
m_Layer: 0
m_Layer: 6
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -84,27 +83,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &599986095408968252
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351786554158684029}
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_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3238744023741729767
GameObject:
m_ObjectHideFlags: 0
@ -116,8 +94,7 @@ GameObject:
- component: {fileID: 2775812873468504414}
- component: {fileID: 4675805639711564604}
- component: {fileID: 4219885489247769707}
- component: {fileID: 5021138776713670615}
m_Layer: 0
m_Layer: 6
m_Name: Cube (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -189,27 +166,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &5021138776713670615
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3238744023741729767}
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_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &3248525637879141301
GameObject:
m_ObjectHideFlags: 0
@ -222,7 +178,10 @@ GameObject:
- component: {fileID: 99605857738449373}
- component: {fileID: 7995358721369753704}
- component: {fileID: 6343727252069474822}
m_Layer: 0
- component: {fileID: 4402499257783305611}
- component: {fileID: 40811086166306172}
- component: {fileID: -5026537654431272615}
m_Layer: 6
m_Name: PlasmaBullet
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -353,6 +312,73 @@ MonoBehaviour:
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!65 &4402499257783305611
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3248525637879141301}
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_Size: {x: 0.35, y: 0.35, z: 0.35}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &40811086166306172
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3248525637879141301}
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: []
--- !u!54 &-5026537654431272615
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3248525637879141301}
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0
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!1 &4076130981359727988
GameObject:
m_ObjectHideFlags: 0
@ -364,8 +390,7 @@ GameObject:
- component: {fileID: 1553517095972250766}
- component: {fileID: 6040231071127825331}
- component: {fileID: 8585621083194835676}
- component: {fileID: 4415436936380299287}
m_Layer: 0
m_Layer: 6
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -437,27 +462,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &4415436936380299287
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4076130981359727988}
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_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &5166680093018848385
GameObject:
m_ObjectHideFlags: 0
@ -469,7 +473,7 @@ GameObject:
- component: {fileID: 952306820225547086}
- component: {fileID: 3616690214030999077}
- component: {fileID: 6503966235850705177}
m_Layer: 0
m_Layer: 6
m_Name: Bounce / Shoot
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5366,7 +5370,7 @@ GameObject:
- component: {fileID: 3826416426683448326}
- component: {fileID: 6047847810707290244}
- component: {fileID: 1756746869659166590}
m_Layer: 0
m_Layer: 6
m_Name: Particle System
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -10205,8 +10209,7 @@ GameObject:
- component: {fileID: 5911113516372945005}
- component: {fileID: 7029898274017296766}
- component: {fileID: 7206949835680583260}
- component: {fileID: 2153801654926115010}
m_Layer: 0
m_Layer: 6
m_Name: Cube (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -10278,24 +10281,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &2153801654926115010
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8900264520011667323}
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_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}

View File

@ -1423,17 +1423,17 @@ PrefabInstance:
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.29548866
value: 0.2954887
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.24788545
value: 0.2478855
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.079687834
value: -0.07968786
objectReference: {fileID: 0}
- target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1513,17 +1513,17 @@ PrefabInstance:
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.32868278
value: 0.32868275
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.24482724
value: 0.24482721
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.08863968
value: -0.08863967
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1548,17 +1548,17 @@ PrefabInstance:
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.31211528
value: 0.3121153
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.24639907
value: 0.24639902
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.08417174
value: -0.08417173
objectReference: {fileID: 0}
- target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1708,7 +1708,7 @@ MonoBehaviour:
- Arc: 0
Amount: 1
Speed: 100
bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee,
bulletPrefab: {fileID: 3248525637879141301, guid: 2ad3be6c6ede5d64e9c73ce6b7a060a5,
type: 3}
Burst: 0
BurstDelay: 0

View File

@ -911,7 +911,7 @@ PrefabInstance:
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.84
value: -0.839
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -931,12 +931,12 @@ PrefabInstance:
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: 3.153011e-36
value: -0
objectReference: {fileID: 0}
- target: {fileID: 85471039882070109, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: 1.3634104e-37
value: -0
objectReference: {fileID: 0}
- target: {fileID: 527409087646353271, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1006,7 +1006,7 @@ PrefabInstance:
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.84
value: -0.839
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1021,7 +1021,7 @@ PrefabInstance:
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.x
value: 2.524355e-29
value: 3.59e-43
objectReference: {fileID: 0}
- target: {fileID: 3231648858884615218, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1041,7 +1041,7 @@ PrefabInstance:
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.84
value: -0.839
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1061,12 +1061,12 @@ PrefabInstance:
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.00000001990998
value: -0.00000001785987
objectReference: {fileID: 0}
- target: {fileID: 4220667717328304921, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
propertyPath: m_LocalRotation.z
value: -3.6221226e-10
value: -3.2491562e-10
objectReference: {fileID: 0}
- target: {fileID: 4657144566828515878, guid: f54a14318952c90c5b47a300aedb0d15,
type: 3}
@ -1641,7 +1641,7 @@ MonoBehaviour:
- Arc: 0
Amount: 1
Speed: 100
bulletPrefab: {fileID: 2962360034595352958, guid: 32921dff6554af324ba0001ca8b56fee,
bulletPrefab: {fileID: 4420203067853765648, guid: 86d1599960f06fa4b830584980cb93c7,
type: 3}
Burst: 0
BurstDelay: 0

View File

@ -149,12 +149,12 @@ PrefabInstance:
- target: {fileID: 681885395900820027, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000017203512
value: 0.000000017203536
objectReference: {fileID: 0}
- target: {fileID: 681885395900820027, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099,
type: 3}
propertyPath: m_LocalRotation.z
value: 3.129748e-10
value: 3.1297526e-10
objectReference: {fileID: 0}
- target: {fileID: 2251032668217228560, guid: 1d7949721a9f0bc9ba1a8c49ca5fd099,
type: 3}
@ -648,12 +648,12 @@ PrefabInstance:
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000023165915
value: -0.000000023165905
objectReference: {fileID: 0}
- target: {fileID: 2259584953001852341, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000000074471567
value: 0.0000000074471527
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
@ -683,12 +683,12 @@ PrefabInstance:
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000016282518
value: -0.000000016282542
objectReference: {fileID: 0}
- target: {fileID: 2659055701601603313, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.0000000055622285
value: 0.0000000055622356
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
@ -718,12 +718,12 @@ PrefabInstance:
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.000000022880894
value: 0.00000002288009
objectReference: {fileID: 0}
- target: {fileID: 3651592998252321242, guid: 148ea27cfb89dc0398835d59bed11cca,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.000000008284025
value: -0.000000008283735
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -955,7 +955,7 @@ PrefabInstance:
- target: {fileID: 8488737342646939416, guid: 9415cb10a1bd579269301ca4f61a1554,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8717774532810144392, guid: 9415cb10a1bd579269301ca4f61a1554,
type: 3}
@ -1698,42 +1698,42 @@ PrefabInstance:
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.3133156
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.95
value: 3.339
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.z
value: 11.533513
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.13855627
value: -3e-45
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.015462777
value: -1e-45
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.9841245
value: 0.9402716
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.10982757
value: -0.34042525
objectReference: {fileID: 0}
- target: {fileID: 3255403189825384754, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: field of view
value: 60
value: 40
objectReference: {fileID: 0}
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}