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

client_Zxw

2018-12-27 74fed5add0507ee4a344bbd9911edf4a66c3393a

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -170,6 +170,7 @@
        public string priceFormula { get;private set;} //购买匹配次数需要价格公式

        public string winStreakScoreFormula { get; private set; } //连胜积分公式

        public List<AwardType> dayAwardTypelist { get; private set; }

        public int afterOpenDayOpenCross { get; private set;}

        private void ParseFuncConfig()

        {

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

@@ -241,6 +242,9 @@


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

            winStreakScoreFormula = CrossRealmPKScore.Numerical3;



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

            afterOpenDayOpenCross = int.Parse(CrossRealmCfg.Numerical1);

        }



        public class AwardType