various ups

This commit is contained in:
Daniel Tyomin 2024-08-19 20:31:46 +02:00
parent a6682a2b8b
commit 11ebf74721
9 changed files with 7195 additions and 4297 deletions

View File

@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcf4ec4eb272446d850eb3c9e72cd87f, type: 3}
m_Name: Original E
m_Name: Eight
m_EditorClassIdentifier:
Prefab: {fileID: 1892923323752838125, guid: 67d17fe30a51b794899db51da3f9fddb, type: 3}
normalClips:

View File

@ -34,7 +34,6 @@ Transform:
- {fileID: 2287517268529993800}
- {fileID: 8575809719962954266}
- {fileID: 7695777137862930754}
- {fileID: 1879206749171155853}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1715723942273311323
@ -65,111 +64,6 @@ MonoBehaviour:
x: 0
y: 0
z: 0
--- !u!1 &3569160532419072485
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1879206749171155853}
- component: {fileID: 504901350325722598}
- component: {fileID: 6354343240920045665}
- component: {fileID: 5679527934212513793}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1879206749171155853
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3569160532419072485}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: -1.125}
m_LocalScale: {x: 1.25, y: 0.25, z: 0.25}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5563351632361831542}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &504901350325722598
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3569160532419072485}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6354343240920045665
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3569160532419072485}
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: bef232e221fa62047b268fcc0f75629a, 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!65 &5679527934212513793
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3569160532419072485}
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 &4823113163291739237
GameObject:
m_ObjectHideFlags: 0
@ -265,13 +159,17 @@ PrefabInstance:
propertyPath: m_Name
value: Column 2m
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalScale.z
value: 1.125
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalPosition.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalPosition.y
value: -0.8749999
value: -1.1249999
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalPosition.z
@ -352,13 +250,17 @@ PrefabInstance:
propertyPath: m_Name
value: Column 2m (1)
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalScale.z
value: 1.125
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalPosition.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalPosition.y
value: -0.8749999
value: -1.1249999
objectReference: {fileID: 0}
- target: {fileID: 3831400912386519841, guid: 13876dc18abddb545a2b16fe43b7b022, type: 3}
propertyPath: m_LocalPosition.z

View File

@ -74,6 +74,7 @@ GameObject:
- component: {fileID: 2348941177902135422}
- component: {fileID: 1271338787096344491}
- component: {fileID: 8255287274007911725}
- component: {fileID: 6281084305135189773}
m_Layer: 0
m_Name: Stair Railing (1)
m_TagString: Untagged
@ -124,7 +125,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: bef232e221fa62047b268fcc0f75629a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -146,6 +147,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &6281084305135189773
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 259285131947433183}
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: 5
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 7710443742579215866, guid: b63196673433e784fad02b661a7699ad, type: 3}
--- !u!1 &1028630298480366769
GameObject:
m_ObjectHideFlags: 0
@ -157,6 +180,7 @@ GameObject:
- component: {fileID: 2313417440225206981}
- component: {fileID: 1748526594218613193}
- component: {fileID: 1662911185822418884}
- component: {fileID: 7213711636305040882}
m_Layer: 0
m_Name: Stair Railing
m_TagString: Untagged
@ -207,7 +231,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: bef232e221fa62047b268fcc0f75629a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -229,6 +253,28 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &7213711636305040882
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1028630298480366769}
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: 5
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 7710443742579215866, guid: b63196673433e784fad02b661a7699ad, type: 3}
--- !u!1 &4180717711929879711
GameObject:
m_ObjectHideFlags: 0
@ -240,6 +286,7 @@ GameObject:
- component: {fileID: 4198658643424600474}
- component: {fileID: 8345012824119483713}
- component: {fileID: 4354173855073237675}
- component: {fileID: 6118456447623097853}
m_Layer: 0
m_Name: Stairs Smoothway
m_TagString: Untagged
@ -290,7 +337,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: bef232e221fa62047b268fcc0f75629a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -312,3 +359,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &6118456447623097853
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4180717711929879711}
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: 5
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 2812826550696626532, guid: b63196673433e784fad02b661a7699ad, type: 3}

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: bef232e221fa62047b268fcc0f75629a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -167,7 +167,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: bef232e221fa62047b268fcc0f75629a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -284,6 +284,7 @@ GameObject:
- component: {fileID: 8477766330351525557}
- component: {fileID: 606292514698105159}
- component: {fileID: 4429659335363642782}
- component: {fileID: 2521908395377684826}
m_Layer: 0
m_Name: Walkway Rusted 1
m_TagString: Untagged
@ -334,7 +335,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: bef232e221fa62047b268fcc0f75629a, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -356,3 +357,25 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2521908395377684826
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8584386384686824827}
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: 5
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 3075573498805961908, guid: b63196673433e784fad02b661a7699ad, type: 3}

View File

@ -438,6 +438,10 @@ PrefabInstance:
propertyPath: m_Name
value: Column 1m (1)
objectReference: {fileID: 0}
- target: {fileID: 8877649197562476679, guid: 3c35cdf4a8f85d34680d2d1f3f242650, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -504,6 +508,10 @@ PrefabInstance:
propertyPath: m_Name
value: Column 1m
objectReference: {fileID: 0}
- target: {fileID: 8877649197562476679, guid: 3c35cdf4a8f85d34680d2d1f3f242650, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -570,6 +578,10 @@ PrefabInstance:
propertyPath: m_Name
value: Column 1m (2)
objectReference: {fileID: 0}
- target: {fileID: 8877649197562476679, guid: 3c35cdf4a8f85d34680d2d1f3f242650, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -636,6 +648,10 @@ PrefabInstance:
propertyPath: m_Name
value: Column 1m (3)
objectReference: {fileID: 0}
- target: {fileID: 8877649197562476679, guid: 3c35cdf4a8f85d34680d2d1f3f242650, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

View File

@ -100,7 +100,7 @@ Rigidbody:
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_AngularDrag: 100
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}

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,8 @@ public class Converter: MonoBehaviour, IResetable
public ProductType expectedReagent;
public Transform outputPoint;
public ProductType conversionProduct;
public bool introduceDefect;
public int CurrentHealth;
public int MaxHealth;
@ -73,7 +74,15 @@ public class Converter: MonoBehaviour, IResetable
if (inputProducts[0].Type == expectedReagent)
{
Spawner.SpawnProduct(conversionProduct, currentProduct.Defect);
if (!introduceDefect)
{
Spawner.SpawnProduct(conversionProduct, currentProduct.Defect);
}
else
{
Spawner.SpawnProduct(conversionProduct);
}
inputProducts.RemoveAt(0);
Destroy(currentProduct);