From 2b390add9cbdee3d62d80b00cfa98cb99f9c6e59 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 21 Oct 2022 10:20:57 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E3=82=B7=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E8=83=8C=E6=99=AF=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 1216 ++--------------- .../Scenes/Main/Scripts/KitchenManager.cs | 10 +- .../Assets/MyGame/Scripts/SpreadsheetData.cs | 5 + 3 files changed, 138 insertions(+), 1093 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index d253f8f8..dc376204 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -390,52 +390,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &251891026 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 251891027} - - component: {fileID: 251891028} - m_Layer: 0 - m_Name: Blue - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &251891027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251891026} - 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: - - {fileID: 1124341217} - - {fileID: 1823553375} - - {fileID: 590848657} - m_Father: {fileID: 382888005} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!210 &251891028 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251891026} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 6 --- !u!1 &278785268 GameObject: m_ObjectHideFlags: 0 @@ -1383,7 +1337,7 @@ GameObject: m_Component: - component: {fileID: 382888005} m_Layer: 0 - m_Name: Brother + m_Name: Charactor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1396,15 +1350,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382888004} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -2.81, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 251891027} - {fileID: 519190655} - m_Father: {fileID: 2082561918} - m_RootOrder: 1 + - {fileID: 1124341217} + - {fileID: 1823553375} + m_Father: {fileID: 1120804190} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &407927298 GameObject: @@ -2436,7 +2391,7 @@ Transform: - {fileID: 939423376} - {fileID: 1066410798} m_Father: {fileID: 382888005} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &519190656 Animator: @@ -2469,6 +2424,81 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 +--- !u!1001 &526364889 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 762548189} + m_Modifications: + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.81 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8002780767932027826, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + propertyPath: m_Name + value: egg + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dc962f298670a954a985d88efcfb2137, type: 3} +--- !u!4 &526364890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6685289381717828071, guid: dc962f298670a954a985d88efcfb2137, + type: 3} + m_PrefabInstance: {fileID: 526364889} + m_PrefabAsset: {fileID: 0} --- !u!1 &546637092 GameObject: m_ObjectHideFlags: 0 @@ -2670,94 +2700,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &590848656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 590848657} - - component: {fileID: 590848658} - m_Layer: 0 - m_Name: desk - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &590848657 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590848656} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.11, y: -5.06, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1796633949} - - {fileID: 1850158121} - - {fileID: 1036488658} - - {fileID: 1719419317} - m_Father: {fileID: 251891027} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &590848658 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590848656} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 0058adecd7072ab4d812218d9a440a3c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 11.16, y: 4.82} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &599958351 GameObject: m_ObjectHideFlags: 0 @@ -3212,6 +3154,38 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &762548188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 762548189} + m_Layer: 0 + m_Name: BackGroundTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &762548189 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 762548188} + 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: + - {fileID: 526364890} + m_Father: {fileID: 1120804190} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &767719701 GameObject: m_ObjectHideFlags: 0 @@ -3945,90 +3919,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1036488657 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1036488658} - - component: {fileID: 1036488659} - m_Layer: 0 - m_Name: Chair_r - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1036488658 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1036488657} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.93, y: 2.16, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 590848657} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1036488659 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1036488657} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 585b6acc805d74e0f8282898c1bdb566, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 2.41, y: 1.78} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1039014658 GameObject: m_ObjectHideFlags: 0 @@ -4317,7 +4207,8 @@ Transform: m_Children: - {fileID: 1122085164} - {fileID: 2088316431} - - {fileID: 2082561918} + - {fileID: 762548189} + - {fileID: 382888005} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4457,14 +4348,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1124341216} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.87, y: -1.97, z: -0.1} + m_LocalPosition: {x: -2.87, y: -1.9699998, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1201209666} - {fileID: 2028992897} - m_Father: {fileID: 251891027} - m_RootOrder: 0 + m_Father: {fileID: 382888005} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1124341218 Animator: @@ -4835,86 +4726,6 @@ Transform: m_Father: {fileID: 1741161906} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1328732174 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2001111210} - m_Modifications: - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalPosition.x - value: -7.45 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalPosition.y - value: -10.71 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5428570721673225340, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_Name - value: cardboard_a (1) - objectReference: {fileID: 0} - - target: {fileID: 7416233741422776622, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_SortingOrder - value: 7 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} ---- !u!4 &1328732175 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - m_PrefabInstance: {fileID: 1328732174} - m_PrefabAsset: {fileID: 0} --- !u!1 &1329852974 GameObject: m_ObjectHideFlags: 0 @@ -5891,90 +5702,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1689503841} m_CullTransparentMesh: 0 ---- !u!1 &1719419316 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1719419317} - - component: {fileID: 1719419318} - m_Layer: 0 - m_Name: shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1719419317 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719419316} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.01, y: -1.18, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 590848657} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1719419318 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719419316} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -32 - m_Sprite: {fileID: 21300000, guid: 80d1c9e9b326898458982e5863f94bee, type: 3} - m_Color: {r: 0.2264151, g: 0.05889301, b: 0, a: 0.078431375} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 1 - m_Size: {x: 10.79, y: 1.86} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1741161905 GameObject: m_ObjectHideFlags: 0 @@ -6197,170 +5924,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1785706283} m_PrefabAsset: {fileID: 0} ---- !u!1 &1796633948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1796633949} - - component: {fileID: 1796633950} - m_Layer: 0 - m_Name: GarbageCan - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1796633949 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1796633948} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.49, y: -0.41, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 590848657} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1796633950 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1796633948} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ca9b51ed4ca3ec94e98ed1c2c0285be7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.1, y: 1.58} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1001 &1796729966 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2001111210} - m_Modifications: - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalPosition.x - value: -5.49 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalPosition.y - value: -10.210001 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5115368287772203103, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_Name - value: cardboard_b (1) - objectReference: {fileID: 0} - - target: {fileID: 8978363875744781964, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_SortingOrder - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 59565d4a26dde7942967ece7fcb898ca, type: 3} ---- !u!4 &1796729967 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - m_PrefabInstance: {fileID: 1796729966} - m_PrefabAsset: {fileID: 0} --- !u!1 &1821652564 GameObject: m_ObjectHideFlags: 0 @@ -6489,7 +6052,7 @@ GameObject: - component: {fileID: 1823553375} - component: {fileID: 1823553376} m_Layer: 0 - m_Name: Employment + m_Name: EmploymentTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6503,13 +6066,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823553374} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.04, y: -0.28, z: 0} + m_LocalPosition: {x: 0.04, y: -0.27999997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 460559076} - m_Father: {fileID: 251891027} - m_RootOrder: 1 + m_Father: {fileID: 382888005} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &1823553376 SortingGroup: @@ -6606,90 +6169,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1850158120 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850158121} - - component: {fileID: 1850158122} - m_Layer: 0 - m_Name: Chair_l - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1850158121 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850158120} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.03, y: 2.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 590848657} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1850158122 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850158120} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 585b6acc805d74e0f8282898c1bdb566, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 2.41, y: 1.78} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1861014217 GameObject: m_ObjectHideFlags: 0 @@ -6812,6 +6291,7 @@ MonoBehaviour: orderIndicatorView: {fileID: 2021031102} autoCookView: {fileID: 2088316432} partTimerButtonView: {fileID: 3664916832445709979} + cityBackGroundTarget: {fileID: 762548189} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -7377,96 +6857,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2001111209 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2001111210} - - component: {fileID: 2001111211} - m_Layer: 0 - m_Name: BackGround - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2001111210 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2001111209} - 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: - - {fileID: 3915769149207111995} - - {fileID: 1563198520393793683} - - {fileID: 5205869160860396639} - - {fileID: 3574189193331113837} - - {fileID: 1796729967} - - {fileID: 1328732175} - m_Father: {fileID: 2082561918} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2001111211 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2001111209} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -5 - m_Sprite: {fileID: 21300000, guid: ae97622c838fa3a49af89b19a4ef6fa2, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.662384, y: 28.08} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2013092455 GameObject: m_ObjectHideFlags: 0 @@ -7761,39 +7151,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2082561917 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2082561918} - m_Layer: 0 - m_Name: egg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2082561918 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2082561917} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -2.81, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2001111210} - - {fileID: 382888005} - m_Father: {fileID: 1120804190} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2088316430 GameObject: m_ObjectHideFlags: 0 @@ -7891,167 +7248,6 @@ Transform: m_Father: {fileID: 1201209666} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1563198520393793682 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2001111210} - m_Modifications: - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.64 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalPosition.y - value: -10.5 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5115368287772203103, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_Name - value: cardboard_b - objectReference: {fileID: 0} - - target: {fileID: 8978363875744781964, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - propertyPath: m_SortingOrder - value: 7 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 59565d4a26dde7942967ece7fcb898ca, type: 3} ---- !u!4 &1563198520393793683 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3460084070880074659, guid: 59565d4a26dde7942967ece7fcb898ca, - type: 3} - m_PrefabInstance: {fileID: 1563198520393793682} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3574189193331113836 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2001111210} - m_Modifications: - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalPosition.x - value: -5.21 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalPosition.y - value: -9.86 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4710813695754945571, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 042fbbcd78f83b74aa16da70a6859157, - type: 3} - - target: {fileID: 8543293137893879736, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - propertyPath: m_Name - value: cardboard_d - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 87436f653f19aa340b31a3bbc779e112, type: 3} ---- !u!4 &3574189193331113837 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1889733163481652204, guid: 87436f653f19aa340b31a3bbc779e112, - type: 3} - m_PrefabInstance: {fileID: 3574189193331113836} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3664916832445709976 PrefabInstance: m_ObjectHideFlags: 0 @@ -8666,168 +7862,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7402670efed5410e894680a6e865ce23, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &3915769149207111994 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2001111210} - m_Modifications: - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalPosition.x - value: 7.11 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalPosition.y - value: -9.44 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5428570721673225340, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_Name - value: cardboard_a - objectReference: {fileID: 0} - - target: {fileID: 7416233741422776622, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: db3153399c7f3b94f861680a27125a22, - type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4646d5e1d9b5c5047badae454ae7703a, type: 3} ---- !u!4 &3915769149207111995 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4005849195683878596, guid: 4646d5e1d9b5c5047badae454ae7703a, - type: 3} - m_PrefabInstance: {fileID: 3915769149207111994} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &5205869160860396638 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2001111210} - m_Modifications: - - target: {fileID: 4395700041655002428, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 95aacb3540a714e15bc506ffbd1c685e, - type: 3} - - target: {fileID: 7681701658211512410, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_Name - value: cardboard_c - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.75 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalPosition.y - value: -10.35 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9f5470ead7b654f418ae4740ffe0be03, type: 3} ---- !u!4 &5205869160860396639 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9095776036031852127, guid: 9f5470ead7b654f418ae4740ffe0be03, - type: 3} - m_PrefabInstance: {fileID: 5205869160860396638} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7698191610787656521 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 0e42b4ca..8bf8b0d3 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -23,6 +23,7 @@ public class KitchenManager : MonoBehaviour [SerializeField] private BulkOrderIndicatorView orderIndicatorView; [SerializeField] private AutoCookView autoCookView; [SerializeField] private PartTimerButtonView partTimerButtonView; + [SerializeField] private Transform cityBackGroundTarget; private readonly Subject showAdDialogSubject = new Subject(); private IDisposable timerDisposable = null; @@ -40,6 +41,12 @@ public class KitchenManager : MonoBehaviour // globalGameData.CustomizeCoinElapsed = Int32.MaxValue / 2; // PartTimerManager.Instance.UpdateList(); + var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); + var cityData = cityDataList.First(data => data.id == 2); + + cityBackGroundTarget.DestroyAllChildrens(); + Instantiate(cityData.GetMainBgPrefab(), cityBackGroundTarget); + // レシピの表示 cookingButton.OnClickAsObservable().Subscribe(_ => { @@ -54,8 +61,7 @@ public class KitchenManager : MonoBehaviour if (isPartTimer) { var partTimersData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.PartTimerDataSheet); - var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); - var cityData = cityDataList.First(data => data.id == globalGameData.CurrentCityId); + // バイト強化可能か判定 partTimerButtonView.SetBadgeActive(PartTimerManager.CheckLevelUp(globalGameData.CurrentCityId)); partTimerButtonView.OnClick.Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 19f91318..c86256e8 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -638,6 +638,11 @@ public sealed class CityData { return Resources.Load($"ShopCityBackground/{prefabName}"); } + + public Transform GetMainBgPrefab() + { + return Resources.Load($"MainCityBackground/{prefabName}"); + } } [Serializable]