diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index f0531fc7..45fc6275 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -121,6 +121,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &30352566 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3152473785108484531, guid: cf466618b278e6c4a85a7b27e6f46c18, + type: 3} + m_PrefabInstance: {fileID: 782907098} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b5e732e57e34b97a8adc725ce004566, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &132784687 stripped Transform: m_CorrespondingSourceObject: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, @@ -154,9 +166,9 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1214401743} - {fileID: 1035142904} - {fileID: 1466604291} - - {fileID: 1214401743} m_Father: {fileID: 1501215306} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -200,34 +212,22 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMax.y + - target: {fileID: 320398123, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMin.x + - target: {fileID: 1823819594, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1823819596, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_Maskable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2041305253, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.x - value: -920 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_SizeDelta.y - value: -2108 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.x - value: 373 - objectReference: {fileID: 0} - - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} - propertyPath: m_AnchoredPosition.y - value: -203 - objectReference: {fileID: 0} - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -403,6 +403,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!1 &536970157 @@ -554,6 +559,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &715847674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 715847676} + - component: {fileID: 715847675} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &715847675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715847674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dadd48ac419c440959ddb48337e48d9f, type: 3} + m_Name: + m_EditorClassIdentifier: + promoteGrowthButton: {fileID: 730756546} + plantLines: [] + centerPlants: + - {fileID: 1059216306} + - {fileID: 1104744249} + - {fileID: 30352566} +--- !u!4 &715847676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715847674} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.18736771, y: -4.7016997, z: -19.129517} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &730756546 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7809777061605929427, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &782907098 PrefabInstance: m_ObjectHideFlags: 0 @@ -566,6 +632,11 @@ PrefabInstance: propertyPath: m_Name value: Seedling (2) objectReference: {fileID: 0} + - target: {fileID: 875275074515791082, guid: cf466618b278e6c4a85a7b27e6f46c18, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} propertyPath: m_RootOrder @@ -579,7 +650,7 @@ PrefabInstance: - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} propertyPath: m_LocalPosition.y - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} @@ -653,7 +724,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 960603096} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.39, y: 0, z: 0} + m_LocalPosition: {x: 0.39, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 132784687} @@ -749,6 +820,30 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2783350420184387839} m_PrefabAsset: {fileID: 0} +--- !u!114 &1059216306 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3152473785108484531, guid: cf466618b278e6c4a85a7b27e6f46c18, + type: 3} + m_PrefabInstance: {fileID: 875275074606616260} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b5e732e57e34b97a8adc725ce004566, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1104744249 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3152473785108484531, guid: cf466618b278e6c4a85a7b27e6f46c18, + type: 3} + m_PrefabInstance: {fileID: 1759900418} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b5e732e57e34b97a8adc725ce004566, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1214401742 PrefabInstance: m_ObjectHideFlags: 0 @@ -769,7 +864,7 @@ PrefabInstance: - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -824,7 +919,12 @@ PrefabInstance: - target: {fileID: 2783350420397184520, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_Name - value: set (2) + value: Top + objectReference: {fileID: 0} + - target: {fileID: 2783350420397184520, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 8144837015556047765, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -945,7 +1045,7 @@ PrefabInstance: - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -1000,7 +1100,12 @@ PrefabInstance: - target: {fileID: 2783350420397184520, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_Name - value: set (1) + value: Bottom + objectReference: {fileID: 0} + - target: {fileID: 2783350420397184520, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 8144837015556047765, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -1068,6 +1173,11 @@ PrefabInstance: propertyPath: m_Name value: Seedling (1) objectReference: {fileID: 0} + - target: {fileID: 875275074515791082, guid: cf466618b278e6c4a85a7b27e6f46c18, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} propertyPath: m_RootOrder @@ -1081,7 +1191,7 @@ PrefabInstance: - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} propertyPath: m_LocalPosition.y - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} @@ -1393,7 +1503,7 @@ PrefabInstance: - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} propertyPath: m_LocalPosition.y - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 875275074515791083, guid: cf466618b278e6c4a85a7b27e6f46c18, type: 3} @@ -1459,10 +1569,15 @@ PrefabInstance: propertyPath: m_SortingOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 2783350420155647087, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -1517,7 +1632,12 @@ PrefabInstance: - target: {fileID: 2783350420397184520, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_Name - value: set + value: Center + objectReference: {fileID: 0} + - target: {fileID: 2783350420397184520, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 8144837015556047765, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -1538,6 +1658,11 @@ PrefabInstance: propertyPath: m_Name value: corn_harvest objectReference: {fileID: 0} + - target: {fileID: 8524901521850801684, guid: e642499b3643dab4ba05b02e8c6bde1c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8524901521850801685, guid: e642499b3643dab4ba05b02e8c6bde1c, type: 3} propertyPath: m_RootOrder @@ -1593,5 +1718,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8524901522036686285, guid: e642499b3643dab4ba05b02e8c6bde1c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e642499b3643dab4ba05b02e8c6bde1c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs new file mode 100644 index 00000000..e2a15194 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UniRx; +using UniRx.Triggers; +using UnityEngine; +using UnityEngine.UI; +using Random = UnityEngine.Random; + +public class CornField : MonoBehaviour +{ + [SerializeField] private Button promoteGrowthButton; + [SerializeField] private List plantLines = new List(); + [SerializeField] private List centerPlants = new List(); + private readonly List plants = new List(); + private static readonly float maxPeriod = 60f; + private static readonly float minPeriod = 45f; + // Start is called before the first frame update + void Start() + { + this.UpdateAsObservable() + .Where(_ => Input.GetKeyDown(KeyCode.R)) + .Take(1) + .Subscribe(_ => TransitionManager.Instance.LoadScene(GameScenes.CornField)).AddTo(this); + var settings = new DateTime[3] + { + DateTime.Now, + DateTime.Now, + DateTime.Now, + }; + // settings = new DateTime[3] + // { + // DateTime.Now.AddSeconds(-Random.Range(0, 15)), + // DateTime.Now.AddSeconds(-Random.Range(0, 15)), + // DateTime.Now.AddSeconds(-Random.Range(0, 15)), + // }; + + + plants.Clear(); + plants.AddRange(centerPlants); + + for (int i = 0; i < plants.Count; i++) + { + var period = 30 + Random.Range(0, 15); + plants[i].SetSeedlingGene(settings[i], period, SeedlingRank.Rank1); + } + + promoteGrowthButton.OnClickAsObservable().Subscribe(_ => + { + for (int i = 0; i < plants.Count; i++) + { + if (Random.Range(0, 2) == 0){ + settings[i] = settings[i].AddSeconds(-1); + plants[i].PromoteGrowth(settings[i]); + }; + } + }); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs.meta b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs.meta new file mode 100644 index 00000000..d1972e13 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dadd48ac419c440959ddb48337e48d9f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: