diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 66634b4e..6344a11f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -506,18 +506,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &390540611 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2152797965052096507, 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: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &404298883 GameObject: m_ObjectHideFlags: 0 @@ -1729,6 +1717,16 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5780529271574476149, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + propertyPath: gameManager + value: + objectReference: {fileID: 1870432533} + - target: {fileID: 5780529271574476149, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + propertyPath: thermalControl + value: + objectReference: {fileID: 1870432535} - target: {fileID: 5969116567130955788, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchorMax.y @@ -1874,66 +1872,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &657773250 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4493661992505599346, 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 &657773251 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4035365465071032020, 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 &657773252 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6405201674218417112, 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 &657773253 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1930711677042961620, 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 &657773254 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2446509828538118658, 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 &657773255 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 390509818088476977, guid: b0a57f0d9e5524e579cad0309e9d44d1, @@ -2796,18 +2734,6 @@ 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 @@ -3951,18 +3877,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: ---- !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 @@ -4395,7 +4309,6 @@ MonoBehaviour: thermalControl: {fileID: 1870432535} thermoMeter: {fileID: 1928679192} cornManager: {fileID: 1870432536} - resetButton: {fileID: 390540611} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -4435,14 +4348,6 @@ MonoBehaviour: maxDecreaseSpeed: 0.1 yellowSize: 0.3 randomRange: 0.2 - factorSlider: {fileID: 657773254} - deadZoneSlider: {fileID: 657773253} - baseSpeedSlider: {fileID: 657773252} - coldSpeedSlider: {fileID: 1995319247} - hotSpeedSlider: {fileID: 657773251} - decreaseSpeedSlider: {fileID: 657773250} - yellowSizeSlider: {fileID: 1028629823} - randomRangeSlider: {fileID: 1665053976} --- !u!114 &1870432536 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4704,18 +4609,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1933828729} m_PrefabAsset: {fileID: 0} ---- !u!114 &1995319247 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 543610246068091086, 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 &2055584752 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab index 86b4f8d9..3ddb07a8 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5613348811662922110} - component: {fileID: 2835022773081316995} - component: {fileID: 9133335128237374767} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -89,7 +89,7 @@ GameObject: - component: {fileID: 4140395521699310764} - component: {fileID: 3302955830178679139} - component: {fileID: 8242868838447147877} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -165,7 +165,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4303795378509814408} - m_Layer: 0 + m_Layer: 5 m_Name: View m_TagString: Untagged m_Icon: {fileID: 0} @@ -210,7 +210,7 @@ GameObject: - component: {fileID: 2505729874336374508} - component: {fileID: 3463608572823271386} - component: {fileID: 8346684863944409345} - m_Layer: 0 + m_Layer: 5 m_Name: BackMainButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -328,7 +328,7 @@ GameObject: - component: {fileID: 3818386847057816358} - component: {fileID: 650525365612456080} - component: {fileID: 5694425316329821690} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -407,7 +407,7 @@ GameObject: - component: {fileID: 6487049893294274262} - component: {fileID: 9091914540220019492} - component: {fileID: 2152797965052096507} - m_Layer: 0 + m_Layer: 5 m_Name: ResetButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -524,7 +524,7 @@ GameObject: m_Component: - component: {fileID: 4971887160877779298} - component: {fileID: 7883455930803081654} - m_Layer: 0 + m_Layer: 5 m_Name: Parameters m_TagString: Untagged m_Icon: {fileID: 0} @@ -587,8 +587,8 @@ MonoBehaviour: m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 900, y: 90} - m_Spacing: {x: 20, y: 20} + m_CellSize: {x: 900, y: 110} + m_Spacing: {x: 0, y: 10} m_Constraint: 1 m_ConstraintCount: 1 --- !u!1 &5001511587226957584 @@ -602,7 +602,7 @@ GameObject: - component: {fileID: 568747320455404892} - component: {fileID: 3484451170873733580} - component: {fileID: 5088421321322141769} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -679,7 +679,7 @@ GameObject: m_Component: - component: {fileID: 5284969908565993463} - component: {fileID: 5780529271574476149} - m_Layer: 0 + m_Layer: 5 m_Name: DebugView m_TagString: Untagged m_Icon: {fileID: 0} @@ -726,6 +726,17 @@ MonoBehaviour: view: {fileID: 608696602171851566} pattern1: {fileID: 7720918852878828156} pattern2: {fileID: 958025840167371830} + panDataParameters: + - {fileID: 1664834096015488296} + - {fileID: 3180199370115656702} + - {fileID: 7929372799703231730} + - {fileID: 3558504320151633892} + - {fileID: 1074510875190235646} + - {fileID: 627587725713367640} + - {fileID: 5544059043823831750} + - {fileID: 3495454367822427755} + gameManager: {fileID: 0} + thermalControl: {fileID: 0} --- !u!1 &5654533854386921258 GameObject: m_ObjectHideFlags: 0 @@ -738,7 +749,7 @@ GameObject: - component: {fileID: 1330983862053837295} - component: {fileID: 4419917016337627108} - component: {fileID: 1835835199602684098} - m_Layer: 0 + m_Layer: 5 m_Name: OpenButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -856,7 +867,7 @@ GameObject: - component: {fileID: 2135879124423655501} - component: {fileID: 8479033059926637393} - component: {fileID: 6590249268861633600} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -934,7 +945,7 @@ GameObject: - component: {fileID: 1245551812151214321} - component: {fileID: 6786330932404166001} - component: {fileID: 5986627331947351756} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -1013,7 +1024,7 @@ GameObject: - component: {fileID: 1680282534423946932} - component: {fileID: 6429788805263348925} - component: {fileID: 958025840167371830} - m_Layer: 0 + m_Layer: 5 m_Name: Pattern2Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1131,7 +1142,7 @@ GameObject: - component: {fileID: 2472549091385177827} - component: {fileID: 1051029848530001939} - component: {fileID: 3736476309860490666} - m_Layer: 0 + m_Layer: 5 m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} @@ -1206,7 +1217,7 @@ GameObject: - component: {fileID: 53300449127876901} - component: {fileID: 3168845778350697030} - component: {fileID: 6674939901714048809} - m_Layer: 0 + m_Layer: 5 m_Name: CloseButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -1325,7 +1336,7 @@ GameObject: - component: {fileID: 334852932963138782} - component: {fileID: 2070673246419519088} - component: {fileID: 7720918852878828156} - m_Layer: 0 + m_Layer: 5 m_Name: Pattern1Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1554,16 +1565,31 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u6570" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornCount objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive @@ -1579,16 +1605,46 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &91222054387263441 stripped @@ -1719,11 +1775,26 @@ PrefabInstance: propertyPath: m_Text value: "Hot\u6642\u4E0A\u6607\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: HotSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -1734,6 +1805,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &662934999055142313 stripped @@ -1742,6 +1843,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 593343534531572864} m_PrefabAsset: {fileID: 0} +--- !u!114 &1074510875190235646 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 593343534531572864} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1037856004329375526 PrefabInstance: m_ObjectHideFlags: 0 @@ -1864,11 +1977,26 @@ PrefabInstance: propertyPath: m_Text value: "\u6700\u5927\u51B7\u5374\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DebugParameter (4) objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -1879,8 +2007,50 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} +--- !u!114 &627587725713367640 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 1037856004329375526} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1112382072943771151 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, @@ -2009,11 +2179,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30D5\u30E9\u30A4\u30D1\u30F3\u611F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: Sense objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2024,6 +2209,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &1207237267587803519 stripped @@ -2032,6 +2247,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1281338920150454358} m_PrefabAsset: {fileID: 0} +--- !u!114 &1664834096015488296 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 1281338920150454358} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2201722375469517283 PrefabInstance: m_ObjectHideFlags: 0 @@ -2154,11 +2381,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u304C\n\u5F3E\u3051\u308B\u5F37\u3055" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DebugParameter (13) objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2169,6 +2411,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &2271744707010736330 stripped @@ -2299,11 +2571,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornBurntTime objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2314,6 +2601,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &2438367493108694558 stripped @@ -2444,11 +2761,26 @@ PrefabInstance: propertyPath: m_Text value: DeadZone objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DeadZone objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2459,8 +2791,50 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} +--- !u!114 &3180199370115656702 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 3094185449995849344} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &3168295903013582761 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, @@ -2589,11 +2963,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u304C\n\u98DB\u3073\u51FA\u3059\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: SpilledLimitSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2604,6 +2993,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &3771789703286377036 stripped @@ -2734,11 +3153,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30E9\u30F3\u30C0\u30E0\u4F4D\u7F6E" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: RandomValue objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2749,6 +3183,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &3987940865115793980 stripped @@ -2757,6 +3221,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3913854601083867925} m_PrefabAsset: {fileID: 0} +--- !u!114 &3495454367822427755 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 3913854601083867925} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4012935884479519386 PrefabInstance: m_ObjectHideFlags: 0 @@ -2879,16 +3355,31 @@ PrefabInstance: propertyPath: m_Text value: "Cold\u6642\u4E0A\u6607\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: ColdSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2899,6 +3390,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &3942904769723343795 stripped @@ -2907,6 +3428,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4012935884479519386} m_PrefabAsset: {fileID: 0} +--- !u!114 &3558504320151633892 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 4012935884479519386} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4407426121755080304 PrefabInstance: m_ObjectHideFlags: 0 @@ -3029,11 +3562,26 @@ PrefabInstance: propertyPath: m_Text value: "\u5931\u6557\u3057\u3066\u3082\u826F\u3044\n\u30B3\u30FC\u30F3\u6570" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: FailedCount objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3044,6 +3592,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &4333201332210061145 stripped @@ -3174,11 +3752,26 @@ PrefabInstance: propertyPath: m_Text value: "Hot\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DebugParameter (9) objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3189,6 +3782,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &4771112501857001908 stripped @@ -3319,11 +3942,26 @@ PrefabInstance: propertyPath: m_Text value: "Cold\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: ColdCornSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3334,6 +3972,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &5028291535338148132 stripped @@ -3464,11 +4132,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30B5\u30A4\u30BA" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: YellowSize objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3479,6 +4162,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &5416192627147036305 stripped @@ -3487,6 +4200,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5342082161051447224} m_PrefabAsset: {fileID: 0} +--- !u!114 &5544059043823831750 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 5342082161051447224} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7308813773154804941 PrefabInstance: m_ObjectHideFlags: 0 @@ -3609,11 +4334,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u5B8C\u6210\u6642\u9593\n0~5\u79D2\u30E9\u30F3\u30C0\u30E0\u3067\u8FFD\u52A0" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornPopTime objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3624,6 +4364,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &7234701249961237988 stripped @@ -3754,11 +4524,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593\u306E\u3070\u3089\u3064\u304D" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornBurntRandom objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3769,6 +4554,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &7271260149865018078 stripped @@ -3899,11 +4714,26 @@ PrefabInstance: propertyPath: m_Text value: "\u6E29\u5EA6\u4E0A\u6607\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: BaseSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3914,8 +4744,50 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} +--- !u!114 &7929372799703231730 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 7554891398754978188} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7624753188443107493 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs index e9152cc7..356534e9 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs @@ -1,6 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -16,6 +18,12 @@ public class MainGameDebugView : MonoBehaviour [SerializeField] private Button pattern1; [SerializeField] private Button pattern2; + [SerializeField] private MainGameDebugParameter[] panDataParameters; + [SerializeField] private PopcornGameManager gameManager; + [SerializeField] private ThermalControl thermalControl; + + private readonly PanData debugPanData = new PanData(); + private void Awake() { #if DEVELOPMENT_BUILD || UNITY_EDITOR @@ -34,21 +42,33 @@ public class MainGameDebugView : MonoBehaviour // Start is called before the first frame update void Start() + { + Initialize(); + } + + [Conditional("DEVELOPMENT_BUILD"), Conditional("UNITY_EDITOR")] + private void Initialize() { showDebugButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 0f; view.SetActive(true); }).AddTo(this); closeDebugButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 1f; view.SetActive(false); }).AddTo(this); gameResetButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 1f; view.SetActive(false); + TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); + gameManager.ResetGame(debugPanData); }).AddTo(this); backMainButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 1f; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); // pattern1.OnClickAsObservable().Subscribe(_ => @@ -59,6 +79,45 @@ public class MainGameDebugView : MonoBehaviour // { // SetPreset(preset2); // }).AddTo(this); + + // panData取得 + var originalPanData = LocalCacheManager.Load(PopcornGameManager.PanDataTag); + debugPanData.id = originalPanData.id; + debugPanData.rarity = originalPanData.rarity; + debugPanData.prefabName = originalPanData.prefabName; + SetPanDataToParam(originalPanData); + panDataParameters.Select(param => param.OnValueChange).CombineLatest() + .ThrottleFrame(1) + // .Debug("debugParameter") + .Subscribe(x => + { + SetParamToPanData(x); + thermalControl.SetPanData(debugPanData); + }).AddTo(this); + } + + private void SetParamToPanData(IList parameters) + { + debugPanData.panFactor = parameters[0]; + debugPanData.deadZone = parameters[1]; + debugPanData.baseIncreaseSpeed = parameters[2]; + debugPanData.coldIncreaseSpeed = parameters[3]; + debugPanData.hotIncreaseSpeed = parameters[4]; + debugPanData.maxDecreaseSpeed = parameters[5]; + debugPanData.yellowSize = parameters[6]; + debugPanData.randomRange = parameters[7]; + } + + private void SetPanDataToParam(PanData panData) + { + panDataParameters[0].SetValue(panData.panFactor); + panDataParameters[1].SetValue(panData.deadZone); + panDataParameters[2].SetValue(panData.baseIncreaseSpeed); + panDataParameters[3].SetValue(panData.coldIncreaseSpeed); + panDataParameters[4].SetValue(panData.hotIncreaseSpeed); + panDataParameters[5].SetValue(panData.maxDecreaseSpeed); + panDataParameters[6].SetValue(panData.yellowSize); + panDataParameters[7].SetValue(panData.randomRange); } private float[] preset1 = @@ -112,10 +171,4 @@ public class MainGameDebugView : MonoBehaviour } } - - // Update is called once per frame - void Update() - { - - } } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs index daeec27a..d6c2aa6c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs @@ -121,6 +121,11 @@ public class PopcornGameManager : MonoBehaviour private void ResetGame() { var panData = LocalCacheManager.Load(PanDataTag); + ResetGame(panData); + } + + public void ResetGame(PanData panData) + { var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); var rarityData = rarityList.First(data => data.Rarity == panData.Rarity); // フライパン設定 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index 10a6ca43..b8332d6d 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -43,18 +43,7 @@ public class ThermalControl : MonoBehaviour private bool isMove; public IReadOnlyReactiveProperty Condition => condition; - private readonly ReactiveProperty condition = new ReactiveProperty(ThermalCondition.Cold); - -#if DEVELOPMENT_BUILD || UNITY_EDITOR - [SerializeField] private Slider factorSlider; - [SerializeField] private Slider deadZoneSlider; - [SerializeField] private Slider baseSpeedSlider; - [SerializeField] private Slider coldSpeedSlider; - [SerializeField] private Slider hotSpeedSlider; - [SerializeField] private Slider decreaseSpeedSlider; - [SerializeField] private Slider yellowSizeSlider; - [SerializeField] private Slider randomRangeSlider; -#endif + private readonly ReactiveProperty condition = new ReactiveProperty(ThermalCondition.Cold); private void Start() { @@ -65,25 +54,7 @@ public class ThermalControl : MonoBehaviour Debug.Log($"cond :{x} temp: {temperature}"); }).AddTo(this); #endif - -#if DEVELOPMENT_BUILD || UNITY_EDITOR - factorSlider.value = panFactor; - deadZoneSlider.value = deadZone; - baseSpeedSlider.value = baseIncreaseSpeed; - coldSpeedSlider.value = coldIncreaseSpeed; - hotSpeedSlider.value = hotIncreaseSpeed; - decreaseSpeedSlider.value = maxDecreaseSpeed; - yellowSizeSlider.value = yellowSize; - randomRangeSlider.value = randomRange; - factorSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => panFactor = x).AddTo(this); - deadZoneSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => deadZone = x).AddTo(this); - baseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => baseIncreaseSpeed = x).AddTo(this); - coldSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => coldIncreaseSpeed = x).AddTo(this); - hotSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => hotIncreaseSpeed = x).AddTo(this); - decreaseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => maxDecreaseSpeed = x).AddTo(this); - yellowSizeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => yellowSize = x).AddTo(this); - randomRangeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => randomRange = x).AddTo(this); -#endif + } private void Update() @@ -198,15 +169,5 @@ public class ThermalControl : MonoBehaviour maxDecreaseSpeed = panData.maxDecreaseSpeed; yellowSize = panData.yellowSize; randomRange = panData.randomRange; -#if UNITY_EDITOR || DEVELOPMENT_BUILD - factorSlider.value = panFactor; - deadZoneSlider.value = deadZone; - baseSpeedSlider.value = baseIncreaseSpeed; - coldSpeedSlider.value = coldIncreaseSpeed; - hotSpeedSlider.value = hotIncreaseSpeed; - decreaseSpeedSlider.value = maxDecreaseSpeed; - yellowSizeSlider.value = yellowSize; - randomRangeSlider.value = randomRange; -#endif } }