Compare commits

...

2 Commits

Author SHA1 Message Date
be419b5c78 Merge branch 'UIScoreAndSeparator' into dev
# Conflicts:
#	Assets/Scenes/SoloGameScene.unity
2025-01-15 17:06:36 +01:00
ced8078398 Added seaprator for UI 1v1 and changed score UI 2025-01-15 16:57:53 +01:00
6 changed files with 4235 additions and 1977 deletions

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: m_jammo_metal 1
m_Shader: {fileID: 4800000, guid: 73ef4de7c429719438a73d771100db7c, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords:
- _METALLICGLOSSMAP
@ -19,6 +21,7 @@ Material:
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -85,3 +88,4 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -2,19 +2,25 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: No Name
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -54,19 +60,26 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -406,7 +406,7 @@ GameObject:
- component: {fileID: 100036930}
- component: {fileID: 100036929}
- component: {fileID: 100036928}
m_Layer: 5
m_Layer: 3
m_Name: Back
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -572,7 +572,7 @@ GameObject:
- component: {fileID: 139585262}
- component: {fileID: 139585263}
- component: {fileID: 139585264}
m_Layer: 5
m_Layer: 3
m_Name: Content
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -595,7 +595,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000050159586, y: 0.0000019978345}
m_AnchoredPosition: {x: -0.000050159586, y: -0.0000038146973}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &139585263
@ -647,7 +647,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 178371325}
m_Layer: 5
m_Layer: 3
m_Name: Sliding Area
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -806,7 +806,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220002225}
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: 46.84}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -851,8 +851,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1858832248}
- {fileID: 1791311983}
- {fileID: 1858832248}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &377940177
@ -1349,7 +1349,7 @@ GameObject:
- component: {fileID: 812835471}
- component: {fileID: 812835470}
- component: {fileID: 812835469}
m_Layer: 5
m_Layer: 3
m_Name: Viewport
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1438,7 +1438,7 @@ GameObject:
- component: {fileID: 839969255}
- component: {fileID: 839969257}
- component: {fileID: 839969256}
m_Layer: 5
m_Layer: 3
m_Name: BackText
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -1575,7 +1575,7 @@ GameObject:
- component: {fileID: 868437932}
- component: {fileID: 868437931}
- component: {fileID: 868437930}
m_Layer: 5
m_Layer: 3
m_Name: Scrollbar Vertical
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2093,7 +2093,7 @@ GameObject:
- component: {fileID: 1055376734}
- component: {fileID: 1055376733}
- component: {fileID: 1055376732}
m_Layer: 5
m_Layer: 3
m_Name: Scroll View
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -2302,7 +2302,7 @@ GameObject:
- component: {fileID: 1237272501}
- component: {fileID: 1237272503}
- component: {fileID: 1237272502}
m_Layer: 5
m_Layer: 3
m_Name: Handle
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -3326,6 +3326,156 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
--- !u!1 &1733628372
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1733628373}
- component: {fileID: 1733628375}
- component: {fileID: 1733628374}
m_Layer: 5
m_Name: Separator
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1733628373
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733628372}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 678372250}
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: 5, y: 598.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1733628374
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733628372}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1733628375
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733628372}
m_CullTransparentMesh: 1
--- !u!1 &1772075871
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1772075872}
- component: {fileID: 1772075874}
- component: {fileID: 1772075873}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1772075872
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772075871}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 678372250}
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: 274.87}
m_SizeDelta: {x: 128.84, y: 30.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1772075873
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772075871}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 0.8980392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1772075874
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1772075871}
m_CullTransparentMesh: 1
--- !u!1 &1791311979
GameObject:
m_ObjectHideFlags: 0
@ -3655,8 +3805,8 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 220002229}
- {fileID: 678372250}
- {fileID: 220002229}
- {fileID: 552140505}
m_Father: {fileID: 245285643}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4101,7 +4251,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1856934115903457218}
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: 28.65}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -4113,8 +4263,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -60.000004, y: -200}
m_AnchoredPosition: {x: 0, y: -5}
m_SizeDelta: {x: -60.000004, y: -110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1856934115903457218
GameObject:
@ -4128,7 +4278,7 @@ GameObject:
- component: {fileID: 1856934115903457221}
- component: {fileID: 1856934115903457222}
- component: {fileID: 4920621562230953387}
m_Layer: 5
m_Layer: 3
m_Name: ScoreboardView
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4156,7 +4306,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 0.59119487, g: 0.59119487, b: 0.59119487, a: 0.7019608}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -4235,7 +4385,7 @@ GameObject:
m_Component:
- component: {fileID: 2749335941631071934}
- component: {fileID: 5068000569768891960}
m_Layer: 5
m_Layer: 3
m_Name: VerticalLayout
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4912,6 +5062,14 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1858832248}
m_Modifications:
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_SizeDelta.x
value: 129.0279
@ -4920,18 +5078,26 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 32
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_LocalPosition.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchoredPosition.x
value: -64.514404
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410792, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_AnchoredPosition.y
value: -16
value: -25.2
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410793, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410798, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_CullTransparentMesh
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_fontSize
value: 30.25
@ -4946,7 +5112,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_margin.z
value: 8.811302
value: -0.043342564
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_fontStyle
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_HorizontalAlignment
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6634832997822410799, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_Pivot.x
@ -5006,7 +5184,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -5.05
objectReference: {fileID: 0}
- target: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
propertyPath: m_LocalRotation.w
@ -5054,7 +5232,13 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
insertIndex: 0
addedObject: {fileID: 1733628373}
- targetCorrespondingSourceObject: {fileID: 6634832998035864265, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
insertIndex: 1
addedObject: {fileID: 1772075872}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 68d36a24cad029f4a91d5c8e7aa18281, type: 3}
--- !u!1 &6871074651254400895
@ -5099,7 +5283,7 @@ GameObject:
- component: {fileID: 4191864465036188526}
- component: {fileID: 334265878197336758}
- component: {fileID: 3413095558211005055}
m_Layer: 5
m_Layer: 3
m_Name: ScoreboardText
m_TagString: Untagged
m_Icon: {fileID: 0}

View File

@ -713,8 +713,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: -410, y: -72}
m_SizeDelta: {x: 195, y: 400}
m_AnchoredPosition: {x: -252.8, y: -42.3}
m_SizeDelta: {x: 142.5, y: 288.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &585937283
MonoBehaviour:
@ -1510,7 +1510,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -39.7636, y: -34}
m_SizeDelta: {x: 195, y: 400}
m_SizeDelta: {x: 144.9, y: 300.43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2040053554
MonoBehaviour:

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long