yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-08-04 17:47:17 +09:00
parent 9a09c154f6 978c19b3e9
commit 0f59a336dc
16 changed files with 1720 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
View File

@ -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
@ -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

12
popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab
View File

@ -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}

258
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs
View File

@ -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,
};
}

31
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs
View File

@ -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;

11
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -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);
});
}
}

85
popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab
View File

@ -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:

8
popcorn/Assets/MyGame/Scenes/recipe/Scripts.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 677f8f5cfef694b24a98e4462d9d3768
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

12
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs Normal file
View File

@ -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;
}
}

3
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 5193219b46d047b595b22809e43804a1
timeCreated: 1628058980

63
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs Normal file
View File

@ -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);
}
}
}

11
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2154205f893c042a390e4b410b5b5ea5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

30
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs Normal file
View File

@ -0,0 +1,30 @@
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}";
public IObservable<Unit> RecipeClickObservable => detailButton.OnClickAsObservable().TakeUntilDestroy(this);
private void Start()
{
}
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);
}
}

3
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 47bc31a2c7d14478bd4ebe3c32e41185
timeCreated: 1628059076

1411
popcorn/Assets/MyGame/Scenes/recipe/recipe.unity
View File

File diff suppressed because it is too large Load Diff

2
popcorn/Assets/MyGame/Scripts/TransitionManager.cs
View File

@ -9,6 +9,8 @@ public enum GameScenes
Main,
Cooking,
CornField,
Recipe,
RecipeChoice,
SettingsDialog,
DebugOption,
UnableWatchVideoDialog,

9
popcorn/ProjectSettings/EditorBuildSettings.asset
View File

@ -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: {}