Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-01 53bd36c6373c3dd6a335162cb3dbbc1f81bed616

 System/Dogz/DogzModel.cs

@@ -937,7 +937,6 @@
                    Redpoint assistRedpoint = GetDogzAssistRedpointById(maxDogzId);

                    if(assistRedpoint.state == RedPointState.None)

                    {

                        dogzPutRedId = 0;

                        assistRedpoint.state = RedPointState.Simple;

                    }

                }

@@ -954,7 +953,6 @@
                        Redpoint assistRedpoint = GetDogzAssistRedpointById(dogzId);

                        if (assistRedpoint.state == RedPointState.None)

                        {

                            dogzPutRedId = 0;

                            assistRedpoint.state = RedPointState.Simple;

                        }

                        break;

@@ -983,6 +981,10 @@
            {

                if(value.state == RedPointState.Simple)

                {

                    if (UpdateDogzPutRedEvent != null)

                    {

                        UpdateDogzPutRedEvent();

                    }

                    return;

                }

            }