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

This commit is contained in:
koya_15 2021-07-15 12:26:01 +09:00
commit 1f16a2e0e9
6 changed files with 408 additions and 637 deletions

View File

@ -1312,43 +1312,23 @@ PrefabInstance:
- target: {fileID: 91222054387263441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 91222054387263441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -890
objectReference: {fileID: 0}
- target: {fileID: 96162680560671871, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u6700\u5927\u51B7\u5374\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 476906389138455430, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 200
objectReference: {fileID: 0}
- target: {fileID: 481924709813747141, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 507056512842051545, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "Hot\u6642\u4E0A\u6607\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 608696602171851566, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 627587725713367640, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1372,58 +1352,23 @@ PrefabInstance:
- target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 662934999055142313, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -410
objectReference: {fileID: 0}
- target: {fileID: 876722673034629423, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 993816989521844384, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1062147305873528289, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1062147305873528289, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1062147305873528289, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1062147305873528289, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1062147305873528289, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1065851863675664592, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1074510875190235646, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1447,23 +1392,13 @@ PrefabInstance:
- target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 1112382072943771151, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -530
objectReference: {fileID: 0}
- target: {fileID: 1116416693750171041, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u6570"
objectReference: {fileID: 0}
- target: {fileID: 1178550771222649028, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1487,7 +1422,7 @@ PrefabInstance:
- target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 1207237267587803519, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
@ -1504,56 +1439,16 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1278038431495819962, guid: b0a57f0d9e5524e579cad0309e9d44d1,
- target: {fileID: 1610756631820064505, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u304C\n\u5F3E\u3051\u308B\u5F37\u3055"
objectReference: {fileID: 0}
- target: {fileID: 1664834096015488296, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 1755420798692535453, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 100
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1781371987602575692, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1927981503880492078, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Name
value: FailedCount
objectReference: {fileID: 0}
- target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1943039892745546559, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1964816351379147906, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1582,12 +1477,12 @@ PrefabInstance:
- target: {fileID: 2271744707010736330, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 2271744707010736330, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1610
value: -1730
objectReference: {fileID: 0}
- target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
@ -1612,58 +1507,18 @@ PrefabInstance:
- target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 2438367493108694558, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1370
objectReference: {fileID: 0}
- target: {fileID: 2494801367756121574, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2494801367756121574, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2494801367756121574, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2494801367756121574, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2494801367756121574, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -1490
objectReference: {fileID: 0}
- target: {fileID: 2671874387844563542, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2741716342712525385, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 2857281799084547238, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Name
value: CornCount
objectReference: {fileID: 0}
- target: {fileID: 3005143316066694067, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3049583156368776163, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1692,83 +1547,13 @@ PrefabInstance:
- target: {fileID: 3168295903013582761, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 3168295903013582761, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -170
objectReference: {fileID: 0}
- target: {fileID: 3180199370115656702, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 3197505165811137441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3197505165811137441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3197505165811137441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3197505165811137441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3197505165811137441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3197505165811137441, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3343183325941849022, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3453285338774953070, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593\n0~1\u79D2\u30E9\u30F3\u30C0\u30E0\u3067\u8FFD\u52A0"
objectReference: {fileID: 0}
- target: {fileID: 3492363002399964332, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Value
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3492363002399964332, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_WholeNumbers
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3495454367822427755, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3609852046670687529, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u5931\u6557\u3057\u3066\u3082\u826F\u3044\n\u30B3\u30FC\u30F3\u6570"
objectReference: {fileID: 0}
- target: {fileID: 3711613621533759003, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 3720408156129738549, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1797,48 +1582,18 @@ PrefabInstance:
- target: {fileID: 3771789703286377036, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 3771789703286377036, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1490
value: -1610
objectReference: {fileID: 0}
- target: {fileID: 3890342366235348115, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3942904769723343795, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3942904769723343795, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3942904769723343795, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 900
objectReference: {fileID: 0}
- target: {fileID: 3942904769723343795, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 3942904769723343795, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 410.10715
objectReference: {fileID: 0}
- target: {fileID: 3942904769723343795, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1730
objectReference: {fileID: 0}
- target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1862,7 +1617,7 @@ PrefabInstance:
- target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 3987940865115793980, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
@ -1874,41 +1629,16 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4134966358512830540, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u30B2\u30FC\u30B8\nYelow/Hot\u5883\u754C"
objectReference: {fileID: 0}
- target: {fileID: 4197929611356534648, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4207008739032098876, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u304C\n\u98DB\u3073\u51FA\u3059\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 4311820225849857357, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4311820225849857357, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4311820225849857357, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4321421045039387406, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 200
objectReference: {fileID: 0}
- target: {fileID: 4333201332210061145, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -1932,18 +1662,13 @@ PrefabInstance:
- target: {fileID: 4333201332210061145, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
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
@ -1967,27 +1692,47 @@ PrefabInstance:
- target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 4771112501857001908, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1130
value: -1250
objectReference: {fileID: 0}
- target: {fileID: 4851060677529136802, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4976605781460055265, guid: b0a57f0d9e5524e579cad0309e9d44d1,
- target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u30B2\u30FC\u30B8\nCold/Yellow\u5883\u754C"
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5038472069214748131, guid: b0a57f0d9e5524e579cad0309e9d44d1,
- target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 10
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 900
objectReference: {fileID: 0}
- target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 5028291535338148132, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1130
objectReference: {fileID: 0}
- target: {fileID: 5284969908565993462, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
@ -2104,186 +1849,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908849183537, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908849183537, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908849183537, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908849183537, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908849183537, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908849183537, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908906193739, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908906193739, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908906193739, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908906193739, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908906193739, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969908906193739, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909030512776, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909030512776, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909030512776, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909030512776, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909030512776, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909030512776, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909260197457, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909260197457, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909260197457, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909260197457, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909260197457, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969909260197457, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910498127746, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910498127746, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910498127746, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910498127746, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910498127746, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910498127746, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910636069747, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910636069747, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910636069747, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910636069747, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910636069747, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5284969910636069747, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -2307,43 +1872,18 @@ PrefabInstance:
- target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 5416192627147036305, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -650
objectReference: {fileID: 0}
- target: {fileID: 5457281739188262246, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5479824536871896004, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "Hot\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 5482079058029049623, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5544059043823831750, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5734970426196978286, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5969116567130955788, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5969116567130955788, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -2354,11 +1894,6 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6318208262153647494, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6530691989741587060, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -2374,41 +1909,6 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7186769019143881139, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 7194319626984850694, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7194319626984850694, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7194319626984850694, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7194319626984850694, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7194319626984850694, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7229225113813647163, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -2432,33 +1932,23 @@ PrefabInstance:
- target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 7234701249961237988, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1250
value: -1370
objectReference: {fileID: 0}
- target: {fileID: 7262785623888489953, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7289807045889352814, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7478945014870838673, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7488019742486762197, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_Text
value: "\u6E29\u5EA6\u4E0A\u6607\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -2482,23 +1972,13 @@ PrefabInstance:
- target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 510.10718
value: 510.10715
objectReference: {fileID: 0}
- target: {fileID: 7624753188443107493, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -290
objectReference: {fileID: 0}
- target: {fileID: 7664150871271751572, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
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: 7929372799703231730, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: maxValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8047938833745119364, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
@ -2524,6 +2004,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9176832860087133112, guid: b0a57f0d9e5524e579cad0309e9d44d1,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3}
--- !u!224 &657773246 stripped
@ -9502,6 +8987,18 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!114 &1661453984 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8429433239281863257, 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
@ -9904,6 +9401,7 @@ MonoBehaviour:
type: 3}
cornSpawnCount: 50
maxFailedCornCount: 10
coldGrowSpeed: 0.1
baseGrowSpeed: 1
hotGrowSpeed: 2
baseCornPopTime: 12.5
@ -9912,6 +9410,7 @@ MonoBehaviour:
cornPopSpeed: 20
cornCountSlider: {fileID: 657773260}
faildCountSlider: {fileID: 657773259}
coldGrowSpeedSlider: {fileID: 1661453984}
hotGrowSpeedSlider: {fileID: 657773258}
popTimeSlider: {fileID: 657773257}
burntDurationSlider: {fileID: 657773256}

View File

@ -1,41 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &774891937227878148
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5998483152276597559}
m_Layer: 0
m_Name: Control
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5998483152276597559
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 774891937227878148}
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: 3009159661648502780}
m_Father: {fileID: 74534877661002025}
m_RootOrder: 2
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: 0, y: 0}
m_SizeDelta: {x: 400, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!1 &1677767607159343418
GameObject:
m_ObjectHideFlags: 0
@ -69,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, y: 0}
m_AnchoredPosition: {x: -5.0000305, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2876606376949105246
@ -104,7 +68,7 @@ RectTransform:
m_Children:
- {fileID: 4479773526412999563}
- {fileID: 9206954437394057716}
- {fileID: 5998483152276597559}
- {fileID: 3009159661648502780}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -457,21 +421,21 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7912557860526418570}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 6396645106939475831}
- {fileID: 5497658110233898209}
- {fileID: 6998303038176274871}
m_Father: {fileID: 5998483152276597559}
m_RootOrder: 0
m_Father: {fileID: 74534877661002025}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 368.73462, y: 46.091827}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -15, y: 0}
m_SizeDelta: {x: 368.73462, y: 63.7}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &3475518114244289108
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -551,6 +551,7 @@ RectTransform:
- {fileID: 3987940865115793980}
- {fileID: 91222054387263441}
- {fileID: 4333201332210061145}
- {fileID: 5028291535338148132}
- {fileID: 4771112501857001908}
- {fileID: 7234701249961237988}
- {fileID: 2438367493108694558}
@ -1542,10 +1543,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u6570"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
value: DebugParameter (7)
value: CornCount
objectReference: {fileID: 0}
- target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -1677,11 +1688,31 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "Hot\u6642\u4E0A\u6607\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
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
@ -1802,6 +1833,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u6700\u5927\u51B7\u5374\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -1937,10 +1978,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 0.1
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
value: DebugParameter
value: Sense
objectReference: {fileID: 0}
- target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -1980,7 +2031,7 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_RootOrder
value: 13
value: 14
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2072,6 +2123,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u304C\n\u5F3E\u3051\u308B\u5F37\u3055"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -2115,7 +2176,7 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 12
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2207,6 +2268,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593\n0~1\u79D2\u30E9\u30F3\u30C0\u30E0\u3067\u8FFD\u52A0"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -2342,10 +2413,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 0.1
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
value: DebugParameter (1)
value: DeadZone
objectReference: {fileID: 0}
- target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2385,7 +2466,7 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_RootOrder
value: 12
value: 13
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2477,6 +2558,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u30B3\u30FC\u30F3\u304C\n\u98DB\u3073\u51FA\u3059\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -2612,6 +2703,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u30B2\u30FC\u30B8\nYelow/Hot\u5883\u754C"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -2655,7 +2756,7 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_RootOrder
value: 14
value: 15
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2665,7 +2766,7 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2675,17 +2776,17 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 900
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: 100
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2725,12 +2826,12 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 410.10715
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -1730
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2752,15 +2853,20 @@ PrefabInstance:
propertyPath: m_Name
value: DebugParameter (14)
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5952165577170501364, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3}
@ -2882,10 +2988,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u5931\u6557\u3057\u3066\u3082\u826F\u3044\n\u30B3\u30FC\u30F3\u6570"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
value: DebugParameter (8)
value: FailedCount
objectReference: {fileID: 0}
- target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -2906,6 +3022,151 @@ RectTransform:
m_PrefabInstance: {fileID: 4407426121755080304}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4845495625434847389
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4971887160877779298}
m_Modifications:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "Hot\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
value: DebugParameter (9)
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 &4771112501857001908 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
m_PrefabInstance: {fileID: 4845495625434847389}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4954198807650985997
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
@ -3017,10 +3278,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 10
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "Cold\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
value: DebugParameter (9)
value: ColdCornSpeed
objectReference: {fileID: 0}
- target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -3034,11 +3305,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3}
--- !u!224 &4771112501857001908 stripped
--- !u!224 &5028291535338148132 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
m_PrefabInstance: {fileID: 4845495625434847389}
m_PrefabInstance: {fileID: 4954198807650985997}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5342082161051447224
PrefabInstance:
@ -3152,6 +3423,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u30B2\u30FC\u30B8\nCold/Yellow\u5883\u754C"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -3195,7 +3476,7 @@ PrefabInstance:
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
@ -3287,6 +3568,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 100
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
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: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name
@ -3422,6 +3713,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: maxValue
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1095104764996803417, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Text
value: "\u6E29\u5EA6\u4E0A\u6607\u901F\u5EA6"
objectReference: {fileID: 0}
- target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087,
type: 3}
propertyPath: m_Name

View File

@ -21,7 +21,8 @@ public class CornManager : MonoBehaviour
[SerializeField] private int cornSpawnCount = 20;
[SerializeField] private int maxFailedCornCount = 10;
[SerializeField, ReadOnly] private float baseGrowSpeed = 1f;
[SerializeField] private float hotGrowSpeed;
[SerializeField] private float coldGrowSpeed = .1f;
[SerializeField] private float hotGrowSpeed = 2f;
[SerializeField] private float baseCornPopTime = 5f;
[SerializeField] private float cornBurntDuration = 5f;
[SerializeField] private float cornSpillSpeed = 50f;
@ -44,6 +45,7 @@ public class CornManager : MonoBehaviour
#if DEVELOPMENT_BUILD || UNITY_EDITOR
[SerializeField] private Slider cornCountSlider;
[SerializeField] private Slider faildCountSlider;
[SerializeField] private Slider coldGrowSpeedSlider;
[SerializeField] private Slider hotGrowSpeedSlider;
[SerializeField] private Slider popTimeSlider;
[SerializeField] private Slider burntDurationSlider;
@ -82,6 +84,7 @@ public class CornManager : MonoBehaviour
cornCountSlider.value = cornSpawnCount;
faildCountSlider.wholeNumbers = true;
faildCountSlider.value = maxFailedCornCount;
coldGrowSpeedSlider.value = coldGrowSpeed;
hotGrowSpeedSlider.value = hotGrowSpeed;
popTimeSlider.value = baseCornPopTime;
burntDurationSlider.value = cornBurntDuration;
@ -90,6 +93,7 @@ public class CornManager : MonoBehaviour
cornCountSlider.OnValueChangedAsObservable().Subscribe(x => cornSpawnCount = (int)x).AddTo(this);
faildCountSlider.OnValueChangedAsObservable().Subscribe(x => maxFailedCornCount = (int)x).AddTo(this);
coldGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => coldGrowSpeed = x).AddTo(this);
hotGrowSpeedSlider.OnValueChangedAsObservable().Subscribe(x => hotGrowSpeed = x).AddTo(this);
popTimeSlider.OnValueChangedAsObservable().Subscribe(x => baseCornPopTime = x).AddTo(this);
burntDurationSlider.OnValueChangedAsObservable().Subscribe(x => cornBurntDuration = x).AddTo(this);
@ -201,7 +205,7 @@ public class CornManager : MonoBehaviour
{
case ThermalCondition.Cold:
isHot = false;
cornGrowSpeed.Value = 0f;
cornGrowSpeed.Value = coldGrowSpeed;
break;
case ThermalCondition.Yellow:
isHot = false;

View File

@ -67,6 +67,7 @@ public class MainGameDebugView : MonoBehaviour
0.65f,
50f,
10f,
.1f,
2f,
12.5f,
1.5f,
@ -85,6 +86,7 @@ public class MainGameDebugView : MonoBehaviour
0.55f,
50f,
20f,
.1f,
2f,
12.5f,
1.5f,

View File

@ -53,7 +53,7 @@ public class ThermalControl : MonoBehaviour
{
condition.AddTo(this);
#if UNITY_EDITOR
condition.DistinctUntilChanged().Subscribe(x =>
condition.Subscribe(x =>
{
Debug.Log($"cond :{x} temp: {temperature}");
}).AddTo(this);
@ -130,6 +130,7 @@ public class ThermalControl : MonoBehaviour
{
isMove = true;
panController.enabled = true;
condition.SetValueAndForceNotify(GetCondition());
}
public void StopMeter()