少年修仙传客户端代码仓库
client_Hale
2018-12-29 55b3589298dbd364e623e954bec95125368938b8
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
44 ■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerSettlementWin.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -148,6 +148,7 @@
        {
            if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return;
            var hero = PlayerDatas.Instance.hero;
            var mission = dungeonModel.mission;
            if(mission.prepareTime > 0)
            {
@@ -156,6 +157,11 @@
                {
                    WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();
                }
                if(hero != null)
                {
                    hero.Behaviour.StopHandupAI(true);
                }
            }
            DebugEx.LogFormat("副本帮助信息回合是否开始::{0}",mission.isStart);
            if (mission.isStart == 1)
@@ -169,6 +175,10 @@
                {
                    WindowCenter.Instance.Open<CrossServerOneVsOneStartFightWin>();
                }
                if (hero != null)
                {
                    hero.Behaviour.StartHandupAI();
                }
            }
        }
System/CrossServerOneVsOne/CrossServerSettlementWin.cs
@@ -50,8 +50,17 @@
        PlayerBuffDatas m_BuffModel;
        PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }
        float timer = 0f;
        private int WinSorce = 0;
        private int FailureSorce = 0;
        protected override void BindController()
        {
        {
            var configNum1 = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKScore").Numerical2;
            var _jsonDataC = LitJson.JsonMapper.ToObject(configNum1);
            if (_jsonDataC.Count > 0)
            {
                WinSorce = int.Parse(_jsonDataC[0].ToString());
                FailureSorce= int.Parse(_jsonDataC[1].ToString());
            }
        }
        protected override void AddListeners()
@@ -133,6 +142,7 @@
            m_RoundWinThree.SetActive(false);
            m_SessionObj.SetActive(false);
            m_SegmentObj.SetActive(false);
            int WinnerID = crossServerModel.pkResultInfo.WinnerID;
            int PlayerId = (int)PlayerDatas.Instance.baseData.PlayerID;
            for (int i = 0; i < crossServerModel.pkResultInfo.RoundCount; i++)
            {
@@ -197,11 +207,18 @@
            }
            if (crossServerModel.pkResultInfo.WinStreak > 1)
            {
                m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
                m_SorceText.text = Language.Get("CrossServer_Z1", WinSorce, (crossServerModel.pkResultInfo.AddScore- WinSorce));
            }
            else
            {
                m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
                if (WinnerID == PlayerId)
                {
                    m_SorceText.text = Language.Get("CrossServer_Z2", WinSorce);
                }
                else
                {
                    m_SorceText.text = Language.Get("CrossServer_Z2", FailureSorce);
                }
            }
        }
@@ -240,11 +257,18 @@
            }
            if (crossServerModel.pkResultInfo.WinStreak > 1)
            {
                m_Sorce_Txt.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
                m_Sorce_Txt.text = Language.Get("CrossServer_Z1", WinSorce, (crossServerModel.pkResultInfo.AddScore- WinSorce));
            }
            else
            {
                m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore);
                if(WinnerID == playerID)
                {
                    m_Sorce_Txt.text = Language.Get("CrossServer_Z2",WinSorce);
                }
                else
                {
                    m_Sorce_Txt.text = Language.Get("CrossServer_Z2", FailureSorce);
                }
            }
        }
    }