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

client_linchunjie

2019-05-08 cf8f15163718b8412490ea3f38a1b625a68b5087

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

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -610,6 +610,9 @@
        {

            UpdateAudioSetting.SetAllAudioAssetBundleName();

            ExcuteBuildAsset("audio");



            UpdateVideoSetting.SetAllVideoAssetBundleName();

            ExcuteBuildAsset("video");

        }



        private void ExcuteBuildEffect()


 Core/ResModule/VideoLoader.cs

@@ -12,7 +12,7 @@
        if (Application.isEditor)
        {
#if UNITY_EDITOR
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Movie/", name, ".mp4");
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Video/", name, ".mp4");
            mp4 = UnityEditor.AssetDatabase.LoadAssetAtPath<VideoClip>(path);
            if (mp4 == null)
            {
@@ -22,35 +22,11 @@
        }
        else
        {
            var assetInfo = new AssetInfo("movie", name);
            var assetInfo = new AssetInfo("video", name);
            mp4 = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as VideoClip;
        }

        return mp4;
    }

    public static GameObject LoadPlayer()
    {
        GameObject prefab = null;
        if (Application.isEditor)
        {
#if UNITY_EDITOR
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Movie/MoviePlayer.prefab");
            prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
#endif
        }
        else
        {
            var assetInfo = new AssetInfo("movie", "MoviePlayer");
            prefab = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as GameObject;
        }

        if (prefab == null)
        {
            DebugEx.LogError("VideoLoader.LoadPlayer() => 加载不到资源: MoviePlayer.");
        }

        return prefab;
    }

}

 System/CreateRolePostProcess/MoviePlayer.cs

@@ -11,7 +11,7 @@
        get {
            if (m_Instance == null)
            {
                var prefab = VideoLoader.LoadPlayer();
                var prefab = BuiltInLoader.LoadPrefab("MoviePlayer");
                var go = Instantiate(prefab);
                go.name = "MoviePlayer";
                go.transform.position = new Vector3(1000, 4000, 1000);

 System/ItemTip/ItemTipUtility.cs

@@ -1717,17 +1717,14 @@
        private static void PrintItemBrief(int itemId)

        {

            var config = ItemConfig.Get(itemId);

            Debug.LogFormat("你查看的物品是：itemId->{0}", itemId);
            Debug.LogFormat("你查看的物品是：name->{0}", config.ItemName);
            Debug.LogFormat("你查看的物品是：itemId->{0} ;name->{1}", itemId, config.ItemName);
        }



        [System.Diagnostics.Conditional("UNITY_EDITOR")]
        private static void PrintItemBrief(int itemId, string guid)

        {

            var config = ItemConfig.Get(itemId);

            Debug.LogFormat("你查看的物品是：guid->{0}", string.IsNullOrEmpty(guid) ? "" : guid);
            Debug.LogFormat("你查看的物品是：itemId->{0}", itemId);
            Debug.LogFormat("你查看的物品是：name->{0}", config.ItemName);
            Debug.LogFormat("你查看的物品是：guid->{0};itemId->{1};name->{2}", string.IsNullOrEmpty(guid) ? "" : guid, itemId, config.ItemName);
        }

    }