Skip to content

Commit

Permalink
fix die error
Browse files Browse the repository at this point in the history
  • Loading branch information
@kyechan99
kyechan99 committed Jul 22, 2017
1 parent 67f63cb commit 8ce20bd
Showing 1 changed file with 57 additions and 53 deletions.
110 changes: 57 additions & 53 deletions Script/User/User.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private static void timeCheck(Object source, System.Timers.ElapsedEventArgs e)
int mvpIdx = 0;
for (int i = 0; i < Server.v_user.Count; i++)
if (Server.v_user[i] != null)
if (Server.v_user[i].proper.Equals(PROPER.THIEF))
if (Server.v_user[i].proper.Equals(PROPER.THIEF) && Server.v_user[i].isLive)
if (maxActive < Server.v_user[i].thiefActiveMass)
{
maxActive = Server.v_user[i].thiefActiveMass;
Expand Down Expand Up @@ -206,12 +206,12 @@ private void ParsePacket(int len)
timeCount = maxPlayTime;
tmr.Stop();
for (int j = 0; j < Server.v_user.Count; j++)
Server.v_user[j].SendMsg(string.Format("DIE:{0}", myIdx));
Server.v_user[j].SendMsg(string.Format("DIE:{0}", myIdx, myIdx));
}
else
{
for (int j = 0; j < Server.v_user.Count; j++)
Server.v_user[j].SendMsg(string.Format("DIE:{0}", myIdx));
Server.v_user[j].SendMsg(string.Format("DIE:{0}", myIdx, myIdx));
}
}
else if (txt[0].Equals("MOVE"))
Expand Down Expand Up @@ -247,65 +247,67 @@ private void ParsePacket(int len)
else if (txt[0].Equals("DIE"))
{
Console.WriteLine("DIED");
for (int i = 0; i < Server.v_user.Count; i++)
{
Server.v_user[i].SendMsg(string.Format("DIE:{0}", int.Parse(txt[1])));

if (Server.v_user[i].myIdx.Equals(int.Parse(txt[2])) && !txt[1].Equals(txt[2]))
{
Server.v_user[i].policeActiveMass += 5;
}
}

int thiefCount = 0, policeCount = 0;
bool lCheck = true;
for (int j = 0; j < Server.v_user.Count; j++)
{
if (Server.v_user[j].isLive)
if (Server.v_user[j] != null)
{
if (int.Parse(txt[1]).Equals(Server.v_user[j].myIdx))
Server.v_user[j].isLive = false;
Server.v_user[j].SendMsg(string.Format("DIE:{0}", int.Parse(txt[1]), txt[2]));

lCheck = false;
//break;
if (Server.v_user[j].isLive)
{
if (int.Parse(txt[1]).Equals(Server.v_user[j].myIdx))
Server.v_user[j].isLive = false;
else
{
if (Server.v_user[j].proper.Equals(PROPER.THIEF)) thiefCount++;
else if (Server.v_user[j].proper.Equals(PROPER.POLICE)) policeCount++;
}

if (Server.v_user[j].myIdx.Equals(int.Parse(txt[2])) && !txt[1].Equals(txt[2]))
Server.v_user[j].policeActiveMass += 5;
}
}
}

if (Server.v_user[j].proper.Equals(PROPER.THIEF)) thiefCount++;
else if (Server.v_user[j].proper.Equals(PROPER.POLICE)) policeCount++;
if (thiefCount.Equals(0))
{
timeCount = maxPlayTime;
tmr.Stop();

int maxActive = -10, mvpIdx = 0;
for (int i = 0; i < Server.v_user.Count; i++)
if (Server.v_user[i] != null)
if (Server.v_user[i].proper.Equals(PROPER.POLICE) && Server.v_user[i].isLive)
if (maxActive < Server.v_user[i].policeActiveMass)
{
maxActive = Server.v_user[i].policeActiveMass;
mvpIdx = Server.v_user[i].myIdx;
}

for (int i = 0; i < Server.v_user.Count; i++)
Server.v_user[i].SendMsg(string.Format("DONE:{0}:{1}", (int)PROPER.POLICE, mvpIdx));
}
else if (policeCount.Equals(0))
{
timeCount = maxPlayTime;
tmr.Stop();

if (lCheck)
if (thiefCount.Equals(0))
{
int maxActive = -10, mvpIdx = 0;
for (int i = 0; i < Server.v_user.Count; i++)
if (Server.v_user[i] != null)
if (Server.v_user[i].proper.Equals(PROPER.POLICE))
if (maxActive < Server.v_user[i].policeActiveMass)
{
maxActive = Server.v_user[i].policeActiveMass;
mvpIdx = Server.v_user[i].myIdx;
}

for (int i = 0; i < Server.v_user.Count; i++)
Server.v_user[i].SendMsg(string.Format("DONE:{0}:{1}", (int)PROPER.POLICE, mvpIdx));
}
else if (policeCount.Equals(0))
{
uint maxActive = 0;
int mvpIdx = 0;
for (int i = 0; i < Server.v_user.Count; i++)
if (Server.v_user[i] != null)
if (Server.v_user[i].proper.Equals(PROPER.THIEF))
if (maxActive < Server.v_user[i].thiefActiveMass)
{
maxActive = Server.v_user[i].thiefActiveMass;
mvpIdx = Server.v_user[i].myIdx;
}

for (int i = 0; i < Server.v_user.Count; i++)
Server.v_user[i].SendMsg(string.Format("DONE:{0}:{1}", (int)PROPER.THIEF));
}
uint maxActive = 0;
int mvpIdx = 0;
for (int i = 0; i < Server.v_user.Count; i++)
if (Server.v_user[i] != null)
if (Server.v_user[i].proper.Equals(PROPER.THIEF) && Server.v_user[i].isLive)
if (maxActive < Server.v_user[i].thiefActiveMass)
{
maxActive = Server.v_user[i].thiefActiveMass;
mvpIdx = Server.v_user[i].myIdx;
}

for (int i = 0; i < Server.v_user.Count; i++)
Server.v_user[i].SendMsg(string.Format("DONE:{0}:{1}", (int)PROPER.THIEF));
}
}
else if (txt[0].Equals("ATTACK"))
{
Expand Down Expand Up @@ -400,6 +402,8 @@ static void StartGame()
{
Server.v_user[j].SendMsg(string.Format("START:{0}", mapNum));
Server.v_user[j].isLive = true;
Server.v_user[j].policeActiveMass = 0;
Server.v_user[j].thiefActiveMass = 0;
}

int memCount = 0;
Expand Down Expand Up @@ -471,7 +475,7 @@ static void ChangeColor()
{
if (Server.v_user[i].proper == PROPER.THIEF)
{
int colorT = Server.rand.Next(0, 8);
int colorT = Server.rand.Next(0, 9);

for (int j = 0; j < Server.v_user.Count; j++)
if (Server.v_user[j] != null)
Expand Down

0 comments on commit 8ce20bd

Please sign in to comment.