1
This commit is contained in:
Binary file not shown.
+429374
-30474
File diff suppressed because it is too large
Load Diff
+290860
-20327
File diff suppressed because it is too large
Load Diff
@@ -418,7 +418,7 @@ AnimatorStateMachine:
|
||||
m_Position: {x: 0, y: 0, z: 0}
|
||||
- serializedVersion: 1
|
||||
m_StateMachine: {fileID: 1107829167588381866}
|
||||
m_Position: {x: 250, y: 20, z: 0}
|
||||
m_Position: {x: 300, y: -10, z: 0}
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions:
|
||||
|
||||
@@ -1917,43 +1917,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 684106649}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &721344202
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6956010706034629469}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59c98b7739d292e409a9c611858e6ee5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemId: 0
|
||||
prefab_DrawEffect: {fileID: 0}
|
||||
iconRatio: 0.85
|
||||
iconOffsetY: 0
|
||||
fontSize: 28
|
||||
drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5}
|
||||
maskSprite: {fileID: 0}
|
||||
prize:
|
||||
prizeId:
|
||||
name:
|
||||
icon:
|
||||
type: 0
|
||||
count: 0
|
||||
otherId:
|
||||
product:
|
||||
number:
|
||||
name:
|
||||
desc:
|
||||
imageUrl:
|
||||
type: 0
|
||||
level: 0
|
||||
weight: 0
|
||||
totalCount: 0
|
||||
drawnCount: 0
|
||||
isDrawn: 0
|
||||
--- !u!1 &757015530
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2436,7 +2399,6 @@ RectTransform:
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1819495571}
|
||||
- {fileID: 6956010706034629467}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@@ -3384,43 +3346,6 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
cameraTransform: {fileID: 0}
|
||||
StrengthMultiplier: 1
|
||||
--- !u!114 &1956001693
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6956010706034629468}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59c98b7739d292e409a9c611858e6ee5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemId: 0
|
||||
prefab_DrawEffect: {fileID: 0}
|
||||
iconRatio: 0.85
|
||||
iconOffsetY: 0
|
||||
fontSize: 28
|
||||
drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5}
|
||||
maskSprite: {fileID: 0}
|
||||
prize:
|
||||
prizeId:
|
||||
name:
|
||||
icon:
|
||||
type: 0
|
||||
count: 0
|
||||
otherId:
|
||||
product:
|
||||
number:
|
||||
name:
|
||||
desc:
|
||||
imageUrl:
|
||||
type: 0
|
||||
level: 0
|
||||
weight: 0
|
||||
totalCount: 0
|
||||
drawnCount: 0
|
||||
isDrawn: 0
|
||||
--- !u!1 &1969162102
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4219,9 +4144,9 @@ MonoBehaviour:
|
||||
spawnList: []
|
||||
isCreateFish: 0
|
||||
isFrozen: 0
|
||||
debugSpawnFishNumber: 11005
|
||||
isleft: 1
|
||||
debugSpawnAllLines: 1
|
||||
debugSpawnFishNumber: 11040
|
||||
isleft: 0
|
||||
debugSpawnAllLines: 0
|
||||
fishList_All: []
|
||||
fishList_Small: []
|
||||
fishList_Boss: []
|
||||
@@ -4271,222 +4196,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
audioMixer: {fileID: 24100000, guid: ca43f9a7549657a49a2978e97c7a621a, type: 2}
|
||||
--- !u!1001 &6956010706034629466
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1096182889}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1748715009826765484, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ChouJiang
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1748715009826765484, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3839088770513023305, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: chouJiang.Array.size
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3839088770513023305, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: chouJiang.Array.data[0]
|
||||
value:
|
||||
objectReference: {fileID: 6956010706034629502}
|
||||
- target: {fileID: 3839088770513023305, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: chouJiang.Array.data[1]
|
||||
value:
|
||||
objectReference: {fileID: 721344202}
|
||||
- target: {fileID: 3839088770513023305, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: chouJiang.Array.data[2]
|
||||
value:
|
||||
objectReference: {fileID: 1956001693}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 7473913208363182890, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 721344202}
|
||||
- targetCorrespondingSourceObject: {fileID: 7226372088942609347, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1956001693}
|
||||
- targetCorrespondingSourceObject: {fileID: 3836616254723645817, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6956010706034629502}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: fa7bc334f6405104db8bcd505104c32e, type: 3}
|
||||
--- !u!224 &6956010706034629467 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 7747513178359053521, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6956010706034629466}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6956010706034629468 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7226372088942609347, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6956010706034629466}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6956010706034629469 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7473913208363182890, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6956010706034629466}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6956010706034629501 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3836616254723645817, guid: fa7bc334f6405104db8bcd505104c32e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6956010706034629466}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6956010706034629502
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6956010706034629501}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59c98b7739d292e409a9c611858e6ee5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemId: 0
|
||||
prefab_DrawEffect: {fileID: 0}
|
||||
iconRatio: 0.85
|
||||
iconOffsetY: 0
|
||||
fontSize: 28
|
||||
drawnColor: {r: 0.35, g: 0.35, b: 0.35, a: 0.5}
|
||||
maskSprite: {fileID: 0}
|
||||
prize:
|
||||
prizeId:
|
||||
name:
|
||||
icon:
|
||||
type: 0
|
||||
count: 0
|
||||
otherId:
|
||||
product:
|
||||
number:
|
||||
name:
|
||||
desc:
|
||||
imageUrl:
|
||||
type: 0
|
||||
level: 0
|
||||
weight: 0
|
||||
totalCount: 0
|
||||
drawnCount: 0
|
||||
isDrawn: 0
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -728,13 +728,31 @@ namespace Assets.MyGame.Scripts.Net
|
||||
|
||||
/// <summary>
|
||||
/// LoginHub KillAnnouncement — 全局击杀公告（特殊 Boss 击杀全服推送）
|
||||
/// 客户端自行拼接公告文本（不再使用服务端 text）：
|
||||
/// 【风雷之渊】珠联璧合!恭喜:【小*鱼】捕获雷皇龙,获得47,640,000金币
|
||||
/// </summary>
|
||||
public static void KillAnnouncement(string msg)
|
||||
{
|
||||
var data = JsonConvert.DeserializeObject<WebSocketResponseBase<KillAnnouncementData>>(msg).arguments[0];
|
||||
// 服务端已拼好 text（格式：恭喜玩家*****在风雷之渊 高级场捕获 人鱼公主*2000倍 150000000大奖）
|
||||
if (data != null && !string.IsNullOrEmpty(data.text))
|
||||
UIManager.Instance.ShowBoardGongGao(data.text);
|
||||
if (data == null) return;
|
||||
|
||||
// 恭喜词随机
|
||||
string[] words = { "珠联璧合", "鸿运当头", "满载而归", "财源滚滚", "好运连连", "喜从天降", "手气爆棚", "天选之人" };
|
||||
string word = words[UnityEngine.Random.Range(0, words.Length)];
|
||||
|
||||
// 外层默认色 ECA895，关键字段用 ECB85F 覆盖
|
||||
string text = $"<color=#ECA895><color=#ECB85F>【{data.gameTypeName}】</color>{word}!恭喜:" +
|
||||
$"<color=#ECB85F>【{MaskUserName(data.userName)}】</color>捕获{data.fishName}," +
|
||||
$"获得<color=#ECB85F>{data.gold:N0}</color>金币</color>";
|
||||
UIManager.Instance.ShowBoardGongGao(text);
|
||||
}
|
||||
|
||||
/// <summary>玩家名脱敏：只显示首尾字，中间用*（如：小美人鱼 → 小*鱼）</summary>
|
||||
private static string MaskUserName(string name)
|
||||
{
|
||||
if (string.IsNullOrEmpty(name)) return string.Empty;
|
||||
if (name.Length == 1) return name;
|
||||
return $"{name[0]}*{name[name.Length - 1]}";
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user