Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 System/Welfare/SignInModel.cs

@@ -108,7 +108,7 @@
                redpoint.state = RedPointState.None;

                return;

            }

            redpoint.state = todaySign ? RedPointState.None : RedPointState.Simple;

            redpoint.state = todaySign ? RedPointState.None : RedPointState.GetReward;

        }



        public override void Init()