Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 System/MainInterfacePanel/PlayerMainDate.cs

@@ -339,7 +339,7 @@
        bool IsBool = false;

        var State1 = RedpointCenter.Instance.GetRedpointState(201);//福利

        var State2 = RedpointCenter.Instance.GetRedpointState(210);

        if (State1 == RedPointState.Simple || State2 == RedPointState.Simple)

        if (State1 == RedPointState.Simple || State1 == RedPointState.GetReward || State2 == RedPointState.Simple)

        {

            IsBool = true;

        }