1
This commit is contained in:
parent
b859308d36
commit
33a7588733
@ -61,10 +61,6 @@ namespace GameLogic
|
|||||||
|
|
||||||
if (data == null)
|
if (data == null)
|
||||||
{
|
{
|
||||||
// 没有加入过阵营
|
|
||||||
if (data.teamId == "-1")
|
|
||||||
{
|
|
||||||
// 指令集操作
|
|
||||||
if (protCustMessageData.content.Contains("加入"))
|
if (protCustMessageData.content.Contains("加入"))
|
||||||
{
|
{
|
||||||
var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
|
var number = protCustMessageData.content.Where(c => char.IsDigit(c)).ToArray();
|
||||||
@ -147,7 +143,6 @@ namespace GameLogic
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1350,6 +1350,7 @@ namespace GameLogic
|
|||||||
|
|
||||||
if (m_GameTimerLen <= 0)
|
if (m_GameTimerLen <= 0)
|
||||||
{
|
{
|
||||||
|
isGaunJunShiKe = false;
|
||||||
// 游戏结束
|
// 游戏结束
|
||||||
OnRestGame();
|
OnRestGame();
|
||||||
}
|
}
|
||||||
|
@ -456,11 +456,11 @@ namespace GameLogic
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_rectBgList.GetChild(teamId).gameObject.SetActive(true);
|
m_rectBgList.GetChild(teamId-1).gameObject.SetActive(true);
|
||||||
m_rectSdx.GetChild(teamId).gameObject.SetActive(true);
|
m_rectSdx.GetChild(teamId-1).gameObject.SetActive(true);
|
||||||
m_rectSceneFx.GetChild(teamId).gameObject.SetActive(true);
|
m_rectSceneFx.GetChild(teamId - 1).gameObject.SetActive(true);
|
||||||
m_rectSpeed.GetChild(teamId).gameObject.SetActive(true);
|
m_rectSpeed.GetChild(teamId - 1).gameObject.SetActive(true);
|
||||||
m_rectTopFx.GetChild(teamId).gameObject.SetActive(true);
|
m_rectTopFx.GetChild(teamId - 1).gameObject.SetActive(true);
|
||||||
|
|
||||||
|
|
||||||
// 替换UI图
|
// 替换UI图
|
||||||
@ -593,7 +593,7 @@ namespace GameLogic
|
|||||||
{
|
{
|
||||||
//m_img_BT.sprite = GameModule.Resource.LoadAsset<Sprite>(string.Format("zjm_{0}_BT", DataGameSceneManager.Instance.m_TeamId + 1));
|
//m_img_BT.sprite = GameModule.Resource.LoadAsset<Sprite>(string.Format("zjm_{0}_BT", DataGameSceneManager.Instance.m_TeamId + 1));
|
||||||
//m_img_BT.SetNativeSize();
|
//m_img_BT.SetNativeSize();
|
||||||
m_img_BT.material = GameModule.Resource.LoadAsset<Material>(string.Format("Main_UI_Top{0}", DataGameSceneManager.Instance.m_TeamId + 1));
|
m_img_BT.material = GameModule.Resource.LoadAsset<Material>(string.Format("Main_UI_Top{0}", DataGameSceneManager.Instance.m_TeamId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -50,7 +50,7 @@ namespace GameLogic
|
|||||||
switch (gameLenTiemrId)
|
switch (gameLenTiemrId)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
EventConts.gameLenTiemr = 10 * 60;
|
EventConts.gameLenTiemr = 2 * 60;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
EventConts.gameLenTiemr = 20 * 60;
|
EventConts.gameLenTiemr = 20 * 60;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user