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

client_Wu Xijin

2019-05-11 b7c337c5b89f5cc7d70e1dc06c747f3c19e2ad4d

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

 Assets/Editor/Actor/NpcResourcesBuilder.cs

@@ -21,7 +21,7 @@
        {

            for (int i = 0; i < _item.showNpcs.Length; i++)

            {

                if(_item.showNpcs[i] == 0)

                if (_item.showNpcs[i] == 0)

                {

                    continue;

                }

@@ -30,10 +30,9 @@
                {

                    continue;

                }



                if (_npcModel.MODE.Equals(modelName))

                if (_npcModel.MODE.Equals(outName))

                {

                    BuildBossShowAnimatorController(modelName);

                    BuildBossShowAnimatorController(outName);

                    break;

                }

            }