Finished changing score to amount of photos

This commit is contained in:
2025-11-18 12:45:36 +01:00
parent 219f2239a1
commit 2c4e90b698
5 changed files with 159 additions and 154 deletions

View File

@@ -25,18 +25,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 663813761358815781} m_GameObject: {fileID: 663813761358815781}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 5708275729410901669} m_Father: {fileID: 2194526835228101506}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.62433946} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.74959403} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 44.236, y: 228.31436}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -131.81, y: 134.5491}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2828019556092814789 --- !u!222 &2828019556092814789
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -92,7 +92,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 136.85 m_fontSize: 134.5
m_fontSizeBase: 72 m_fontSizeBase: 72
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
@@ -166,7 +166,9 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 1965178107275650778}
- {fileID: 2759880600983436529}
m_Father: {fileID: 5708275729410901669} m_Father: {fileID: 5708275729410901669}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.0212202, y: 0} m_AnchorMin: {x: 0.0212202, y: 0}
@@ -258,8 +260,6 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 2194526835228101506} - {fileID: 2194526835228101506}
- {fileID: 1965178107275650778}
- {fileID: 2759880600983436529}
- {fileID: 754661265897109340} - {fileID: 754661265897109340}
m_Father: {fileID: 592992386388815559} m_Father: {fileID: 592992386388815559}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -336,17 +336,17 @@ RectTransform:
m_GameObject: {fileID: 1649201712728354542} m_GameObject: {fileID: 1649201712728354542}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0677084, y: 1.0677084, z: 1.0677084} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 6509531303802704468} - {fileID: 6509531303802704468}
- {fileID: 19951787490115460} - {fileID: 19951787490115460}
m_Father: {fileID: 5708275729410901669} m_Father: {fileID: 2194526835228101506}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.15518795, y: 0.41016972} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0.84949106, y: 0.586} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 44.237, y: 30.066}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: -131.81, y: 261.95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2430067199507798593 --- !u!114 &2430067199507798593
MonoBehaviour: MonoBehaviour:
@@ -366,11 +366,11 @@ MonoBehaviour:
m_Top: 0 m_Top: 0
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 4 m_ChildAlignment: 4
m_Spacing: 0 m_Spacing: 25
m_ChildForceExpandWidth: 1 m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1 m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1 m_ChildControlWidth: 0
m_ChildControlHeight: 1 m_ChildControlHeight: 0
m_ChildScaleWidth: 0 m_ChildScaleWidth: 0
m_ChildScaleHeight: 0 m_ChildScaleHeight: 0
m_ReverseArrangement: 0 m_ReverseArrangement: 0
@@ -408,9 +408,9 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 754661265897109340} m_Father: {fileID: 754661265897109340}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 640.62054, y: 0} m_AnchoredPosition: {x: 672.49915, y: -149.50665}
m_SizeDelta: {x: 268, y: 0} m_SizeDelta: {x: 268, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1768576830901014477 --- !u!222 &1768576830901014477
@@ -682,9 +682,9 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6509531303802704468} - component: {fileID: 6509531303802704468}
- component: {fileID: 2205574065701906917} - component: {fileID: 2205574065701906917}
- component: {fileID: 4125557264992545207} - component: {fileID: 6388610750262107744}
m_Layer: 0 m_Layer: 0
m_Name: ScoreLabel m_Name: PhotoIcon
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@@ -699,7 +699,7 @@ RectTransform:
m_GameObject: {fileID: 3025814654250773583} m_GameObject: {fileID: 3025814654250773583}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.93658537, y: 0.93658537, z: 0.93658537} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2759880600983436529} m_Father: {fileID: 2759880600983436529}
@@ -707,7 +707,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 256, y: 256}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2205574065701906917 --- !u!222 &2205574065701906917
CanvasRenderer: CanvasRenderer:
@@ -717,7 +717,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3025814654250773583} m_GameObject: {fileID: 3025814654250773583}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &4125557264992545207 --- !u!114 &6388610750262107744
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@@ -726,9 +726,9 @@ MonoBehaviour:
m_GameObject: {fileID: 3025814654250773583} m_GameObject: {fileID: 3025814654250773583}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
@@ -737,77 +737,16 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 'SCORE:' m_Sprite: {fileID: 1917382497509789248, guid: 8d568408ea5f183458e17af541af2d8e, type: 3}
m_isRightToLeft: 0 m_Type: 0
m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_PreserveAspect: 0
m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_FillCenter: 1
m_fontSharedMaterials: [] m_FillMethod: 4
m_fontMaterial: {fileID: 0} m_FillAmount: 1
m_fontMaterials: [] m_FillClockwise: 1
m_fontColor32: m_FillOrigin: 0
serializedVersion: 2 m_UseSpriteMesh: 0
rgba: 4285311121 m_PixelsPerUnitMultiplier: 1
m_fontColor: {r: 0.5686275, g: 0.65882355, b: 0.42352942, 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: 192.1
m_fontSizeBase: 100
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 0.1
m_fontSizeMax: 400
m_fontStyle: 1
m_HorizontalAlignment: 4
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
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_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &3907121777593230662 --- !u!1 &3907121777593230662
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -835,7 +774,7 @@ RectTransform:
m_GameObject: {fileID: 3907121777593230662} m_GameObject: {fileID: 3907121777593230662}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.93658537, y: 0.93658537, z: 0.93658537} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2759880600983436529} m_Father: {fileID: 2759880600983436529}
@@ -843,7 +782,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 193.7712, y: 239.61}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8369606923535336432 --- !u!222 &8369606923535336432
CanvasRenderer: CanvasRenderer:
@@ -873,7 +812,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 1346 m_text: x4
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2}
m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2}
@@ -900,7 +839,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 192.1 m_fontSize: 239.6
m_fontSizeBase: 72 m_fontSizeBase: 72
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
@@ -978,9 +917,9 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 754661265897109340} m_Father: {fileID: 754661265897109340}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 270.45056, y: 0} m_AnchoredPosition: {x: 302.32916, y: -149.50665}
m_SizeDelta: {x: 42, y: 0} m_SizeDelta: {x: 42, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2782310018074465201 --- !u!222 &2782310018074465201
@@ -1125,9 +1064,9 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 754661265897109340} m_Father: {fileID: 754661265897109340}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1010.7905, y: 0} m_AnchoredPosition: {x: 1042.6692, y: -149.50665}
m_SizeDelta: {x: 42, y: 0} m_SizeDelta: {x: 42, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8344156654954553365 --- !u!222 &8344156654954553365
@@ -1274,8 +1213,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.10938991, y: 0.11800001} m_AnchorMin: {x: 0.10938991, y: 0.11800001}
m_AnchorMax: {x: 0.94400007, y: 0.41016972} m_AnchorMax: {x: 0.94400007, y: 0.41016972}
m_AnchoredPosition: {x: -0.00024414062, y: 0} m_AnchoredPosition: {x: 4.8622, y: 0}
m_SizeDelta: {x: -86.75, y: -20.246} m_SizeDelta: {x: -22.9929, y: -20.246}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!114 &7750609879083104855 --- !u!114 &7750609879083104855
MonoBehaviour: MonoBehaviour:

View File

@@ -306,6 +306,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 471921060} - {fileID: 471921060}
- {fileID: 341271022} - {fileID: 341271022}
- {fileID: 1450108938}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@@ -419,16 +420,16 @@ LineRenderer:
m_SortingOrder: 0 m_SortingOrder: 0
m_Positions: m_Positions:
- {x: -0.15602553, y: 4.074945, z: 0} - {x: -0.15602553, y: 4.074945, z: 0}
- {x: -0.1566351, y: 3.9736378, z: 0} - {x: -0.1566351, y: 3.973638, z: 0}
- {x: -0.1572447, y: 3.8729856, z: 0} - {x: -0.1572447, y: 3.8729856, z: 0}
- {x: -0.15785426, y: 3.7729874, z: 0} - {x: -0.15785426, y: 3.7729874, z: 0}
- {x: -0.15846384, y: 3.6736436, z: 0} - {x: -0.15846384, y: 3.6736436, z: 0}
- {x: -0.15907341, y: 3.5749538, z: 0} - {x: -0.15907341, y: 3.574954, z: 0}
- {x: -0.15968299, y: 3.476919, z: 0} - {x: -0.15968299, y: 3.4769192, z: 0}
- {x: -0.16029257, y: 3.3795385, z: 0} - {x: -0.16029257, y: 3.3795385, z: 0}
- {x: -0.16090216, y: 3.2828124, z: 0} - {x: -0.16090216, y: 3.2828126, z: 0}
- {x: -0.16151173, y: 3.1867404, z: 0} - {x: -0.16151173, y: 3.1867409, z: 0}
- {x: -0.16212131, y: 3.0913231, z: 0} - {x: -0.16212131, y: 3.0913236, z: 0}
m_Parameters: m_Parameters:
serializedVersion: 3 serializedVersion: 3
widthMultiplier: 1 widthMultiplier: 1
@@ -966,6 +967,7 @@ MonoBehaviour:
picturesTaken: 0 picturesTaken: 0
deathAudioPlayer: {fileID: 199536377} deathAudioPlayer: {fileID: 199536377}
cameraViewfinderManager: {fileID: 424805727} cameraViewfinderManager: {fileID: 424805727}
scoreCanvasObject: {fileID: 341271021}
--- !u!4 &424805726 --- !u!4 &424805726
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1347,8 +1349,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 52.88064, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 105.76128, y: 217.37007} m_SizeDelta: {x: 0, y: 217.37007}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &495116985 --- !u!114 &495116985
MonoBehaviour: MonoBehaviour:
@@ -2084,17 +2086,17 @@ LineRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Positions: m_Positions:
- {x: -0.15602553, y: 4.074945, z: 0} - {x: -0.15602553, y: 4.0749445, z: 0}
- {x: -0.11662118, y: 3.8796225, z: 0} - {x: -0.11662118, y: 3.879622, z: 0}
- {x: -0.07721684, y: 3.7057445, z: 0} - {x: -0.07721684, y: 3.7057445, z: 0}
- {x: -0.03781248, y: 3.5533106, z: 0} - {x: -0.03781248, y: 3.5533106, z: 0}
- {x: 0.0015918687, y: 3.4223213, z: 0} - {x: 0.0015918687, y: 3.4223216, z: 0}
- {x: 0.040996216, y: 3.312776, z: 0} - {x: 0.040996216, y: 3.3127766, z: 0}
- {x: 0.08040057, y: 3.2246754, z: 0} - {x: 0.08040057, y: 3.2246761, z: 0}
- {x: 0.11980491, y: 3.1580195, z: 0} - {x: 0.11980491, y: 3.15802, z: 0}
- {x: 0.15920927, y: 3.1128078, z: 0} - {x: 0.15920927, y: 3.1128082, z: 0}
- {x: 0.1986136, y: 3.0890403, z: 0} - {x: 0.1986136, y: 3.0890405, z: 0}
- {x: 0.23801796, y: 3.0867171, z: 0} - {x: 0.23801796, y: 3.0867176, z: 0}
m_Parameters: m_Parameters:
serializedVersion: 3 serializedVersion: 3
widthMultiplier: 1 widthMultiplier: 1
@@ -2804,17 +2806,17 @@ LineRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Positions: m_Positions:
- {x: -0.15602553, y: 4.074945, z: 0} - {x: -0.15602553, y: 4.0749445, z: 0}
- {x: -0.18956745, y: 3.8764977, z: 0} - {x: -0.18956745, y: 3.8764973, z: 0}
- {x: -0.22310936, y: 3.7000234, z: 0} - {x: -0.22310936, y: 3.7000232, z: 0}
- {x: -0.25665125, y: 3.5455205, z: 0} - {x: -0.25665125, y: 3.5455203, z: 0}
- {x: -0.29019317, y: 3.412991, z: 0} - {x: -0.29019317, y: 3.412991, z: 0}
- {x: -0.32373506, y: 3.3024333, z: 0} - {x: -0.32373506, y: 3.3024335, z: 0}
- {x: -0.35727698, y: 3.213848, z: 0} - {x: -0.35727698, y: 3.2138484, z: 0}
- {x: -0.39081886, y: 3.1472356, z: 0} - {x: -0.39081886, y: 3.1472359, z: 0}
- {x: -0.4243608, y: 3.1025958, z: 0} - {x: -0.4243608, y: 3.1025958, z: 0}
- {x: -0.45790267, y: 3.0799277, z: 0} - {x: -0.45790267, y: 3.0799282, z: 0}
- {x: -0.4914446, y: 3.0792325, z: 0} - {x: -0.4914446, y: 3.079233, z: 0}
m_Parameters: m_Parameters:
serializedVersion: 3 serializedVersion: 3
widthMultiplier: 1 widthMultiplier: 1
@@ -2905,6 +2907,11 @@ MonoBehaviour:
ropeDamping: 0.3 ropeDamping: 0.3
initialSeparationDistance: 0.1 initialSeparationDistance: 0.1
initialFallImpulse: 2 initialFallImpulse: 2
--- !u!4 &1450108938 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
m_PrefabInstance: {fileID: 8347532583749285323}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1579704002 --- !u!1 &1579704002
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3662,7 +3669,7 @@ Transform:
m_GameObject: {fileID: 2106431001} m_GameObject: {fileID: 2106431001}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.165, y: 2.697517, z: 0} m_LocalPosition: {x: -0.165, y: 2.6975174, z: 0}
m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574} m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -3724,7 +3731,7 @@ PrefabInstance:
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 116234201}
m_Modifications: m_Modifications:
- target: {fileID: 353945067315692781, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 353945067315692781, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
@@ -3788,11 +3795,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0.20093 value: -767.7991
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 2.44859 value: -1021.5514
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
@@ -3804,15 +3811,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
@@ -3834,6 +3841,10 @@ PrefabInstance:
propertyPath: introVO propertyPath: introVO
value: value:
objectReference: {fileID: 8300000, guid: fca641cdc8dcd074483fad3db1cbe24c, type: 3} objectReference: {fileID: 8300000, guid: fca641cdc8dcd074483fad3db1cbe24c, type: 3}
- target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: scoreCanvas
value:
objectReference: {fileID: 341271021}
- target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: playTutorial propertyPath: playTutorial
value: 1 value: 1
@@ -3842,6 +3853,54 @@ PrefabInstance:
propertyPath: bottleAudioPlayer propertyPath: bottleAudioPlayer
value: value:
objectReference: {fileID: 747976408} objectReference: {fileID: 747976408}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_SizeDelta.x
value: 1619.9999
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_SizeDelta.y
value: 2160
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalScale.x
value: 0.9481482
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalScale.y
value: 0.9481482
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalScale.z
value: 0.9481482
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_AnchoredPosition.x
value: 767.7991
objectReference: {fileID: 0}
- target: {fileID: 4592376486413311028, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_AnchoredPosition.y
value: 1021.5514
objectReference: {fileID: 0}
- target: {fileID: 8452897808363562605, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3} - target: {fileID: 8452897808363562605, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
propertyPath: m_Sprite propertyPath: m_Sprite
value: value:
@@ -3878,6 +3937,5 @@ SceneRoots:
- {fileID: 323864665} - {fileID: 323864665}
- {fileID: 424805726} - {fileID: 424805726}
- {fileID: 1651034646} - {fileID: 1651034646}
- {fileID: 8347532583749285323}
- {fileID: 1928843372} - {fileID: 1928843372}
- {fileID: 199536378} - {fileID: 199536378}

View File

@@ -101,6 +101,7 @@ namespace Minigames.DivingForPictures
public AudioSource deathAudioPlayer; public AudioSource deathAudioPlayer;
public CameraViewfinderManager cameraViewfinderManager; public CameraViewfinderManager cameraViewfinderManager;
public GameObject scoreCanvasObject;
public static DivingGameManager Instance => _instance; public static DivingGameManager Instance => _instance;
@@ -629,9 +630,9 @@ namespace Minigames.DivingForPictures
deathAudioPlayer.Stop(); deathAudioPlayer.Stop();
CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic",true); CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic",true);
CinematicsManager.Instance.ChangeCinematicBackgroundColour(new Color(0.5058824f, 0.7803922f, 0.8862746f, 1f)); CinematicsManager.Instance.ChangeCinematicBackgroundColour(new Color(0.5058824f, 0.7803922f, 0.8862746f, 1f));
//PlayerHudManager.Instance.ResizeCinematicPlayer();
//surfacingTimeline.Play(); // Remove score canvas
//Logging.Debug("[DivingGameManager] Last tile left the screen, playing timeline"); scoreCanvasObject.SetActive(false);
} }
else else
@@ -646,6 +647,8 @@ namespace Minigames.DivingForPictures
CinematicsManager.Instance.OnCinematicStopped -= EndGame; CinematicsManager.Instance.OnCinematicStopped -= EndGame;
// Start the end game sequence that grants a booster, waits for the UI animation, then shows Game Over. // Start the end game sequence that grants a booster, waits for the UI animation, then shows Game Over.
StartCoroutine(EndGameSequence()); StartCoroutine(EndGameSequence());
} }
private IEnumerator EndGameSequence() private IEnumerator EndGameSequence()

View File

@@ -39,8 +39,8 @@ namespace UI
// Update score when showing the screen // Update score when showing the screen
if (DivingGameManager.Instance != null) if (DivingGameManager.Instance != null)
{ {
int finalScore = DivingGameManager.Instance.PlayerScore; int finalScore = DivingGameManager.Instance.picturesTaken;
finalScoreText.text = $"{finalScore}"; finalScoreText.text = $"x {finalScore}";
} }
if (canvasGroup != null) if (canvasGroup != null)

View File

@@ -22,6 +22,7 @@ namespace UI.Tutorial
public bool playTutorial; public bool playTutorial;
public AudioSource bottleAudioPlayer; public AudioSource bottleAudioPlayer;
public AudioResource introVO; public AudioResource introVO;
public GameObject scoreCanvas;
[SerializeField] private ProgressType progressType = ProgressType.Auto; [SerializeField] private ProgressType progressType = ProgressType.Auto;
// gating for input until current state's animation finishes first loop // gating for input until current state's animation finishes first loop
@@ -52,6 +53,9 @@ namespace UI.Tutorial
// prepare gating for the initial active state // prepare gating for the initial active state
SetupInputGateForCurrentState(); SetupInputGateForCurrentState();
// hide the score canvas gameobject
scoreCanvas.SetActive(false);
} }
else else
{ {
@@ -80,6 +84,7 @@ namespace UI.Tutorial
Destroy(gameObject); Destroy(gameObject);
bottleAudioPlayer.resource = introVO; bottleAudioPlayer.resource = introVO;
bottleAudioPlayer.Play(); bottleAudioPlayer.Play();
scoreCanvas.SetActive(true);
} }
public void OnTap(Vector2 position) public void OnTap(Vector2 position)