From 67e264580c8f4729dc37e4113dd294afe1e44d15 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 14:54:38 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E3=82=B2=E3=83=BC=E3=82=B8=E3=81=8C?= =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=80=E3=83=A0=E3=81=A7=E7=A7=BB=E5=8B=95?= =?UTF-8?q?=E3=81=99=E3=82=8B=E4=BB=95=E6=A7=98=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 56 +++++++++---------- .../Scenes/Cooking/Prefabs/DebugView.prefab | 12 ++-- .../Scenes/Cooking/Scripts/ThermalControl.cs | 31 +++++++--- 3 files changed, 57 insertions(+), 42 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 6e3fcf18..798b49b4 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -1876,30 +1876,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &657773248 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 462546169576730945, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &657773249 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8798175650031291884, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &657773250 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4493661992505599346, guid: b0a57f0d9e5524e579cad0309e9d44d1, @@ -7582,6 +7558,18 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1028629823 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8798175650031291884, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + m_PrefabInstance: {fileID: 657773245} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1095273984 GameObject: m_ObjectHideFlags: 0 @@ -13399,6 +13387,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2137549891} m_PrefabAsset: {fileID: 0} +--- !u!114 &1665053976 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 462546169576730945, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + m_PrefabInstance: {fileID: 657773245} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1673325601 GameObject: m_ObjectHideFlags: 0 @@ -13665,16 +13665,16 @@ MonoBehaviour: coldIncreaseSpeed: 0.5 hotIncreaseSpeed: 0.08 maxDecreaseSpeed: 0.5 - coldValue: 0.35 - hotValue: 0.65 + yellowSize: 0.3 + randomRange: 0.2 factorSlider: {fileID: 657773254} deadZoneSlider: {fileID: 657773253} baseSpeedSlider: {fileID: 657773252} coldSpeedSlider: {fileID: 1995319247} hotSpeedSlider: {fileID: 657773251} decreaseSpeedSlider: {fileID: 657773250} - coldSlider: {fileID: 657773249} - hotSlider: {fileID: 657773248} + yellowSizeSlider: {fileID: 1028629823} + randomRangeSlider: {fileID: 1665053976} --- !u!114 &1870432536 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab index 8598883b..86b4f8d9 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab @@ -2727,17 +2727,17 @@ PrefabInstance: - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: maxValue - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Text - value: "\u30B2\u30FC\u30B8\nYelow/Hot\u5883\u754C" + value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30E9\u30F3\u30C0\u30E0\u4F4D\u7F6E" objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (6) + value: RandomValue objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} @@ -3457,17 +3457,17 @@ PrefabInstance: - target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: maxValue - value: 1 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Text - value: "\u30B2\u30FC\u30B8\nCold/Yellow\u5883\u754C" + value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30B5\u30A4\u30BA" objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name - value: DebugParameter (5) + value: YellowSize objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index a915f1ce..de58c728 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -3,6 +3,7 @@ using UniRx; using Unity.Mathematics; using UnityEngine; using UnityEngine.UI; +using Random = UnityEngine.Random; public enum ThermalCondition { @@ -30,8 +31,12 @@ public class ThermalControl : MonoBehaviour [SerializeField] private float maxDecreaseSpeed = .03f; [Space] [Header("ゲージ調整")] - [SerializeField] private float coldValue = 0.32f; - [SerializeField] private float hotValue = 0.67f; + [Range(0f, .8f)] + [SerializeField] private float yellowSize; + [Range(0f, .5f)] + [SerializeField] private float randomRange; + private float coldValue; + private float hotValue; private float increaseDuration = 0.3f; private float decreaseDuration = 0.1f; @@ -47,8 +52,8 @@ public class ThermalControl : MonoBehaviour [SerializeField] private Slider coldSpeedSlider; [SerializeField] private Slider hotSpeedSlider; [SerializeField] private Slider decreaseSpeedSlider; - [SerializeField] private Slider coldSlider; - [SerializeField] private Slider hotSlider; + [SerializeField] private Slider yellowSizeSlider; + [SerializeField] private Slider randomRangeSlider; #endif private void Start() @@ -68,16 +73,16 @@ public class ThermalControl : MonoBehaviour coldSpeedSlider.value = coldIncreaseSpeed; hotSpeedSlider.value = hotIncreaseSpeed; decreaseSpeedSlider.value = maxDecreaseSpeed; - coldSlider.value = coldValue; - hotSlider.value = hotValue; + yellowSizeSlider.value = yellowSize; + randomRangeSlider.value = randomRange; factorSlider.OnValueChangedAsObservable().Subscribe(x => panFactor = x).AddTo(this); deadZoneSlider.OnValueChangedAsObservable().Subscribe(x => deadZone = x).AddTo(this); baseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => baseIncreaseSpeed = x).AddTo(this); coldSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldIncreaseSpeed = x).AddTo(this); hotSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotIncreaseSpeed = x).AddTo(this); decreaseSpeedSlider.OnValueChangedAsObservable().Subscribe(x => maxDecreaseSpeed = x).AddTo(this); - coldSlider.OnValueChangedAsObservable().Subscribe(x => coldValue = x).AddTo(this); - hotSlider.OnValueChangedAsObservable().Subscribe(x => hotValue = x).AddTo(this); + yellowSizeSlider.OnValueChangedAsObservable().Subscribe(x => yellowSize = x).AddTo(this); + randomRangeSlider.OnValueChangedAsObservable().Subscribe(x => randomRange = x).AddTo(this); #endif } @@ -140,11 +145,21 @@ public class ThermalControl : MonoBehaviour return ThermalCondition.Yellow; } + private void SetMeterValue() + { + // Todo 初回プレイ時は中央 + var yellowPos = Random.Range(-randomRange, randomRange) + .5f; + var halfYellowSize = yellowSize / 2; + coldValue = Mathf.Max(0f, yellowPos - halfYellowSize); + hotValue = Mathf.Min(1f, yellowPos + halfYellowSize); + } + public void ResetMeter() { temperature = 0f; thermoMeter.SetValue(temperature); temperatureSpeed = 0f; + SetMeterValue(); thermoMeter.SetScale(coldValue, hotValue); panController.ResetTargetPosition(); panController.enabled = true; From ba09765d0c7c0acd6f3765c3685b08d8e2e61c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Wed, 4 Aug 2021 14:59:56 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AA=BF=E7=90=86=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=82=9280=E7=B2=92=E3=81=AB=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 2 +- .../Cooking/Scripts/CornPopParameters.cs | 258 +++++++++++------- 2 files changed, 160 insertions(+), 100 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 6e3fcf18..4cba8620 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -13692,7 +13692,7 @@ MonoBehaviour: type: 3} spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc, type: 3} - cornSpawnCount: 50 + cornSpawnCount: 80 maxFailedCornCount: 25 baseGrowSpeed: 1 coldGrowSpeed: 0.1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs index ac69000c..82e6e470 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs @@ -2,107 +2,167 @@ public class CornPopParameters { public static readonly float[] CornPopTimeArray = { 1f, - 3.99f, - 5.691f, - 7.222f, - 8.6f, - 9.84f, - 10.956f, - 11.96f, - 12.864f, - 13.678f, - 14.134f, - 14.554f, - 14.94f, - 15.298f, - 15.628f, - 15.934f, - 16.219f, - 16.484f, - 16.732f, - 16.964f, - 17.182f, - 17.387f, - 17.581f, - 17.764f, - 17.938f, - 18.103f, - 18.261f, - 18.413f, - 18.558f, - 18.697f, - 18.832f, - 18.962f, - 19.088f, - 19.211f, - 19.33f, - 19.447f, - 19.561f, - 19.672f, - 19.782f, - 19.889f, - 19.995f, - 20.099f, - 20.202f, - 20.303f, - 20.403f, - 20.503f, - 20.601f, - 20.699f, - 20.796f, - 20.892f, +2.495f, +3.99f, +4.841f, +5.691f, +6.456f, +7.222f, +7.911f, +8.6f, +9.22f, +9.84f, +10.398f, +10.956f, +11.458f, +11.96f, +12.412f, +12.864f, +13.271f, +13.678f, +13.906f, +14.134f, +14.344f, +14.554f, +14.747f, +14.94f, +15.119f, +15.298f, +15.463f, +15.628f, +15.781f, +15.934f, +16.077f, +16.219f, +16.352f, +16.484f, +16.608f, +16.732f, +16.848f, +16.964f, +17.073f, +17.182f, +17.284f, +17.387f, +17.484f, +17.581f, +17.672f, +17.764f, +17.851f, +17.938f, +18.02f, +18.103f, +18.182f, +18.261f, +18.337f, +18.413f, +18.485f, +18.558f, +18.627f, +18.697f, +18.765f, +18.832f, +18.897f, +18.962f, +19.025f, +19.088f, +19.15f, +19.211f, +19.271f, +19.33f, +19.389f, +19.447f, +19.504f, +19.561f, +19.616f, +19.672f, +19.727f, +19.782f, +19.835f, +19.889f, +19.942f, }; public static readonly float[] CornBurntTimeArray = { - 90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, -90f, + 10f, +8f, +5.9f, +4.3f, +3.2f, +2.6f, +2.5f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, +2.4f, }; } \ No newline at end of file From bc591cf283e32ef7779e13b6a002d191b4cc31a6 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 15:10:13 +0900 Subject: [PATCH 3/8] =?UTF-8?q?UI=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/recipe/recipe.unity | 1119 ++++++++++++++++- 1 file changed, 1085 insertions(+), 34 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 5aaee4b3..99299b64 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -152,13 +152,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 28991872} + - {fileID: 1578250478} m_Father: {fileID: 203585998} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -11.799988, y: 0} + m_SizeDelta: {x: -42.699986, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &25421136 MonoBehaviour: @@ -220,6 +221,7 @@ GameObject: m_Component: - component: {fileID: 28991872} - component: {fileID: 28991873} + - component: {fileID: 28991874} m_Layer: 0 m_Name: Panel m_TagString: Untagged @@ -246,13 +248,19 @@ RectTransform: - {fileID: 1831059053} - {fileID: 1903930586} - {fileID: 1435667915} + - {fileID: 1396650753} + - {fileID: 1062013460} + - {fileID: 495196858} + - {fileID: 384598190} + - {fileID: 466365747} + - {fileID: 1905102510} m_Father: {fileID: 25421135} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 467.99997, y: -393} - m_SizeDelta: {x: 960, y: 810} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &28991873 MonoBehaviour: @@ -276,8 +284,22 @@ MonoBehaviour: m_StartAxis: 0 m_CellSize: {x: 490, y: 300} m_Spacing: {x: -20, y: -80.5} - m_Constraint: 0 + m_Constraint: 1 m_ConstraintCount: 2 +--- !u!114 &28991874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28991871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &103445604 GameObject: m_ObjectHideFlags: 0 @@ -451,6 +473,170 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &136044098 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 28991872} + m_Modifications: + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Name + value: Frame (13) + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} --- !u!1 &203585997 GameObject: m_ObjectHideFlags: 0 @@ -503,7 +689,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: - m_Content: {fileID: 0} + m_Content: {fileID: 28991872} m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 @@ -515,7 +701,7 @@ MonoBehaviour: m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 409545283} m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: -3 m_VerticalScrollbarSpacing: -3 m_OnValueChanged: @@ -590,11 +776,11 @@ RectTransform: m_Father: {fileID: 1578250478} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 14, y: -286} - m_SizeDelta: {x: 944, y: 48} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &277152054 MonoBehaviour: m_ObjectHideFlags: 0 @@ -669,6 +855,12 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1186, y: 1310} m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &384598190 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1022328681} + m_PrefabAsset: {fileID: 0} --- !u!1 &409545281 GameObject: m_ObjectHideFlags: 0 @@ -707,7 +899,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: -17} - m_Pivot: {x: 1, y: 0} + m_Pivot: {x: 1, y: 1} --- !u!114 &409545283 MonoBehaviour: m_ObjectHideFlags: 0 @@ -726,7 +918,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -749,9 +941,9 @@ MonoBehaviour: m_Interactable: 1 m_TargetGraphic: {fileID: 2120123254} m_HandleRect: {fileID: 2120123253} - m_Direction: 3 - m_Value: 0 - m_Size: 1 + m_Direction: 2 + m_Value: 0.50000006 + m_Size: 0.48237482 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -963,6 +1155,182 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 425834632} m_PrefabAsset: {fileID: 0} +--- !u!224 &466365747 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1464274323} + m_PrefabAsset: {fileID: 0} +--- !u!224 &495196858 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1193300603} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &573590064 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 28991872} + m_Modifications: + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Name + value: Frame (8) + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} --- !u!224 &701105333 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -1171,7 +1539,7 @@ RectTransform: m_Children: - {fileID: 103445605} m_Father: {fileID: 1455181832} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1258,6 +1626,176 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968322475} m_CullTransparentMesh: 0 +--- !u!1001 &1022328681 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 28991872} + m_Modifications: + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Name + value: Frame (11) + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!224 &1062013460 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1759919285} + m_PrefabAsset: {fileID: 0} --- !u!1 &1062067455 GameObject: m_ObjectHideFlags: 0 @@ -1294,6 +1832,176 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1193300603 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 28991872} + m_Modifications: + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Name + value: Frame (10) + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!224 &1396650753 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 573590064} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1435667914 PrefabInstance: m_ObjectHideFlags: 0 @@ -1494,7 +2202,6 @@ RectTransform: m_Children: - {fileID: 1554563049} - {fileID: 203585998} - - {fileID: 1578250478} - {fileID: 968322476} m_Father: {fileID: 329292690} m_RootOrder: 1 @@ -1516,6 +2223,170 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1001 &1464274323 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 28991872} + m_Modifications: + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Name + value: Frame (12) + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} --- !u!1 &1554563048 GameObject: m_ObjectHideFlags: 0 @@ -1707,6 +2578,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (1) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -1789,12 +2665,12 @@ RectTransform: m_Children: - {fileID: 1706201272} - {fileID: 277152053} - m_Father: {fileID: 1455181832} - m_RootOrder: 2 + m_Father: {fileID: 25421135} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -12, y: -44} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1594398329 @@ -1903,11 +2779,11 @@ RectTransform: m_Father: {fileID: 1578250478} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 10, y: 470} - m_SizeDelta: {x: 944, y: 48} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 48} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &1706201273 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1945,6 +2821,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1706201271} m_CullTransparentMesh: 0 +--- !u!1001 &1759919285 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 28991872} + m_Modifications: + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_Name + value: Frame (9) + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} --- !u!1001 &1771084670 PrefabInstance: m_ObjectHideFlags: 0 @@ -2455,6 +3495,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1903930585} m_PrefabAsset: {fileID: 0} +--- !u!224 &1905102510 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 136044098} + m_PrefabAsset: {fileID: 0} --- !u!1 &2120123252 GameObject: m_ObjectHideFlags: 0 @@ -2489,8 +3535,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 371.5} - m_SizeDelta: {x: 52, y: -691} + m_AnchoredPosition: {x: 0, y: 127.75} + m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2120123254 MonoBehaviour: @@ -2706,6 +3752,11 @@ PrefabInstance: propertyPath: m_Name value: Frame objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y From 7de95a7cfd746552ec34070da33314ac941c2e4f Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 16:06:28 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94View=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 85 +++++++++++++++---- .../Assets/MyGame/Scenes/recipe/Scripts.meta | 8 ++ .../Scenes/recipe/Scripts/RecipeData.cs | 12 +++ .../Scenes/recipe/Scripts/RecipeData.cs.meta | 3 + .../Scenes/recipe/Scripts/RecipeView.cs | 33 +++++++ .../Scenes/recipe/Scripts/RecipeView.cs.meta | 3 + 6 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts.meta create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index adfb0b92..a0bbf16c 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -504,6 +504,7 @@ GameObject: m_Component: - component: {fileID: 2929932627350163026} - component: {fileID: 1570337604946174006} + - component: {fileID: 5490177795204899762} m_Layer: 0 m_Name: Frame m_TagString: Untagged @@ -550,7 +551,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -571,10 +572,28 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 1785032438920414220} m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &5490177795204899762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2929932627350163027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47bc31a2c7d14478bd4ebe3c32e41185, type: 3} + m_Name: + m_EditorClassIdentifier: + detailButton: {fileID: 1570337604946174006} + flavorName: {fileID: 2929932626752093611} + flavorPrice: {fileID: 2929932627123125673} + cornAmountText: {fileID: 6296255899301773980} + flavor1AmountText: {fileID: 2929932625557648441} + flavor2AmountText: {fileID: 367551539734858426} --- !u!1 &2997770120253274331 GameObject: m_ObjectHideFlags: 0 @@ -612,7 +631,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -100} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 172, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3788395727770399120 MonoBehaviour: @@ -670,7 +689,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5518194748275484553 RectTransform: m_ObjectHideFlags: 0 @@ -798,10 +817,10 @@ RectTransform: m_Father: {fileID: 9097260142390357153} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 108, y: 0} + m_SizeDelta: {x: 128, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7841468932949581945 CanvasRenderer: @@ -876,10 +895,10 @@ RectTransform: m_Father: {fileID: 9097260142390357153} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 42} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 19, y: 0} + m_SizeDelta: {x: 38, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8472150098743274780 CanvasRenderer: @@ -928,7 +947,7 @@ PrefabInstance: - target: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_Name - value: MaterialFrame + value: MaterialFrame1 objectReference: {fileID: 0} - target: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1093,6 +1112,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} +--- !u!114 &2929932625557648441 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 1133216431126940221} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2929932625336302236 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1109,7 +1140,7 @@ PrefabInstance: - target: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_Name - value: MaterialFrame (1) + value: MaterialFrame2 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1264,6 +1295,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} +--- !u!114 &367551539734858426 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &367551539495355423 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1280,7 +1323,7 @@ PrefabInstance: - target: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_Name - value: MaterialFrame (2) + value: CornAmount objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1436,3 +1479,15 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 8101979052737494168} m_PrefabAsset: {fileID: 0} +--- !u!114 &6296255899301773980 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 8101979052737494168} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts.meta new file mode 100644 index 00000000..0652d787 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 677f8f5cfef694b24a98e4462d9d3768 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs new file mode 100644 index 00000000..3b016dcf --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs @@ -0,0 +1,12 @@ +namespace MyGame.Scenes.recipe.Scripts +{ + public class RecipeData + { + public int RecipeId; + public string Name; + public int Price; + public int CornAmount; + public int Flavor1Amount; + public int Flavor2Amount; + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta new file mode 100644 index 00000000..f3e6eb2f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5193219b46d047b595b22809e43804a1 +timeCreated: 1628058980 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs new file mode 100644 index 00000000..1576f4a0 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs @@ -0,0 +1,33 @@ +using System; +using MyGame.Scenes.recipe.Scripts; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class RecipeView : MonoBehaviour +{ + [SerializeField] private Button detailButton; + [SerializeField] private Text flavorName; + [SerializeField] private Text flavorPrice; + [SerializeField] private Text cornAmountText; + [SerializeField] private Text flavor1AmountText; + [SerializeField] private Text flavor2AmountText; + private static readonly string amountFormat = "x{0}"; + + private void Start() + { + detailButton.OnClickAsObservable().Subscribe(_ => + { + // open detail + }).AddTo(this); + } + + public void SetRecipe(RecipeData data) + { + flavorName.text = data.Name; + flavorPrice.text = data.Price.ToString(); + cornAmountText.text = string.Format(amountFormat, data.CornAmount); + flavor1AmountText.text = string.Format(amountFormat, data.Flavor1Amount); + flavor2AmountText.text = string.Format(amountFormat, data.Flavor2Amount); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs.meta new file mode 100644 index 00000000..8f438277 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 47bc31a2c7d14478bd4ebe3c32e41185 +timeCreated: 1628059076 \ No newline at end of file From 0fc4f9dbbc01949ebecfe29daa6601f96f3f5b21 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 16:34:59 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E3=83=80?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recipe/Scripts/RecipeSelectDialog.cs | 63 ++++ .../recipe/Scripts/RecipeSelectDialog.cs.meta | 11 + .../Scenes/recipe/Scripts/RecipeView.cs | 5 +- .../Assets/MyGame/Scenes/recipe/recipe.unity | 292 ++++++++++++------ 4 files changed, 277 insertions(+), 94 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs create mode 100644 popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs new file mode 100644 index 00000000..cec2bb35 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using MyGame.Scenes.recipe.Scripts; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class RecipeSelectDialog : MonoBehaviour +{ + [SerializeField] private GameObject content; + [SerializeField] private RecipeView recipePrefab; + [SerializeField] private Button closeButton; + // Start is called before the first frame update + void Start() + { + closeButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.UnloadScene(GameScenes.Recipe); + }).AddTo(this); + + // 所持レシピ取得 + var recipes = new[] + { + new RecipeData + { + RecipeId = 0, + Name = "塩コケコーン", + Price = 5, + CornAmount = 0, + Flavor1Amount = 0, + Flavor2Amount = 0 + }, + new RecipeData + { + RecipeId = 0, + Name = "キャラメルコケコーン", + Price = 15, + CornAmount = 0, + Flavor1Amount = 0, + Flavor2Amount = 0 + }, + new RecipeData + { + RecipeId = 0, + Name = "ブラックペッパーコケコーン", + Price = 9, + CornAmount = 0, + Flavor1Amount = 0, + Flavor2Amount = 0 + }, + }; + // レシピ一覧生成 + foreach (var recipeData in recipes) + { + var view = Instantiate(recipePrefab, content.transform); + view.SetRecipe(recipeData); + view.RecipeClickObservable.Subscribe(_ => + { + + }).AddTo(this); + } + } +} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs.meta new file mode 100644 index 00000000..b1f1ae83 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2154205f893c042a390e4b410b5b5ea5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs index 1576f4a0..803ea4b5 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs @@ -13,13 +13,10 @@ public class RecipeView : MonoBehaviour [SerializeField] private Text flavor1AmountText; [SerializeField] private Text flavor2AmountText; private static readonly string amountFormat = "x{0}"; + public IObservable RecipeClickObservable => detailButton.OnClickAsObservable().TakeUntilDestroy(this); private void Start() { - detailButton.OnClickAsObservable().Subscribe(_ => - { - // open detail - }).AddTo(this); } public void SetRecipe(RecipeData data) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 99299b64..d295f3ff 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -503,7 +503,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -513,17 +513,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -563,12 +563,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1467 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -590,6 +590,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (13) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -942,8 +947,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2120123254} m_HandleRect: {fileID: 2120123253} m_Direction: 2 - m_Value: 0.50000006 - m_Size: 0.48237482 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1015,7 +1020,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1025,17 +1030,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1075,12 +1080,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -369.5 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1102,6 +1107,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (3) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -1197,7 +1207,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1207,17 +1217,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1257,12 +1267,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1028 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1284,6 +1294,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (8) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -1367,7 +1382,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1377,17 +1392,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1427,12 +1442,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -369.5 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1454,6 +1469,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (2) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -1656,7 +1676,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1666,17 +1686,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1716,12 +1736,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1247.5 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1743,6 +1763,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (11) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -1862,7 +1887,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1872,17 +1897,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1922,12 +1947,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1247.5 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1949,6 +1974,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (10) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -2032,7 +2062,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2042,17 +2072,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2092,12 +2122,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -808.5 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2119,6 +2149,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (7) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -2253,7 +2288,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2263,17 +2298,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2313,12 +2348,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1467 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2340,6 +2375,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (12) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -2491,7 +2531,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2501,17 +2541,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2551,12 +2591,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -150 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2581,7 +2621,7 @@ PrefabInstance: - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2747,6 +2787,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1594398329} m_CullTransparentMesh: 0 +--- !u!1 &1642095981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1642095983} + - component: {fileID: 1642095982} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1642095982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642095981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2154205f893c042a390e4b410b5b5ea5, type: 3} + m_Name: + m_EditorClassIdentifier: + content: {fileID: 28991871} + recipePrefab: {fileID: 5490177795204899762, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + closeButton: {fileID: 968322477} +--- !u!4 &1642095983 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1642095981} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 911.2726, y: 1515.1672, z: -622.0129} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1706201271 GameObject: m_ObjectHideFlags: 0 @@ -2851,7 +2938,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2861,17 +2948,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2911,12 +2998,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -1028 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2938,6 +3025,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (9) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -3015,7 +3107,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3025,17 +3117,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3075,12 +3167,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -589 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3102,6 +3194,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (4) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -3185,7 +3282,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3195,17 +3292,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3245,12 +3342,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 715 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -589 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3272,6 +3369,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (5) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -3355,7 +3457,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3365,17 +3467,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 490 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3415,12 +3517,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 245 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -808.5 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3442,6 +3544,11 @@ PrefabInstance: propertyPath: m_Name value: Frame (6) objectReference: {fileID: 0} + - target: {fileID: 2929932627350163027, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y @@ -3760,28 +3867,33 @@ PrefabInstance: - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 38 objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 19 objectReference: {fileID: 0} - target: {fileID: 2969128505512012149, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3261803197014340250, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6772187420262461984, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_Layer @@ -3825,7 +3937,7 @@ PrefabInstance: - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3835,17 +3947,17 @@ PrefabInstance: - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 128.50366 objectReference: {fileID: 0} - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 108.25183 objectReference: {fileID: 0} - target: {fileID: 8440980752897465212, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3855,7 +3967,7 @@ PrefabInstance: - target: {fileID: 9097260142390357153, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 172.50366 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2929932625336302234, guid: 2beb2d436ad55734186e797d315796b3, type: 3} From 1a2fe0ff2120a475aefe62267abf09bf34833b70 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 16:35:10 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=83=B3=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scripts/TransitionManager.cs | 2 ++ popcorn/ProjectSettings/EditorBuildSettings.asset | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index 694a3dc8..1c0afedc 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -9,6 +9,8 @@ public enum GameScenes Main, Cooking, CornField, + Recipe, + RecipeChoice, SettingsDialog, DebugOption, UnableWatchVideoDialog, diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset index 94866b31..6a433833 100644 --- a/popcorn/ProjectSettings/EditorBuildSettings.asset +++ b/popcorn/ProjectSettings/EditorBuildSettings.asset @@ -8,10 +8,19 @@ EditorBuildSettings: - enabled: 1 path: Assets/MyGame/Scenes/Main/Main.unity guid: 7f040d1b248234841802683edae3c4fa + - enabled: 1 + path: Assets/MyGame/Scenes/recipe/Recipe.unity + guid: e3d17c6b649257641bd3b50559692087 + - enabled: 1 + path: Assets/MyGame/Scenes/recipe/RecipeChoice.unity + guid: 303178fa574d90d4f81046cb6a3a1b9c - enabled: 1 path: Assets/MyGame/Scenes/Cooking/Cooking.unity guid: 505f6fca18c0c4a769e89c86a9a1f5b5 - enabled: 1 path: Assets/MyGame/Scenes/CornField/CornField.unity guid: 7ee833196453c8045b9ec713662ccf4e + - enabled: 1 + path: Assets/MyGame/Scenes/marketing/Marketing.unity + guid: 0578a0087d4b17041b0a94debf03e0d6 m_configObjects: {} From dc79ac9b321cc21df7fa6b6ae915523c43991bfe Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 16:35:58 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E5=B0=8E?= =?UTF-8?q?=E7=B7=9A=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Scripts/KitchenManager.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 5155bb7e..a8f77db6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -11,12 +11,11 @@ public class KitchenManager : MonoBehaviour // Start is called before the first frame update void Start() { - cookingButton.OnClickAsObservable().Subscribe(_ => TransitionManager.Instance.LoadScene(GameScenes.Cooking)); - } - - // Update is called once per frame - void Update() - { + cookingButton.OnClickAsObservable().Subscribe(_ => + { + // TransitionManager.Instance.LoadScene(GameScenes.Cooking); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe); + }); } } From 978c19b3e9254095735938a6c8424e61f0d16ce5 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 4 Aug 2021 16:37:13 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E5=B0=8E=E7=B7=9A=E6=88=BB=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index a8f77db6..37d670eb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -13,8 +13,8 @@ public class KitchenManager : MonoBehaviour { cookingButton.OnClickAsObservable().Subscribe(_ => { - // TransitionManager.Instance.LoadScene(GameScenes.Cooking); - TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe); + TransitionManager.Instance.LoadScene(GameScenes.Cooking); + // TransitionManager.Instance.LoadSceneAdditive(GameScenes.Recipe); }); }