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

client_linchunjie

2018-11-01 d80c4e12e61f9fc6e1ff8f8bcaa2462b9b060741

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

 System/Dogz/DogzModel.cs

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

                    if(assistRedpoint.state == RedPointState.None)

                    {

                        dogzPutRedId = 0;

                        assistRedpoint.state = RedPointState.Simple;

                    }

                }

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

                        if (assistRedpoint.state == RedPointState.None)

                        {

                            dogzPutRedId = 0;

                            assistRedpoint.state = RedPointState.Simple;

                        }

                        break;