diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index ceb56ead..21b6ca28 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -77,6 +77,12 @@ public class CornField : MonoBehaviour var index = i; i++; seedling.SetSeedlingGene(lineData.Seedlings[index].FirstTime, lineData.Seedlings[index].Period, lineData.Seedlings[index].Level); +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugFastGrowing", false)) + { + seedling.SetSeedlingGene(lineData.Seedlings[index].FirstTime, lineData.Seedlings[index].Period / 3, lineData.Seedlings[index].Level); + } +#endif seedling.Harvested.Subscribe(_ => { // 収穫 @@ -113,6 +119,12 @@ public class CornField : MonoBehaviour // 新しい苗 var newGene = GenerateSeedlingGene(line.FieldLevel); seedling.SetSeedlingGene(newGene.FirstTime, newGene.Period, newGene.Level); +#if DEVELOPMENT_BUILD || UNITY_EDITOR + if (UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugFastGrowing", false)) + { + seedling.SetSeedlingGene(newGene.FirstTime, newGene.Period / 3, newGene.Level); + } +#endif gameData.SeedlingDataList[seedlingDataIndex].Seedlings[index] = newGene; GameDataManager.SaveGameData(); }).AddTo(compositeDisposable); @@ -146,12 +158,6 @@ public class CornField : MonoBehaviour { var gameData = GameDataManager.GameData; // 解放済みの畑 - gameData.PlantLines = new List - { - new PlantLineData(PlantLineType.Top, CornFieldRank.Rank2), - new PlantLineData(PlantLineType.Center, CornFieldRank.Rank1), - new PlantLineData(PlantLineType.Bottom, CornFieldRank.Rank3) - }; if (gameData.PlantLines == null || gameData.PlantLines.Count == 0) { gameData.PlantLines = new List @@ -164,7 +170,7 @@ public class CornField : MonoBehaviour gameData.SeedlingDataList = new List(); } // 収穫機レベル - gameData.MachineLevel = 1; + Debug.Log($"machineLevel {gameData.MachineLevel}"); GameDataManager.SaveGameData(); } @@ -214,8 +220,7 @@ public class CornField : MonoBehaviour private SeedlingData GenerateSeedlingGene(CornFieldRank level) { - // return (DateTime.Now, Random.Range(minPeriod, maxPeriod + 1)); - return new SeedlingData(DateTime.Now.AddSeconds(-Random.Range(0, 15)), 15 + Random.Range(0, 15), level); + return new SeedlingData(DateTime.Now, Random.Range(minPeriod, maxPeriod + 1), level); } private int GetHarvestCount(CornFieldRank rank) diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption.meta b/popcorn/Assets/MyGame/Scenes/DebugOption.meta new file mode 100644 index 00000000..155de128 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/DebugOption.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74940235ef0224772b05ce990edd567d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity new file mode 100644 index 00000000..397e8bcc --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -0,0 +1,962 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &450754451 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 785180939} + m_Modifications: + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Text + value: "\u7551\u30EA\u30BB\n\u30C3\u30C8" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: FieldResetButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} +--- !u!114 &450754452 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 450754451} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &515787033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515787036} + - component: {fileID: 515787035} + - component: {fileID: 515787034} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &515787034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515787033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &515787035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515787033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &515787036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515787033} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &744739665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 744739666} + - component: {fileID: 744739668} + - component: {fileID: 744739667} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &744739666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744739665} + 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_Children: + - {fileID: 1998240840} + m_Father: {fileID: 785180938} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -144} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &744739667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744739665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &744739668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744739665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1001 &785180937 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2541661408357901930, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_Name + value: Canvas + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541661408536301873, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2541661408570683698, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 32f8e8f0ced494daeb0f218e6be9d9db, type: 3} +--- !u!224 &785180938 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2541661408357901934, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + m_PrefabInstance: {fileID: 785180937} + m_PrefabAsset: {fileID: 0} +--- !u!224 &785180939 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2541661409141469743, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + m_PrefabInstance: {fileID: 785180937} + m_PrefabAsset: {fileID: 0} +--- !u!114 &785180940 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2541661408982824310, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + m_PrefabInstance: {fileID: 785180937} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &785180941 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2541661408536301872, guid: 32f8e8f0ced494daeb0f218e6be9d9db, + type: 3} + m_PrefabInstance: {fileID: 785180937} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1711540512 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195739, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1418391247242195742, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + propertyPath: m_Name + value: MainCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8dee1e67eb6fa45268e20133acc68259, type: 3} +--- !u!1001 &1767352103 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 785180939} + m_Modifications: + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Text + value: "\u7D20\u6750\n\u88DC\u5145" + objectReference: {fileID: 0} + - target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + propertyPath: m_Name + value: RefillButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3} +--- !u!114 &1767352104 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb, + type: 3} + m_PrefabInstance: {fileID: 1767352103} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1870432532 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1870432534} + - component: {fileID: 1870432533} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1870432533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870432532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75b7d1c3a6fcf447bba7e80b6155a547, type: 3} + m_Name: + m_EditorClassIdentifier: + resetButton: {fileID: 785180941} + backButton: {fileID: 785180940} + resetFieldButton: {fileID: 450754452} + refillMaterialButton: {fileID: 1767352104} + fastGrowingToggle: {fileID: 1998240841} +--- !u!4 &1870432534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870432532} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1998240839 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 744739666} + m_Modifications: + - target: {fileID: 1907863346325523399, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Name + value: FastGrowingToggle + objectReference: {fileID: 0} + - target: {fileID: 6855072136971505580, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Text + value: "\u6210\u9577\u52A0\u901F" + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bc0b42d29ba9f4568aa0b803c18574c5, type: 3} +--- !u!224 &1998240840 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8789217124120630612, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 1998240839} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1998240841 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8246534116929882156, guid: bc0b42d29ba9f4568aa0b803c18574c5, + type: 3} + m_PrefabInstance: {fileID: 1998240839} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity.meta b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity.meta new file mode 100644 index 00000000..1b28287b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fe763d31ed9d54598b71a92ae78adefe +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts.meta b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts.meta new file mode 100644 index 00000000..2b56bb50 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd41b7263c7334ac39798d7ad7995d1b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs new file mode 100644 index 00000000..f6c7778d --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class DebugOptionManager : MonoBehaviour +{ + // シーン取得 + public static readonly string DebugPrevSceneTag = "DebugPrevScene"; + [SerializeField] private Button resetButton; + [SerializeField] private Button backButton; + [SerializeField] private Button resetFieldButton; + [SerializeField] private Button refillMaterialButton; + [SerializeField] private Toggle fastGrowingToggle; + // Start is called before the first frame update + void Start() + { + var prevScene = LocalCacheManager.Load(DebugPrevSceneTag); + resetButton.OnClickAsObservable().Subscribe(_ => + { + GameDataManager.ResetData(); + TransitionManager.Instance.LoadScene(GameScenes.DebugOption); + }).AddTo(this); + + backButton.OnClickAsObservable().Subscribe(_ => + { + GameDataManager.SaveGameData(); + TransitionManager.Instance.LoadScene(prevScene); + }); + + var gameData = GameDataManager.GameData; + resetFieldButton.OnClickAsObservable().Subscribe(_ => + { + gameData.SeedlingDataList = null; + }).AddTo(this); + + refillMaterialButton.OnClickAsObservable().Subscribe(_ => + { + // 所持素材 + foreach (var material in gameData.Material) + { + material.Amount = 10; + } + }).AddTo(this); + + // debugfielddata + // gameData.PlantLines = new List + // { + // new PlantLineData(PlantLineType.Top, CornFieldRank.Rank2), + // new PlantLineData(PlantLineType.Center, CornFieldRank.Rank1), + // new PlantLineData(PlantLineType.Bottom, CornFieldRank.Rank3) + // }; + + fastGrowingToggle.isOn = UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugFastGrowing", false); + fastGrowingToggle.OnValueChangedAsObservable().Subscribe(x => + { + UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugFastGrowing", x); + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs.meta b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs.meta new file mode 100644 index 00000000..f5d76f5b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 75b7d1c3a6fcf447bba7e80b6155a547 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 9b63711f..5c2b0b36 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 137127162501263390} - component: {fileID: 137127162501263385} - component: {fileID: 137127162501263384} + - component: {fileID: 6001645693166704829} m_Layer: 5 m_Name: Button_setting m_TagString: Untagged @@ -118,6 +119,19 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6001645693166704829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127162501263386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d98a3722b2a5d49c28715cd9366799c3, type: 3} + m_Name: + m_EditorClassIdentifier: + debugOptionButton: {fileID: 137127162501263384} --- !u!1 &137127162547959665 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 17768392..c0337b39 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -29,17 +29,7 @@ public class KitchenManager : MonoBehaviour SetData(); // 在庫表示 - var tmpTanks = new List(gameData.StorageTanks); - gameData.StorageTanks.AddRange(new List - { - new StorageTank {Capacity = 50, Stock = 0}, - new StorageTank {Capacity = 50, Stock = 5}, - new StorageTank {Capacity = 50, Stock = 25}, - new StorageTank {Capacity = 50, Stock = 40}, - new StorageTank {Capacity = 50, Stock = 50}, - }); tankListView.SetTanksView(gameData.StorageTanks); - gameData.StorageTanks = tmpTanks; Market.StockFlavorLog(); } @@ -58,23 +48,9 @@ public class KitchenManager : MonoBehaviour // 所持素材 if (gameData.Material == null || gameData.Material.Count == 0) { - gameData.Material = new List - { - new MaterialData(1, 10), - new MaterialData(2, 10), - new MaterialData(6, 10), - }; + gameData.Material = Enumerable.Range(1, 12).Select(x => new MaterialData(x, 0)).ToList(); } - - // 素材の補充 - var materialStockIndex = gameData.Material.FindIndex(x => x.Amount == 0); - if (materialStockIndex != -1) - { - var temp = gameData.Material[materialStockIndex]; - temp.Amount += 10; - gameData.Material[materialStockIndex] = temp; - } - + // 店頭ストック if (gameData.ShopStock == null) { diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab new file mode 100644 index 00000000..61c4041b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab @@ -0,0 +1,149 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6654275607504121913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 648528851945481441} + - component: {fileID: 2301097158442999248} + - component: {fileID: 856520055824150402} + m_Layer: 0 + m_Name: package_a_salt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &648528851945481441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6654275607504121913} + 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_Children: [] + m_Father: {fileID: 7689040401039027174} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2301097158442999248 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6654275607504121913} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: 7 + m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.92, y: 1.36} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &856520055824150402 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6654275607504121913} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b9e306c9dd9a867409caee4d882fd445, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7689040401039027175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7689040401039027174} + - component: {fileID: 3788453926216569065} + m_Layer: 0 + m_Name: popcorn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7689040401039027174 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7689040401039027175} + 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_Children: + - {fileID: 648528851945481441} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3788453926216569065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7689040401039027175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: + popcornRenderer: {fileID: 2301097158442999248} + caramelSprite: {fileID: 21300000, guid: 469b78432f101024aa1a2060a57231d8, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab.meta new file mode 100644 index 00000000..0c1732d3 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/popcorn.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ecdd4b8fb7ad486fba3b4949386d6c9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 7f84349a..fd7f605b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -10,6 +10,8 @@ public class Market : MonoBehaviour public static readonly int ShopStockCount = 21; [SerializeField] private ShopStockView stockView; + + [SerializeField] private MarketCartView cartView; // Start is called before the first frame update void Start() { @@ -22,6 +24,8 @@ public class Market : MonoBehaviour var allRecipe = RecipeData.GetAllRecipe(); StockFlavorLog(); + + cartView.SetStock(GameDataManager.GameData.ShopStock); // お客さんの出現タイミング(10秒間に１回) Observable.Timer(TimeSpan.FromSeconds(2f), TimeSpan.FromSeconds(10f)) @@ -41,9 +45,11 @@ public class Market : MonoBehaviour // 売上反映 GameDataManager.GameData.coin = CoinManager.Instance.OwnCoin; GameDataManager.SaveGameData(); + cartView.SellStock(); // 自動補充 refill RefillProduct(); - stockView.SetStock(gameData.StorageTanks); + stockView.SetStock(GameDataManager.GameData.StorageTanks); + cartView.SetStock(GameDataManager.GameData.ShopStock); StockFlavorLog(); }).AddTo(this); } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs new file mode 100644 index 00000000..d60c316b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +public class MarketCartView : MonoBehaviour +{ + [SerializeField] private List popcornPositions; + + private void ResetDisplay() + { + foreach (var popcorn in popcornPositions) + { + popcorn.gameObject.SetActive(false); + } + } + + public void SetStock(List shopStock) + { + ResetDisplay(); + // 陳列 + var i = 0; + foreach (var flavor in shopStock) + { + var popcorn = popcornPositions[i]; + popcorn.ChangeSkin(flavor); + this.CallWaitForSeconds(.05f * i, () => + { + popcorn.gameObject.SetActive(true); + }); + i++; + } + } + + public void SellStock() + { + popcornPositions[0].gameObject.SetActive(false); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs.meta new file mode 100644 index 00000000..1aa7673d --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketCartView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 81d6313dccd940ccaaeaeb71fffca557 +timeCreated: 1629346514 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs new file mode 100644 index 00000000..680da764 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +public class MarketPopcornView : MonoBehaviour +{ + [SerializeField] private SpriteRenderer popcornRenderer; + [SerializeField] private Sprite caramelSprite; + + public void ChangeSkin(int flavor) + { + if (flavor == 2) + { + popcornRenderer.sprite = caramelSprite; + } + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs.meta new file mode 100644 index 00000000..8991f495 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketPopcornView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: db6c3e3cc4bd48f480264f676924cb14 +timeCreated: 1629350571 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index d0b42b1a..8edddf4d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -283,6 +283,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!1 &58426210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 58426211} + m_Layer: 0 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &58426211 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 58426210} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.32, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1492176970} + - {fileID: 2064880679} + - {fileID: 969975203} + - {fileID: 1044373332} + - {fileID: 1023351034} + - {fileID: 699350949} + m_Father: {fileID: 2104509456} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &61343775 GameObject: m_ObjectHideFlags: 0 @@ -395,107 +431,12 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &82988134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 82988135} - - component: {fileID: 82988137} - - component: {fileID: 82988136} - m_Layer: 0 - m_Name: package_a_salt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &82988135 +--- !u!4 &82988135 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 7689040400970721153} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82988134} - 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_Children: [] - m_Father: {fileID: 2048621275} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &82988136 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82988134} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b9e306c9dd9a867409caee4d882fd445, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &82988137 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 82988134} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 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: 7 - m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.92, y: 1.36} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &151001427 GameObject: m_ObjectHideFlags: 0 @@ -692,6 +633,43 @@ Transform: m_Father: {fileID: 1102296790} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &183110189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183110190} + m_Layer: 0 + m_Name: Front + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &183110190 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183110189} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.3400001, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 82988135} + - {fileID: 1075915153} + - {fileID: 223592693} + - {fileID: 1556091577} + - {fileID: 1615446478} + - {fileID: 1444432615} + - {fileID: 1640594306} + m_Father: {fileID: 2104509456} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &203299120 GameObject: m_ObjectHideFlags: 0 @@ -727,6 +705,180 @@ Transform: m_Father: {fileID: 1258987825} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &204377775 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &204377776 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 204377775} + m_PrefabAsset: {fileID: 0} +--- !u!114 &204377777 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 204377775} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &208416664 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.96000004 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &208416665 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 208416664} + m_PrefabAsset: {fileID: 0} +--- !u!114 &208416666 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 208416664} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &220821819 GameObject: m_ObjectHideFlags: 0 @@ -808,6 +960,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &223592692 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.96 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &223592693 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 223592692} + m_PrefabAsset: {fileID: 0} +--- !u!114 &223592694 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 223592692} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &240851456 GameObject: m_ObjectHideFlags: 0 @@ -923,6 +1162,93 @@ Transform: m_Father: {fileID: 760797061} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &291408121 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &291408122 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 291408121} + m_PrefabAsset: {fileID: 0} +--- !u!114 &291408123 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 291408121} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &363149699 GameObject: m_ObjectHideFlags: 0 @@ -1428,6 +1754,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &699350948 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 58426211} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.45 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &699350949 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 699350948} + m_PrefabAsset: {fileID: 0} +--- !u!114 &699350950 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 699350948} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &699827848 GameObject: m_ObjectHideFlags: 0 @@ -2257,6 +2670,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &969975202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 58426211} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.45 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &969975203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 969975202} + m_PrefabAsset: {fileID: 0} +--- !u!114 &969975204 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 969975202} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &995339916 GameObject: m_ObjectHideFlags: 0 @@ -2338,6 +2838,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1023351033 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 58426211} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.43 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1023351034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1023351033} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1023351035 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1023351033} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1025201113 GameObject: m_ObjectHideFlags: 0 @@ -2402,6 +2989,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stockView: {fileID: 438315601} + cartView: {fileID: 2048621276} --- !u!1 &1035509476 GameObject: m_ObjectHideFlags: 0 @@ -2483,6 +3071,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1044373331 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 58426211} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.45 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1044373332 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1044373331} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1044373333 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1044373331} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1066327839 GameObject: m_ObjectHideFlags: 0 @@ -2557,6 +3232,93 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1066327839} m_CullTransparentMesh: 0 +--- !u!1001 &1075915152 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.96 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1075915153 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1075915152} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1075915154 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1075915152} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1102296789 GameObject: m_ObjectHideFlags: 0 @@ -3275,6 +4037,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1444432614 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1444432615 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1444432614} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1444432616 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1444432614} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1472008186 GameObject: m_ObjectHideFlags: 0 @@ -3430,6 +4279,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1492176969 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 58426211} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.48999995 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1492176970 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1492176969} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1492176971 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1492176969} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1506158579 GameObject: m_ObjectHideFlags: 0 @@ -3462,6 +4398,180 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1515102455 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1515102456 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1515102455} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1515102457 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1515102455} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1556091576 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1556091577 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1556091576} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1556091578 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1556091576} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1563148346 GameObject: m_ObjectHideFlags: 0 @@ -3656,6 +4766,180 @@ Transform: m_Father: {fileID: 203299121} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1615446477 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1615446478 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1615446477} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1615446479 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1615446477} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1640594305 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1640594306 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1640594305} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1640594307 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1640594305} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1671950923 GameObject: m_ObjectHideFlags: 0 @@ -3895,6 +5179,93 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &1775193988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.96000004 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1775193989 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1775193988} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1775193990 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1775193988} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1791987849 GameObject: m_ObjectHideFlags: 0 @@ -4138,6 +5509,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1857525120 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &1857525121 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1857525120} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1857525122 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 1857525120} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1866673242 GameObject: m_ObjectHideFlags: 0 @@ -4510,6 +5968,93 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 714437464} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2011193247 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2050100490} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.94 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &2011193248 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 2011193247} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2011193249 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 2011193247} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2016817760 GameObject: m_ObjectHideFlags: 0 @@ -4659,6 +6204,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2048621275} + - component: {fileID: 2048621276} m_Layer: 0 m_Name: MarketingCart m_TagString: Untagged @@ -4680,10 +6226,80 @@ Transform: - {fileID: 1482901211} - {fileID: 1871854428} - {fileID: 220821820} - - {fileID: 82988135} + - {fileID: 2104509456} m_Father: {fileID: 2031857954} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2048621276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2048621274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81d6313dccd940ccaaeaeb71fffca557, type: 3} + m_Name: + m_EditorClassIdentifier: + popcornPositions: + - {fileID: 7689040400970721154} + - {fileID: 1075915154} + - {fileID: 223592694} + - {fileID: 1556091578} + - {fileID: 1615446479} + - {fileID: 1444432616} + - {fileID: 1640594307} + - {fileID: 1492176971} + - {fileID: 2064880680} + - {fileID: 969975204} + - {fileID: 1044373333} + - {fileID: 1023351035} + - {fileID: 699350950} + - {fileID: 291408123} + - {fileID: 208416666} + - {fileID: 1775193990} + - {fileID: 2011193249} + - {fileID: 1515102457} + - {fileID: 204377777} + - {fileID: 1857525122} +--- !u!1 &2050100489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2050100490} + m_Layer: 0 + m_Name: Rear + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2050100490 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050100489} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.88, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 291408122} + - {fileID: 208416665} + - {fileID: 1775193989} + - {fileID: 2011193248} + - {fileID: 1515102456} + - {fileID: 204377776} + - {fileID: 1857525121} + m_Father: {fileID: 2104509456} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2057951083 GameObject: m_ObjectHideFlags: 0 @@ -4839,6 +6455,93 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &2064880678 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 58426211} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.4700001 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!4 &2064880679 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 2064880678} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2064880680 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 2064880678} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2066991624 GameObject: m_ObjectHideFlags: 0 @@ -9795,6 +11498,39 @@ Transform: m_Father: {fileID: 1178501604} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2104509455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2104509456} + m_Layer: 0 + m_Name: PopcornPosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2104509456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2104509455} + 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_Children: + - {fileID: 183110190} + - {fileID: 58426211} + - {fileID: 2050100490} + m_Father: {fileID: 2048621275} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4886416728593125320 PrefabInstance: m_ObjectHideFlags: 0 @@ -9959,6 +11695,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5221623863607992028} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7689040400970721153 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 183110190} + m_Modifications: + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7689040401039027175, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + propertyPath: m_Name + value: popcorn + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, type: 3} +--- !u!114 &7689040400970721154 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3788453926216569065, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9, + type: 3} + m_PrefabInstance: {fileID: 7689040400970721153} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7893376663159737481 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/DebugOptionButton.cs b/popcorn/Assets/MyGame/Scripts/DebugOptionButton.cs new file mode 100644 index 00000000..db03782f --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/DebugOptionButton.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UniRx; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class DebugOptionButton : MonoBehaviour +{ + [SerializeField] private Button debugOptionButton; + // Start is called before the first frame update + void Start() + { + debugOptionButton.OnClickAsObservable().Subscribe(_ => + { + var currentScene = (GameScenes)Enum.Parse(typeof(GameScenes), SceneManager.GetActiveScene().name, false); + LocalCacheManager.Save(DebugOptionManager.DebugPrevSceneTag, currentScene); + TransitionManager.Instance.LoadScene(GameScenes.DebugOption); + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scripts/DebugOptionButton.cs.meta b/popcorn/Assets/MyGame/Scripts/DebugOptionButton.cs.meta new file mode 100644 index 00000000..2094937f --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/DebugOptionButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d98a3722b2a5d49c28715cd9366799c3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset index d085904e..dc7161d7 100644 --- a/popcorn/ProjectSettings/EditorBuildSettings.asset +++ b/popcorn/ProjectSettings/EditorBuildSettings.asset @@ -9,7 +9,7 @@ EditorBuildSettings: path: Assets/MyGame/Scenes/Main/Main.unity guid: 7f040d1b248234841802683edae3c4fa - enabled: 1 - path: Assets/MyGame/Scenes/recipe/Recipe.unity + path: Assets/MyGame/Scenes/recipe/recipe.unity guid: e3d17c6b649257641bd3b50559692087 - enabled: 1 path: Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -32,4 +32,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/MyGame/Scenes/shopping/Purchase.unity guid: 6cdf801ecd42cd543a2b68afba311048 + - enabled: 1 + path: Assets/MyGame/Scenes/DebugOption/DebugOption.unity + guid: fe763d31ed9d54598b71a92ae78adefe m_configObjects: {}