diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab index 83ff54ee..b15e8677 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab @@ -33,7 +33,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5.0000305, y: 0} + m_AnchoredPosition: {x: -5.000061, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2876606376949105246 @@ -67,7 +67,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4479773526412999563} - - {fileID: 9206954437394057716} + - {fileID: 9143851948024293878} - {fileID: 3009159661648502780} m_Father: {fileID: 0} m_RootOrder: 0 @@ -75,7 +75,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 900, y: 100} + m_SizeDelta: {x: 900, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &491621608902190462 MonoBehaviour: @@ -90,7 +90,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: text: {fileID: 1095104764996803417} - value: {fileID: 72149009873864757} + inputField: {fileID: 897396180863686974} slider: {fileID: 3475518114244289108} minValue: 0 maxValue: 0 @@ -131,6 +131,146 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3274499932230645930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9143851948024293878} + - component: {fileID: 3419366076015106744} + - component: {fileID: 590428595889232007} + - component: {fileID: 897396180863686974} + m_Layer: 0 + m_Name: InputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9143851948024293878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + 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: 619926225662647783} + m_Father: {fileID: 74534877661002025} + 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: 150.47, y: 0} + m_SizeDelta: {x: 559.05005, y: 91.47} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3419366076015106744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + m_CullTransparentMesh: 0 +--- !u!114 &590428595889232007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + 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: 10911, 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 &897396180863686974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, 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: 590428595889232007} + m_TextComponent: {fileID: 3432115779824197160} + m_Placeholder: {fileID: 0} + m_ContentType: 3 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 2 + m_LineType: 0 + m_HideMobileInput: 0 + m_CharacterValidation: 2 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: 0.000000 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!1 &3826102410214529843 GameObject: m_ObjectHideFlags: 0 @@ -166,7 +306,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 300, y: -10} + m_SizeDelta: {x: 270.56714, y: -10} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3190204835267579441 CanvasRenderer: @@ -209,7 +349,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: TextTestTextTest ---- !u!1 &5987920068234996123 +--- !u!1 &6223501935553774239 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -217,50 +357,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9206954437394057716} - - component: {fileID: 2057185061937190269} - - component: {fileID: 72149009873864757} + - component: {fileID: 619926225662647783} + - component: {fileID: 538406132838563980} + - component: {fileID: 3432115779824197160} m_Layer: 0 - m_Name: Value + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9206954437394057716 +--- !u!224 &619926225662647783 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5987920068234996123} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6223501935553774239} + 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: 74534877661002025} - m_RootOrder: 1 + m_Father: {fileID: 9143851948024293878} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -400, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &2057185061937190269 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5000038} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &538406132838563980 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5987920068234996123} + m_GameObject: {fileID: 6223501935553774239} m_CullTransparentMesh: 0 ---- !u!114 &72149009873864757 +--- !u!114 &3432115779824197160 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5987920068234996123} + m_GameObject: {fileID: 6223501935553774239} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -275,18 +415,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 70 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 100 - m_Alignment: 3 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 0 m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 0000 + m_Text: 0.000000 --- !u!1 &6757487088329549315 GameObject: m_ObjectHideFlags: 0 @@ -413,7 +553,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3009159661648502780 RectTransform: m_ObjectHideFlags: 0 @@ -434,7 +574,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 368.73462, y: 63.7} + m_SizeDelta: {x: 318.0871, y: 63.7} m_Pivot: {x: 1, y: 0.5} --- !u!114 &3475518114244289108 MonoBehaviour: @@ -519,7 +659,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -593,7 +733,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs index 2d49aa2f..a0d71fbd 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs @@ -8,29 +8,32 @@ using UnityEngine.UI; public class MainGameDebugParameter : MonoBehaviour { [SerializeField] private Text text; - [SerializeField] private Text value; + [SerializeField] private InputField inputField; [SerializeField] private Slider slider; [SerializeField] private float minValue; [SerializeField] private float maxValue; - // [SerializeField] private String paramName; - + + public IObservable OnValueChange => slider.OnValueChangedAsObservable() + .Merge(inputField.OnEndEditAsObservable().Select(float.Parse)) + .TakeUntilDestroy(this); + void Awake() { slider.minValue = minValue; slider.maxValue = maxValue; // text.text = paramName; - slider.OnValueChangedAsObservable().SubscribeToText(value, f => $"{f:F3}"); + OnValueChange.Subscribe(x => + { + inputField.text = $"{x:0.######}"; + SetValue(x); + }).AddTo(this); } public void SetValue(float value) { + // maxValueを超えた値が来た場合そちらを優先する + slider.maxValue = Mathf.Max(slider.maxValue, value); slider.value = value; } - - // Update is called once per frame - void Update() - { - - } }