Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/KnapSack/Logic/GuardOverdueWin.cs

@@ -55,6 +55,7 @@


        ItemConfig itemConfig;

        TimeSpan guardTime;

        public static string guid;

        protected override void BindController()

        {



@@ -80,7 +81,7 @@


        protected override void OnPreClose()

        {

            
            guid = string.Empty;

        }



        protected override void OnAfterClose()

@@ -91,7 +92,8 @@
        private void InitUI()

        {

            itemOverduelist = null;

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

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

            itemModel = playerPack.GetItemModelByGUID(guid);

            if (itemModel == null) return;



            itemBG.SetItemBackGround(modelInterface.GetItemQuality(itemModel.itemInfo.ItemID,itemModel.useDataDict));

@@ -140,7 +142,7 @@


                    if (isOk)

                    {

                        itemOverdue.SendRenewalQuest(itemOverdue.guardOverdueIndex,2);

                        itemOverdue.SendRenewalQuest(itemModel.itemInfo.ItemPlace,2);

                        CloseWin();

                    }

                });

@@ -169,7 +171,7 @@


                    if(isOk)

                    {

                        itemOverdue.SendRenewalQuest(itemOverdue.guardOverdueIndex, 1);

                        itemOverdue.SendRenewalQuest(itemModel.itemInfo.ItemPlace, 1);

                        CloseWin();

                    }

                });