Merge branch 'master' into Cross_Server

client_Wu Xijin

2018-12-17 44f37651391a48c21b367a74902a3bc7ecbb4ce0

 System/FindPrecious/DemonJarAutoDoubleSettingWin.cs

@@ -63,7 +63,7 @@
        private void SetAutoChallenge()
        {
            var autoable = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.DemonJarAuto) >= 1;
            if (autoable || model.oldDouble)
            if (autoable)
            {
                model.autoChallenge = !model.autoChallenge;
            }
@@ -77,7 +77,7 @@
        private void SetDoubleChallenge()
        {
            var candouble = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.DemonJarDouble) >= 1;
            if (candouble)
            if (candouble || model.oldDouble)
            {
                model.RequestSetDoubleAward(!model.isDoubleAward);
            }