Project_SG_scripts.git

parent: 2b3fe117 | 补丁 | 提交 | ignore whitespace

yyl

3 天以前 85a6c1055ece4aca394490e162d3a28acd2898b1

68 【设置】设置战斗飘字屏蔽问题

8个文件已修改

	Main/System/Battle/BaseBattleWin.cs	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/BoneFieldBattleWin.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/StoryBossBattleWin.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/TianziBillboradBattleWin.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/UIComp/BattleBuffCell.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/UIComp/BattleFloatingUIController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/UIComp/BattleHeroInfoBar.cs	93 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Main/System/Battle/WarlordPavilionBattleWin.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Main/System/Battle/BaseBattleWin.cs

@@ -59,6 +59,48 @@
        }
    }

    protected void RefreshBuffCells(List<BattleBuffCell> cells, List<HB428_tagSCBuffRefresh> datas)
    {
        if (datas == null)
        {
            for (int i = 0; i < cells.Count; i++)
            {
                cells[i].SetActive(false);
            }
        }
        else
        {
            if (battleField.battleSwitch.BuffIcon)
            {
                for (int i = 0; i < cells.Count; i++)
                {
                    var cell = cells[i];
                    if (i < datas.Count)
                    {
                        cell.SetActive(true);
                        HB428_tagSCBuffRefresh buffData = datas[i];
                        SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                        cell.Init(buffData, () =>
                        {
                            //  点击buff图标 显示buff描述/当前身上所有buff
                        });
                    }
                    else
                    {
                        cell.SetActive(false);
                    }
                }
            }
            else
            {
                for (int i = 0; i < cells.Count; i++)
                {
                    cells[i].SetActive(false);
                }
            }

        }
    }
    protected virtual void BindMingge()
    {
        if (minggeObj == null)

 Main/System/Battle/BoneFieldBattleWin.cs

@@ -251,33 +251,7 @@

    public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
    {
        if (buffCells == null)
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                buffCells[i].SetActive(false);
            }
        }
        else
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                if (i < datas.Count)
                {
                    buffCells[i].SetActive(true);
                    HB428_tagSCBuffRefresh buffData = datas[i];
                    SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                    buffCells[i].Init(buffData, () =>
                    {
                        //  点击buff图标 显示buff描述/当前身上所有buff
                    });
                }
                else
                {
                    buffCells[i].SetActive(false);
                }
            }
        }
        RefreshBuffCells(buffCells, datas);
    }

    bool IsOpenBattleChangeTab()

 Main/System/Battle/StoryBossBattleWin.cs

@@ -231,33 +231,7 @@

    public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
    {
        if (buffCells == null)
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                buffCells[i].SetActive(false);
            }
        }
        else
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                if (i < datas.Count)
                {
                    buffCells[i].SetActive(true);
                    HB428_tagSCBuffRefresh buffData = datas[i];
                    SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                    buffCells[i].Init(buffData, () =>
                    {
                        //  点击buff图标 显示buff描述/当前身上所有buff
                    });
                }
                else
                {
                    buffCells[i].SetActive(false);
                }
            }
        }
        RefreshBuffCells(buffCells, datas);
    }
    List<TeamHero> GetTeamHeroList(List<BattleObject> teams)
    {

 Main/System/Battle/TianziBillboradBattleWin.cs

@@ -301,33 +301,7 @@

    public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
    {
        if (buffCells == null)
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                buffCells[i].SetActive(false);
            }
        }
        else
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                if (i < datas.Count)
                {
                    buffCells[i].SetActive(true);
                    HB428_tagSCBuffRefresh buffData = datas[i];
                    SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                    buffCells[i].Init(buffData, () =>
                    {
                        //  点击buff图标 显示buff描述/当前身上所有buff
                    });
                }
                else
                {
                    buffCells[i].SetActive(false);
                }
            }
        }
        RefreshBuffCells(buffCells, datas);
    }

    bool IsOpenBattleChangeTab()

 Main/System/Battle/UIComp/BattleBuffCell.cs

@@ -44,10 +44,10 @@
        }
    }

    void Awake()
    {
        LoadPrefab();
    }
    // void Start()
    // {
    //     LoadPrefab();
    // }

    GameObject cellContainer;


 Main/System/Battle/UIComp/BattleFloatingUIController.cs

@@ -141,7 +141,7 @@
    /// </summary>
    public void Run()
    {
        if (!gameObject.activeSelf || !ValidateConfig()) 
        if (!ValidateConfig()) 
            return;

        // 检查是否完成

 Main/System/Battle/UIComp/BattleHeroInfoBar.cs

@@ -137,33 +137,7 @@
    
    public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
    {
        if (battleObject.battleField.battleSwitch.BuffIcon && datas != null && datas.Count > 0)
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                if (i < datas.Count)
                {
                    buffCells[i].SetActive(true);
                    HB428_tagSCBuffRefresh buffData = datas[i];
                    SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                    buffCells[i].Init(buffData, () =>
                    {
                        //  点击buff图标 显示buff描述/当前身上所有buff
                    });
                }
                else
                {
                    buffCells[i].SetActive(false);
                }
            }
        }
        else
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                buffCells[i].SetActive(false);
            }
        }
        RefreshBuffCells(buffCells, datas);

        // check shield buff
        var buffMgr = battleObject.GetBuffMgr();
@@ -193,7 +167,49 @@
        // Debug.LogError($"[BattleHeroInfoBar.RefreshBuff] 设置护盾 - curHp: {curHp}, shieldValue: {shieldValue}, maxHp: {maxHp}, shield1前: {oldShield1Value}, shield1后: {shield1Value}, shield2前: {oldShield2Value}, shield2后: {shield2Value}");
    }
    
    
    protected void RefreshBuffCells(List<BattleBuffCell> cells, List<HB428_tagSCBuffRefresh> datas)
    {
        if (datas == null)
        {
            for (int i = 0; i < cells.Count; i++)
            {
                cells[i].SetActive(false);
            }
        }
        else
        {
            if (battleObject.battleField.battleSwitch.BuffIcon)
            {
                for (int i = 0; i < cells.Count; i++)
                {
                    var cell = cells[i];
                    if (i < datas.Count)
                    {
                        cell.SetActive(true);
                        HB428_tagSCBuffRefresh buffData = datas[i];
                        SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                        cell.Init(buffData, () =>
                        {
                            //  点击buff图标 显示buff描述/当前身上所有buff
                        });
                    }
                    else
                    {
                        cell.SetActive(false);
                    }
                }
            }
            else
            {
                for (int i = 0; i < cells.Count; i++)
                {
                    cells[i].SetActive(false);
                }
            }

        }
    }

    /// <summary>
    /// 添加飘字到队列(非伤害飘字)
    /// </summary>
@@ -216,9 +232,21 @@
    /// </summary>
    public void ShowTips(TipsInfo tipsInfo)
    {
        if (battleObject.battleField.battleSwitch.NonDamageTips)
        //  BUFF飘字
        if (tipsInfo.useBuffColor)
        {
            messages.Add(tipsInfo);
            if (battleObject.battleField.battleSwitch.BuffAction)
            {
                messages.Add(tipsInfo);
            }
        }
        else
        {
            //  非伤害飘字
            if (battleObject.battleField.battleSwitch.NonDamageTips)
            {
                messages.Add(tipsInfo);
            }
        }
    }
    
@@ -812,10 +840,9 @@
    {
        messages.Clear();
        
        foreach (var tip in tipsList)
        for (int i = tipsList.Count - 1; i >= 0; i--)
        {
            tip.OnFinish = null;
            GameObject.DestroyImmediate(tip.gameObject);
            RemoveTips(tipsList[i]);
        }
        
        tipsList.Clear();

 Main/System/Battle/WarlordPavilionBattleWin.cs

@@ -254,33 +254,7 @@

    public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
    {
        if (buffCells == null)
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                buffCells[i].SetActive(false);
            }
        }
        else
        {
            for (int i = 0; i < buffCells.Count; i++)
            {
                if (i < datas.Count)
                {
                    buffCells[i].SetActive(true);
                    HB428_tagSCBuffRefresh buffData = datas[i];
                    SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
                    buffCells[i].Init(buffData, () =>
                    {
                        //  点击buff图标 显示buff描述/当前身上所有buff
                    });
                }
                else
                {
                    buffCells[i].SetActive(false);
                }
            }
        }
        RefreshBuffCells(buffCells, datas);
    }

    bool IsOpenBattleChangeTab()

			@@ -59,6 +59,48 @@
			}
			}

			protected void RefreshBuffCells(List<BattleBuffCell> cells, List<HB428_tagSCBuffRefresh> datas)
			{
			if (datas == null)
			{
			for (int i = 0; i < cells.Count; i++)
			{
			cells[i].SetActive(false);
			}
			}
			else
			{
			if (battleField.battleSwitch.BuffIcon)
			{
			for (int i = 0; i < cells.Count; i++)
			{
			var cell = cells[i];
			if (i < datas.Count)
			{
			cell.SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			cell.Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			cell.SetActive(false);
			}
			}
			}
			else
			{
			for (int i = 0; i < cells.Count; i++)
			{
			cells[i].SetActive(false);
			}
			}

			}
			}
			protected virtual void BindMingge()
			{
			if (minggeObj == null)

			@@ -251,33 +251,7 @@

			public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
			{
			if (buffCells == null)
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			buffCells[i].SetActive(false);
			}
			}
			else
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			if (i < datas.Count)
			{
			buffCells[i].SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			buffCells[i].Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			buffCells[i].SetActive(false);
			}
			}
			}
			RefreshBuffCells(buffCells, datas);
			}

			bool IsOpenBattleChangeTab()

			@@ -231,33 +231,7 @@

			public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
			{
			if (buffCells == null)
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			buffCells[i].SetActive(false);
			}
			}
			else
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			if (i < datas.Count)
			{
			buffCells[i].SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			buffCells[i].Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			buffCells[i].SetActive(false);
			}
			}
			}
			RefreshBuffCells(buffCells, datas);
			}
			List<TeamHero> GetTeamHeroList(List<BattleObject> teams)
			{

			@@ -301,33 +301,7 @@

			public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
			{
			if (buffCells == null)
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			buffCells[i].SetActive(false);
			}
			}
			else
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			if (i < datas.Count)
			{
			buffCells[i].SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			buffCells[i].Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			buffCells[i].SetActive(false);
			}
			}
			}
			RefreshBuffCells(buffCells, datas);
			}

			bool IsOpenBattleChangeTab()

			@@ -44,10 +44,10 @@
			}
			}

			void Awake()
			{
			LoadPrefab();
			}
			// void Start()
			// {
			// LoadPrefab();
			// }

			GameObject cellContainer;

			@@ -141,7 +141,7 @@
			/// </summary>
			public void Run()
			{
			if (!gameObject.activeSelf \|\| !ValidateConfig())
			if (!ValidateConfig())
			return;

			// 检查是否完成

			@@ -137,33 +137,7 @@

			public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
			{
			if (battleObject.battleField.battleSwitch.BuffIcon && datas != null && datas.Count > 0)
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			if (i < datas.Count)
			{
			buffCells[i].SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			buffCells[i].Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			buffCells[i].SetActive(false);
			}
			}
			}
			else
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			buffCells[i].SetActive(false);
			}
			}
			RefreshBuffCells(buffCells, datas);

			// check shield buff
			var buffMgr = battleObject.GetBuffMgr();
			@@ -193,7 +167,49 @@
			// Debug.LogError($"[BattleHeroInfoBar.RefreshBuff] 设置护盾 - curHp: {curHp}, shieldValue: {shieldValue}, maxHp: {maxHp}, shield1前: {oldShield1Value}, shield1后: {shield1Value}, shield2前: {oldShield2Value}, shield2后: {shield2Value}");
			}


			protected void RefreshBuffCells(List<BattleBuffCell> cells, List<HB428_tagSCBuffRefresh> datas)
			{
			if (datas == null)
			{
			for (int i = 0; i < cells.Count; i++)
			{
			cells[i].SetActive(false);
			}
			}
			else
			{
			if (battleObject.battleField.battleSwitch.BuffIcon)
			{
			for (int i = 0; i < cells.Count; i++)
			{
			var cell = cells[i];
			if (i < datas.Count)
			{
			cell.SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			cell.Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			cell.SetActive(false);
			}
			}
			}
			else
			{
			for (int i = 0; i < cells.Count; i++)
			{
			cells[i].SetActive(false);
			}
			}

			}
			}

			/// <summary>
			/// 添加飘字到队列(非伤害飘字)
			/// </summary>
			@@ -216,9 +232,21 @@
			/// </summary>
			public void ShowTips(TipsInfo tipsInfo)
			{
			if (battleObject.battleField.battleSwitch.NonDamageTips)
			// BUFF飘字
			if (tipsInfo.useBuffColor)
			{
			messages.Add(tipsInfo);
			if (battleObject.battleField.battleSwitch.BuffAction)
			{
			messages.Add(tipsInfo);
			}
			}
			else
			{
			// 非伤害飘字
			if (battleObject.battleField.battleSwitch.NonDamageTips)
			{
			messages.Add(tipsInfo);
			}
			}
			}

			@@ -812,10 +840,9 @@
			{
			messages.Clear();

			foreach (var tip in tipsList)
			for (int i = tipsList.Count - 1; i >= 0; i--)
			{
			tip.OnFinish = null;
			GameObject.DestroyImmediate(tip.gameObject);
			RemoveTips(tipsList[i]);
			}

			tipsList.Clear();

			@@ -254,33 +254,7 @@

			public void RefreshBuff(List<HB428_tagSCBuffRefresh> datas)
			{
			if (buffCells == null)
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			buffCells[i].SetActive(false);
			}
			}
			else
			{
			for (int i = 0; i < buffCells.Count; i++)
			{
			if (i < datas.Count)
			{
			buffCells[i].SetActive(true);
			HB428_tagSCBuffRefresh buffData = datas[i];
			SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
			buffCells[i].Init(buffData, () =>
			{
			// 点击buff图标显示buff描述/当前身上所有buff
			});
			}
			else
			{
			buffCells[i].SetActive(false);
			}
			}
			}
			RefreshBuffCells(buffCells, datas);
			}

			bool IsOpenBattleChangeTab()