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-08-26 15:30:51 +08:00
parent d68c14f4fa
commit 15eec86b71
24 changed files with 10756 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Fish_FLZY.asset
+7
View File
@@ -785,6 +785,13 @@ MonoBehaviour:
- Audio
- FLZY
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: ffff53a53d592684eb4bfe5ac0d70b48
m_Address: Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab
m_ReadOnly: 0
m_SerializedLabels:
- FLZY
- FishPrefab
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 3d7ea06370502a34e82011fabf822b45, type: 2}
m_SchemaSet:
Assets/Art/FengLei/Boss/4052/4052_Timeline.playable
+143
View File
@@ -252,6 +252,38 @@ MonoBehaviour:
m_DisplayName: eff_long_hj
m_Markers:
m_Objects: []
--- !u!114 &-9129218161124786863
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 5.75
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &-8943757044825471528
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 40.65
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &-8699113579195344296
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -2896,6 +2928,7 @@ MonoBehaviour:
- {fileID: 1396888575031122819}
- {fileID: 8609794542007802337}
- {fileID: 3931431303891078130}
- {fileID: 8144100009597798695}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@@ -3102,6 +3135,22 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &1276669418525772775
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 11.916666666666666
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &1306881525152843492
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -3437,6 +3486,22 @@ MonoBehaviour:
m_DisplayName: eff_qiu_houjiao_01
m_Markers:
m_Objects: []
--- !u!114 &2424360269537248990
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 26.416666666666668
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &2668862267532072309
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -4675,6 +4740,22 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &3044593757138083861
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 46.983333333333306
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 27ead056a3555a449b1c33be851ca0c5, type: 2}
--- !u!114 &3166192615547760130
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -5733,6 +5814,22 @@ MonoBehaviour:
searchHierarchy: 0
active: 1
postPlayback: 2
--- !u!114 &5878178368460268243
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 34.5
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &6133376057660959367
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -5866,6 +5963,36 @@ MonoBehaviour:
searchHierarchy: 0
active: 1
postPlayback: 2
--- !u!114 &8144100009597798695
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b46e36075dd1c124a8422c228e75e1fb, type: 3}
m_Name: Signal Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects:
- {fileID: -9129218161124786863}
- {fileID: 1276669418525772775}
- {fileID: 8561377144014812563}
- {fileID: 2424360269537248990}
- {fileID: 5878178368460268243}
- {fileID: -8943757044825471528}
- {fileID: 3044593757138083861}
--- !u!114 &8161278724170884664
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -6447,6 +6574,22 @@ MonoBehaviour:
volume: 1
stereoPan: 0
spatialBlend: 0
--- !u!114 &8561377144014812563
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
m_Name: Signal Emitter
m_EditorClassIdentifier:
m_Time: 20.116666666666667
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &8561702726762975943
MonoBehaviour:
m_ObjectHideFlags: 1
Assets/Art/FengLei/Boss/4052/4052_Timeline.prefab
-13
View File
@@ -67693,7 +67693,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5409550208954430057}
- component: {fileID: 7680976914787735766}
m_Layer: 21
m_Name: bgm
m_TagString: Untagged
@@ -67716,18 +67715,6 @@ Transform:
m_Children: []
m_Father: {fileID: 8438414185937953582}
m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0}
--- !u!114 &7680976914787735766
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2529270759054519136}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0b8a17f050da31a30be99363c5f527f7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2545691563438172162
GameObject:
m_ObjectHideFlags: 0
Assets/Framework/Tool/UITool/SubUIManager.cs
+1 -1
View File
@@ -15,7 +15,7 @@ using UnityEngine.UI;
public class SubUIManager
{
public UIBase parentUIBase;
private readonly Transform parent;
public readonly Transform parent;
private readonly Dictionary<UIPanel, SubUIBase> panels = new Dictionary<UIPanel, SubUIBase>();
private readonly Dictionary<UIPanel, string> addressMap = new Dictionary<UIPanel, string>();
public GameObject boardCast_Boss;
Assets/MyGame/Scripts/fishResources/Resources/tbfishresources.json
+1 -1
View File
@@ -423,7 +423,7 @@
},
{
"fishNumber": 11040,
"prefabFishResourcesPath": "",
"prefabFishResourcesPath": "4052",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
Assets/MyGame/aa/Game/FLZY/BOSS/BJEventBase.cs
+13 -2
View File
@@ -165,16 +165,27 @@ public class BJEventBase : MonoBehaviour
die();
}
/// <summary>创建爆奖结算面板（统一入口：所有子类不要各自 Instantiate bjEndUI）</summary>
/// <summary>创建爆奖结算面板（统一入口：所有子类不要各自 Instantiate bjEndUI）。</summary>
protected void ShowBJEndUI()
{
if (bjEndUI == null) return;
var uiPos = GetBJEndUIPosition();
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
}
/// <summary>
/// bjEndUI 的父对象：直接挂击杀者玩家所在座位（SitPosData，UI 游戏座位层），
/// 随座位/UI 卸载自动清理；找不到击杀者座位时回退 bjEffectRoot。
/// </summary>
protected Transform GetBJEndUIParent()
{
if (_targetSit != null && _targetSit.transform != null)
return _targetSit.transform;
return CreateFishManager.Instance.bjEffectRoot;
}
/// <summary>BJEndUI 的生成位置：默认座位上方（2/3 号座位翻转到下方）。子类可 override。</summary>
protected virtual Vector3 GetBJEndUIPosition()
{
Assets/MyGame/aa/Game/FLZY/BOSS/LeiTingZhiZhu.meta → Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ.meta
View File
Assets/MyGame/aa/Game/FLZY/BOSS/LeiTingZhiZhu/4052 Variant.prefab → Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab
+812 -520
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/Game/FLZY/BOSS/LeiTingZhiZhu/4052 Variant.prefab.meta → Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052.prefab.meta
View File
Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052_Timeline Variant.prefab
+9580
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/4052_Timeline Variant.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 13d75eee32ce4764c9ea2ffcd4119c6d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/UI_baojiang Variant 11.prefab
+161
View File
@@ -0,0 +1,161 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2555049829235497414
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 236781439713602893, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_Name
value: UI_baojiang Variant 11
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -449
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -158
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 685976588209175045, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2278261232015200288, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -914534354, guid: 68e4fec764425b4438eb6a06c7b99c16,
type: 3}
- target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_SizeDelta.x
value: 558
objectReference: {fileID: 0}
- target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_SizeDelta.y
value: 346
objectReference: {fileID: 0}
- target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalScale.x
value: 2.3012447
objectReference: {fileID: 0}
- target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalScale.y
value: 2.3012447
objectReference: {fileID: 0}
- target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_LocalScale.z
value: 2.3012447
objectReference: {fileID: 0}
- target: {fileID: 4213903445032130685, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 109
objectReference: {fileID: 0}
- target: {fileID: 5627438144398829183, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 46.9
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a96966a1d55149a4f83724f224013303, type: 3}
Assets/MyGame/aa/Game/FLZY/BOSS/LTZZ/UI_baojiang Variant 11.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 81ab0620ca35bbe46b75f60ed8522efe
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/Game/FLZY/BOSS/QL/Game173_Effect_LDJT.prefab
+2 -2
View File
@@ -132362,7 +132362,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e4f5dd9a6b3cca14b960a02a2a8ab3a4, type: 3}
m_Name:
m_EditorClassIdentifier:
bjEndUI: {fileID: 1790254316978060978, guid: 24c31eadc42c2a84782806970ca46b14, type: 3}
bjEndUI: {fileID: 4300126860111980404, guid: 76fbf7ef2bf607648b6fa328e86774da, type: 3}
bjEndUIOffsetY: 150
posID: 0
paoBei: 0
@@ -132372,7 +132372,7 @@ MonoBehaviour:
startOffset: {x: 0, y: 0, z: -100}
isSelf: 0
isScoreEnd: 0
useScorePanel: 1
useScorePanel: 0
tMP_Score: {fileID: 6528776512666913368}
scorePanelPrefab: {fileID: 2322849427427554443, guid: 76fbf7ef2bf607648b6fa328e86774da,
type: 3}
Assets/MyGame/aa/Game/FLZY/BOSS/QL/LeiLongEvent.cs
+4 -3
View File
@@ -52,6 +52,7 @@ public class LeiLongEvent : BJRedPacketEvent
public TextMeshProUGUI tmp_CoinNum;
public TMP_SpriteAsset tmp_goldSprite;
public TMP_SpriteAsset tmp_SilverSprite;
public override void Init(long goldCount,int posID,long paobei,long fishScore,int beishu,Action<int> action,Action action1=null)
{
JiaFen =()=>{
@@ -65,7 +66,7 @@ public class LeiLongEvent : BJRedPacketEvent
this.fishScore = (int)fishScore;
bJbeishu = beishu;
action1?.Invoke();
isSelf = _targetSit != null && _targetSit.user == GameManager.Instance.user.id;
// ⭐ 只设置参数、标记就绪，不立即触发爆奖。
// 真正的激活由 BossControl 延迟 SetActive(true) → OnEnable 触发。
// ⭐ Init 手动赋值不走 base.Init/ResetState，这里手动重置滚动状态：
@@ -91,7 +92,7 @@ public class LeiLongEvent : BJRedPacketEvent
/// </summary>
private void OnEnable()
{
if (_ready) GoldEffect();
//if (_ready) GoldEffect();
}
public override void GoldEffect()
{
@@ -156,7 +157,7 @@ public class LeiLongEvent : BJRedPacketEvent
yield return new WaitForSeconds(1f);
transform.DOScale(Vector3.zero, 0.5f).OnComplete(() =>
{
Destroy(gameObject);
});
}
Assets/MyGame/aa/Game/FLZY/BOSS/QL/UI_baojiang Variant 7.prefab
+5
View File
@@ -149,6 +149,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 141
objectReference: {fileID: 0}
- target: {fileID: 5627438144398829183, guid: a96966a1d55149a4f83724f224013303,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 49.7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab
+6
View File
@@ -7509,6 +7509,8 @@ MonoBehaviour:
end: {x: 0, y: 0}
moveTime: 0
moveSpeed: 0
cachedCamera: {fileID: 0}
cachedUirootRect: {fileID: 0}
skeleton: {fileID: 0}
isSpine: 1
fishTypeID: 11030
@@ -7539,6 +7541,7 @@ MonoBehaviour:
- {fileID: 95139269106097999}
lockPoint: {fileID: 95425877480302237}
bingDongEffect: {fileID: 0}
needLockEvent: 0
createVideoClip: {fileID: 0}
rotationPY: 60
baseMmove: 0
@@ -7546,6 +7549,8 @@ MonoBehaviour:
isNot1: 0
ischild0: 0
depthOffset: 0
is2DFish: 0
sortOrder2D: 0
bossName:
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
@@ -7560,3 +7565,4 @@ MonoBehaviour:
isLocalCoin: 0
killerSitPos: -1
animator: {fileID: 4384588345448661}
delayActivateSeconds: 4
Assets/MyGame/aa/Game/XJMH/Boss/BaoLieJinSha/BaoLieJinShaEvent.cs
+1 -1
View File
@@ -170,7 +170,7 @@ public class BaoLieJinShaEvent : BJRedPacketEvent
if (posID == 2 || posID == 3) y *= -1f;
Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
long displayScore = _totalCoin > 0 ? _totalCoin : maxScore;
endUI.Init(bJbeishu, displayScore, isSelf);
}
Assets/MyGame/aa/Game/XJMH/Boss/ChaoNengMoHe/ChaoNengMoHeEvent.cs
+1 -1
View File
@@ -109,7 +109,7 @@ public class ChaoNengMoHeEvent : BJRedPacketEvent
if (posID == 2 || posID == 3) y *= -1f;
Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
}
Assets/MyGame/aa/Game/XJMH/Boss/HeiDongFeiChuan/HeiDongFeiChuanEvent.cs
+1 -1
View File
@@ -151,7 +151,7 @@ public class HeiDongFeiChuanEvent : BJRedPacketEvent
if (posID == 2 || posID == 3) y *= -1f;
Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
}
Assets/MyGame/aa/Game/XJMH/Boss/JiXieXie/JiXieXieEvent.cs
+1 -2
View File
@@ -531,8 +531,7 @@ public class JiXieXieEvent : BJRedPacketEvent
Vector3 uiPos = GetSeatPosition() + Vector3.up * bjEndUIOffsetY;
if (bjEndUI != null)
{
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity,
CreateFishManager.Instance != null ? CreateFishManager.Instance.bjEffectRoot : null);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
// 音效：分数数字放大→还原（lua RollScoreAim 用 FreeCardEarnEnlarge / FreeCardEarnReduce）
Assets/MyGame/aa/Game/XJMH/Boss/LieYanFengBao/LieYanFengBaoEvent.cs
+1 -1
View File
@@ -59,7 +59,7 @@ public class LieYanFengBaoEvent : BJRedPacketEvent
float y = bjEndUIOffsetY;
if (posID == 2 || posID == 3) y *= -1f;
Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
}
Assets/MyGame/aa/Game/XJMH/Boss/PoHuaiQiu/PoHuaiQiuEvent.cs
+1 -1
View File
@@ -66,7 +66,7 @@ public class PoHuaiQiuEvent : BJRedPacketEvent
if (posID == 2 || posID == 3) y *= -1f;
Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
}
Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/XingYunLunEvent.cs
+1 -1
View File
@@ -537,7 +537,7 @@ public class XingYunLunEvent : BJRedPacketEvent
if (posID == 2 || posID == 3) y *= -1f;
Vector3 uiPos = GetSeatPosition() + Vector3.up * y;
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, CreateFishManager.Instance.bjEffectRoot);
var endUI = Instantiate(bjEndUI, uiPos, Quaternion.identity, GetBJEndUIParent());
endUI.Init(bJbeishu, maxScore, isSelf);
}