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

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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  コーン焦げ時間調整
  フォントサイズ調整
  フォントサイズ調整
This commit is contained in:
kimura 2021-08-06 18:16:29 +09:00
parent 8f47a19cdc cfa0c67e36
commit d5726b1eb6
14 changed files with 332 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 61, y: 0, z: 60, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1 alphaIsTransparency: 1

BIN
popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_facility_off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_material_off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_button_icon_recipe_off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

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

@ -1,208 +1,208 @@
public class CornPopParameters public class CornPopParameters
{ {
public static readonly float[] CornPopTimeArray = { public static readonly float[] CornPopTimeArray = {
1f, 1f,
2.495f, 2.495f,
3.99f, 3.99f,
4.841f, 4.841f,
5.691f, 5.691f,
6.456f, 6.456f,
7.222f, 7.222f,
7.911f, 7.911f,
8.6f, 8.6f,
9.22f, 9.22f,
9.84f, 9.84f,
10.398f, 10.398f,
10.956f, 10.956f,
11.458f, 11.458f,
11.96f, 11.96f,
12.412f, 12.412f,
12.864f, 12.864f,
13.271f, 13.271f,
13.678f, 13.678f,
14.044f, 14.044f,
14.41f, 14.41f,
14.739f, 14.739f,
15.069f, 15.069f,
15.366f, 15.366f,
15.662f, 15.662f,
15.929f, 15.929f,
16.196f, 16.196f,
16.436f, 16.436f,
16.676f, 16.676f,
16.892f, 16.892f,
17.109f, 17.109f,
17.303f, 17.303f,
17.498f, 17.498f,
17.673f, 17.673f,
17.848f, 17.848f,
18.006f, 18.006f,
18.163f, 18.163f,
18.305f, 18.305f,
18.447f, 18.447f,
18.575f, 18.575f,
18.702f, 18.702f,
18.817f, 18.817f,
18.932f, 18.932f,
19.035f, 19.035f,
19.139f, 19.139f,
19.232f, 19.232f,
19.325f, 19.325f,
19.409f, 19.409f,
19.492f, 19.492f,
19.568f, 19.568f,
19.643f, 19.643f,
19.711f, 19.711f,
19.779f, 19.779f,
19.84f, 19.84f,
19.901f, 19.901f,
19.956f, 19.956f,
20.011f, 20.011f,
20.06f, 20.06f,
20.11f, 20.11f,
20.154f, 20.154f,
20.199f, 20.199f,
20.239f, 20.239f,
20.279f, 20.279f,
20.315f, 20.315f,
20.351f, 20.351f,
20.383f, 20.383f,
20.416f, 20.416f,
20.445f, 20.445f,
20.474f, 20.474f,
20.501f, 20.501f,
20.527f, 20.527f,
20.551f, 20.551f,
20.574f, 20.574f,
20.596f, 20.596f,
20.617f, 20.617f,
20.636f, 20.636f,
20.655f, 20.655f,
20.672f, 20.672f,
20.69f, 20.69f,
20.705f, 20.705f,
20.721f, 20.721f,
20.735f, 20.735f,
20.749f, 20.749f,
20.761f, 20.761f,
20.774f, 20.774f,
20.785f, 20.785f,
20.796f, 20.796f,
20.807f, 20.807f,
20.817f, 20.817f,
20.826f, 20.826f,
20.835f, 20.835f,
20.843f, 20.843f,
20.852f, 20.852f,
20.859f, 20.859f,
20.866f, 20.866f,
20.873f, 20.873f,
20.88f, 20.88f,
20.886f, 20.886f,
20.892f, 20.892f,
20.897f, 20.897f,
}; };
public static readonly float[] CornBurntTimeArray = { public static readonly float[] CornBurntTimeArray = {
10f, 6f,
9f, 5.5f,
8f, 5f,
6.95f, 4.5f,
5.9f, 4f,
5.1f, 3.5f,
4.3f, 3f,
3.75f, 6f,
3.2f, 5.89f,
2.9f, 5.78f,
2.6f, 5.67f,
2.55f, 5.56f,
2.5f, 5.45f,
2.45f, 5.34f,
2.4f, 5.23f,
2.4f, 5.12f,
2.4f, 5.01f,
2.4f, 4.9f,
2.4f, 4.79f,
2.4f, 4.68f,
2.4f, 4.57f,
2.4f, 4.46f,
2.4f, 4.35f,
2.4f, 4.24f,
2.4f, 4.13f,
2.4f, 4.02f,
2.4f, 3.91f,
2.4f, 3.8f,
2.4f, 3.69f,
2.4f, 3.58f,
2.4f, 3.47f,
2.4f, 3.36f,
2.4f, 3.25f,
2.4f, 3.14f,
2.4f, 3.03f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
2.4f, 3f,
}; };
} }

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

@ -338,10 +338,10 @@ RectTransform:
m_Father: {fileID: 2646634445844468798} m_Father: {fileID: 2646634445844468798}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 83.5, y: -32} m_AnchoredPosition: {x: 83.5, y: 68}
m_SizeDelta: {x: -227, y: 50} m_SizeDelta: {x: 250, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2929932626752093610 --- !u!222 &2929932626752093610
CanvasRenderer: CanvasRenderer:
@ -372,11 +372,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 35 m_FontSize: 23
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 0
m_MinSize: 0 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 23
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -494,8 +494,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.18002, y: -26} m_AnchoredPosition: {x: 85.6, y: -26}
m_SizeDelta: {x: 95, y: 50} m_SizeDelta: {x: 95, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2929932627123125672 --- !u!222 &2929932627123125672
CanvasRenderer: CanvasRenderer:
@ -529,15 +529,15 @@ MonoBehaviour:
m_FontSize: 25 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 22
m_MaxSize: 25 m_MaxSize: 25
m_Alignment: 4 m_Alignment: 5
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10000 m_Text: 100
--- !u!1 &2929932627350163027 --- !u!1 &2929932627350163027
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1481,12 +1481,6 @@ PrefabInstance:
m_RemovedComponents: m_RemovedComponents:
- {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3}
m_SourcePrefab: {fileID: 100100000, 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 --- !u!114 &6296255899301773980 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340,
@ -1499,3 +1493,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!224 &6296255899524172857 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340,
type: 3}
m_PrefabInstance: {fileID: 8101979052737494168}
m_PrefabAsset: {fileID: 0}

4
popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame.prefab
View File

@ -112,10 +112,10 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 28
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 25
m_MaxSize: 28 m_MaxSize: 28
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0

8
popcorn/Assets/MyGame/Scenes/recipe/Prefabs/MaterialFrame_stock.prefab
View File

@ -66,11 +66,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 28
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 25
m_MaxSize: 30 m_MaxSize: 28
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -116,7 +116,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 8.8, y: -110} m_AnchoredPosition: {x: 8.799988, y: -110}
m_SizeDelta: {x: 0, y: 50} m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &4307709386842909017 --- !u!222 &4307709386842909017

6
popcorn/Assets/MyGame/Scenes/recipe/Prefabs/NecessaryMaterial.prefab
View File

@ -140,11 +140,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 20 m_FontSize: 28
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 25
m_MaxSize: 25 m_MaxSize: 28
m_Alignment: 5 m_Alignment: 5
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1

102
popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
View File

@ -158,7 +158,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 4, y: 33} m_AnchoredPosition: {x: 4, y: 33}
m_SizeDelta: {x: 158, y: 48} m_SizeDelta: {x: 180, y: 48}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &138926719 --- !u!114 &138926719
MonoBehaviour: MonoBehaviour:
@ -180,7 +180,7 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 425f40ed32ef5974bb5fa6b1c836dc80, type: 3} m_Sprite: {fileID: 21300000, guid: 425f40ed32ef5974bb5fa6b1c836dc80, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -343,7 +343,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 5, y: -30} m_AnchoredPosition: {x: 5, y: -30}
m_SizeDelta: {x: 180, y: 34} m_SizeDelta: {x: 200, y: 34}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &326258103 --- !u!114 &326258103
MonoBehaviour: MonoBehaviour:
@ -366,11 +366,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 20 m_FontSize: 26
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 0
m_MinSize: 20 m_MinSize: 0
m_MaxSize: 24 m_MaxSize: 26
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -570,8 +570,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.18002, y: -26} m_AnchoredPosition: {x: 98.9, y: -25.4}
m_SizeDelta: {x: 95, y: 50} m_SizeDelta: {x: 115, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &498799267 --- !u!114 &498799267
MonoBehaviour: MonoBehaviour:
@ -594,18 +594,18 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 30
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 28
m_MaxSize: 25 m_MaxSize: 30
m_Alignment: 4 m_Alignment: 5
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 10000 m_Text: 100
--- !u!222 &498799268 --- !u!222 &498799268
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1449,7 +1449,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 6, y: 17} m_AnchoredPosition: {x: 6, y: 21}
m_SizeDelta: {x: 300, y: 50} m_SizeDelta: {x: 300, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &956402762 --- !u!114 &956402762
@ -1473,11 +1473,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 20 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 2 m_MinSize: 22
m_MaxSize: 23 m_MaxSize: 27
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -1666,11 +1666,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 14 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 10 m_MinSize: 20
m_MaxSize: 22 m_MaxSize: 25
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -1982,6 +1982,21 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 2086551031} m_TransformParent: {fileID: 2086551031}
m_Modifications: m_Modifications:
- target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3}
propertyPath: m_FontData.m_MaxSize
value: 28
objectReference: {fileID: 0}
- target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3}
propertyPath: m_FontData.m_MinSize
value: 25
objectReference: {fileID: 0}
- target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 28
objectReference: {fileID: 0}
- target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -2368,11 +2383,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 20 m_FontSize: 26
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 0
m_MinSize: 20 m_MinSize: 2
m_MaxSize: 24 m_MaxSize: 26
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -2721,7 +2736,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 77, y: -207} m_AnchoredPosition: {x: 77, y: -204}
m_SizeDelta: {x: 370, y: 85} m_SizeDelta: {x: 370, y: 85}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2045825934 --- !u!114 &2045825934
@ -2745,18 +2760,18 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 20 m_FontSize: 23
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 0
m_MinSize: 18 m_MinSize: 0
m_MaxSize: 20 m_MaxSize: 25
m_Alignment: 0 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u6642\u9593\u304C\u304B\u304C\u308B\u304C\u7126\u3052\u306B\u304F\u304F\u4F7F\u3044\u3084\u3059\u3044\r\n\u521D\u5FC3\u8005\u5411\u3051\u306E\u30D5\u30E9\u30A4\u30D1\u30F3" m_Text: "\u6642\u9593\u304C\u5C11\u3057\u304B\u304B\u308B\u304C\n\u7126\u3052\u306B\u304F\u304F\u4F7F\u3044\u3084\u3059\u3044\n\r\u521D\u5FC3\u8005\u5411\u3051\u306E\u30D5\u30E9\u30A4\u30D1\u30F3"
--- !u!222 &2045825935 --- !u!222 &2045825935
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3442,18 +3457,18 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 28
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 25
m_MaxSize: 30 m_MaxSize: 28
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 9999/25 m_Text: 999/250
--- !u!1 &5352886968946593876 --- !u!1 &5352886968946593876
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3578,6 +3593,21 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 2086551031} m_TransformParent: {fileID: 2086551031}
m_Modifications: m_Modifications:
- target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3}
propertyPath: m_FontData.m_MaxSize
value: 28
objectReference: {fileID: 0}
- target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3}
propertyPath: m_FontData.m_MinSize
value: 25
objectReference: {fileID: 0}
- target: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 28
objectReference: {fileID: 0}
- target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name

20
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab
View File

@ -334,11 +334,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 30 m_FontSize: 40
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 2 m_MinSize: 35
m_MaxSize: 30 m_MaxSize: 40
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -985,7 +985,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -21, y: 60} m_AnchoredPosition: {x: -21, y: 59.4}
m_SizeDelta: {x: 380, y: 40} m_SizeDelta: {x: 380, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8536603424255746890 --- !u!222 &8536603424255746890
@ -1017,11 +1017,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 23 m_MinSize: 30
m_MaxSize: 25 m_MaxSize: 35
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 0 m_RichText: 0
@ -1170,11 +1170,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 30 m_FontSize: 40
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 2 m_MinSize: 35
m_MaxSize: 30 m_MaxSize: 40
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1

42
popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity
View File

@ -781,7 +781,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 208.2, y: -1.9} m_AnchoredPosition: {x: 208.2, y: -2.8}
m_SizeDelta: {x: 145, y: 50} m_SizeDelta: {x: 145, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &174704449 --- !u!114 &174704449
@ -805,18 +805,18 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 30 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 0 m_MinSize: 32
m_MaxSize: 40 m_MaxSize: 35
m_Alignment: 5 m_Alignment: 5
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 3000 m_Text: 30000
--- !u!222 &174704450 --- !u!222 &174704450
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1011,7 +1011,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 4, y: 26} m_AnchoredPosition: {x: 4, y: 26}
m_SizeDelta: {x: 158, y: 48} m_SizeDelta: {x: 200, y: 48}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &581137343 --- !u!114 &581137343
MonoBehaviour: MonoBehaviour:
@ -1033,7 +1033,7 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 425f40ed32ef5974bb5fa6b1c836dc80, type: 3} m_Sprite: {fileID: 21300000, guid: 425f40ed32ef5974bb5fa6b1c836dc80, type: 3}
m_Type: 0 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
m_FillMethod: 4 m_FillMethod: 4
@ -1658,8 +1658,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.18002, y: -26} m_AnchoredPosition: {x: 109.1, y: -26}
m_SizeDelta: {x: 95, y: 50} m_SizeDelta: {x: 130, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1352733511 --- !u!114 &1352733511
MonoBehaviour: MonoBehaviour:
@ -1682,12 +1682,12 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 30
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 0 m_MinSize: 25
m_MaxSize: 25 m_MaxSize: 30
m_Alignment: 4 m_Alignment: 5
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -1760,18 +1760,18 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 14 m_FontSize: 25
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 10 m_MinSize: 20
m_MaxSize: 22 m_MaxSize: 25
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u6240\u6301\u6570 :1000" m_Text: "\u6240\u6301\u6570 :100"
--- !u!222 &1361083690 --- !u!222 &1361083690
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2117,7 +2117,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -17} m_AnchoredPosition: {x: 0, y: -23.1}
m_SizeDelta: {x: 512, y: 6} m_SizeDelta: {x: 512, y: 6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1640187116 --- !u!114 &1640187116
@ -2215,7 +2215,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 25 m_FontSize: 35
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 2
@ -2345,7 +2345,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -7, y: -201} m_AnchoredPosition: {x: -7, y: -207.9}
m_SizeDelta: {x: 550, y: 230} m_SizeDelta: {x: 550, y: 230}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1965424766 --- !u!1 &1965424766

6
popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity
View File

@ -520,11 +520,11 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 28 m_FontSize: 32
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 300
m_Alignment: 4 m_Alignment: 4
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
@ -598,7 +598,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 24 m_FontSize: 27
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 2

6
popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
View File

@ -378,7 +378,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -9.000015}
m_SizeDelta: {x: 218, y: 114} m_SizeDelta: {x: 218, y: 114}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &225351270 --- !u!114 &225351270
@ -777,7 +777,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -9}
m_SizeDelta: {x: 218, y: 114} m_SizeDelta: {x: 218, y: 114}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &432591955 --- !u!114 &432591955
@ -1961,7 +1961,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -9.000015}
m_SizeDelta: {x: 218, y: 114} m_SizeDelta: {x: 218, y: 114}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1085629574 --- !u!114 &1085629574