diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 39180eb7..24a3ec63 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -610,6 +610,38 @@ Transform: m_Father: {fileID: 1501215306} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &169101453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 169101454} + m_Layer: 0 + m_Name: HouseTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &169101454 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169101453} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6553501872873945362} + m_Father: {fileID: 1989990598} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &189803525 GameObject: m_ObjectHideFlags: 0 @@ -2879,7 +2911,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 645963151} - - component: {fileID: 645963153} - component: {fileID: 645963152} m_Layer: 0 m_Name: background_fever @@ -2917,59 +2948,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -5 ---- !u!212 &645963153 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645963150} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: 6665bcb5988d9aa488b54cfb534809d7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 17.66, y: 22.08039} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_SortingOrder: -7 --- !u!1 &665770084 GameObject: m_ObjectHideFlags: 0 @@ -3190,6 +3169,7 @@ MonoBehaviour: counterView: {fileID: 1507187603938887411} additionView: {fileID: 347092272} animationTarget: {fileID: 1881129199} + cityBackGroundTarget: {fileID: 169101454} plantLines: - {fileID: 1656378502} - {fileID: 1192216301} @@ -5350,6 +5330,7 @@ GameObject: m_Component: - component: {fileID: 1381520041} - component: {fileID: 1381520042} + - component: {fileID: 1381520043} m_Layer: 0 m_Name: Cloud m_TagString: Untagged @@ -5397,6 +5378,17 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!210 &1381520043 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381520040} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -8 --- !u!1 &1406886287 GameObject: m_ObjectHideFlags: 0 @@ -17012,7 +17004,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1989990598} - - component: {fileID: 1989990600} m_Layer: 0 m_Name: background m_TagString: Untagged @@ -17034,23 +17025,12 @@ Transform: m_Children: - {fileID: 1164585268} - {fileID: 1381520041} - - {fileID: 6553501872873945362} + - {fileID: 169101454} - {fileID: 1091047776} - {fileID: 120504944} m_Father: {fileID: 1501215306} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!210 &1989990600 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989990597} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -10 --- !u!1 &1993403389 GameObject: m_ObjectHideFlags: 0 @@ -18275,7 +18255,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1989990598} + m_TransformParent: {fileID: 169101454} m_Modifications: - target: {fileID: 475787842800321855, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} @@ -18290,7 +18270,7 @@ PrefabInstance: - target: {fileID: 3177023301897836689, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3177023301897836689, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} @@ -18342,6 +18322,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6553501873066179743, guid: ef7bca0ec048ab64b86804eb007385c4, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} --- !u!4 &6553501872873945362 stripped diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index c558e87f..2dbaf41c 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -38,6 +38,7 @@ public class CornField : MonoBehaviour [SerializeField] private HarvestedCounterView counterView; [SerializeField] private HarvestedAdditionView additionView; [SerializeField] private Transform animationTarget; + [SerializeField] private Transform cityBackGroundTarget; [Space] [SerializeField] private List plantLines = new List(); [Space] @@ -70,6 +71,12 @@ public class CornField : MonoBehaviour // データ var globalGameData = GameDataManager.GameData; var cityGameData = GameDataManager.GetCurrentCityGameData(); + + // 背景 + var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); + var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId); + cityBackGroundTarget.DestroyAllChildrens(); + Instantiate(cityData.GetCornFieldBgPrefab(), cityBackGroundTarget); if (!globalGameData.FinishedFlags.HasFlag(TutorialFlag.CornField)) { diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index c86256e8..d7ede451 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -643,6 +643,11 @@ public sealed class CityData { return Resources.Load($"MainCityBackground/{prefabName}"); } + + public Transform GetCornFieldBgPrefab() + { + return Resources.Load($"CornFieldCityBackground/{prefabName}"); + } } [Serializable]