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

client_Wu Xijin

2018-08-21 a16ebfc11595a6f7dc0c34c89c7a794a95fb075c

 UI/Common/UI3DShowHero.cs

@@ -50,6 +50,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(weaponId);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(weaponModel);

                pool.Release(weaponModel);

                weaponModel = null;

            }

@@ -58,6 +59,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(secondaryId);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(secondaryModel);

                pool.Release(secondaryModel);

                secondaryModel.SetActive(true);

                secondaryModel = null;

@@ -67,6 +69,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(wingsId);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(wingsModel);

                pool.Release(wingsModel);

                wingsModel = null;

                wingsAnimator = null;

@@ -76,6 +79,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(clothesId);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(clothesModel);

                pool.Release(clothesModel);

                clothesModel = null;

                if (clothesAnimator)

@@ -116,6 +120,7 @@


            if (weaponModel)

            {

                ResetModelLayer(weaponModel);

                GameObject prefab = InstanceResourcesLoader.LoadModelRes(weaponId);

                GameObjectPoolManager.Instance.ReleaseGameObject(prefab, weaponModel);

                weaponModel = null;

@@ -220,6 +225,7 @@


            var prefab = InstanceResourcesLoader.LoadModelRes(clothesId);

            var pool = GameObjectPoolManager.Instance.RequestPool(prefab);

            ResetModelLayer(clothesModel);

            pool.Release(clothesModel);

            clothesModel = null;

            if (clothesAnimator != null)

@@ -262,6 +268,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(oldWeapon);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(weaponModel);

                pool.Release(weaponModel);

                weaponModel = null;

            }

@@ -311,6 +318,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(oldSecondary);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(secondaryModel);

                pool.Release(secondaryModel);

                secondaryModel = null;

            }

@@ -325,6 +333,13 @@
                }

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                secondaryModel = pool.Request();



                secondaryModel.layer = LayerUtility.Player;

                SkinnedMeshRenderer _renderer = secondaryModel.GetComponentInChildren<SkinnedMeshRenderer>();

                if (_renderer)

                {

                    _renderer.gameObject.layer = LayerUtility.Player;

                }



                var parent = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]);

                secondaryModel.transform.SetParentEx(parent, Vector3.zero, Quaternion.identity, Vector3.one);

@@ -357,6 +372,7 @@
            {

                prefab = InstanceResourcesLoader.LoadModelRes(oldWings);

                pool = GameObjectPoolManager.Instance.RequestPool(prefab);

                ResetModelLayer(wingsModel);

                pool.Release(wingsModel);

                wingsModel = null;

            }

@@ -523,6 +539,14 @@
            }

            closthesSFXList.Clear();

        }



        void ResetModelLayer(GameObject _go)

        {

            if (_go != null)

            {

                LayerUtility.SetLayer(_go, LayerUtility.Player, true);

            }

        }

    }



}