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

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

This commit is contained in:
hirokei 2021-11-19 15:48:04 +09:00
parent 1939653407 a614121390
commit fabba6440a
7 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resources/Data/BulkOrderTextData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
WpLjb3vswLInLU9C9+DsmC+zxoGAkJxPaBBjnVz2/34og6KxuAWbdQVG37PnYYbd
rztTeqrSuFZzDkVHZ/hCxyF3tS1TCOr5MPYWUmRPRoQlzyNdU45J/sOwOhWKiRoN

2
popcorn/Assets/MyGame/Resources/Data/MissionData.txt
View File

File diff suppressed because one or more lines are too long

6
popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity
View File

@ -19067,7 +19067,7 @@ PrefabInstance:
- target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c,
type: 3}
@ -19077,7 +19077,7 @@ PrefabInstance:
- target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c,
type: 3}
@ -19132,7 +19132,7 @@ PrefabInstance:
- target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 10
value: -125
objectReference: {fileID: 0}
- target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c,
type: 3}

2
popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
View File

@ -855,7 +855,7 @@ MonoBehaviour:
counter: {fileID: 323920547}
triggerThrottle: 0.2
countDuration: 0.5
waitDisappeared: 3
waitDisappeared: 1.5
--- !u!223 &347092273
Canvas:
m_ObjectHideFlags: 0

15
popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity
View File

@ -203,6 +203,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8660695104952201896, guid: 7a0e45165860f4e5099d690b636937a8,
type: 3}
propertyPath: m_SortingOrder
value: 250
objectReference: {fileID: 0}
- target: {fileID: 8660695105013301477, guid: 7a0e45165860f4e5099d690b636937a8,
type: 3}
propertyPath: InitialModule.startColor.maxColor.b
value: 0.9607843
objectReference: {fileID: 0}
- target: {fileID: 8660695105013301478, guid: 7a0e45165860f4e5099d690b636937a8,
type: 3}
propertyPath: m_SortingOrder
value: 249
objectReference: {fileID: 0}
- target: {fileID: 8660695105553703394, guid: 7a0e45165860f4e5099d690b636937a8,
type: 3}
propertyPath: m_Name

72
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab
View File

@ -184,7 +184,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 140, y: 125.10004}
m_SizeDelta: {x: 240, y: 98}
m_SizeDelta: {x: 240, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1561612110923996906
CanvasRenderer:
@ -258,7 +258,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 705, y: 705}
m_SizeDelta: {x: 740, y: 740}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335139982202
CanvasRenderer:
@ -333,7 +333,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 705, y: 705}
m_SizeDelta: {x: 740, y: 740}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &922664456060550582
MonoBehaviour:
@ -401,7 +401,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 140, y: 125.10004}
m_SizeDelta: {x: 240, y: 98}
m_SizeDelta: {x: 240, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335268316948
CanvasRenderer:
@ -611,8 +611,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -98, y: -23}
m_SizeDelta: {x: 185, y: 36}
m_AnchoredPosition: {x: -98, y: -28.6}
m_SizeDelta: {x: 185, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9133304335344414330
GameObject:
@ -819,7 +819,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -71}
m_SizeDelta: {x: 648, y: 156}
m_SizeDelta: {x: 690, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335380453068
CanvasRenderer:
@ -1045,7 +1045,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 185, y: 36}
m_SizeDelta: {x: 200, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335498336186
CanvasRenderer:
@ -1111,7 +1111,7 @@ RectTransform:
m_GameObject: {fileID: 9133304335518990124}
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.2, y: 1.2, z: 1.2}
m_Children:
- {fileID: 9133304336647550438}
- {fileID: 9133304335307007778}
@ -1121,7 +1121,7 @@ RectTransform:
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: -139, y: 0}
m_AnchoredPosition: {x: -148, y: 0}
m_SizeDelta: {x: 300, y: 72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335518990113
@ -1233,8 +1233,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 4, y: 26}
m_SizeDelta: {x: 200, y: 48}
m_AnchoredPosition: {x: 4, y: 12}
m_SizeDelta: {x: 220, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335893567705
CanvasRenderer:
@ -1298,7 +1298,7 @@ RectTransform:
m_GameObject: {fileID: 9133304335899740160}
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.2, y: 1.2, z: 1.2}
m_Children:
- {fileID: 1859185896440214129}
- {fileID: 1859185894779871106}
@ -1307,7 +1307,7 @@ RectTransform:
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: 167, y: 0}
m_AnchoredPosition: {x: 188, y: 0}
m_SizeDelta: {x: 200, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9133304335940276435
@ -1348,7 +1348,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -159, y: 125.1}
m_SizeDelta: {x: 196, y: 98}
m_SizeDelta: {x: 196, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304335940276439
CanvasRenderer:
@ -1480,8 +1480,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 109.1, y: -26}
m_SizeDelta: {x: 130, y: 50}
m_AnchoredPosition: {x: 122.9, y: -29.8}
m_SizeDelta: {x: 140, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304336128604241
CanvasRenderer:
@ -1512,11 +1512,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 30
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 25
m_MaxSize: 30
m_MinSize: 30
m_MaxSize: 35
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
@ -1559,7 +1559,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 185, y: 30}
m_SizeDelta: {x: 211.9, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304336153810483
CanvasRenderer:
@ -1590,11 +1590,11 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 29
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 29
m_MinSize: 30
m_MaxSize: 35
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -1637,7 +1637,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 620, y: 120}
m_SizeDelta: {x: 660, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304336181127575
CanvasRenderer:
@ -1707,14 +1707,14 @@ RectTransform:
m_GameObject: {fileID: 9133304336235834663}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.38, y: 0.38, z: 0.38}
m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
m_Children: []
m_Father: {fileID: 9133304335893567655}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 26.1, y: -24.5}
m_AnchoredPosition: {x: 30.3, y: -28.299927}
m_SizeDelta: {x: 86, y: 92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304336235834712
@ -1779,7 +1779,7 @@ RectTransform:
m_GameObject: {fileID: 9133304336456421485}
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.2, y: 1.2, z: 1.2}
m_Children:
- {fileID: 9133304335452798351}
- {fileID: 9133304336756314527}
@ -1788,7 +1788,7 @@ RectTransform:
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: 167, y: 2.1}
m_AnchoredPosition: {x: 188, y: 2.1}
m_SizeDelta: {x: 94, y: 94}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9133304336500199658
@ -2244,7 +2244,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 520, y: 50}
m_SizeDelta: {x: 580, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304336883555432
CanvasRenderer:
@ -2275,7 +2275,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -2322,7 +2322,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -23.1}
m_SizeDelta: {x: 560, y: 6}
m_SizeDelta: {x: 600, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9133304336944246772
CanvasRenderer:
@ -2396,7 +2396,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -66}
m_SizeDelta: {x: 520, y: 50}
m_SizeDelta: {x: 580, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9133304337054428179
GameObject:
@ -2434,7 +2434,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 648, y: 156}
m_SizeDelta: {x: 660, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &9133304335910433000
PrefabInstance:
@ -2546,7 +2546,7 @@ PrefabInstance:
- target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975,
type: 3}
@ -2709,7 +2709,7 @@ PrefabInstance:
- target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: -10
objectReference: {fileID: 0}
- target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975,
type: 3}