This commit is contained in:
2026-07-18 18:16:35 +08:00
parent e2286b1af4
commit c82f884c54
61 changed files with 7332 additions and 186312 deletions
@@ -82,7 +82,13 @@ namespace Assets.MyGame.Scripts.Net
userid=userID
}, callback);
}
public static void GetUser(Action<UserData> callback)
{
APIManager.Response<UserData>(APIType.User_GetUser, new GetUserParam
{
userid = GameManager.Instance.user.id
}, callback);
}
/// <summary>
/// 更新头像(GET)
/// 参数:avatarUrl(头像地址或ID)
@@ -307,7 +307,7 @@ namespace Assets.MyGame.Scripts.Net
if (panel == null || panel.currSitData == null) break;
if (panel.currSitData.user == userid)
{
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, UIPanel.MainGamePanelFLZY);
ExitFishingGame(UIPanel.MainGamePanelFLZY);
break;
}
foreach (var item in panel.list_Sits)
@@ -326,7 +326,7 @@ namespace Assets.MyGame.Scripts.Net
if (panel == null || panel.currSitData == null) break;
if (panel.currSitData.user == userid)
{
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, UIPanel.MainGamePanelYYSC);
ExitFishingGame(UIPanel.MainGamePanelYYSC);
break;
}
foreach (var item in panel.list_Sits)
@@ -347,7 +347,7 @@ namespace Assets.MyGame.Scripts.Net
if (panel == null || panel.currSitData == null) break;
if (panel.currSitData.user == userid)
{
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, UIPanel.MainGamePanelXJMH);
ExitFishingGame(UIPanel.MainGamePanelXJMH);
break;
}
foreach (var item in panel.list_Sits)
@@ -367,7 +367,7 @@ namespace Assets.MyGame.Scripts.Net
if (panel == null || panel.currSitData == null) break;
if (panel.currSitData.user == userid)
{
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, UIPanel.MainGamePanelHHWK);
ExitFishingGame(UIPanel.MainGamePanelHHWK);
break;
}
foreach (var item in panel.list_Sits)
@@ -386,6 +386,27 @@ namespace Assets.MyGame.Scripts.Net
}
/// <summary>
/// 统一退出捕鱼游戏流程:
/// 1. 关闭 game socket(自己的离房通知已收到,可以正常关闭)
/// 2. 拉取最新用户数据并触发 OnUserDataChanged 事件,同步大厅金币/钻石/等级等 UI
/// 3. 切回大厅
/// </summary>
private static void ExitFishingGame(UIPanel gamePanel)
{
// 标记游戏已结束
WebSocketManager.Instance.isGame = false;
// 关闭游戏连接
WebSocketManager.Instance.Close(SocketType.game);
// 拉取最新用户数据,触发 UI 同步更新(金币/钻石/等级/VIP等)
APIRequestList.GetUser((user) =>
{
GameManager.Instance.UpdataUserData(user);
});
// 切回大厅
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, gamePanel);
}
// ---------------- LoginHub ----------------
/// <summary>
@@ -6077,7 +6077,7 @@ PrefabInstance:
- target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -6087,7 +6087,7 @@ PrefabInstance:
- target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -6189,6 +6189,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8405686698745501670, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 630496439fe6bf243ba97bef46ec8c24,
type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 998111e312f018648b7c9f2e0c1ed8fa
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,297 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5836807997895594395
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 308975215000396503, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_SizeDelta.x
value: 321
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_SizeDelta.y
value: 380
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.000011444092
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 489874330562916937, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 997109247618254783, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1074600454626855566, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1085068257688748841, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1287107613773418892, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2213062569931327087, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2266729856965816927, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2318363401772017058, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2666076306678552393, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2715109203797586250, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2911326648329937379, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3148078874585420935, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3992753865219481776, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalScale.x
value: 0.13
objectReference: {fileID: 0}
- target: {fileID: 3992753865219481776, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalScale.y
value: 0.13
objectReference: {fileID: 0}
- target: {fileID: 4162288028278543133, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4457782651156071502, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4463538357481777367, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Name
value: SelectRoomLV2_FXZY_2
objectReference: {fileID: 0}
- target: {fileID: 4463538357481777367, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4871782660227725949, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4922688436949110520, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5485916797110815497, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5978626097470269857, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6027279120447877059, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6274427157448331023, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6687331765579752277, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6759418241991291010, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6920457670517896964, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: skeletonDataAsset
value:
objectReference: {fileID: 11400000, guid: 9a243b67feb52ae40b1d72160344336d,
type: 2}
- target: {fileID: 7659495112591322929, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: ef1be4c49a0b0dd48bc80b9ba2e5c624,
type: 3}
- target: {fileID: 7672128128543509596, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7839841338615355089, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8259596929001994032, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8874662027628222115, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8982224216143227916, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9117895036240634083, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9129976123292910278, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 998111e312f018648b7c9f2e0c1ed8fa, type: 3}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 549505ae8fc5b9b46abe07999836645d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,131 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7225264315531746901
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_SizeDelta.x
value: 246
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_SizeDelta.y
value: 396
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000030517578
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 422439208563219852, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4463538357481777367, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Name
value: SelectRoomLV3_FXZY_3
objectReference: {fileID: 0}
- target: {fileID: 4463538357481777367, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7659495112591322929, guid: 998111e312f018648b7c9f2e0c1ed8fa,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 0a3b751484f54534b8dfe5bbb805ccf1,
type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 998111e312f018648b7c9f2e0c1ed8fa, type: 3}
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fa8b75719d4e08c40a788ca49fe54755
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -3683,7 +3683,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 123456489789789548564864654654658546516598659865298569856
m_text: "\u554A\u5927\u5927\u5341\u5206\u58EB\u5927\u592B\u8C46\u8150\u5E72\u5927\u5E08\u5085\u83B7\u5F97\u4E30\u539A\u58EB\u5927\u592B"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
@@ -3693,8 +3693,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -3711,8 +3711,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 27
m_fontSizeBase: 27
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18