This commit is contained in:
2026-09-22 03:59:20 +08:00
parent c612f527ea
commit af7a380e18
147 changed files with 28761 additions and 26 deletions
@@ -40,8 +40,8 @@ namespace Assets.MyGame.Scripts.Net.APIRequest.Params
[Serializable]
public class LotteryDrawParam : RequestParamBase
{
/// <summary>抽奖活动 ID(按后端定义补充)</summary>
public int lotteryId;
/// <summary>奖池分组:0=旧调用(默认),1=炮台,2=战神,3=翅膀</summary>
public int poolType;
}
// ---------------- /api/SummonCard/use(GET) ----------------
@@ -18,6 +18,9 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
[Serializable]
public class LotteryPoolLevel
{
/// <summary>奖池类型(一种类型=一种抽奖,多种抽奖各有独立奖池)</summary>
public int poolType;
/// <summary>奖励等级:A / B / C</summary>
public string level;
public int count;
public int weight;
@@ -64,6 +64,8 @@ namespace Assets.MyGame.Scripts.Net.APIResponses
public string otherId;
/// <summary>消耗</summary>
public long cost;
/// <summary>本次指定的奖池分组:0=旧调用,1=炮台,2=战神,3=翅膀</summary>
public int poolType;
}
// ---------------- /api/Lottery/UserStatus ----------------
@@ -279,6 +279,31 @@ namespace Assets.MyGame.Scripts.Net.WebResponses
public string userId;
}
/// <summary>
/// 召唤卡召唤通知 SummonCardFishNotice 数据。
/// 仅用于播放召唤提示/特效/显示召唤玩家,实际鱼对象仍由 OnFishSpawn 创建。
/// </summary>
[Serializable]
public class SummonCardFishNoticeData
{
/// <summary>房间ID</summary>
public string roomId;
/// <summary>使用召唤卡的玩家ID</summary>
public string userId;
/// <summary>玩家编号</summary>
public string userNumber;
/// <summary>玩家昵称</summary>
public string userName;
/// <summary>鱼类型 2=Boss鱼(飞机场/星际迷航场次), 3=黄金鱼(其他场次)</summary>
public int fishType;
/// <summary>"Boss鱼"或"黄金鱼"</summary>
public string fishTypeName;
/// <summary>鱼配置编号</summary>
public string fishNumber;
/// <summary>鱼实例ID,与 OnFishSpawn 中的 fishId 一致</summary>
public long fishId;
}
/// <summary>
/// 全局击杀公告 KillNotice 数据。
/// 真人击杀时只填基础字段;机器人模拟时额外填 fishName/multiplier/sceneName。
@@ -682,6 +682,11 @@ namespace Assets.MyGame.Scripts.Net
WebSocketReponseList.PlayerCancelAfkNotice(msg);
break;
case "SummonCardFishNotice":
// ⭐ 召唤卡召唤通知:某玩家使用召唤卡,服务端已创建召唤鱼(实际鱼由 OnFishSpawn 下发,这里只播提示)
WebSocketReponseList.SummonCardFishNotice(msg);
break;
case "RoomChange":
{
// FishRoomHub 房间变化通知(人数/状态变更),更新房间列表
@@ -463,6 +463,19 @@ namespace Assets.MyGame.Scripts.Net
EventCenter.Instance.EventTrigger<PlayerAfkNoticeData>(ConstEventString.PlayerCancelAfkNotice, data);
}
/// <summary>
/// 召唤卡召唤通知 SummonCardFishNotice。
/// 某玩家使用召唤卡(40006),服务端已创建 Boss鱼(飞机场)/黄金鱼(其他场次)。
/// 仅用于播放召唤提示/特效/显示召唤玩家,实际鱼对象仍由 OnFishSpawn 创建。
/// </summary>
public static void SummonCardFishNotice(string msg)
{
var data = JsonConvert.DeserializeObject<WebSocketResponseBase<SummonCardFishNoticeData>>(msg).arguments[0];
if (data == null) return;
EventCenter.Instance.EventTrigger<SummonCardFishNoticeData>(ConstEventString.SummonCardFishNotice, data);
NetLog.Log("召唤通知:", msg);
}
/// <summary>
/// 全局击杀公告 KillNotice。
/// 真人击杀/机器人模拟,机器人模拟时额外带 fishName/multiplier/sceneName。