Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 System/Welfare/WelfareCenter.cs

@@ -25,7 +25,7 @@
            {

                functionOrder = 1;

            }

            else if (signInModel.redpoint.state == RedPointState.Simple)

            else if (signInModel.redpoint.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 0);

@@ -38,7 +38,7 @@
            {

                functionOrder = 2;

            }

            else if (prayerModel.redpoint.state == RedPointState.Simple)

            else if (prayerModel.redpoint.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 1);

@@ -56,7 +56,7 @@
                return;

            }



            if (levelGiftModel.redpoint.state == RedPointState.Simple)

            if (levelGiftModel.redpoint.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 3);

@@ -80,7 +80,7 @@
            {

                functionOrder = 1;

            }

            else if (signInModel.redpoint.state == RedPointState.Simple)

            else if (signInModel.redpoint.state == RedPointState.GetReward)

            {

                return 0;

            }

@@ -91,7 +91,7 @@
            {

                functionOrder = 2;

            }

            else if (prayerModel.redpoint.state == RedPointState.Simple)

            else if (prayerModel.redpoint.state == RedPointState.GetReward)

            {

                return 1;

            }

@@ -105,7 +105,7 @@
                return 2;

            }



            if (levelGiftModel.redpoint.state == RedPointState.Simple)

            if (levelGiftModel.redpoint.state == RedPointState.GetReward)

            {

                return 3;

            }