Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
This commit is contained in:
commit
7cd0dcc46c
@ -141,6 +141,7 @@ public class ReadRoom : MonoBehaviour
|
|||||||
RoleId = item1.RoleId;
|
RoleId = item1.RoleId;
|
||||||
if(item1.RoleId==8000)//主持人
|
if(item1.RoleId==8000)//主持人
|
||||||
{
|
{
|
||||||
|
Debug.LogError(item1.RoleId+"11111111111111111s");
|
||||||
isenter=true;
|
isenter=true;
|
||||||
}
|
}
|
||||||
else if(item1.RoleId == 8001)//总指挥
|
else if(item1.RoleId == 8001)//总指挥
|
||||||
@ -175,11 +176,6 @@ public class ReadRoom : MonoBehaviour
|
|||||||
Debug.LogError(room.PlayerList.Count);
|
Debug.LogError(room.PlayerList.Count);
|
||||||
for (int i = 0; i < room.PlayerList.Count; i++)
|
for (int i = 0; i < room.PlayerList.Count; i++)
|
||||||
{
|
{
|
||||||
Debug.LogError(GlobalData.ServerData.data.userId);
|
|
||||||
Debug.LogError(room.PlayerList[i].UserId);
|
|
||||||
Debug.LogError("------------");
|
|
||||||
Debug.LogError(formattedDate);
|
|
||||||
Debug.LogError(room.ReserveDate);
|
|
||||||
if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && (formattedDate == room.ReserveDate))
|
if ((GlobalData.ServerData.data.userId == room.PlayerList[i].UserId) && (formattedDate == room.ReserveDate))
|
||||||
{
|
{
|
||||||
//传人物职业ID
|
//传人物职业ID
|
||||||
|
@ -45,7 +45,7 @@ public class LoginPanel : Base
|
|||||||
grantType = "password",
|
grantType = "password",
|
||||||
clientId = "e5cd7e4891bf95d1d19206ce24a7b32e",
|
clientId = "e5cd7e4891bf95d1d19206ce24a7b32e",
|
||||||
userType = "company_user",
|
userType = "company_user",
|
||||||
username = "13699802230",//"ZF16c788632",
|
username = "13051628292",//"ZF16c788632",13699802230,13051628292
|
||||||
password = "YYL5371!"
|
password = "YYL5371!"
|
||||||
};
|
};
|
||||||
image.gameObject.SetActive (true);
|
image.gameObject.SetActive (true);
|
||||||
@ -72,16 +72,16 @@ public class LoginPanel : Base
|
|||||||
//ReadRoom.instance.adHead();
|
//ReadRoom.instance.adHead();
|
||||||
SceneManager.LoadScene("yhj");
|
SceneManager.LoadScene("yhj");
|
||||||
}
|
}
|
||||||
else if(id.text == "13699802230" && pwd.text == "YYL5371!")
|
else //if(id.text == "13699802230" && pwd.text == "YYL5371!")
|
||||||
{
|
{
|
||||||
|
|
||||||
//SceneManager.LoadScene("yhj");
|
//SceneManager.LoadScene("yhj");
|
||||||
ReadRoom.instance.head();
|
ReadRoom.instance.head();
|
||||||
}
|
}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
SceneManager.LoadScene("Tmap 1");
|
// SceneManager.LoadScene("Tmap 1");
|
||||||
}
|
//}
|
||||||
|
|
||||||
////如果是玩家账号就跳转到加入房间界面
|
////如果是玩家账号就跳转到加入房间界面
|
||||||
//if (loginBody.userType == "Player")
|
//if (loginBody.userType == "Player")
|
||||||
|
Loading…
Reference in New Issue
Block a user