Skip to content

Commit 01e67d4

Browse files
author
luiza.torello
committed
fix: merge conflicts
2 parents db16f12 + df3570c commit 01e67d4

File tree

12 files changed

+69
-1
lines changed

12 files changed

+69
-1
lines changed

‎Assets/Prefabs/Forms/QuestionAnswer.prefab.meta‎

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

‎Assets/Scripts/Game/DataCollection/ClickableLink.cs.meta‎

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

‎Assets/Scripts/Game/DataCollection/PlayerData.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,15 @@ public void IncrementCombo()
8989

9090
public void IncrementKills(string enemyTypeString)
9191
{
92+
<<<<<<< HEAD
9293
/* BEFORE CONFLICT
9394
if ( !SerializedData.EnemiesKilledByType.ContainsKey(enemyTypeString) )
9495
SerializedData.EnemiesKilledByType.Add(enemyTypeString, 0);
9596
SerializedData.EnemiesKilledByType[enemyTypeString]++;
9697
SerializedData.EnemiesKilled++;
9798
*/
99+
=======
100+
>>>>>>> Develop
98101
SerializedData.EnemiesKilled++;
99102
}
100103

@@ -170,7 +173,11 @@ public void RefreshJson()
170173
}
171174
}
172175

176+
<<<<<<< HEAD
173177
public void AddCollectedItem(int amount)
178+
=======
179+
public void AddCollectedTreasure(int amount)
180+
>>>>>>> Develop
174181
{
175182
SerializedData.TreasuresCollected += amount;
176183
}
@@ -223,6 +230,7 @@ public void LoadState(object state)
223230
SerializedData.TotalNpcs = saveData.TotalNpcs;
224231
SerializedData.TotalEnemies = saveData.TotalEnemies;
225232
SerializedData.EnemiesKilled = saveData.EnemiesKilled;
233+
<<<<<<< HEAD
226234
SerializedData.TotalEnemiesByType = saveData.TotalEnemiesByType;
227235
SerializedData.EnemiesKilledByType = saveData.EnemiesKilledByType;
228236
SerializedData.TotalCollectableItems = saveData.TotalCollectableItems;
@@ -231,6 +239,11 @@ public void LoadState(object state)
231239
SerializedData.ItemsRead = saveData.ItemsRead;
232240
SerializedData.TotalLostHealth = saveData.TotalLostHealth;
233241
SerializedData.InitialHealth = saveData.InitialHealth;
242+
=======
243+
SerializedData.TotalTreasure = saveData.TotalTreasure;
244+
SerializedData.TreasuresCollected = saveData.TreasuresCollected;
245+
SerializedData.TotalLostHealth = saveData.TotalLostHealth;
246+
>>>>>>> Develop
234247
SerializedData.MaxCombo = saveData.MaxCombo;
235248
SerializedData.KeysCollected = saveData.KeysCollected;
236249
SerializedData.TotalKeys = saveData.TotalKeys;
@@ -240,7 +253,10 @@ public void LoadState(object state)
240253
SerializedData.UniqueRoomsEntered = saveData.UniqueRoomsEntered;
241254
SerializedData.RoomsEntered = saveData.RoomsEntered;
242255
SerializedData.PlayerProfile = saveData.PlayerProfile;
256+
<<<<<<< HEAD
243257
SerializedData.PreviousPlayerProfiles = saveData.PreviousPlayerProfiles;
258+
=======
259+
>>>>>>> Develop
244260
SerializedData.GivenPlayerProfile = saveData.GivenPlayerProfile;
245261
SerializedData.TotalQuests = saveData.TotalQuests;
246262
SerializedData.CompletedQuests = saveData.CompletedQuests;
@@ -280,11 +296,14 @@ public void LoadState(object state)
280296
[Serializable]
281297
public class PlayerSerializedData
282298
{
299+
<<<<<<< HEAD
283300

284301
#if !UNITY_WEBGL || UNITY_EDITOR
285302
[FirestoreProperty]
286303
#endif
287304
[field: SerializeField] public bool UseFixedProfile { get; set; }
305+
=======
306+
>>>>>>> Develop
288307
#if !UNITY_WEBGL || UNITY_EDITOR
289308
[FirestoreProperty]
290309
#endif
@@ -324,6 +343,7 @@ public class PlayerSerializedData
324343
#if !UNITY_WEBGL || UNITY_EDITOR
325344
[FirestoreProperty]
326345
#endif
346+
<<<<<<< HEAD
327347
[field: SerializeField] public Dictionary<string, int> TotalEnemiesByType { get; set; }
328348
#if !UNITY_WEBGL || UNITY_EDITOR
329349
[FirestoreProperty]
@@ -333,13 +353,17 @@ public class PlayerSerializedData
333353
[FirestoreProperty]
334354
#endif
335355
[field: SerializeField] public int TotalCollectableItems { get; set; }
356+
=======
357+
[field: SerializeField] public int TotalTreasure { get; set; }
358+
>>>>>>> Develop
336359
#if !UNITY_WEBGL || UNITY_EDITOR
337360
[FirestoreProperty]
338361
#endif
339362
[field: SerializeField] public int TreasuresCollected { get; set; }
340363
#if !UNITY_WEBGL || UNITY_EDITOR
341364
[FirestoreProperty]
342365
#endif
366+
<<<<<<< HEAD
343367
[field: SerializeField] public int TotalReadableItems { get; set; }
344368
#if !UNITY_WEBGL || UNITY_EDITOR
345369
[FirestoreProperty]
@@ -348,14 +372,19 @@ public class PlayerSerializedData
348372
#if !UNITY_WEBGL || UNITY_EDITOR
349373
[FirestoreProperty]
350374
#endif
375+
=======
376+
>>>>>>> Develop
351377
[field: SerializeField] public int TotalLostHealth { get; set; }
352378
#if !UNITY_WEBGL || UNITY_EDITOR
353379
[FirestoreProperty]
354380
#endif
381+
<<<<<<< HEAD
355382
[field: SerializeField] public int InitialHealth { get; set; }
356383
#if !UNITY_WEBGL || UNITY_EDITOR
357384
[FirestoreProperty]
358385
#endif
386+
=======
387+
>>>>>>> Develop
359388
[field: SerializeField] public int MaxCombo { get; set; }
360389
#if !UNITY_WEBGL || UNITY_EDITOR
361390
[FirestoreProperty]
@@ -392,10 +421,13 @@ public class PlayerSerializedData
392421
#if !UNITY_WEBGL || UNITY_EDITOR
393422
[FirestoreProperty]
394423
#endif
424+
<<<<<<< HEAD
395425
[field: SerializeField] public List<PlayerProfile> PreviousPlayerProfiles { get; set; }
396426
#if !UNITY_WEBGL || UNITY_EDITOR
397427
[FirestoreProperty]
398428
#endif
429+
=======
430+
>>>>>>> Develop
399431
[field: SerializeField] public PlayerProfile GivenPlayerProfile { get; set; }
400432
#if !UNITY_WEBGL || UNITY_EDITOR
401433
[FirestoreProperty]

‎Assets/Scripts/Game/DataCollection/PlayerDataController.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
using Game.NarrativeGenerator.Quests.QuestGrammarTerminals;
1212
using Game.Quests;
1313
using Game.SaveLoadSystem;
14+
<<<<<<< HEAD
1415
using Game.NPCs;
16+
=======
17+
>>>>>>> Develop
1518
using System;
1619
using UnityEngine;
1720

‎Assets/Scripts/Game/Dialogues/DialogueController.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,16 @@ public void AddDialogue(NpcDialogueData dialogueData, string dialogueLine, bool
4343
bool isQuestCloser = false)
4444
{
4545
NewQuestDialogues.Add(new QuestDialogueLine(dialogueData, dialogueLine, keepDialogueAfterSpoken,
46+
<<<<<<< HEAD
4647
id, isQuestCloser));
4748
}
4849

4950
public void InsertDialogue(NpcDialogueData dialogueData, string dialogueLine, bool keepDialogueAfterSpoken, int id,
5051
int position, bool isQuestCloser = false)
5152
{
5253
QuestDialogues.Insert( position, new QuestDialogueLine(dialogueData, dialogueLine,keepDialogueAfterSpoken,
54+
=======
55+
>>>>>>> Develop
5356
id, isQuestCloser));
5457
}
5558

‎Assets/Scripts/Game/Dialogues/Quest/QuestDialogueInteraction.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
<<<<<<< HEAD
12
using System.Collections;
23
using System;
4+
=======
5+
>>>>>>> Develop
36
using System.Collections.Generic;
47
using System.Linq;
58
using Fog.Dialogue;

‎Assets/Scripts/Game/Dialogues/TaggedDialogueHandler.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@ public class TaggedDialogueHandler : DialogueHandler, IQuestElement
1515
public static event MarkRoomOnMiniMapEvent MarkRoomOnMiniMapEventHandler;
1616
public static event StartExchangeEvent StartExchangeEventHandler;
1717
public static event StartGiveEvent StartGiveEventHandler;
18+
<<<<<<< HEAD
1819
public static event StartCheckpointEvent StartCheckpointEventHandler;
1920
public static event StartGiveKeyEvent StartGiveKeyEventHandler;
2021

22+
=======
23+
24+
>>>>>>> Develop
2125
private string[] _tags;
2226

2327
private void OnEnable()
@@ -143,12 +147,15 @@ private void EvaluateTag(string textTag)
143147
var questId = int.Parse(textTag.Split(',')[1]);
144148
StartGiveEventHandler?.Invoke(this, new StartGiveEventArgs(questId));
145149
((IQuestElement)this).OnQuestTaskResolved(this, new QuestGiveDialogueEventArgs(npcName, questId));
150+
<<<<<<< HEAD
146151
}
147152
else if (textTag.StartsWith("checkpoint="))
148153
{
149154
var npcName = textTag.Split('=')[1];
150155
var questId = int.Parse(textTag.Split(',')[1]);
151156
StartCheckpointEventHandler?.Invoke(this, new StartCheckpointEventArgs(questId));
157+
=======
158+
>>>>>>> Develop
152159
}
153160
}
154161
}

‎Assets/Scripts/Game/EnemyManager/EnemyController.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,12 @@ protected virtual void StartDeath()
219219
private void InvokeEnemyKilledEvents()
220220
{
221221
EnemyKilledHandler?.Invoke(this, EnemyData);
222+
<<<<<<< HEAD
222223
((IQuestElement) this).OnQuestTaskResolved(this, new QuestKillEnemyEventArgs(EnemyData.weapon, QuestId));
223224
KillEnemyEventHandler?.Invoke(this, new KillEnemyEventArgs( EnemyData.movement.enemyMovementIndex, EnemyData.weapon.Type));
224225
/* BEFORE CONFLICT
226+
=======
227+
>>>>>>> Develop
225228
((IQuestElement)this).OnQuestTaskResolved(this, new QuestKillEnemyEventArgs(EnemyData.weapon, QuestId));
226229
KillEnemyEventHandler?.Invoke(null, EventArgs.Empty);
227230
*/

‎Assets/Scripts/Game/Events/EnterRoomEvent.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ public class EnterRoomEventArgs : EventArgs
1313
{
1414
public RoomData RoomData { get; set; }
1515
public Vector3 PositionInScene { get; set; }
16+
<<<<<<< HEAD
1617
public int PlayerHealthWhenEntering { get; set; }
18+
=======
19+
>>>>>>> Develop
1720

1821
public EnterRoomEventArgs(Coordinates roomCoordinates, Dimensions roomDimensions, EnemyByAmountDictionary enemiesInRoom, Vector3 roomPosition)
1922
{

‎Assets/Scripts/Game/GameManager/ExperimentController.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
using Game.Maestro;
66
using Game.NarrativeGenerator;
77
using Game.NarrativeGenerator.Quests;
8+
<<<<<<< HEAD
89
using System;
10+
=======
11+
using MyBox;
12+
>>>>>>> Develop
913
using System.Collections;
1014
using System.Collections.Generic;
1115
using UnityEngine;

0 commit comments

Comments
 (0)