Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
| | |
| | | }
|
| | | if (crossServerModel.pkResultInfo.WinStreak > 1)
|
| | | {
|
| | | m_SorceText.text = Language.Get("CrossServer_Z1", WinSorce, (crossServerModel.pkResultInfo.AddScore- WinSorce));
|
| | | m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.AddScore, (crossServerModel.pkResultInfo.AddScore- WinSorce));
|
| | | }
|
| | | else
|
| | | {
|
| | | if (WinnerID == PlayerId)
|
| | | {
|
| | | m_SorceText.text = Language.Get("CrossServer_Z2", WinSorce);
|
| | | m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);
|
| | | }
|
| | | else
|
| | | {
|
| | | m_SorceText.text = Language.Get("CrossServer_Z2", FailureSorce);
|
| | | m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);
|
| | | }
|
| | | }
|
| | | } |
| | |
| | | }
|
| | | if (crossServerModel.pkResultInfo.WinStreak > 1)
|
| | | {
|
| | | m_Sorce_Txt.text = Language.Get("CrossServer_Z1", WinSorce, (crossServerModel.pkResultInfo.AddScore- WinSorce));
|
| | | m_Sorce_Txt.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.AddScore, (crossServerModel.pkResultInfo.AddScore- WinSorce));
|
| | | }
|
| | | else
|
| | | {
|
| | | if(WinnerID == playerID)
|
| | | {
|
| | | m_Sorce_Txt.text = Language.Get("CrossServer_Z2",WinSorce);
|
| | | m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);
|
| | | }
|
| | | else
|
| | | {
|
| | | m_Sorce_Txt.text = Language.Get("CrossServer_Z2", FailureSorce);
|
| | | m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.AddScore);
|
| | | }
|
| | | }
|
| | | } |
| | |
| | | roomId = matchOK.RoomID, |
| | | waitForLoginCrossServer = true, |
| | | validTimeLimited = Time.time + 30f, |
| | | autoEnsureTime = Time.time + 5f, |
| | | autoEnsureTime = Time.time + 3f, |
| | | myName = matchOK.PlayerName, |
| | | myJob = PlayerDatas.Instance.baseData.Job, |
| | | myBornPoint = matchOK.Number, |