1

UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 YelloLine 1.asset

@@ -889,6 +889,66 @@ MonoBehaviour:
     m_Scale: 1
     m_AtlasIndex: 0
     m_ClassDefinitionType: 0
+  - m_Index: 6580
+    m_Metrics:
+      m_Width: 112.5
+      m_Height: 84.875
+      m_HorizontalBearingX: 2.4375
+      m_HorizontalBearingY: 75.875
+      m_HorizontalAdvance: 117
+    m_GlyphRect:
+      m_X: 278
+      m_Y: 523
+      m_Width: 113
+      m_Height: 85
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 6283
+    m_Metrics:
+      m_Width: 113.765625
+      m_Height: 84.875
+      m_HorizontalBearingX: 1.703125
+      m_HorizontalBearingY: 75.875
+      m_HorizontalAdvance: 117
+    m_GlyphRect:
+      m_X: 143
+      m_Y: 619
+      m_Width: 115
+      m_Height: 85
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 3568
+    m_Metrics:
+      m_Width: 114.03125
+      m_Height: 84.875
+      m_HorizontalBearingX: 1.703125
+      m_HorizontalBearingY: 75.875
+      m_HorizontalAdvance: 117
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 723
+      m_Width: 115
+      m_Height: 85
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 6310
+    m_Metrics:
+      m_Width: 113.671875
+      m_Height: 84.875
+      m_HorizontalBearingX: 1.703125
+      m_HorizontalBearingY: 75.875
+      m_HorizontalAdvance: 117
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 827
+      m_Width: 115
+      m_Height: 85
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
   m_CharacterTable:
   - m_ElementType: 1
     m_Unicode: 32
@@ -1074,6 +1134,22 @@ MonoBehaviour:
     m_Unicode: 37266
     m_GlyphIndex: 6173
     m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 38738
+    m_GlyphIndex: 6580
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 38108
+    m_GlyphIndex: 6283
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 29076
+    m_GlyphIndex: 3568
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 38136
+    m_GlyphIndex: 6310
+    m_Scale: 1
   m_AtlasTextures:
   - {fileID: -7646704604280163338}
   m_AtlasTextureIndex: 0
@@ -1260,6 +1336,22 @@ MonoBehaviour:
     m_Y: 416
     m_Width: 134
     m_Height: 104
+  - m_X: 268
+    m_Y: 513
+    m_Width: 132
+    m_Height: 104
+  - m_X: 133
+    m_Y: 609
+    m_Width: 134
+    m_Height: 104
+  - m_X: 0
+    m_Y: 713
+    m_Width: 134
+    m_Height: 104
+  - m_X: 0
+    m_Y: 817
+    m_Width: 134
+    m_Height: 104
   m_FreeGlyphRects:
   - m_X: 102
     m_Y: 32
@@ -1369,18 +1461,6 @@ MonoBehaviour:
     m_Y: 400
     m_Width: 50
     m_Height: 9
-  - m_X: 0
-    m_Y: 656
-    m_Width: 1023
-    m_Height: 367
-  - m_X: 133
-    m_Y: 609
-    m_Width: 890
-    m_Height: 414
-  - m_X: 133
-    m_Y: 552
-    m_Width: 1
-    m_Height: 471
   - m_X: 653
     m_Y: 312
     m_Width: 14
@@ -1397,14 +1477,6 @@ MonoBehaviour:
     m_Y: 409
     m_Width: 117
     m_Height: 7
-  - m_X: 268
-    m_Y: 520
-    m_Width: 755
-    m_Height: 503
-  - m_X: 268
-    m_Y: 513
-    m_Width: 134
-    m_Height: 510
   - m_X: 536
     m_Y: 506
     m_Width: 487
@@ -1413,6 +1485,38 @@ MonoBehaviour:
     m_Y: 416
     m_Width: 117
     m_Height: 607
+  - m_X: 400
+    m_Y: 520
+    m_Width: 623
+    m_Height: 503
+  - m_X: 400
+    m_Y: 513
+    m_Width: 2
+    m_Height: 510
+  - m_X: 133
+    m_Y: 552
+    m_Width: 1
+    m_Height: 57
+  - m_X: 267
+    m_Y: 617
+    m_Width: 756
+    m_Height: 406
+  - m_X: 267
+    m_Y: 609
+    m_Width: 1
+    m_Height: 414
+  - m_X: 134
+    m_Y: 713
+    m_Width: 889
+    m_Height: 310
+  - m_X: 0
+    m_Y: 656
+    m_Width: 133
+    m_Height: 57
+  - m_X: 0
+    m_Y: 921
+    m_Width: 1023
+    m_Height: 102
   m_fontInfo:
     Name: 
     PointSize: 0

UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab

@@ -78555,7 +78555,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -194, y: 584}
+  m_AnchoredPosition: {x: -194, y: 714}
   m_SizeDelta: {x: 673.4304, y: 121.1576}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7971765919379679797
@@ -99365,6 +99365,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6805953989209425366}
     m_Modifications:
+    - target: {fileID: 262265735614488083, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 266805990287437706, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 1670347114808273646, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
       propertyPath: m_Name
       value: HDWMSP
@@ -99373,6 +99381,30 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2833808460870750844, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3305702071757996608, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3349534088760272594, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3915757582508217486, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6524387709254424223, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7896412005283133828, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 8451575949868884774, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -99453,6 +99485,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8792248248902349103, guid: f6282c9fd1b60fa44a49784333a9ad3b, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs

@@ -274,13 +274,13 @@ namespace GameLogic
             DOTween.To(
                 () => m_imgValue.fillAmount,
                 x => m_imgValue.fillAmount = x,
-                shrinkTo, 0.12f
+                shrinkTo, 0.15f
             ).SetEase(Ease.InQuad).OnComplete(() =>
             {
                 DOTween.To(
                     () => m_imgValue.fillAmount,
                     x => m_imgValue.fillAmount = x,
-                    originalFill, 0.4f
+                    originalFill, 0.35f
                 ).SetEase(Ease.OutElastic);
             });
         }
@@ -511,13 +511,7 @@ namespace GameLogic
                     eGo.transform.localScale = Vector3.one;
                     eGo.gameObject.SetActive(true);
 
-                    eGo.transform.DOLocalMoveX(0, 3f).OnComplete(async () =>
+                    await UniTask.Delay(1500);
-                    {
-                        // 特效播放完毕后销毁
-                        GameObject.Destroy(eGo);
-                    });
-
-                    await UniTask.Delay(1500); // 等待特效播放完毕
 
                     // 给进度条一个缩减回弹效果
                     float originalFill = m_CurrentFillAmount;
@@ -535,6 +529,31 @@ namespace GameLogic
                         ).SetEase(Ease.OutElastic);
                     });
 
+                    // 生成新爆点
+                    var eGoBoom = GameModule.Resource.LoadGameObject("Long_Boom");
+                    eGoBoom.transform.SetParent(m_rectCar.transform);
+                    eGoBoom.transform.localPosition = new Vector3(0, 0, 0);
+                    eGoBoom.transform.localScale = Vector3.one;
+                    eGoBoom.gameObject.SetActive(true);
+
+                    eGoBoom.transform.DOLocalMoveX(0, 3f).OnComplete(async () =>
+                    {
+                        // 特效播放完毕后销毁
+                        GameObject.Destroy(eGo);
+                    });
+
+
+
+                    eGo.transform.DOLocalMoveX(0, 3f).OnComplete(async () =>
+                    {
+                        // 特效播放完毕后销毁
+                        GameObject.Destroy(eGo);
+                    });
+
+                    await UniTask.Delay(1500); // 等待特效播放完毕
+
+
+
                     // 直接扣
                     m_AllPush += (int)buff.addPower;
                     return;

UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs

@@ -807,8 +807,9 @@ namespace GameLogic
                     m_Buff1.m_EffectGo = eGo;
 
                     // 移动特效
-                    eGo.transform.DOLocalMoveX(0, 5f).OnComplete(async () =>
+                    eGo.transform.DOLocalMoveX(0, 5f).OnComplete(() =>
                     {
+                        Log.Debug("?");
                         GameObject.Destroy(eGo);
                         m_TempList[i].SetCurrenFill();
                     });
@@ -865,7 +866,7 @@ namespace GameLogic
 
             // 添加无敌护罩
             Buff m_Buff = new Buff();
-            m_Buff.OnInit(giftConfig.Id, 0, giftConfig.TimerLen * num, giftConfig.AddGiftScore, num);
+            m_Buff.OnInit(giftConfig.Id, 0, giftConfig.TimerLen * num * 10, giftConfig.AddGiftScore, num);
             m_Buff.isZoneTimer = true;
             actor.AddBuff(m_Buff, unitPlayerData, giftConfig);
 
@@ -894,6 +895,7 @@ namespace GameLogic
 
 
                 await UniTask.Delay(500);
+
                 // 添加减速Buff
                 Buff m_Buff1 = new Buff();
                 m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num);
@@ -923,7 +925,7 @@ namespace GameLogic
                 for (int i = 0; i < 45; i++)
                 {
                     DataGameSceneManager.Instance.m_TeamSortList[1].SetCurrenFill();
-                    await UniTask.Delay(1000);
+                    await UniTask.Delay(600);
                 }
 
             }
@@ -946,7 +948,7 @@ namespace GameLogic
                 for (int i = 0; i < 45; i++)
                 {
                     DataGameSceneManager.Instance.m_TeamSortList[0].SetCurrenFill();
-                    await UniTask.Delay(1000);
+                    await UniTask.Delay(600);
                 }
             }