Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/MainInterfacePanel/HighSettingFadeInFadeOut.cs

@@ -498,7 +498,7 @@
                        }

                        if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index))

                        {

                            if (isPlayerUIeffect.RedPointId == 201 || isPlayerUIeffect.RedPointId == 210)

                            if (isPlayerUIeffect.RedPointId == 201 /*|| isPlayerUIeffect.RedPointId == 210*/)//201(福利)，210（仙宝寻主）

                            {

                                if (RedpointCenter.Instance.GetRedpointState(isPlayerUIeffect.RedPointId) == RedPointState.GetReward)

                                {