diff --git a/Assets/GameRes/AutoSource/BossSceneTimeline.playable b/Assets/GameRes/AutoSource/BossSceneTimeline.playable index 9a290ac..495d53b 100644 --- a/Assets/GameRes/AutoSource/BossSceneTimeline.playable +++ b/Assets/GameRes/AutoSource/BossSceneTimeline.playable @@ -590,6 +590,126 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!74 &-7725999013491513980 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (8) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.0166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.0166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] --- !u!114 &-7214270727001333676 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1586,6 +1706,48 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: player + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Part1Img/bg_black + classID: 1 + script: {fileID: 0} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -1648,6 +1810,24 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2551806565 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2776519796 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1468066514 attribute: 664433463 @@ -1961,6 +2141,48 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: player + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Part1Img/bg_black + classID: 1 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 @@ -3704,6 +3926,88 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!114 &-3564121085050593140 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (7) + 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: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 8581011851705903968} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !u!114 &-3127341758071418340 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track (8) + 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: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -7725999013491513980} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 --- !u!114 &-2798433427859149621 MonoBehaviour: m_ObjectHideFlags: 1 @@ -3805,6 +4109,8 @@ MonoBehaviour: - {fileID: -4313145878285373939} - {fileID: -999243817957591299} - {fileID: -7214270727001333676} + - {fileID: -3564121085050593140} + - {fileID: -3127341758071418340} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -4795,6 +5101,108 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!74 &8581011851705903968 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded (7) + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.033333335 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Priority + path: + classID: 114 + script: {fileID: 11500000, guid: 325a6a3050a061e4b8aa51386c30e8e1, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 2492073993 + script: {fileID: 11500000, guid: 325a6a3050a061e4b8aa51386c30e8e1, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.033333335 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.033333335 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Priority + path: + classID: 114 + script: {fileID: 11500000, guid: 325a6a3050a061e4b8aa51386c30e8e1, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] --- !u!74 &8641038303419079462 AnimationClip: m_ObjectHideFlags: 0 diff --git a/Assets/GameRes/AlwaysRes/CGScene.meta b/Assets/GameRes/AutoSource/CGScene.meta similarity index 100% rename from Assets/GameRes/AlwaysRes/CGScene.meta rename to Assets/GameRes/AutoSource/CGScene.meta diff --git a/Assets/GameRes/AlwaysRes/CGScene/BossScene.prefab b/Assets/GameRes/AutoSource/CGScene/BossScene.prefab similarity index 99% rename from Assets/GameRes/AlwaysRes/CGScene/BossScene.prefab rename to Assets/GameRes/AutoSource/CGScene/BossScene.prefab index 02ba967..56d1d5c 100644 --- a/Assets/GameRes/AlwaysRes/CGScene/BossScene.prefab +++ b/Assets/GameRes/AutoSource/CGScene/BossScene.prefab @@ -9938,7 +9938,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 21 + m_SortingOrder: 18 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 @@ -15166,7 +15166,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 21 + m_SortingOrder: 15 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 @@ -16844,6 +16844,112 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &2877452569331798970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9030894834856245168} + - component: {fileID: 8801697468175562379} + - component: {fileID: 3411725056995921482} + m_Layer: 0 + m_Name: bg_black + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &9030894834856245168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2877452569331798970} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 119.8596, z: 0} + m_LocalScale: {x: 126.76078, y: 125.30387, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1196850354363982530} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8801697468175562379 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2877452569331798970} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 6813fff00cffacc4db63ae636a083d87, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 1 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &3411725056995921482 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2877452569331798970} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2988816821785696221 GameObject: m_ObjectHideFlags: 0 @@ -16871,7 +16977,7 @@ Transform: m_GameObject: {fileID: 2988816821785696221} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.27281284, y: 117.10269, z: -50} + m_LocalPosition: {x: -0.27281284, y: 16.10269, z: -50} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -17148,7 +17254,7 @@ Transform: m_GameObject: {fileID: 3131916376551262510} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 181.09114, z: -10} + m_LocalPosition: {x: 0, y: 1.0911365, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -23056,7 +23162,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3314739321817583476 Transform: m_ObjectHideFlags: 0 @@ -44047,6 +44153,10 @@ PlayableDirector: value: {fileID: 2608685853172331472} - key: {fileID: -7053742041988943133, guid: 7fd9f28b65007c54c84491dcb3c72335, type: 2} value: {fileID: 6482651108512213141} + - key: {fileID: -3564121085050593140, guid: 7fd9f28b65007c54c84491dcb3c72335, type: 2} + value: {fileID: 208620638564458000} + - key: {fileID: -3127341758071418340, guid: 7fd9f28b65007c54c84491dcb3c72335, type: 2} + value: {fileID: 3411725056995921482} m_ExposedReferences: m_References: [] --- !u!1 &7249593456513591030 @@ -48846,7 +48956,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 21 + m_SortingOrder: 18 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 @@ -49232,6 +49342,7 @@ Transform: - {fileID: 2038480408436833816} - {fileID: 8000017665510959015} - {fileID: 8517351121554378571} + - {fileID: 9030894834856245168} m_Father: {fileID: 577306181614254600} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7502763244218361824 @@ -54602,7 +54713,7 @@ Transform: m_GameObject: {fileID: 7843590756034422425} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 100, z: -40.39} + m_LocalPosition: {x: 0, y: -1, z: -40.39} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -54831,7 +54942,7 @@ MonoBehaviour: - m_Script m_LockStageInInspector: m_StreamingVersion: 20170927 - m_Priority: 20 + m_Priority: 0 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} m_Follow: {fileID: 0} @@ -55278,13 +55389,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2106752452017322310, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_SortingOrder + value: 18 + objectReference: {fileID: 0} - target: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} propertyPath: m_Name value: player objectReference: {fileID: 0} - target: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_TagString + value: Untagged objectReference: {fileID: 0} - target: {fileID: 2783966503281588806, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} propertyPath: m_Time @@ -55296,10 +55415,12 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3744876990496415339, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} propertyPath: m_Mass - value: 0.19634955 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8247442098040652398, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + - {fileID: 3090526782097431095, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + - {fileID: 3744876990496415339, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: diff --git a/Assets/GameRes/AlwaysRes/CGScene/BossScene.prefab.meta b/Assets/GameRes/AutoSource/CGScene/BossScene.prefab.meta similarity index 100% rename from Assets/GameRes/AlwaysRes/CGScene/BossScene.prefab.meta rename to Assets/GameRes/AutoSource/CGScene/BossScene.prefab.meta diff --git a/Assets/GameRes/AlwaysRes/CGScene/TopCompleteScene.prefab b/Assets/GameRes/AutoSource/CGScene/TopCompleteScene.prefab similarity index 100% rename from Assets/GameRes/AlwaysRes/CGScene/TopCompleteScene.prefab rename to Assets/GameRes/AutoSource/CGScene/TopCompleteScene.prefab diff --git a/Assets/GameRes/AlwaysRes/CGScene/TopCompleteScene.prefab.meta b/Assets/GameRes/AutoSource/CGScene/TopCompleteScene.prefab.meta similarity index 100% rename from Assets/GameRes/AlwaysRes/CGScene/TopCompleteScene.prefab.meta rename to Assets/GameRes/AutoSource/CGScene/TopCompleteScene.prefab.meta diff --git a/Assets/Scripts/Game/FsmNode/GameSuccess.cs b/Assets/Scripts/Game/FsmNode/GameSuccess.cs index f1b654d..bd63422 100644 --- a/Assets/Scripts/Game/FsmNode/GameSuccess.cs +++ b/Assets/Scripts/Game/FsmNode/GameSuccess.cs @@ -22,7 +22,7 @@ namespace Game.FsmNode // GameEventDefine.GlobalRunaway.SendMessage (10); MapContent.Instance.IsPause = true; AudioManager.Instance.PlaySoundEffect (SeAudio.OverGame_Success); - if (RoomManager.Instance.PartIndex < 3) + if (RoomManager.Instance.PartIndex <= 3) { await UniTask.Delay (1500); UIManager.Instance.OpenView (UIPanel.SuccessPanel , new IC_ViewData (RoomManager.Instance.PartIndex)); diff --git a/Assets/Scripts/Game/RoomManager.cs b/Assets/Scripts/Game/RoomManager.cs index 1870b45..35c7068 100644 --- a/Assets/Scripts/Game/RoomManager.cs +++ b/Assets/Scripts/Game/RoomManager.cs @@ -114,7 +114,7 @@ namespace Game if (partIndex == 3) { //额外加载boss场景 - var bossScene = AssetManager.Instance.LoadAsset(""); + var bossScene = AssetManager.Instance.LoadAsset("AutoSource/CGScene/BossScene.prefab"); var gameObject = Object.Instantiate (bossScene , MapContent.Instance.ScenePart.SuccessProp.transform.position , Quaternion.identity); this._BossSceneDirector = gameObject.GetComponent (); } diff --git a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat index 95262f3..36df8ce 100644 --- a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat +++ b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat @@ -46,7 +46,7 @@ Material: m_Ints: [] m_Floats: - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003 - - _blurOffset: 0.013190931 + - _blurOffset: 0.011229792 m_Colors: [] m_BuildTextureStacks: [] --- !u!114 &268278646524644520 diff --git a/Assets/Scripts/Views/SuccessPanel.cs b/Assets/Scripts/Views/SuccessPanel.cs index e9dbf98..d067c8a 100644 --- a/Assets/Scripts/Views/SuccessPanel.cs +++ b/Assets/Scripts/Views/SuccessPanel.cs @@ -34,6 +34,7 @@ namespace Views{ public override async void OnOpenView(IC_ViewData parameters) { + MapContent.Instance.PlayerEntity.gameObject.SetActive (false); this.nextBtn.gameObject.SetActive (false); var index = parameters.GetValue (); this.lastFragment.SetActive (false); @@ -65,22 +66,27 @@ namespace Views{ { this.nextBtn.onClick.AddListener (() => { - UIManager.Instance.OpenLoading (() => + if (RoomManager.Instance.PartIndex < 3) + { + UIManager.Instance.OpenLoading (() => + { + this.ViewConnector.CloseView (); + { + Destroy (MapContent.Instance.ScenePart.gameObject); + MapContent.Instance.ScenePart = null; + RoomManager.Instance.PartIndex++; + GameEventDefine.ChangeGameFsm.SendMessage (GameState.StartGame); + } + }); + } + else { this.ViewConnector.CloseView (); - if (RoomManager.Instance.PartIndex < 3) - { - Destroy (MapContent.Instance.ScenePart.gameObject); - MapContent.Instance.ScenePart = null; - RoomManager.Instance.PartIndex++; - GameEventDefine.ChangeGameFsm.SendMessage (GameState.StartGame); - } - else - { - //播放结尾gc动画 - RoomManager.Instance._BossSceneDirector.Play(); - } - }); + Destroy (MapContent.Instance.ScenePart.gameObject); + MapContent.Instance.ScenePart = null; + //播放结尾gc动画 + RoomManager.Instance._BossSceneDirector.Play(); + } }); } // #if UNITY_EDITOR