Skip to content

Commit e1309fb

Browse files
author
luiza.torello
committed
fix: merge conflicts in files
1 parent 01e67d4 commit e1309fb

File tree

9 files changed

+1
-67
lines changed

9 files changed

+1
-67
lines changed

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

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

9090
public void IncrementKills(string enemyTypeString)
9191
{
92-
<<<<<<< HEAD
93-
/* BEFORE CONFLICT
9492
if ( !SerializedData.EnemiesKilledByType.ContainsKey(enemyTypeString) )
9593
SerializedData.EnemiesKilledByType.Add(enemyTypeString, 0);
9694
SerializedData.EnemiesKilledByType[enemyTypeString]++;
97-
SerializedData.EnemiesKilled++;
98-
*/
99-
=======
100-
>>>>>>> Develop
10195
SerializedData.EnemiesKilled++;
10296
}
10397

@@ -116,12 +110,9 @@ public void IncrementDeaths()
116110

117111
public void IncrementWins()
118112
{
119-
/* BEFORE CONFLICT
120113
SerializedData.TotalWins++;
121114
SerializedData.RoomsEntered += CurrentDungeon.RoomsEntered;
122115
SerializedData.UniqueRoomsEntered += CurrentDungeon.UniqueRoomsEntered;
123-
*/
124-
SerializedData.TotalWins++;
125116
CurrentDungeon.IncrementWins();
126117
}
127118

@@ -173,11 +164,7 @@ public void RefreshJson()
173164
}
174165
}
175166

176-
<<<<<<< HEAD
177167
public void AddCollectedItem(int amount)
178-
=======
179-
public void AddCollectedTreasure(int amount)
180-
>>>>>>> Develop
181168
{
182169
SerializedData.TreasuresCollected += amount;
183170
}
@@ -230,7 +217,6 @@ public void LoadState(object state)
230217
SerializedData.TotalNpcs = saveData.TotalNpcs;
231218
SerializedData.TotalEnemies = saveData.TotalEnemies;
232219
SerializedData.EnemiesKilled = saveData.EnemiesKilled;
233-
<<<<<<< HEAD
234220
SerializedData.TotalEnemiesByType = saveData.TotalEnemiesByType;
235221
SerializedData.EnemiesKilledByType = saveData.EnemiesKilledByType;
236222
SerializedData.TotalCollectableItems = saveData.TotalCollectableItems;
@@ -239,11 +225,6 @@ public void LoadState(object state)
239225
SerializedData.ItemsRead = saveData.ItemsRead;
240226
SerializedData.TotalLostHealth = saveData.TotalLostHealth;
241227
SerializedData.InitialHealth = saveData.InitialHealth;
242-
=======
243-
SerializedData.TotalTreasure = saveData.TotalTreasure;
244-
SerializedData.TreasuresCollected = saveData.TreasuresCollected;
245-
SerializedData.TotalLostHealth = saveData.TotalLostHealth;
246-
>>>>>>> Develop
247228
SerializedData.MaxCombo = saveData.MaxCombo;
248229
SerializedData.KeysCollected = saveData.KeysCollected;
249230
SerializedData.TotalKeys = saveData.TotalKeys;
@@ -253,10 +234,7 @@ public void LoadState(object state)
253234
SerializedData.UniqueRoomsEntered = saveData.UniqueRoomsEntered;
254235
SerializedData.RoomsEntered = saveData.RoomsEntered;
255236
SerializedData.PlayerProfile = saveData.PlayerProfile;
256-
<<<<<<< HEAD
257237
SerializedData.PreviousPlayerProfiles = saveData.PreviousPlayerProfiles;
258-
=======
259-
>>>>>>> Develop
260238
SerializedData.GivenPlayerProfile = saveData.GivenPlayerProfile;
261239
SerializedData.TotalQuests = saveData.TotalQuests;
262240
SerializedData.CompletedQuests = saveData.CompletedQuests;
@@ -296,14 +274,11 @@ public void LoadState(object state)
296274
[Serializable]
297275
public class PlayerSerializedData
298276
{
299-
<<<<<<< HEAD
300277

301278
#if !UNITY_WEBGL || UNITY_EDITOR
302279
[FirestoreProperty]
303280
#endif
304281
[field: SerializeField] public bool UseFixedProfile { get; set; }
305-
=======
306-
>>>>>>> Develop
307282
#if !UNITY_WEBGL || UNITY_EDITOR
308283
[FirestoreProperty]
309284
#endif
@@ -343,7 +318,6 @@ public class PlayerSerializedData
343318
#if !UNITY_WEBGL || UNITY_EDITOR
344319
[FirestoreProperty]
345320
#endif
346-
<<<<<<< HEAD
347321
[field: SerializeField] public Dictionary<string, int> TotalEnemiesByType { get; set; }
348322
#if !UNITY_WEBGL || UNITY_EDITOR
349323
[FirestoreProperty]
@@ -353,17 +327,13 @@ public class PlayerSerializedData
353327
[FirestoreProperty]
354328
#endif
355329
[field: SerializeField] public int TotalCollectableItems { get; set; }
356-
=======
357-
[field: SerializeField] public int TotalTreasure { get; set; }
358-
>>>>>>> Develop
359330
#if !UNITY_WEBGL || UNITY_EDITOR
360331
[FirestoreProperty]
361332
#endif
362333
[field: SerializeField] public int TreasuresCollected { get; set; }
363334
#if !UNITY_WEBGL || UNITY_EDITOR
364335
[FirestoreProperty]
365336
#endif
366-
<<<<<<< HEAD
367337
[field: SerializeField] public int TotalReadableItems { get; set; }
368338
#if !UNITY_WEBGL || UNITY_EDITOR
369339
[FirestoreProperty]
@@ -372,19 +342,14 @@ public class PlayerSerializedData
372342
#if !UNITY_WEBGL || UNITY_EDITOR
373343
[FirestoreProperty]
374344
#endif
375-
=======
376-
>>>>>>> Develop
377345
[field: SerializeField] public int TotalLostHealth { get; set; }
378346
#if !UNITY_WEBGL || UNITY_EDITOR
379347
[FirestoreProperty]
380348
#endif
381-
<<<<<<< HEAD
382349
[field: SerializeField] public int InitialHealth { get; set; }
383350
#if !UNITY_WEBGL || UNITY_EDITOR
384351
[FirestoreProperty]
385352
#endif
386-
=======
387-
>>>>>>> Develop
388353
[field: SerializeField] public int MaxCombo { get; set; }
389354
#if !UNITY_WEBGL || UNITY_EDITOR
390355
[FirestoreProperty]
@@ -421,13 +386,10 @@ public class PlayerSerializedData
421386
#if !UNITY_WEBGL || UNITY_EDITOR
422387
[FirestoreProperty]
423388
#endif
424-
<<<<<<< HEAD
425389
[field: SerializeField] public List<PlayerProfile> PreviousPlayerProfiles { get; set; }
426390
#if !UNITY_WEBGL || UNITY_EDITOR
427391
[FirestoreProperty]
428392
#endif
429-
=======
430-
>>>>>>> Develop
431393
[field: SerializeField] public PlayerProfile GivenPlayerProfile { get; set; }
432394
#if !UNITY_WEBGL || UNITY_EDITOR
433395
[FirestoreProperty]

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

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

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

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

5049
public void InsertDialogue(NpcDialogueData dialogueData, string dialogueLine, bool keepDialogueAfterSpoken, int id,
5150
int position, bool isQuestCloser = false)
5251
{
5352
QuestDialogues.Insert( position, new QuestDialogueLine(dialogueData, dialogueLine,keepDialogueAfterSpoken,
54-
=======
55-
>>>>>>> Develop
5653
id, isQuestCloser));
5754
}
5855

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
<<<<<<< HEAD
21
using System.Collections;
32
using System;
4-
=======
5-
>>>>>>> Develop
63
using System.Collections.Generic;
74
using System.Linq;
85
using Fog.Dialogue;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@ 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
1918
public static event StartCheckpointEvent StartCheckpointEventHandler;
2019
public static event StartGiveKeyEvent StartGiveKeyEventHandler;
2120

22-
=======
23-
24-
>>>>>>> Develop
2521
private string[] _tags;
2622

2723
private void OnEnable()
@@ -147,15 +143,12 @@ private void EvaluateTag(string textTag)
147143
var questId = int.Parse(textTag.Split(',')[1]);
148144
StartGiveEventHandler?.Invoke(this, new StartGiveEventArgs(questId));
149145
((IQuestElement)this).OnQuestTaskResolved(this, new QuestGiveDialogueEventArgs(npcName, questId));
150-
<<<<<<< HEAD
151146
}
152147
else if (textTag.StartsWith("checkpoint="))
153148
{
154149
var npcName = textTag.Split('=')[1];
155150
var questId = int.Parse(textTag.Split(',')[1]);
156151
StartCheckpointEventHandler?.Invoke(this, new StartCheckpointEventArgs(questId));
157-
=======
158-
>>>>>>> Develop
159152
}
160153
}
161154
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,8 @@ protected virtual void StartDeath()
219219
private void InvokeEnemyKilledEvents()
220220
{
221221
EnemyKilledHandler?.Invoke(this, EnemyData);
222-
<<<<<<< HEAD
223222
((IQuestElement) this).OnQuestTaskResolved(this, new QuestKillEnemyEventArgs(EnemyData.weapon, QuestId));
224223
KillEnemyEventHandler?.Invoke(this, new KillEnemyEventArgs( EnemyData.movement.enemyMovementIndex, EnemyData.weapon.Type));
225-
/* BEFORE CONFLICT
226-
=======
227-
>>>>>>> Develop
228-
((IQuestElement)this).OnQuestTaskResolved(this, new QuestKillEnemyEventArgs(EnemyData.weapon, QuestId));
229-
KillEnemyEventHandler?.Invoke(null, EventArgs.Empty);
230-
*/
231224
}
232225

233226
public void Die()

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

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

2118
public EnterRoomEventArgs(Coordinates roomCoordinates, Dimensions roomDimensions, EnemyByAmountDictionary enemiesInRoom, Vector3 roomPosition)
2219
{

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
using Game.Maestro;
66
using Game.NarrativeGenerator;
77
using Game.NarrativeGenerator.Quests;
8-
<<<<<<< HEAD
98
using System;
10-
=======
119
using MyBox;
12-
>>>>>>> Develop
1310
using System.Collections;
1411
using System.Collections.Generic;
1512
using UnityEngine;

‎Assets/Scripts/Game/GameManager/Player/PlayerSoundAndCamera.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Game.LevelManager.DungeonManager;
55
using System;
66
using UnityEngine;
7+
using Game.NPCs;
78

89
namespace Game.GameManager.Player
910
{

0 commit comments

Comments
 (0)