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

client_linchunjie

2018-08-22 9f44ddc93b96fe98ff71d8a24408871ae36befbd

 System/Dogz/DogzModel.cs

@@ -388,7 +388,7 @@
        {

            if (TryGetAssistDogzState(presentSelectDogz))

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),"当前神兽助战中，卸下装备无法保持助战状态，确定继续？",

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),Language.Get("DogzFunc103"),

                    (bool isOk)=>

                    {

                        if(isOk)