Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-09-21 40091c35768cf11eff1927e44a0ae3e1fce8e624

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -57,7 +57,7 @@
            StatusMgr.Instance.GetBuffIds(vNetData.ObjID, ref _skill.cacheBuffList);

            _skill.OnRecv_SkillCast();



            if (BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))

            if (!(_attacker is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))

            {

                // 这里播放配置的技能特效

                if (_skill.skillInfo.config.EffectName > 0)


 Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs

@@ -41,7 +41,7 @@
            }

        }



        if (BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))

        if (!(_attacker is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(vNetData.ObjID))

        {

            if (_skill.skillInfo.config.EffectName != 0)

            {


 System/Chat/ChatCtrl.cs

@@ -179,6 +179,9 @@


        DTC0102_tagCDBPlayer.switchAccountEvent += SwitchAccountEvent;

        StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += PlayerLoginOkEvent;



        InitChatRedpoints();



        FuncConfigConfig _cfg = Config.Instance.Get<FuncConfigConfig>("RandomWord");

        try

@@ -192,12 +195,20 @@
        }

    }



    private void PlayerLoginOkEvent()

    {

        UpdateRedpoint(ChatInfoType.Team);

        UpdateRedpoint(ChatInfoType.Fairy);

    }



    private void OnStageLoadFinish()

    {

        bool isDungeon = StageManager.Instance.CurrentStage is DungeonStage;

        if (!isDungeon)

        {

            ClearAllChatInfo();

            unReadChatCounts[ChatInfoType.Fairy] = 0;

            unReadChatCounts[ChatInfoType.Team] = 0;

        }

    }



@@ -430,6 +441,7 @@
    {

        ChatData chatData = new ChatFamilyData(vNetData.Content, (int)vNetData.PlayerID, vNetData.Name, vNetData.Extras);

        KeepChatInfo(chatData);

        ReceiveNewChat(ChatInfoType.Fairy);

    }

    /// <summary>

    /// 好友私聊

@@ -494,6 +506,7 @@
    {

        ChatData chatData = new ChatTeamData(vNetData.Content, (int)vNetData.PlayerID, vNetData.Name, vNetData.Extras);

        KeepChatInfo(chatData);

        ReceiveNewChat(ChatInfoType.Team);

    }

    /// <summary>

    /// GM

@@ -990,6 +1003,75 @@
        return string.Empty;

    }

    #endregion



    #region 仙缘红点

    Dictionary<ChatInfoType, Redpoint> chatSocialRedpoints = new Dictionary<ChatInfoType, Redpoint>();

    Dictionary<ChatInfoType, int> unReadChatCounts = new Dictionary<ChatInfoType, int>();

    public void InitChatRedpoints()

    {

        chatSocialRedpoints.Add(ChatInfoType.Fairy, new Redpoint(MainRedDot.RedPoint_FriendChatKey, 2502));

        chatSocialRedpoints.Add(ChatInfoType.Team, new Redpoint(MainRedDot.RedPoint_FriendChatKey, 2503));

        unReadChatCounts.Add(ChatInfoType.Fairy, 0);

        unReadChatCounts.Add(ChatInfoType.Team, 0);

    }



    public void ViewChat(ChatInfoType type)

    {

        if (unReadChatCounts.ContainsKey(type))

        {

            unReadChatCounts[type] = 0;

            UpdateRedpoint(type);

        }

    }



    void ReceiveNewChat(ChatInfoType type)

    {

        switch (type)

        {

            case ChatInfoType.Team:

                if (!WindowCenter.Instance.CheckOpen<TeamChatWin>())

                {

                    unReadChatCounts[ChatInfoType.Team] = Mathf.Min(unReadChatCounts[ChatInfoType.Team] + 1, 99);

                }

                break;

            case ChatInfoType.Fairy:

                if (!WindowCenter.Instance.CheckOpen<FairyChatWin>())

                {

                    unReadChatCounts[ChatInfoType.Fairy] = Mathf.Min(unReadChatCounts[ChatInfoType.Fairy] + 1, 99);

                }

                break;

        }

        UpdateRedpoint(type);

    }



    public void UpdateRedpoint(ChatInfoType type)

    {

        if (chatSocialRedpoints.ContainsKey(type))

        {

            var redpoint = chatSocialRedpoints[type];

            if (unReadChatCounts[type] > 0)

            {

                redpoint.state = RedPointState.Quantity;

                redpoint.count = unReadChatCounts[type];

            }

            else

            {

                redpoint.state = RedPointState.None;

            }

        }

        var socialRed = MainRedDot.Instance.redPointFriendChat;

        if (chatSocialRedpoints[ChatInfoType.Fairy].state == RedPointState.Quantity

            || chatSocialRedpoints[ChatInfoType.Team].state == RedPointState.Quantity)

        {

            socialRed.count = unReadChatCounts[ChatInfoType.Fairy] > 0 ?

                unReadChatCounts[ChatInfoType.Fairy] : unReadChatCounts[ChatInfoType.Team];

        }

        else

        {

            socialRed.count = 0;

        }

    }

    #endregion

}

public struct ChatExtraData

{


 System/Chat/FairyChatWin.cs

@@ -18,6 +18,9 @@
        [SerializeField] ChatContentBehaviour m_ChatContent;

        [SerializeField] RectTransform m_ContainerNoFairy;

        [SerializeField] Button m_JoinFairy;



        ChatCenter chatCenter { get { return ModelCenter.Instance.GetModel<ChatCenter>(); } }



        #region Built-in

        protected override void BindController()

        {

@@ -36,6 +39,9 @@
            ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

            m_ChatContent.chatType = ChatInfoType.Fairy;

            MyFairyRefresh();

            ChatCtrl.Inst.ViewChat(ChatInfoType.Fairy);

            ChatCtrl.Inst.lockUpdate = false;

            chatCenter.UpdateChatContentPos();

        }



        protected override void OnActived()


 System/Chat/TeamChatWin.cs

@@ -17,6 +17,7 @@
        [SerializeField] ChatContentBehaviour m_ChatContent;

        [SerializeField] RectTransform m_NoTeamContainer;

        TeamModel team { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }

        ChatCenter chatCenter { get { return ModelCenter.Instance.GetModel<ChatCenter>(); } }

        #region Built-in

        protected override void BindController()

        {

@@ -33,6 +34,9 @@
            ChatCtrl.Inst.presentChatType = ChatInfoType.Team;

            m_ChatContent.chatType = ChatInfoType.Team;

            MyTeamRefresh();

            ChatCtrl.Inst.ViewChat(ChatInfoType.Team);

            ChatCtrl.Inst.lockUpdate = false;

            chatCenter.UpdateChatContentPos();

        }



        protected override void OnActived()


 System/FriendSystem/MailAllModel.cs

@@ -475,8 +475,10 @@
    }



    StringBuilder todayDailySB = new StringBuilder();

    List<int> dailyIdlist = new List<int>();

    public string GetTodayDailyNotify(DateTime getTime)

    {

        dailyIdlist.Clear();

        todayDailySB.Length = 0;

        var dayOfWeek = (int)getTime.DayOfWeek;

        var quests = dailyModel.GetQuestByWeekTime(dayOfWeek % 7);

@@ -487,6 +489,11 @@
            int openTime = openTimelist[i];

            for (int j = 0;j < quests[openTime].Count; j++)

            {

                if(dailyIdlist.Contains(quests[openTime][j]))

                {

                    continue;

                }

                dailyIdlist.Add(quests[openTime][j]);

                DailyQuestOpenTime dailyQuestOpenTime;

                dailyModel.TryGetOpenTime(quests[openTime][j], out dailyQuestOpenTime);

                if (dailyQuestOpenTime.IsValidServerOpenTime())


 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -238,10 +238,21 @@
                }

                TaskChanges(MissionID, MissionState, DiscriptionIndex);//任务的状态修改



                if (Event_TaskRefreshes != null)//刷新任务

                if (allMissionDict[MissionID].MissionState == 0 && MissionState == 1)

                {

                    Event_TaskRefreshes(MissionID);

                    if (Event_TaskToAdd != null)//任务添加（用于存储于身上的未接取任务的特殊处理）

                    {

                        Event_TaskToAdd(MissionID, MissionState, DiscriptionIndex);

                    }

                }

                else

                {

                    if (Event_TaskRefreshes != null)//刷新任务

                    {

                        Event_TaskRefreshes(MissionID);

                    }

                }

                
            }

            else

            {


 System/Strengthening/GodBeastAttributes.cs

@@ -108,10 +108,18 @@
            }

            if (m_DoubleToggle.isOn)

            {

                if (ListIndex.Count <= 0)

                {

                    return;

                }

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 1);

            }

            else

            {

                if (ListIndex.Count <= 0)

                {

                    return;

                }

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

            }

        }

@@ -150,8 +158,10 @@
                        }

                    }

                }

                m_UIAlphaTween.gameObject.SetActive(true);

                m_FrameNull.SetActive(true);

                m_FullLevel.SetActive(false);

                m_StrengthenBtn.interactable = true;

                GetDogZLevelAndExp();

                AttributeAssignment();

            }

@@ -167,9 +177,12 @@
                m_TextAttributes2.gameObject.SetActive(false);

                m_TextAttributesAdd1.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

                m_StrengthenDoubleBtn.gameObject.SetActive(false);

                m_Text_two.SetActive(false);

                m_FrameNull.SetActive(false);

                m_FullLevel.SetActive(false);

                m_UIAlphaTween.gameObject.SetActive(false);

                m_StrengthenBtn.interactable = false;

            }

        }