diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 8bf02772c..bc2876812 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -858,11 +858,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -968,11 +968,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -1379,11 +1379,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -2300,11 +2300,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -2667,11 +2667,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -160 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -3859,11 +3859,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4132,11 +4132,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4317,11 +4317,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -160 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -4771,11 +4771,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -4892,11 +4892,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -5436,11 +5436,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -6252,11 +6252,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -6401,11 +6401,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -290 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -6503,11 +6503,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -7636,11 +7636,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -7798,11 +7798,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -7973,10 +7973,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1701236784} + - {fileID: 437358691} - {fileID: 1496452082} - {fileID: 1987164072} - {fileID: 102499728} - - {fileID: 437358691} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -10838,11 +10838,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -11396,11 +11396,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -95 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -12966,11 +12966,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 37.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -13890,11 +13890,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -52.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -15181,11 +15181,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -290 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} propertyPath: m_LocalPosition.z @@ -16194,11 +16194,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -142.5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5685570007726524012, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} propertyPath: m_LocalPosition.z @@ -19300,14 +19300,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 582435561938650247, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2548904580019888559, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2700294535905665279, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -19348,10 +19340,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7952377105833992481, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - propertyPath: m_AdditionalShaderChannelsFlag - value: 25 - objectReference: {fileID: 0} - target: {fileID: 9041926907780427371, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_Name value: TycoonMap diff --git a/Assets/04.Materials/TransparentReceiveShadow.mat b/Assets/04.Materials/TransparentReceiveShadow.mat index 6c8fa1623..985b7df60 100644 --- a/Assets/04.Materials/TransparentReceiveShadow.mat +++ b/Assets/04.Materials/TransparentReceiveShadow.mat @@ -39,7 +39,6 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly - - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index 0233018a4..3377bb05c 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -2024,8 +2024,6 @@ Transform: - {fileID: 8902303721943049359} - {fileID: 4068649883988211428} - {fileID: 7582037073008409459} - - {fileID: 3420309976120284445} - - {fileID: 2735561464644860791} - {fileID: 3458041048788596166} m_Father: {fileID: 4449232531499695111} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3053,7 +3051,6 @@ Transform: - {fileID: 2846576861165937971} - {fileID: 607897003010389427} - {fileID: 1147213678061483695} - - {fileID: 4148739593993087795} - {fileID: 5816752459512434123} - {fileID: 3685666716780329301} - {fileID: 2653731595491371991} @@ -3483,7 +3480,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.x - value: -2.5 + value: -6.026 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.y @@ -3491,7 +3488,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.z - value: 4.15 + value: -0.441 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalRotation.w @@ -3615,7 +3612,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} propertyPath: m_LocalPosition.x - value: -7.19 + value: 3.36 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} propertyPath: m_LocalPosition.y @@ -3623,7 +3620,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} propertyPath: m_LocalPosition.z - value: 7.21 + value: 11.7 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} propertyPath: m_LocalRotation.w @@ -5815,7 +5812,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.x - value: -4.04 + value: -1.309 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.y @@ -5823,7 +5820,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalPosition.z - value: 5.38 + value: 5.565 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} propertyPath: m_LocalRotation.w @@ -6115,68 +6112,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} m_PrefabInstance: {fileID: 3578289723384366598} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3651960090585577425 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1402113424960589398} - m_Modifications: - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalPosition.x - value: -3.9 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalPosition.z - value: 7.32 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - propertyPath: m_Name - value: FireWood (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} ---- !u!4 &4148739593993087795 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} - m_PrefabInstance: {fileID: 3651960090585577425} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3765576498426945686 PrefabInstance: m_ObjectHideFlags: 0 @@ -6791,80 +6726,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 4633496899233647850} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4762720603204338952 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7906693004392999617} - m_Modifications: - - target: {fileID: 4397089680262887274, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_Name - value: TrashCan - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalPosition.x - value: -6.1 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalPosition.z - value: -0.49 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} ---- !u!4 &2735561464644860791 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7488993113894731391, guid: 0fe1ac92efe26c74ebef48f467379c45, type: 3} - m_PrefabInstance: {fileID: 4762720603204338952} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4977829239787037314 PrefabInstance: m_ObjectHideFlags: 0 @@ -7797,80 +7658,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} m_PrefabInstance: {fileID: 6263828908763440281} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6377950779973675032 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7906693004392999617} - m_Modifications: - - target: {fileID: 3251546115841864720, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_Name - value: FirewoodSet - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalScale.x - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalScale.y - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalScale.z - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalPosition.x - value: 3.56 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalPosition.z - value: 11.93 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 094600785d7e8154ebd515528e341ebb, type: 3} ---- !u!4 &3420309976120284445 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8643649843004079365, guid: 094600785d7e8154ebd515528e341ebb, type: 3} - m_PrefabInstance: {fileID: 6377950779973675032} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6442612953090237881 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/FirewoodSet.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/FirewoodSet.prefab deleted file mode 100644 index 2aa8b72f2..000000000 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/FirewoodSet.prefab +++ /dev/null @@ -1,75 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &1810536512625289201 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 4fd4ec246d4e26642bf91830e74f9ef6, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Name - value: BaseTycoonProp Variant - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 4fd4ec246d4e26642bf91830e74f9ef6, type: 3} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/FirewoodSet.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/FirewoodSet.prefab.meta deleted file mode 100644 index 5fa6cc551..000000000 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/FirewoodSet.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 094600785d7e8154ebd515528e341ebb -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/TrashCan.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/TrashCan.prefab deleted file mode 100644 index ae46ba8f6..000000000 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/TrashCan.prefab +++ /dev/null @@ -1,75 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &664852067909854347 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 2a0226b856048c840aa1e8166b651277, type: 3} - - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Name - value: TrashCan - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 2a0226b856048c840aa1e8166b651277, type: 3} - - target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3} diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/TrashCan.prefab.meta b/Assets/05.Prefabs/Props/Environment/Tycoon/TrashCan.prefab.meta deleted file mode 100644 index 5b781650d..000000000 --- a/Assets/05.Prefabs/Props/Environment/Tycoon/TrashCan.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0fe1ac92efe26c74ebef48f467379c45 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab index 0a7cd13e9..fd1ac51d0 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab @@ -18,15 +18,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 0.5 + value: 0.18181819 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 0.5 + value: 0.18181819 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 0.5 + value: 0.18181819 objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_AnchoredPosition.y @@ -35,7 +35,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 318d98fbc21718d459483945b60b9baf, type: 3} + objectReference: {fileID: 21300000, guid: 4fd4ec246d4e26642bf91830e74f9ef6, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -46,15 +46,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 5.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 5.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 5.5 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.x @@ -99,7 +99,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 318d98fbc21718d459483945b60b9baf, type: 3} + objectReference: {fileID: 21300000, guid: 4fd4ec246d4e26642bf91830e74f9ef6, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -112,6 +112,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1902174628981360791} m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!1 &5897095096647521783 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} @@ -129,8 +134,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 52765c2911ce12f4c8802a4c848251e7, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 809828747251277026} + k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 8975593228546502023} k__BackingField: {fileID: 8793236136028073839} k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} @@ -138,6 +143,11 @@ MonoBehaviour: k__BackingField: 2 _isOpened: 0 _itemIdx: 70001 +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} --- !u!224 &8793236136028073839 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index e8344156d..f5b11d7a7 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -35,7 +35,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c3d243126f4fb9a4fb4355556d1a0baa, type: 3} + objectReference: {fileID: 21300000, guid: 2a0226b856048c840aa1e8166b651277, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -99,7 +99,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c3d243126f4fb9a4fb4355556d1a0baa, type: 3} + objectReference: {fileID: 21300000, guid: 2a0226b856048c840aa1e8166b651277, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 diff --git a/Assets/BlueWater.asset b/Assets/BlueWater.asset index d5ab5b6e2..5390bfd5a 100644 --- a/Assets/BlueWater.asset +++ b/Assets/BlueWater.asset @@ -246,7 +246,7 @@ MonoBehaviour: canvasRect: serializedVersion: 2 x: 289 - y: 50 + y: 49 width: 160 height: 30 - id: 1