少年修仙传客户端代码仓库
client_linchunjie
2018-12-28 0b0ac3af3fb312e4eaa575797e0e5678e7c9f7cb
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
38 ■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerRewardModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerSettlementWin.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/RankingWin.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/SeasonRewardCell.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -128,6 +128,10 @@
    {
        if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面
        {
            if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
            {
                WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneRoundWin>();
            }
            WindowCenter.Instance.Open<CrossServerSettlementWin>();
        }
    }
System/CrossServerOneVsOne/CrossServerSettlementWin.cs
@@ -191,7 +191,14 @@
                m_SegmentTxt2.text = config2.Name;
               
            }
            m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";
            if (crossServerModel.pkResultInfo.WinStreak > 1)
            {
                m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
            }
            else
            {
                m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
            }
        }
        private void SetBrokenLine()
@@ -200,11 +207,11 @@
            int playerID = (int)PlayerDatas.Instance.baseData.PlayerID;
            if (WinnerID == playerID)
            {
                m_BrokenLineText.text = "对手离开战斗";
                m_BrokenLineText.text = Language.Get("CrossServer_Z6");
            }
            else
            {
                m_BrokenLineText.text = "重新连接超时";
                m_BrokenLineText.text = Language.Get("CrossServer_Z7");
            }
            if (crossServerModel.pkResultInfo.WinStreak > 1)
            {
@@ -228,7 +235,14 @@
            {
                m_SegmentObj1.SetActive(false);
            }
            m_Sorce_Txt.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")";
            if (crossServerModel.pkResultInfo.WinStreak > 1)
            {
                m_Sorce_Txt.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
            }
            else
            {
                m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
            }
        }
    }
System/CrossServerOneVsOne/RankingWin.cs
@@ -171,7 +171,7 @@
            int Index = cell.index;
            Button Btn = cell.GetComponent<Button>();
            Text txt = cell.transform.Find("Text").GetComponent<Text>();
            txt.text = "赛区" + Index;
            txt.text = Language.Get("CrossServer_Z4") + Index;
            Btn.SetListener(() =>
            {
                crossServerRewardModel.ZoneID = Index;
@@ -185,7 +185,7 @@
            int Index = cell.index;
            Button Btn = cell.GetComponent<Button>();
            Text txt = cell.transform.Find("Text").GetComponent<Text>();
            txt.text = "赛季" + Index;
            txt.text = Language.Get("CrossServer_Z3") + Index;
            Btn.SetListener(() =>
            {
                crossServerRewardModel.SeasonID = Index;
@@ -217,8 +217,8 @@
        private void SetZoneAndSeasonNum()
        {
            m_DivisionNameText1.text = "赛区"+crossServerRewardModel.ZoneID.ToString();
            m_DivisionNameText2.text = "赛季"+crossServerRewardModel.SeasonID.ToString();
            m_DivisionNameText1.text = Language.Get("CrossServer_Z4") +crossServerRewardModel.ZoneID.ToString();
            m_DivisionNameText2.text = Language.Get("CrossServer_Z3") + crossServerRewardModel.SeasonID.ToString();
        }
        private void SetZoneIDAndSeasonID()//设置赛区和ID
System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -59,12 +59,12 @@
            int Index = keyList.IndexOf(id);
            if (Index == 0)
            {
                m_Text_Ranking.text = "1-" + id + "名";
                m_Text_Ranking.text = Language.Get("CrossServer_Z5", 1, id);
            }
            else
            {
                int Number = keyList[(Index - 1)];
                m_Text_Ranking.text = (Number+1) + "-" + id + "名";
                m_Text_Ranking.text = Language.Get("CrossServer_Z5", (Number + 1), id);
            }
            switch (Index)
            {