From 43065af74f2a04dbd100459c27adb877662f1dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Fri, 10 Jul 2026 23:26:42 +0800 Subject: [PATCH] 1 --- Assets/MyGame/Scenes/UIScene.unity | 1267 +++++++++++++++++ Assets/MyGame/Scripts/Manager/GameManager.cs | 45 +- Assets/MyGame/Scripts/Net/APIManager.cs | 3 +- .../Net/APIRequest/Params/HallRequest.cs | 91 +- .../MyGame/Scripts/Net/APIRequestList_Hall.cs | 12 + Assets/MyGame/Scripts/Net/APIType.cs | 3 + .../Net/WebResponses/RoomKillNotice.cs | 23 +- Assets/MyGame/Scripts/Net/WebSocketManager.cs | 12 +- .../Scripts/Net/WebSocketManager_Message.cs | 5 +- .../Scripts/Net/WebSocketReponseList.cs | 37 +- 10 files changed, 1435 insertions(+), 63 deletions(-) diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index 263213e84..a1041f500 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -2515,6 +2515,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 495101440} m_CullTransparentMesh: 1 +--- !u!1 &498603921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 498603922} + - component: {fileID: 498603924} + - component: {fileID: 498603923} + m_Layer: 0 + m_Name: "\u56FE\u5C42 1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &498603922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498603921} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: NaN, y: NaN} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: NaN, y: NaN} +--- !u!114 &498603923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498603921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 6124315842932745608, guid: 8476884778a4cde4fafa88578175ab1d, + type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &498603924 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498603921} + m_CullTransparentMesh: 1 --- !u!1 &511077921 GameObject: m_ObjectHideFlags: 0 @@ -2890,6 +2966,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 541760365} m_CullTransparentMesh: 1 +--- !u!1 &577788731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 577788732} + - component: {fileID: 577788734} + - component: {fileID: 577788733} + m_Layer: 0 + m_Name: "\u83B7\u53D6\u9A8C\u8BC1\u7801" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &577788732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577788731} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: 165.99998, y: 331} + m_SizeDelta: {x: 92, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &577788733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577788731} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 2b0ea4e204626994982ed8b75e51e79d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &577788734 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577788731} + m_CullTransparentMesh: 1 --- !u!1 &586830829 GameObject: m_ObjectHideFlags: 0 @@ -3228,6 +3379,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616555262} m_CullTransparentMesh: 1 +--- !u!1 &619878029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 619878030} + - component: {fileID: 619878032} + - component: {fileID: 619878031} + m_Layer: 0 + m_Name: BY_beibao_002 (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &619878030 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619878029} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -277, y: 569} + m_SizeDelta: {x: 154, y: 94} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &619878031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619878029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 476b1f3ce44363f45a9a4489f8064a56, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &619878032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619878029} + m_CullTransparentMesh: 1 --- !u!1 &623996930 GameObject: m_ObjectHideFlags: 0 @@ -4845,6 +5071,109 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 911993539} m_CullTransparentMesh: 1 +--- !u!1 &915409728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 915409732} + - component: {fileID: 915409731} + - component: {fileID: 915409730} + - component: {fileID: 915409729} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &915409729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915409728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &915409730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915409728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &915409731 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915409728} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &915409732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 915409728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1226880509} + - {fileID: 1940105591} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &921761174 GameObject: m_ObjectHideFlags: 0 @@ -5526,6 +5855,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1033556600} m_CullTransparentMesh: 1 +--- !u!1 &1035020959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1035020960} + - component: {fileID: 1035020962} + - component: {fileID: 1035020961} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_001 (15) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1035020960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035020959} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -96, y: 403.5} + m_SizeDelta: {x: 88, y: 43} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1035020961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035020959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 33275be4d3519d5448a4cf2cc1242563, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1035020962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035020959} + m_CullTransparentMesh: 1 --- !u!1 &1065430328 GameObject: m_ObjectHideFlags: 0 @@ -5873,6 +6277,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 941} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1138039167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1138039168} + - component: {fileID: 1138039170} + - component: {fileID: 1138039169} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_008 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1138039168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138039167} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -1.5000343, y: 389} + m_SizeDelta: {x: 707, y: 436} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1138039169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138039167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 11052badf00d03e4dbfbe493b1d2769b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1138039170 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138039167} + m_CullTransparentMesh: 1 --- !u!1 &1142131034 GameObject: m_ObjectHideFlags: 0 @@ -6352,6 +6831,81 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1188378860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1188378861} + - component: {fileID: 1188378863} + - component: {fileID: 1188378862} + m_Layer: 0 + m_Name: 08 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1188378861 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188378860} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -10.000038, y: 247} + m_SizeDelta: {x: 214, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1188378862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188378860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: e62340f32b52df94faf037c06bae6fd7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1188378863 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188378860} + m_CullTransparentMesh: 1 --- !u!1 &1191572240 GameObject: m_ObjectHideFlags: 0 @@ -6562,6 +7116,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195989018} m_CullTransparentMesh: 1 +--- !u!224 &1226880509 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + m_PrefabInstance: {fileID: 7537952842253031169} + m_PrefabAsset: {fileID: 0} --- !u!1 &1242213261 GameObject: m_ObjectHideFlags: 0 @@ -6785,6 +7345,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1248128280} m_CullTransparentMesh: 1 +--- !u!1 &1308245076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1308245077} + - component: {fileID: 1308245079} + - component: {fileID: 1308245078} + m_Layer: 0 + m_Name: "\u5927\u5587\u53ED" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1308245077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308245076} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -163.50003, y: 560.99994} + m_SizeDelta: {x: 101, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1308245078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308245076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 09db8ea41240ab84996e4f9f2e76fac3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1308245079 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1308245076} + m_CullTransparentMesh: 1 --- !u!1 &1312826143 GameObject: m_ObjectHideFlags: 0 @@ -7220,6 +7855,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369449480} m_CullTransparentMesh: 1 +--- !u!1 &1389132402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1389132403} + - component: {fileID: 1389132405} + - component: {fileID: 1389132404} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1389132403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389132402} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -305.49997, y: 264.5} + m_SizeDelta: {x: 131, y: 207} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1389132404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389132402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 8d088b72f60ca5d46a6fa38eb7fa960d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1389132405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389132402} + m_CullTransparentMesh: 1 --- !u!1 &1417933965 GameObject: m_ObjectHideFlags: 0 @@ -8045,6 +8755,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624561634} m_CullTransparentMesh: 1 +--- !u!1 &1657412018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1657412019} + - component: {fileID: 1657412021} + - component: {fileID: 1657412020} + m_Layer: 0 + m_Name: "\u5587\u53ED\u5185\u5BB9\u4E0D\u80FD\u8D85\u8FC720\u4E2A\u5B57" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1657412019 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657412018} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -7.9999924, y: 315} + m_SizeDelta: {x: 176, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1657412020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657412018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 6c3f29a08a846044791abe5b6d0f1c10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1657412021 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1657412018} + m_CullTransparentMesh: 1 --- !u!1 &1663842062 GameObject: m_ObjectHideFlags: 0 @@ -8263,6 +9048,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1689302959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1689302960} + - component: {fileID: 1689302962} + - component: {fileID: 1689302961} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_003 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1689302960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1689302959} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: 308, y: 564} + m_SizeDelta: {x: 42, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1689302961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1689302959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 8f4b03c45bd1f3b41b6896aae79bc0b7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1689302962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1689302959} + m_CullTransparentMesh: 1 --- !u!1 &1700229264 GameObject: m_ObjectHideFlags: 0 @@ -9399,6 +10259,54 @@ MonoBehaviour: m_EditorClassIdentifier: cameraTransform: {fileID: 0} StrengthMultiplier: 1 +--- !u!1 &1940105590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1940105591} + m_Layer: 0 + m_Name: PSB_UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1940105591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1940105590} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1138039168} + - {fileID: 1657412019} + - {fileID: 2119074484} + - {fileID: 619878030} + - {fileID: 2032861863} + - {fileID: 1308245077} + - {fileID: 2085934663} + - {fileID: 498603922} + - {fileID: 1035020960} + - {fileID: 1389132403} + - {fileID: 1689302960} + - {fileID: 577788732} + - {fileID: 1188378861} + m_Father: {fileID: 915409732} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1969162102 GameObject: m_ObjectHideFlags: 0 @@ -9851,6 +10759,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2016282716} m_CullTransparentMesh: 1 +--- !u!1 &2032861862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2032861863} + - component: {fileID: 2032861865} + - component: {fileID: 2032861864} + m_Layer: 0 + m_Name: BY_beibao8(5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2032861863 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032861862} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -271, y: 564.5} + m_SizeDelta: {x: 168, y: 103} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2032861864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032861862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 43baa3bbdd54ef842be8d269a1bc0399, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2032861865 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032861862} + m_CullTransparentMesh: 1 --- !u!1 &2053128244 GameObject: m_ObjectHideFlags: 0 @@ -10403,6 +11386,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioMixer: {fileID: 24100000, guid: ca43f9a7549657a49a2978e97c7a621a, type: 2} +--- !u!1 &2085934662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2085934663} + - component: {fileID: 2085934665} + - component: {fileID: 2085934664} + m_Layer: 0 + m_Name: "\u5587\u53ED\u5185\u5BB9\uFF1A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2085934663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085934662} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -224.49998, y: 403.5} + m_SizeDelta: {x: 137, y: 29} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2085934664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085934662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: a908e1b610ee1bf49bd7809d3aeb68fe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2085934665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2085934662} + m_CullTransparentMesh: 1 --- !u!1 &2093586847 GameObject: m_ObjectHideFlags: 0 @@ -10478,6 +11536,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2093586847} m_CullTransparentMesh: 1 +--- !u!1 &2119074483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2119074484} + - component: {fileID: 2119074486} + - component: {fileID: 2119074485} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_003 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2119074484 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119074483} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1940105591} + 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: -2.0000458, y: 569} + m_SizeDelta: {x: 688, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2119074485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119074483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 9899c40ea1fd1e14c95e5b8db44756d8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2119074486 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2119074483} + m_CullTransparentMesh: 1 --- !u!114 &253829674362749262 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11491,6 +12624,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5041438878795856291} m_CullTransparentMesh: 1 +--- !u!1001 &7537952842253031169 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 915409732} + m_Modifications: + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5297965370328433198, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_Name + value: BackPack + objectReference: {fileID: 0} + - target: {fileID: 5979716680938546605, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5979716680938546605, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6735192382069086011, guid: c48b9e15c1940764a9da95551887a147, + type: 3} + propertyPath: m_SizeDelta.y + value: 155.67 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c48b9e15c1940764a9da95551887a147, type: 3} --- !u!224 &7620752177888780274 RectTransform: m_ObjectHideFlags: 0 @@ -11749,3 +13015,4 @@ SceneRoots: - {fileID: 1184862095} - {fileID: 1663842063} - {fileID: 8406649690848505089} + - {fileID: 915409732} diff --git a/Assets/MyGame/Scripts/Manager/GameManager.cs b/Assets/MyGame/Scripts/Manager/GameManager.cs index 5c85c7c3c..b219ff163 100644 --- a/Assets/MyGame/Scripts/Manager/GameManager.cs +++ b/Assets/MyGame/Scripts/Manager/GameManager.cs @@ -1,4 +1,4 @@ -using Assets.MyGame.Scripts.Net; +using Assets.MyGame.Scripts.Net; using Assets.MyGame.Scripts.Net.API; using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass; using CameraShake; @@ -241,39 +241,52 @@ public class GameManager : MonoSingleton UIManager.Instance.ShowAsync(UIPanel.MainGamePanelDefault); break; case GameType.FLZY: - if (action != null) - WebSocketManager.Instance.Connect(SocketType.game, action); //UIManager.Instance.ShowAsync(UIPanel.MainGamePanelFLZY); + ConnectGameSocket(action); break; case GameType.YYSC: - if (action != null) - { - WebSocketManager.Instance.Connect(SocketType.game, action); - } + ConnectGameSocket(action); break; case GameType.ZGXQ: - //UIManager.Instance.ShowAsync(UIPanel.MainGamePanelZGXQ); + //UIManager.Instance.ShowAsync(UIPanel.MainGamePanelZGXQ); //这里设置触å�‘棋盘的åˆ�始化 break; case GameType.XJMH: - if (action != null) - { - WebSocketManager.Instance.Connect(SocketType.game, action); - } - else - WebSocketManager.Instance.Connect(SocketType.game); + ConnectGameSocket(action); break; case GameType.HHWK: //UIManager.Instance.ShowAsync(UIPanel.MainGamePanelDefault); - if (action != null) - WebSocketManager.Instance.Connect(SocketType.game, action); + ConnectGameSocket(action); break; default: break; } } + + /// + /// 通过 /api/Room/Assign 获å�–房间专属 socket 地å�€å�Žè¿žæŽ¥ game socket + /// + private void ConnectGameSocket(Action action) + { + string roomId = gameData.currRoomData?.roomId; + if (string.IsNullOrEmpty(roomId)) + { +#if UNITY_EDITOR + Debug.LogWarning("[GameManager] currRoomData.roomId 为空,使用默认 game socket 地å�€"); +#endif + WebSocketManager.Instance.Connect(SocketType.game, action); + return; + } + APIRequestList.RoomAssign(roomId, url => + { + if (!string.IsNullOrEmpty(url)) + WebSocketManager.Instance.Connect(SocketType.game, url, action); + else + WebSocketManager.Instance.Connect(SocketType.game, action); + }); + } // Start is called before the first frame update public Button btn_Skip; public VideoClip startVideoClip; diff --git a/Assets/MyGame/Scripts/Net/APIManager.cs b/Assets/MyGame/Scripts/Net/APIManager.cs index 38a97294e..57908dbfb 100644 --- a/Assets/MyGame/Scripts/Net/APIManager.cs +++ b/Assets/MyGame/Scripts/Net/APIManager.cs @@ -1,4 +1,4 @@ -using Assets.MyGame.Scripts.Net.API; +using Assets.MyGame.Scripts.Net.API; using Assets.MyGame.Scripts.Net.APIRequest; using Best.HTTP.SecureProtocol.Org.BouncyCastle.Ocsp; using Newtonsoft.Json; @@ -165,6 +165,7 @@ namespace Assets.MyGame.Scripts.Net dic_API[APIType.Hall_GetRanking] = "/api/Hall/GetRanking"; dic_API[APIType.Hall_GetChessRoomPartitionCount] = "/api/Hall/GetChessRoomPartitionCount"; dic_API[APIType.Hall_SendBroadcast] = "/api/Hall/SendBroadcast"; + dic_API[APIType.Room_Assign] = "/api/Room/Assign"; // ---------------- Customer ---------------- dic_API[APIType.Customer_Start] = "/customerapi/Customer/start"; diff --git a/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs b/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs index 99ff634bf..de4d5dea8 100644 --- a/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs +++ b/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs @@ -3,26 +3,26 @@ using System; namespace Assets.MyGame.Scripts.Net.APIRequest.Params { /// - /// ´æÈë±£ÏÕÏäÇëÇó²ÎÊý + /// ���뱣����������� /// [Serializable] public class SaveSafeBoxParam : RequestParamBase { - public int gold; // ´æÈë½ð¶î + public int gold; // ������ } /// - /// ÉèÖñ£ÏÕÏäÃÜÂëÇëÇó²ÎÊý + /// ����������������� /// [Serializable] public class SetSafeBoxPasswordParam : RequestParamBase { - public string password; // ÐÂÃÜÂë + public string password; // ������ } /// - /// ÖØÖñ£ÏÕÏäÃÜÂëÇëÇó²ÎÊý£¨GET£© + /// �������������������GET�� /// Swagger: /api/Hall/ResetSafeBoxPassword?password=&code= /// [Serializable] @@ -33,7 +33,7 @@ namespace Assets.MyGame.Scripts.Net.APIRequest.Params } /// - /// È¡³ö±£ÏÕÏäÇëÇó²ÎÊý£¨GET£© + /// ȡ�����������������GET�� /// Swagger: /api/Hall/GetSafeBox?gold=&password= /// [Serializable] @@ -44,7 +44,7 @@ namespace Assets.MyGame.Scripts.Net.APIRequest.Params } /// - /// »ñÈ¡×ʲú±ä¶¯¼Ç¼²ÎÊý£¨GET£© + /// ��ȡ�ʲ��䶯��¼������GET�� /// Swagger: /api/Hall/GetUserRewardList /// [Serializable] @@ -54,151 +54,158 @@ namespace Assets.MyGame.Scripts.Net.APIRequest.Params public int pageIndex; public int pageSize; public string userId; - public int type; // 1Ôö¼Ó 2¼õÉÙ 0È«²¿ + public int type; // 1���� 2���� 0ȫ�� public int source; - public int currencyType; // 1½ð±Ò 2½ð±Ò±£ÏÕÏä 3×êʯ 0È«²¿ + public int currencyType; // 1��� 2��ұ����� 3��ʯ 0ȫ�� } /// - /// ºÏ³ÉË鯬ÇëÇó²ÎÊý + /// �ϳ���Ƭ������� /// [Serializable] public class SynthesisFragmentParam : RequestParamBase { - public int fragmentId; // Ë鯬ID - public int count; // ÊýÁ¿ + public int fragmentId; // ��ƬID + public int count; // ���� } /// - /// ¹ºÂòÔ¿¨ÇëÇó²ÎÊý£¨GET£© + /// �����¿����������GET�� /// Swagger: GET /api/Hall/BuyMonthCard /// [Serializable] public class BuyMonthCardParam : RequestParamBase { - /// Ô¿¨ÀàÐÍ 1=ÖÜ¿¨ 2=Ô¿¨ 3=Ä꿨 + /// �¿����� 1=�ܿ� 2=�¿� 3=�꿨 public int type; - /// ½ð±Ò¼Û¸ñ£¨ÓÃÓÚУÑ飩 + /// ��Ҽ۸�����У�飩 public int gold; - /// ÏÖ½ð¼Û¸ñ + /// �ֽ�۸� public double money; } /// - /// ¹ºÂòµÀ¾ßÇëÇó²ÎÊý£¨GET£© + /// ����������������GET�� /// Swagger: GET /api/Hall/BuyProp /// [Serializable] public class BuyPropParam : RequestParamBase { - /// µÀ¾ß±àºÅ + /// ���߱�� public string propNumber; - /// ¹ºÂòÊýÁ¿ + /// �������� public int count; } /// - /// ¹ºÂò½ð±ÒÇëÇó²ÎÊý£¨GET£© + /// ���������������GET�� /// Swagger: GET /api/Hall/BuyGold /// [Serializable] public class BuyGoldParam : RequestParamBase { - /// ÉÌÆ·±àºÅ£¨GoldShopConfig.number£© + /// ��Ʒ��ţ�GoldShopConfig.number�� public string number; - /// ¹ºÂòÊýÁ¿ + /// �������� public int count; } /// - /// ¹ºÂò×êʯÇëÇó²ÎÊý£¨GET£© + /// ������ʯ���������GET�� /// Swagger: GET /api/Hall/BuyDiamond /// [Serializable] public class BuyDiamondParam : RequestParamBase { - /// ÉÌÆ·±àºÅ£¨DiamondShopConfig.number£© + /// ��Ʒ��ţ�DiamondShopConfig.number�� public string number; - /// ¹ºÂòÊýÁ¿ + /// �������� public int count; } /// - /// Çл»ÅŲ́ÇëÇó²ÎÊý + /// �л���̨������� /// [Serializable] public class ChangeCannonParam : RequestParamBase { - public string number; // ÅŲ́±àºÅ + public string number; // ��̨��� } /// - /// Çл»³á°òÇëÇó²ÎÊý + /// ����������� /// [Serializable] public class ChangeWingParam : RequestParamBase { - public string number; // ³á°ò±àºÅ + public string number; // ����� } /// - /// Çл»Õ½ÉñÇëÇó²ÎÊý + /// �л�ս��������� /// [Serializable] public class ChangeGodWarParam : RequestParamBase { - public string number; // Õ½Éñ±àºÅ + public string number; // ս���� } /// - /// ·¢·Å½±ÀøÇëÇó²ÎÊý + /// ������������� /// [Serializable] public class DistributeRewardsParam : RequestParamBase { - public string id; // ½±Àø/ÈÎÎñ ID + public string id; // ����/���� ID } - /// ÁìȡսÁîµÈ¼¶½±Àø£¨GET£© + /// ��ȡս��ȼ�������GET�� [Serializable] public class ReceiveBattleOrderLevelRewardParam : RequestParamBase { - public int level; // µÈ¼¶ + public int level; // �ȼ� } - /// ¹ºÂòÕ½ÁîµÈ¼¶£¨GET£© + /// ����ս��ȼ���GET�� [Serializable] public class BuyBattleOrderLevelParam : RequestParamBase { - public int levelCount; // ¹ºÂòµÈ¼¶Êý + public int levelCount; // ����ȼ��� } - /// ¹ºÂòÕ½Áî½ø½×£¨GET£© + /// ����ս����ף�GET�� [Serializable] public class BuyBattleOrderAdvanceParam : RequestParamBase { - public int type; // ½ø½×ÀàÐÍ 1=¾«Ó¢ 2=ÖÁ×ð + public int type; // �������� 1=��Ӣ 2=���� } - /// »ñÈ¡Óû§ÈÎÎñÁÐ±í£¨GET£© + /// ��ȡ�û������б���GET�� [Serializable] public class GetUserTaskListParam : RequestParamBase { - public int taskType = -1; // -1=È«²¿ + public int taskType = -1; // -1=ȫ�� } - /// ·¢ËÍÈ«·þ¹ã²¥£¨GET£© + /// å�‘é€�å…¨æœ�广播(GET) [Serializable] public class SendBroadcastParam : RequestParamBase { public string message; } + + /// 获å�–房间专属 socket 地å�€ï¼ˆGET /api/Room/Assign?roomId=) + [Serializable] + public class RoomAssignParam : RequestParamBase + { + public string roomId; + } } diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs index f44c313a6..5fac6cd6a 100644 --- a/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs +++ b/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs @@ -308,6 +308,18 @@ namespace Assets.MyGame.Scripts.Net }, callback); } + /// + /// 获å�–房间专属 socket 地å�€ï¼ˆGET /api/Room/Assign?roomId=xxx) + /// 返回:string(如 ws://8.137.163.153/fishinghub?instance=1) + /// + public static void RoomAssign(string roomId, Action callback) + { + APIManager.Response(APIType.Room_Assign, new RoomAssignParam + { + roomId = roomId + }, callback); + } + #endregion } } diff --git a/Assets/MyGame/Scripts/Net/APIType.cs b/Assets/MyGame/Scripts/Net/APIType.cs index 8a61f6e8a..7ddaa152c 100644 --- a/Assets/MyGame/Scripts/Net/APIType.cs +++ b/Assets/MyGame/Scripts/Net/APIType.cs @@ -339,6 +339,9 @@ namespace Assets.MyGame.Scripts.Net /// å�‘é€�å…¨æœ�广播(GET) Hall_SendBroadcast, + /// 获å�–房间专属 socket 地å�€ï¼ˆGET /api/Room/Assign?roomId=) + Room_Assign, + // ---------------- Customer ---------------- /// å�‘起会è¯�(POST) diff --git a/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs b/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs index 3979c81ce..6095c7ed7 100644 --- a/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs +++ b/Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; @@ -38,5 +38,26 @@ namespace Assets.MyGame.Scripts.Net.WebResponses public int fishScore; public object param; + /// + /// 掉è�½é�“具(击æ�€ Boss 鱼时å�¯èƒ½æŽ‰è�½ï¼Œä¸Ž gold 一样仅å� ä½�,掉è�½é�“具弹窗逻辑暂未实现) + /// + public RoomKillNoticeDrop drop; + + } + + /// + /// 击æ�€æŽ‰è�½é�“å…·ä¿¡æ�¯ + /// + [Serializable] + public class RoomKillNoticeDrop + { + /// 掉è�½é�“å…·ç¼–å�· + public string propNumber; + + /// 掉è�½é�“å…·å��ç§° + public string propName; + + /// 掉è�½æ•°é‡� + public int count; } } diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager.cs b/Assets/MyGame/Scripts/Net/WebSocketManager.cs index 757f4c63a..e06291263 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager.cs @@ -49,6 +49,14 @@ namespace Assets.MyGame.Scripts.Net /// 创建或返回已存在的 WebSocket /// public WebSocket Connect(SocketType type,Action action=null) + { + return Connect(type, null, action); + } + + /// + /// 创建或返回已存在的 WebSocket(å�¯æŒ‡å®šåЍæ€� URL,用于 /api/Room/Assign 返回的房间专属地å�€ï¼‰ + /// + public WebSocket Connect(SocketType type, string url, Action action = null) { // 已存在则直接返回 if (sockets.TryGetValue(type, out var exist)) @@ -83,7 +91,9 @@ namespace Assets.MyGame.Scripts.Net } } - string url = baseUrl + socketPaths[type]; + // 未指定 url 时用默认 baseUrl + socketPaths + if (string.IsNullOrEmpty(url)) + url = baseUrl + socketPaths[type]; var ws = new WebSocket(new Uri(url)); sockets[type] = ws; // 事件绑定 diff --git a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs index 6cc5201b1..5f5786f19 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs @@ -347,7 +347,7 @@ namespace Assets.MyGame.Scripts.Net } /// - /// LoginHub 消æ�¯å¤„ç�†ï¼ˆBroadcast / AssetUpdated / BackpackUpdated / NewEmail) + /// LoginHub 消æ�¯å¤„ç�†ï¼ˆBroadcast / AssetUpdated / BackpackUpdated / NewEmail / KillAnnouncement) /// private static void LoginMSG(string msg, WebSocketResponseBase v) { @@ -368,6 +368,9 @@ namespace Assets.MyGame.Scripts.Net case "NewEmail": WebSocketReponseList.NewEmail(msg); break; + case "KillAnnouncement": + WebSocketReponseList.KillAnnouncement(msg); + break; default: break; } diff --git a/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs b/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs index 021d41d85..7933dbeb2 100644 --- a/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs +++ b/Assets/MyGame/Scripts/Net/WebSocketReponseList.cs @@ -1,4 +1,4 @@ -using Assets.MyGame.Scripts.Net.WebResponses; +using Assets.MyGame.Scripts.Net.WebResponses; using Newtonsoft.Json; using System; using System.Collections.Generic; @@ -389,6 +389,17 @@ namespace Assets.MyGame.Scripts.Net UIManager.Instance.ShowBoardError($"收到新邮件:{data.title}"); } + /// + /// LoginHub KillAnnouncement — 全局击æ�€å…¬å‘Šï¼ˆç‰¹æ®Š Boss 击æ�€å…¨æœ�推é€�) + /// + public static void KillAnnouncement(string msg) + { + var data = JsonConvert.DeserializeObject>(msg).arguments[0]; + // æœ�务端已拼好 text(格å¼�:æ�­å–œçީ家*****在风雷之渊 高级场æ�•获 人鱼公主*2000å€� 150000000大奖) + if (data != null && !string.IsNullOrEmpty(data.text)) + UIManager.Instance.ShowBoardGongGao(data.text); + } + // ---------------- Customer ---------------- /// @@ -445,6 +456,30 @@ namespace Assets.MyGame.Scripts.Net public long time; } + /// + /// LoginHub KillAnnouncement æ•°æ�®ï¼ˆå…¨å±€å‡»æ�€å…¬å‘Šï¼‰ + /// + [Serializable] + public class KillAnnouncementData + { + /// 公告文本(æœ�务端已拼接:æ�­å–œçީ家*****在风雷之渊 高级场æ�•获 人鱼公主*2000å€� 150000000大奖) + public string text; + /// 玩家å��(已脱æ•�,全部替æ�¢ä¸º*) + public string userName; + /// 游æˆ�类型å��(如:风雷之渊) + public string gameTypeName; + /// 房间å��(如:高级场) + public string roomName; + /// é±¼å��称(如:人鱼公主) + public string fishName; + /// ç‚®å�°å€�æ•° + public int multiple; + /// 获得金å¸� + public long gold; + /// 时间戳(Unix秒) + public long time; + } + /// /// LoginHub AssetUpdated æ•°æ�® ///