コーン株/粒を特定Object配下に生成するように変更

This commit is contained in:
kimura 2021-10-07 10:39:27 +09:00
parent d2ddd4f583
commit cab38db16d
3 changed files with 51 additions and 5 deletions

View File

@ -314,7 +314,7 @@ Transform:
- {fileID: 279224990} - {fileID: 279224990}
- {fileID: 1958951428} - {fileID: 1958951428}
m_Father: {fileID: 1501215306} m_Father: {fileID: 1501215306}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &213307014 --- !u!1 &213307014
GameObject: GameObject:
@ -503,7 +503,7 @@ Transform:
- {fileID: 1793483901} - {fileID: 1793483901}
- {fileID: 998360038} - {fileID: 998360038}
m_Father: {fileID: 1501215306} m_Father: {fileID: 1501215306}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &282523124 --- !u!114 &282523124
MonoBehaviour: MonoBehaviour:
@ -1696,6 +1696,7 @@ MonoBehaviour:
type: 3} type: 3}
harvestPrefab: {fileID: 8524901521850801684, guid: e642499b3643dab4ba05b02e8c6bde1c, harvestPrefab: {fileID: 8524901521850801684, guid: e642499b3643dab4ba05b02e8c6bde1c,
type: 3} type: 3}
harvestSpawnTarget: {fileID: 1998181883}
harvestInsertPosition: {fileID: 895001959} harvestInsertPosition: {fileID: 895001959}
cornHarvester: {fileID: 282523124} cornHarvester: {fileID: 282523124}
counterView: {fileID: 1507187603938887411} counterView: {fileID: 1507187603938887411}
@ -2923,6 +2924,7 @@ Transform:
- {fileID: 1194872049} - {fileID: 1194872049}
- {fileID: 1989990598} - {fileID: 1989990598}
- {fileID: 895001959} - {fileID: 895001959}
- {fileID: 1998181883}
- {fileID: 282523123} - {fileID: 282523123}
- {fileID: 149181931} - {fileID: 149181931}
m_Father: {fileID: 0} m_Father: {fileID: 0}
@ -13284,6 +13286,48 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &1998181882
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1998181883}
- component: {fileID: 1998181884}
m_Layer: 0
m_Name: harvestSpawnTarget
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1998181883
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1998181882}
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: 1501215306}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &1998181884
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1998181882}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 30
--- !u!1 &2050892191 --- !u!1 &2050892191
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14246,7 +14290,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6bf6e7fee6cf41a6bad181319bb8b8ed, type: 3} m_Script: {fileID: 11500000, guid: 6bf6e7fee6cf41a6bad181319bb8b8ed, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
animator: {fileID: 7854448233124094805} animatorPrefab: {fileID: 0}
pinkTransform: {fileID: 7854448233124094804} pinkTransform: {fileID: 7854448233124094804}
walkSideBottomPos: -8 walkSideBottomPos: -8
pinkWalkSpeed: 4 pinkWalkSpeed: 4

View File

@ -23,6 +23,7 @@ public class CornField : MonoBehaviour
[SerializeField] private Button upgradeButton; [SerializeField] private Button upgradeButton;
[SerializeField] private GameObject harvestEffectPrefab; [SerializeField] private GameObject harvestEffectPrefab;
[SerializeField] private GameObject harvestPrefab; [SerializeField] private GameObject harvestPrefab;
[SerializeField] private Transform harvestSpawnTarget;
[SerializeField] private Transform harvestInsertPosition; [SerializeField] private Transform harvestInsertPosition;
[SerializeField] private CornHarvester cornHarvester; [SerializeField] private CornHarvester cornHarvester;
[SerializeField] private HarvestedCounterView counterView; [SerializeField] private HarvestedCounterView counterView;
@ -182,7 +183,7 @@ public class CornField : MonoBehaviour
} }
this.CallWaitForFrame(harvestedFrameInterval * j, () => this.CallWaitForFrame(harvestedFrameInterval * j, () =>
{ {
var harvestAnimation = Instantiate(harvestPrefab, pos, Quaternion.identity, seedlingTransform); var harvestAnimation = Instantiate(harvestPrefab, pos, Quaternion.identity, harvestSpawnTarget);
this.CallWaitForSeconds(.5f, () => this.CallWaitForSeconds(.5f, () =>
{ {
this.CallLerp(.4f, f => this.CallLerp(.4f, f =>

View File

@ -13,6 +13,7 @@ public class CornHarvester : MonoBehaviour
private static readonly int PutOut = Animator.StringToHash("PutOut"); private static readonly int PutOut = Animator.StringToHash("PutOut");
[SerializeField] private Transform harvestedSpawnTransform; [SerializeField] private Transform harvestedSpawnTransform;
[SerializeField] private GameObject harvestedPrefab; [SerializeField] private GameObject harvestedPrefab;
[SerializeField] private GameObject harvestedSpawnTarget;
[SerializeField] private float thrust = 100f; [SerializeField] private float thrust = 100f;
[SerializeField] private Transform machineTarget; [SerializeField] private Transform machineTarget;
private Animator machineAnimator; private Animator machineAnimator;
@ -57,7 +58,7 @@ public class CornHarvester : MonoBehaviour
var finishedList = new List<Collider2D>(); var finishedList = new List<Collider2D>();
for (int i = 0; i < cnt; i++) for (int i = 0; i < cnt; i++)
{ {
var corn = Instantiate(harvestedPrefab, harvestedSpawnTransform.position, Quaternion.identity); var corn = Instantiate(harvestedPrefab, harvestedSpawnTransform.position, Quaternion.identity, harvestedSpawnTransform);
corn.GetComponent<Rigidbody2D>().AddForce(new Vector2(Random.Range(-0.3f, 0.3f), -1).normalized * thrust, ForceMode2D.Impulse); corn.GetComponent<Rigidbody2D>().AddForce(new Vector2(Random.Range(-0.3f, 0.3f), -1).normalized * thrust, ForceMode2D.Impulse);
finishedList.Add(corn.GetComponent<Collider2D>()); finishedList.Add(corn.GetComponent<Collider2D>());
yield return null; yield return null;