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

client_Zxw

2018-08-13 f1a5c17ad9d34099bef4dec10d86863d47002fd9

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

 Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs

@@ -615,25 +615,25 @@
        private void ExecuteBuildClientPackageIpaAppend()

        {

            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            ClientPackage.BuildPublishers(outputPath, ApkOutputPath, publishers, false, false);

            ClientPackage.BuildPublishers(ClientPackage.SDK_PLUGIN_PROJECT, outputPath, ApkOutputPath, publishers, false, false);

        }



        private void ExecuteBuildClientPackageIpaReplace()

        {

            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            ClientPackage.BuildPublishers(outputPath, ApkOutputPath, publishers, false, true);

            ClientPackage.BuildPublishers(ClientPackage.SDK_PLUGIN_PROJECT, outputPath, ApkOutputPath, publishers, false, true);

        }



        private void ExecuteBuildClientPackageApk()

        {

            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            ClientPackage.BuildPublishers(outputPath, ApkOutputPath, publishers, false, false);

            ClientPackage.BuildPublishers(ClientPackage.SDK_PLUGIN_PROJECT, outputPath, ApkOutputPath, publishers, false, false);

        }



        private void ExecuteBuildClientPackageDevelopApk()

        {

            var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);

            ClientPackage.BuildPublishers(outputPath, ApkOutputPath, publishers, true, false);

            ClientPackage.BuildPublishers(ClientPackage.SDK_PLUGIN_PROJECT, outputPath, ApkOutputPath, publishers, true, false);

        }



        private static void DirectoryCopy(string sourceDirName, string destDirName)


 Fight/GameActor/GActorPlayerBase.cs

@@ -677,15 +677,12 @@
            }

        }



        GameObject _prefab = null;

        // 穿上新的

        if (itemID > 0 && _itemConfig != null)

        {

            GameObject _prefab = InstanceResourcesLoader.LoadModelRes(_itemConfig.ChangeOrd);

            MP_Name = _prefab.transform.GetChildTransformDeeply("A_Name");

            if (MP_Name_Pos == Vector3.zero && MP_Name)

            {

                MP_Name_Pos = MP_Name.localPosition;

            }

            _prefab = InstanceResourcesLoader.LoadModelRes(_itemConfig.ChangeOrd);



            if (!_prefab)

            {

                itemID = 0;

@@ -707,6 +704,15 @@
            }

        }



        if (_prefab)

        {

            MP_Name = _prefab.transform.GetChildTransformDeeply("A_Name");

            if (MP_Name_Pos == Vector3.zero && MP_Name)

            {

                MP_Name_Pos = MP_Name.localPosition;

            }

        }



        m_SMRenderer = m_ClothesModel.GetComponentInChildren<SkinnedMeshRenderer>();

        if (m_SMRenderer)

        {