Skip to content

Commit cb9f78a

Browse files
committed
Add Background
Add in Match 3 scene baground from curent level
1 parent c792a42 commit cb9f78a

12 files changed

+650
-5
lines changed

Assets/Scenes/GameScene.unity

Lines changed: 124 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -498,11 +498,11 @@ RectTransform:
498498
m_Children:
499499
- {fileID: 1879916603}
500500
m_Father: {fileID: 1238698634}
501-
m_RootOrder: 3
501+
m_RootOrder: 4
502502
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
503503
m_AnchorMin: {x: 0.1924375, y: 0.87700003}
504504
m_AnchorMax: {x: 0.8117501, y: 0.96922094}
505-
m_AnchoredPosition: {x: -3, y: 1}
505+
m_AnchoredPosition: {x: -2.999878, y: 1}
506506
m_SizeDelta: {x: -7.089966, y: -2}
507507
m_Pivot: {x: 0.5, y: 0.5}
508508
--- !u!1 &641517907
@@ -977,7 +977,7 @@ RectTransform:
977977
m_ConstrainProportionsScale: 0
978978
m_Children: []
979979
m_Father: {fileID: 1238698634}
980-
m_RootOrder: 0
980+
m_RootOrder: 1
981981
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
982982
m_AnchorMin: {x: 0, y: 0}
983983
m_AnchorMax: {x: 1, y: 1}
@@ -1677,6 +1677,7 @@ RectTransform:
16771677
m_LocalScale: {x: 0, y: 0, z: 0}
16781678
m_ConstrainProportionsScale: 0
16791679
m_Children:
1680+
- {fileID: 1271782619}
16801681
- {fileID: 862295120}
16811682
- {fileID: 6541020236614636302}
16821683
- {fileID: 1528680348}
@@ -1921,6 +1922,124 @@ CanvasRenderer:
19211922
m_PrefabAsset: {fileID: 0}
19221923
m_GameObject: {fileID: 1267449266}
19231924
m_CullTransparentMesh: 1
1925+
--- !u!1 &1271782618
1926+
GameObject:
1927+
m_ObjectHideFlags: 0
1928+
m_CorrespondingSourceObject: {fileID: 0}
1929+
m_PrefabInstance: {fileID: 0}
1930+
m_PrefabAsset: {fileID: 0}
1931+
serializedVersion: 6
1932+
m_Component:
1933+
- component: {fileID: 1271782619}
1934+
- component: {fileID: 1271782622}
1935+
- component: {fileID: 1271782621}
1936+
- component: {fileID: 1271782620}
1937+
- component: {fileID: 1271782623}
1938+
m_Layer: 5
1939+
m_Name: Baground
1940+
m_TagString: Untagged
1941+
m_Icon: {fileID: 0}
1942+
m_NavMeshLayer: 0
1943+
m_StaticEditorFlags: 0
1944+
m_IsActive: 1
1945+
--- !u!224 &1271782619
1946+
RectTransform:
1947+
m_ObjectHideFlags: 0
1948+
m_CorrespondingSourceObject: {fileID: 0}
1949+
m_PrefabInstance: {fileID: 0}
1950+
m_PrefabAsset: {fileID: 0}
1951+
m_GameObject: {fileID: 1271782618}
1952+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1953+
m_LocalPosition: {x: 0, y: 0, z: 0}
1954+
m_LocalScale: {x: 1, y: 1, z: 1}
1955+
m_ConstrainProportionsScale: 0
1956+
m_Children: []
1957+
m_Father: {fileID: 1238698634}
1958+
m_RootOrder: 0
1959+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1960+
m_AnchorMin: {x: 0, y: 0}
1961+
m_AnchorMax: {x: 0, y: 0}
1962+
m_AnchoredPosition: {x: 0, y: 0}
1963+
m_SizeDelta: {x: 0, y: 0}
1964+
m_Pivot: {x: 0.5, y: 0.5}
1965+
--- !u!114 &1271782620
1966+
MonoBehaviour:
1967+
m_ObjectHideFlags: 0
1968+
m_CorrespondingSourceObject: {fileID: 0}
1969+
m_PrefabInstance: {fileID: 0}
1970+
m_PrefabAsset: {fileID: 0}
1971+
m_GameObject: {fileID: 1271782618}
1972+
m_Enabled: 1
1973+
m_EditorHideFlags: 0
1974+
m_Script: {fileID: 11500000, guid: 8508295fc2451b846b50032ce571f617, type: 3}
1975+
m_Name:
1976+
m_EditorClassIdentifier:
1977+
_bagroundImage: {fileID: 1271782621}
1978+
_configs:
1979+
- <Sprite>k__BackingField: {fileID: 21300000, guid: 94d52055702559b4bb01132e8b4c7f88,
1980+
type: 3}
1981+
<StartLevel>k__BackingField: 0
1982+
<EndLevel>k__BackingField: 5
1983+
- <Sprite>k__BackingField: {fileID: 21300000, guid: 9c845b5c25744d742b71a7aefe9e84e6,
1984+
type: 3}
1985+
<StartLevel>k__BackingField: 6
1986+
<EndLevel>k__BackingField: 10
1987+
- <Sprite>k__BackingField: {fileID: 21300000, guid: d11dab8ed612b134a92945beb821b918,
1988+
type: 3}
1989+
<StartLevel>k__BackingField: 11
1990+
<EndLevel>k__BackingField: 20
1991+
--- !u!114 &1271782621
1992+
MonoBehaviour:
1993+
m_ObjectHideFlags: 0
1994+
m_CorrespondingSourceObject: {fileID: 0}
1995+
m_PrefabInstance: {fileID: 0}
1996+
m_PrefabAsset: {fileID: 0}
1997+
m_GameObject: {fileID: 1271782618}
1998+
m_Enabled: 1
1999+
m_EditorHideFlags: 0
2000+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
2001+
m_Name:
2002+
m_EditorClassIdentifier:
2003+
m_Material: {fileID: 0}
2004+
m_Color: {r: 1, g: 1, b: 1, a: 1}
2005+
m_RaycastTarget: 1
2006+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
2007+
m_Maskable: 1
2008+
m_OnCullStateChanged:
2009+
m_PersistentCalls:
2010+
m_Calls: []
2011+
m_Sprite: {fileID: 21300000, guid: 94d52055702559b4bb01132e8b4c7f88, type: 3}
2012+
m_Type: 0
2013+
m_PreserveAspect: 0
2014+
m_FillCenter: 1
2015+
m_FillMethod: 4
2016+
m_FillAmount: 1
2017+
m_FillClockwise: 1
2018+
m_FillOrigin: 0
2019+
m_UseSpriteMesh: 0
2020+
m_PixelsPerUnitMultiplier: 1
2021+
--- !u!222 &1271782622
2022+
CanvasRenderer:
2023+
m_ObjectHideFlags: 0
2024+
m_CorrespondingSourceObject: {fileID: 0}
2025+
m_PrefabInstance: {fileID: 0}
2026+
m_PrefabAsset: {fileID: 0}
2027+
m_GameObject: {fileID: 1271782618}
2028+
m_CullTransparentMesh: 1
2029+
--- !u!114 &1271782623
2030+
MonoBehaviour:
2031+
m_ObjectHideFlags: 0
2032+
m_CorrespondingSourceObject: {fileID: 0}
2033+
m_PrefabInstance: {fileID: 0}
2034+
m_PrefabAsset: {fileID: 0}
2035+
m_GameObject: {fileID: 1271782618}
2036+
m_Enabled: 1
2037+
m_EditorHideFlags: 0
2038+
m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3}
2039+
m_Name:
2040+
m_EditorClassIdentifier:
2041+
m_AspectMode: 4
2042+
m_AspectRatio: 1.77777
19242043
--- !u!1 &1288659373
19252044
GameObject:
19262045
m_ObjectHideFlags: 0
@@ -2677,7 +2796,7 @@ PrefabInstance:
26772796
- target: {fileID: 744114261140172706, guid: 4a7c1b49b2924a64e9c757d086060867,
26782797
type: 3}
26792798
propertyPath: m_RootOrder
2680-
value: 2
2799+
value: 3
26812800
objectReference: {fileID: 0}
26822801
- target: {fileID: 744114261140172706, guid: 4a7c1b49b2924a64e9c757d086060867,
26832802
type: 3}
@@ -4122,7 +4241,7 @@ RectTransform:
41224241
- {fileID: 6541020235780642889}
41234242
- {fileID: 1076681654}
41244243
m_Father: {fileID: 1238698634}
4125-
m_RootOrder: 1
4244+
m_RootOrder: 2
41264245
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
41274246
m_AnchorMin: {x: 0, y: 0}
41284247
m_AnchorMax: {x: 1, y: 1}

Assets/Scripts/BackgroundConfig.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using UnityEngine;
2+
3+
[System.Serializable]
4+
public class BackgroundConfig
5+
{
6+
[field: SerializeField] public Sprite Sprite { get; private set; }
7+
[field: SerializeField] public int StartLevel { get; private set; }
8+
[field: SerializeField] public int EndLevel { get; private set; }
9+
10+
}

Assets/Scripts/BackgroundConfig.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/BackgroundSetter.cs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using UnityEngine;
5+
using UnityEngine.UI;
6+
7+
public class BackgroundSetter : MonoBehaviour
8+
{
9+
[SerializeField] private Image _bagroundImage;
10+
[SerializeField] private BackgroundConfig[] _configs;
11+
12+
private void Start()
13+
{
14+
SetBaground();
15+
}
16+
17+
private void SetBaground()
18+
{
19+
_bagroundImage.sprite = GetBackground();
20+
}
21+
22+
private Sprite GetBackground()
23+
{
24+
foreach (var config in _configs)
25+
{
26+
if (IsSutableConfig(config))
27+
{
28+
return config.Sprite;
29+
}
30+
}
31+
32+
return GetHighestLevelBackground();
33+
}
34+
35+
private bool IsSutableConfig(BackgroundConfig config)
36+
{
37+
return config.StartLevel <= LevelSelector.SelectedLevel &&
38+
config.EndLevel >= LevelSelector.SelectedLevel;
39+
}
40+
41+
private Sprite GetHighestLevelBackground()
42+
{
43+
return _configs.OrderByDescending(c => c.EndLevel).Select(c => c.Sprite).First(); ;
44+
}
45+
}

Assets/Scripts/BackgroundSetter.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Textures/Backgrounds.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
488 KB
Loading

0 commit comments

Comments
 (0)