Skip to content

Commit a7af7b0

Browse files
uChemauChema
committed
Add Rolling credits to GameplayScene
1 parent 994ccc1 commit a7af7b0

File tree

6 files changed

+311
-8
lines changed

6 files changed

+311
-8
lines changed

‎UOP1_Project/Assets/Prefabs/UI/WIP/Credits_Panel_FinalScreen.prefab

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &7815952524619863395
4+
PrefabInstance:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications:
10+
- target: {fileID: 4183443505173494034, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
11+
type: 3}
12+
propertyPath: m_SizeDelta.y
13+
value: 0
14+
objectReference: {fileID: 0}
15+
- target: {fileID: 4183443505173494034, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
16+
type: 3}
17+
propertyPath: m_AnchoredPosition.y
18+
value: 0
19+
objectReference: {fileID: 0}
20+
- target: {fileID: 6472991824597497641, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
21+
type: 3}
22+
propertyPath: m_AnchorMax.y
23+
value: 0.8
24+
objectReference: {fileID: 0}
25+
- target: {fileID: 6472991824597497641, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
26+
type: 3}
27+
propertyPath: m_SizeDelta.y
28+
value: -140
29+
objectReference: {fileID: 0}
30+
- target: {fileID: 6472991824597497641, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
31+
type: 3}
32+
propertyPath: m_AnchoredPosition.y
33+
value: -70
34+
objectReference: {fileID: 0}
35+
- target: {fileID: 7668864389926187046, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
36+
type: 3}
37+
propertyPath: m_Enabled
38+
value: 0
39+
objectReference: {fileID: 0}
40+
- target: {fileID: 8357250150811881581, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
41+
type: 3}
42+
propertyPath: m_IsActive
43+
value: 0
44+
objectReference: {fileID: 0}
45+
- target: {fileID: 8357250151146825051, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
46+
type: 3}
47+
propertyPath: m_Enabled
48+
value: 0
49+
objectReference: {fileID: 0}
50+
- target: {fileID: 8357250151446615845, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
51+
type: 3}
52+
propertyPath: m_Name
53+
value: Credits_Panel
54+
objectReference: {fileID: 0}
55+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
56+
type: 3}
57+
propertyPath: m_Pivot.x
58+
value: 0.5
59+
objectReference: {fileID: 0}
60+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
61+
type: 3}
62+
propertyPath: m_Pivot.y
63+
value: 0.5
64+
objectReference: {fileID: 0}
65+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
66+
type: 3}
67+
propertyPath: m_RootOrder
68+
value: 0
69+
objectReference: {fileID: 0}
70+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
71+
type: 3}
72+
propertyPath: m_AnchorMax.x
73+
value: 1
74+
objectReference: {fileID: 0}
75+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
76+
type: 3}
77+
propertyPath: m_AnchorMax.y
78+
value: 1
79+
objectReference: {fileID: 0}
80+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
81+
type: 3}
82+
propertyPath: m_AnchorMin.x
83+
value: 0
84+
objectReference: {fileID: 0}
85+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
86+
type: 3}
87+
propertyPath: m_AnchorMin.y
88+
value: 0
89+
objectReference: {fileID: 0}
90+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
91+
type: 3}
92+
propertyPath: m_SizeDelta.x
93+
value: 0
94+
objectReference: {fileID: 0}
95+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
96+
type: 3}
97+
propertyPath: m_SizeDelta.y
98+
value: 0
99+
objectReference: {fileID: 0}
100+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
101+
type: 3}
102+
propertyPath: m_LocalPosition.x
103+
value: 0
104+
objectReference: {fileID: 0}
105+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
106+
type: 3}
107+
propertyPath: m_LocalPosition.y
108+
value: 0
109+
objectReference: {fileID: 0}
110+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
111+
type: 3}
112+
propertyPath: m_LocalPosition.z
113+
value: 0
114+
objectReference: {fileID: 0}
115+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
116+
type: 3}
117+
propertyPath: m_LocalRotation.w
118+
value: 1
119+
objectReference: {fileID: 0}
120+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
121+
type: 3}
122+
propertyPath: m_LocalRotation.x
123+
value: 0
124+
objectReference: {fileID: 0}
125+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
126+
type: 3}
127+
propertyPath: m_LocalRotation.y
128+
value: 0
129+
objectReference: {fileID: 0}
130+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
131+
type: 3}
132+
propertyPath: m_LocalRotation.z
133+
value: 0
134+
objectReference: {fileID: 0}
135+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
136+
type: 3}
137+
propertyPath: m_AnchoredPosition.x
138+
value: 0
139+
objectReference: {fileID: 0}
140+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
141+
type: 3}
142+
propertyPath: m_AnchoredPosition.y
143+
value: 0
144+
objectReference: {fileID: 0}
145+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
146+
type: 3}
147+
propertyPath: m_LocalEulerAnglesHint.x
148+
value: 0
149+
objectReference: {fileID: 0}
150+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
151+
type: 3}
152+
propertyPath: m_LocalEulerAnglesHint.y
153+
value: 0
154+
objectReference: {fileID: 0}
155+
- target: {fileID: 8357250151446615846, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
156+
type: 3}
157+
propertyPath: m_LocalEulerAnglesHint.z
158+
value: 0
159+
objectReference: {fileID: 0}
160+
- target: {fileID: 8357250151446615847, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb,
161+
type: 3}
162+
propertyPath: m_Enabled
163+
value: 0
164+
objectReference: {fileID: 0}
165+
m_RemovedComponents: []
166+
m_SourcePrefab: {fileID: 100100000, guid: 94ca6d0c15c4b4a2cbbe4758a17b8dfb, type: 3}

‎UOP1_Project/Assets/Prefabs/UI/WIP/Credits_Panel_FinalScreen.prefab.meta

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

‎UOP1_Project/Assets/Scenes/Managers/Gameplay.unity

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ NavMeshSettings:
123123
debug:
124124
m_Flags: 0
125125
m_NavMeshData: {fileID: 0}
126+
--- !u!224 &511380159 stripped
127+
RectTransform:
128+
m_CorrespondingSourceObject: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
129+
type: 3}
130+
m_PrefabInstance: {fileID: 7815952524517826525}
131+
m_PrefabAsset: {fileID: 0}
126132
--- !u!114 &670213351 stripped
127133
MonoBehaviour:
128134
m_CorrespondingSourceObject: {fileID: 8980297398607076176, guid: ccad748453924ff4092fe3e5b978d8e5,
@@ -1175,6 +1181,7 @@ RectTransform:
11751181
- {fileID: 978261885}
11761182
- {fileID: 4949818870599756131}
11771183
- {fileID: 1479900142}
1184+
- {fileID: 511380159}
11781185
m_Father: {fileID: 0}
11791186
m_RootOrder: 4
11801187
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2052,6 +2059,130 @@ MonoBehaviour:
20522059
m_Script: {fileID: 11500000, guid: 8f5450ac502f84bd89a993767b4d01e0, type: 3}
20532060
m_Name:
20542061
m_EditorClassIdentifier:
2062+
--- !u!1001 &7815952524517826525
2063+
PrefabInstance:
2064+
m_ObjectHideFlags: 0
2065+
serializedVersion: 2
2066+
m_Modification:
2067+
m_TransformParent: {fileID: 1869732381}
2068+
m_Modifications:
2069+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2070+
type: 3}
2071+
propertyPath: m_Pivot.x
2072+
value: 0.5
2073+
objectReference: {fileID: 0}
2074+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2075+
type: 3}
2076+
propertyPath: m_Pivot.y
2077+
value: 0.5
2078+
objectReference: {fileID: 0}
2079+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2080+
type: 3}
2081+
propertyPath: m_RootOrder
2082+
value: 6
2083+
objectReference: {fileID: 0}
2084+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2085+
type: 3}
2086+
propertyPath: m_AnchorMax.x
2087+
value: 1
2088+
objectReference: {fileID: 0}
2089+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2090+
type: 3}
2091+
propertyPath: m_AnchorMax.y
2092+
value: 1
2093+
objectReference: {fileID: 0}
2094+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2095+
type: 3}
2096+
propertyPath: m_AnchorMin.x
2097+
value: 0
2098+
objectReference: {fileID: 0}
2099+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2100+
type: 3}
2101+
propertyPath: m_AnchorMin.y
2102+
value: 0
2103+
objectReference: {fileID: 0}
2104+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2105+
type: 3}
2106+
propertyPath: m_SizeDelta.x
2107+
value: 0
2108+
objectReference: {fileID: 0}
2109+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2110+
type: 3}
2111+
propertyPath: m_SizeDelta.y
2112+
value: 0
2113+
objectReference: {fileID: 0}
2114+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2115+
type: 3}
2116+
propertyPath: m_LocalPosition.x
2117+
value: 0
2118+
objectReference: {fileID: 0}
2119+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2120+
type: 3}
2121+
propertyPath: m_LocalPosition.y
2122+
value: 0
2123+
objectReference: {fileID: 0}
2124+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2125+
type: 3}
2126+
propertyPath: m_LocalPosition.z
2127+
value: 0
2128+
objectReference: {fileID: 0}
2129+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2130+
type: 3}
2131+
propertyPath: m_LocalRotation.w
2132+
value: 1
2133+
objectReference: {fileID: 0}
2134+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2135+
type: 3}
2136+
propertyPath: m_LocalRotation.x
2137+
value: 0
2138+
objectReference: {fileID: 0}
2139+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2140+
type: 3}
2141+
propertyPath: m_LocalRotation.y
2142+
value: 0
2143+
objectReference: {fileID: 0}
2144+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2145+
type: 3}
2146+
propertyPath: m_LocalRotation.z
2147+
value: 0
2148+
objectReference: {fileID: 0}
2149+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2150+
type: 3}
2151+
propertyPath: m_AnchoredPosition.x
2152+
value: 0
2153+
objectReference: {fileID: 0}
2154+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2155+
type: 3}
2156+
propertyPath: m_AnchoredPosition.y
2157+
value: 0
2158+
objectReference: {fileID: 0}
2159+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2160+
type: 3}
2161+
propertyPath: m_LocalEulerAnglesHint.x
2162+
value: 0
2163+
objectReference: {fileID: 0}
2164+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2165+
type: 3}
2166+
propertyPath: m_LocalEulerAnglesHint.y
2167+
value: 0
2168+
objectReference: {fileID: 0}
2169+
- target: {fileID: 2273541362857460293, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2170+
type: 3}
2171+
propertyPath: m_LocalEulerAnglesHint.z
2172+
value: 0
2173+
objectReference: {fileID: 0}
2174+
- target: {fileID: 2273541362857460294, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2175+
type: 3}
2176+
propertyPath: m_Name
2177+
value: Credits_Panel
2178+
objectReference: {fileID: 0}
2179+
- target: {fileID: 2273541362857460294, guid: 6f8c5e8a271a38540a27afab7424c7d5,
2180+
type: 3}
2181+
propertyPath: m_IsActive
2182+
value: 0
2183+
objectReference: {fileID: 0}
2184+
m_RemovedComponents: []
2185+
m_SourcePrefab: {fileID: 100100000, guid: 6f8c5e8a271a38540a27afab7424c7d5, type: 3}
20552186
--- !u!1001 &8304245671203898743
20562187
PrefabInstance:
20572188
m_ObjectHideFlags: 0

‎UOP1_Project/Assets/Scripts/UI/UICredits.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,34 @@ public class UICredits : MonoBehaviour
3838
private void OnEnable()
3939
{
4040
_inputReader.menuCloseEvent += CloseCreditsScreen;
41-
41+
SetCreditsScreen();
4242
}
4343
private void OnDisable()
4444
{
4545
_inputReader.menuCloseEvent -= CloseCreditsScreen;
4646
}
47-
public void SetCreditsScreen()
47+
private void SetCreditsScreen()
4848
{
4949
_creditsRoller.rollingEnded += EndRolling;
5050
FillCreditsRoller();
5151
_creditsRoller.StartRolling();
5252

5353

5454
}
55-
public void CloseCreditsScreen()
55+
private void CloseCreditsScreen()
5656
{
5757
_creditsRoller.rollingEnded -= EndRolling;
5858
closeCreditsAction.Invoke();
5959
}
60-
public void FillCreditsRoller()
60+
private void FillCreditsRoller()
6161
{
6262
_creditsList = new CreditsList();
6363
TextAsset creditsList = Resources.Load(_creditsFilename) as TextAsset;
6464
string json = creditsList.text;
6565
_creditsList = JsonUtility.FromJson<CreditsList>(json);
6666
SetCreditsText();
6767
}
68-
public void SetCreditsText()
68+
private void SetCreditsText()
6969
{
7070
string creditsText = "";
7171
for (int i = 0; i < _creditsList.Contributors.Count; i++)
@@ -81,7 +81,7 @@ public void SetCreditsText()
8181
_creditsText.text = creditsText;
8282

8383
}
84-
public void EndRolling()
84+
private void EndRolling()
8585
{
8686
if (_creditsRollEndEvent != null)
8787
_creditsRollEndEvent.RaiseEvent();

‎UOP1_Project/Assets/Scripts/UI/UIMenuManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ public void CloseSettingsScreen()
118118
public void OpenCreditsScreen()
119119
{
120120
_creditsPanel.gameObject.SetActive(true);
121-
_creditsPanel.SetCreditsScreen();
122121

123122
_creditsPanel.closeCreditsAction += CloseCreditsScreen;
124123

‎UOP1_Project/ProjectSettings/QualitySettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ QualitySettings:
2121
skinWeights: 4
2222
textureQuality: 0
2323
anisotropicTextures: 1
24-
antiAliasing: 2
24+
antiAliasing: 0
2525
softParticles: 0
2626
softVegetation: 1
2727
realtimeReflectionProbes: 1

0 commit comments

Comments
 (0)