少年修仙传客户端代码仓库
client_linchunjie
2018-12-28 4610a375a492a0bf6207e862b9e6d6fcc19bbc20
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
25 ■■■■■ 已修改文件
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerRewardModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/FightingPKWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/ChatFrame.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -106,6 +106,7 @@
            }
            lookPlayerObj.SetActive(crossServerModel.IsMatching);
            matchRedPointBeh.gameObject.SetActive(!crossServerModel.IsMatching);
        }
        private void UpdateMatchInfo()
@@ -142,8 +143,16 @@
        private void UpdateLookPlayerTime()
        {
            if (!crossServerModel.IsMatching) return;
            if (!crossServerModel.IsMatching)
            {
                if(lookPlayerObj.activeInHierarchy)
                {
                    matchRedPointBeh.gameObject.SetActive(true);
                    lookPlayerObj.SetActive(false);
                }
                return;
            }
            if(CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
            {
                int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);
System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -146,7 +146,7 @@
    private void UpdatePkResultEvent()
    {
        if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面
        if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//副本结算界面
        {
            if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
            {
System/CrossServerOneVsOne/FightingPKWin.cs
@@ -126,11 +126,11 @@
        {
            if (PlayerDatas.Instance.hero.aiHandler.IsAuto())
            {
                m_AutoImg.SetActive(true);
                m_AutoImg.SetActive(false);
            }
            else
            {
                m_AutoImg.SetActive(false);
                m_AutoImg.SetActive(true);
            }
            if (WindowCenter.Instance.IsOpen("CrossServerSettlementWin"))
            {
System/MainInterfacePanel/ChatFrame.cs
@@ -131,7 +131,7 @@
        private void MailCountChange()
        {
            if (GameNetSystem.Instance.crossServerConnected_Loigc)
            if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
            {
                _MailBtn.gameObject.SetActive(false);
                return;
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1141,7 +1141,7 @@
        private void IsShowTaskPanel()//是否显示任务面板
        {
            var inDungeon = IsDungeon();
            var IsCrossServerOneVsOne = GameNetSystem.Instance.crossServerConnected_Loigc;
            var IsCrossServerOneVsOne = PlayerDatas.Instance.baseData.ExAttr5 == 1;
            if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne)
            {
                m_TaskAndTeamTip.SetActive(false);
@@ -1269,7 +1269,7 @@
        private void IsCrossServerOneVsOne()
        {
            if (GameNetSystem.Instance.crossServerConnected_Loigc)//是否再跨服副本中
            if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//是否再跨服副本中
            {
                if (!WindowCenter.Instance.IsOpen("FightingPKWin"))
                {