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

client_Zxw

2018-08-13 8edabb4bd6892df62eeed23eaa88003e2e9670fe

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

 Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs

@@ -6,7 +6,7 @@
    public partial class ItemCompoundConfig : ConfigBase, IConfigPostProcess

    {

        private static Dictionary<int, Dictionary<int, Dictionary<int, List<ItemCompoundConfig>>>> allComposeModelDict = new Dictionary<int, Dictionary<int, Dictionary<int, List<ItemCompoundConfig>>>>();



        static Dictionary<int, List<ItemCompoundConfig>> ticketComposeDict = new Dictionary<int, List<ItemCompoundConfig>>();

        public void OnConfigParseCompleted()

        {

            if (!allComposeModelDict.ContainsKey(firstType))

@@ -43,6 +43,21 @@
                    }

                }



            }



            if (firstType == (int)ComposeFuncType.Ticket)

            {

                var makeItemArray = ConfigParse.GetMultipleStr<int>(makeID);

                for (int i = 0; i < makeItemArray.Length; i++)

                {

                    List<ItemCompoundConfig> list = null;

                    if (!ticketComposeDict.TryGetValue(makeItemArray[i], out list))

                    {

                        list = new List<ItemCompoundConfig>();

                        ticketComposeDict.Add(makeItemArray[i], list);

                    }

                    list.Add(this);

                }

            }

        }



@@ -105,6 +120,11 @@
            return null;

        }



        public static bool TryGetTicketCompose(int _ticketId, out List<ItemCompoundConfig> list)

        {

            return ticketComposeDict.TryGetValue(_ticketId, out list);

        }



    }

}




 Fight/PreFightMission.cs

@@ -1526,6 +1526,11 @@
    private bool mDestroy = false;

    public void Destroy()

    {

        if (IsFinished())

        {

            return;

        }



        mDestroy = true;

        if (m_FuncNpc != null)

        {


 System/Dungeon/DungeonSuppliesLackWin.cs

@@ -23,11 +23,14 @@
        [SerializeField] TextEx m_TicketNeed;

        [SerializeField] Text m_LackContentTip;

        [SerializeField] Text m_LackMoneyTip;

        [SerializeField] Text m_ConfirmLabel;

        [SerializeField] Button m_Confirm;

        [SerializeField] Button m_Close;

        [SerializeField] Button m_TicketCompose;



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

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

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



        #region Built-in

        protected override void BindController()

@@ -38,6 +41,7 @@
        {

            m_Confirm.AddListener(Confirm);

            m_Close.AddListener(CloseClick);

            m_TicketCompose.AddListener(TicketCompose);

        }



        protected override void OnPreOpen()

@@ -50,9 +54,11 @@
            m_TicketOwn.text = own.ToString();

            m_TicketNeed.text = StringUtility.Contact("/", lackItem.count);

            m_TicketOwn.colorType = own >= lackItem.count ? TextColType.White : TextColType.Red;

            m_TicketCompose.gameObject.SetActive(own < lackItem.count && CanComposeTicket(lackType));



            m_LackContentTip.text = GetLackContentTip(lackType);

            m_LackMoneyTip.gameObject.SetActive(own < lackItem.count);

            m_ConfirmLabel.text = GetConfirmLabel(lackType);



            if (own < lackItem.count)

            {

@@ -117,6 +123,22 @@
            else

            {

                ConfirmTodo(lackType);

            }

        }



        private void TicketCompose()

        {

            switch (lackType)

            {

                case LackType.ElderGodArea:

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeTicketIce);

                    break;

                case LackType.FairyLand:

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeTicketFairy);

                    break;

                case LackType.SingleIceCrystal:

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ComposeTicketGod);

                    break;

            }

        }



@@ -271,6 +293,34 @@
            }

        }



        private string GetConfirmLabel(LackType _lackType)

        {

            switch (_lackType)

            {

                case LackType.PersonalBoss:

                case LackType.Kylin:

                case LackType.IceCrystal:

                    return Language.Get("ConfirmTarget");

                case LackType.ElderGodArea:

                case LackType.FairyLand:

                case LackType.SingleIceCrystal:

                    return Language.Get("W_CertainInto");

                default:

                    return Language.Get("ConfirmTarget");

            }

        }



        private bool CanComposeTicket(LackType _lackType)

        {

            var lackItem = GetLackItem(lackType);

            List<ItemCompoundConfig> list;

            if (ItemCompoundConfig.TryGetTicketCompose(lackItem.id, out list))

            {

                return composeModel.IsComposeTicketByType(list[0].secondType);

            }

            return false;

        }



        public enum LackType

        {

            PersonalBoss,


 System/FindPrecious/DemonJarWin.cs

@@ -65,6 +65,7 @@
        {

            model.bossSelectedEvent += OnBossSelected;

            findPreciousModel.bossSubscribeChangeEvent += OnSubscribeBoss;

            dungeonModel.dungeonRecordChangeEvent += OnRemaintimeUpdate;

            dungeonModel.countRemainTimeChangeEvent += OnRemaintimeUpdate;

            dungeonModel.updateDungeonBuyCnt += OnBuyTimesOk;

            model.doubleAwardChangeEvent += OnDoubleAwardChange;

@@ -75,6 +76,7 @@
            guideChallenge = false;

            model.bossSelectedEvent -= OnBossSelected;

            findPreciousModel.bossSubscribeChangeEvent -= OnSubscribeBoss;

            dungeonModel.dungeonRecordChangeEvent -= OnRemaintimeUpdate;

            dungeonModel.countRemainTimeChangeEvent -= OnRemaintimeUpdate;

            dungeonModel.updateDungeonBuyCnt -= OnBuyTimesOk;

            model.doubleAwardChangeEvent -= OnDoubleAwardChange;


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -68,6 +68,7 @@
        {

            TimeUtility.OnServerOpenDayRefresh += OnStepServerDayEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent;

            OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;

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

            {

                m_ActivitySpreadDict[m_SortArray[i]] = false;

@@ -119,6 +120,7 @@
        {

            TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;

            OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;

            CloseOtherWin();

            WindowCenter.Instance.Open<MainInterfaceWin>();

            impactRankModel.gotoImpactRankType = 0;

@@ -478,6 +480,44 @@
                m_ActivityCtrl.m_Scorller.RefreshActiveCellViews();

            }

        }



        private void OperationStartEvent(Operation type, int state)

        {

            switch (type)

            {

                case Operation.MultipleExp:

                    if (state == 1 && !alreadyOpenActivitys.Contains(5))

                    {

                        alreadyOpenActivitys.Add(5);

                        UpdateFunctionBtns();

                    }

                    break;

                case Operation.ConsumeRebate:

                    if (state == 0 && !alreadyOpenActivitys.Contains(1))

                    {

                        alreadyOpenActivitys.Add(1);

                        UpdateFunctionBtns();

                    }

                    break;

                case Operation.FlashSale:

                    if (state == 0 && !alreadyOpenActivitys.Contains(4))

                    {

                        alreadyOpenActivitys.Add(4);

                        UpdateFunctionBtns();

                    }

                    break;

                case Operation.BossReborn:

                    break;

                case Operation.GiftPackage:

                    break;

                case Operation.FairyCeremony:

                    break;

                case Operation.MultipRealmPoint:

                    break;

                case Operation.max:

                    break;

            }

        }

    }

}




 System/WindowBase/WindowAsyncLoad.cs

@@ -45,6 +45,7 @@
                var task = taskQueue[i];

                if (task.windowName == _name)

                {

                    task.Dispose();

                    taskQueue.Remove(task);

                    break;

                }

@@ -66,6 +67,11 @@
                currentTask = null;

            }



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

            {

                var task = taskQueue[i];

                task.Dispose();

            }

            taskQueue.Clear();

            NetLinkWin.Hide();

        }

@@ -116,6 +122,14 @@
                }

            }



            public void RemoveTask(Task _task)

            {

                if (tasks.Contains(_task))

                {

                    tasks.Remove(_task);

                }

            }



            public void NotifyTaskState(Task _task)

            {

                bool allReady = true;

@@ -155,9 +169,9 @@
                callBack = _callBack;

            }



            public void Bind(TaskGroup _task)

            public void Bind(TaskGroup _taskGroup)

            {

                taskGroup = _task;

                taskGroup = _taskGroup;

            }



            public void Report(bool _ok, UnityEngine.Object _object)

@@ -179,6 +193,10 @@
            public void Dispose()

            {

                callBack = null;

                if (taskGroup != null)

                {

                    taskGroup.RemoveTask(this);

                }

            }



            public void Done()


 UI/HUD/HeadUpName.cs

@@ -102,6 +102,19 @@
            }

        }



        public void SetFunctionalNpcRealm(int _realm)

        {

            m_Realm.gameObject.SetActive(true);

            m_PlayerName.alignment = TextAnchor.MiddleLeft;



            var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(_realm);

            if (realmConfig != null)

            {

                m_Realm.SetSprite(realmConfig.Img);

                SetImageMaterialTexture(realmConfig.Img);

            }

        }



        public void SetTitle(uint _titleId)

        {

            titleId = _titleId;

@@ -180,7 +193,7 @@


        public void SetNPCName(string _name)

        {

            SetRealm(0);

            SetFunctionalNpcRealm(0);

            m_PlayerName.text = _name;

            SyncPosition(true);

        }

@@ -190,7 +203,7 @@
            var config = ConfigManager.Instance.GetTemplate<NPCConfig>(_id);

            if (config != null)

            {

                SetRealm(config.Realm);

                SetFunctionalNpcRealm(config.Realm);

                m_PlayerName.text = config.charName;

            }




 UI/HUD/LifeBar.cs

@@ -133,6 +133,7 @@
            this.transform.localScale = Vector3.one;

            hideTime = Time.time + hideInterval;

            multipleSlider.ResetValue(value);

            SyncPosition(true);

        }



        public void Show(ulong _hp, ulong _maxHp)