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:
  お客さん吹き出しに購入数追加
  会話クエスチョンSE１回のみ
  大量注文会話枠調整
  タイトル画面カメラサイズ調整
  アイコンとスプラッシュの設定
  店舗レベルの数字大きさ調整
  加工したフォント調整
This commit is contained in:
kimura 2021-11-18 13:40:11 +09:00
parent 44765eb7af 4100c17a26
commit b9506c8413
23 changed files with 2206 additions and 1835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resource/Animation/Brother/Brother_ef_Question.anim
View File

@ -118,7 +118,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0

18
popcorn/Assets/MyGame/Resource/Animation/EarnedCoins.anim
View File

@ -57,15 +57,15 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: 443
inSlope: 33.600002
outSlope: 33.600002
inSlope: 63.90001
outSlope: 63.90001
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8333333
value: 450
time: 1.3333334
value: 494.2
inSlope: 0
outSlope: 0
tangentMode: 136
@ -177,7 +177,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.8333333
m_StopTime: 1.3333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -208,15 +208,15 @@ AnimationClip:
- serializedVersion: 3
time: 0.16666667
value: 443
inSlope: 33.600002
outSlope: 33.600002
inSlope: 63.90001
outSlope: 63.90001
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.8333333
value: 450
time: 1.3333334
value: 494.2
inSlope: 0
outSlope: 0
tangentMode: 136

4
popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset
View File

@ -5717,10 +5717,10 @@ Material:
- _OutlineSoftness: 0
- _OutlineUVSpeedX: 0
- _OutlineUVSpeedY: 0
- _OutlineWidth: 0.63
- _OutlineWidth: 0.7
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.6217617
- _ScaleRatioA: 0.59308076
- _ScaleRatioB: 0.16424999
- _ScaleRatioC: 0.16424999
- _ScaleX: 1

16
popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF_Red.asset
View File

File diff suppressed because one or more lines are too long

3474
popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF_White edge.asset
View File

File diff suppressed because one or more lines are too long

182
popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab
View File

@ -4915,6 +4915,181 @@ SortingGroup:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 19
--- !u!1 &1092181693449319662
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8505724812089943112}
- component: {fileID: 8292803671486116808}
- component: {fileID: 2553052695395965287}
- component: {fileID: 364609804150918069}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8505724812089943112
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1092181693449319662}
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: 4886416729748261545}
m_RootOrder: 3
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.649, y: 0.51}
m_SizeDelta: {x: 1, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &8292803671486116808
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1092181693449319662}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 6b0ec8d08c1e64575b9889e8f2732bd0, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
--- !u!222 &2553052695395965287
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1092181693449319662}
m_CullTransparentMesh: 0
--- !u!114 &364609804150918069
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1092181693449319662}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: x1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 6b0ec8d08c1e64575b9889e8f2732bd0, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 5
m_fontSizeBase: 5
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 6
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 8292803671486116808}
m_maskType: 0
_SortingLayerID: 0
_SortingOrder: 0
--- !u!1 &2471704596236347950
GameObject:
m_ObjectHideFlags: 0
@ -6631,6 +6806,7 @@ Transform:
- {fileID: 4886416730275037410}
- {fileID: 4886416729808650664}
- {fileID: 4202605991405497019}
- {fileID: 8505724812089943112}
m_Father: {fileID: 4886416728471897984}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -6772,7 +6948,7 @@ Transform:
m_GameObject: {fileID: 4886416729808650647}
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: []
m_Father: {fileID: 4886416729748261545}
m_RootOrder: 1
@ -7485,8 +7661,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4886416730275037409}
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
m_LocalPosition: {x: 0.338, y: 0.621, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_LocalPosition: {x: 0.236, y: 0.775, z: 0}
m_LocalScale: {x: 0.65, y: 0.65, z: 0.65}
m_Children:
- {fileID: 2617542989482238824}
m_Father: {fileID: 4886416729748261545}

52
popcorn/Assets/MyGame/Scenes/Main/Main.unity
View File

@ -5193,11 +5193,6 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916833545329524, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_SizeDelta.x
@ -5228,6 +5223,53 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.x
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.y
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalScale.z
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -152
objectReference: {fileID: 0}
- target: {fileID: 3664916833948146493, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -7.7
objectReference: {fileID: 0}
- target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_fontSize
value: 40
objectReference: {fileID: 0}
- target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555,
type: 2}
- target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_fontSizeBase
value: 40
objectReference: {fileID: 0}
- target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 5374284371091958195, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555,
type: 2}
- target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_IsActive

16
popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab
View File

@ -446,8 +446,8 @@ 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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_AnchoredPosition: {x: -313, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4082915277894373616
GameObject:
@ -633,8 +633,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: 430, y: -57.6}
m_SizeDelta: {x: 550, y: 100}
m_AnchoredPosition: {x: 446, y: -57.6}
m_SizeDelta: {x: 580, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4082915277970689976
CanvasRenderer:
@ -1212,7 +1212,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: -301, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 118, y: 118}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4082915278807493228
@ -1806,7 +1806,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: -302.2, y: -44.2}
m_AnchoredPosition: {x: 0, y: -44.2}
m_SizeDelta: {x: 82, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4082915279096126319
@ -2034,7 +2034,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 635}
m_SizeDelta: {x: 720, y: 116}
m_SizeDelta: {x: 750, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4082915279204653804
GameObject:
@ -2071,7 +2071,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 43, y: 0}
m_SizeDelta: {x: 634, y: 116}
m_SizeDelta: {x: 656, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4082915279204653793
CanvasRenderer:

18
popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab
View File

@ -180,14 +180,14 @@ RectTransform:
m_GameObject: {fileID: 2377818823009469882}
m_LocalRotation: {x: -0, y: -0, z: 0.09801341, w: 0.99518514}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children: []
m_Father: {fileID: 2377818824381547236}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.250001}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -306, y: -6}
m_AnchoredPosition: {x: -358, y: -6}
m_SizeDelta: {x: 118, y: 118}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2377818823009469881
@ -910,8 +910,8 @@ 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: 115, y: -17}
m_SizeDelta: {x: 600, y: 125}
m_AnchoredPosition: {x: 119, y: -23}
m_SizeDelta: {x: 690, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2377818823780007095
CanvasRenderer:
@ -947,13 +947,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u305F\u304F\u3055\u3093\u3042\u308A\u304C\u3068\u3046"
m_Text: "\u307F\u3093\u306A\u559C\u3093\u3067\u304F\u308C\u305F\u3088\uFF01\r\n\u3042\u308A\u304C\u3068\u3046\uFF01"
--- !u!1 &2377818823802633427
GameObject:
m_ObjectHideFlags: 0
@ -1368,7 +1368,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: -141, y: 62}
m_AnchoredPosition: {x: -175, y: 62}
m_SizeDelta: {x: 82, y: 34}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2377818824163143827
@ -1798,8 +1798,8 @@ 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: 0, y: 381.99994}
m_SizeDelta: {x: 876, y: 234}
m_AnchoredPosition: {x: -10, y: 382}
m_SizeDelta: {x: 980, y: 234}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2377818824381547234
CanvasRenderer:

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information.meta → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information.meta
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/Canvas.prefab.meta → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab.meta
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_MaterialInventory.prefab → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_MaterialInventory.prefab
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_MaterialInventory.prefab.meta → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_MaterialInventory.prefab.meta
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_ProductInventory.prefab → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_ProductInventory.prefab
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_ProductInventory.prefab.meta → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_ProductInventory.prefab.meta
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_histoy.prefab → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_histoy.prefab
View File

0
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_histoy.prefab.meta → popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/detail_histoy.prefab.meta
View File

24
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab
View File

@ -1851,18 +1851,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3}
--- !u!1 &3664916833752817996 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
type: 3}
m_PrefabInstance: {fileID: 2246654624185019878}
m_PrefabAsset: {fileID: 0}
--- !u!224 &3664916833752817997 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
type: 3}
m_PrefabInstance: {fileID: 2246654624185019878}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3664916833752817996 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691,
type: 3}
m_PrefabInstance: {fileID: 2246654624185019878}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3691625806369805098
PrefabInstance:
m_ObjectHideFlags: 0
@ -2104,18 +2104,18 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3}
--- !u!1 &3664916834242367712 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963,
type: 3}
m_PrefabInstance: {fileID: 3691625806369805098}
m_PrefabAsset: {fileID: 0}
--- !u!224 &3664916834242367713 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963,
type: 3}
m_PrefabInstance: {fileID: 3691625806369805098}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3664916834242367712 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963,
type: 3}
m_PrefabInstance: {fileID: 3691625806369805098}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7577981076568039546
PrefabInstance:
m_ObjectHideFlags: 0

4
popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
View File

@ -705,8 +705,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35
m_fontSizeBase: 35
m_fontSize: 40
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18

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

@ -1205,7 +1205,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 12.5
orthographic size: 11.04
m_Depth: -1
m_CullingMask:
serializedVersion: 2

14
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/EarnedCoins.prefab
View File

@ -27,7 +27,7 @@ RectTransform:
m_GameObject: {fileID: 8159396421177597464}
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: []
m_Father: {fileID: 8159396421809467538}
m_RootOrder: 0
@ -147,7 +147,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_Spacing: 5
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
@ -265,7 +265,7 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 1454425
rgba: 4279644505
m_fontColor: {r: 0.34901962, g: 0.19215687, b: 0.08627451, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
@ -283,17 +283,17 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 45
m_fontSizeBase: 45
m_fontSize: 50
m_fontSizeBase: 50
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 15.35
m_fontSizeMax: 64.4
m_fontStyle: 1
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterSpacing: 14
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: -0.49

215
popcorn/ProjectSettings/ProjectSettings.asset
View File

@ -16,12 +16,12 @@ PlayerSettings:
productName: popcorn
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1
m_SplashScreenAnimation: 0
m_SplashScreenLogoStyle: 0
m_SplashScreenDrawMode: 0
m_SplashScreenBackgroundAnimationZoom: 1
m_SplashScreenLogoAnimationZoom: 1
@ -39,8 +39,11 @@ PlayerSettings:
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: 8505ae4422e0645d7b82c63b6ae9615b, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 8505ae4422e0645d7b82c63b6ae9615b,
type: 3}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
@ -265,8 +268,206 @@ PlayerSettings:
androidGamepadSupportLevel: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
m_BuildTargetPlatformIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 1968fb06f1fc9c84e9f1d8dd4fabad09, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons:
- m_BuildTarget: iPhone
m_Icons:
- m_Textures: []
m_Width: 180
m_Height: 180
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 167
m_Height: 167
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 152
m_Height: 152
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 76
m_Height: 76
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 87
m_Height: 87
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 60
m_Height: 60
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 20
m_Height: 20
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 1024
m_Height: 1024
m_Kind: 4
m_SubKind: App Store
- m_BuildTarget: Android
m_Icons:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 0
m_SubKind:
- m_Textures:
- {fileID: 2800000, guid: b3801ebc99491c249b4fbc3854b0c918, type: 3}
- {fileID: 2800000, guid: 16624c12eb1f70d418699050cb4b5de2, type: 3}
m_Width: 432
m_Height: 432
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 324
m_Height: 324
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 216
m_Height: 216
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 162
m_Height: 162
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 108
m_Height: 108
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 81
m_Height: 81
m_Kind: 2
m_SubKind:
m_BuildTargetBatching: []
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport