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

client_Zxw

2018-11-07 68e7732b5fb38382c35ffde4804a9497f4213e31

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

 System/AssetVersion/AssetVersionUtility.cs

@@ -196,19 +196,22 @@
            return false;
        }



        ActorShowConfig actorShowConfig = null;

        if (ActorShowConfig.GetActoreShowConfigByMapIdAndLineId(dataMapId, lineId, out actorShowConfig))
        {
            var npcs = actorShowConfig.showNpcs;

            foreach (var item in npcs)
            {
                var npcConfig = Config.Instance.Get<NPCConfig>(item);
                var assetbundleName = StringUtility.Contact("prefab_race_", npcConfig.MODE.ToLower());

                if (!IsAssetValid(assetbundleName))
                {
                    return false;
        if (dataMapId != 10010)
        {

            ActorShowConfig actorShowConfig = null;

            if (ActorShowConfig.GetActoreShowConfigByMapIdAndLineId(dataMapId, lineId, out actorShowConfig))

            {

                var npcs = actorShowConfig.showNpcs;

                foreach (var item in npcs)

                {

                    var npcConfig = Config.Instance.Get<NPCConfig>(item);

                    var assetbundleName = StringUtility.Contact("prefab_race_", npcConfig.MODE.ToLower());

                    if (!IsAssetValid(assetbundleName))

                    {

                        return false;

                    }

                }

            }

            }
        }



        return true;