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

client_Zxw

2018-11-13 04f2d6989fbf40473d233490c224083a95f2efdc

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

 Fight/GameActor/GActorNpcNoFight.cs

@@ -165,7 +165,7 @@
            {

                GAMgr.Instance.AddNeedDestroyPrefab(_prefab);

            }

            if (this is GA_Guard)

            if (this is GA_Guard || NpcConfig.MODE.Contains("A_Zs") || NpcConfig.MODE.Contains("A_Fs"))

            {

                GAMgr.Instance.RemoveNeedDestroyPrefab(_prefab);

            }


 System/KnapSack/ItemOverdueBehaviour.cs

@@ -64,7 +64,6 @@
                        WindowCenter.Instance.Open<GuardOverdueWin>();
                        break;
                }
                model.ReportConfirmUseItem(model.currentShowItem);
            }
        }

@@ -87,7 +86,7 @@

        private void CloseItemShow()
        {
            model.ReportConfirmUseItem(model.currentShowItem);
            model.ReportConfirmUseItem(model.currentShowItem.guid);
        }

        private void DrawItem(string guid,int itemId)

 System/KnapSack/Logic/GuardOverdueWin.cs

@@ -81,6 +81,7 @@


        protected override void OnPreClose()

        {

            itemOverdue.ReportConfirmUseItem(guid);

            guid = string.Empty;

        }



@@ -92,6 +93,7 @@
        private void InitUI()

        {

            itemOverduelist = null;

            DebugEx.LogFormat("itemOverdue.currentShowItem.guid is null?", itemOverdue.currentShowItem.guid == null);

            guid = string.IsNullOrEmpty(guid) || guid == "" ? itemOverdue.currentShowItem.guid : guid;

            itemModel = playerPack.GetItemModelByGUID(guid);

            if (itemModel == null) return;


 System/KnapSack/Logic/ItemOverdueModel.cs

@@ -100,16 +100,16 @@
            return itemStack.TryGetValue(_guid, out _itemModel);

        }



        public void ReportConfirmUseItem(OverdueItem _UseItem)

        public void ReportConfirmUseItem(string guid)

        {

            if (itemGuids.Contains(_UseItem.guid))

            if (itemGuids.Contains(guid))

            {

                itemGuids.Remove(_UseItem.guid);

                itemGuids.Remove(guid);

            }



            if (itemStack.ContainsKey(_UseItem.guid))

            if (itemStack.ContainsKey(guid))

            {

                itemStack.Remove(_UseItem.guid);

                itemStack.Remove(guid);

            }



            RefreshCurrrentShowUseItem();


 System/KnapSack/Logic/VipOverdueWin.cs

@@ -12,6 +12,12 @@
        [SerializeField]
        Button renewalBtn;

        ItemOverdueModel _itemOverdue;

        ItemOverdueModel itemOverdue

        {

            get { return _itemOverdue ?? (_itemOverdue = ModelCenter.Instance.GetModel<ItemOverdueModel>()); }

        }



        protected override void BindController()
        {
            closeBtn.AddListener(CloseWin);
@@ -40,7 +46,10 @@

        protected override void OnPreClose()
        {
           
            if(itemOverdue.currentShowItem != default(ItemOverdueModel.OverdueItem))

            {

                itemOverdue.ReportConfirmUseItem(itemOverdue.currentShowItem.guid);

            }

        }

        private void InitUI()