1

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_抖音礼物图_Dy.spriteatlas

@@ -82,10 +82,34 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - c0d49da3c50e364499817c8cde4829b7: 21300000
+    - 9a8f35849df73bf4a8a841de4e70b699: 21300000
+    - 71b615b93291b324ca18162473870d2a: 21300000
+    - d4c3de2ca85632b40b3e8d9884a94100: 21300000
+    - 221527fce6ae996489ca2c7e01d0d678: 21300000
+    - f28891cd97d1b1d4c995209dc870e427: 21300000
+    - f7c47b4f3b4ef04459d62f909f2e12c8: 21300000
+    - 6e5fddbf1f5ca3f4c80f68feeac293fa: 21300000
   m_MasterAtlas: {fileID: 0}
-  m_PackedSprites: []
+  m_PackedSprites:
-  m_PackedSpriteNamesToIndex: []
+  - {fileID: 21300000, guid: c0d49da3c50e364499817c8cde4829b7, type: 3}
+  - {fileID: 21300000, guid: 9a8f35849df73bf4a8a841de4e70b699, type: 3}
+  - {fileID: 21300000, guid: 71b615b93291b324ca18162473870d2a, type: 3}
+  - {fileID: 21300000, guid: d4c3de2ca85632b40b3e8d9884a94100, type: 3}
+  - {fileID: 21300000, guid: 221527fce6ae996489ca2c7e01d0d678, type: 3}
+  - {fileID: 21300000, guid: f28891cd97d1b1d4c995209dc870e427, type: 3}
+  - {fileID: 21300000, guid: f7c47b4f3b4ef04459d62f909f2e12c8, type: 3}
+  - {fileID: 21300000, guid: 6e5fddbf1f5ca3f4c80f68feeac293fa, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - 1_8
+  - 1_3
+  - 1_4
+  - 1_6
+  - 1_2
+  - 1_7
+  - 1_5
+  - 1_1
   m_RenderDataMap: {}
   m_Tag: "UIRaw_Atlas_\u6296\u97F3\u793C\u7269\u56FE_Dy"
   m_IsVariant: 0

UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab

@@ -5607,12 +5607,12 @@ GameObject:
   - component: {fileID: 3031959468877678420}
   - component: {fileID: 7109943892183298174}
   m_Layer: 5
-  m_Name: Nao
+  m_Name: m_rectNao
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9171262180880956483
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5622,14 +5622,15 @@ RectTransform:
   m_GameObject: {fileID: 870038134523134445}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
+  m_LocalScale: {x: 0.923077, y: 0.923077, z: 0.923077}
   m_ConstrainProportionsScale: 1
-  m_Children: []
+  m_Children:
-  m_Father: {fileID: 1814839733780877975}
+  - {fileID: 3600857068495130212}
+  m_Father: {fileID: 5645085182591318069}
   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: -64, y: 78.0011}
+  m_AnchoredPosition: {x: -193.63557, y: 105.42035}
   m_SizeDelta: {x: 60, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3031959468877678420
@@ -11140,7 +11141,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4871076593613299986}
-  - {fileID: 9171262180880956483}
   - {fileID: 688984147342290442}
   m_Father: {fileID: 8086681985000168470}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -51943,6 +51943,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5019063949487602446
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3600857068495130212}
+  - component: {fileID: 658461650971245635}
+  - component: {fileID: 4406288740564388502}
+  m_Layer: 5
+  m_Name: m_itemAddNum
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3600857068495130212
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5019063949487602446}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -26.6}
+  m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9171262180880956483}
+  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: 83.2, y: -35.8}
+  m_SizeDelta: {x: 52.1644, y: 31}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &658461650971245635
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5019063949487602446}
+  m_CullTransparentMesh: 1
+--- !u!114 &4406288740564388502
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5019063949487602446}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: +1
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 22.24
+  m_fontSizeBase: 22.24
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &5046560702088191477
 GameObject:
   m_ObjectHideFlags: 0
@@ -57067,7 +57201,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.65, y: 0.65, z: 0.65}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 9171262180880956483}
   m_Father: {fileID: 688984147342290442}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

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

@@ -23,6 +23,8 @@ namespace GameLogic
         private TextMeshProUGUI m_tmpValue;
         private RectTransform m_rectCar;
         private TextMeshProUGUI m_tmpAllValue;
+        private RectTransform m_rectNao;
+        private GameObject m_itemAddNum;
         protected override void ScriptGenerator()
         {
             m_rectHeadRt = FindChildComponent<RectTransform>("PlayerHeadRt/m_rectHeadRt");
@@ -33,6 +35,8 @@ namespace GameLogic
             m_tmpValue = FindChildComponent<TextMeshProUGUI>("Mid/m_imgValue/m_tmpValue");
             m_rectCar = FindChildComponent<RectTransform>("Mid/m_imgValue/m_rectCar");
             m_tmpAllValue = FindChildComponent<TextMeshProUGUI>("Mid/m_imgValue/m_rectCar/m_tmpAllValue");
+            m_rectNao = FindChildComponent<RectTransform>("Mid/m_imgValue/m_rectCar/m_tmpAllValue/m_rectNao");
+            m_itemAddNum = FindChild("Mid/m_imgValue/m_rectCar/m_tmpAllValue/m_rectNao/m_itemAddNum").gameObject;
         }
         #endregion
 
@@ -250,6 +254,9 @@ namespace GameLogic
             m_tmpAllValue.text = ((int)m_AllPush).ToString();
         }
 
+
+
+
         /// <summary>
         /// 增加礼物推力效果
         /// </summary>
@@ -282,7 +289,32 @@ namespace GameLogic
                 actorHItem.transform.DOLocalMoveX(0, 4f).OnComplete(async () =>
                 {
                     // 显示一下脑袋
+                    m_rectNao.GetComponent<Image>().material.SetFloat("_Alpha", 1);
 
+                    // 进度条0-1之间闪烁3次
+                    int flashCount = 3;
+                    float flashDuration = 0.12f; // 每次闪烁的时间
+
+                    Sequence seq = DOTween.Sequence();
+                    for (int i = 0; i < flashCount; i++)
+                    {
+                        seq.Append(DOTween.To(
+                            () => m_imgValue.fillAmount,
+                            x => m_imgValue.fillAmount = x,
+                            0f, flashDuration / 2f
+                        ).SetEase(Ease.InQuad));
+                        seq.Append(DOTween.To(
+                            () => m_imgValue.fillAmount,
+                            x => m_imgValue.fillAmount = x,
+                            1f, flashDuration / 2f
+                        ).SetEase(Ease.OutQuad));
+                    }
+                    // 最后回到当前进度
+                    seq.Append(DOTween.To(
+                        () => m_imgValue.fillAmount,
+                        x => m_imgValue.fillAmount = x,
+                        m_CurrentFillAmount, 0.18f
+                    ).SetEase(Ease.OutQuad));
 
 
                     await UniTask.Delay(2000);