Merge branch 'master' into h5version

yyl

2026-02-11 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
using System.Collections;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using UnityEngine;
using UnityEngine.UI;
 
public class TotalDamageDisplayer : MonoBehaviour
{
    public Image damageBackground;
    public Text textDamage;
    public Image imgTotalDesc; //总伤害或者总治疗
 
    private long damage = 0;
 
    private long heal = 0;
 
    public const float scaleDuration = 1.5f;
 
    public const float delayCloseDuration = 1.5f;
 
    public static readonly Vector3 scalePunch = new Vector3(0.4f, 0.4f, 0.4f);
 
    private Sequence punchTween = null;
 
    public void SetDamage(BattleDmgInfo dmgInfo)
    {
        var battleField = BattleManager.Instance.GetBattleField(dmgInfo.battleFieldGuid);
 
        if (!gameObject.activeInHierarchy)
            gameObject.SetActive(true);
 
        if (dmgInfo == null)
            return;
 
        if (dmgInfo.isFirstHit)
        {
            damage = 0;
            heal = 0;
        }
 
        if (dmgInfo.IsType(DamageType.Recovery))
        {
            // 保持原有处理逻辑位置
            foreach (var h in dmgInfo.damageList)
            {
                heal += h;
            }
            textDamage.text = BattleUtility.DisplayDamageNum(heal, BattleConst.BattleTotalRecoverType);
            damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_83");
            imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_80");
        }
        else if (dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsType(DamageType.Realdamage))
        {
            // 保持原有处理逻辑位置
            foreach (var d in dmgInfo.damageList)
            {
                damage += d;
            }
            textDamage.text = BattleUtility.DisplayDamageNum(damage, BattleConst.BattleTotalDamageType);
            imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_85");
            damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_88");
        }
        else
        {
            gameObject.SetActive(false);
            return;
        }
        // else
        // {
        //     textDamage.text =BattleUtility.DisplayDamageNum(0, BattleConst.BattleTotalDamageType);
        //     imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_85");
        //     damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_88");
        // }
 
        if (punchTween != null && punchTween.IsActive())
        {
            battleField.battleTweenMgr.OnKillTween(punchTween);
            textDamage.transform.localScale = Vector3.one;
            punchTween = null;
        }
 
        punchTween = DOTween.Sequence();
        var tween1 = textDamage.transform.DOPunchScale(scalePunch, scaleDuration / battleField.speedRatio, 1);
        punchTween.Append(tween1);
        //  播放结束后 延迟1.5秒再消失
        var tween2 = DOVirtual.DelayedCall(delayCloseDuration / battleField.speedRatio, () => { });
        punchTween.Append(tween2);
        punchTween.OnComplete(() =>
        {
            textDamage.transform.localScale = Vector3.one;
            if (dmgInfo.isLastHit)
            {
                gameObject.SetActive(false);
            }
        });
 
        battleField.battleTweenMgr.OnPlayTween(punchTween);
 
    }
 
    public async UniTask SetDamageAsync(BattleDmgInfo dmgInfo)
    {
        var battleField = BattleManager.Instance.GetBattleField(dmgInfo.battleFieldGuid);
 
        if (!gameObject.activeInHierarchy)
            gameObject.SetActive(true);
 
        if (dmgInfo == null)
            return;
 
        if (dmgInfo.isFirstHit)
        {
            damage = 0;
            heal = 0;
        }
 
        if (dmgInfo.IsType(DamageType.Recovery))
        {
            // 保持原有处理逻辑位置
            foreach (var h in dmgInfo.damageList)
            {
                heal += h;
            }
            textDamage.text = BattleUtility.DisplayDamageNum(heal, BattleConst.BattleTotalRecoverType);
            damageBackground.sprite = await UILoader.LoadSpriteAsync("Fight", "Fight1_img_83");
            if (this == null) return;
            imgTotalDesc.sprite = await UILoader.LoadSpriteAsync("Fight", "Fight1_img_80");
            if (this == null) return;
        }
        else if (dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsType(DamageType.Realdamage))
        {
            // 保持原有处理逻辑位置
            foreach (var d in dmgInfo.damageList)
            {
                damage += d;
            }
            textDamage.text = BattleUtility.DisplayDamageNum(damage, BattleConst.BattleTotalDamageType);
            imgTotalDesc.sprite = await UILoader.LoadSpriteAsync("Fight", "Fight1_img_85");
            if (this == null) return;
            damageBackground.sprite = await UILoader.LoadSpriteAsync("Fight", "Fight1_img_88");
            if (this == null) return;
        }
        else
        {
            gameObject.SetActive(false);
            return;
        }
 
        if (punchTween != null && punchTween.IsActive())
        {
            battleField.battleTweenMgr.OnKillTween(punchTween);
            textDamage.transform.localScale = Vector3.one;
            punchTween = null;
        }
 
        punchTween = DOTween.Sequence();
        var tween1 = textDamage.transform.DOPunchScale(scalePunch, scaleDuration / battleField.speedRatio, 1);
        punchTween.Append(tween1);
        //  播放结束后 延迟1.5秒再消失
        var tween2 = DOVirtual.DelayedCall(delayCloseDuration / battleField.speedRatio, () => { });
        punchTween.Append(tween2);
        punchTween.OnComplete(() =>
        {
            textDamage.transform.localScale = Vector3.one;
            if (dmgInfo.isLastHit)
            {
                gameObject.SetActive(false);
            }
        });
 
        battleField.battleTweenMgr.OnPlayTween(punchTween);
 
    }
}