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

client_Hale

2018-12-03 3ad8237a1631be487f39ac3fdf6015acc9b0631f

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

 Core/GameEngine/Model/Player/Rank/PlayerRankData.cs

@@ -120,6 +120,8 @@
        OpenServerFightPower = 16,

        Def_BT_FCCostGold = 17,  //消费排行榜(仙界盛典)

        OpenServerRune = 18,

        OpenServerGodWeapon = 20,

        OpenServerRecharge = 21,

    }



    public class RankData


 Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA32C_tagCMEquipDecompose.cs

@@ -1,20 +1,45 @@
using UnityEngine;

using System.Collections;



//A3 2C 装备分解 #tagCMEquipDecompose



public class CA32C_tagCMEquipDecompose : GameNetPackBasic {

    public byte IndexCount;    //材料所在背包索引的数量

    public  byte[] IndexList;    //材料所在背包索引列表



    public CA32C_tagCMEquipDecompose () {

        combineCmd = (ushort)0x03FE;

        _cmd = (ushort)0xA32C;

    }



    public override void WriteToBytes () {

        WriteBytes (IndexCount, NetDataType.BYTE);

        WriteBytes (IndexList, NetDataType.BYTE, IndexCount);

    }



}

//A3 2C 装备分解 #tagCMEquipDecompose







public class CA32C_tagCMEquipDecompose : GameNetPackBasic {



    public byte Count;    //材料所在背包索引的数量



    public  ushort[] IndexList;    //材料所在背包索引列表



    public  uint[] ItemIDList;    //材料所在背包物品ID列表



    public byte IsAuto;    //是否自动分解







    public CA32C_tagCMEquipDecompose () {



        combineCmd = (ushort)0x03FE;



        _cmd = (ushort)0xA32C;



    }







    public override void WriteToBytes () {



        WriteBytes (Count, NetDataType.BYTE);



        WriteBytes (IndexList, NetDataType.WORD, Count);



        WriteBytes (ItemIDList, NetDataType.DWORD, Count);



        WriteBytes (IsAuto, NetDataType.BYTE);



    }







}




 System/Chat/ChatTip.cs

@@ -42,7 +42,7 @@
        }

    }



    public event Action OnChatUpEvent;

    public static event Action OnChatUpEvent;



    private Image chatBg;

    private ScrollerController chatUpCtrl;

@@ -53,6 +53,9 @@


    static StringBuilder sb = new StringBuilder();



    public Vector2 chatLowSize { get { return m_ChatLowSize; } }

    public Vector2 chatHighSize { get { return m_ChatHighSize; } }



    void InitCom()

    {

        chatBg = this.GetComponent<Image>("Image");


 System/KnapSack/Logic/EquipDevourWin.cs

@@ -593,13 +593,17 @@
            playerPack.isAutoDecompose = false;

            SettingEffectMgr.Instance.isStartDecompose = true;

            CA32C_tagCMEquipDecompose _petEat = new CA32C_tagCMEquipDecompose();

            byte[] _petIndex = new byte[realDevourlist.Count];

            var _petIndex = new ushort[realDevourlist.Count];

            var idlist = new uint[realDevourlist.Count];

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

            {

                _petIndex[i] = (byte)realDevourlist[i].itemInfo.ItemPlace;

                _petIndex[i] = (ushort)realDevourlist[i].itemInfo.ItemPlace;

                idlist[i] = (uint)realDevourlist[i].itemId;

            }

            _petEat.IndexCount = (byte)_petIndex.Length;

            _petEat.Count = (byte)_petIndex.Length;

            _petEat.IndexList = _petIndex;

            _petEat.ItemIDList = idlist;

            _petEat.IsAuto = 0;

            GameNetSystem.Instance.SendInfo(_petEat);

        }




 System/KnapSack/Logic/PlayerPackModels.cs

@@ -1727,18 +1727,22 @@
            isAutoDecompose = true;

            recordAutoDecomNum = itemModels.Count;

            CA32C_tagCMEquipDecompose _petEat = new CA32C_tagCMEquipDecompose();

            byte[] _petIndex = new byte[recordAutoDecomNum];

            var _petIndex = new ushort[recordAutoDecomNum];

            var idlist = new uint[recordAutoDecomNum];

            for (int i = 0; i < recordAutoDecomNum; i++)

            {

                _petIndex[i] = (byte)itemModels[i].itemInfo.ItemPlace;

                _petIndex[i] = (ushort)itemModels[i].itemInfo.ItemPlace;

                idlist[i] = (uint)itemModels[i].itemId;

                if (itemModels[i].chinItemModel.StarLevel >= 2 

                    || (itemModels[i].chinItemModel.EquipPlace == 0 && itemModels[i].chinItemModel.Type != 29))

                {

                    return;

                }

            }

            _petEat.IndexCount = (byte)_petIndex.Length;

            _petEat.Count = (byte)_petIndex.Length;

            _petEat.IndexList = _petIndex;

            _petEat.ItemIDList = idlist;

            _petEat.IsAuto = 1;

            GameNetSystem.Instance.SendInfo(_petEat);

        }




 System/KnapSack/New/BagWin.cs

@@ -71,6 +71,8 @@
        }

        protected override void OnAfterOpen() {



            Transform parent = WindowCenter.Instance.Get<KnapSackWin>().transform;

            this.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one);

            this.transform.SetAsLastSibling();

            OnRefrenshUIModel();

            if(KnapSackWin.titleType == KnapsackFuncTitle.bag


 System/MainInterfacePanel/ExperienceOpenWin.cs

@@ -42,7 +42,7 @@
            billionsExperience = 0;

            unitExperience = 0;

            PlayerMainDate.Event_Experience += OnExperience;

            ChatTip.Inst.OnChatUpEvent += OnChatUpEvent;

            ChatTip.OnChatUpEvent += OnChatUpEvent;

            PositionModification(ChatTip.Inst.IsChatUp);

        }



@@ -55,7 +55,7 @@
        protected override void OnPreClose()

        {

            PlayerMainDate.Event_Experience -= OnExperience;

            ChatTip.Inst.OnChatUpEvent -= OnChatUpEvent;

            ChatTip.OnChatUpEvent -= OnChatUpEvent;

        }



        protected override void OnAfterClose()


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -86,6 +86,8 @@
        [SerializeField] Button WishingAwardImg;

        [SerializeField] Button MysticalPurchaseImg;

        [SerializeField] Button DungeonAssistImg;

        [SerializeField] RectTransform m_ContainerGotoGrabBoss;

        [SerializeField] RectTransform m_ContainerAdaptiveChat;

        [SerializeField] Button m_GotoFairyGrabBoss;

        [SerializeField] Button m_FlyToFairyGrabBoss;



@@ -247,6 +249,7 @@
            assistModel.UpdateRedpointEvent += UpdateDungeonAssistImag;

            purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;

            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;

            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;

        }



        private void CompletionOfTaskEvent(int obj)

@@ -259,6 +262,7 @@
        {

            m_HighSettingTip.OnActived();

            IsShowTaskPanel();//是否显示任务面板

            RefreshAdaptiveChat();

        }



        IEnumerator Co_Load()

@@ -416,6 +420,7 @@
            RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;

            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;

            fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss;

            ChatTip.OnChatUpEvent -= RefreshAdaptiveChat;

            if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

            {

                WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();

@@ -1170,7 +1175,7 @@


        private void ShowFairyGrabBoss()

        {

            m_GotoFairyGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&

            m_ContainerGotoGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&

                !fairyGrabBossModel.grabBossHintOpen);

        }



@@ -1264,6 +1269,16 @@
                    break;

            }

        }



        private void RefreshAdaptiveChat()

        {

            if (ChatTip.Inst == null)

            {

                return;

            }

            m_ContainerAdaptiveChat.sizeDelta = m_ContainerAdaptiveChat.sizeDelta.SetY(

                ChatTip.Inst.IsChatUp ? ChatTip.Inst.chatHighSize.y : ChatTip.Inst.chatLowSize.y);

        }

    }



}


 System/OpenServerActivity/ImpactRankModel.cs

@@ -73,7 +73,7 @@
        private void OnRefreshRank(int type)

        {

            if (type >= (int)PlayerRankData.RankType.OpenServerStrengthen

                && type <= (int)PlayerRankData.RankType.OpenServerRune)

                && type <= (int)PlayerRankData.RankType.OpenServerRecharge)

            {

                foreach (var _type in m_Redpoints.Keys)

                {

@@ -93,6 +93,7 @@
        public Dictionary<int, int[]> billRankPromotePathDict { get; private set; }

        public Dictionary<int, OSCbillBoardCondition> impactRankTypeOpenDict { get; private set; }

        public Dictionary<int, List<OSCBillTagAwardConfig>> billTagSortCfgDict { get; private set; }

        public List<int> impactRankSorts = new List<int>();

        public int openServerActivityDays { get; private set; }

        public int openServerRankDays { get; private set; }

        public int gotoImpactRankType { get; set; }

@@ -218,6 +219,7 @@
                }

                impactRankTypeOpenDict.Add(_type, _condition);

                m_Redpoints.Add(_type, new Redpoint(Redpoint_Key_ImpactRank, Redpoint_Key_ImpactRank * 100 + _type));

                impactRankSorts.Add(_type);

            }

        }



@@ -368,6 +370,10 @@
                    return PlayerRankData.RankType.OpenServerFightPower;

                case 7:

                    return PlayerRankData.RankType.OpenServerRune;

                case 8:

                    return PlayerRankData.RankType.OpenServerGodWeapon;

                case 9:

                    return PlayerRankData.RankType.OpenServerRecharge;

            }

            return PlayerRankData.RankType.OpenServerMount;

        }

@@ -613,28 +619,30 @@
        /// <returns></returns>

        public int GetDefaultSelectType()

        {

            if (gotoImpactRankType != 0 && billRankCfgDict.ContainsKey(gotoImpactRankType))

            if (gotoImpactRankType != 0 && impactRankSorts.Contains(gotoImpactRankType))

            {

                var _tyep = gotoImpactRankType;

                gotoImpactRankType = 0;

                return _tyep;

            }

            foreach (var _key in m_Redpoints.Keys)

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

            {

                if (m_Redpoints[_key].state == RedPointState.GetReward

                    || m_Redpoints[_key].state == RedPointState.Simple)

                var _type = impactRankSorts[i];

                if (m_Redpoints[_type].state == RedPointState.GetReward

                    || m_Redpoints[_type].state == RedPointState.Simple)

                {

                    return _key;

                    return _type;

                }

            }

            foreach (var _key in billRankCfgDict.Keys)

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

            {

                if (!IsActivityClose(_key) && !IsMissImpactRank(_key))

                var _type = impactRankSorts[i];

                if (!IsActivityClose(_type) && !IsMissImpactRank(_type))

                {

                    return _key;

                    return _type;

                }

            }

            return billRankCfgDict.Keys.First();

            return impactRankSorts[0];

        }



        public bool HasRedpoint()


 System/OpenServerActivity/ImpactRankWin.cs

@@ -472,6 +472,10 @@
                    return 18;

                case 7:

                    return 31;

                case 8:

                    return 38;

                case 9:

                    return 39;

            }

            return 13;

        }


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -69,7 +69,7 @@
            var impactDefaultType = impactRankModel.GetDefaultSelectType();

            if (impactRankModel.IsLock(impactDefaultType))

            {

                impactDefaultType = impactRankModel.billRankCfgDict.Keys.First();

                impactDefaultType = impactRankModel.impactRankSorts[0];

            }

            impactRankModel.presentSelectType = impactDefaultType;

            impactRankModel.gotoImpactRankType = 0;

@@ -462,7 +462,7 @@
                        {

                            break;

                        }

                        foreach (var _type in impactRankModel.billRankCfgDict.Keys)

                        foreach (var _type in impactRankModel.impactRankSorts)

                        {

                            if (impactRankModel.IsLock(_type))

                            {