snxxz_scripts.git

parent: a667f31a | 补丁 | 提交 | ignore whitespace

Client_PangDeRong

2018-10-09 65a1fea02685048480049d2026e75d677b1ba015

2101 【BUG】商城购买后物品数量显示BUG

7个文件已修改

	System/Store/BuyItemPopModel.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyBoxInfoWin.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyEquipTip.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyGuardTip.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyItemInfoWin.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyPetMatInfoWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyWingsTip.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Store/BuyItemPopModel.cs

@@ -106,23 +106,9 @@
        int count = 0;
        IsReachUpper = false;
        if(canBuyCnt == 0)
        {
            if(isVipBuy)
            {
                IsReachUpper = true;
            }
            else
            {
                if (buyCnt <= 9999)
                {
                    count = buyCnt;
                }
                else
                {
                    count = 9999;
                    IsReachUpper = true;
                }
            }
        {

            IsReachUpper = true;
            count = 0;
        }
        else
        {

 System/Store/Logic/BuyBoxInfoWin.cs

@@ -336,7 +336,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -361,7 +361,6 @@
                if(curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

                }

                else

                {

@@ -373,7 +372,6 @@
            {

                vipInfoText.gameObject.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/Store/Logic/BuyEquipTip.cs

@@ -690,8 +690,8 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            if(itemAttrData.itemConfig.PackCount > 1)

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemAttrData.itemConfig.PackCount > 1)

            {

                _numberGo.gameObject.SetActive(true);

            }

@@ -715,7 +715,6 @@
                if (curVipIndex != -1)

                {

                    btnGroup.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

@@ -727,7 +726,6 @@
            {

                vipInfoText.gameObject.SetActive(false);

                btnGroup.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/Store/Logic/BuyGuardTip.cs

@@ -398,7 +398,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemAttrData.itemConfig.PackCount > 1)

            {

                _numberGo.gameObject.SetActive(true);

@@ -423,7 +423,6 @@
                if (curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

@@ -435,7 +434,6 @@
            {

                vipInfoObj.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/Store/Logic/BuyItemInfoWin.cs

@@ -326,7 +326,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -352,7 +352,7 @@


                if(curVipIndex != -1)

                {

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

                    
                }

                else

                {

@@ -363,7 +363,6 @@
            else

            {

                vipInfoText.gameObject.SetActive(false);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            if(buyItem.storeConfig.LimitValue != 0)

@@ -475,7 +474,7 @@
        private void OnClickNum()

        {

            bool isReachUpper = false;

            buyCnt = buyItem.GetCurBuyCnt(int.Parse(numKeyboard.Value),GetRemainBuyCnt(), isVipBuy,out isReachUpper);

            buyCnt = buyItem.GetCurBuyCnt(int.Parse(numKeyboard.Value), GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            RefreshBuyPrice(buyCnt);

            numKeyboard.Value = buyCnt.ToString();

            if (isReachUpper)

@@ -495,12 +494,12 @@


        private void OnClickPlusBuyNum()

        {

            buyCnt += 1;

            bool isReachUpper = false;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt,GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCnt += 1;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

            if (isReachUpper)

            if (isReachUpper || buyCnt == 0)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("StoreWin109"));

            }

@@ -508,9 +507,9 @@


        private void OnClickReduceBuyNum()

        {

            buyCnt -= 1;

            bool isReachUpper = false;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy,out isReachUpper);

            buyCnt -= 1;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

        }


 System/Store/Logic/BuyPetMatInfoWin.cs

@@ -307,7 +307,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -333,7 +333,7 @@


                if(curVipIndex != -1)

                {

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

                    
                }

                else

                {

@@ -344,7 +344,6 @@
            else

            {

                vipInfoText.gameObject.SetActive(false);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            if(buyItem.storeConfig.LimitValue != 0)


 System/Store/Logic/BuyWingsTip.cs

@@ -361,7 +361,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -386,7 +386,6 @@
                if (curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

@@ -398,7 +397,6 @@
            {

                vipInfoText.gameObject.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();

			@@ -106,23 +106,9 @@
			int count = 0;
			IsReachUpper = false;
			if(canBuyCnt == 0)
			{
			if(isVipBuy)
			{
			IsReachUpper = true;
			}
			else
			{
			if (buyCnt <= 9999)
			{
			count = buyCnt;
			}
			else
			{
			count = 9999;
			IsReachUpper = true;
			}
			}
			{
			IsReachUpper = true;
			count = 0;
			}
			else
			{

			@@ -336,7 +336,7 @@
			int addBuyCnt = 0;
			bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);
			bool isReachUpper = false;
			buyCnt = 0;
			buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)
			{
			numberGo.gameObject.SetActive(true);
			@@ -361,7 +361,6 @@
			if(curVipIndex != -1)
			{
			buyBtn.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);
			}
			else
			{
			@@ -373,7 +372,6 @@
			{
			vipInfoText.gameObject.SetActive(false);
			buyBtn.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}

			buyCountText.text = buyCnt.ToString();

			@@ -690,8 +690,8 @@
			int addBuyCnt = 0;
			bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);
			bool isReachUpper = false;
			buyCnt = 0;
			if(itemAttrData.itemConfig.PackCount > 1)
			buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			if (itemAttrData.itemConfig.PackCount > 1)
			{
			_numberGo.gameObject.SetActive(true);
			}
			@@ -715,7 +715,6 @@
			if (curVipIndex != -1)
			{
			btnGroup.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}
			else
			{
			@@ -727,7 +726,6 @@
			{
			vipInfoText.gameObject.SetActive(false);
			btnGroup.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}

			buyCountText.text = buyCnt.ToString();

			@@ -398,7 +398,7 @@
			int addBuyCnt = 0;
			bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);
			bool isReachUpper = false;
			buyCnt = 0;
			buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			if (itemAttrData.itemConfig.PackCount > 1)
			{
			_numberGo.gameObject.SetActive(true);
			@@ -423,7 +423,6 @@
			if (curVipIndex != -1)
			{
			buyBtn.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}
			else
			{
			@@ -435,7 +434,6 @@
			{
			vipInfoObj.SetActive(false);
			buyBtn.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}

			buyCountText.text = buyCnt.ToString();

			@@ -326,7 +326,7 @@
			int addBuyCnt = 0;
			bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);
			bool isReachUpper = false;
			buyCnt = 0;
			buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)
			{
			numberGo.gameObject.SetActive(true);
			@@ -352,7 +352,7 @@

			if(curVipIndex != -1)
			{
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

			}
			else
			{
			@@ -363,7 +363,6 @@
			else
			{
			vipInfoText.gameObject.SetActive(false);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}

			if(buyItem.storeConfig.LimitValue != 0)
			@@ -475,7 +474,7 @@
			private void OnClickNum()
			{
			bool isReachUpper = false;
			buyCnt = buyItem.GetCurBuyCnt(int.Parse(numKeyboard.Value),GetRemainBuyCnt(), isVipBuy,out isReachUpper);
			buyCnt = buyItem.GetCurBuyCnt(int.Parse(numKeyboard.Value), GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			RefreshBuyPrice(buyCnt);
			numKeyboard.Value = buyCnt.ToString();
			if (isReachUpper)
			@@ -495,12 +494,12 @@

			private void OnClickPlusBuyNum()
			{
			buyCnt += 1;
			bool isReachUpper = false;
			buyCnt = buyItem.GetCurBuyCnt(buyCnt,GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			buyCnt += 1;
			buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			buyCountText.text = buyCnt.ToString();
			RefreshBuyPrice(buyCnt);
			if (isReachUpper)
			if (isReachUpper \|\| buyCnt == 0)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("StoreWin109"));
			}
			@@ -508,9 +507,9 @@

			private void OnClickReduceBuyNum()
			{
			buyCnt -= 1;
			bool isReachUpper = false;
			buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy,out isReachUpper);
			buyCnt -= 1;
			buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			buyCountText.text = buyCnt.ToString();
			RefreshBuyPrice(buyCnt);
			}

			@@ -307,7 +307,7 @@
			int addBuyCnt = 0;
			bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);
			bool isReachUpper = false;
			buyCnt = 0;
			buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)
			{
			numberGo.gameObject.SetActive(true);
			@@ -333,7 +333,7 @@

			if(curVipIndex != -1)
			{
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

			}
			else
			{
			@@ -344,7 +344,6 @@
			else
			{
			vipInfoText.gameObject.SetActive(false);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}

			if(buyItem.storeConfig.LimitValue != 0)

			@@ -361,7 +361,7 @@
			int addBuyCnt = 0;
			bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);
			bool isReachUpper = false;
			buyCnt = 0;
			buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);
			if (itemAttrData.itemConfig.PackCount > 1)
			{
			numberGo.gameObject.SetActive(true);
			@@ -386,7 +386,6 @@
			if (curVipIndex != -1)
			{
			buyBtn.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}
			else
			{
			@@ -398,7 +397,6 @@
			{
			vipInfoText.gameObject.SetActive(false);
			buyBtn.gameObject.SetActive(true);
			buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);
			}

			buyCountText.text = buyCnt.ToString();