Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-20 21a1542f9d99466b2aedd0992a1032b37b4154a3

 System/Welfare/ConsumeRebateModel.cs

@@ -57,7 +57,7 @@
        {

            get

            {

                return consumeRebateRedpoint.state == RedPointState.Simple;

                return consumeRebateRedpoint.state == RedPointState.GetReward;

            }

        }



@@ -208,7 +208,7 @@
                        {

                            continue;

                        }

                        consumeRebateRedpoint.state = RedPointState.Simple;

                        consumeRebateRedpoint.state = RedPointState.GetReward;

                        break;

                    }

                }