This commit is contained in:
2026-06-20 15:00:15 +08:00
parent 5bf4e31ab3
commit a800620fee
58 changed files with 2997 additions and 619 deletions
@@ -289,22 +289,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-4011472172645179464
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: 8.6
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}
--- !u!114 &-3280715919841177948
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -604,12 +588,29 @@ MonoBehaviour:
- {fileID: 8966980292562386502}
- {fileID: -1450512506653033593}
- {fileID: -8410463078486255931}
- {fileID: 3346501188439748426}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &519255660199966396
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: 3.6
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
--- !u!114 &2876034410431816231
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -702,6 +703,31 @@ MonoBehaviour:
m_DisplayName: eff_4014_skill_02_root
m_Markers:
m_Objects: []
--- !u!114 &3346501188439748426
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: 519255660199966396}
- {fileID: 6524706665890921399}
--- !u!114 &3454426411156651009
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -832,9 +858,7 @@ MonoBehaviour:
m_PreExtrapolationTime: 0
m_DisplayName: skill
m_Markers:
m_Objects:
- {fileID: 3775199925071225187}
- {fileID: -4011472172645179464}
m_Objects: []
m_InfiniteClipPreExtrapolation: 0
m_InfiniteClipPostExtrapolation: 0
m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
@@ -898,6 +922,22 @@ MonoBehaviour:
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &6524706665890921399
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: 8.6
m_Retroactive: 0
m_EmitOnce: 0
m_Asset: {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}
--- !u!114 &6590680180736035066
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -1,30 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8061026104838485733
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim1
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2643829409718807925}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6970293768688546812
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -190,31 +165,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101632218582760814
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim2
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102603978201376131}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102526986454134208
AnimatorState:
serializedVersion: 6
@@ -281,29 +231,29 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102603978201376131}
m_Position: {x: 140, y: 60, z: 0}
m_Position: {x: 310, y: 270, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102526986454134208}
m_Position: {x: 120, y: 260, z: 0}
m_Position: {x: 130, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -2643829409718807925}
m_Position: {x: -110, y: 50, z: 0}
m_Position: {x: -70, y: 220, z: 0}
- serializedVersion: 1
m_State: {fileID: 1853114097551451906}
m_Position: {x: -110, y: 230, z: 0}
m_Position: {x: -160, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: -5043566497708910696}
m_Position: {x: 542.60205, y: 13.25415, z: 0}
m_Position: {x: 470, y: 70, z: 0}
- serializedVersion: 1
m_State: {fileID: 8435202195559775581}
m_Position: {x: -120, y: 340, z: 0}
m_Position: {x: -180, y: 380, z: 0}
- serializedVersion: 1
m_State: {fileID: 7229380922095566941}
m_Position: {x: 120, y: 380, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101632218582760814}
- {fileID: -8061026104838485733}
- {fileID: 1771328740008945305}
- {fileID: 3899798646363139309}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -312,6 +262,31 @@ AnimatorStateMachine:
m_ExitPosition: {x: 500, y: -100, z: 0}
m_ParentStateMachinePosition: {x: 0, y: -200, z: 0}
m_DefaultState: {fileID: -5043566497708910696}
--- !u!1101 &1771328740008945305
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim1
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102526986454134208}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.99798626
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1853114097551451906
AnimatorState:
serializedVersion: 6
@@ -352,6 +327,31 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6badf29928730704f891ff4e7b659d0b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1101 &3899798646363139309
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim2
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102526986454134208}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9979864
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7229380922095566941
AnimatorState:
serializedVersion: 6
+4 -4
View File
@@ -234771,7 +234771,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1.6, y: 1.6, z: 1.6}
value: {x: 1.9, y: 1.9, z: 1.9}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -1174431,7 +1174431,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.6
value: 1.9
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -1174452,7 +1174452,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.6
value: 1.9
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -1174473,7 +1174473,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.6
value: 1.9
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -12,50 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6badf29928730704f891ff4e7b659d0b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1101 &-8928389595047260221
AnimatorStateTransition:
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: -7186710519824502037}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9785714
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-8432435232021350378
AnimatorStateTransition:
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: -8406782465747796068}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9785714
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-8406782465747796068
AnimatorState:
serializedVersion: 6
@@ -84,7 +40,7 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8079270851782987725
--- !u!1101 &-7884247595253670536
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -93,68 +49,19 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5154889609657224894}
m_DstState: {fileID: 1545273614429862671}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9785714
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-7669622672049329350
AnimatorStateTransition:
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: 9176323379334122166}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9785714
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-7186710519824502037
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: swim01 0 0
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: -8079270851782987725}
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: 8fed19404dbac8e4b82c337569e60d03, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4667145784369971404
AnimatorState:
serializedVersion: 6
@@ -181,28 +88,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4362651480564099571
AnimatorStateTransition:
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: 3921915256859707414}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9785714
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!114 &-2721678186216389102
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -241,6 +126,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-105914687810671816
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim2
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8406782465747796068}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9743597
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -275,7 +185,7 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &298294114601701064
--- !u!1101 &863967738767287865
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -284,69 +194,19 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1545273614429862671}
m_DstState: {fileID: -8406782465747796068}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9785714
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101234009825198111
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim1
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102868372257805354}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101723405681530597
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim2
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102457088336026237}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102094719567602369
AnimatorState:
serializedVersion: 6
@@ -384,7 +244,7 @@ AnimatorState:
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: -8928389595047260221}
- {fileID: 863967738767287865}
m_StateMachineBehaviours: []
m_Position: {x: 250, y: 0, z: 0}
m_IKOnFeet: 0
@@ -411,7 +271,7 @@ AnimatorState:
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: -7669622672049329350}
- {fileID: -7884247595253670536}
m_StateMachineBehaviours: []
m_Position: {x: 0, y: 100, z: 0}
m_IKOnFeet: 0
@@ -441,28 +301,16 @@ AnimatorStateMachine:
m_Position: {x: 420, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102457088336026237}
m_Position: {x: 170, y: 160, z: 0}
m_Position: {x: 610, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102868372257805354}
m_Position: {x: -50, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: 9176323379334122166}
m_Position: {x: -40, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: 5154889609657224894}
m_Position: {x: 190, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: 3921915256859707414}
m_Position: {x: -30, y: 280, z: 0}
- serializedVersion: 1
m_State: {fileID: -7186710519824502037}
m_Position: {x: 180, y: 230, z: 0}
m_Position: {x: 390, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: -8406782465747796068}
m_Position: {x: 190, y: 340, z: 0}
m_Position: {x: 140, y: 90, z: 0}
- serializedVersion: 1
m_State: {fileID: 1545273614429862671}
m_Position: {x: -30, y: 330, z: 0}
m_Position: {x: -110, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: -390240541205797645}
m_Position: {x: 0, y: 420, z: 0}
@@ -471,8 +319,8 @@ AnimatorStateMachine:
m_Position: {x: 230, y: 410, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101234009825198111}
- {fileID: 1101723405681530597}
- {fileID: 5499277173905345713}
- {fileID: -105914687810671816}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -531,60 +379,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3921915256859707414
AnimatorState:
serializedVersion: 6
--- !u!1101 &5499277173905345713
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: swim01 0
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: 298294114601701064}
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: 8fed19404dbac8e4b82c337569e60d03, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5154889609657224894
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: swim02 0 0
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: -8432435232021350378}
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: 954f1246e2277444a8ea9fc03f608436, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: swim1
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8406782465747796068}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &6197616762112661550
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -607,30 +426,3 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &9176323379334122166
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: swim02 0
m_Speed: 0.8
m_CycleOffset: 0
m_Transitions:
- {fileID: -4362651480564099571}
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: 954f1246e2277444a8ea9fc03f608436, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+4 -4
View File
@@ -234771,7 +234771,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 1.6, y: 1.6, z: 1.6}
value: {x: 1.8, y: 1.8, z: 1.8}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -1174431,7 +1174431,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.6
value: 1.8
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -1174452,7 +1174452,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.6
value: 1.8
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -1174473,7 +1174473,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.6
value: 1.8
inSlope: 0
outSlope: 0
tangentMode: 136
+1 -1
View File
@@ -367,7 +367,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -10
m_SortingOrder: -1000
m_Sprite: {fileID: 21300000, guid: ee3a57413dbbc474eb77909505eeb7b0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
-8
View File
@@ -3631,15 +3631,7 @@ MonoBehaviour:
propConfig: []
propFragments: []
vipLevelConfigs: []
signConfigs: []
monthCardConfigs: []
reliefConfigs:
isOpen: 0
gold: 0
count: 0
limit: 0
goldShopConfigs: []
diamondShopConfigs: []
user:
BaseInfo:
avatarSprite: {fileID: 0}
@@ -365,6 +365,7 @@ public class MonsterContral : MonoBehaviour
transform.position = next;
}
public bool isRotate = true;
public bool isNot1 = false;
/// <summary>
/// 根据 forwordXYZ 字段将物体朝向目标点方向。
/// 为空时 2D 鱼用 up,3D 鱼用 forward。
@@ -441,8 +442,16 @@ public class MonsterContral : MonoBehaviour
{
transform.GetChild(0).forward = toNext.normalized;
var vv = transform.GetChild(0).eulerAngles;
if (isNot1)
{
vv.z = rotationPY;
}
else
{
vv.z = rotationPY * (vv.y < 180 ? -1 : 1);
}
transform.GetChild(0).eulerAngles = vv;
}
@@ -1,4 +1,4 @@
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net.API;
using Assets.MyGame.Scripts.Net.WebResponses;
using System.Collections;
@@ -64,6 +64,14 @@ public class BullitMove : MonoBehaviour
void Update()
{
// 子弹生命周期:超时自动销毁(默认10秒)
currShowTime += Time.deltaTime;
if (currShowTime >= desTime)
{
Destroy(gameObject);
return;
}
if (isLock)
{
// 目标无效 → 解除锁定
@@ -104,7 +112,6 @@ public class BullitMove : MonoBehaviour
else
{
// 非锁定模式:保持原有直线 + 反弹逻辑(不变)
currShowTime += Time.deltaTime;
Vector3 targetPoint = transform.up.normalized * currShowTime * moveSpeed;
targetPoint.z = 0;
transform.position = vector3_startPosition + targetPoint;
@@ -617,15 +617,17 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
//bossTimer = 3f;
if (!fishTypeConfig.TryGetValue(FishTypeEnum.Boss鱼, out var bossList) || bossList.Count == 0)
return;
foreach (var item in bossList)
{
//if (item.fishNumber == "11027")
//foreach (var item in bossList)
//{
// if (item.fishNumber == "13036")
// item.isCreate = 2;
//if (item.fishNumber == "11042")
// item.isCreate = 2;
// // if (item.fishNumber == "11027")
// // item.isCreate = 2;
// // if (item.fishNumber == "11030")
// // item.isCreate = 2;
}
//}
StartCoroutine(buchongfu(bossList, bossCount, fishDatas_hashCodekey_Boss, bossRecentList, bossRecentMax));
@@ -0,0 +1,79 @@
using Assets.MyGame.Scripts.Net.API;
using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
using System;
using System.Collections.Generic;
namespace Assets.MyGame.Scripts.Net
{
public static partial class APIRequestList
{
#region ActivityConfig
/// <summary>
/// 获取活动配置(聚合)(GET)
/// 返回:ActivityConfig
/// </summary>
public static void GetActivityConfig(Action<ActivityConfig> callback)
{
APIManager.Response<ActivityConfig>(APIType.ActivityConfig_Get, callback);
}
/// <summary>
/// 获取钻石商城列表(GET)
/// </summary>
public static void GetDiamondShopList(Action<List<DiamondShopConfig>> callback)
{
APIManager.Response<List<DiamondShopConfig>>(APIType.ActivityConfig_DiamondShopList, callback);
}
/// <summary>
/// 获取金币商城列表(GET)
/// </summary>
public static void GetGoldShopList(Action<List<GoldShopConfig>> callback)
{
APIManager.Response<List<GoldShopConfig>>(APIType.ActivityConfig_GoldShopList, callback);
}
/// <summary>
/// 获取救济金配置(GET)
/// </summary>
public static void GetReliefConfig(Action<ReliefConfig> callback)
{
APIManager.Response<ReliefConfig>(APIType.ActivityConfig_ReliefConfig, callback);
}
/// <summary>
/// 获取签到池配置(GET)
/// </summary>
public static void GetSignConfigs(Action<List<SignConfig>> callback)
{
APIManager.Response<List<SignConfig>>(APIType.ActivityConfig_SignConfigs, callback);
}
/// <summary>
/// 获取注册配置(GET)
/// </summary>
public static void GetRegisterConfig(Action<RegisterConfig> callback)
{
APIManager.Response<RegisterConfig>(APIType.ActivityConfig_RegisterConfig, callback);
}
/// <summary>
/// 获取战令配置(GET)
/// </summary>
public static void GetBattleOrderConfig(Action<BattleOrderConfig> callback)
{
APIManager.Response<BattleOrderConfig>(APIType.ActivityConfig_BattleOrderConfig, callback);
}
/// <summary>
/// 获取捕鱼返利配置(GET)
/// </summary>
public static void GetFishingReturnConfig(Action<FishingReturnConfig> callback)
{
APIManager.Response<FishingReturnConfig>(APIType.ActivityConfig_FishingReturnConfig, callback);
}
#endregion
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 196e84aecdf457e448d7b20b64beb1de
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,70 @@
using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
using Assets.MyGame.Scripts.Net.API.UserData_SubClass;
using System;
using System.Collections.Generic;
namespace Assets.MyGame.Scripts.Net.API
{
/// <summary>
/// 活动配置实体类(独立于 GameConfig)
/// 商店金币/钻石、签到、救济金等已从 GameConfig 迁移至此
/// </summary>
[Serializable]
public class ActivityConfig
{
/// <summary>
/// 数据ID
/// </summary>
public string id;
/// <summary>
/// 是否删除
/// </summary>
public bool isDelete;
/// <summary>
/// 创建人信息
/// </summary>
public OptionUserInfo createInfo;
/// <summary>
/// 战令配置
/// </summary>
public BattleOrderConfig battleOrderConfig;
/// <summary>
/// 救济金配置
/// </summary>
public ReliefConfig reliefConfig;
/// <summary>
/// 签到池配置
/// </summary>
public List<SignConfig> signConfigs;
/// <summary>
/// 金币商城配置
/// </summary>
public List<GoldShopConfig> goldShopConfigs;
/// <summary>
/// 钻石商城配置
/// </summary>
public List<DiamondShopConfig> diamondShopConfigs;
/// <summary>
/// 注册配置
/// </summary>
public RegisterConfig registerConfig;
/// <summary>
/// 捕鱼返利配置
/// </summary>
public FishingReturnConfig fishingReturnConfig;
/// <summary>
/// 抽奖活动配置
/// </summary>
public LotteryActivityConfig lotteryActivityConfig;
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8f6f82be72e53a94aa1f11af3fd90261
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,4 +1,4 @@
using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
using Assets.MyGame.Scripts.Net.API.UserData_SubClass;
using System;
using System.Collections.Generic;
@@ -6,6 +6,7 @@ namespace Assets.MyGame.Scripts.Net.API
{
/// <summary>
/// 游戏后台配置(Unity 解析版)
/// 注:商店/签到/救济等配置已迁移至 ActivityConfig
/// </summary>
[Serializable]
public class GameConfig
@@ -65,35 +66,14 @@ namespace Assets.MyGame.Scripts.Net.API
/// </summary>
public List<VipLevelConfig> vipLevelConfigs;
/// <summary>
/// 签到池配置
/// </summary>
public List<SignConfig> signConfigs;
/// <summary>
/// 月卡配置
/// </summary>
public List<MonthCardConfig> monthCardConfigs;
/// <summary>
/// 救济金配置
/// </summary>
public ReliefConfig reliefConfigs;
/// <summary>
/// 金币商城配置
/// </summary>
public List<GoldShopConfig> goldShopConfigs;
/// <summary>
/// 钻石商城配置
/// </summary>
public List<DiamondShopConfig> diamondShopConfigs;
/// <summary>
/// 击杀配置
/// </summary>
public object killConfig ;
public object killConfig;
}
}
@@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
{
/// <summary>
/// 战令配置
/// </summary>
[Serializable]
public class BattleOrderConfig
{
public bool isOpen;
public long endTime;
public string ruleDesc;
public string buyDesc;
public string advanceGiftDesc;
public List<BattleOrderLevelConfig> levelConfig;
public List<AdvanceGiftConfig> advanceGift;
}
/// <summary>
/// 战令等级配置
/// </summary>
[Serializable]
public class BattleOrderLevelConfig
{
public int level;
public int exp;
public GiftConfig normalGift;
public GiftConfig luxuryGift;
public GiftConfig supremeGift;
public int payType;
public int payCount;
}
/// <summary>
/// 进阶奖励配置
/// </summary>
[Serializable]
public class AdvanceGiftConfig
{
public int type;
public string name;
public int count;
public string imageUrl;
public int payType;
public int payCount;
public List<GiftConfig> giftList;
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: dce793a3439f7564ebdca4d510156939
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,4 +1,4 @@
using System;
using System;
using UnityEngine;
namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
@@ -34,8 +34,15 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
/// 现金价格
/// </summary>
public double money;
/// <summary>
/// 经销商价格
/// </summary>
public double dealerMoney;
/// <summary>
/// 是否首充限制
/// </summary>
public bool isFirst;
}
}
@@ -0,0 +1,26 @@
using System;
namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
{
/// <summary>
/// 捕鱼返金币活动配置
/// </summary>
[Serializable]
public class FishingReturnConfig
{
/// <summary>
/// 是否开启活动
/// </summary>
public bool isEnabled;
/// <summary>
/// 返利比例(千分之一 = 0.001)
/// </summary>
public double returnRate;
/// <summary>
/// 每日返利上限(0=无上限)
/// </summary>
public long dailyMaxReturn;
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0a7dc1e056fdffd49943877ede5cfa7d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,4 +1,4 @@
using System;
using System;
using UnityEngine;
namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
@@ -31,10 +31,18 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
public long gold;
/// <summary>
/// 钻石数量
/// 钻石数量(购买所需钻石)
/// </summary>
public int diamond;
/// <summary>
/// 经销商价格(钻石)
/// </summary>
public int dealerDiamond;
/// <summary>
/// 是否首充限制
/// </summary>
public bool isFirst;
}
}
@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
{
[Serializable]
public class LotteryActivityConfig
{
public string activityName;
public bool isOpen;
public long startTime;
public long endTime;
public List<LotteryPoolLevel> pools;
public List<long> costs;
public int userMaxDraw;
}
[Serializable]
public class LotteryPoolLevel
{
public string level;
public int count;
public int weight;
public List<LotteryPrize> prizeList;
}
[Serializable]
public class LotteryPrize
{
public string type;
public long count;
public string name;
public string icon;
public int weight;
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0eb06d724025e75439446a16126c5a78
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using Assets.MyGame.Scripts.Net.API.UserData_SubClass;
namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
{
/// <summary>
/// 注册配置
/// </summary>
[Serializable]
public class RegisterConfig
{
/// <summary>
/// 注册初始金币
/// </summary>
public int initGold;
/// <summary>
/// 注册初始钻石
/// </summary>
public int initDiamond;
/// <summary>
/// 注册初始道具列表
/// </summary>
public List<BaseProductCount> initProductList;
}
}
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4eec481164da9f74592228e1f000d967
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
+27 -1
View File
@@ -1,4 +1,4 @@
namespace Assets.MyGame.Scripts.Net
namespace Assets.MyGame.Scripts.Net
{
/// <summary>
/// 所有接口类型(自动生成)
@@ -18,6 +18,32 @@
GameConfig_Update,
// ---------------- ActivityConfig ----------------
/// <summary>获取活动配置·聚合(GET)</summary>
ActivityConfig_Get,
/// <summary>钻石商城列表(GET)</summary>
ActivityConfig_DiamondShopList,
/// <summary>金币商城列表(GET)</summary>
ActivityConfig_GoldShopList,
/// <summary>救济金配置(GET)</summary>
ActivityConfig_ReliefConfig,
/// <summary>签到池配置(GET)</summary>
ActivityConfig_SignConfigs,
/// <summary>注册配置(GET)</summary>
ActivityConfig_RegisterConfig,
/// <summary>战令配置(GET)</summary>
ActivityConfig_BattleOrderConfig,
/// <summary>捕鱼返利配置(GET)</summary>
ActivityConfig_FishingReturnConfig,
// ---------------- Hall ----------------
/// <summary>存入保险箱(GET)</summary>
Hall_SaveSafeBox,
@@ -5,6 +5,7 @@ using UnityEngine;
public class LLBTDieEvent : BJEventBase
{
public GameObject obj;
private void Awake()
{
scoreCount = 2;
@@ -12,9 +13,21 @@ public class LLBTDieEvent : BJEventBase
public override void Init(int goldCount, int posID, int paobei, int fishScore, int beishu, Action<int> action, Action action1 = null)
{
base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1);
StartCoroutine(yanshi());
}
public void bjLLBT()
{
CallBJ();
}
IEnumerator yanshi()
{
yield return new WaitForSeconds(3.5f);
CallBJ();
yield return new WaitForSeconds(5f);
CallBJ();
yield return new WaitForSeconds(3.6f);
obj.SetActive(false);
}
}
File diff suppressed because it is too large Load Diff
@@ -7452,6 +7452,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
bossName:
@@ -68,6 +68,22 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: 0.10915822
objectReference: {fileID: 0}
- target: {fileID: 320664690865933118, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
propertyPath: m_SceneBindings.Array.size
value: 6
objectReference: {fileID: 0}
- target: {fileID: 320664690865933118, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
propertyPath: m_SceneBindings.Array.data[5].key
value:
objectReference: {fileID: 3346501188439748426, guid: 01a250db6b8b0264792df81b66b91d6c,
type: 2}
- target: {fileID: 320664690865933118, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
propertyPath: m_SceneBindings.Array.data[5].value
value:
objectReference: {fileID: 1621037776088824803}
- target: {fileID: 1506037607010321960, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
propertyPath: m_CameraType
@@ -82,10 +98,10 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 5786818863089195692}
- targetCorrespondingSourceObject: {fileID: 1264887924163234, guid: 185787de59441cf49be38e6b31956cd1,
- targetCorrespondingSourceObject: {fileID: 1646037670075368, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
insertIndex: -1
addedObject: {fileID: 3615978696677865829}
addedObject: {fileID: 1621037776088824803}
- targetCorrespondingSourceObject: {fileID: 1913982629221611, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
insertIndex: -1
@@ -95,57 +111,6 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 5171096580736390918}
m_SourcePrefab: {fileID: 100100000, guid: 185787de59441cf49be38e6b31956cd1, type: 3}
--- !u!1 &2982629942220973619 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1264887924163234, guid: 185787de59441cf49be38e6b31956cd1,
type: 3}
m_PrefabInstance: {fileID: 2981400861485360273}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3615978696677865829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2982629942220973619}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
- {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5786818863089195692}
m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp
m_MethodName: SetScore
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5786818863089195692}
m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp
m_MethodName: Die
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &2982826138642937302 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1461080587964743, guid: 185787de59441cf49be38e6b31956cd1,
@@ -235,6 +200,7 @@ MonoBehaviour:
coinFlyDuration: 0.5
coinArrivalInterval: 0.1
isSelf: 0
autoFinishOnScoreFull: 1
totalBJCount: 0
currBJCount: 0
isEffEnd: 0
@@ -242,6 +208,51 @@ MonoBehaviour:
isScoreEnd: 0
isGoldEffectStart: 0
playable: {fileID: 0}
--- !u!114 &1621037776088824803
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2983011714766503801}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Events:
m_Signals:
- {fileID: 11400000, guid: 344d1087c2077664ebcfebc51d6cf167, type: 2}
- {fileID: 11400000, guid: aca498d52b11314418047bc8d6c097ae, type: 2}
m_Events:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5786818863089195692}
m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp
m_MethodName: SetScore
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5786818863089195692}
m_TargetAssemblyTypeName: YGLGDieEvent, Assembly-CSharp
m_MethodName: Die
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &2983314281452826746 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1913982629221611, guid: 185787de59441cf49be38e6b31956cd1,
@@ -11,6 +11,9 @@ public class YGLGDieEvent : BJEventBase
public override void Init(int goldCount, int posID, int paobei, int fishScore, int beishu, Action<int> action, Action action1 = null)
{
base.Init(goldCount, posID, paobei, fishScore, beishu, action, action1);
StartCoroutine(ScrollTo_Time(bJbeishu, () => MoveToSit()));
}
public void SetScore()
{
@@ -60,4 +63,45 @@ public class YGLGDieEvent : BJEventBase
onComplete?.Invoke();
}
private IEnumerator ScrollTo_Time(int target, Action onComplete)
{
yield return new WaitForSeconds(3.6f);
int from = currScore;
float duration = 5f;
float elapsed = 0f;
float coinInterval = 0.12f;
float nextCoinTime = 0f;
while (elapsed < duration)
{
elapsed += Time.deltaTime;
float t = elapsed / duration;
currScore = (int)Mathf.Lerp(from, target, t);
if (tMP_Score != null)
tMP_Score.text = currScore.ToString();
// 每隔 coinInterval 爆一波金币
if (elapsed >= nextCoinTime)
{
nextCoinTime += coinInterval;
}
yield return null;
}
currScore = target;
if (tMP_Score != null)
tMP_Score.text = target.ToString();
//// 最后补一波金币
//layeredPool = new LayeredPool(paoBei * fishScore / 2, 1);
//BigPrize(5, 10);
//yield return new WaitForSeconds(0.3f); // 等最后一批金币飞到
onComplete?.Invoke();
yield return new WaitForSeconds(5f);
Die();
}
}
@@ -16,7 +16,7 @@ PrefabInstance:
- target: {fileID: 2997278484354343629, guid: d91ace63f3f1e264397418d302f4f473,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4089144667359713400, guid: d91ace63f3f1e264397418d302f4f473,
type: 3}
@@ -188,6 +188,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
bossName:
@@ -16,7 +16,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &3718238474006946628
Transform:
m_ObjectHideFlags: 0
@@ -59,7 +59,7 @@ MonoBehaviour:
pathList:
skeleton: {fileID: 0}
isSpine: 1
fishTypeID: 0
fishTypeID: 13033
currState: 0
HP: 5
effect_Die: {fileID: 0}
@@ -132,8 +132,8 @@ MonoBehaviour:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1665854515320995799}
m_TargetAssemblyTypeName: BJEventBase, Assembly-CSharp
m_MethodName: ManualFinishBJ
m_TargetAssemblyTypeName: DefaultBJEvent, Assembly-CSharp
m_MethodName: TimeLineEnd
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -162,7 +162,7 @@ MonoBehaviour:
type: 3}
currScore: 0
maxScore: 0
scoreCount: 0
scoreCount: 1
posID: 0
paoBei: 0
fishScore: 0
@@ -13,6 +13,16 @@ PrefabInstance:
propertyPath: m_Name
value: Game177_yilong
objectReference: {fileID: 0}
- target: {fileID: 4144863413135012992, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4144863413135012992, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 4729582408731192932, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_SceneBindings.Array.size
@@ -29,6 +39,706 @@ PrefabInstance:
propertyPath: m_SceneBindings.Array.data[12].value
value:
objectReference: {fileID: 473942705176731120}
- target: {fileID: 4729582408731192932, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[6].second
value:
objectReference: {fileID: 0}
- target: {fileID: 4729582408731192932, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_ExposedReferences.m_References.Array.data[9].second
value:
objectReference: {fileID: 0}
- target: {fileID: 6473932968833178269, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473945913859011714, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473947168603511170, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473949292880977062, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473957931113628973, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473962799657088900, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473964773218001744, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6473964773218001744, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473965395585073913, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473969700634659620, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473974612536419749, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473979665797144853, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473980457729985249, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473983783359016358, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473984182233041847, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473985019722902353, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473986259747406892, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473987327705947297, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473989764606627090, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473989957868348658, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6473994753325382195, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474012658250119001, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474015690976125590, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474023831800210232, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474026730539723735, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474031770658936035, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474065102820363817, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474073843303593970, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474091927234495377, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474100372368934490, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474102219559734943, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474124136307752675, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474124779308717556, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474131801280172889, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474145207039565630, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474148085812527721, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474149362581578120, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474167035469396782, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474174939976889616, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474175200188619214, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474177906887600674, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474195420056781656, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474258512750926397, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474258795225210946, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474262400879380390, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474271602482024702, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474496370013850294, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474500957704658626, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474509391426705579, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474512007950813308, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474523312789041481, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474526293332641619, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474540683004363640, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474558078961528289, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474570748982224667, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474582468632419713, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474589718614838976, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474591234447959206, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474593010669734765, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474598564298913247, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474601705221007507, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474624951609998831, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474635726064435661, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474638841269845582, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474643765552861004, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474652755509966732, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474659038477596899, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474664206386288748, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474664904207108129, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474676565067086495, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474696002323434913, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474700053074335512, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474704164703770999, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474723321740652818, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474728539678746343, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474730667927530744, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474740384176154031, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474742188339935796, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474742579529337019, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474744571595806043, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474751960129795566, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474779309074574997, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474783004645744738, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474785556578447766, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474787822385741142, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474804136161714180, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474817535192094647, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474829115450086167, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474844597151919634, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474845759240026752, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474860326375077712, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474880874771378489, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474904799637450332, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474917153849447341, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474919367175591541, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474926801233421223, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474929654533523251, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474931535387573912, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474933392938724951, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474945200369530404, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474946530441700307, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474946966914697428, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474948521292880318, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474948908709507189, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474954190571768841, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474968961113781893, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474987501725724109, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6474999897147944615, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475015650359745452, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475018657645657415, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475024192077402850, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475038162220408806, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475039408898571911, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475041641372602033, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475044392394861481, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475044724770292377, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475045274232360245, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475047239606532006, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475472796300718009, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475473612385775067, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475476252981879310, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475493651114327510, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475493972610869409, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475508454424299022, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475510460204900725, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475520613853262395, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475534675715099198, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475536124392867889, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475551909252815425, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475557976790232448, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475562200293936464, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475566451161833000, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475570731893300442, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475588105176887317, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475592607156834014, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475598793678912373, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475599090740362590, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6475609040723793329, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 6621424607753161970, guid: 3a2d8052104ea1a45aab65e5511276c0,
type: 3}
propertyPath: m_LocalPosition.x
@@ -80,7 +790,9 @@ PrefabInstance:
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 7621483054875922705, guid: 3a2d8052104ea1a45aab65e5511276c0, type: 3}
- {fileID: 652958895766593643, guid: 3a2d8052104ea1a45aab65e5511276c0, type: 3}
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4144863413135012992, guid: 3a2d8052104ea1a45aab65e5511276c0,
@@ -143,6 +855,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
isNot1: 0
ischild0: 0
depthOffset: 0
bossName:
@@ -453,7 +453,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 0180faaabe140fe44a828d7e68b665fe, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 0180faaabe140fe44a828d7e68b665fe, type: 3}
propertyPath: m_TagString
@@ -614,5 +614,6 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 810
@@ -166,7 +166,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: b3920823ccb1c1c42b1627122ebc589b, type: 3}
propertyPath: m_TagString
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
@@ -180,14 +180,15 @@ MonoBehaviour:
is3D: 0
forwordXYZ: Z
fishenum: 0
moveTime: 0
isyz: 0
moveTime: 90
isyz: 1
yzID:
colliderList: []
lockPoint: {fileID: 1497276017444126853}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &3932267669272526887 stripped
@@ -244,6 +245,30 @@ PrefabInstance:
propertyPath: m_TagString
value: Fish
objectReference: {fileID: 0}
- target: {fileID: 4243736805655561, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4243736805655561, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4243736805655561, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4243736805655561, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4243736805655561, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4243736805655561, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -262,11 +287,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalRotation.z
@@ -274,15 +299,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -0
value: 90
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -0
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 1461200f483c12642a09ef755696d8c4, type: 3}
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 6f9ba87c0c298204597a3786e912d4f3, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 6f9ba87c0c298204597a3786e912d4f3, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 6f9ba87c0c298204597a3786e912d4f3, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 6f9ba87c0c298204597a3786e912d4f3, type: 3}
@@ -186,8 +186,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 6613943160179652640}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &4798522997234469819 stripped
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: b153e0a4abc0c664cb98ddf7afb53870, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: b153e0a4abc0c664cb98ddf7afb53870, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: b153e0a4abc0c664cb98ddf7afb53870, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: b153e0a4abc0c664cb98ddf7afb53870, type: 3}
@@ -192,8 +192,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 843371976736088860}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!1001 &6761791426332002869
@@ -213,7 +213,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: d0d8725bed789824bb1b0462fde12f45, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: d0d8725bed789824bb1b0462fde12f45, type: 3}
propertyPath: m_TagString
@@ -281,7 +281,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: d0d8725bed789824bb1b0462fde12f45, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: d0d8725bed789824bb1b0462fde12f45, type: 3}
@@ -346,8 +346,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 65027620505796751}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &7024093533638435985 stripped
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 51618a9fa649dc84bbbb0f2b2ae34548, type: 3}
@@ -186,8 +186,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 1621051044293585920}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &4331926983231046282 stripped
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: ee1e72c133ca6124485715190eaa1e3a, type: 3}
@@ -192,8 +192,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 4063311169368434864}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!1001 &5582305301452974272
@@ -213,7 +213,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 4760e9d2d74a347458314fcb191d6d8b, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 4760e9d2d74a347458314fcb191d6d8b, type: 3}
propertyPath: m_TagString
@@ -281,7 +281,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 4760e9d2d74a347458314fcb191d6d8b, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 4760e9d2d74a347458314fcb191d6d8b, type: 3}
@@ -352,7 +352,8 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 4698499819094165687}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
@@ -186,8 +186,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 4929093940051466871}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &7201521853190922041 stripped
@@ -258,31 +259,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
value: 180
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -0
value: 90
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -0
value: -90
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 8aca3c1d421ff8e4c87619bd4511a615, type: 3}
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 574ac90f80e643441b595de13ffc99fe, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 574ac90f80e643441b595de13ffc99fe, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 574ac90f80e643441b595de13ffc99fe, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 574ac90f80e643441b595de13ffc99fe, type: 3}
@@ -192,8 +192,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 1513225839292478598}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!1001 &6202979445234625319
@@ -109,7 +109,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_TagString
@@ -193,7 +193,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114313026266067498, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
@@ -264,8 +264,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 8119681082241791630}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: 30
isRotate: 1
isNot1: 0
ischild0: 1
depthOffset: 1000
--- !u!1001 &2585595305865003636
@@ -474,27 +475,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.w
value: 0.61237246
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.x
value: -0.61237246
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.y
value: -0.3535534
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.z
value: -0.3535534
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -60
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4470112387431263, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -512,6 +513,34 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4632457200066912, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114313026266067498, guid: 2795507d1f0204c489f2c5cbde35ee6d, type: 3}
m_RemovedGameObjects: []
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 10dcab870ce73d24abf17f9ea84712ad, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: 10dcab870ce73d24abf17f9ea84712ad, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: 10dcab870ce73d24abf17f9ea84712ad, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: 10dcab870ce73d24abf17f9ea84712ad, type: 3}
@@ -186,8 +186,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 8770686222094608858}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &3527731164989796449 stripped
@@ -53,7 +53,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: d441aa2f2c0f8524e9a494199140b726, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1709254077376921, guid: d441aa2f2c0f8524e9a494199140b726, type: 3}
propertyPath: m_TagString
@@ -121,7 +121,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4703437598541787, guid: d441aa2f2c0f8524e9a494199140b726, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114884547391421755, guid: d441aa2f2c0f8524e9a494199140b726, type: 3}
@@ -186,8 +186,9 @@ MonoBehaviour:
colliderList: []
lockPoint: {fileID: 6143660667663271190}
bingDongEffect: {fileID: 0}
rotationPY: 0
rotationPY: -90
isRotate: 1
isNot1: 1
ischild0: 1
depthOffset: 1000
--- !u!4 &3079608771229918319 stripped
@@ -93,8 +93,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 26.52
m_fontSizeBase: 26.52
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -171,8 +171,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 125}
m_SizeDelta: {x: 734.6, y: 100}
m_AnchoredPosition: {x: 0, y: 138.68408}
m_SizeDelta: {x: 708.4, y: 63.3681}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4157826458431261933
CanvasRenderer:
@@ -202,7 +202,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 728a9b8f0c9f0c546a8d897ab96863ac, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -230,7 +230,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 32767
Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 728a9b8f0c9f0c546a8d897ab96863ac
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
@@ -59,7 +59,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -675,7 +675,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -2611,7 +2611,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -2721,7 +2721,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -3207,7 +3207,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -3602,7 +3602,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -3678,7 +3678,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -102,7 +102,6 @@ using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using static UnityEditor.Progress;
public class GameMainPanel_FishBase : GameMainPanel_Base
{
@@ -772,11 +771,17 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
screenPos, null, out Vector2 localPos);
Vector2 dir = localPos - sit.tra_CurrTurret.GetComponent<RectTransform>().anchoredPosition;
// ⭐ 鱼太近时 dir 接近零向量,Atan2 会不稳定导致原地转圈 → 跳过
const float minDistance = 5f;
if (dir.sqrMagnitude < minDistance * minDistance) return;
float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg - 90f;
if (sit.IsFlipped) angle = (angle + 180f) % 360f;
sit.SetRotation(angle);
SyncRotate(angle);
}
private void HandleAutoRotate()
@@ -899,6 +904,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
clickTime += Time.deltaTime;
if (clickTime < attackTime) return;
// ⭐ 子弹上限校验(先于扣费和状态切换)
if (IsBulletLimitReached(currSitData.user))
{
clickTime = 0; // 重置计时,下次再试
return;
}
clickTime = 0;
float angle = currSitData.currentAngle;
@@ -1021,6 +1033,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
autoFireTimer += Time.deltaTime;
if (autoFireTimer < attackTime) return;
// ⭐ 子弹上限校验(先于状态切换和扣费)
if (IsBulletLimitReached(currSitData.user))
{
autoFireTimer = 0f; // 重置计时,下次再试
return;
}
autoFireTimer = 0f;
float angle = currSitData.currentAngle;
@@ -1364,6 +1383,27 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#endregion
#region BulletModule(子弹系统)
public int sitBulletMaxCount = 80;
/// <summary>
/// 检查指定用户是否已达50发子弹上限
/// </summary>
private bool IsBulletLimitReached(string userId)
{
if (bulletParent == null) return false;
int count = 0;
foreach (Transform child in bulletParent.transform)
{
if (child.TryGetComponent<BullitMove>(out var bm) && bm.userid == userId)
count++;
}
if (count >= sitBulletMaxCount)
{
UIManager.Instance.ShowBoardError("子弹已达上限");
return true;
}
return false;
}
private BullitMove CreateBullet(SitPosData sit, Vector2 pos, float angle, bool isDouble, bool isLock, string id,
MonsterContral lockTarget = null, Transform lockHitPos = null)
{
@@ -1376,6 +1416,19 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
GameObject prefab = isDouble ? sit.currentTurret.bulletPrefab_Two : sit.currentTurret.bulletPrefab;
// ⭐ 每座位最多50发子弹(先校验,不扣钱)
int activeBullets = 0;
foreach (Transform child in bulletParent.transform)
{
if (child.TryGetComponent<BullitMove>(out var bm) && bm.userid == sit.user)
activeBullets++;
}
if (activeBullets >= 50)
{
UIManager.Instance.ShowBoardError($"[子弹上限] 座位{sit.posID}已达50发上限");
return null;
}
if (!sit.ConsumeGold(isDouble ? 2 : 1))
return null;
@@ -402,7 +402,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -555,7 +555,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -1139,7 +1139,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -1334,7 +1334,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -1535,7 +1535,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -2046,7 +2046,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -3129,7 +3129,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -33,12 +33,14 @@ public class UIHome_BY_JJJPanel : SubUIBase
{
base.OnShow(args);
var jjjData = GameManager.Instance.gameConfig.reliefConfigs;
APIRequestList.GetReliefConfig(jjjData =>
{
txt_coinsNum.text = "金币" + jjjData.gold.ToString();
if (GameManager.Instance.user.assets.gold < jjjData.limit&& GameManager.Instance.user.@static.reliefGoldCount>0)
if (GameManager.Instance.user.assets.gold < jjjData.limit && GameManager.Instance.user.@static.reliefGoldCount > 0)
img_DisReceive.gameObject.SetActive(false);
else
img_DisReceive.gameObject.SetActive(true);
});
}
}
@@ -1,4 +1,4 @@
using Assets.Framework.Tool;
using Assets.Framework.Tool;
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
using Assets.MyGame.Scripts.Net.APIRequest.Params;
@@ -35,7 +35,10 @@ public class UIHome_BY_ShopPanel : SubUIBase
Destroy(tra_PrefabParent.GetChild(i).gameObject);
}
foreach (var item in gameConfig.goldShopConfigs)
// 金币商城配置已从 GameConfig 迁移至 ActivityConfig API
APIRequestList.GetGoldShopList(goldList =>
{
foreach (var item in goldList)
{
var obj = Instantiate(obj_ItemPrefab, tra_PrefabParent).transform;
@@ -73,6 +76,7 @@ public class UIHome_BY_ShopPanel : SubUIBase
obj.GetChild(2).GetChild(0).GetComponent<TextMeshProUGUI>().text ="\ue002"+item.diamond.ToString();
obj.GetChild(3).GetComponent<TextMeshProUGUI>().text = item.gold.ToString();
}
});
//
});
@@ -83,7 +87,10 @@ public class UIHome_BY_ShopPanel : SubUIBase
Destroy(tra_PrefabParent.GetChild(i).gameObject);
}
foreach (var item in gameConfig.diamondShopConfigs)
// 钻石商城配置已从 GameConfig 迁移至 ActivityConfig API
APIRequestList.GetDiamondShopList(diamondList =>
{
foreach (var item in diamondList)
{
var obj = Instantiate(obj_ItemPrefab, tra_PrefabParent).transform;
@@ -121,6 +128,7 @@ public class UIHome_BY_ShopPanel : SubUIBase
obj.GetChild(2).GetChild(0).GetComponent<TextMeshProUGUI>().text = item.money.ToString()+"元";
obj.GetChild(3).GetComponent<TextMeshProUGUI>().text = item.diamond.ToString();
}
});
//
});