From ccf19615fba77c1045bdd6a5fdf0bd6eb0d40646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com>
Date: Sat, 25 Apr 2026 00:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E9=87=91=E5=B8=81=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Tool/RedPacket/LayeredRedPacket.cs | 1 +
.../Characters/Monster/MonsterContral.cs | 5 +-
.../Scripts/Manager/CreateFishManager.cs | 31 ++-
.../Scripts/Net/WebResponses/SyncGameData.cs | 1 +
.../aa/Game/DefaultDieEffect/Coin.prefab | 226 ++----------------
.../aa/UI/Game/GameMainPanel_FishBase.cs | 2 +-
6 files changed, 57 insertions(+), 209 deletions(-)
diff --git a/Assets/Framework/Tool/RedPacket/LayeredRedPacket.cs b/Assets/Framework/Tool/RedPacket/LayeredRedPacket.cs
index a3e44a425..a6c4a160a 100644
--- a/Assets/Framework/Tool/RedPacket/LayeredRedPacket.cs
+++ b/Assets/Framework/Tool/RedPacket/LayeredRedPacket.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
+[Serializable]
///
/// 纯整数红包记录
/// 金额单位：分 (int)
diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
index 0d290ef70..ea637f6fd 100644
--- a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
@@ -34,6 +34,7 @@ public class MonsterContral : MonoBehaviour
public string forwordXYZ;
protected RectTransform uirootRect;
protected Camera mainCamera;
+ public FishTypeEnum fishenum;
public virtual void DieFish(RoomKillNotice obj =null)
{
Destroy(gameObject);
@@ -89,10 +90,12 @@ public class MonsterContral : MonoBehaviour
default:
break;
}
- switch ((FishTypeEnum)monsterData.fishTypeConfig.fishType)
+ fishenum = (FishTypeEnum)monsterData.fishTypeConfig.fishType;
+ switch (fishenum)
{
case FishTypeEnum.普通鱼:
Destroy(gameObject, Time);
+
break;
case FishTypeEnum.Boss鱼:
Destroy(gameObject, Time);
diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
index 7e528e27a..988f21734 100644
--- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
@@ -13,10 +13,12 @@ using System.Drawing;
using System.Linq;
using System.Security.Cryptography;
using System.Threading;
+using TMPro;
using Unity.Collections;
using Unity.Jobs;
using UnityEditor;
using UnityEngine;
+using static UnityEditor.Progress;
using Random = UnityEngine.Random;
public class CreateFishManager : MonoSingleton
@@ -918,7 +920,7 @@ public class CreateFishManager : MonoSingleton
///
///
///
- public List SyncGameData_SendRendromDieFishID(int count,List coinNum=null)
+ public List SyncGameData_SendRendromDieFishID(int count,List coinNum)
{
@@ -957,6 +959,7 @@ public class CreateFishManager : MonoSingleton
frameData = new FrameData_RandomDieFish
{
guids = list,
+ coinNum= coinNum,
count = count
}
};
@@ -976,7 +979,7 @@ public class CreateFishManager : MonoSingleton
fishDatas_hashCodekey.Remove(fishId);
}
}
- public void Id_DieFish_FX(string fishId)
+ public void Id_DieFish_FX(string fishId, RedPacketRecord coinNum)
{
if (fishDatas_hashCodekey.ContainsKey(fishId))
{
@@ -984,8 +987,14 @@ public class CreateFishManager : MonoSingleton
var monster = fishDatas_hashCodekey[fishId];
Instantiate(monster.effect_Die == null ? dieFXPrefab : monster.effect_Die, monster.transform.position, Quaternion.identity, transform.parent);
//award效果
- //Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, monster.transform.position, Quaternion.identity, transform.parent);
+
+ if (monster.effect_DieAward == null && monster.fishenum != FishTypeEnum.Boss鱼)
+ {
+ var award = Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, currGameType.subPanelParent.parent);
+ award.GetComponent().anchoredPosition =CoordinateTransformation.WorldPos_ToCanvas(monster.transform.position, UIManager.Instance.uiRoot.GetComponent