wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-10-12 00:37:28 +08:00
parent 20cdf28cfa
commit 32f7a1db7b
25 changed files with 6966 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/aa/UI/DefaultPanel/GongXiHuoDe/HuoDe.cs
+1
View File
@@ -36,6 +36,7 @@ public class HuoDe : MonoBehaviour
{
if (skeletonGraphic == null)
skeletonGraphic = GetComponent<SkeletonGraphic>();
UIClickSound.AttachToAll(gameObject); // ⭐ 弹窗是独立预制体（非 UIBase 面板），这里手动补按钮点击音效
if (btn_Close != null)
btn_Close.onClick.AddListener(Close);
}
Assets/MyGame/aa/UI/DefaultPanel/JiaZaiZhong.prefab
+175
View File
@@ -0,0 +1,175 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2498735191370420737
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8936735123803640290}
- component: {fileID: 4802091541961723999}
- component: {fileID: 5229908422829759345}
- component: {fileID: 4032031768493949582}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8936735123803640290
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2498735191370420737}
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: 439111589277315844}
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!222 &4802091541961723999
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2498735191370420737}
m_CullTransparentMesh: 1
--- !u!114 &5229908422829759345
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2498735191370420737}
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: 0}
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!95 &4032031768493949582
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2498735191370420737}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a5d7833a4b87655418d3ab65ec5bf9ea, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &4264627302849353753
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 439111589277315844}
- component: {fileID: 4304591977372035238}
- component: {fileID: 347520471200239115}
m_Layer: 5
m_Name: JiaZaiZhong
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &439111589277315844
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4264627302849353753}
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: 8936735123803640290}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4304591977372035238
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4264627302849353753}
m_CullTransparentMesh: 1
--- !u!114 &347520471200239115
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4264627302849353753}
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: 0, g: 0, b: 0, a: 0.4627451}
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: 0}
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
Assets/MyGame/aa/UI/DefaultPanel/JiaZaiZhong.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 021ede141bc7c4e47bcf4fabed7681d6
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/UI/DefaultPanel/TiShi/TiShi.cs
+1
View File
@@ -21,6 +21,7 @@ public class TiShi : MonoBehaviour
private void Awake()
{
_standardSize = transform.GetChild(0).localScale;
UIClickSound.AttachToAll(gameObject); // ⭐ 弹窗是独立预制体（非 UIBase 面板），这里手动补按钮点击音效
if (btn_Close != null)
btn_Close.onClick.AddListener(Close);
if (btn_QueRen != null)
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+35
View File
@@ -476,6 +476,37 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
}
/// <summary>
/// XJMH 进房首帧预热（加载 90%→100% 收尾窗口调用，进度条还显示着玩家看不到）：
/// 把本地座位（座位自带炮台随 Awake 一起初始化）与"入场要用的那架完整飞机"提前点亮——
/// 这些 XJMH 独有资产首次初始化（骨架/粒子/贴图首上传）很重，全堆在 100% 那一帧玩家会看到明显卡顿。
/// 入场动画有加载完成门卫（IsGameLoadCompleted），预热不会导致动画提前播放。
/// </summary>
private void PrewarmXJMHForLocalSeat()
{
if (!_pendingFirstShowInit || _pendingRoomJoinNotice == null) return;
if (list_Sits == null || list_Sits.Count == 0) return;
var sit = list_Sits.Find(s => s != null && s.posID == SeatMirror.ToDisplay(_pendingRoomJoinNotice.Position));
if (sit == null || sit.turretControlMode != TurretControlMode.XJMH) return;
StartCoroutine(PrewarmXJMHCoroutine(sit));
}
private IEnumerator PrewarmXJMHCoroutine(SitPosData sit)
{
// ① 提前激活本地座位：Awake → InitXJMHTurret → 激活默认炮台（PW_Battery_x 首次初始化在这里完成，
// 被加载界面遮住）。100% 时 JoinGame 再 SetActive(true) 是幂等的，不影响正常入座流程
if (sit != null && !sit.gameObject.activeSelf)
sit.gameObject.SetActive(true);
yield return null; // 让座位/炮台这帧的重活落在加载画面里
// ② 飞机隐藏预热（座位激活后 currentTurret 已就绪 = 入场会用的那把）
var turret = sit != null ? sit.currentTurret as FlyTurretData : null;
if (turret != null)
turret.PrewarmEnterPlane();
}
private void RefreshGGKCount()
{
var user = GameManager.Instance.user;
@@ -1408,6 +1439,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// ⭐ 90% 确认点：走到这里所有资源加载都已完成（上面全是 await 顺序执行）
SetLoadProgress(0.9f);
// ⭐ XJMH 预热：借 90→100 的收尾窗口（进度条还在走）提前把本地座位/炮台 + 入场飞机点亮。
// 这些 XJMH 独有资产首次初始化（骨架/粒子/贴图）很重，堆到 100% 那帧玩家会看到卡一下
PrewarmXJMHForLocalSeat();
// ⭐ 90→100 平滑收尾：约 1 秒走完，进度条持续在动（替代原 2 秒死等；
// 保留这段缓冲是等出鱼首帧/场景渲染稳定，比原来快 1 秒+）
for (int i = 1; i <= 20; i++)