From f932934db6053b9d6bba0a25eaf9a0f08db50899 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 14 Jul 2021 14:12:17 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=81=AB?= =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E3=82=B7=E3=83=BC=E3=83=B3=E3=81=B8?= =?UTF-8?q?=E3=81=AE=E9=81=B7=E7=A7=BB=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 | 33 +-- .../Cooking/Prefabs/DebugParameter.prefab | 2 +- .../Scenes/Cooking/Prefabs/DebugView.prefab | 233 ++++++++++++++++-- .../Cooking/Scripts/MainGameDebugView.cs | 5 + 4 files changed, 231 insertions(+), 42 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 6c5fce40..7eeebb80 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -1164,7 +1164,7 @@ PrefabInstance: - target: {fileID: 91222054387263441, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 91222054387263441, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1224,7 +1224,7 @@ PrefabInstance: - target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1299,7 +1299,7 @@ PrefabInstance: - target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1339,7 +1339,7 @@ PrefabInstance: - target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1434,7 +1434,7 @@ PrefabInstance: - target: {fileID: 2271744707010736330, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 2271744707010736330, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1464,7 +1464,7 @@ PrefabInstance: - target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1544,7 +1544,7 @@ PrefabInstance: - target: {fileID: 3168295903013582761, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 3168295903013582761, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1649,7 +1649,7 @@ PrefabInstance: - target: {fileID: 3771789703286377036, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 3771789703286377036, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1714,7 +1714,7 @@ PrefabInstance: - target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -1784,13 +1784,18 @@ PrefabInstance: - target: {fileID: 4333201332210061145, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 4333201332210061145, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.y value: -1010 objectReference: {fileID: 0} + - target: {fileID: 4449818114142116960, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchorMax.y @@ -1814,7 +1819,7 @@ PrefabInstance: - target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -2154,7 +2159,7 @@ PrefabInstance: - target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -2279,7 +2284,7 @@ PrefabInstance: - target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -2329,7 +2334,7 @@ PrefabInstance: - target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchoredPosition.x - value: 410.10715 + value: 510.10718 objectReference: {fileID: 0} - target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab index e6acc9e5..300bc307 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab @@ -244,7 +244,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Close + m_Text: TextTestTextTest --- !u!1 &5987920068234996123 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 e0d2b1b0..59de27c3 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab @@ -78,6 +78,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30D1\u30BF\u30FC\u30F3\uFF12" +--- !u!1 &472006361173282404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4140395521699310764} + - component: {fileID: 3302955830178679139} + - component: {fileID: 8242868838447147877} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4140395521699310764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472006361173282404} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1160474325582570968} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3302955830178679139 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472006361173282404} + m_CullTransparentMesh: 0 +--- !u!114 &8242868838447147877 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472006361173282404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u30E1\u30A4\u30F3\u306B\n\u623B\u308B" --- !u!1 &608696602171851566 GameObject: m_ObjectHideFlags: 0 @@ -109,6 +187,7 @@ RectTransform: - {fileID: 8387935088226281029} - {fileID: 8286853419815727351} - {fileID: 4336101879092561992} + - {fileID: 1160474325582570968} - {fileID: 881613488373358922} - {fileID: 4971887160877779298} m_Father: {fileID: 5284969908565993463} @@ -119,6 +198,125 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1162830844850121652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1160474325582570968} + - component: {fileID: 2505729874336374508} + - component: {fileID: 3463608572823271386} + - component: {fileID: 8346684863944409345} + m_Layer: 0 + m_Name: BackMainButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1160474325582570968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162830844850121652} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4140395521699310764} + m_Father: {fileID: 4303795378509814408} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 590, y: -30} + m_SizeDelta: {x: 150, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2505729874336374508 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162830844850121652} + m_CullTransparentMesh: 0 +--- !u!114 &3463608572823271386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162830844850121652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8346684863944409345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162830844850121652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + 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} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3463608572823271386} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2503808969632153177 GameObject: m_ObjectHideFlags: 0 @@ -229,12 +427,12 @@ RectTransform: m_Children: - {fileID: 568747320455404892} m_Father: {fileID: 4303795378509814408} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -30, y: -30} - m_SizeDelta: {x: 300, y: 100} + m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 1, y: 1} --- !u!222 &6487049893294274262 CanvasRenderer: @@ -360,12 +558,12 @@ RectTransform: - {fileID: 2271744707010736330} - {fileID: 3942904769723343795} m_Father: {fileID: 4303795378509814408} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -100} - m_SizeDelta: {x: -200, y: -200} + m_SizeDelta: {x: 0, y: -200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7883455930803081654 MonoBehaviour: @@ -522,6 +720,7 @@ MonoBehaviour: showDebugButton: {fileID: 1835835199602684098} closeDebugButton: {fileID: 6674939901714048809} gameResetButton: {fileID: 2152797965052096507} + backMainButton: {fileID: 8346684863944409345} view: {fileID: 608696602171851566} pattern1: {fileID: 7720918852878828156} pattern2: {fileID: 958025840167371830} @@ -836,8 +1035,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 470, y: -30} - m_SizeDelta: {x: 200, y: 100} + m_AnchoredPosition: {x: 420, y: -30} + m_SizeDelta: {x: 150, y: 100} m_Pivot: {x: 0, y: 1} --- !u!222 &1680282534423946932 CanvasRenderer: @@ -1149,7 +1348,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 250, y: -30} - m_SizeDelta: {x: 200, y: 100} + m_SizeDelta: {x: 150, y: 100} m_Pivot: {x: 0, y: 1} --- !u!222 &334852932963138782 CanvasRenderer: @@ -1483,16 +1682,6 @@ PrefabInstance: propertyPath: m_Name value: DebugParameter (3) objectReference: {fileID: 0} - - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5952165577170501364, guid: 4b152553cae694e4fb6cd75d23ba5087, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &662934999055142313 stripped @@ -1748,11 +1937,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, - type: 3} - propertyPath: m_Text - value: "\u30D5\u30E9\u30A4\u30D1\u30F3\u611F\u5EA6" - objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name @@ -2158,11 +2342,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087, - type: 3} - propertyPath: m_Text - value: DeadZone - objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs index b9f4eb66..4f223750 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs @@ -10,6 +10,7 @@ public class MainGameDebugView : MonoBehaviour [SerializeField] private Button showDebugButton; [SerializeField] private Button closeDebugButton; [SerializeField] private Button gameResetButton; + [SerializeField] private Button backMainButton; [SerializeField] private GameObject view; [SerializeField] private Button pattern1; @@ -41,6 +42,10 @@ public class MainGameDebugView : MonoBehaviour { view.SetActive(false); }).AddTo(this); + backMainButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.LoadScene(GameScenes.Main); + }).AddTo(this); pattern1.OnClickAsObservable().Subscribe(_ => { SetPreset(preset1);