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-06-16 23:45:31 +08:00
parent a563fe45a2
commit c0be980a55
36 changed files with 154960 additions and 4002 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/Art/FengLei/Boss/1595/Preview_1595.unity
+1021 -58
View File
File diff suppressed because it is too large Load Diff
Assets/Art/FengLei/Boss/1595/eff_dead_1595_timeline.prefab
+1 -1
View File
@@ -290887,7 +290887,7 @@ SkinnedMeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 0000000deadbeef15deadf00d0000000, type: 2}
- {fileID: 2100000, guid: 243df580ddf8fbd4fb50b3b8bc820196, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Assets/Art/FengLei/Fish/20.prefab
+1 -1
View File
@@ -127,7 +127,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &156482802418479094
Transform:
m_ObjectHideFlags: 0
Assets/Art/FengLei/Fish/42.prefab
+1 -1
View File
@@ -5437,7 +5437,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4687509073537306
Transform:
m_ObjectHideFlags: 0
Assets/Art/FengLei/Fish/63.prefab
+1 -1
View File
@@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4838960281201077
Transform:
m_ObjectHideFlags: 0
Assets/Art/FengLei/Fish/8.prefab
+1 -1
View File
@@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4211869767440078
Transform:
m_ObjectHideFlags: 0
Assets/Art/HHWK/res/model/yuxilong/mdl_model1_bs_0020_skill_0tx.anim
+109970 -3758
View File
File diff suppressed because it is too large Load Diff
Assets/Art/HHWK/res/model/zhubajie/skill_turn.anim
+2 -2
View File
@@ -95429,7 +95429,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 4.3333335
m_StopTime: 4.333333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -476742,7 +476742,7 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 4.3333335
- time: 4.233333
functionName: eventTurnEnd
data:
objectReferenceParameter: {fileID: 0}
Assets/Art/JABY/ResJABY/assetspackage/fishes/fish_413/models/AC_fish_413.controller
+150 -133
View File
@@ -2,12 +2,12 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AC_fish_413
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Die
m_Type: 9
@@ -28,42 +28,35 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &1107709254077376921
AnimatorStateMachine:
serializedVersion: 6
--- !u!1101 &1101703437598541787
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- m_State: {fileID: 1102724804207875695}
m_Position: {x: 0, y: 0, z: 0}
- m_State: {fileID: 1102618682377417806}
m_Position: {x: 250, y: 0, z: 0}
- m_State: {fileID: 1102884547391421755}
m_Position: {x: 0, y: 100, z: 0}
- m_State: {fileID: 1102099118695303065}
m_Position: {x: 250, y: 100, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101730242686860875}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 0, y: -100, z: 0}
m_EntryPosition: {x: 250, y: -100, z: 0}
m_ExitPosition: {x: 500, y: -100, z: 0}
m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
m_DefaultState: {fileID: 1102724804207875695}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.8125
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101730242686860875
AnimatorStateTransition:
serializedVersion: 3
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Die
@@ -73,6 +66,7 @@ AnimatorStateTransition:
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
@@ -81,107 +75,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102724804207875695
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: move
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 0, y: 0, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8cfed33175ad7714c9c27ab30b85940b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102618682377417806
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: special
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101703437598541787}
m_StateMachineBehaviours: []
m_Position: {x: 250, y: 0, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 425c680896b631547ace28e08a9c09f3, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &1101703437598541787
AnimatorStateTransition:
serializedVersion: 3
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.8125
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102884547391421755
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: special2
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 0, y: 100, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ec6566da99140cd45ba27150f472c5d7, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102099118695303065
AnimatorState:
serializedVersion: 6
@@ -203,8 +96,132 @@ AnimatorState:
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 0958b774f56e3fc4b994267fd6b1884f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102618682377417806
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: special
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101703437598541787}
m_StateMachineBehaviours:
- {fileID: 8615374332383066456}
m_Position: {x: 250, y: 0, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 425c680896b631547ace28e08a9c09f3, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102724804207875695
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: move
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 0, y: 0, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8cfed33175ad7714c9c27ab30b85940b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102884547391421755
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: special2
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 0, y: 100, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ec6566da99140cd45ba27150f472c5d7, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107709254077376921
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102724804207875695}
m_Position: {x: 0, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102618682377417806}
m_Position: {x: 240, y: 20, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102884547391421755}
m_Position: {x: 270, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102099118695303065}
m_Position: {x: 520, y: 120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101730242686860875}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 0, y: -100, z: 0}
m_EntryPosition: {x: 250, y: -100, z: 0}
m_ExitPosition: {x: 500, y: -100, z: 0}
m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
m_DefaultState: {fileID: 1102724804207875695}
--- !u!114 &8615374332383066456
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: 6badf29928730704f891ff4e7b659d0b, type: 3}
m_Name:
m_EditorClassIdentifier:
Assets/Art/JABY/ResJABY/assetspackage/fishes/fish_413/models/special.anim
+43361 -30
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/Scenes/UIScene.unity
+1
View File
@@ -3615,6 +3615,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: afce420be78fe7e45bf80ca49529e276, type: 3}
m_Name:
m_EditorClassIdentifier:
enableBot: 1
gameConfig:
id:
isDelete: 0
Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+21 -3
View File
@@ -1586,8 +1586,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
coinScript.Init(killFish.gold, sitData.transform.position, killFish.userId, sitData.posID, killFish.param);
coinScript.isBoss = false;
coinScript.SetCoinCount();
coinScript.JiaFen = onScoreAdd;
coinScript.SetCoinCount();
break;
}
@@ -1638,8 +1638,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
coinScript.Init(killFish.gold, sitData.transform.position, killFish.userId, sitData.posID, killFish.param);
coinScript.isBoss = false;
coinScript.SetCoinCount();
coinScript.JiaFen = onScoreAdd;
coinScript.SetCoinCount();
}
@@ -1668,9 +1668,27 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
coinScript.Init(killFish.gold, sitData.transform.position, killFish.userId, sitData.posID, killFish.param);
coinScript.isBoss = false;
coinScript.SetCoinCount();
coinScript.JiaFen = onScoreAdd;
coinScript.SetCoinCount();
// Boss 鱼：显示浮动分数文本
var bossCtrl = (MonsterControl_BossBase)monster;
bossCtrl.v3 = sitData.transform.position;
if (bossCtrl.isToUI)
{
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
currGameType.subPanelParent.parent);
}
else
{
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp);
}
bossCtrl.action_effect_DieAward?.Invoke(bossCtrl.currEffect_DieAward);
bossCtrl.JiaFen = onScoreAdd;
}
break;
case FishTypeEnum.特殊Boss:
Assets/MyGame/Scripts/Manager/GameManager.cs
+3
View File
@@ -15,6 +15,9 @@ using UnityEngine.Video;
public class GameManager : MonoSingleton<GameManager>
{
[Header("人机")]
public bool enableBot = true; // 人机开关
public GameConfig gameConfig;
public Dictionary<string, FishTypeConfig> dic_fishTypeConfigs=new Dictionary<string, FishTypeConfig>();
public UserData user;
Assets/MyGame/aa/Game/FLZY/BOSS/FLZY_BOSS_AnimatorLeave.cs
+1 -1
View File
@@ -19,7 +19,7 @@ public class FLZY_BOSS_AnimatorLeave : StateMachineBehaviour
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
{
var control = animator.GetComponentInParent<MonsterControl_BossBase>();
var control = animator.GetComponentInParent<MonsterContral>();
CreateFishManager.Instance.Id_DieFish_NotFX(control.guid);
}
Assets/MyGame/aa/Game/FLZY/BOSS/YGSM/1613.prefab
+2 -1
View File
@@ -2195,7 +2195,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1160467257372520, guid: d4f4d3a3290340b4eab091293cdbe822, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1160467257372520, guid: d4f4d3a3290340b4eab091293cdbe822, type: 3}
propertyPath: m_TagString
@@ -2970,6 +2970,7 @@ MonoBehaviour:
yzID:
colliderList: []
lockPoint: {fileID: 4830099115532342399}
bingDongEffect: {fileID: 0}
rotationPY: 0
isRotate: 1
ischild0: 1
Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab
+25
View File
@@ -75,7 +75,12 @@ MonoBehaviour:
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
depthOffset: 0
bossName: "\u767D\u9AA8\u7CBE"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
@@ -2530,6 +2535,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 111353891062718048, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111353891062718048, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_AnimatePhysics
@@ -2540,6 +2550,11 @@ PrefabInstance:
propertyPath: m_Animation
value:
objectReference: {fileID: 7400000, guid: 2425ef8bf54c2844fadc4c5f2871f39d, type: 2}
- target: {fileID: 111616761771223058, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111616761771223058, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_AnimatePhysics
@@ -4868,11 +4883,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -14.183159
objectReference: {fileID: 0}
- target: {fileID: 111477794280538272, guid: f9bdcb2c4d107cb49ac89bbec9e44727,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111477794280538272, guid: f9bdcb2c4d107cb49ac89bbec9e44727,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111510073901028830, guid: f9bdcb2c4d107cb49ac89bbec9e44727,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111510073901028830, guid: f9bdcb2c4d107cb49ac89bbec9e44727,
type: 3}
propertyPath: m_AnimatePhysics
Assets/MyGame/aa/Game/HHWK/Boss/BaoChuanJuXie/Game177_bcjx.prefab
+15
View File
@@ -75,7 +75,12 @@ MonoBehaviour:
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
depthOffset: 0
bossName: "\u5B9D\u8239\u5C45\u87F9"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
@@ -2955,11 +2960,21 @@ PrefabInstance:
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111291547872775986, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111291547872775986, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111500050402096248, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111500050402096248, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_AnimatePhysics
Assets/MyGame/aa/Game/HHWK/Boss/ChangE/Game177_changE.prefab
+26
View File
@@ -77,6 +77,7 @@ MonoBehaviour:
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
@@ -2789,11 +2790,21 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111007271993718322, guid: d52c461779f3a1548a3f4543a5f1860d,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111007271993718322, guid: d52c461779f3a1548a3f4543a5f1860d,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111696919880513765, guid: d52c461779f3a1548a3f4543a5f1860d,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111696919880513765, guid: d52c461779f3a1548a3f4543a5f1860d,
type: 3}
propertyPath: m_AnimatePhysics
@@ -2804,6 +2815,11 @@ PrefabInstance:
propertyPath: m_PlayAutomatically
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111866108357657329, guid: d52c461779f3a1548a3f4543a5f1860d,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111866108357657329, guid: d52c461779f3a1548a3f4543a5f1860d,
type: 3}
propertyPath: m_AnimatePhysics
@@ -5498,6 +5514,11 @@ PrefabInstance:
propertyPath: m_Animation
value:
objectReference: {fileID: 7400000, guid: 0edeace7ba3689742a8caef51a4bd753, type: 2}
- target: {fileID: 111293198502218400, guid: dd660ab8139c6df4895797c43ee143c4,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111293198502218400, guid: dd660ab8139c6df4895797c43ee143c4,
type: 3}
propertyPath: m_AnimatePhysics
@@ -7842,6 +7863,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -173.07037
objectReference: {fileID: 0}
- target: {fileID: 111132299442727904, guid: 1051f203e6a58a343aa56f1d1f0963f8,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111132299442727904, guid: 1051f203e6a58a343aa56f1d1f0963f8,
type: 3}
propertyPath: m_AnimatePhysics
Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab
+5
View File
@@ -81,7 +81,12 @@ MonoBehaviour:
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
depthOffset: 0
bossName: "\u6C99\u50E7"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab
+6 -1
View File
@@ -75,7 +75,12 @@ MonoBehaviour:
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
depthOffset: 0
bossName: "\u5B59\u609F\u7A7A"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
@@ -2869,7 +2874,7 @@ PrefabInstance:
- target: {fileID: 111771092198208730, guid: aa7e92afb22dcd54cb64c818ec6b17a2,
type: 3}
propertyPath: m_CullingType
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111771092198208730, guid: aa7e92afb22dcd54cb64c818ec6b17a2,
type: 3}
Assets/MyGame/aa/Game/HHWK/Boss/TangSeng/Game177_tangseng.prefab
+5
View File
@@ -109,7 +109,12 @@ MonoBehaviour:
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
depthOffset: 0
bossName: "\u5510\u50E7"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab
+15
View File
@@ -77,7 +77,12 @@ MonoBehaviour:
isyz: 0
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
depthOffset: 0
bossName: "\u94C1\u6247\u516C\u4E3B"
isToUI: 1
tMP_CurrBossScore: {fileID: 0}
@@ -1915,6 +1920,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -123.80341
objectReference: {fileID: 0}
- target: {fileID: 111948132087033897, guid: d23d6e1670cd5a84ab17f3a17bf2029e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111948132087033897, guid: d23d6e1670cd5a84ab17f3a17bf2029e,
type: 3}
propertyPath: m_AnimatePhysics
@@ -3917,6 +3927,11 @@ PrefabInstance:
propertyPath: m_Animation
value:
objectReference: {fileID: 7400000, guid: b7a2b42180239884d91317836d1603d7, type: 2}
- target: {fileID: 111817325062191328, guid: 5a583fd179bb19e4693bdbb25c336cc0,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111817325062191328, guid: 5a583fd179bb19e4693bdbb25c336cc0,
type: 3}
propertyPath: m_AnimatePhysics
Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/Game177_lm.prefab
+8 -7
View File
@@ -29108,6 +29108,7 @@ MonoBehaviour:
- {fileID: 7994895025437696444}
- {fileID: 7992829528882488842}
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
@@ -33351,7 +33352,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: a0cb12357050bea4b972d7261aec339c, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1730242686860875, guid: a0cb12357050bea4b972d7261aec339c, type: 3}
propertyPath: m_IsActive
@@ -35226,7 +35227,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 0e9212330ff6ee9409697653133e6a21, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 0e9212330ff6ee9409697653133e6a21, type: 3}
propertyPath: m_TagString
@@ -36122,7 +36123,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: f5f44638051b3dd4ba2b8205902e7ade, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4000342987746139, guid: f5f44638051b3dd4ba2b8205902e7ade, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -38225,7 +38226,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4007271993718322, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -39807,7 +39808,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 4ee0d217dd6de9d4993dbcaef64a6f77, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4000342987746139, guid: 4ee0d217dd6de9d4993dbcaef64a6f77, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -41707,7 +41708,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4007271993718322, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -43337,7 +43338,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 170807814fe45e24fb1fef543261d7ff, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1924050743934937, guid: 170807814fe45e24fb1fef543261d7ff, type: 3}
propertyPath: m_TagString
Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab
+31
View File
@@ -85,6 +85,7 @@ MonoBehaviour:
- {fileID: 3421246963248850191}
- {fileID: 3421056663850599134}
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
@@ -1234,21 +1235,41 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 97.54049
objectReference: {fileID: 0}
- target: {fileID: 111095919050787622, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111095919050787622, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111356700911858394, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111356700911858394, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111458735412797113, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111458735412797113, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111891103352497787, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111891103352497787, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
@@ -2959,11 +2980,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 28.634092
objectReference: {fileID: 0}
- target: {fileID: 111528911807818478, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111528911807818478, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111688331903957256, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111688331903957256, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: m_AnimatePhysics
Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab
+97 -1
View File
@@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1418836501065536891
Transform:
m_ObjectHideFlags: 0
@@ -77,6 +77,7 @@ MonoBehaviour:
yzID:
colliderList: []
lockPoint: {fileID: 0}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
ischild0: 0
@@ -523,46 +524,91 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 34.39913
objectReference: {fileID: 0}
- target: {fileID: 111075864462779534, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111075864462779534, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111101133080060232, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111101133080060232, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111151797847433907, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111151797847433907, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111163714622165790, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111163714622165790, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111216095195831122, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111216095195831122, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111426252596376205, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111426252596376205, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111514865527688870, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111514865527688870, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111725357837634651, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111725357837634651, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111856281198064092, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111856281198064092, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
@@ -3578,6 +3624,11 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111008770253507523, guid: 49acee7e5db085c4a86d1ad72c22468b,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111008770253507523, guid: 49acee7e5db085c4a86d1ad72c22468b,
type: 3}
propertyPath: m_AnimatePhysics
@@ -4049,46 +4100,91 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -129.17252
objectReference: {fileID: 0}
- target: {fileID: 111029543675603457, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111029543675603457, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111095919050787622, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111095919050787622, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111134286944189183, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111134286944189183, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111176931266004030, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111176931266004030, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111274088443893264, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111274088443893264, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111416982030819627, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111416982030819627, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111540393087334429, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111540393087334429, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111725357837634651, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111725357837634651, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111855622808019284, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_CullingType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111855622808019284, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
Assets/MyGame/aa/Game/HHWK/Boss/YuXI/HHWK_YX_BOSS.cs
+2
View File
@@ -19,6 +19,8 @@ public class HHWK_YX_BOSS : MonsterControl_BossBase
{
base.OnEnable();
YuXiIdle.transform.GetChild(0).GetComponent<Animation>().CrossFade("swim", 0.3f);
Skill1.SetActive(false);
Skill2.SetActive(false);
}
public override void DieFish(RoomKillNotice obj = null)
Assets/MyGame/aa/Game/HHWK/Fish/fish_4003 Variant.prefab
+1
View File
@@ -1378,6 +1378,7 @@ MonoBehaviour:
yzID:
colliderList: []
lockPoint: {fileID: 2389183733391645494}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
ischild0: 1
Assets/MyGame/aa/Game/HHWK/Fish/fish_4014 Variant.prefab
+1
View File
@@ -985,6 +985,7 @@ MonoBehaviour:
yzID:
colliderList: []
lockPoint: {fileID: 721721979365182479}
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
ischild0: 1
Assets/MyGame/aa/Game/HHWK/MonsterTSY/ZDX.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5fbc0fcc9e2e01e45b7d474029ea3d09
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/Game/HHWK/MonsterTSY/ZDX/HHWK_ZDX_DieEvent.cs
+129
View File
@@ -0,0 +1,129 @@
using Assets.MyGame.Scripts.Net.APIResponses.Enum;
using Assets.MyGame.Scripts.Net.WebResponses;
using DG.Tweening;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class HHWK_ZDX_DieEvent : BJBase
{
[Header("炸弹")]
public GameObject bombPrefab; // 炸弹预制体
public GameObject explosionPrefab; // 爆炸特效预制体
[Header("参数")]
public int bombCount = 5; // 炸弹数量
public float bombFlyTime = 0.6f; // 炸弹飞行时间
public float bombInterval = 0.3f; // 炸弹间隔
public float explosionRadius = 3f; // 爆炸检测半径
public LayerMask fishLayer; // 鱼层（Inspector 设 Fish）
private int paoBei;
private void Start()
{
paoBei = (int)CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum;
if (fishLayer == 0) fishLayer = LayerMask.GetMask("Fish");
}
public override void SetCoinCount()
{
StartCoroutine(BombRoutine());
}
private IEnumerator BombRoutine()
{
Vector3 startPos = transform.position;
startPos.z = 0;
for (int i = 0; i < bombCount; i++)
{
// 随机屏幕坐标 → 世界坐标
float sx = Random.Range(Screen.width * 0.15f, Screen.width * 0.85f);
float sy = Random.Range(Screen.height * 0.15f, Screen.height * 0.85f);
Vector3 worldTarget = Camera.main.ScreenToWorldPoint(new Vector3(sx, sy, -Camera.main.transform.position.z));
worldTarget.z = 0;
// 创建炸弹并飞行
GameObject bomb = bombPrefab != null ? Instantiate(bombPrefab) : null;
if (bomb != null)
{
bomb.transform.position = startPos;
StartCoroutine(BombFly(bomb, startPos, worldTarget));
}
else
{
// 没有炸弹预制体时直接爆炸
Boom(worldTarget);
}
yield return new WaitForSeconds(bombInterval);
}
yield return new WaitForSeconds(bombFlyTime + 0.5f);
Destroy(gameObject);
}
/// <summary>炸弹飞行到目标点</summary>
private IEnumerator BombFly(GameObject bomb, Vector3 from, Vector3 to)
{
float elapsed = 0f;
// 抛物线弧顶
Vector3 mid = Vector3.Lerp(from, to, 0.5f) + Vector3.up * 3f;
while (elapsed < bombFlyTime)
{
elapsed += Time.deltaTime;
float t = elapsed / bombFlyTime;
bomb.transform.position = BezierPoint(from, mid, to, t);
yield return null;
}
bomb.transform.position = to;
Destroy(bomb);
// 到达 → 爆炸
Boom(to);
}
/// <summary>二次贝塞尔</summary>
private Vector3 BezierPoint(Vector3 a, Vector3 b, Vector3 c, float t)
{
float u = 1f - t;
return u * u * a + 2f * u * t * b + t * t * c;
}
/// <summary>爆炸：创建特效 + 检测并杀死附近普通鱼</summary>
private void Boom(Vector3 worldPos)
{
// 爆炸特效
if (explosionPrefab != null)
{
var fx = Instantiate(explosionPrefab, worldPos, Quaternion.identity);
Destroy(fx, 1.5f);
}
// 范围检测鱼
var hits = Physics2D.OverlapCircleAll(worldPos, explosionRadius, fishLayer);
foreach (var hit in hits)
{
if (!hit.CompareTag("Fish")) continue;
var control = hit.GetComponentInParent<MonsterContral>();
if (control == null) continue;
if (control.fishenum == FishTypeEnum.普通鱼)
{
var sitPos = CreateFishManager.Instance.currGameType?.currSitData?.transform.position ?? Vector3.zero;
CreateFishManager.Instance.Id_DieFish_FX(control.guid,
new RedPacketRecord { Amount = paoBei * control.monsterData.fishTypeConfig.fishScore },
sitPos);
}
}
}
#if UNITY_EDITOR
private void OnDrawGizmosSelected()
{
Gizmos.color = new Color(1, 0, 0, 0.3f);
Gizmos.DrawWireSphere(transform.position, explosionRadius);
}
#endif
}
Assets/MyGame/aa/Game/HHWK/MonsterTSY/ZDX/HHWK_ZDX_DieEvent.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 249d1dedcb7a25e4e98489afaa42e78f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/Game/HHWK/MonsterTSY/ZDX/HHWK_ZDX_TSY.cs
+24
View File
@@ -0,0 +1,24 @@
using Assets.MyGame.Scripts.Net.WebResponses;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class HHWK_ZDX_TSY : MonsterContral
{
public Animator Animator;
public override void OnEnable()
{
base.OnEnable();
}
public override void DieFish(RoomKillNotice obj = null)
{
if (FishResourcesData.fishResourcesDatasDic.TryGetValue(fishTypeID, out var res)
&& res.dieAudio != null && res.dieAudio.Count > 0)
{
AudioManager.Instance.PlayerFX(res.dieAudio[0]);
}
CreateFishManager.Instance.Id_DieFish_NotFX(guid);
Animator.SetTrigger("Die");
}
}
Assets/MyGame/aa/Game/HHWK/MonsterTSY/ZDX/HHWK_ZDX_TSY.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1d344e3e888bd6c4bb86723c803a4f9d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+2 -1
View File
@@ -190,7 +190,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
// 生成人机：倒着填空余座位
int botCount = GameManager.Instance.gameData.currRoomData.robotCount;
if (botCount > 0)
if (botCount > 0 && GameManager.Instance.enableBot)
{
var usedPositions = new HashSet<int>();
foreach (var p in GameManager.Instance.gameData.currRoomData.players)
@@ -1642,6 +1642,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
// 只有房主控制人机
if (SitPosData.roomOwnerSit == null || currSitData != SitPosData.roomOwnerSit) return;
if (!GameManager.Instance.enableBot) return;
var fishList = CreateFishManager.Instance;
if (fishList == null || fishList.fishDatas_hashCodekey == null) return;
Assets/Scripts/Assembly-CSharp/Eff_shaseng_Skill1_AniEvent.cs
+1 -1
View File
@@ -119,7 +119,7 @@ public class Eff_shaseng_Skill1_AniEvent : MonoBehaviour
skillAnimation.CrossFade(nextAnimationClip, 0.3f);
HHWK_ShaSeng_Boss.obj_Skill2Effect.SetActive(false);
if (count == 4)
if (count >= 4)
{
CreateFishManager.Instance.Id_DieFish_NotFX(HHWK_ShaSeng_Boss.guid);