Skip to content

Commit 5371ad4

Browse files
committed
Revert "Adds new timeline logic structure and archive data"
This reverts commit 8a842bc.
1 parent 8a842bc commit 5371ad4

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Assets/_Project/Scripts/Effects/CameraManager.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class CameraManager : MonoBehaviour {
2323

2424
// Player selection info
2525
private GameObject cameraTarget;
26-
public List<string> players = new List<string> ();
26+
private List<string> players = new List<string> ();
2727
private int playersCurrentIndex = 0;
2828
private GameObject currentSelectionParticle;
2929

@@ -193,7 +193,7 @@ float EaseInOut (float t)
193193
/// </summary>
194194
IEnumerator Transition ()
195195
{
196-
playerDetails.playerPanel.SetActive (false);
196+
playerDetails.playerPanel.SetActive(false);
197197

198198
float t = 0.0f;
199199
Vector3 startingPos = mainCamera.transform.position;
@@ -210,8 +210,8 @@ IEnumerator Transition ()
210210
yield return 0;
211211
}
212212
cameraMoving = false;
213-
playerDetails.playerPanel.SetActive (true);
214-
playerDetails.setUI (cameraTarget.GetComponentInParent<Player> ().username, "1", "1", "1", "1", "1", "1", "1");
213+
playerDetails.playerPanel.SetActive(true);
214+
playerDetails.setUI(cameraTarget.GetComponentInParent<Player>().username, "1", "1", "1", "1", "1", "1", "1");
215215
}
216216

217217
/// ARCHIVED TRANSITION IN CASE YOU NEED IT LATER
@@ -284,8 +284,8 @@ IEnumerator ZoomIn ()
284284
}
285285
cameraZooming = false;
286286
cameraZoomed = true;
287-
playerDetails.playerPanel.SetActive (true);
288-
playerDetails.setUI (cameraTarget.GetComponentInParent<Player> ().username, "1", "1", "1", "1", "1", "1", "1");
287+
playerDetails.playerPanel.SetActive(true);
288+
playerDetails.setUI(cameraTarget.GetComponentInParent<Player>().username, "1", "1", "1", "1", "1", "1", "1");
289289
}
290290
}
291291

@@ -298,7 +298,7 @@ IEnumerator ZoomOut ()
298298
float startingZoom = mainCamera.orthographicSize;
299299
float longestD = Vector2.Distance (mainCamera.transform.position, new Vector3 (0, 1, -10)) / speed;
300300

301-
playerDetails.playerPanel.SetActive (false);
301+
playerDetails.playerPanel.SetActive(false);
302302

303303
// If the camera is not moving, zooming, or currently zoomed in
304304
if (!cameraMoving && !cameraZooming && cameraZoomed) {

Assets/_Project/Scripts/Players/PlayerManager.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ void RemoveAllPlayers ()
141141

142142
// clear the dictionary
143143
playerDict.Clear ();
144-
// clear the camera manager's list of players
145-
cameraManager.players.Clear ();
146144
// update the count
147145
UpdateCounts ();
148146
}
@@ -312,7 +310,7 @@ public void PlayEvent (FeedData feed)
312310

313311
// check to see if there are monsters following the player
314312
if (feed.monsters != "") {
315-
//Debug.Log ("PlayerManager.PlayEvent() monsters = " + feed.monsters);
313+
Debug.Log ("PlayerManager.PlayEvent() monsters = " + feed.monsters);
316314
}
317315
}
318316

0 commit comments

Comments
 (0)