fully functioning marlon-branch. sick!

This commit is contained in:
Marlon Portmann committed 2023-01-02 16:09:25 +01:00
1 parent a1f520943f
commit fd31d29743
88 files changed
+4500 -110

No files matched your search

@@ -723,7 +723,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 491f82f81612a468c89aa913470c367d, type: 3}
propertyPath: m_RootOrder
value: 5
value: 6
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 491f82f81612a468c89aa913470c367d, type: 3}
propertyPath: m_LocalScale.x
@@ -1083,7 +1083,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 60c29c57f5d3749a6bc75d0206a7f189, type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 60c29c57f5d3749a6bc75d0206a7f189, type: 3}
propertyPath: m_LocalScale.x
@@ -1325,7 +1325,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 60c29c57f5d3749a6bc75d0206a7f189, type: 3}
propertyPath: m_RootOrder
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 60c29c57f5d3749a6bc75d0206a7f189, type: 3}
propertyPath: m_LocalScale.x
@@ -1861,7 +1861,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2139908696}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 181.338, y: 23.106995, z: 93.005}
--- !u!64 &281808170
MeshCollider:
@@ -2759,6 +2759,8 @@ GameObject:
- component: {fileID: 373324740}
- component: {fileID: 373324739}
- component: {fileID: 373324738}
- component: {fileID: 373324742}
- component: {fileID: 373324741}
m_Layer: 0
m_Name: smallDateScreen
m_TagString: Untagged
@@ -2815,7 +2817,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: be7093a46467945b5ab70d832f727e87, type: 2}
- {fileID: 2100000, guid: 65ac7cabe46fb49d5b65842b6a04cc1f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -2845,6 +2847,37 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373324736}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &373324741
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373324736}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
_objectReferences:
- {fileID: 11400000, guid: 26a4d8d44f1464cb9a4d2b5762c685c0, type: 2}
--- !u!114 &373324742
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 373324736}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []
--- !u!1001 &386881445
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4314,7 +4347,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 60c29c57f5d3749a6bc75d0206a7f189, type: 3}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 60c29c57f5d3749a6bc75d0206a7f189, type: 3}
propertyPath: m_LocalScale.x
@@ -6403,7 +6436,7 @@ Light:
m_Type: 0
m_Shape: 0
m_Color: {r: 0.7216981, g: 0.9025944, b: 1, a: 1}
m_Intensity: 6.3
m_Intensity: 4.44
m_Range: 415.04
m_SpotAngle: 169.63235
m_InnerSpotAngle: 99.68365
@@ -6808,7 +6841,7 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 967445099}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.004329902, y: 0.0037405312, z: 0.0005519405}
@@ -6863,6 +6896,102 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5bc8ea30da2604b2482ade5224740f59, type: 3}
m_PrefabInstance: {fileID: 1055292291}
m_PrefabAsset: {fileID: 0}
--- !u!82 &967445110
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 967445099}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: a674ec0dd5c5e44bdbaa7f95ffa20e6e, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.373
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1001 &981245467
PrefabInstance:
m_ObjectHideFlags: 0
@@ -9605,6 +9734,171 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 581b0363539f64cf2809a7068f84a5f1, type: 3}
m_PrefabInstance: {fileID: 1150860240}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1153580133
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1153580134}
- component: {fileID: 1153580137}
- component: {fileID: 1153580136}
- component: {fileID: 1153580135}
- component: {fileID: 1153580138}
- component: {fileID: 1153580140}
- component: {fileID: 1153580139}
m_Layer: 0
m_Name: dateScreen VideoPlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 1
--- !u!4 &1153580134
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
m_LocalRotation: {x: 0.69163805, y: -0.6916379, z: -0.14709519, w: 0.14709522}
m_LocalPosition: {x: -0.030998, y: 0.00325, z: 0.008744}
m_LocalScale: {x: 0.00045745884, y: 0.009999999, z: 0.00032315572}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2139908696}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 180, y: 24.013, z: 90}
--- !u!64 &1153580135
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1153580136
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
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: d47097b7e09544a43a9d9e9455b74388, 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!33 &1153580137
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!328 &1153580138
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
m_Enabled: 1
m_VideoClip: {fileID: 32900000, guid: 2e1fc86cec9194b4b9d6cea2721e50a7, type: 3}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 0}
m_TargetTexture: {fileID: 0}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: _EmissionMap
m_RenderMode: 3
m_AspectRatio: 2
m_DataSource: 0
m_PlaybackSpeed: 1
m_AudioOutputMode: 0
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url:
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 0
m_SkipOnDrop: 1
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!114 &1153580139
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"nest":{"source":"Embed","macro":null,"embed":{"variables":{"Kind":"Flow","collection":{"$content":[],"$version":"A"},"$version":"A"},"controlInputDefinitions":[],"controlOutputDefinitions":[],"valueInputDefinitions":[],"valueOutputDefinitions":[],"title":"play
the main video when index = 1","summary":null,"pan":{"x":-196.7781,"y":-385.5118},"zoom":0.85,"elements":[{"coroutine":true,"defaultValues":{},"position":{"x":-1022.0,"y":-1001.0},"guid":"83d8a529-c84a-440b-aa7a-92f25488eead","$version":"A","$type":"Unity.VisualScripting.Update","$id":"10"},{"specifyFallback":false,"kind":"Scene","defaultValues":{"name":{"$content":"redLight","$type":"System.String"}},"position":{"x":-1012.0,"y":-895.0},"guid":"9801c055-4312-4f2f-8e24-d8f10121ac21","$version":"A","$type":"Unity.VisualScripting.GetVariable","$id":"12"},{"defaultValues":{"seconds":{"$content":0.85,"$type":"System.Single"},"unscaledTime":{"$content":false,"$type":"System.Boolean"}},"position":{"x":-25.0,"y":-1022.0},"guid":"15c111e9-add3-4620-b868-5da0ab187580","$version":"A","$type":"Unity.VisualScripting.WaitForSecondsUnit","$id":"14"},{"chainable":false,"member":{"name":"EnableKeyword","parameterTypes":["System.String"],"targetType":"UnityEngine.Material","targetTypeName":"UnityEngine.Material","$version":"A"},"defaultValues":{"target":null,"%keyword":{"$content":"_EMISSION","$type":"System.String"}},"position":{"x":191.0,"y":-846.0},"guid":"9acd155c-c65b-4065-8803-7b83bbd394f4","$version":"A","$type":"Unity.VisualScripting.InvokeMember","$id":"16"},{"specifyFallback":false,"kind":"Scene","defaultValues":{"name":{"$content":"delay_PLAY_VIDEO_ROCKET","$type":"System.String"}},"position":{"x":-838.0,"y":-1147.0},"guid":"a430291f-2e72-444a-8c8a-f7503938e059","$version":"A","$type":"Unity.VisualScripting.GetVariable","$id":"19"},{"defaultValues":{},"position":{"x":-646.0,"y":-975.0},"guid":"ed6ba324-183f-45c1-8834-eeeafb91e257","$version":"A","$type":"Unity.VisualScripting.Once","$id":"21"},{"chainable":false,"member":{"name":"Play","parameterTypes":[],"targetType":"UnityEngine.Video.VideoPlayer","targetTypeName":"UnityEngine.Video.VideoPlayer","$version":"A"},"defaultValues":{"target":null},"position":{"x":-253.0,"y":-932.0},"guid":"b8edec0e-570d-4aa3-a631-f10ce7580868","$version":"A","$type":"Unity.VisualScripting.InvokeMember","$id":"23"},{"defaultValues":{},"position":{"x":-771.0,"y":-939.0},"guid":"87b0a4e9-1f15-4e86-bb31-5b4e3ea47f5c","$version":"A","$type":"Unity.VisualScripting.If","$id":"26"},{"chainable":false,"member":{"name":"DisableKeyword","parameterTypes":["System.String"],"targetType":"UnityEngine.Material","targetTypeName":"UnityEngine.Material","$version":"A"},"defaultValues":{"target":null,"%keyword":{"$content":"_EMISSION","$type":"System.String"}},"position":{"x":-299.0,"y":-487.0},"guid":"5de446f7-f4fb-4d99-bb5a-ad4b11bbb790","$version":"A","$type":"Unity.VisualScripting.InvokeMember","$id":"28"},{"type":"UnityEngine.Renderer","instance":true,"static":true,"defaultValues":{"target":null},"position":{"x":-672.0,"y":-322.0},"guid":"b66addbe-0213-4b1e-9fb0-8e49dcae0e31","$version":"A","$type":"Unity.VisualScripting.Expose","$id":"31"},{"coroutine":false,"defaultValues":{},"position":{"x":-413.0,"y":-780.0},"guid":"ddc35a62-2678-4546-a89e-e5daf7e2eb85","$version":"A","$type":"Unity.VisualScripting.Start","$id":"33"},{"defaultValues":{"seconds":{"$content":5.0,"$type":"System.Single"},"unscaledTime":{"$content":false,"$type":"System.Boolean"}},"position":{"x":-465.0,"y":-1109.0},"guid":"49f452e2-0cae-4858-85b7-340b94b87f77","$version":"A","$type":"Unity.VisualScripting.WaitForSecondsUnit","$id":"35"},{"sourceUnit":{"$ref":"10"},"sourceKey":"trigger","destinationUnit":{"$ref":"26"},"destinationKey":"enter","guid":"5910a54f-63a2-47d8-bd8e-73d2686341e6","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"14"},"sourceKey":"exit","destinationUnit":{"$ref":"16"},"destinationKey":"enter","guid":"4d7ab9ba-654e-42e0-b356-0798825f49df","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"26"},"sourceKey":"ifTrue","destinationUnit":{"$ref":"21"},"destinationKey":"enter","guid":"767908f3-6778-444f-8789-1fdcd6d158b8","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"23"},"sourceKey":"exit","destinationUnit":{"$ref":"14"},"destinationKey":"enter","guid":"63ae3985-5db2-4d1a-9b8d-6e353084ffaf","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"35"},"sourceKey":"exit","destinationUnit":{"$ref":"23"},"destinationKey":"enter","guid":"e20c9cb4-058c-4015-87fc-d4ae8d9411f4","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"21"},"sourceKey":"once","destinationUnit":{"$ref":"35"},"destinationKey":"enter","guid":"e294bda2-d4be-47aa-a9b8-8f99c4749c2f","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"33"},"sourceKey":"trigger","destinationUnit":{"$ref":"28"},"destinationKey":"enter","guid":"13a9f4ff-8897-43d6-902b-96409380d484","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"31"},"sourceKey":"material","destinationUnit":{"$ref":"28"},"destinationKey":"target","guid":"c17978ba-ae2c-4675-8db5-68df9c1ecac1","$type":"Unity.VisualScripting.ValueConnection"}Line truncated
_objectReferences: []
--- !u!114 &1153580140
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1153580133}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []
--- !u!1001 &1154206118
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10834,7 +11128,7 @@ Light:
m_Type: 0
m_Shape: 0
m_Color: {r: 1, g: 0.8735849, b: 0.6839622, a: 1}
m_Intensity: 12.47
m_Intensity: 7.57
m_Range: 10
m_SpotAngle: 127.56089
m_InnerSpotAngle: 89.580765
@@ -10892,7 +11186,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1290729411}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -2.0448923, y: 3.8467426, z: -1.2111732}
m_LocalPosition: {x: -2.0448923, y: 3.8467426, z: -2.032}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -11275,7 +11569,8 @@ GameObject:
- component: {fileID: 1324893495}
- component: {fileID: 1324893494}
- component: {fileID: 1324893493}
- component: {fileID: 1324893491}
- component: {fileID: 1324893497}
- component: {fileID: 1324893496}
m_Layer: 0
m_Name: video screen left
m_TagString: Untagged
@@ -11298,39 +11593,6 @@ Transform:
m_Father: {fileID: 1134229862}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 180, y: 0, z: 105.808}
--- !u!328 &1324893491
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324893489}
m_Enabled: 1
m_VideoClip: {fileID: 32900000, guid: bd9efcba68d804d408b8e80e8a31d158, type: 3}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 0}
m_TargetTexture: {fileID: 0}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: _EmissionMap
m_RenderMode: 3
m_AspectRatio: 2
m_DataSource: 0
m_PlaybackSpeed: 1
m_AudioOutputMode: 2
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url:
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 1
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!64 &1324893493
MeshCollider:
m_ObjectHideFlags: 0
@@ -11365,7 +11627,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 7c8f20dde78b04a3d8a11e10dda23e38, type: 2}
- {fileID: 2100000, guid: 65ac7cabe46fb49d5b65842b6a04cc1f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -11395,6 +11657,37 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324893489}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1324893496
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324893489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d2fe5546f775c47d2820aa5e8a715f53, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
_objectReferences:
- {fileID: 11400000, guid: 48e206edd96fc4aa9a26e8d490966b0a, type: 2}
--- !u!114 &1324893497
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324893489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []
--- !u!1001 &1338391737
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12580,6 +12873,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 5231465532879039171, guid: 19a9d2642dbbf489ea59a9596d0c9517, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5231465532879039171, guid: 19a9d2642dbbf489ea59a9596d0c9517, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
@@ -12743,7 +13040,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 4c103e351724b49baaaa4e88d2359234, type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 4c103e351724b49baaaa4e88d2359234, type: 3}
propertyPath: m_LocalScale.x
@@ -13142,7 +13439,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 491f82f81612a468c89aa913470c367d, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 491f82f81612a468c89aa913470c367d, type: 3}
propertyPath: m_LocalScale.x
@@ -17040,7 +17337,7 @@ Light:
m_Type: 0
m_Shape: 0
m_Color: {r: 0.7216981, g: 0.9025944, b: 1, a: 1}
m_Intensity: 11.07
m_Intensity: 9.42
m_Range: 19.4
m_SpotAngle: 169.63235
m_InnerSpotAngle: 99.68365
@@ -78,7 +78,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 8900000, guid: dc25ff33afb124dfba593e09789fbdf9, type: 3}
m_Texture: {fileID: 8900000, guid: 18d7afba6f069475c9715bb165dcdd2d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
@@ -106,7 +106,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _Exposure: 0.34
- _Exposure: 0.98
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
@@ -115,7 +115,7 @@ Material:
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Rotation: 0
- _Rotation: 104
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
@@ -128,5 +128,5 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _Tint: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 0.5}
m_BuildTextureStacks: []
@@ -5,8 +5,8 @@ TextureImporter:
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
mipMapMode: 1
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
filterMode: 2
aniso: 1
mipBias: 0
wrapU: 0
@@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
Binary file not shown.

After

Width:  |  Height:  |  Size: 10 MiB

@@ -0,0 +1,135 @@
fileFormatVersion: 2
guid: 18d7afba6f069475c9715bb165dcdd2d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
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: Server
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: