diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/FLZY_ZDX_BOSS.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/FLZY_ZDX_BOSS.cs deleted file mode 100644 index 24affb06a..000000000 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/FLZY_ZDX_BOSS.cs +++ /dev/null @@ -1,53 +0,0 @@ -using Assets.MyGame.Scripts.Net.WebResponses; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class FLZY_ZDX_BOSS : MonsterControl_BossBase -{ - public override void OnMoveUpdata() - { - - base.OnMoveUpdata(); - if (moveTime >= monsterData.moveLine.moveTime) - { - CreateFishManager.Instance.Id_DieFish_NotFX(guid); - } - } - public override void DieFish(RoomKillNotice obj = null) - { - base.DieFish(obj); - CreateFishManager.Instance.Id_DieFish_NotFX(guid); - action_effect_DieAward = (o) => - { - if (obj == null) return; - - foreach (var item in CreateFishManager.Instance.currGameType.list_Sits) - { - if (item.user == obj.userId) - { - - - - var v = o.GetComponent(); - v.Init( - obj.gold, // goldCount - item.posID, // posID - obj.skillsGold, // paobei - obj.fishScore, // fishScore - obj.beishu, // beishu - JiaFen // action - ); - - } - } - }; - } - public override void OnDisable() - { - - //GetComponent().enabled = false; - if (currEffect_DieAward != null) - currEffect_DieAward.SetActive(true); - } -} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/ZDXDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/ZDXDieEvent.cs deleted file mode 100644 index eeeb57400..000000000 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/ZDXDieEvent.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ZDXDieEvent : BJRedPacketEvent -{ - private void Awake() - { - scoreCount = 8; - } - public override void Init(long goldCount, int posID, long paobei, long fishScore, int beishu, Action action, Action action1 = null) - { - base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1); - StartCoroutine(yan()); - } - public IEnumerator yan() - { - yield return new WaitForSeconds(4f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(1f); - CallBJ(); - yield return new WaitForSeconds(0.5f); - ShrinkEffect(); - } -} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX.meta diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/1595.prefab.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/1595.prefab.meta diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/FLZY_ZDX_BOSS.cs b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/FLZY_ZDX_BOSS.cs new file mode 100644 index 000000000..a8f9abaf5 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/FLZY_ZDX_BOSS.cs @@ -0,0 +1,25 @@ +using Assets.MyGame.Scripts.Net.WebResponses; +using UnityEngine; + +/// +/// 特殊鱼：炸弹蟹 控制脚本。 +/// +/// ⭐ 炸弹蟹已从 特殊Boss 改为 特殊鱼： +/// 死亡爆奖由 CreateFishManager.Ws_DieFish 的 特殊鱼 分支统一生成并初始化 +/// （EffectPool 取 effect_DieAward → DieEffect_TSY.Init → SetCoinCount）， +/// 本脚本不再走 Boss 的 action_effect_DieAward / currEffect_DieAward 回调。 +/// +/// 保留 MonsterControl_BossBase 继承：维持 bossName+pathId 路线移动、出场音效、 +/// 死亡震屏（base.DieFish）。DieFish 只负责死亡表现与本体回收。 +/// +public class FLZY_ZDX_BOSS : MonsterControl_BossBase +{ + public override void DieFish(RoomKillNotice obj = null) + { + // 震屏 + 死亡音效（MonsterControl_BossBase.DieFish） + base.DieFish(obj); + + // 回收本体：特殊鱼分支的爆奖特效由 CreateFishManager 生成，不依赖鱼本体 + CreateFishManager.Instance.Id_DieFish_NotFX(guid); + } +} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/FLZY_ZDX_BOSS.cs.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/FLZY_ZDX_BOSS.cs.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/FLZY_ZDX_BOSS.cs.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/FLZY_ZDX_BOSS.cs.meta diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/Image Variant 1.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/Image Variant 1.prefab similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/Image Variant 1.prefab rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/Image Variant 1.prefab diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/Image Variant 1.prefab.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/Image Variant 1.prefab.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/Image Variant 1.prefab.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/Image Variant 1.prefab.meta diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/UI_baojiang Variant 12.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/UI_baojiang Variant 12.prefab similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/UI_baojiang Variant 12.prefab rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/UI_baojiang Variant 12.prefab diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/UI_baojiang Variant 12.prefab.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/UI_baojiang Variant 12.prefab.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/UI_baojiang Variant 12.prefab.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/UI_baojiang Variant 12.prefab.meta diff --git a/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/ZDXDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/ZDXDieEvent.cs new file mode 100644 index 000000000..eb9dca032 --- /dev/null +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/ZDXDieEvent.cs @@ -0,0 +1,50 @@ +using System.Collections; +using UnityEngine; + +/// +/// 特殊鱼：炸弹蟹 死亡爆奖事件（继承 DieEffect_TSY）。 +/// +/// ⭐ 炸弹蟹已从 特殊Boss 改为 特殊鱼： +/// CreateFishManager.Ws_DieFish 的 特殊鱼 分支只识别 BJBase / DieEffect_TSY， +/// 继承 DieEffect_TSY 才能被正确初始化并触发爆奖。 +/// +/// 触发链路（特殊鱼分支）： +/// EffectPool 取 effect_DieAward → 注入参数(startPoint/posID/paoBei/coinCount...) +/// → DieEffect_TSY.Init（或 Boss爆奖模式的 InitBossAward）→ SetCoinCount +/// → 这里启动红包爆奖协程（CallBJ ×8 → 自动滚分/结算/JiaFen → die）。 +/// +public class ZDXDieEvent : DieEffect_TSY +{ + private void Awake() + { + scoreCount = 8; + } + + /// 特殊鱼死亡触发入口：CreateFishManager 注入参数(Init/InitBossAward)后统一调用 + public override void SetCoinCount() + { + StartCoroutine(yan()); + } + + public IEnumerator yan() + { + yield return new WaitForSeconds(4f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(1f); + CallBJ(); + yield return new WaitForSeconds(0.5f); + ShrinkEffect(); + } +} diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/ZDXDieEvent.cs.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/ZDXDieEvent.cs.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/ZDXDieEvent.cs.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/ZDXDieEvent.cs.meta diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/eff_dead_1595_timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/eff_dead_1595_timeline Variant.prefab similarity index 88% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/eff_dead_1595_timeline Variant.prefab rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/eff_dead_1595_timeline Variant.prefab index 1eb781c47..9d6c95619 100644 --- a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/eff_dead_1595_timeline Variant.prefab +++ b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/eff_dead_1595_timeline Variant.prefab @@ -61,7 +61,7 @@ MonoBehaviour: type: 3} currScore: 0 scoreCount: 0 - bigPrizeFishMode: 0 + bigPrizeFishMode: 2 showDelay: 3 moveDuration: 0.5 moveEase: 6 @@ -74,6 +74,23 @@ MonoBehaviour: isEffEnd: 0 isScoreStart: 0 isGoldEffectStart: 0 + baoJiangMode: 0 + endUIType: 1 + endUIEntries: [] + monster: {fileID: 0} + startPoint: {x: 0, y: 0, z: 0} + coinCount: 0 + isLocalCoin: 0 + baoJiangEffectPrefab: {fileID: 0} + parentTransform: {fileID: 0} + offsetPosition: {x: 0, y: 0, z: 0} + effectType: 0 + onTimeObjs: [] + hitTimes: [] + time: 0 + dieEffectTesyNum: 0 + minBJCount: 10 + maxBJCount: 15 --- !u!1001 &8569392900590368777 PrefabInstance: m_ObjectHideFlags: 0 @@ -142,6 +159,16 @@ PrefabInstance: propertyPath: m_CameraType value: 1 objectReference: {fileID: 0} + - target: {fileID: 3880830232804047534, guid: 8d993a4fd5a4fb046b40dbad536b7a58, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.59 + objectReference: {fileID: 0} + - target: {fileID: 6952548477276205976, guid: 8d993a4fd5a4fb046b40dbad536b7a58, + type: 3} + propertyPath: orthographic size + value: 15 + objectReference: {fileID: 0} - target: {fileID: 7135117531682520789, guid: 8d993a4fd5a4fb046b40dbad536b7a58, type: 3} propertyPath: m_Name diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/eff_dead_1595_timeline Variant.prefab.meta b/Assets/MyGame/aa/Game/FLZY/TSY/ZDX/eff_dead_1595_timeline Variant.prefab.meta similarity index 100% rename from Assets/MyGame/aa/Game/FLZY/BOSS/ZDX/eff_dead_1595_timeline Variant.prefab.meta rename to Assets/MyGame/aa/Game/FLZY/TSY/ZDX/eff_dead_1595_timeline Variant.prefab.meta diff --git a/Assets/MyGame/aa/UI/Game/左下.prefab b/Assets/MyGame/aa/UI/Game/左下.prefab index 2800854f2..4b5b90063 100644 --- a/Assets/MyGame/aa/UI/Game/左下.prefab +++ b/Assets/MyGame/aa/UI/Game/左下.prefab @@ -2675,7 +2675,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.6745098} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1