Nextrek

Explore

Commits

Diff Revisions 122 vs 125 for /3DSpace/Assets/Custum/Scripts/CommunicationCenter.cs

		@@ -8,7 +8,6 @@
8	8		public GameObject smallCamera;
9	9		public GameObject smallCamera1;
10	10		public GameObject smallCamera2;
11		-	public Transform allyPrefeb;
12	11
13	12		private string missionName;
14	13		private string description;
		@@ -46,11 +45,9 @@
46	45		EnemyPool.Instance.StartGame();
47	46		}
48	47
49		-	for(int i=0;i<allies;i++)
	48	+	if (AllyPool.Instance!=null)
50	49		{
51		-
52		-	Transform tp = Instantiate(allyPrefeb) as Transform;
53		-	tp.gameObject.tag = "Ally";
	50	+	AllyPool.Instance.StartGame();
54	51		}
55	52		}
56	53		void LoadDataOfMission(int missionID)
		@@ -73,6 +70,8 @@
73	70		}
74	71		allies = int.Parse(missionData["allies"].ToString());
75	72
	73	+	AllyPool.Instance.InsertAlly(0, allies);
	74	+
76	75		JsonData subMission = missionData["submissions"];
77	76		int kill = int.Parse(subMission["kill-enemy-number"].ToString());
78	77		if(kill==0)
		@@ -230,6 +229,9 @@
230	229		{
231	230		GameManager.GetHero().gameObject.SetActive(false);
232	231		}
233		-	GlobalObject.Instance.WinThisLevel(false);
	232	+	if (GlobalObject.Instance)
	233	+	{
	234	+	GlobalObject.Instance.WinThisLevel(false);
	235	+	}
234	236		}
235	237		}