From 5a77fc1be40cbaa2b9bf7fe925b068c863bcf952 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 24 Jun 2021 16:44:03 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=82=B3=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=80=E3=83=BC=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E4=BB=98=E3=81=91=E6=9B=BF=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Corn.cs | 7 +- popcorn/Assets/MyGame/Scenes/Main/corn.prefab | 116 +++++++++--------- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Corn.cs b/popcorn/Assets/MyGame/Scenes/Main/Corn.cs index d5fbccbe..dda9a57c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Corn.cs @@ -7,6 +7,7 @@ using Random = UnityEngine.Random; [RequireComponent(typeof(Rigidbody2D))] public class Corn : MonoBehaviour { + [SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private Sprite cornSeedSprite; [SerializeField] private Sprite cornSimpleSprite; [SerializeField] private Sprite cornBurntSprite; @@ -31,7 +32,7 @@ public class Corn : MonoBehaviour void Start() { rigidbody2D = GetComponent(); - GetComponent().sprite = cornSeedSprite; + spriteRenderer.sprite = cornSeedSprite; cornSpawnTime = Time.time; var cornPopBasicTime = 5f; cornPopTime = cornPopBasicTime + Random.Range(0, 5f); @@ -50,7 +51,7 @@ public class Corn : MonoBehaviour if (cornStopTime >= maxCornStopTime && isPop) { - GetComponent().sprite = cornBurntSprite; + spriteRenderer.sprite = cornBurntSprite; } if (cornLifeTime >= cornPopTime) { @@ -65,6 +66,6 @@ public class Corn : MonoBehaviour var popVelocity = 20f; var popDirection = new Vector2(Random.value * 2 - 1, Random.value * 2 - 1); rigidbody2D.AddForce(popVelocity * popDirection, ForceMode2D.Impulse); - GetComponent().sprite = cornSimpleSprite; + spriteRenderer.sprite = cornSimpleSprite; } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/corn.prefab b/popcorn/Assets/MyGame/Scenes/Main/corn.prefab index 498fec5c..f72966c9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/corn.prefab @@ -10,6 +10,9 @@ GameObject: m_Component: - component: {fileID: 1324329073609281160} - component: {fileID: 5972257590091015193} + - component: {fileID: 5499754490129207122} + - component: {fileID: 7195010600253370228} + - component: {fileID: 8932234855615206969} m_Layer: 0 m_Name: corn m_TagString: Untagged @@ -51,6 +54,61 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5499754490129207122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324329073609281157} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 175dce409df2f4d3aa1941a08822e03e, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteRenderer: {fileID: 8958880017665793879} + cornSeedSprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3} + cornSimpleSprite: {fileID: 21300000, guid: 041ad2539ff56d945ab2da4be6a02f04, type: 3} + cornBurntSprite: {fileID: 21300000, guid: a9d669186411b2b4da1511f59a91b4c9, type: 3} + cornVelocity: 0 + cornLifeTime: 0 +--- !u!50 &7195010600253370228 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324329073609281157} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 1 + m_AngularDrag: 4 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!58 &8932234855615206969 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1324329073609281157} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.37 --- !u!1 &3431194784518736845 GameObject: m_ObjectHideFlags: 0 @@ -60,9 +118,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9198528551727453440} - - component: {fileID: 3441361436078805048} - - component: {fileID: 5399497193231118923} - - component: {fileID: 2413096644658422630} - component: {fileID: 8958880017665793879} m_Layer: 0 m_Name: Image_corn @@ -85,61 +140,6 @@ Transform: m_Father: {fileID: 3310446858927984796} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3441361436078805048 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3431194784518736845} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 175dce409df2f4d3aa1941a08822e03e, type: 3} - m_Name: - m_EditorClassIdentifier: - spriteRenderer: {fileID: 8958880017665793879} - cornSeedSprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3} - cornSimpleSprite: {fileID: 21300000, guid: 041ad2539ff56d945ab2da4be6a02f04, type: 3} - cornBurntSprite: {fileID: 21300000, guid: a9d669186411b2b4da1511f59a91b4c9, type: 3} - cornVelocity: 0 - cornLifeTime: 0 ---- !u!58 &5399497193231118923 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3431194784518736845} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.34 ---- !u!50 &2413096644658422630 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3431194784518736845} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 1 - m_AngularDrag: 4 - m_GravityScale: 0 - m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 --- !u!212 &8958880017665793879 SpriteRenderer: m_ObjectHideFlags: 0