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

client_Wu Xijin

2019-06-24 a9f44ac88775b8d2dde65b608f478fc6da8a3c37

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

 System/DailyQuest/DailyQuestModel.cs

@@ -168,11 +168,15 @@
            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            TaskModel.Event_FairyAuTask -= OnFairyTaskRefresh;

            FuncOpen.Instance.NewFuncOpenEvent -= OnNewFuncOpen;

            m_newDailyQuestOpenList.Clear();

            m_HasShowDailyQuestList.Clear();

        }



        public void OnPlayerLoginOk()

        {

            DailyQuestActionTimer.Instance.Begin();

            m_newDailyQuestOpenList.Clear();

            m_HasShowDailyQuestList.Clear();

        }



        public void OnBeforePlayerDataInitialize()

@@ -193,7 +197,7 @@
            bool bHasAdd = false;

            foreach (var quest in quests)

            {

                if(quest.UnLockFuncID == id)

                if(quest.UnLockFuncID == id && !m_newDailyQuestOpenList.Contains(quest.ID))

                {              

                    m_newDailyQuestOpenList.Add(quest.ID);

                    bHasAdd = true;


 System/Message/RichEvent.cs

@@ -29,4 +29,5 @@
    MyFightPoint,

    MyReikiRoot,

    MyDefense,

    JobLabel,

}


 System/Message/RichNormalEvent.cs

@@ -22,6 +22,7 @@
        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.MyFightPoint, this);

        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.MyReikiRoot, this);

        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.MyDefense, this);

        RichTextMgr.Inst.RegisterEvent(RichTextEventEnum.JobLabel, this);

    }



    public override bool Execute(RichTextEventEnum type, RichTextMgr.HrefInfo href)

@@ -308,6 +309,18 @@
                        return label;

                    }

                }

            case RichTextEventEnum.JobLabel:

                {

                    var json = dic["joblabel"];

                    var labelArray = LitJson.JsonMapper.ToObject<string[]>(json);

                    var job = PlayerDatas.Instance.baseData.Job;

                    var index = job - 1;

                    if (labelArray != null && index < labelArray.Length)

                    {

                        return labelArray[index];

                    }

                }

                break;

        }

        return string.Empty;

    }


 System/Message/WordAnalysis.cs

@@ -168,6 +168,12 @@
                        eventType = RichTextEventEnum.MyDefense;

                    }

                    break;

                case "joblabel":

                    {

                        displayDic.Add(split_value, array[1].ToLower());

                        eventType = RichTextEventEnum.JobLabel;

                    }

                    break;

                default:

                    {

                        displayDic.Add(split_value, array[1]);