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

client_linchunjie

2018-09-20 e432f2e612b213b1a262d3122363ea7d1fcebe49

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

 System/Compose/New/ComposeWinModel.cs

@@ -854,6 +854,20 @@
        }

    }



    public bool CheckIsComposeByType(int firstType,int secondType,int thirdType)

    {

        ItemCompoundConfig itemCompound = GetThirdTypeModellist(firstType,secondType,thirdType)[0];

        if (itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV)

        {

            return true;

        }

        else

        {

            SysNotifyMgr.Instance.ShowTip("TicketComposeUnlock", itemCompound.levelNeed, itemCompound.secondTypeName);

            return false;

        }

    }



    public int secondType { get; private set; }

    public int thirdType { get; private set;}

    public void SetJumpToModel(ComposeFuncType type,int secondType,int thirdType)


 System/FindPrecious/PersonalBossModel.cs

@@ -148,9 +148,8 @@
                return;

            }



            personalRedpoint.count = own / ticketItem.count;

            personalRedpoint.count = Mathf.Clamp(own / ticketItem.count, 0, totalTimes - enterTimes);

            personalRedpoint.state = RedPointState.Quantity;



        }



        private void ParseConfig()


 System/HappyXB/BestXBWin.cs

@@ -54,7 +54,10 @@
        [SerializeField] float maxTimeInter = 0.6f;

        [Header("最小时间间隔")]

        [SerializeField] float minTimeInter = 0.005f;



        [Header("闪烁次数")]

        [SerializeField] public int flashingTimes = 10;

        [Header("单次闪烁时间")]

        [SerializeField] public  float flashingTime = 0.2f;

        [Header("得到物品停留时间")]

        [SerializeField] float stopTime = 2f;

        [Header("寻宝得到物品动画时间")]

@@ -434,6 +437,14 @@
                {

                    if (cycle > cycleTimes)

                    {

                        for (int i = 0; i < xbItemlist.Count; i++)

                        {

                            xbItemlist[i].CheckToFlashing(1,curSelectIndex);

                        }

                        for (int i = 0; i < xbItemlist.Count; i++)

                        {

                            xbItemlist[i].RefreshSelectIcon(curSelectIndex);

                        }

                        if (isXBMany)

                        {

                            if (targetIndex >= targetIndexs.Count - 1)

@@ -495,7 +506,16 @@


        IEnumerator PlaySelectItemAni(bool isEndXB,int targetIndex = 0,int curSelectIndex = 0)

        {

            yield return new WaitForSeconds(stopTime);

            XBGetItemConfig getItemConfig = XBModel.GetXBItemConfigByType(1);

            if(getItemConfig != null && getItemConfig.LuckyGridNum == curSelectIndex)

            {

                yield return new WaitForSeconds(flashingTime*flashingTimes);

            }

            else

            {

                yield return new WaitForSeconds(stopTime);

            }

          
            if(isEndXB)

            {

                if(targetIndexs.Count > 1)


 System/HappyXB/HappyXBModel.cs

@@ -314,6 +314,28 @@
            return dict;

        }



        public XBGetItemConfig GetXBItemConfigByType(int type)

        {

            int lv = 0;

            List<XBGetItemConfig> configlist = null;

            xbTypeItemDict.TryGetValue(type, out configlist);

            if (configlist != null)

            {

                for (int i = configlist.Count - 1; i > -1; i--)

                {

                    if (PlayerDatas.Instance.baseData.LV >= configlist[i].MinLV)

                    {

                        lv = configlist[i].MinLV;

                        break;

                    }

                }

            }

            XBGetItemConfig xbItemConfig = null;

            string key = StringUtility.Contact(type, lv);

            xbGetItemDict.TryGetValue(key,out xbItemConfig);

            return xbItemConfig;

        }



        #region 处理服务端数据

        public event Action RefreshXBTypeInfoAct;

        public event Action RefreshXBResultAct;


 System/HappyXB/RuneXBWin.cs

@@ -55,6 +55,11 @@
        [SerializeField] float maxTimeInter = 0.6f;

        [Header("最小时间间隔")]

        [SerializeField] float minTimeInter = 0.005f;

        [Header("闪烁次数")]

        [SerializeField] public int flashingTimes = 10;

        [Header("单次闪烁时间")]

        [SerializeField] public float flashingTime = 0.2f;



        [Header("得到物品停留时间")]

        [SerializeField] float stopTime = 0.5f;

        [Header("寻宝得到物品动画时间")]

@@ -444,6 +449,11 @@
                {

                    if (cycle > cycleTimes)

                    {

                        for (int i = 0; i < xbItemlist.Count; i++)

                        {

                            xbItemlist[i].CheckToFlashing(2, curSelectIndex);

                        }



                        if (isXBMany)

                        {

                            if (targetIndex >= targetIndexs.Count - 1)

@@ -503,7 +513,16 @@


        IEnumerator PlaySelectItemAni(bool isEndXB, int targetIndex = 0, int curSelectIndex = 0)

        {

            yield return new WaitForSeconds(stopTime);

            XBGetItemConfig getItemConfig = XBModel.GetXBItemConfigByType(2);

            if (getItemConfig != null && getItemConfig.LuckyGridNum == curSelectIndex)

            {

                yield return new WaitForSeconds(flashingTime * flashingTimes);

            }

            else

            {

                yield return new WaitForSeconds(stopTime);

            }



            if (isEndXB)

            {

                if (targetIndexs.Count > 1)


 System/HappyXB/XBItemCell.cs

@@ -2,6 +2,7 @@
using UnityEngine.UI;

using TableConfig;

using System.Collections.Generic;

using System.Collections;



namespace Snxxz.UI

{

@@ -12,6 +13,7 @@
        [SerializeField] Text nameText;



        ItemTipsModel itemTips { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        HappyXBModel XBModel { get { return ModelCenter.Instance.GetModel<HappyXBModel>(); } }

        int xbIndex = 0;



        public void SetModel(int itemId,int count,int index)

@@ -45,5 +47,53 @@
                selectIcon.SetActive(false);

            }

        }



        public void CheckToFlashing(int xbType, int curSelect)

        {

            if (curSelect != xbIndex) return;



            XBGetItemConfig xbItemConfig = XBModel.GetXBItemConfigByType(xbType);

            if (xbItemConfig == null || xbItemConfig.LuckyGridNum != xbIndex) return;

            StartCoroutine(BestItemFlashing(xbType));

        }



        IEnumerator BestItemFlashing(int xbType)

        {

            int num = 0;

            BestXBWin bestXB = null;

            RuneXBWin runeXB = null;

            switch (xbType)

            {

                case 1:

                    bestXB = WindowCenter.Instance.Get<BestXBWin>();

                    break;

                case 2:

                    runeXB = WindowCenter.Instance.Get<RuneXBWin>();

                    break;

            }

            int flashingTimes = 0;

            float flashingTime = 0;

            if(bestXB != null)

            {

                flashingTimes = bestXB.flashingTimes;

                flashingTime = bestXB.flashingTime;

            }

            else if(runeXB != null)

            {

                flashingTimes = runeXB.flashingTimes;

                flashingTime = runeXB.flashingTime;

            }



            while (true)

            {

                selectIcon.SetActive(!selectIcon.activeInHierarchy);

                num += 1;

                if (num >= flashingTimes)

                {

                    break;

                }

                yield return new WaitForSeconds(flashingTime);

            }

        }

    }

}


 System/KnapSack/Logic/ItemOverdueModel.cs

@@ -35,7 +35,7 @@
        public event Action showItemRefreshEvent;

        public OverdueItem currentShowItem { get; private set; }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



        bool isdelay = true;

        public readonly int VipExperirnceID = 985;

        public readonly int VipCardID = 978;

        Dictionary<int, Dictionary<int, List<ItemModel>>>  allGuardDict = new Dictionary<int, Dictionary<int, List<ItemModel>>>(); //守护类型，守护ID

@@ -63,6 +63,8 @@


        public void OnBeforePlayerDataInitialize()

        {

            isdelay = true;

            GlobalTimeEvent.Instance.secondEvent -= UpdateSecond;

            guardOverdueIndex = -1;

            itemStack.Clear();

            itemGuids.Clear();

@@ -73,10 +75,25 @@
        {

          

        }



        void IPlayerLoginOk.OnPlayerLoginOk()

    
        public void OnPlayerLoginOk()

        {

            GetOverdueGuard();

            GlobalTimeEvent.Instance.secondEvent += UpdateSecond;

            time = 0;

        }

        float time = 0;

        private void UpdateSecond()

        {

           if(isdelay)

            {

                time += 1;

                if(time >= 5)

                {

                    GetOverdueGuard();

                    isdelay = false;

                    time = 0;

                }

            }

        }



        public bool TryGetItem(string _guid, out OverdueItem _itemModel)

@@ -194,6 +211,7 @@
                case "Guardian_Timeout":

                    if (list.Count > 1)

                    {

                        SetAllGuardIdlist();

                        guardOverdueIndex = int.Parse(list[1].ToString());

                        ItemModel itemModel = playerPack.GetItemModelByIndex(PackType.rptItem, guardOverdueIndex);

                        if (itemModel != null)


 System/MainInterfacePanel/SideMission.cs

@@ -23,6 +23,7 @@


        [SerializeField] Button _Btn_Forward;//支线前往按钮

        [SerializeField] Text _Text_Forward;//按钮文字

        [SerializeField] Button m_FinishAtOnce;//立即完成

        PlayerTaskDatas m_TaskModel;

        PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }

        ItemTipsModel _itemTipsModel;

@@ -40,6 +41,7 @@
        private void Start()

        {

            _Btn_Forward.onClick.AddListener(ForwardButton);

            m_FinishAtOnce.AddListener(OnClickSkillTask);

        }

        private void OnEnable()

        {

@@ -60,6 +62,11 @@


        }



        private void OnClickSkillTask()

        {

            TaskAllocation.Instance.SkillTask(TaskIdNow);



        }

        private void ForwardButton()

        {

            if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3)

@@ -144,7 +151,7 @@
            str = WordAnalysis.Color_Start_Regex.Replace(str, string.Empty);

            str = WordAnalysis.Color_End_Regex.Replace(str, string.Empty);

            _Text_TaskTarget.text = str;//任务目标



            SkillTask(taskID);

            if ((int)taskmodel.GetTaskStatus(TaskIdNow) == 3)//能够进行立即完成的支线任务

            {

                _Text_Forward.text = string.Format(Language.Get("FinishAtOnce_Z"));

@@ -234,6 +241,16 @@
            }

            return string.Empty;

        }



        private void SkillTask(int TsakID)

        {

            if (!taskmodel.allMissionDict.ContainsKey(TsakID) || !mainModel.TaskId_Skill.Contains(TsakID))

            {

                m_FinishAtOnce.gameObject.SetActive(false);

                return;

            }

            m_FinishAtOnce.gameObject.SetActive(true);

        }

    }

}




 System/MainInterfacePanel/TaskAllocation.cs

@@ -9,9 +9,11 @@
using System.Text.RegularExpressions;

using System.Collections.Generic;

//用于任务分配

namespace Snxxz.UI {

namespace Snxxz.UI

{



    public class TaskAllocation:Singleton<TaskAllocation> {

    public class TaskAllocation : Singleton<TaskAllocation>

    {



        private static StringBuilder textBuilder = new StringBuilder();

        private const string Info_Pattern = "{([a-zA-Z0-9_]+)}";

@@ -23,7 +25,7 @@
                return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>());

            }

        }

        public  string GetTaskInfo(string val, int _item)//用于0820中字典的值替换（1字符串2任务ID）

        public string GetTaskInfo(string val, int _item)//用于0820中字典的值替换（1字符串2任务ID）

        {

            textBuilder.Length = 0;

            int index = 0;

@@ -56,7 +58,7 @@
            }

        }



      public int ForRingNumber()//获取赏金环数

        public int ForRingNumber()//获取赏金环数

        {

            if (taskmodel.ReplaceDic.ContainsKey(1))

            {

@@ -114,7 +116,38 @@
            }

            return 0;

        }



        PlayerMainDate m_MainModel;

        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }

        public void SkillTask(int TaskID)//用于解锁被动技能任务

        {

            int Gold = (int)UIHelper.GetMoneyCnt(1);//仙玉

            if (mainModel.TaskId_Skill.Contains(TaskID))

            {

                int Index = mainModel.TaskId_Skill.IndexOf(TaskID);

                int NeedMoney = mainModel.NeedFairyJade[Index];

                string strNull = string.Format(Language.Get("PassiveSkillTask3"), NeedMoney);

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>

                {

                    if (isOk)

                    {

                        if (Gold >= NeedMoney)

                        {

                            taskmodel.CompletionOfTask(TaskID);

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                        }

                        else

                        {

                            if (VersionConfig.Get().isBanShu)

                            {

                                SysNotifyMgr.Instance.ShowTip("GoldErr");

                                return;

                            }

                            WindowCenter.Instance.Open<RechargeTipWin>();

                        }

                    }

                });

            }

        }

    }



}


 System/MainInterfacePanel/TaskListTip.cs

@@ -99,6 +99,7 @@
            PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//任务的删除

            PlayerTaskDatas.Event_TaskInformation += TaskInformation;//任务字典信息

            PlayerTaskDatas.MainCardLevelChange += MainCardLevelChange;//卡级任务修改

            PlayerTaskDatas.CardLevelChange += CardLevelChangeEvent;//卡级任务状态改变

            model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;

@@ -132,6 +133,7 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;

            PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改

            PlayerTaskDatas.CardLevelChange -= CardLevelChangeEvent;//卡级任务状态改变

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)

        }



@@ -153,6 +155,15 @@
            }

        }



        private void CardLevelChangeEvent(int taskID)

        {

            if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3)

            {

                TaskScheduling();

                TheTaskToGenerate();

                TaskJump(taskID);

            }

        }

        private void MainCardLevelChange(int _id)

        {

            TaskScheduling();    

@@ -347,7 +358,7 @@
            foreach (var key in taskmodel.MainTaskDic.Keys)

            {

                var State = taskmodel.GetTaskStatus(key);

                if (State == PlayerTaskDatas.TaskStatus.CardLevel)

                if (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel)

                {

                    IsDefault = false;

                }

@@ -371,6 +382,10 @@
            {

                return _index0.CompareTo(_index1);

            }

            if (xPack.LV.CompareTo(yPack.LV) != 0)

            {

                return -xPack.LV.CompareTo(yPack.LV);

            }

            return 1;

        }



@@ -384,6 +399,11 @@
            {

                return _index0.CompareTo(_index1);

            }

            if (xPack.LV.CompareTo(yPack.LV) != 0)

            {

                return -xPack.LV.CompareTo(yPack.LV);

            }

           
            return 1;

        }




 System/Team/TeamModel.cs

@@ -15,6 +15,7 @@
        bool serverInited = false;

        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }



        public bool autoAcceptApplication {

            get { return (PlayerDatas.Instance.baseData.ExAttr2 / 10) % 10 == 0; }

@@ -193,10 +194,12 @@
            levelMaxBuf = GeneralConfig.Instance.playerMaxLevel;

            ParseTeamMission();

            DTCB309_tagGCAnswerPlayerShortInfo.OnPlayerShortInfoEvent += OnGetPlayerShortInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnUpdateFairyInfo;

        }



        public override void UnInit()

        {

            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnUpdateFairyInfo;

            DTCB309_tagGCAnswerPlayerShortInfo.OnPlayerShortInfoEvent -= OnGetPlayerShortInfo;

        }



@@ -632,11 +635,7 @@
                    }

                    break;

                case TeamInviteType.Fairy:

                    GetFairyMemebers();

                    if (teamInvitesUpdateEvent != null)

                    {

                        teamInvitesUpdateEvent(_inviteType);

                    }

                    fairyModel.UpdateFairyInfo();

                    break;

                case TeamInviteType.NearBy:

                    RequestQueryNearbyPlayers();

@@ -738,6 +737,18 @@
            }

        }



        private void OnUpdateFairyInfo()

        {

            if (currentInviteType == TeamInviteType.Fairy)

            {

                GetFairyMemebers();

                if (teamInvitesUpdateEvent != null)

                {

                    teamInvitesUpdateEvent(TeamInviteType.Fairy);

                }

            }

        }



        public void OnGetPlayerShortInfo(HB309_tagGCAnswerPlayerShortInfo _inTeamInfo)

        {

            if (playerInTeamAnswerEvent != null)


 System/Vip/LimitedTimePackageWin.cs

@@ -109,7 +109,15 @@
                            {

                                if (OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage))

                                {

                                    SysNotifyMgr.Instance.ShowTip("LimitGilt1");

                                    var seconds = 0;

                                    if (operationBase != null)

                                    {

                                        if (operationBase.InAdvanceTime(TimeUtility.ServerNow))

                                        {

                                            seconds = operationBase.GetSecondsBeforeStart(TimeUtility.ServerNow);

                                        }

                                    }

                                    SysNotifyMgr.Instance.ShowTip("LimitGilt1", TimeUtility.SecondsToDHMSCHS(seconds));

                                    return;

                                }

                                else


 System/Vip/VipInvest/VipInvestModel.cs

@@ -414,6 +414,7 @@
        private void VipInvestRedPoint()//Vip 投资红点

        {

            JumpIndex = 0;

            redPointStre1.state = RedPointState.None;

            InvestInfo = GetInvestInfoByType((int)InvestType.Vip);

            cycle = GetInvestCycle(InvestInfo.curDay);

            if (InvestInfo.investGold <= 0)


 System/Vip/VipInvest/VipInvestWin.cs

@@ -51,7 +51,12 @@
            }

            else

            {

                m_RemainingDays.text = string.Format(Language.Get("TheRemainingNumberDays_Z"), UIHelper.GetTextColorByItemColor(TextColType.Green, (7 - InvestInfo.curDay).ToString(), true));

                int Day = 0;

                if (7 - InvestInfo.curDay > 0)

                {

                    Day = 7 - InvestInfo.curDay;

                }

                m_RemainingDays.text = string.Format(Language.Get("TheRemainingNumberDays_Z"), UIHelper.GetTextColorByItemColor(TextColType.Green, Day.ToString(), true));

            }



            if (InvestInfo.investGold <= 0)

@@ -118,7 +123,12 @@
                }

                else

                {

                    m_RemainingDays.text = string.Format(Language.Get("TheRemainingNumberDays_Z"), UIHelper.GetTextColorByItemColor(TextColType.Green, (7 - InvestInfo.curDay).ToString(), true));

                    int Day = 0;

                    if (7 - InvestInfo.curDay > 0)

                    {

                        Day = 7 - InvestInfo.curDay;

                    }

                    m_RemainingDays.text = string.Format(Language.Get("TheRemainingNumberDays_Z"), UIHelper.GetTextColorByItemColor(TextColType.Green, Day.ToString(), true));

                }

            }

        }


 System/WindowJump/WindowJumpMgr.cs

@@ -45,6 +45,7 @@
    DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }

    TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }

    ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }

    ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }



    public bool IsJumpState { get; private set; }

    private int jumpPhase = 0;

@@ -320,6 +321,22 @@
                break;

            case JumpUIType.OpenServerGift:

                return;

            case JumpUIType.EquipCompose1:

            case JumpUIType.EquipCompose2:

            case JumpUIType.EquipCompose3:

            case JumpUIType.EquipCompose4:

            case JumpUIType.ComposeTicketFairy:

            case JumpUIType.ComposeTicketGod:

            case JumpUIType.ComposeTicketIce:

                int[] types = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);

                if (types.Length > 0)

                {

                    if (!composeModel.CheckIsComposeByType(_tagWinSearchModel.TABID+1,types[0],types[1]))

                    {

                        return;

                    }

                }

                break;

        }



        DebugEx.Log("WindowJumpTo" + jumpType);

@@ -353,7 +370,9 @@
            case JumpUIType.StrengthFunc3:

            case JumpUIType.StrengthFunc4:

            case JumpUIType.StrengthFunc5:

            case JumpUIType.EquipWashType2:

            case JumpUIType.StrengthFunc1Type2:

            case JumpUIType.EquipSuitType2:

                SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.ComposeFunc1:

@@ -364,6 +383,17 @@
            case JumpUIType.TicketCompose1:

            case JumpUIType.TicketCompose2:

                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.EquipCompose1:

            case JumpUIType.EquipCompose2:

            case JumpUIType.EquipCompose3:

            case JumpUIType.EquipCompose4:

                int[] types = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);

                if(types.Length > 0)

                {

                    composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1,types[0],types[1]);

                    SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                }

                break;

            case JumpUIType.RuneFunc1:

            case JumpUIType.RuneFunc2:

@@ -383,6 +413,7 @@
                break;

            case JumpUIType.PetFunc1:

            case JumpUIType.PetFunc2:

            case JumpUIType.MountType2:

            case JumpUIType.FairyGrabBoss:

                SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);

                break;

@@ -723,7 +754,6 @@
            case JumpUIType.ComposeTicketFairy:

            case JumpUIType.ComposeTicketGod:

            case JumpUIType.ComposeTicketIce:

                var composeModel = ModelCenter.Instance.GetModel<ComposeWinModel>();

                int[] composeTypelist = ConfigParse.GetMultipleStr<int>(_tagWinSearchModel.SelectActive);

                composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, composeTypelist[0], composeTypelist[1]);

                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

@@ -1081,7 +1111,9 @@
    StrengthFunc2 = 13,

    StrengthFunc3 = 14,

    StrengthFunc4 = 15,

    EquipSuitType2 = 241, //套装界面

    StrengthFunc5 = 16,

    EquipWashType2 = 239, //装备洗练界面

    ComposeFunc1 = 17,

    ComposeFunc2 = 18,

    ComposeFunc3 = 19,

@@ -1099,6 +1131,7 @@
    UnionFunc5 = 31,

    PetFunc1 = 32,

    PetFunc2 = 33,

    MountType2 = 240,//坐骑界面

    PetStone = 34,

    Treasure = 35,

    WorldChat = 38,

@@ -1270,6 +1303,10 @@
    Kylin5= 232,//麒麟之府的5层

    Kylin6 = 233,//麒麟之府的6层

    PrayforDrug = 234, //炼丹祈福（太上老君的馈赠）

    EquipCompose1 = 235, //装备合成-龙魂红二

    EquipCompose2 = 236, //装备合成-龙魂红三

    EquipCompose3 = 237, //装备合成-灵瑶红二

    EquipCompose4 = 238, //装备合成-灵瑶红三

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面