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-09-14 17:55:17 +08:00
parent 79237f5df2
commit 4a40310520
39 changed files with 948 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/Scenes/UIScene.unity
+1 -1
View File
@@ -7416,7 +7416,7 @@ MonoBehaviour:
spawnList: []
isCreateFish: 0
isFrozen: 0
debugSpawnFishNumber: 11037
debugSpawnFishNumber: 11024
isleft: 1
fishList_All: []
fishList_Small: []
Assets/MyGame/aa/Game/FLZY/BOSS/FLXJ/5010.prefab
+6 -2
View File
@@ -991,7 +991,7 @@ MonoBehaviour:
baseMmove: 0
isRotate: 0
isNot1: 0
ischild0: 1
ischild0: 0
depthOffset: 50
is2DFish: 0
sortOrder2D: 0
@@ -3060,7 +3060,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4380208956805359, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3}
propertyPath: m_LocalScale.x
value: -1
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4380208956805359, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3}
propertyPath: m_LocalScale.y
@@ -3954,6 +3954,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0.000001307255
objectReference: {fileID: 0}
- target: {fileID: 4821050624063303, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3}
propertyPath: m_LocalScale.x
value: -1.3
objectReference: {fileID: 0}
- target: {fileID: 4821050624063303, guid: 9b5f1a7c326d71146b03297869d16dac, type: 3}
propertyPath: m_LocalScale.z
value: -1.3
Assets/MyGame/aa/Game/FLZY/BOSS/TSK/TSKDieEvent.cs
+4
View File
@@ -14,6 +14,10 @@ public class TSKDieEvent : BJRedPacketEvent
public override void Init(long goldCount, int posID, long paobei, long fishScore, int beishu, Action<int> action, Action action1 = null)
{
base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1);
// 基类 Init 里 ApplySeatOffset 会用 startOffset(z=-100) 覆盖位置，这里再改回 700
Vector3 pos = transform.position;
pos.z = 3500;
transform.position = pos;
StartCoroutine(yan());
}
public IEnumerator yan()
Assets/MyGame/aa/Game/HHWK/MonsterTSY/DieEffect_TSY.cs
+13 -4
View File
@@ -132,10 +132,19 @@ public class DieEffect_TSY : BJRedPacketEvent
return;
}
// 父对象：优先 Inspector 指定 → 否则统一爆奖父节点 bjEffectRoot
Transform parent = parentTransform != null
? parentTransform
: CreateFishManager.Instance.bjEffectRoot;
// 父对象：优先 Inspector 指定 → 默认挂游戏主 UI 面板（currGameType.subPanelParent.parent，
// 与 CreateFishManager 生成 UI 爆奖特效的父节点一致）
// ⭐ baoJiangEffectPrefab 是 UI 层特效：之前默认挂 bjEffectRoot（uiRoot 层），
// 不在游戏 UI 面板里，渲染层级/位置不对；面板取不到时才回退 bjEffectRoot
Transform parent = parentTransform;
if (parent == null)
{
var mgr = CreateFishManager.Instance;
var gamePanel = mgr != null ? mgr.currGameType : null;
parent = gamePanel != null && gamePanel.subPanelParent != null
? gamePanel.subPanelParent.parent
: (mgr != null ? mgr.bjEffectRoot : null);
}
// 基准位置：击杀者座位坐标（按 posID 查找，人机转发时也显示在人机座位）
// Y 偏移与 Boss 一致：posID 0/1 上方 +bjEndUIOffsetY，posID 2/3 下方 -bjEndUIOffsetY
Assets/MyGame/aa/UI/Game/右上.prefab
+5
View File
@@ -528,6 +528,11 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5052182321843905449, guid: 509192cd5f627cf409a54e9be694a24d,
type: 3}
propertyPath: m_LocalScale.y
value: -1.25
objectReference: {fileID: 0}
- target: {fileID: 5060816028395868385, guid: 509192cd5f627cf409a54e9be694a24d,
type: 3}
propertyPath: m_SortingLayer
Assets/MyGame/aa/UI/Game/左上.prefab
+6 -1
View File
@@ -466,7 +466,7 @@ PrefabInstance:
- target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 114.9
value: 44.4
objectReference: {fileID: 0}
- target: {fileID: 4710570228793354968, guid: c9c177e60fd350e49844955f7e8a5874,
type: 3}
@@ -853,6 +853,11 @@ PrefabInstance:
propertyPath: m_SortingLayer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7835193491978159751, guid: c9c177e60fd350e49844955f7e8a5874,
type: 3}
propertyPath: m_LocalScale.y
value: -1.25
objectReference: {fileID: 0}
- target: {fileID: 8015305268238102307, guid: c9c177e60fd350e49844955f7e8a5874,
type: 3}
propertyPath: m_SortingLayer
Assets/MyGame/aa/UI/Game/左下.prefab
+234 -6
View File
@@ -666,6 +666,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 570503617379538941}
m_CullTransparentMesh: 1
--- !u!1 &866009965387904772
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3796582310799277073}
- component: {fileID: 3634096452784061158}
- component: {fileID: 463101364850485396}
m_Layer: 0
m_Name: "\u8FDB\u5EA6\u6761\u5730"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3796582310799277073
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866009965387904772}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6599412530834680981}
m_Father: {fileID: 4710570228793354968}
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: -8.6249695, y: -3.3250427}
m_SizeDelta: {x: 59, y: 11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3634096452784061158
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866009965387904772}
m_CullTransparentMesh: 1
--- !u!114 &463101364850485396
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 866009965387904772}
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: f78df629bc3cea249bfe765bb80141e2, 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!1 &916762197708610206
GameObject:
m_ObjectHideFlags: 0
@@ -2072,6 +2148,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2267845634196581589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6599412530834680981}
- component: {fileID: 2092874098819867927}
- component: {fileID: 8553250344073291929}
m_Layer: 0
m_Name: "\u6761"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6599412530834680981
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2267845634196581589}
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: 3796582310799277073}
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: -15.5, y: -0.5}
m_SizeDelta: {x: 28, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2092874098819867927
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2267845634196581589}
m_CullTransparentMesh: 1
--- !u!114 &8553250344073291929
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2267845634196581589}
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: e33c9398d0163144c9567a72b1f3fdba, 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!1 &2423142081813339218
GameObject:
m_ObjectHideFlags: 0
@@ -2720,12 +2871,14 @@ RectTransform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 973905160343307270}
- {fileID: 7835193491978159751}
- {fileID: 3796582310799277073}
m_Father: {fileID: 7609364501153394415}
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: 118.00003, y: 77.49994}
m_SizeDelta: {x: 112, y: 37}
m_AnchoredPosition: {x: 43.5, y: 77.49994}
m_SizeDelta: {x: 261, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7598986287992324467
CanvasRenderer:
@@ -2756,7 +2909,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f761ed9049d0f1c4eac2b394b5ef587e, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -3252,9 +3405,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 4710570228793354968}
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: 3.5, y: -0.6}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -52.5, y: -2.7000427}
m_SizeDelta: {x: 87, y: 13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2271467992873135901
@@ -5582,6 +5735,81 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!1 &8715748350172511410
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7835193491978159751}
- component: {fileID: 4580168597633069950}
- component: {fileID: 3204247540150277790}
m_Layer: 0
m_Name: LV:21
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7835193491978159751
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715748350172511410}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4710570228793354968}
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: -73, y: -2.7}
m_SizeDelta: {x: 38, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4580168597633069950
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715748350172511410}
m_CullTransparentMesh: 1
--- !u!114 &3204247540150277790
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715748350172511410}
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: dfad6d04aec8344468ffd7b3c3fffcc8, 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!1 &8722353448971975848
GameObject:
m_ObjectHideFlags: 0