From d3e728dad0f1f062f890a242027dc4dd1c4bd150 Mon Sep 17 00:00:00 2001 From: hirokei Date: Thu, 30 Sep 2021 15:43:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E7=95=91=E3=82=B3=E3=83=BC=E3=83=B3?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=82=B9=E3=83=94=E3=83=BC=E3=83=89=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/CornField/CornField.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 4c0c0903..2a4bf36f 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -868,7 +868,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dadd48ac419c440959ddb48337e48d9f, type: 3} m_Name: m_EditorClassIdentifier: - animationDuration: 0.3 + animationDuration: 0.5 promoteGrowthButton: {fileID: 730756546} upgradeButton: {fileID: 1992043646} harvestEffectPrefab: {fileID: 3900911687800301846, guid: e9a7e2b2f003d44fab5926ca6ec6d728, From dff71c5208d47eff982356df23ecc2877dd18d78 Mon Sep 17 00:00:00 2001 From: hirokei Date: Thu, 30 Sep 2021 15:54:20 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=AE?= =?UTF-8?q?=E7=A8=B2=E6=BC=94=E5=87=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CornField/Prefabs/CornField/Corn_one_lv1.prefab | 2 +- .../CornField/Prefabs/CornField/Corn_one_lv2.prefab | 4 ++-- .../CornField/Prefabs/CornField/Corn_one_lv3.prefab | 2 +- .../CornField/Prefabs/CornField/Corn_one_lv4.prefab | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab index d313d6aa..4b00c2b9 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab @@ -4727,7 +4727,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} + - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab index ffb8e458..9b2c5ad9 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab @@ -801,7 +801,7 @@ ParticleSystem: donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: 0.85, y: 1.52, z: 1} + m_Scale: {x: 0.85, y: 1.31, z: 1} placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 @@ -4861,7 +4861,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} + - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab index cec68758..a17c262a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab @@ -4861,7 +4861,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} + - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab index 5b8c32d8..abbdbf96 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &8565919771951872518 Transform: m_ObjectHideFlags: 0 @@ -107,7 +107,7 @@ ParticleSystem: m_RotationOrder: 4 moveWithTransform: 1 moveWithCustomTransform: {fileID: 0} - scalingMode: 1 + scalingMode: 0 randomSeed: 0 InitialModule: serializedVersion: 3 @@ -4727,7 +4727,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} + - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 @@ -9692,7 +9692,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} + - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2} - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 From 93fe90c318d7370708774261544d89bdca1736ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Thu, 30 Sep 2021 16:18:41 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AA=BF=E7=90=86=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index b57bd0b1..e42b1d26 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -3625,7 +3625,7 @@ MonoBehaviour: temperature: 0 temperatureSpeed: 0 panSpeed: 0.1369657 - panFactor: 0.00145 + panFactor: 0.001475 deadZone: 0.0045 baseIncreaseSpeed: 0.15 coldIncreaseSpeed: 0.5