snxxz_scripts.git

parent: 63d124b1 | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-08-13 3d3bf4d80b0fe86ff6d7952a14bffed7c3797e58

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

4个文件已修改

	Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/GameActor/GActorPlayerBase.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Strengthening/StrengtheningSripts.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Vip/FairyJadeInvestmentWin.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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)

        {


 System/Strengthening/StrengtheningSripts.cs

@@ -1017,6 +1017,7 @@


    void EquipPartStar(HA3B3_tagMCEquipPartStarLVInfo info)//服务器下发的数据初始化

    {

        SoundPlayer.Instance.PlayUIAudio(14);   
        TheDynamicChange(_tag, strengthengmodel._EqInfo[_tag].EquipPartStarLV);//刷新等级和阶数

        StrengthenRefresh();//强化刷新

        Refresh();


 System/Vip/FairyJadeInvestmentWin.cs

@@ -15,6 +15,8 @@
    {

        FairyJadeInvestmentModel m_FairyJadeInvestmentModel;

        FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }

        VipInvestModel m_VipInvestModel;
        VipInvestModel VipInvestModel { get { return m_VipInvestModel ?? (m_VipInvestModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } }

        [SerializeField] ScrollerController m_ScrollerController;

        [SerializeField] Button m_InvestmentButton;//投资按钮

        [SerializeField] GameObject m_MaxInverstment;//最大投资上限

@@ -46,7 +48,18 @@
        {

            if (fairyJadeInvestmentModel.InvestGold < fairyJadeInvestmentModel.RecordSelectNumberMax)

            {

                fairyJadeInvestmentModel.SelectNumber = fairyJadeInvestmentModel.RecordSelectNumberMax;

                if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 0))

                {

                    fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 0);

                }

                else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 1))

                {

                    fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 1);

                }

                else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 2))

                {

                    fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 2);

                }

                m_SelectButton.gameObject.SetActive(true);

            }

            else

			@@ -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)

			@@ -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)
			{

			@@ -1017,6 +1017,7 @@

			void EquipPartStar(HA3B3_tagMCEquipPartStarLVInfo info)//服务器下发的数据初始化
			{
			SoundPlayer.Instance.PlayUIAudio(14);
			TheDynamicChange(_tag, strengthengmodel._EqInfo[_tag].EquipPartStarLV);//刷新等级和阶数
			StrengthenRefresh();//强化刷新
			Refresh();

			@@ -15,6 +15,8 @@
			{
			FairyJadeInvestmentModel m_FairyJadeInvestmentModel;
			FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }
			VipInvestModel m_VipInvestModel;
			VipInvestModel VipInvestModel { get { return m_VipInvestModel ?? (m_VipInvestModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } }
			[SerializeField] ScrollerController m_ScrollerController;
			[SerializeField] Button m_InvestmentButton;//投资按钮
			[SerializeField] GameObject m_MaxInverstment;//最大投资上限
			@@ -46,7 +48,18 @@
			{
			if (fairyJadeInvestmentModel.InvestGold < fairyJadeInvestmentModel.RecordSelectNumberMax)
			{
			fairyJadeInvestmentModel.SelectNumber = fairyJadeInvestmentModel.RecordSelectNumberMax;
			if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 0))
			{
			fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 0);
			}
			else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 1))
			{
			fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 1);
			}
			else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 2))
			{
			fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 2);
			}
			m_SelectButton.gameObject.SetActive(true);
			}
			else