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

client_Hale

2018-12-28 01fcf2ed85d30cc11c18386c1758c494a0751d92

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

 System/FairyAu/FairyFeastModel.cs

@@ -17,6 +17,7 @@
        public event Action fairyFeastPlayerUpdate;



        public float transmitCostSeconds { get; private set; }

        public float transmitExpSeconds { get; private set; }

        string expFormula { get; set; }

        public int riseLevel { get; private set; }

        public int expFlyStage { get; private set; }

@@ -47,7 +48,8 @@
        void ParseConfig()

        {

            var config = Config.Instance.Get<FuncConfigConfig>("FairyFeastTransmit");

            transmitCostSeconds = 15;

            transmitCostSeconds = 8.5f;

            transmitExpSeconds = 7.7f;

            expFlyCount = 3;

            expFlyStage = 3;

            if (config != null)

@@ -55,6 +57,7 @@
                transmitCostSeconds = float.Parse(config.Numerical2) / 1000;

                expFlyStage = int.Parse(config.Numerical3);

                expFlyCount = int.Parse(config.Numerical4);

                transmitExpSeconds = float.Parse(config.Numerical5) / 1000;

            }

            config = Config.Instance.Get<FuncConfigConfig>("FamilyPartySitAward");

            expFormula = config.Numerical1;


 System/FairyAu/FairyFeastTransmitShow.cs

@@ -60,7 +60,7 @@
        {

            get

            {

                return timer / model.transmitCostSeconds;

                return timer / model.transmitExpSeconds;

            }

        }



@@ -144,7 +144,7 @@
                    Stop();

                    return;

                }

                if (timer >= stage * model.transmitCostSeconds / (model.expFlyStage + 1))

                if (timer >= stage * model.transmitExpSeconds / (model.expFlyStage + 1))

                {

                    StepStage();

                    stage++;