snxxz_scripts.git

parent: 2f1731eb | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2018-08-21 f2e8420b03e7bebd3adfba0aaf89378f0b5b9308

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

3个文件已修改

	System/HappyXB/BestXBWin.cs	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/HappyXB/RuneXBWin.cs	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Welfare/WelfareWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/HappyXB/BestXBWin.cs

@@ -212,12 +212,9 @@
                else

                {

                    freeXBTimeText.gameObject.SetActive(true);

                    freeXbBtn.gameObject.SetActive(false);

                    xbBtn.gameObject.SetActive(true);

                    freeXBTimeText.text = Language.Get("HappyXB102", TimeUtility.SecondsToHMSCHSRetain((int)time));

                    if(!XBModel.IsHaveOneXBTool(1))

                    {

                        freeXbBtn.gameObject.SetActive(false);

                        xbBtn.gameObject.SetActive(true);

                    }

                }

            }

            else

@@ -236,18 +233,6 @@


        public void RefreshXBTools()

        {

            if(XBModel.IsHaveOneXBTool(1))

            {

                freeXbBtn.gameObject.SetActive(true);

                xbBtn.gameObject.SetActive(false);

            }

            else

            {

                freeXbBtn.gameObject.SetActive(false);

                xbBtn.gameObject.SetActive(true);

               
            }



            int xbToolCnt = 0;

            if (XBModel.IsHaveManyXBTool(1,out xbToolCnt))

            {

@@ -324,14 +309,7 @@
            {

                maskObj.SetActive(true);

                isXBMany = false;

                if (XBModel.IsHaveFreeXB(1))

                {

                    XBModel.SendXBQuest(1, 0, 1);

                }

                else if(XBModel.IsHaveOneXBTool(1))

                {

                    XBModel.SendXBQuest(1,0,2);

                }

                XBModel.SendXBQuest(1, 0, 1);

            }

        }



@@ -339,16 +317,24 @@
        {

            if (XBModel.CheckIsEmptyGrid(PackType.rptTreasure))

            {

                if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)

                if(XBModel.IsHaveOneXBTool(1))

                {

                    maskObj.SetActive(true);

                    isXBMany = false;

                    XBModel.SendXBQuest(1, 0, 0);

                    XBModel.SendXBQuest(1, 0, 2);

                }

                else

                {

                    WindowCenter.Instance.Open<RechargeTipWin>();

                    if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)

                    {

                        maskObj.SetActive(true);

                        isXBMany = false;

                        XBModel.SendXBQuest(1, 0, 0);

                    }

                    else

                    {

                        WindowCenter.Instance.Open<RechargeTipWin>();

                    }

                }

               
            }

        }




 System/HappyXB/RuneXBWin.cs

@@ -220,12 +220,9 @@
                else

                {

                    freeXBTimeText.gameObject.SetActive(true);

                    freeXbBtn.gameObject.SetActive(false);

                    xbBtn.gameObject.SetActive(true);

                    freeXBTimeText.text = Language.Get("HappyXB102", TimeUtility.SecondsToHMSCHSRetain((int)time));

                    if (!XBModel.IsHaveOneXBTool(2))

                    {

                        freeXbBtn.gameObject.SetActive(false);

                        xbBtn.gameObject.SetActive(true);

                    }

                }

            }

            else

@@ -243,18 +240,6 @@


        public void RefreshXBTools()

        {

            if (XBModel.IsHaveOneXBTool(2))

            {

                freeXbBtn.gameObject.SetActive(true);

                xbBtn.gameObject.SetActive(false);

            }

            else

            {

                freeXbBtn.gameObject.SetActive(false);

                xbBtn.gameObject.SetActive(true);



            }



            int xbToolCnt = 0;

            if (XBModel.IsHaveManyXBTool(2, out xbToolCnt))

            {

@@ -327,15 +312,22 @@
        {

            if(XBModel.CheckIsEmptyGrid(PackType.rptRunePack))

            {

                if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)

                if (XBModel.IsHaveOneXBTool(2))

                {

                    maskObj.SetActive(true);

                    isXBMany = false;

                    XBModel.SendXBQuest(2, 0, 0);

                    XBModel.SendXBQuest(2, 0, 2);

                }

                else

                {

                    WindowCenter.Instance.Open<RechargeTipWin>();

                    if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)

                    {

                        maskObj.SetActive(true);

                        isXBMany = false;

                        XBModel.SendXBQuest(2, 0, 0);

                    }

                    else

                    {

                        WindowCenter.Instance.Open<RechargeTipWin>();

                    }

                }

            }

        }

@@ -346,14 +338,7 @@
            {

                maskObj.SetActive(true);

                isXBMany = false;

                if (XBModel.IsHaveFreeXB(2))

                {

                    XBModel.SendXBQuest(2, 0, 1);

                }

                else if (XBModel.IsHaveOneXBTool(2))

                {

                    XBModel.SendXBQuest(2, 0, 2);

                }

                XBModel.SendXBQuest(2, 0, 1);

            }

        }




 System/Welfare/WelfareWin.cs

@@ -152,7 +152,7 @@
                {

                    foreach (int key in fairyJadeInvestmentModel.InfoSeriors.Keys)

                    {

                        if (fairyJadeInvestmentModel.InfoSeriors[key] == 0)

                        if (fairyJadeInvestmentModel.InfoSeriors[key] != 3)

                        {

                            isOpen = true;

                        }

			@@ -212,12 +212,9 @@
			else
			{
			freeXBTimeText.gameObject.SetActive(true);
			freeXbBtn.gameObject.SetActive(false);
			xbBtn.gameObject.SetActive(true);
			freeXBTimeText.text = Language.Get("HappyXB102", TimeUtility.SecondsToHMSCHSRetain((int)time));
			if(!XBModel.IsHaveOneXBTool(1))
			{
			freeXbBtn.gameObject.SetActive(false);
			xbBtn.gameObject.SetActive(true);
			}
			}
			}
			else
			@@ -236,18 +233,6 @@

			public void RefreshXBTools()
			{
			if(XBModel.IsHaveOneXBTool(1))
			{
			freeXbBtn.gameObject.SetActive(true);
			xbBtn.gameObject.SetActive(false);
			}
			else
			{
			freeXbBtn.gameObject.SetActive(false);
			xbBtn.gameObject.SetActive(true);

			}

			int xbToolCnt = 0;
			if (XBModel.IsHaveManyXBTool(1,out xbToolCnt))
			{
			@@ -324,14 +309,7 @@
			{
			maskObj.SetActive(true);
			isXBMany = false;
			if (XBModel.IsHaveFreeXB(1))
			{
			XBModel.SendXBQuest(1, 0, 1);
			}
			else if(XBModel.IsHaveOneXBTool(1))
			{
			XBModel.SendXBQuest(1,0,2);
			}
			XBModel.SendXBQuest(1, 0, 1);
			}
			}

			@@ -339,16 +317,24 @@
			{
			if (XBModel.CheckIsEmptyGrid(PackType.rptTreasure))
			{
			if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)
			if(XBModel.IsHaveOneXBTool(1))
			{
			maskObj.SetActive(true);
			isXBMany = false;
			XBModel.SendXBQuest(1, 0, 0);
			XBModel.SendXBQuest(1, 0, 2);
			}
			else
			{
			WindowCenter.Instance.Open<RechargeTipWin>();
			if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)
			{
			maskObj.SetActive(true);
			isXBMany = false;
			XBModel.SendXBQuest(1, 0, 0);
			}
			else
			{
			WindowCenter.Instance.Open<RechargeTipWin>();
			}
			}

			}
			}

			@@ -220,12 +220,9 @@
			else
			{
			freeXBTimeText.gameObject.SetActive(true);
			freeXbBtn.gameObject.SetActive(false);
			xbBtn.gameObject.SetActive(true);
			freeXBTimeText.text = Language.Get("HappyXB102", TimeUtility.SecondsToHMSCHSRetain((int)time));
			if (!XBModel.IsHaveOneXBTool(2))
			{
			freeXbBtn.gameObject.SetActive(false);
			xbBtn.gameObject.SetActive(true);
			}
			}
			}
			else
			@@ -243,18 +240,6 @@

			public void RefreshXBTools()
			{
			if (XBModel.IsHaveOneXBTool(2))
			{
			freeXbBtn.gameObject.SetActive(true);
			xbBtn.gameObject.SetActive(false);
			}
			else
			{
			freeXbBtn.gameObject.SetActive(false);
			xbBtn.gameObject.SetActive(true);

			}

			int xbToolCnt = 0;
			if (XBModel.IsHaveManyXBTool(2, out xbToolCnt))
			{
			@@ -327,15 +312,22 @@
			{
			if(XBModel.CheckIsEmptyGrid(PackType.rptRunePack))
			{
			if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)
			if (XBModel.IsHaveOneXBTool(2))
			{
			maskObj.SetActive(true);
			isXBMany = false;
			XBModel.SendXBQuest(2, 0, 0);
			XBModel.SendXBQuest(2, 0, 2);
			}
			else
			{
			WindowCenter.Instance.Open<RechargeTipWin>();
			if (UIHelper.GetMoneyCnt(1) >= (ulong)xbOneMoney)
			{
			maskObj.SetActive(true);
			isXBMany = false;
			XBModel.SendXBQuest(2, 0, 0);
			}
			else
			{
			WindowCenter.Instance.Open<RechargeTipWin>();
			}
			}
			}
			}
			@@ -346,14 +338,7 @@
			{
			maskObj.SetActive(true);
			isXBMany = false;
			if (XBModel.IsHaveFreeXB(2))
			{
			XBModel.SendXBQuest(2, 0, 1);
			}
			else if (XBModel.IsHaveOneXBTool(2))
			{
			XBModel.SendXBQuest(2, 0, 2);
			}
			XBModel.SendXBQuest(2, 0, 1);
			}
			}

			@@ -152,7 +152,7 @@
			{
			foreach (int key in fairyJadeInvestmentModel.InfoSeriors.Keys)
			{
			if (fairyJadeInvestmentModel.InfoSeriors[key] == 0)
			if (fairyJadeInvestmentModel.InfoSeriors[key] != 3)
			{
			isOpen = true;
			}