Skip to content

Commit c19683b

Browse files
Phalcon22EpitaPhalcon22Epita
committed
Merge branch 'enguerrand' into axel
2 parents af709a8 + 2f04168 commit c19683b

File tree

7 files changed

+321
-139
lines changed

7 files changed

+321
-139
lines changed

‎.idea/.idea.year-zero/.idea/workspace.xml‎

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

‎Assets/Resources/Buildings/Energy Farm/Energy FarmCons.prefab‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,11 @@ PrefabInstance:
209209
propertyPath: m_LocalEulerAnglesHint.z
210210
value: 0
211211
objectReference: {fileID: 0}
212+
- target: {fileID: 8658544533429796332, guid: ef7ceb16424827042aacdfe8c9c8e71b,
213+
type: 3}
214+
propertyPath: m_Enabled
215+
value: 0
216+
objectReference: {fileID: 0}
212217
- target: {fileID: 2910697150060041105, guid: ef7ceb16424827042aacdfe8c9c8e71b,
213218
type: 3}
214219
propertyPath: m_LocalScale.x
@@ -224,11 +229,6 @@ PrefabInstance:
224229
propertyPath: m_LocalScale.z
225230
value: 0.7
226231
objectReference: {fileID: 0}
227-
- target: {fileID: 8658544533429796332, guid: ef7ceb16424827042aacdfe8c9c8e71b,
228-
type: 3}
229-
propertyPath: m_Enabled
230-
value: 0
231-
objectReference: {fileID: 0}
232232
m_RemovedComponents: []
233233
m_SourcePrefab: {fileID: 100100000, guid: ef7ceb16424827042aacdfe8c9c8e71b, type: 3}
234234
--- !u!4 &3990744452997251023 stripped

‎Assets/Resources/Units/Bomber.prefab‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,31 @@ PrefabInstance:
7373
propertyPath: m_Name
7474
value: Bomber
7575
objectReference: {fileID: 0}
76-
- target: {fileID: 114909607590321650, guid: a2cd80c251494bb4a9642bd55de4b99a,
76+
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
7777
type: 3}
78-
propertyPath: ObservedComponents.Array.data[0]
79-
value:
80-
objectReference: {fileID: 2367246494767128176}
78+
propertyPath: m_LocalScale.x
79+
value: 0.25
80+
objectReference: {fileID: 0}
81+
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
82+
type: 3}
83+
propertyPath: m_LocalScale.z
84+
value: 0.25
85+
objectReference: {fileID: 0}
86+
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
87+
type: 3}
88+
propertyPath: m_LocalScale.y
89+
value: 0.25
90+
objectReference: {fileID: 0}
91+
- target: {fileID: 7043851759568410477, guid: a2cd80c251494bb4a9642bd55de4b99a,
92+
type: 3}
93+
propertyPath: m_Radius
94+
value: 0.32
95+
objectReference: {fileID: 0}
96+
- target: {fileID: 7043851759568410477, guid: a2cd80c251494bb4a9642bd55de4b99a,
97+
type: 3}
98+
propertyPath: m_Radius
99+
value: 0.32
100+
objectReference: {fileID: 0}
81101
- target: {fileID: 4991307429433494, guid: a2cd80c251494bb4a9642bd55de4b99a, type: 3}
82102
propertyPath: m_LocalPosition.x
83103
value: 0
@@ -122,31 +142,16 @@ PrefabInstance:
122142
propertyPath: m_LocalEulerAnglesHint.z
123143
value: 0
124144
objectReference: {fileID: 0}
125-
- target: {fileID: 7043851759568410477, guid: a2cd80c251494bb4a9642bd55de4b99a,
126-
type: 3}
127-
propertyPath: m_Radius
128-
value: 0.32
129-
objectReference: {fileID: 0}
130-
- target: {fileID: 7043851759568410477, guid: a2cd80c251494bb4a9642bd55de4b99a,
131-
type: 3}
132-
propertyPath: m_Radius
133-
value: 0.32
134-
objectReference: {fileID: 0}
135-
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
136-
type: 3}
137-
propertyPath: m_LocalScale.x
138-
value: 0.25
139-
objectReference: {fileID: 0}
140-
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
145+
- target: {fileID: 114909607590321650, guid: a2cd80c251494bb4a9642bd55de4b99a,
141146
type: 3}
142-
propertyPath: m_LocalScale.z
143-
value: 0.25
144-
objectReference: {fileID: 0}
145-
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
147+
propertyPath: ObservedComponents.Array.data[0]
148+
value:
149+
objectReference: {fileID: 2367246494767128176}
150+
- target: {fileID: 1845902412829512259, guid: a2cd80c251494bb4a9642bd55de4b99a,
146151
type: 3}
147-
propertyPath: m_LocalScale.y
148-
value: 0.25
149-
objectReference: {fileID: 0}
152+
propertyPath: m_Mesh
153+
value:
154+
objectReference: {fileID: 4300006, guid: 21c6d0bb8170cae4f9d49bb728b3f524, type: 3}
150155
- target: {fileID: 653636693239936526, guid: a2cd80c251494bb4a9642bd55de4b99a,
151156
type: 3}
152157
propertyPath: ObservedComponents.Array.data[0]
@@ -157,11 +162,6 @@ PrefabInstance:
157162
propertyPath: m_Materials.Array.data[0]
158163
value:
159164
objectReference: {fileID: 2100000, guid: 78944cc85fa085845b84141d319ac0dd, type: 2}
160-
- target: {fileID: 1845902412829512259, guid: a2cd80c251494bb4a9642bd55de4b99a,
161-
type: 3}
162-
propertyPath: m_Mesh
163-
value:
164-
objectReference: {fileID: 4300006, guid: 21c6d0bb8170cae4f9d49bb728b3f524, type: 3}
165165
- target: {fileID: 5445773958597346252, guid: a2cd80c251494bb4a9642bd55de4b99a,
166166
type: 3}
167167
propertyPath: firePoint

‎Assets/Resources/Units/Hacker.prefab‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,21 @@ PrefabInstance:
8686
propertyPath: m_Name
8787
value: Hacker
8888
objectReference: {fileID: 0}
89+
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
90+
type: 3}
91+
propertyPath: m_LocalScale.x
92+
value: 0.3
93+
objectReference: {fileID: 0}
94+
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
95+
type: 3}
96+
propertyPath: m_LocalScale.y
97+
value: 0.3
98+
objectReference: {fileID: 0}
99+
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
100+
type: 3}
101+
propertyPath: m_LocalScale.z
102+
value: 0.3
103+
objectReference: {fileID: 0}
89104
- target: {fileID: 4991307429433494, guid: a2cd80c251494bb4a9642bd55de4b99a, type: 3}
90105
propertyPath: m_LocalPosition.x
91106
value: 0
@@ -135,21 +150,6 @@ PrefabInstance:
135150
propertyPath: ObservedComponents.Array.data[0]
136151
value:
137152
objectReference: {fileID: 5411636765406584959}
138-
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
139-
type: 3}
140-
propertyPath: m_LocalScale.x
141-
value: 0.3
142-
objectReference: {fileID: 0}
143-
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
144-
type: 3}
145-
propertyPath: m_LocalScale.y
146-
value: 0.3
147-
objectReference: {fileID: 0}
148-
- target: {fileID: 7678754933936445317, guid: a2cd80c251494bb4a9642bd55de4b99a,
149-
type: 3}
150-
propertyPath: m_LocalScale.z
151-
value: 0.3
152-
objectReference: {fileID: 0}
153153
- target: {fileID: 1845902412829512259, guid: a2cd80c251494bb4a9642bd55de4b99a,
154154
type: 3}
155155
propertyPath: m_Mesh
@@ -190,15 +190,15 @@ PrefabInstance:
190190
propertyPath: m_Layer
191191
value: 0
192192
objectReference: {fileID: 0}
193-
- target: {fileID: 1183898688568993966, guid: a2cd80c251494bb4a9642bd55de4b99a,
193+
- target: {fileID: 7382188653647537440, guid: a2cd80c251494bb4a9642bd55de4b99a,
194194
type: 3}
195195
propertyPath: m_RootOrder
196-
value: 1
196+
value: 2
197197
objectReference: {fileID: 0}
198-
- target: {fileID: 7382188653647537440, guid: a2cd80c251494bb4a9642bd55de4b99a,
198+
- target: {fileID: 1183898688568993966, guid: a2cd80c251494bb4a9642bd55de4b99a,
199199
type: 3}
200200
propertyPath: m_RootOrder
201-
value: 2
201+
value: 1
202202
objectReference: {fileID: 0}
203203
m_RemovedComponents:
204204
- {fileID: 114743559952315036, guid: a2cd80c251494bb4a9642bd55de4b99a, type: 3}

‎Assets/Scenes/MainMenu.unity‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9100,6 +9100,7 @@ RectTransform:
91009100
- {fileID: 1932595694}
91019101
- {fileID: 1486573153}
91029102
- {fileID: 1734995612}
9103+
- {fileID: 2088080453}
91039104
m_Father: {fileID: 961181132}
91049105
m_RootOrder: 12
91059106
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15968,6 +15969,148 @@ RectTransform:
1596815969
m_AnchoredPosition: {x: -3.77, y: 0}
1596915970
m_SizeDelta: {x: 139.85, y: 20}
1597015971
m_Pivot: {x: 0.5, y: 0.5}
15972+
--- !u!1001 &2088080452
15973+
PrefabInstance:
15974+
m_ObjectHideFlags: 0
15975+
serializedVersion: 2
15976+
m_Modification:
15977+
m_TransformParent: {fileID: 1338490246}
15978+
m_Modifications:
15979+
- target: {fileID: 2322418288383231154, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
15980+
type: 3}
15981+
propertyPath: m_Name
15982+
value: Mission3Button
15983+
objectReference: {fileID: 0}
15984+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
15985+
type: 3}
15986+
propertyPath: m_LocalPosition.x
15987+
value: 0
15988+
objectReference: {fileID: 0}
15989+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
15990+
type: 3}
15991+
propertyPath: m_LocalPosition.y
15992+
value: 0
15993+
objectReference: {fileID: 0}
15994+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
15995+
type: 3}
15996+
propertyPath: m_LocalPosition.z
15997+
value: 5
15998+
objectReference: {fileID: 0}
15999+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16000+
type: 3}
16001+
propertyPath: m_LocalRotation.x
16002+
value: 0
16003+
objectReference: {fileID: 0}
16004+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16005+
type: 3}
16006+
propertyPath: m_LocalRotation.y
16007+
value: 0
16008+
objectReference: {fileID: 0}
16009+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16010+
type: 3}
16011+
propertyPath: m_LocalRotation.z
16012+
value: 0
16013+
objectReference: {fileID: 0}
16014+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16015+
type: 3}
16016+
propertyPath: m_LocalRotation.w
16017+
value: 1
16018+
objectReference: {fileID: 0}
16019+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16020+
type: 3}
16021+
propertyPath: m_RootOrder
16022+
value: 7
16023+
objectReference: {fileID: 0}
16024+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16025+
type: 3}
16026+
propertyPath: m_LocalEulerAnglesHint.x
16027+
value: 0
16028+
objectReference: {fileID: 0}
16029+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16030+
type: 3}
16031+
propertyPath: m_LocalEulerAnglesHint.y
16032+
value: 0
16033+
objectReference: {fileID: 0}
16034+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16035+
type: 3}
16036+
propertyPath: m_LocalEulerAnglesHint.z
16037+
value: 0
16038+
objectReference: {fileID: 0}
16039+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16040+
type: 3}
16041+
propertyPath: m_AnchoredPosition.x
16042+
value: 150
16043+
objectReference: {fileID: 0}
16044+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16045+
type: 3}
16046+
propertyPath: m_AnchoredPosition.y
16047+
value: -69.9
16048+
objectReference: {fileID: 0}
16049+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16050+
type: 3}
16051+
propertyPath: m_SizeDelta.x
16052+
value: 160
16053+
objectReference: {fileID: 0}
16054+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16055+
type: 3}
16056+
propertyPath: m_SizeDelta.y
16057+
value: 30
16058+
objectReference: {fileID: 0}
16059+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16060+
type: 3}
16061+
propertyPath: m_AnchorMin.x
16062+
value: 0.5
16063+
objectReference: {fileID: 0}
16064+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16065+
type: 3}
16066+
propertyPath: m_AnchorMin.y
16067+
value: 0.5
16068+
objectReference: {fileID: 0}
16069+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16070+
type: 3}
16071+
propertyPath: m_AnchorMax.x
16072+
value: 0.5
16073+
objectReference: {fileID: 0}
16074+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16075+
type: 3}
16076+
propertyPath: m_AnchorMax.y
16077+
value: 0.5
16078+
objectReference: {fileID: 0}
16079+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16080+
type: 3}
16081+
propertyPath: m_Pivot.x
16082+
value: 0.5
16083+
objectReference: {fileID: 0}
16084+
- target: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16085+
type: 3}
16086+
propertyPath: m_Pivot.y
16087+
value: 0.5
16088+
objectReference: {fileID: 0}
16089+
- target: {fileID: 2322418288383231156, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16090+
type: 3}
16091+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
16092+
value:
16093+
objectReference: {fileID: 1338490248}
16094+
- target: {fileID: 2322418288383231156, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16095+
type: 3}
16096+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
16097+
value: StartMission2
16098+
objectReference: {fileID: 0}
16099+
- target: {fileID: 2322418287199082520, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16100+
type: 3}
16101+
propertyPath: m_Text
16102+
value: 'MISSION 3
16103+
16104+
'
16105+
objectReference: {fileID: 0}
16106+
m_RemovedComponents: []
16107+
m_SourcePrefab: {fileID: 100100000, guid: bfc4b371a0ad5a94cb577dc1b12a5c74, type: 3}
16108+
--- !u!224 &2088080453 stripped
16109+
RectTransform:
16110+
m_CorrespondingSourceObject: {fileID: 2322418288383231155, guid: bfc4b371a0ad5a94cb577dc1b12a5c74,
16111+
type: 3}
16112+
m_PrefabInstance: {fileID: 2088080452}
16113+
m_PrefabAsset: {fileID: 0}
1597116114
--- !u!1 &2092971802
1597216115
GameObject:
1597316116
m_ObjectHideFlags: 0

‎Assets/Scripts/Game/mission.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class mission : MonoBehaviour
1414
private bool isFirstTick = true;
1515
private int waveTime = 10;
1616
private int waveCount = 0;
17-
private int[] numberPerWave = {0, 1, 2, 2, 3, 0, 0, 0};
17+
private int[] numberPerWave = {0, 1, 2, 2, 3, 0, 0};
1818
private string[] messageOfWave =
1919
{
2020
"Instructor: Create units to be prepared",
@@ -23,7 +23,7 @@ public class mission : MonoBehaviour
2323
"Instructor: More are coming at you",
2424
"Instructor: Last one you are almost done with them",
2525
"Instructor: Last one you are almost done with them",
26-
"Instructor: Last one you are almost done with them",
26+
//"Instructor: Last one you are almost done with them",
2727
"Instructor: Good Job!" + "\n" + "Endless mode and Mission 2 unlocked!"
2828
};
2929
private string[] voicesToPlay =
@@ -34,7 +34,7 @@ public class mission : MonoBehaviour
3434
"NameNotMissing",
3535
"NameNotMissing",
3636
"NameNotMissing",
37-
"NameNotMissing",
37+
//"NameNotMissing",
3838
"VoixMission1.4"
3939
};
4040

@@ -75,7 +75,7 @@ void Update()
7575
}
7676
waveTime += 40;
7777
waveCount += 1;
78-
if (waveCount > 7)
78+
if (waveCount > 6)
7979
{
8080
EndMission();
8181
}

‎Assets/Scripts/Menus/MainMenu/CampaignMenu.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,17 @@ public void StartMission2()
3939
WarningMissionNotCleared.GetComponent<TemporaryMenuMessage>().Activate();
4040
}
4141
}
42+
43+
public void StartMission3()
44+
{
45+
if ((PlayerPrefs.GetInt("mission2Cleared",0)==1))
46+
{
47+
PhotonNetwork.LoadLevel("Mission3");
48+
FindObjectOfType<AudioManager>().PlaySound("BattleMusic");
49+
}
50+
else
51+
{
52+
WarningMissionNotCleared.GetComponent<TemporaryMenuMessage>().Activate();
53+
}
54+
}
4255
}

0 commit comments

Comments
 (0)