diff --git a/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim b/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim index e32b3062..746ef1bc 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Machine_putOut.anim @@ -240,7 +240,7 @@ AnimationClip: m_HasMotionFloatCurves: 0 m_Events: - time: 0 - functionName: OnPlayVibrationOnce + functionName: OnPlayVibrationOnceWeak data: objectReferenceParameter: {fileID: 0} floatParameter: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim b/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim index 6c23db31..094fd922 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Tap_reaction.anim @@ -752,7 +752,7 @@ AnimationClip: intParameter: 0 messageOptions: 0 - time: 0.033333335 - functionName: OnPlayVibrationOnce + functionName: OnPlayVibrationOnceWeak data: objectReferenceParameter: {fileID: 0} floatParameter: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 98e1441b..5692fa87 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -785,7 +785,7 @@ RectTransform: - {fileID: 308891213} - {fileID: 698470367} m_Father: {fileID: 2144327477} - m_RootOrder: 1 + 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} @@ -1038,7 +1038,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2144327477} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1082,6 +1082,100 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1728771686} m_CullTransparentMesh: 0 +--- !u!1 &1754970737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1754970738} + - component: {fileID: 1754970741} + - component: {fileID: 1754970740} + - component: {fileID: 1754970739} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1754970738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754970737} + 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: 2144327477} + m_RootOrder: 0 + 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: 2048, y: 2732} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1754970739 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754970737} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 09ef68c9f0336934a928483fe08ec427, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1754970740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754970737} + 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: 0.9372549, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &1754970741 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1754970737} + m_CullTransparentMesh: 0 --- !u!1 &1848874147 GameObject: m_ObjectHideFlags: 0 @@ -1221,6 +1315,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1754970738} - {fileID: 1728771687} - {fileID: 884928058} m_Father: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 45c95e6e..437a8ded 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -27,7 +27,7 @@ RectTransform: m_GameObject: {fileID: 515072792329783960} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 2157734177276742269} m_RootOrder: 0 @@ -289,11 +289,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 28 + m_MinSize: 3 + m_MaxSize: 35 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -440,7 +440,7 @@ RectTransform: m_GameObject: {fileID: 3068393799277523995} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 3477121770257347838} m_RootOrder: 0 @@ -1584,8 +1584,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 89, y: -2} - m_SizeDelta: {x: 64, y: 50} + m_AnchoredPosition: {x: 136.2, y: -2} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6701890203883728053 CanvasRenderer: @@ -1616,11 +1616,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 28 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -1848,8 +1848,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 89, y: -2} - m_SizeDelta: {x: 64, y: 50} + m_AnchoredPosition: {x: 136.2, y: -2} + m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8120304310888387126 CanvasRenderer: @@ -1880,11 +1880,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 28 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -1919,7 +1919,7 @@ RectTransform: m_GameObject: {fileID: 8713368702720867389} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 7077462476696796376} m_RootOrder: 0 @@ -2179,6 +2179,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c82036225f2d453cac3ff9fb07fae4d, type: 3} +--- !u!224 &5676996117682643678 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0} --- !u!114 &5676996117682643677 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, @@ -2191,9 +2197,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01738374a494495b82539c6ff39c1a3a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &5676996117682643678 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, - type: 3} - m_PrefabInstance: {fileID: 5112378705130438364} - m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index db08e075..4daba86d 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -1149,6 +1149,11 @@ PrefabInstance: propertyPath: m_FontData.m_MaxSize value: 28 objectReference: {fileID: 0} + - target: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 25 + objectReference: {fileID: 0} - target: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_FontData.m_FontSize @@ -1184,18 +1189,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7519072249774920432 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 1133216431126940221} - m_PrefabAsset: {fileID: 0} --- !u!224 &2929932625336302236 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_PrefabInstance: {fileID: 1133216431126940221} m_PrefabAsset: {fileID: 0} +--- !u!224 &7519072249774920432 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 1133216431126940221} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1330168031711161346 PrefabInstance: m_ObjectHideFlags: 0 @@ -1468,6 +1473,11 @@ PrefabInstance: propertyPath: m_FontData.m_MaxSize value: 28 objectReference: {fileID: 0} + - target: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 25 + objectReference: {fileID: 0} - target: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_FontData.m_FontSize @@ -1486,24 +1496,6 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} ---- !u!1 &367551539495355422 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} ---- !u!224 &367551539495355423 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} ---- !u!224 &5037808626432961651 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 2452498385069847742} - m_PrefabAsset: {fileID: 0} --- !u!114 &367551539734858426 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1516,6 +1508,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5037808626432961651 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7485231107204569293, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} +--- !u!224 &367551539495355423 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} +--- !u!1 &367551539495355422 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2814970099097301152, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 2452498385069847742} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8101979052737494168 PrefabInstance: m_ObjectHideFlags: 0 @@ -1663,6 +1673,11 @@ PrefabInstance: propertyPath: m_FontData.m_MaxSize value: 28 objectReference: {fileID: 0} + - target: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 25 + objectReference: {fileID: 0} - target: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_FontData.m_FontSize @@ -1676,12 +1691,6 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} ---- !u!224 &6296255899524172857 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 8101979052737494168} - m_PrefabAsset: {fileID: 0} --- !u!114 &6296255899301773980 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1694,3 +1703,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6296255899524172857 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 8101979052737494168} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab index bdc05b58..76908be2 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab @@ -80,7 +80,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 134, y: -2} + m_AnchoredPosition: {x: 132.2, y: -0.4} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2814970099411582469 @@ -112,11 +112,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 28 + m_MinSize: 30 + m_MaxSize: 35 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -251,6 +251,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 56 objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1 + objectReference: {fileID: 0} - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, type: 3} propertyPath: m_LocalPosition.x diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab index 092f85e5..5410557c 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab @@ -66,11 +66,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 25 - m_MaxSize: 28 + m_MinSize: 28 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -222,7 +222,7 @@ RectTransform: m_GameObject: {fileID: 7859107217004789462} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 114} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 6693321828800561202} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab index ba9d5962..82ce6382 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab @@ -101,7 +101,7 @@ RectTransform: m_GameObject: {fileID: 2358514311597240715} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 6739113353957456840} m_RootOrder: 0 @@ -218,7 +218,7 @@ MonoBehaviour: m_FontStyle: 0 m_BestFit: 1 m_MinSize: 25 - m_MaxSize: 28 + m_MaxSize: 30 m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 0c26b1a9..a8e51497 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -329,7 +329,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 111842754} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -537,6 +537,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1767569254} - {fileID: 96916715} - {fileID: 329292690} m_Father: {fileID: 0} @@ -1018,7 +1019,7 @@ RectTransform: - {fileID: 199954321} - {fileID: 1455181832} m_Father: {fileID: 111842754} - m_RootOrder: 1 + 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} @@ -1187,7 +1188,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1197,17 +1198,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 505.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1247,12 +1248,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 676.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -330 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1554,7 +1555,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1564,17 +1565,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 505.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1614,12 +1615,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 252.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -330 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2720,7 +2721,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2730,17 +2731,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 505.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2780,12 +2781,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 676.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3266,6 +3267,100 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!1 &1767569253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1767569254} + - component: {fileID: 1767569257} + - component: {fileID: 1767569256} + - component: {fileID: 1767569255} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1767569254 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767569253} + 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: 111842754} + m_RootOrder: 0 + 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: 2048, y: 2732} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1767569255 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767569253} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 09ef68c9f0336934a928483fe08ec427, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1767569256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767569253} + 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: 0.9372549, a: 0.19607843} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + 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!222 &1767569257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767569253} + m_CullTransparentMesh: 0 --- !u!1001 &1771084670 PrefabInstance: m_ObjectHideFlags: 0 @@ -3296,7 +3391,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3306,17 +3401,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 505.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3356,12 +3451,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 252.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -610 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3966,7 +4061,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3976,17 +4071,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 505.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -4026,12 +4121,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 252.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3}