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

client_linchunjie

2019-01-21 d6e77bc23e62cd32560896a6aef0f297b34c0cd2

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

 Core/ResModule/SceneLoader.cs

@@ -11,7 +11,7 @@
        if (AssetSource.sceneFromEditor)
        {
#if UNITY_EDITOR
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Scene/", folder, "/", name, ".png");
            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Scene/", folder, "/", name, ".jpg");
            texture2D = UnityEditor.AssetDatabase.LoadAssetAtPath<Texture2D>(path);
#endif
        }

 Fight/Stage/Dungeon/DungeonStage.cs

@@ -26,7 +26,7 @@


        SoundPlayer.Instance.UnLoadMusic(mapResConfig.Music);

        SoundPlayer.Instance.PlayBackGroundMusic(mapResConfig.Music);



        SceneResourcesReplace();

        // 做一些前期战斗的预加载

        // if (!PreFightMission.Instance.IsFinished())

        // {

@@ -416,15 +416,19 @@


    private void SceneResourceReplace10010()

    {

        var config = Config.Instance.Get<SceneReplaceConfig>(100101);

        if (config != null)

        for (var i = 100101; i <= 100109; i++)

        {

            var groundTexture = SceneLoader.LoadTexture(config.folder, config.resourceName);

            var @object = GameObject.Find(config.objectPath);

            var config = Config.Instance.Get<SceneReplaceConfig>(i);

            if (config != null)

            {

                var groundTexture = SceneLoader.LoadTexture(config.folder, config.resourceName);

                var @object = GameObject.Find(config.objectPath);



            var renderer = @object.GetComponent<Renderer>();

            renderer.material.SetTexture("_MainTex", groundTexture);

                var renderer = @object.GetComponent<Renderer>();

                renderer.material.SetTexture("_MainTex", groundTexture);

            }

        }



    }