少年修仙传客户端代码仓库
client_Hale
2019-01-05 e03cc0580dba766fd4b1f64e81faa60a6b5a631a
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
41 ■■■■■ 已修改文件
System/Chat/ChatContentBehaviour.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Debug/DebugRoot.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Debug/DebugUtility.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/HeadPortraitTip.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/MainInterfaceWin.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/HUD/PopUpNum.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Chat/ChatContentBehaviour.cs
@@ -116,6 +116,7 @@
            if (m_ChatType == ChatInfoType.Friend)
            {
                DisplayChatContent();
                DisplayChatRemind();
                JumpPteChatBottom();
            }
        }
@@ -336,8 +337,8 @@
                {
                    if (WindowCenter.Instance.IsOpen<ChatWin>())
                    {
                        if ((_dict != null && _dict.Count > 0) ||
                        friendModel.tempFriendData != null)
                        if (((_dict != null && _dict.Count > 0) ||
                        friendModel.tempFriendData != null) && ChatCtrl.Inst.PteChatID > 0)
                        {
                            requireRemind = true;
                        }
@@ -510,13 +511,16 @@
        private void RefreshFriendCntEvent(GroupType type, bool arg2)
        {
            if (type == GroupType.RecentContact)
            if (type == GroupType.RecentContact && m_ChatType == ChatInfoType.Friend)
            {
                DisplayChatRemind();
                var _dict = friendModel.GetFriendInfoDict((byte)GroupType.RecentContact);
                if (!_dict.ContainsKey((uint)ChatCtrl.Inst.PteChatID))
                if (WindowCenter.Instance.IsOpen<ChatWin>())
                {
                    ChatCtrl.Inst.PteChatID = 0;
                    var _dict = friendModel.GetFriendInfoDict((byte)GroupType.RecentContact);
                    if (!_dict.ContainsKey((uint)ChatCtrl.Inst.PteChatID))
                    {
                        ChatCtrl.Inst.PteChatID = 0;
                    }
                }
            }
        }
System/Debug/DebugRoot.cs
@@ -36,7 +36,7 @@
            return;
        }
        if (DebugUtility.Instance.debugAccount)
        if (DebugUtility.Instance.isWhiteListAccount)
        {
            if (Input.GetMouseButtonDown(0))
            {
System/Debug/DebugUtility.cs
@@ -19,7 +19,7 @@
            if (m_DebugAccount != value)
            {
                m_DebugAccount = value;
                if (debugAccount)
                if (m_DebugAccount)
                {
                    RunTimeExceptionUtility.Instance.Init();
                }
System/MainInterfacePanel/HeadPortraitTip.cs
@@ -212,6 +212,13 @@
            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
            if (atkInt.Length > 1)
            {
                var activityline = 0;
                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
                if (PlayerDatas.Instance.baseData.MapID == 10040 && activityline == PlayerDatas.Instance.baseData.FBID)//逍遥城活动线不允许切换模式
                {
                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");
                    return;
                }
                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//逍遥城boss区域特殊处理(可切换状态)
                {
                    WindowCenter.Instance.Open<CombatModeWin>();
@@ -221,8 +228,7 @@
                    }
                    return;
                }
                var activityline = 0;
                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
                if (onMainModel.ShieldedArea.Contains(mapID))//Boss争夺战前三只保底只能是和平模式
                {
System/MainInterfacePanel/MainInterfaceWin.cs
@@ -567,15 +567,15 @@
            int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
            int Line = 0;
            bool BoolBossLine = fairyGrabBossModel.TryGetFairyGrabBossLine(out Line);
            if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && BoolBossLine)
            fairyGrabBossModel.TryGetFairyGrabBossLine(out Line);
            if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line== PlayerDatas.Instance.baseData.FBID)
            {               
                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
                onMainModel.AreaState = Buffmodel.PkType;
                return;
            }
            if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !BoolBossLine)//逍遥城普通Boss区域处理
            if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && Line != PlayerDatas.Instance.baseData.FBID)//逍遥城普通Boss区域处理
            {
                
                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
UI/HUD/PopUpNum.cs
@@ -72,6 +72,11 @@
                return;
            }
            if (_popupInfo.target==null || _popupInfo.camera==null)
            {
                return;
            }
            var popupNum = PopUpNumPool.Require(_popupInfo.pattern);
            if (popupNum == null)
            {