diff --git a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
index a6527d023..e1c96dad0 100644
Binary files a/Assets/AddressableAssetsData/Windows/addressables_content_state.bin and b/Assets/AddressableAssetsData/Windows/addressables_content_state.bin differ
diff --git a/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Timeline.playable b/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Timeline.playable
index 4494ea1d7..79f282673 100644
--- a/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Timeline.playable
+++ b/Assets/Art/FengLei/ResLY/bundles/by_fish_update/bundles/fish/6005/6005_Timeline.playable
@@ -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
diff --git a/Assets/Art/HHWK/LeiHuangLong/136/cjb_136.controller b/Assets/Art/HHWK/LeiHuangLong/136/cjb_136.controller
index 29f4e01f5..12c41f45a 100644
--- a/Assets/Art/HHWK/LeiHuangLong/136/cjb_136.controller
+++ b/Assets/Art/HHWK/LeiHuangLong/136/cjb_136.controller
@@ -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
diff --git a/Assets/Art/HHWK/LeiHuangLong/136/swim01.anim b/Assets/Art/HHWK/LeiHuangLong/136/swim01.anim
index 78bfbbbfd..5fad74473 100644
--- a/Assets/Art/HHWK/LeiHuangLong/136/swim01.anim
+++ b/Assets/Art/HHWK/LeiHuangLong/136/swim01.anim
@@ -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
diff --git a/Assets/Art/HHWK/LeiHuangLong/144/cjb_144.controller b/Assets/Art/HHWK/LeiHuangLong/144/cjb_144.controller
index 6ca775daf..ebeab0a58 100644
--- a/Assets/Art/HHWK/LeiHuangLong/144/cjb_144.controller
+++ b/Assets/Art/HHWK/LeiHuangLong/144/cjb_144.controller
@@ -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:
diff --git a/Assets/Art/HHWK/LeiHuangLong/144/swim01.anim b/Assets/Art/HHWK/LeiHuangLong/144/swim01.anim
index 78bfbbbfd..e1716b598 100644
--- a/Assets/Art/HHWK/LeiHuangLong/144/swim01.anim
+++ b/Assets/Art/HHWK/LeiHuangLong/144/swim01.anim
@@ -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
diff --git a/Assets/MyGame/Scenes/HHWK.unity b/Assets/MyGame/Scenes/HHWK.unity
index 03502e18b..988f400f1 100644
--- a/Assets/MyGame/Scenes/HHWK.unity
+++ b/Assets/MyGame/Scenes/HHWK.unity
@@ -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
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index d207b41fd..b13d1d342 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -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}
diff --git a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
index 6f8e9189b..82302b36d 100644
--- a/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+++ b/Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
@@ -365,6 +365,7 @@ public class MonsterContral : MonoBehaviour
transform.position = next;
}
public bool isRotate = true;
+ public bool isNot1 = false;
///
/// 根据 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;
- vv.z = rotationPY * (vv.y < 180 ? -1 : 1);
+ }
+ else
+ {
+ vv.z = rotationPY * (vv.y < 180 ? -1 : 1);
+
+ }
transform.GetChild(0).eulerAngles = vv;
}
diff --git a/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs b/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs
index fd60f8782..36d6e60ec 100644
--- a/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs
+++ b/Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs
@@ -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;
diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
index 0b1e5e57b..4d55c39cb 100644
--- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs
@@ -617,15 +617,17 @@ public class CreateFishManager : MonoSingleton
//bossTimer = 3f;
if (!fishTypeConfig.TryGetValue(FishTypeEnum.Boss鱼, out var bossList) || bossList.Count == 0)
return;
- foreach (var item in bossList)
- {
- //if (item.fishNumber == "11027")
- // item.isCreate = 2;
+ //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));
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs
new file mode 100644
index 000000000..b88d5d510
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs
@@ -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
+
+ ///
+ /// 获取活动配置（聚合）（GET）
+ /// 返回：ActivityConfig
+ ///
+ public static void GetActivityConfig(Action callback)
+ {
+ APIManager.Response(APIType.ActivityConfig_Get, callback);
+ }
+
+ ///
+ /// 获取钻石商城列表（GET）
+ ///
+ public static void GetDiamondShopList(Action> callback)
+ {
+ APIManager.Response>(APIType.ActivityConfig_DiamondShopList, callback);
+ }
+
+ ///
+ /// 获取金币商城列表（GET）
+ ///
+ public static void GetGoldShopList(Action> callback)
+ {
+ APIManager.Response>(APIType.ActivityConfig_GoldShopList, callback);
+ }
+
+ ///
+ /// 获取救济金配置（GET）
+ ///
+ public static void GetReliefConfig(Action callback)
+ {
+ APIManager.Response(APIType.ActivityConfig_ReliefConfig, callback);
+ }
+
+ ///
+ /// 获取签到池配置（GET）
+ ///
+ public static void GetSignConfigs(Action> callback)
+ {
+ APIManager.Response>(APIType.ActivityConfig_SignConfigs, callback);
+ }
+
+ ///
+ /// 获取注册配置（GET）
+ ///
+ public static void GetRegisterConfig(Action callback)
+ {
+ APIManager.Response(APIType.ActivityConfig_RegisterConfig, callback);
+ }
+
+ ///
+ /// 获取战令配置（GET）
+ ///
+ public static void GetBattleOrderConfig(Action callback)
+ {
+ APIManager.Response(APIType.ActivityConfig_BattleOrderConfig, callback);
+ }
+
+ ///
+ /// 获取捕鱼返利配置（GET）
+ ///
+ public static void GetFishingReturnConfig(Action callback)
+ {
+ APIManager.Response(APIType.ActivityConfig_FishingReturnConfig, callback);
+ }
+
+ #endregion
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs.meta b/Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs.meta
new file mode 100644
index 000000000..626b22e2f
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 196e84aecdf457e448d7b20b64beb1de
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs
new file mode 100644
index 000000000..5235630cd
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs
@@ -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
+{
+ ///
+ /// 活动配置实体类（独立于 GameConfig）
+ /// 商店金币/钻石、签到、救济金等已从 GameConfig 迁移至此
+ ///
+ [Serializable]
+ public class ActivityConfig
+ {
+ ///
+ /// 数据ID
+ ///
+ public string id;
+
+ ///
+ /// 是否删除
+ ///
+ public bool isDelete;
+
+ ///
+ /// 创建人信息
+ ///
+ public OptionUserInfo createInfo;
+
+ ///
+ /// 战令配置
+ ///
+ public BattleOrderConfig battleOrderConfig;
+
+ ///
+ /// 救济金配置
+ ///
+ public ReliefConfig reliefConfig;
+
+ ///
+ /// 签到池配置
+ ///
+ public List signConfigs;
+
+ ///
+ /// 金币商城配置
+ ///
+ public List goldShopConfigs;
+
+ ///
+ /// 钻石商城配置
+ ///
+ public List diamondShopConfigs;
+
+ ///
+ /// 注册配置
+ ///
+ public RegisterConfig registerConfig;
+
+ ///
+ /// 捕鱼返利配置
+ ///
+ public FishingReturnConfig fishingReturnConfig;
+
+ ///
+ /// 抽奖活动配置
+ ///
+ public LotteryActivityConfig lotteryActivityConfig;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs.meta
new file mode 100644
index 000000000..6dd9b0f7a
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8f6f82be72e53a94aa1f11af3fd90261
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs
index 97a606c7d..619ea2638 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs
@@ -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
{
///
/// 游戏后台配置（Unity 解析版）
+ /// 注：商店/签到/救济等配置已迁移至 ActivityConfig
///
[Serializable]
public class GameConfig
@@ -65,35 +66,14 @@ namespace Assets.MyGame.Scripts.Net.API
///
public List vipLevelConfigs;
- ///
- /// 签到池配置
- ///
- public List signConfigs;
-
///
/// 月卡配置
///
public List monthCardConfigs;
- ///
- /// 救济金配置
- ///
- public ReliefConfig reliefConfigs;
-
- ///
- /// 金币商城配置
- ///
- public List goldShopConfigs;
-
- ///
- /// 钻石商城配置
- ///
- public List diamondShopConfigs;
///
/// 击杀配置
///
-
- public object killConfig ;
+ public object killConfig;
}
-
-}
+}
\ No newline at end of file
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs
new file mode 100644
index 000000000..72e1fcf02
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+ ///
+ /// 战令配置
+ ///
+ [Serializable]
+ public class BattleOrderConfig
+ {
+ public bool isOpen;
+ public long endTime;
+ public string ruleDesc;
+ public string buyDesc;
+ public string advanceGiftDesc;
+ public List levelConfig;
+ public List advanceGift;
+ }
+
+ ///
+ /// 战令等级配置
+ ///
+ [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;
+ }
+
+ ///
+ /// 进阶奖励配置
+ ///
+ [Serializable]
+ public class AdvanceGiftConfig
+ {
+ public int type;
+ public string name;
+ public int count;
+ public string imageUrl;
+ public int payType;
+ public int payCount;
+ public List giftList;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs.meta
new file mode 100644
index 000000000..43ad753c7
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dce793a3439f7564ebdca4d510156939
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/DiamondShopConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/DiamondShopConfig.cs
index df18cd685..d0e0958dd 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/DiamondShopConfig.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/DiamondShopConfig.cs
@@ -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
/// 现金价格
///
public double money;
+
+ ///
+ /// 经销商价格
+ ///
+ public double dealerMoney;
+
+ ///
+ /// 是否首充限制
+ ///
+ public bool isFirst;
}
-
-
-
-}
+}
\ No newline at end of file
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs
new file mode 100644
index 000000000..570bbfd1e
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+ ///
+ /// 捕鱼返金币活动配置
+ ///
+ [Serializable]
+ public class FishingReturnConfig
+ {
+ ///
+ /// 是否开启活动
+ ///
+ public bool isEnabled;
+
+ ///
+ /// 返利比例（千分之一 = 0.001）
+ ///
+ public double returnRate;
+
+ ///
+ /// 每日返利上限（0=无上限）
+ ///
+ public long dailyMaxReturn;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs.meta
new file mode 100644
index 000000000..cc433c4fd
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0a7dc1e056fdffd49943877ede5cfa7d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/GoldShopConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/GoldShopConfig.cs
index 28d6da64d..35dd033ee 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/GoldShopConfig.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/GoldShopConfig.cs
@@ -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;
///
- /// 钻石数量
+ /// 钻石数量（购买所需钻石）
///
public int diamond;
+
+ ///
+ /// 经销商价格（钻石）
+ ///
+ public int dealerDiamond;
+
+ ///
+ /// 是否首充限制
+ ///
+ public bool isFirst;
}
-
-
-}
+}
\ No newline at end of file
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs
new file mode 100644
index 000000000..0bf283cdd
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs
@@ -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 pools;
+ public List costs;
+ public int userMaxDraw;
+ }
+
+ [Serializable]
+ public class LotteryPoolLevel
+ {
+ public string level;
+ public int count;
+ public int weight;
+ public List prizeList;
+ }
+
+ [Serializable]
+ public class LotteryPrize
+ {
+ public string type;
+ public long count;
+ public string name;
+ public string icon;
+ public int weight;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs.meta
new file mode 100644
index 000000000..4888fe524
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0eb06d724025e75439446a16126c5a78
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs
new file mode 100644
index 000000000..ef3ae5e96
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs
@@ -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
+{
+ ///
+ /// 注册配置
+ ///
+ [Serializable]
+ public class RegisterConfig
+ {
+ ///
+ /// 注册初始金币
+ ///
+ public int initGold;
+
+ ///
+ /// 注册初始钻石
+ ///
+ public int initDiamond;
+
+ ///
+ /// 注册初始道具列表
+ ///
+ public List initProductList;
+ }
+}
diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs.meta b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs.meta
new file mode 100644
index 000000000..2d7523df2
--- /dev/null
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4eec481164da9f74592228e1f000d967
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MyGame/Scripts/Net/APIType.cs b/Assets/MyGame/Scripts/Net/APIType.cs
index 574505db2..48c588b84 100644
--- a/Assets/MyGame/Scripts/Net/APIType.cs
+++ b/Assets/MyGame/Scripts/Net/APIType.cs
@@ -1,4 +1,4 @@
-namespace Assets.MyGame.Scripts.Net
+namespace Assets.MyGame.Scripts.Net
{
///
/// 所有接口类型（自动生成）
@@ -18,6 +18,32 @@
GameConfig_Update,
+ // ---------------- ActivityConfig ----------------
+ /// 获取活动配置·聚合（GET）
+ ActivityConfig_Get,
+
+ /// 钻石商城列表（GET）
+ ActivityConfig_DiamondShopList,
+
+ /// 金币商城列表（GET）
+ ActivityConfig_GoldShopList,
+
+ /// 救济金配置（GET）
+ ActivityConfig_ReliefConfig,
+
+ /// 签到池配置（GET）
+ ActivityConfig_SignConfigs,
+
+ /// 注册配置（GET）
+ ActivityConfig_RegisterConfig,
+
+ /// 战令配置（GET）
+ ActivityConfig_BattleOrderConfig,
+
+ /// 捕鱼返利配置（GET）
+ ActivityConfig_FishingReturnConfig,
+
+
// ---------------- Hall ----------------
/// 存入保险箱（GET）
Hall_SaveSafeBox,
@@ -297,4 +323,4 @@
/// 获取聊天记录（GET）
Customer_ChatLog,
}
-}
+}
\ No newline at end of file
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/LLBTDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/LLBTDieEvent.cs
index e17953364..a4c12db83 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/LLBTDieEvent.cs
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/LLBTDieEvent.cs
@@ -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 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);
+ }
}
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/eff_dead_192_timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/eff_dead_192_timeline Variant.prefab
index 4bf47622c..ef81a74fc 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/eff_dead_192_timeline Variant.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/LLBT/eff_dead_192_timeline Variant.prefab
@@ -2456,6 +2456,170 @@ PrefabInstance:
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
+ - target: {fileID: 4010308029220558, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99874985
+ objectReference: {fileID: 0}
+ - target: {fileID: 4010308029220558, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.008426606
+ objectReference: {fileID: 0}
+ - target: {fileID: 4010308029220558, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.04524815
+ objectReference: {fileID: 0}
+ - target: {fileID: 4010308029220558, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.01950412
+ objectReference: {fileID: 0}
+ - target: {fileID: 4034516472705926, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.6382612
+ objectReference: {fileID: 0}
+ - target: {fileID: 4034516472705926, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.026813796
+ objectReference: {fileID: 0}
+ - target: {fileID: 4034516472705926, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.0118066985
+ objectReference: {fileID: 0}
+ - target: {fileID: 4034516472705926, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7692622
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1.0000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.0000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.042078856
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 5.158105
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1.899313
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.037081834
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.6898382
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.71376044
+ objectReference: {fileID: 0}
+ - target: {fileID: 4042259442668691, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.11530084
+ objectReference: {fileID: 0}
+ - target: {fileID: 4056674845431541, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.6443269
+ objectReference: {fileID: 0}
+ - target: {fileID: 4056674845431541, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.008694912
+ objectReference: {fileID: 0}
+ - target: {fileID: 4056674845431541, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.18264753
+ objectReference: {fileID: 0}
+ - target: {fileID: 4056674845431541, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7425679
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.6554914
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.7860575
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 2.5789287
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.40866753
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.5885104
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.69015604
+ objectReference: {fileID: 0}
+ - target: {fileID: 4059728461115978, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.10164166
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.0000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.7858674
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 5.151029
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 2.0672379
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.019040272
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.69519246
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.69176364
+ objectReference: {fileID: 0}
+ - target: {fileID: 4061014775253342, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.19444273
+ objectReference: {fileID: 0}
+ - target: {fileID: 4064425915772771, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9869915
+ objectReference: {fileID: 0}
+ - target: {fileID: 4064425915772771, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.030923324
+ objectReference: {fileID: 0}
+ - target: {fileID: 4064425915772771, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.1540548
+ objectReference: {fileID: 0}
+ - target: {fileID: 4064425915772771, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.03403938
+ objectReference: {fileID: 0}
- target: {fileID: 4095283588563570, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@@ -2496,6 +2660,962 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4095947791088692, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.4595233
+ objectReference: {fileID: 0}
+ - target: {fileID: 4095947791088692, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.15572363
+ objectReference: {fileID: 0}
+ - target: {fileID: 4095947791088692, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.87398785
+ objectReference: {fileID: 0}
+ - target: {fileID: 4095947791088692, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.027087694
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.9999999
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.45795158
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000007629394
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.95644265
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.26983288
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.07513359
+ objectReference: {fileID: 0}
+ - target: {fileID: 4157008281672205, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.082235254
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.4619596
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00000030517577
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9623639
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.24709901
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.10838694
+ objectReference: {fileID: 0}
+ - target: {fileID: 4221802970622096, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.032405175
+ objectReference: {fileID: 0}
+ - target: {fileID: 4235568301142156, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9979274
+ objectReference: {fileID: 0}
+ - target: {fileID: 4235568301142156, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.020516405
+ objectReference: {fileID: 0}
+ - target: {fileID: 4235568301142156, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.038559817
+ objectReference: {fileID: 0}
+ - target: {fileID: 4235568301142156, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.04725521
+ objectReference: {fileID: 0}
+ - target: {fileID: 4256905037832303, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99521494
+ objectReference: {fileID: 0}
+ - target: {fileID: 4256905037832303, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.056426983
+ objectReference: {fileID: 0}
+ - target: {fileID: 4256905037832303, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.07863081
+ objectReference: {fileID: 0}
+ - target: {fileID: 4256905037832303, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.013432988
+ objectReference: {fileID: 0}
+ - target: {fileID: 4265892325526526, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -1.5781212
+ objectReference: {fileID: 0}
+ - target: {fileID: 4265892325526526, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0068881623
+ objectReference: {fileID: 0}
+ - target: {fileID: 4265892325526526, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00000021388435
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.13491169
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.5794973
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 3.9736204
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.70538807
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.00015968182
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.00004022155
+ objectReference: {fileID: 0}
+ - target: {fileID: 4282017395467462, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.7088213
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.2551665
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.4259257
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 3.6784248
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.69329953
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.58255917
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.39766088
+ objectReference: {fileID: 0}
+ - target: {fileID: 4287453969011061, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.14773759
+ objectReference: {fileID: 0}
+ - target: {fileID: 4293269689031208, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99532884
+ objectReference: {fileID: 0}
+ - target: {fileID: 4293269689031208, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.044879764
+ objectReference: {fileID: 0}
+ - target: {fileID: 4293269689031208, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.080434084
+ objectReference: {fileID: 0}
+ - target: {fileID: 4293269689031208, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.0289263
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.0000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.418094
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 5.1659555
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1.9529527
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.011525903
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.69445497
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.6942422
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322059040009367, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.18875208
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322134133695179, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.48435852
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322134133695179, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.5261816
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322134133695179, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.3682743
+ objectReference: {fileID: 0}
+ - target: {fileID: 4322134133695179, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.5940571
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.0000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.4700035
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.00000030517577
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99038196
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.11087895
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.022910263
+ objectReference: {fileID: 0}
+ - target: {fileID: 4330286383536826, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.07952764
+ objectReference: {fileID: 0}
+ - target: {fileID: 4339806414043346, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9982936
+ objectReference: {fileID: 0}
+ - target: {fileID: 4339806414043346, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.016638394
+ objectReference: {fileID: 0}
+ - target: {fileID: 4339806414043346, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.05293839
+ objectReference: {fileID: 0}
+ - target: {fileID: 4339806414043346, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.018182537
+ objectReference: {fileID: 0}
+ - target: {fileID: 4342590031528317, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1.0000001
+ objectReference: {fileID: 0}
+ - target: {fileID: 4342590031528317, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.000003967285
+ objectReference: {fileID: 0}
+ - target: {fileID: 4342590031528317, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.98780423
+ objectReference: {fileID: 0}
+ - target: {fileID: 4342590031528317, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.13057779
+ objectReference: {fileID: 0}
+ - target: {fileID: 4342590031528317, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.048402254
+ objectReference: {fileID: 0}
+ - target: {fileID: 4342590031528317, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.06963855
+ objectReference: {fileID: 0}
+ - target: {fileID: 4358820414591120, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9980395
+ objectReference: {fileID: 0}
+ - target: {fileID: 4358820414591120, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.004055187
+ objectReference: {fileID: 0}
+ - target: {fileID: 4358820414591120, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.059759013
+ objectReference: {fileID: 0}
+ - target: {fileID: 4358820414591120, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.018156905
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.9382318
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.640238
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 2.92947
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.5016965
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.57982385
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.63018936
+ objectReference: {fileID: 0}
+ - target: {fileID: 4377174855566797, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.122336574
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378836290012583, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99570614
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378836290012583, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.054471195
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378836290012583, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.067113504
+ objectReference: {fileID: 0}
+ - target: {fileID: 4378836290012583, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.033136494
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.46323818
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0000012207031
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.0000007629394
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99154353
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.08668922
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.09646587
+ objectReference: {fileID: 0}
+ - target: {fileID: 4385915727530066, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.0045508607
+ objectReference: {fileID: 0}
+ - target: {fileID: 4437429591877351, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.6931104
+ objectReference: {fileID: 0}
+ - target: {fileID: 4437429591877351, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.02952583
+ objectReference: {fileID: 0}
+ - target: {fileID: 4437429591877351, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.09199848
+ objectReference: {fileID: 0}
+ - target: {fileID: 4437429591877351, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7143266
+ objectReference: {fileID: 0}
+ - target: {fileID: 4484306951216226, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9963464
+ objectReference: {fileID: 0}
+ - target: {fileID: 4484306951216226, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.030044906
+ objectReference: {fileID: 0}
+ - target: {fileID: 4484306951216226, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.07004614
+ objectReference: {fileID: 0}
+ - target: {fileID: 4484306951216226, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.038531583
+ objectReference: {fileID: 0}
+ - target: {fileID: 4498018578953239, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.5375876
+ objectReference: {fileID: 0}
+ - target: {fileID: 4498018578953239, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.50053316
+ objectReference: {fileID: 0}
+ - target: {fileID: 4498018578953239, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.5675811
+ objectReference: {fileID: 0}
+ - target: {fileID: 4498018578953239, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.37191108
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.50104165
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 5.11104
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1.9430813
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.10170055
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.6712409
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.73378515
+ objectReference: {fileID: 0}
+ - target: {fileID: 4550198382286464, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.025534524
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.1478362
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.503174
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 3.3133526
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.606455
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.5881598
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.52159464
+ objectReference: {fileID: 0}
+ - target: {fileID: 4587993745617398, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.11924518
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.9300205
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 5.0301347
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 2.0791993
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.18219458
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.641445
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.74407107
+ objectReference: {fileID: 0}
+ - target: {fileID: 4613035250225074, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.04137337
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623486285237576, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9955687
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623486285237576, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.059620634
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623486285237576, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.07198212
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623486285237576, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.0103410445
+ objectReference: {fileID: 0}
+ - target: {fileID: 4633478662003738, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.95942724
+ objectReference: {fileID: 0}
+ - target: {fileID: 4633478662003738, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.16883264
+ objectReference: {fileID: 0}
+ - target: {fileID: 4633478662003738, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.0123320455
+ objectReference: {fileID: 0}
+ - target: {fileID: 4633478662003738, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.22548361
+ objectReference: {fileID: 0}
+ - target: {fileID: 4634347077017148, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.97287625
+ objectReference: {fileID: 0}
+ - target: {fileID: 4634347077017148, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.060906775
+ objectReference: {fileID: 0}
+ - target: {fileID: 4634347077017148, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.21052079
+ objectReference: {fileID: 0}
+ - target: {fileID: 4634347077017148, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.07404835
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1.0000002
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.46626738
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000017547607
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9876648
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.105754934
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.007821121
+ objectReference: {fileID: 0}
+ - target: {fileID: 4647310376730834, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.11520807
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.99999976
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.9999999
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.390762
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00000061035155
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9855418
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.12405176
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.10825652
+ objectReference: {fileID: 0}
+ - target: {fileID: 4649093501182641, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.03998879
+ objectReference: {fileID: 0}
+ - target: {fileID: 4673361765465281, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.98002285
+ objectReference: {fileID: 0}
+ - target: {fileID: 4673361765465281, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.02557789
+ objectReference: {fileID: 0}
+ - target: {fileID: 4673361765465281, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.19508842
+ objectReference: {fileID: 0}
+ - target: {fileID: 4673361765465281, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.029007867
+ objectReference: {fileID: 0}
+ - target: {fileID: 4702248392513815, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99616855
+ objectReference: {fileID: 0}
+ - target: {fileID: 4702248392513815, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.02017831
+ objectReference: {fileID: 0}
+ - target: {fileID: 4702248392513815, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.054256964
+ objectReference: {fileID: 0}
+ - target: {fileID: 4702248392513815, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.065553695
+ objectReference: {fileID: 0}
+ - target: {fileID: 4703837838683662, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4703837838683662, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4703837838683662, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.38592598
+ objectReference: {fileID: 0}
+ - target: {fileID: 4703837838683662, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.000000076293944
+ objectReference: {fileID: 0}
+ - target: {fileID: 4755841223239626, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9983973
+ objectReference: {fileID: 0}
+ - target: {fileID: 4755841223239626, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.00019979409
+ objectReference: {fileID: 0}
+ - target: {fileID: 4755841223239626, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.0012595969
+ objectReference: {fileID: 0}
+ - target: {fileID: 4755841223239626, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.056579713
+ objectReference: {fileID: 0}
+ - target: {fileID: 4791267471250297, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9960279
+ objectReference: {fileID: 0}
+ - target: {fileID: 4791267471250297, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.0038903458
+ objectReference: {fileID: 0}
+ - target: {fileID: 4791267471250297, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.08872061
+ objectReference: {fileID: 0}
+ - target: {fileID: 4791267471250297, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.00647892
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.3217806
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.92287
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 2.2870483
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.29740086
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.6158569
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.72674596
+ objectReference: {fileID: 0}
+ - target: {fileID: 4793572663168774, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.064136215
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.4566111
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.000000076293944
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9846394
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.14766747
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.029954253
+ objectReference: {fileID: 0}
+ - target: {fileID: 4811066474870306, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.08821716
+ objectReference: {fileID: 0}
+ - target: {fileID: 4824151138822192, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99463224
+ objectReference: {fileID: 0}
+ - target: {fileID: 4824151138822192, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.0028725537
+ objectReference: {fileID: 0}
+ - target: {fileID: 4824151138822192, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.022651881
+ objectReference: {fileID: 0}
+ - target: {fileID: 4824151138822192, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.10092268
+ objectReference: {fileID: 0}
+ - target: {fileID: 4830887645159699, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99113595
+ objectReference: {fileID: 0}
+ - target: {fileID: 4830887645159699, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.03497863
+ objectReference: {fileID: 0}
+ - target: {fileID: 4830887645159699, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.115427986
+ objectReference: {fileID: 0}
+ - target: {fileID: 4830887645159699, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.055699818
+ objectReference: {fileID: 0}
+ - target: {fileID: 4854931471842194, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9966983
+ objectReference: {fileID: 0}
+ - target: {fileID: 4854931471842194, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.039180707
+ objectReference: {fileID: 0}
+ - target: {fileID: 4854931471842194, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.057973538
+ objectReference: {fileID: 0}
+ - target: {fileID: 4854931471842194, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.041187104
+ objectReference: {fileID: 0}
+ - target: {fileID: 4855737410877955, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99899435
+ objectReference: {fileID: 0}
+ - target: {fileID: 4855737410877955, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.0053460146
+ objectReference: {fileID: 0}
+ - target: {fileID: 4855737410877955, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.03664163
+ objectReference: {fileID: 0}
+ - target: {fileID: 4855737410877955, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.02528072
+ objectReference: {fileID: 0}
+ - target: {fileID: 4885828401385261, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.99253744
+ objectReference: {fileID: 0}
+ - target: {fileID: 4885828401385261, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.015133132
+ objectReference: {fileID: 0}
+ - target: {fileID: 4885828401385261, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.120771684
+ objectReference: {fileID: 0}
+ - target: {fileID: 4885828401385261, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.0073918155
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1.0000002
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.2551668
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.4259257
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 3.6784253
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.76728445
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.22318596
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.5299029
+ objectReference: {fileID: 0}
+ - target: {fileID: 4928101617535935, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.28401688
+ objectReference: {fileID: 0}
+ - target: {fileID: 4968383925762903, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.1870224
+ objectReference: {fileID: 0}
+ - target: {fileID: 4968383925762903, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.4520318
+ objectReference: {fileID: 0}
+ - target: {fileID: 4968383925762903, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.068591855
+ objectReference: {fileID: 0}
+ - target: {fileID: 4968383925762903, guid: d7e9b287e0705b2469037928ce9c54ac, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.869474
+ objectReference: {fileID: 0}
- target: {fileID: 20490283409408092, guid: d7e9b287e0705b2469037928ce9c54ac,
type: 3}
propertyPath: m_CullingMask.m_Bits
@@ -2598,7 +3718,7 @@ MonoBehaviour:
posID: 0
paoBei: 0
fishScore: 0
- bJbeishu: 0
+ bJbeishu: 2
showDelay: 3
moveDuration: 0.5
moveEase: 6
@@ -2607,12 +3727,14 @@ MonoBehaviour:
coinFlyDuration: 0.5
coinArrivalInterval: 0.1
isSelf: 0
+ autoFinishOnScoreFull: 1
totalBJCount: 0
currBJCount: 0
isEffEnd: 0
isScoreStart: 0
isScoreEnd: 0
isGoldEffectStart: 0
+ obj: {fileID: 1223100822565321988}
--- !u!114 &5616761956007200063
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab
index 962fea7dd..74be1c50d 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/QL/fish_144.prefab
@@ -7452,6 +7452,7 @@ MonoBehaviour:
bingDongEffect: {fileID: 0}
rotationPY: 60
isRotate: 0
+ isNot1: 0
ischild0: 0
depthOffset: 0
bossName:
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab
index 324249d0c..8ab01ab71 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/6005_Timeline Variant.prefab
@@ -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,
diff --git a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs
index 0b6b62aa2..e8d426f0a 100644
--- a/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs
+++ b/Assets/MyGame/aa/Game/FLZY/BOSS/YGLG/YGLGDieEvent.cs
@@ -11,6 +11,9 @@ public class YGLGDieEvent : BJEventBase
public override void Init(int goldCount, int posID, int paobei, int fishScore, int beishu, Action 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();
+ }
}
diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab
index 27d3f7caf..e2fe192c9 100644
--- a/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab
@@ -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:
diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab
index 482d7d6fe..3e14eb3c1 100644
--- a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab
@@ -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}
diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu_Timeline Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu_Timeline Variant.prefab
index bd7eae490..0bde52c8e 100644
--- a/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu_Timeline Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu_Timeline Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab b/Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab
index 67132a25b..84acf6afe 100644
--- a/Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab
@@ -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:
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab
index 28e5b86f5..c71ae6c9e 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2008 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab
index c0b3f9256..4adf2bbe7 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/Fish_2013 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab
index 01b13c585..2c0ade36a 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1017 Variant.prefab
@@ -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}
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab
index 07c604352..6e3a812ec 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1018 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab
index 43f320bd8..70e1202c8 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1019 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab
index 038d8d62f..fee335eb6 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1020 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab
index 0157a6638..0664fb64b 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1021 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab
index dc9e77694..2952dd02a 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1022 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab
index f6458b2cf..7cf238fa0 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1023 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab
index 2bee9129d..6286596e0 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1024 Variant.prefab
@@ -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}
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab
index ab12ac8c5..e1470c9e9 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1025 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab
index 540c14298..a2fa129f2 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1026 Variant.prefab
@@ -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: []
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab
index c7d0ca1e4..4bc892275 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1027 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab
index 8baaeeda9..0f57617cf 100644
--- a/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab
+++ b/Assets/MyGame/aa/Game/HHWK/Fish/fish_1028 Variant.prefab
@@ -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
diff --git a/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab b/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab
index cd007c55a..2b7569298 100644
--- a/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab
+++ b/Assets/MyGame/aa/UI/DefaultPanel/BoardCarst.prefab
@@ -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
diff --git a/Assets/MyGame/aa/UI/DefaultPanel/bg_01.png b/Assets/MyGame/aa/UI/DefaultPanel/bg_01.png
new file mode 100644
index 000000000..86d4e8cef
Binary files /dev/null and b/Assets/MyGame/aa/UI/DefaultPanel/bg_01.png differ
diff --git a/Assets/MyGame/aa/UI/DefaultPanel/bg_01.png.meta b/Assets/MyGame/aa/UI/DefaultPanel/bg_01.png.meta
new file mode 100644
index 000000000..6de64d417
--- /dev/null
+++ b/Assets/MyGame/aa/UI/DefaultPanel/bg_01.png.meta
@@ -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:
diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
index 621788ad5..2a19a9144 100644
--- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
+++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
@@ -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:
diff --git a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
index 8e1d920ac..de99dcb60 100644
--- a/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+++ b/Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
@@ -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().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;
+ ///
+ /// 检查指定用户是否已达50发子弹上限
+ ///
+ private bool IsBulletLimitReached(string userId)
+ {
+ if (bulletParent == null) return false;
+ int count = 0;
+ foreach (Transform child in bulletParent.transform)
+ {
+ if (child.TryGetComponent(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(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;
diff --git a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
index aa96a5a9f..924e13576 100644
--- a/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
+++ b/Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
@@ -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:
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs
index 57711cff6..8ee881334 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_JJJPanel.cs
@@ -33,12 +33,14 @@ public class UIHome_BY_JJJPanel : SubUIBase
{
base.OnShow(args);
- var jjjData = GameManager.Instance.gameConfig.reliefConfigs;
- txt_coinsNum.text = "金币" + jjjData.gold.ToString();
- 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);
+ APIRequestList.GetReliefConfig(jjjData =>
+ {
+ txt_coinsNum.text = "金币" + jjjData.gold.ToString();
+ 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);
+ });
}
}
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs
index 90e4e74ed..07f356b93 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ShopPanel.cs
@@ -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,44 +35,48 @@ public class UIHome_BY_ShopPanel : SubUIBase
Destroy(tra_PrefabParent.GetChild(i).gameObject);
}
- foreach (var item in gameConfig.goldShopConfigs)
+ // 金币商城配置已从 GameConfig 迁移至 ActivityConfig API
+ APIRequestList.GetGoldShopList(goldList =>
{
- var obj = Instantiate(obj_ItemPrefab, tra_PrefabParent).transform;
+ foreach (var item in goldList)
+ {
+ var obj = Instantiate(obj_ItemPrefab, tra_PrefabParent).transform;
- if (item.sprite_Icon==null)
- {
- WebTool.DownImage(APIManager.baseURL + item.icon, (texture) =>
+ if (item.sprite_Icon==null)
{
- item.sprite_Icon = Sprite.Create(texture,new Rect(0,0, texture.width,texture.height),new Vector2(0.5f,0.5f));
- obj.GetChild(0).GetComponent().sprite= item.sprite_Icon;
- });
-
- }
- else
- {
- obj.GetChild(0).GetComponent().sprite = item.sprite_Icon;
- }
- obj.name = item.number;
- dic_GoldItems[item.number] = item;
- obj.GetChild(2).GetComponent