diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 09343fc..80e1957 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: 0.025399864, g: 0.52247053, b: 0, a: 0} + - Center: {r: 0.48349547, g: 0.41133165, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/灯光/背景爆炸.prefab b/Assets/Prefabs/灯光/背景爆炸.prefab index e1b8756..b4a173b 100644 --- a/Assets/Prefabs/灯光/背景爆炸.prefab +++ b/Assets/Prefabs/灯光/背景爆炸.prefab @@ -47,9 +47,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_LightType: 3 m_BlendStyleIndex: 0 - m_FalloffIntensity: 0.5 - m_Color: {r: 1, g: 0.64433026, b: 0, a: 1} - m_Intensity: 7.11 + m_FalloffIntensity: 0.493 + m_Color: {r: 1, g: 0.67976373, b: 0, a: 1} + m_Intensity: 141.42 m_LightVolumeOpacity: 0 m_ApplyToSortingLayers: 87ef51a6 m_LightCookieSprite: {fileID: 0} @@ -60,8 +60,8 @@ MonoBehaviour: m_ShadowVolumeIntensity: 0 m_PointLightInnerAngle: 360 m_PointLightOuterAngle: 360 - m_PointLightInnerRadius: 1.56 - m_PointLightOuterRadius: 3.2072575 + m_PointLightInnerRadius: 5.07 + m_PointLightOuterRadius: 5.79 m_PointLightDistance: 3 m_PointLightQuality: 1 m_ShapeLightParametricSides: 5 diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index 5ac9e5d..cc95e94 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -246,6 +246,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_interface: {fileID: 0} + blackUI: {fileID: 778585118} --- !u!1 &21934455 GameObject: m_ObjectHideFlags: 0 @@ -1301,7 +1302,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &310835680 Transform: m_ObjectHideFlags: 0 @@ -1910,7 +1911,7 @@ AudioSource: m_audioClip: {fileID: 8300000, guid: d46e0985dbc704f4fa342035f5e1638a, type: 3} m_PlayOnAwake: 0 m_Volume: 1 - m_Pitch: 1 + m_Pitch: 0.67 Loop: 0 Mute: 0 Spatialize: 0 @@ -2676,7 +2677,7 @@ MonoBehaviour: m_EditorClassIdentifier: CGName: "\u6682\u7528-\u6218\u53CB" texture: {fileID: 8400000, guid: 1b6ff5fb7c39468419c3f22aa5d42457, type: 2} - time: 26 + time: 27 onEnded: {fileID: 728085632} --- !u!328 &744467544 VideoPlayer: @@ -3075,6 +3076,81 @@ MonoBehaviour: targetObject: {fileID: 21934455} methodName: OnCall delay: 0 +--- !u!1 &778585118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 778585119} + - component: {fileID: 778585121} + - component: {fileID: 778585120} + m_Layer: 5 + m_Name: "\u9ED1\u5E55" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &778585119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778585118} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2052706945} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 637.17017, y: 337.29993} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &778585120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778585118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &778585121 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 778585118} + m_CullTransparentMesh: 1 --- !u!1001 &798428058 PrefabInstance: m_ObjectHideFlags: 0 @@ -4874,7 +4950,7 @@ MonoBehaviour: m_EditorClassIdentifier: nameText: "\u6211" nameColor: {r: 1, g: 1, b: 1, a: 1} - soundEffect: {fileID: 0} + soundEffect: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} portraits: - {fileID: 21300000, guid: 1d716b52e3ce1764a81897513728571b, type: 3} portraitsFace: 0 @@ -4939,7 +5015,7 @@ MonoBehaviour: m_EditorClassIdentifier: nameText: "\u6211" nameColor: {r: 1, g: 1, b: 1, a: 1} - soundEffect: {fileID: 0} + soundEffect: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} portraits: - {fileID: 21300000, guid: 28cf61809bd5319449892f6310525fd5, type: 3} portraitsFace: 0 @@ -6446,6 +6522,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 296af97ad0e28b5489d86f727888d738, type: 3} m_Name: m_EditorClassIdentifier: + blackUI: {fileID: 778585118} --- !u!1 &1366529687 GameObject: m_ObjectHideFlags: 0 @@ -8008,7 +8085,7 @@ MonoBehaviour: m_EditorClassIdentifier: nameText: "\u7236\u4EB2" nameColor: {r: 1, g: 1, b: 1, a: 1} - soundEffect: {fileID: 0} + soundEffect: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} portraits: - {fileID: 21300000, guid: 8bb7d99df9dd41b4c867ac425157c287, type: 3} portraitsFace: 0 @@ -8809,6 +8886,7 @@ MonoBehaviour: strengthOfThrowing: 10 stageName: CGFadeTime: 2 + blackUITime: 2 --- !u!4 &2039349954 Transform: m_ObjectHideFlags: 0 @@ -9354,6 +9432,7 @@ RectTransform: m_Children: - {fileID: 1771706914} - {fileID: 1500782588} + - {fileID: 778585119} m_Father: {fileID: 1860666399} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9746,7 +9825,7 @@ VideoPlayer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2125100631} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 9721c6ab411fa7143b3ccd74e9994c1a, type: 3} + m_VideoClip: {fileID: 32900000, guid: d4e94fe6d171ec641bc089d8f065626a, type: 3} m_TargetCameraAlpha: 1 m_TargetCamera3DLayout: 0 m_TargetCamera: {fileID: 0} diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index 9aeb829..dfd5d69 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -275,7 +275,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.4994535, y: 1.6167455, z: -10} + m_LocalPosition: {x: -6.4979916, y: 1.6167927, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -11556,7 +11556,7 @@ MonoBehaviour: m_EditorClassIdentifier: nameText: "\u7236\u4EB2" nameColor: {r: 1, g: 1, b: 1, a: 1} - soundEffect: {fileID: 0} + soundEffect: {fileID: 8300000, guid: 70e9196dbc23a684ca9fb14ae6c3adf2, type: 3} portraits: - {fileID: 21300000, guid: 8bb7d99df9dd41b4c867ac425157c287, type: 3} portraitsFace: 0 @@ -11754,6 +11754,81 @@ GameObject: m_CorrespondingSourceObject: {fileID: 258423305571384622, guid: 236dc77b3760ae74fa6ce9a1be8f52e3, type: 3} m_PrefabInstance: {fileID: 258423306241059278} m_PrefabAsset: {fileID: 0} +--- !u!1 &739096053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 739096054} + - component: {fileID: 739096056} + - component: {fileID: 739096055} + m_Layer: 5 + m_Name: "\u9ED1\u5E55" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &739096054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739096053} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 927359185} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 211.875, y: 119.375} + m_SizeDelta: {x: 1060.9202, y: 576.0499} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &739096055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739096053} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &739096056 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 739096053} + m_CullTransparentMesh: 1 --- !u!1 &786455509 GameObject: m_ObjectHideFlags: 0 @@ -11900,7 +11975,7 @@ MonoBehaviour: setSayDialog: {fileID: 0} --- !u!114 &786455515 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -12071,6 +12146,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_interface: {fileID: 0} onAudio: {fileID: 1501518558} + blackUI: {fileID: 739096053} --- !u!1 &921243556 GameObject: m_ObjectHideFlags: 1 @@ -12146,6 +12222,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 466905107} + - {fileID: 739096054} m_Father: {fileID: 2044422407} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18041,6 +18118,7 @@ MonoBehaviour: strengthOfThrowing: 10 stageName: CGFadeTime: 2 + blackUITime: 2 --- !u!4 &1258254500 Transform: m_ObjectHideFlags: 0 @@ -28921,14 +28999,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 37b11312617daf740bb62cd2115d4705, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -34178,7 +34256,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: c1ca249af50cf004f80a5eb1802ebbb1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index 4cf5dd9..871ff4b 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -264,7 +264,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.172} m_AnchorMax: {x: 0.565, y: 0.41035822} - m_AnchoredPosition: {x: 0.80000305, y: -1.9000397} + m_AnchoredPosition: {x: 0.80000305, y: -1.9000473} m_SizeDelta: {x: -8, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &14316730 @@ -1021,7 +1021,7 @@ Transform: m_GameObject: {fileID: 59521504} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -51.2, y: -7.99, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.3456405, y: 1.3456405, z: 1.3456405} m_Children: [] m_Father: {fileID: 2098285686} m_RootOrder: 14 @@ -1070,7 +1070,7 @@ ParticleSystemRenderer: m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 - m_MaxParticleSize: 0.5 + m_MaxParticleSize: 6.07 m_CameraVelocityScale: 0 m_VelocityScale: 0 m_LengthScale: 2 @@ -1282,7 +1282,7 @@ ParticleSystem: serializedVersion: 2 minMaxState: 0 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 0.5803922} + maxColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 0.40392157} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} @@ -1344,7 +1344,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 15.5 + scalar: 38.53 minScalar: 1 maxCurve: serializedVersion: 2 @@ -7346,7 +7346,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 367679635} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 77.3, y: -8, z: 0} + m_LocalPosition: {x: 77.7, y: -8.2, z: 0} m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998} m_Children: - {fileID: 1737112887496214201} @@ -7398,6 +7398,7 @@ MonoBehaviour: strengthOfThrowing: 10 stageName: CGFadeTime: 2 + blackUITime: 0 --- !u!4 &371655832 Transform: m_ObjectHideFlags: 0 @@ -17615,108 +17616,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 7 ---- !u!1 &502055429 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 502055430} - - component: {fileID: 502055432} - - component: {fileID: 502055431} - m_Layer: 0 - m_Name: "\u6321\u677F\u67AA\u5149" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &502055430 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 502055429} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.03, y: 1.34, z: 0} - m_LocalScale: {x: 0.43675998, y: 0.43675998, z: 0.43675998} - m_Children: [] - m_Father: {fileID: 722416801} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &502055431 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 502055429} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 12.96, y: 1.11} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!95 &502055432 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 502055429} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c2185c4e66de89249bd50a3d181d515a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &526267217 GameObject: m_ObjectHideFlags: 0 @@ -19044,6 +18943,8 @@ Transform: - {fileID: 2020193186} - {fileID: 1738610713} - {fileID: 1577033978} + - {fileID: 909907789} + - {fileID: 963590458} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19207,6 +19108,7 @@ GameObject: m_Component: - component: {fileID: 722416801} - component: {fileID: 722416800} + - component: {fileID: 722416802} m_Layer: 0 m_Name: "\u6321\u677F2" m_TagString: Untagged @@ -19275,11 +19177,29 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 102.62, y: -0.46000004, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 502055430} + m_Children: [] m_Father: {fileID: 105534304} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &722416802 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722416799} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c973c024a749ba4cbfe712823b1b17d, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &736402861 GameObject: m_ObjectHideFlags: 0 @@ -20435,6 +20355,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888196477} m_CullTransparentMesh: 1 +--- !u!1 &909907788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 909907789} + - component: {fileID: 909907790} + m_Layer: 0 + m_Name: "\u6495\u7EB8\u58F0" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &909907789 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909907788} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0777283, y: 0.42526522, z: 1.9582174} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 690175700} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &909907790 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909907788} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: d46e0985dbc704f4fa342035f5e1638a, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &928812678 PrefabInstance: m_ObjectHideFlags: 0 @@ -20686,6 +20733,133 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &963590457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963590458} + - component: {fileID: 963590459} + m_Layer: 0 + m_Name: "\u7535\u62A5\u673A\u5F00\u673A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &963590458 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963590457} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.0777283, y: 0.42526522, z: 1.9582174} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 690175700} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &963590459 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963590457} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: e76cf4bc92b5253449001bf42192e756, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &974347673 GameObject: m_ObjectHideFlags: 0 @@ -21465,7 +21639,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: befb85dad8a26734a8bf4cdbca6ba2dc, type: 3} m_PlayOnAwake: 0 - m_Volume: 0.705 + m_Volume: 0.6 m_Pitch: 1 Loop: 1 Mute: 0 @@ -22252,7 +22426,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142437218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 92.600006, y: 1.1099999, z: -10} + m_LocalPosition: {x: -29.00893, y: -3.1676853, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1608038909} @@ -24202,108 +24376,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1431467046 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1431467047} - - component: {fileID: 1431467048} - - component: {fileID: 1431467049} - m_Layer: 0 - m_Name: "\u6321\u677F\u67AA\u5149" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1431467047 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1431467046} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.41, z: 0} - m_LocalScale: {x: 0.43675503, y: 0.43675503, z: 0.43675503} - m_Children: [] - m_Father: {fileID: 1753032686} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1431467048 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1431467046} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c2185c4e66de89249bd50a3d181d515a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &1431467049 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1431467046} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 12.96, y: 1.11} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1442610426 GameObject: m_ObjectHideFlags: 0 @@ -24448,7 +24520,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1477400527} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 92.600006, y: 1.1099999, z: -10} + m_LocalPosition: {x: -34.960003, y: -3.2499988, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 32565896} @@ -29914,7 +29986,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: befb85dad8a26734a8bf4cdbca6ba2dc, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.6 m_Pitch: 1 Loop: 1 Mute: 0 @@ -30060,10 +30132,18 @@ PrefabInstance: propertyPath: m_SortingOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} + propertyPath: OnAudio + value: + objectReference: {fileID: 963590459} - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_Event value: objectReference: {fileID: 635525187} + - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} + propertyPath: tearAudio + value: + objectReference: {fileID: 909907790} - target: {fileID: 6148935033436152198, guid: b034a6d27e737a9438c2164815880846, type: 3} propertyPath: m_interface value: @@ -30816,6 +30896,7 @@ GameObject: m_Component: - component: {fileID: 1753032686} - component: {fileID: 1753032685} + - component: {fileID: 1753032687} m_Layer: 0 m_Name: "\u6321\u677F1" m_TagString: Untagged @@ -30884,11 +30965,29 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 90.16, y: -0.47000027, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1431467047} + m_Children: [] m_Father: {fileID: 105534304} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1753032687 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753032684} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7c973c024a749ba4cbfe712823b1b17d, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1778231438 GameObject: m_ObjectHideFlags: 0 @@ -42930,8 +43029,8 @@ MonoBehaviour: - {fileID: 2047411004448683759} - {fileID: 5695032862028633419} m_Bounds: - m_Center: {x: 0.0021947622, y: -0.005881071, z: 0} - m_Extent: {x: 1.54779, y: 2.3710995, z: 0} + m_Center: {x: 0.0021795034, y: -0.0058791637, z: 0} + m_Extent: {x: 1.54779, y: 2.371099, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 --- !u!4 &1062080848641781139 @@ -43024,7 +43123,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4658248456436591408} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -112.8, y: -4, z: 0} + m_LocalPosition: {x: -432.7, y: -14.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 674795379} @@ -43083,7 +43182,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4936508675712544306} m_Bounds: - m_Center: {x: 0.0034547448, y: -0.0018946826, z: 0} + m_Center: {x: 0.0034318566, y: -0.0018951595, z: 0} m_Extent: {x: 0.68153024, y: 0.4230354, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43168,7 +43267,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5437654542896820717} m_Bounds: - m_Center: {x: 6.3700104, y: -0.0021141768, z: 0} + m_Center: {x: 6.3700027, y: -0.002114892, z: 0} m_Extent: {x: 0.855, y: 1.1198149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43251,7 +43350,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 2934879650646324577} m_Bounds: - m_Center: {x: 0.00085026026, y: -0.0022343993, z: 0} + m_Center: {x: 0.0007892251, y: -0.002234161, z: 0} m_Extent: {x: 0.6941651, y: 0.8818251, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43436,7 +43535,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 7089406931308197820} m_Bounds: - m_Center: {x: -0.00849551, y: 0.000014901161, z: 0} + m_Center: {x: -0.008472621, y: 0.000013709068, z: 0} m_Extent: {x: 0.55653495, y: 0.69665515, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -43507,7 +43606,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 2360827735431813924} m_Bounds: - m_Center: {x: -0.0004349947, y: 0.004314363, z: 0} + m_Center: {x: -0.0004273653, y: 0.0043129325, z: 0} m_Extent: {x: 0.689565, y: 0.9506854, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44240,7 +44339,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4718247844144699107} m_Bounds: - m_Center: {x: 0.0019849539, y: -0.00000047683716, z: 0} + m_Center: {x: 0.0019620657, y: 0, z: 0} m_Extent: {x: 0.57801485, y: 0.9349998, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44278,7 +44377,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5215891186772959842} m_Bounds: - m_Center: {x: -0.00000011920929, y: 0.0016950965, z: 0} + m_Center: {x: -0.000030636787, y: 0.0016979575, z: 0} m_Extent: {x: 1.1549999, y: 0.77910495, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -44580,8 +44679,8 @@ MonoBehaviour: m_EditorClassIdentifier: firingInterval: 2 fireAnimations: - - {fileID: 1431467048} - - {fileID: 502055432} + - {fileID: 1753032687} + - {fileID: 722416802} - {fileID: 6516117755177119164} - {fileID: 6516117755979738220} - {fileID: 659778040} @@ -44592,6 +44691,10 @@ MonoBehaviour: advanceTime: 0.5 blockHouseAudio: {fileID: 1590066412} blackHouseGunLight: {fileID: 6516117756223022124} + warningSounds: + - {fileID: 8300000, guid: 691e477f110a5934b9c9c80d47a45ef0, type: 3} + - {fileID: 8300000, guid: baf2d3179ee78164fbe8d0eaa1e97994, type: 3} + - {fileID: 8300000, guid: f17ad0fa60012d74f99b887221a8adcf, type: 3} --- !u!1 &6516117756223022121 GameObject: m_ObjectHideFlags: 0 @@ -44605,6 +44708,7 @@ GameObject: - component: {fileID: 6516117756223022116} - component: {fileID: 6516117756223022117} - component: {fileID: 6516117756223022124} + - component: {fileID: 6516117756223022125} m_Layer: 0 m_Name: "\u7889\u5821" m_TagString: Untagged @@ -44700,6 +44804,102 @@ MonoBehaviour: light3: {fileID: 2146866977} isFire: 0 isInvoke: 0 +--- !u!82 &6516117756223022125 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6516117756223022121} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!212 &6602844856305531699 SpriteRenderer: m_ObjectHideFlags: 0 @@ -45053,7 +45253,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 4586288761792830837} m_Bounds: - m_Center: {x: 0.0021648407, y: -0.00000023841858, z: 0} + m_Center: {x: 0.002149582, y: 0, z: 0} m_Extent: {x: 0.60282004, y: 0.69500005, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45257,8 +45457,8 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 6675447233366868755} m_Bounds: - m_Center: {x: -0.000050246716, y: 0.000605464, z: 0} - m_Extent: {x: 0.705515, y: 1.2171148, z: 0} + m_Center: {x: -0.0000731349, y: 0.00060486794, z: 0} + m_Extent: {x: 0.705515, y: 1.2171149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 --- !u!1001 &7643571272023716792 @@ -45348,7 +45548,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 7263140363742385229} m_Bounds: - m_Center: {x: -0.004270196, y: 0.0007253885, z: 0} + m_Center: {x: -0.004293084, y: 0.0007251501, z: 0} m_Extent: {x: 0.8907454, y: 1.2819755, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45474,7 +45674,7 @@ MonoBehaviour: - {fileID: 8355431490900499643} - {fileID: 4936508675712544306} m_Bounds: - m_Center: {x: 0.0022998452, y: -0.0016744733, z: 0} + m_Center: {x: 0.0023074746, y: -0.0016773343, z: 0} m_Extent: {x: 0.68268514, y: 0.4232551, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45604,7 +45804,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 3397380986102525386} m_Bounds: - m_Center: {x: 0.0013449192, y: 0.00000023841858, z: 0} + m_Center: {x: 0.0013067722, y: 0.0000019073486, z: 0} m_Extent: {x: 0.7836551, y: 1.035, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45675,7 +45875,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 5215891186772959842} m_Bounds: - m_Center: {x: 0.0030246973, y: -0.0026347637, z: 0} + m_Center: {x: 0.0029941797, y: -0.002632141, z: 0} m_Extent: {x: 0.9919598, y: 1.2031548, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -45711,7 +45911,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 8339351226288312874} m_Bounds: - m_Center: {x: 0.0017050505, y: -0.00012362003, z: 0} + m_Center: {x: 0.0016745329, y: -0.00012481213, z: 0} m_Extent: {x: 1.0732954, y: 1.2652456, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index f318cd2..26389f8 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -611,7 +611,7 @@ MonoBehaviour: - {fileID: 1960939660} - {fileID: 27089236} m_Bounds: - m_Center: {x: -56.53, y: -23.92, z: 0} + m_Center: {x: -56.530003, y: -23.92, z: 0} m_Extent: {x: 1.3650017, y: 1.6399994, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -1028,7 +1028,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1648463582} m_Bounds: - m_Center: {x: 0.003477633, y: -0.0018951595, z: 0} + m_Center: {x: 0.003466189, y: -0.0018946826, z: 0} m_Extent: {x: 0.68153024, y: 0.4230354, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -1450,7 +1450,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 498685356} m_Bounds: - m_Center: {x: 0.0017050505, y: -0.00012481213, z: 0} + m_Center: {x: 0.0017040968, y: -0.00012552738, z: 0} m_Extent: {x: 1.0732954, y: 1.2652456, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -1584,7 +1584,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 382896906} m_Bounds: - m_Center: {x: -0.004254937, y: 0.0007251501, z: 0} + m_Center: {x: -0.0042568445, y: 0.00072443485, z: 0} m_Extent: {x: 0.8907454, y: 1.2819755, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -2120,6 +2120,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 297521988} + - component: {fileID: 297521989} m_Layer: 0 m_Name: "\u654C\u4EBA\uFF08\u7F29\u653E\u7528\u5916\u58F3\uFF09" m_TagString: Untagged @@ -2142,6 +2143,102 @@ Transform: m_Father: {fileID: 405730575} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &297521989 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297521987} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &313419874 GameObject: m_ObjectHideFlags: 0 @@ -3024,7 +3121,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1495285309} m_Bounds: - m_Center: {x: -0.0004273653, y: 0.004316747, z: 0} + m_Center: {x: -0.00044548512, y: 0.0043134093, z: 0} m_Extent: {x: 0.689565, y: 0.9506854, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -3978,7 +4075,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1756251741} m_Bounds: - m_Center: {x: -0.00000011920929, y: 0.0016970038, z: 0} + m_Center: {x: -0.000007748604, y: 0.0016953349, z: 0} m_Extent: {x: 1.1549999, y: 0.77910495, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -4249,7 +4346,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 509834882} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4, y: -6.5, z: 0} + m_LocalPosition: {x: 39.9, y: -0.2, z: 0} m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998} m_Children: - {fileID: 1720952666} @@ -4634,7 +4731,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1756251741} m_Bounds: - m_Center: {x: 0.0030475855, y: -0.0026340485, z: 0} + m_Center: {x: 0.0030323267, y: -0.0026345253, z: 0} m_Extent: {x: 0.9919598, y: 1.2031548, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -4737,7 +4834,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1960939660} m_Bounds: - m_Center: {x: -0.0000076293945, y: 2.6999989, z: 0} + m_Center: {x: -0.000002861023, y: 2.6999998, z: 0} m_Extent: {x: 1.4950001, y: 1.3900001, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -5104,7 +5201,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1960683337} m_Bounds: - m_Center: {x: 0.0013372898, y: 0.0000019073486, z: 0} + m_Center: {x: 0.0013391972, y: 0, z: 0} m_Extent: {x: 0.7836551, y: 1.035, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -6083,7 +6180,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1227561594} m_Bounds: - m_Center: {x: -0.000027358532, y: 0.00060486794, z: 0} + m_Center: {x: -0.000033080578, y: 0.00060498714, z: 0} m_Extent: {x: 0.705515, y: 1.2171149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -6689,7 +6786,7 @@ MonoBehaviour: - {fileID: 1684178002} - {fileID: 1648463582} m_Bounds: - m_Center: {x: 0.0023074746, y: -0.001675427, z: 0} + m_Center: {x: 0.0023160577, y: -0.0016759038, z: 0} m_Extent: {x: 0.68268514, y: 0.4232551, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -7863,7 +7960,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 384365923} m_Bounds: - m_Center: {x: 0.00083500147, y: -0.0022351146, z: 0} + m_Center: {x: 0.00082451105, y: -0.0022351146, z: 0} m_Extent: {x: 0.6941651, y: 0.8818251, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -7966,7 +8063,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1104417632} m_Bounds: - m_Center: {x: 0.0021877289, y: 0.0000019073486, z: 0} + m_Center: {x: 0.002166748, y: 0, z: 0} m_Extent: {x: 0.60282004, y: 0.69500005, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -9793,7 +9890,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 1100102619} m_Bounds: - m_Center: {x: -0.008464992, y: 0.000014662743, z: 0} + m_Center: {x: -0.008468807, y: 0.000014901161, z: 0} m_Extent: {x: 0.55653495, y: 0.69665515, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -10848,6 +10945,7 @@ MonoBehaviour: strengthOfThrowing: 10 stageName: CGFadeTime: 2 + blackUITime: 0 --- !u!4 &1539831298 Transform: m_ObjectHideFlags: 0 @@ -10920,7 +11018,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1575635868} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -34.5956, y: -5.235755, z: -10} + m_LocalPosition: {x: 9.3043995, y: 1.0642443, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1663511912} @@ -11959,7 +12057,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 143988934} m_Bounds: - m_Center: {x: 0.0019849539, y: 0, z: 0} + m_Center: {x: 0.0019830465, y: -0.0000009536743, z: 0} m_Extent: {x: 0.57801485, y: 0.9349998, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -12127,6 +12225,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1693775298} + - component: {fileID: 1693775299} m_Layer: 0 m_Name: "\u654C\u4EBA\uFF08\u7F29\u653E\u7528\u5916\u58F3\uFF09 (1)" m_TagString: Untagged @@ -12149,6 +12248,102 @@ Transform: m_Father: {fileID: 405730575} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1693775299 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693775297} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1695976832 GameObject: m_ObjectHideFlags: 0 @@ -13292,8 +13487,8 @@ MonoBehaviour: - {fileID: 27089236} - {fileID: 1960939660} m_Bounds: - m_Center: {x: 0.0022176504, y: -0.0058791637, z: 0} - m_Extent: {x: 1.54779, y: 2.371099, z: 0} + m_Center: {x: 0.002198577, y: -0.0058805943, z: 0} + m_Extent: {x: 1.54779, y: 2.3711, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 --- !u!212 &1767946773 @@ -13590,7 +13785,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1791259307} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -28.862282, y: -3.1726923, z: -10} + m_LocalPosition: {x: 9.3043995, y: 1.0642443, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1031032740} @@ -14933,6 +15128,11 @@ MonoBehaviour: walkSEs: - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + interruptSEs: + - {fileID: 8300000, guid: d87582f554dad8f468dae204bb4fdbab, type: 3} + - {fileID: 8300000, guid: 8d1c029fbe798c648ad7644cfd4c300c, type: 3} + - {fileID: 8300000, guid: 54a409a1aeba01040a37026f12312925, type: 3} + interruptSEPlayer: {fileID: 1693775299} --- !u!95 &1996504127 Animator: serializedVersion: 3 @@ -15008,7 +15208,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -15038,7 +15238,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -15216,7 +15416,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.6407686} m_AnchorMax: {x: 0.45847487, y: 0.8197163} - m_AnchoredPosition: {x: -0.1031189, y: -0.73651123} + m_AnchoredPosition: {x: -0.10310364, y: -0.73651123} m_SizeDelta: {x: -6.6049995, y: -6.7173996} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2025920173 @@ -15622,7 +15822,7 @@ MonoBehaviour: m_BoneTransforms: - {fileID: 816793905} m_Bounds: - m_Center: {x: 6.369995, y: -0.002114892, z: 0} + m_Center: {x: 6.369994, y: -0.0021147728, z: 0} m_Extent: {x: 0.855, y: 1.1198149, z: 0} m_UseBatching: 1 m_AlwaysUpdate: 1 @@ -18488,6 +18688,11 @@ MonoBehaviour: walkSEs: - {fileID: 8300000, guid: 94034da76c6ed8c428668a3d973d292e, type: 3} - {fileID: 8300000, guid: 6fa90032468c79041b8f680711db216d, type: 3} + interruptSEs: + - {fileID: 8300000, guid: d87582f554dad8f468dae204bb4fdbab, type: 3} + - {fileID: 8300000, guid: 8d1c029fbe798c648ad7644cfd4c300c, type: 3} + - {fileID: 8300000, guid: 54a409a1aeba01040a37026f12312925, type: 3} + interruptSEPlayer: {fileID: 297521989} --- !u!61 &8735070709909669209 BoxCollider2D: m_ObjectHideFlags: 0 @@ -18570,7 +18775,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -18600,7 +18805,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.1 inSlope: 0 outSlope: 0 tangentMode: 0 diff --git a/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs b/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs index 858e04e..6b4f8ae 100644 --- a/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs +++ b/Assets/Scripts/事件/WhenTheCodeAndConversationAreCompleted.cs @@ -7,9 +7,12 @@ public class WhenTheCodeAndConversationAreCompleted : Event { // Start is called before the first frame update //事件,当在序章中完成教学并且完成和父亲的第二段对话后 + [Tooltip("请拖入黑幕游戏物体")] + public GameObject blackUI; + private IndexRecoder indexRecoder; void Start() { - + indexRecoder = FindObjectOfType(); } // Update is called once per frame @@ -20,8 +23,15 @@ public class WhenTheCodeAndConversationAreCompleted : Event public override void OnCall() { - IndexRecoder indexRecoder = FindObjectOfType(); + blackUI.SetActive(true); + Invoke("LoadScene",indexRecoder.blackUITime); + } + + private void LoadScene() + { indexRecoder.ChangeStageName("序章-战场"); SceneManager.LoadScene("序章-战场"); } + + } diff --git a/Assets/Scripts/信息相关/IndexRecoder.cs b/Assets/Scripts/信息相关/IndexRecoder.cs index 8a5b00b..714c414 100644 --- a/Assets/Scripts/信息相关/IndexRecoder.cs +++ b/Assets/Scripts/信息相关/IndexRecoder.cs @@ -42,6 +42,8 @@ public class IndexRecoder : MonoBehaviour public string stageName; [Tooltip("CG的淡入淡出时间")] public float CGFadeTime; + [Tooltip("该项决定所有黑幕的持续时间")] + public float blackUITime; void Start() { diff --git a/Assets/Scripts/具象物体/AFakeMachine.cs b/Assets/Scripts/具象物体/AFakeMachine.cs index 464b93f..9437047 100644 --- a/Assets/Scripts/具象物体/AFakeMachine.cs +++ b/Assets/Scripts/具象物体/AFakeMachine.cs @@ -9,6 +9,8 @@ public class AFakeMachine : Interactive //一个假的电报机类,因为“序章-战场”中的电报机不需要实际打码功能,为了方便我这里单独写一些代码 //继承可交互物体基类 public AudioSource onAudio; + [Tooltip("拖入黑幕游戏物体")] + public GameObject blackUI; void Start() { @@ -32,8 +34,8 @@ public class AFakeMachine : Interactive IndexRecoder indexRecoder = FindObjectOfType(); indexRecoder.ChangeStageName("序章-家中-已打码"); onAudio.Play(); - Invoke("loadSceneHome",1.5f); - //Debug.Log("转到场景“序章-家中”,给记录员发信息,让“序章-家中”表现为正确状态"); + blackUI.SetActive(true); + Invoke("loadSceneHome",indexRecoder.blackUITime); } else { diff --git a/Assets/Scripts/具象物体/Blockhouse.cs b/Assets/Scripts/具象物体/Blockhouse.cs index 8b23057..b119cd8 100644 --- a/Assets/Scripts/具象物体/Blockhouse.cs +++ b/Assets/Scripts/具象物体/Blockhouse.cs @@ -28,6 +28,8 @@ public class Blockhouse : MonoBehaviour public AudioSource blockHouseAudio;//获取音频对象 public BlackHouseGunLight blackHouseGunLight;//获取碉堡枪光的脚本 + private AudioSource audioPlayer; + public AudioClip[] warningSounds; void Start() { @@ -38,6 +40,7 @@ public class Blockhouse : MonoBehaviour gameObject.AddComponent();//给每个子物体挂上射击区的脚本 //并且把它的脚本送到数组里面,免去以后再遍历拖慢速度 } + audioPlayer = GetComponent(); } void Update() @@ -67,11 +70,16 @@ public class Blockhouse : MonoBehaviour } } + //invoke执行,每隔一段时间改变警示UI的图片 void ReplaceWarningUIImage() { - if(!isShooting) + if(!isShooting)//如果没在开枪,则把图片改为挥下的 { warningUI.sprite = done; + //播放警告音效 + audioPlayer.clip = warningSounds[(int)Random.Range(0,warningSounds.Length)]; + audioPlayer.volume = 0.8f; + audioPlayer.Play(); } else { diff --git a/Assets/Scripts/具象物体/Door.cs b/Assets/Scripts/具象物体/Door.cs index 824eb1f..07d4e6c 100644 --- a/Assets/Scripts/具象物体/Door.cs +++ b/Assets/Scripts/具象物体/Door.cs @@ -8,6 +8,8 @@ using UnityEngine.InputSystem; public class Door : Interactive { //可交互对象:门的控制类 + [Tooltip("拖入黑幕")] + public GameObject blackUI; public override void OnCall() { //在开门演出的多态,当门被唤醒,显示CG @@ -22,8 +24,10 @@ public class Door : Interactive { if(FindObjectOfType().transform.Find("包").gameObject.activeSelf)//如果已经捡起背包 { - //加载第一关场景 - SceneManager.LoadScene("第一关"); + // //加载第一关场景 + // SceneManager.LoadScene("第一关"); + blackUI.SetActive(true); + Invoke("LoadScenen",FindObjectOfType().blackUITime); } else { @@ -33,4 +37,9 @@ public class Door : Interactive } } } + + private void LoadScenen() + { + SceneManager.LoadScene("第一关"); + } } diff --git a/Assets/Scripts/具象物体/Patrolman.cs b/Assets/Scripts/具象物体/Patrolman.cs index f6b7f35..e651b18 100644 --- a/Assets/Scripts/具象物体/Patrolman.cs +++ b/Assets/Scripts/具象物体/Patrolman.cs @@ -28,7 +28,11 @@ public class Patrolman : MonoBehaviour private Animator animator; public AudioClip[] RunSEs; public AudioClip[] walkSEs; + [Tooltip("请拖入敌人被投掷物吸引后的音效")] + public AudioClip[] interruptSEs; private AudioSource audioPlayer; + [Tooltip("拖入父级物体")] + public AudioSource interruptSEPlayer; @@ -93,6 +97,10 @@ public class Patrolman : MonoBehaviour //执行听见动画 animator.SetBool("IsListen",true); StartCoroutine("StopListen");//取消听见动画条件 + //播放听见音效 + interruptSEPlayer.clip = interruptSEs[(int)Random.Range(0,interruptSEs.Length)]; + interruptSEPlayer.volume = 0.5f; + interruptSEPlayer.Play(); } } } diff --git a/Assets/Scripts/抽象的东西/BackBoom.cs b/Assets/Scripts/抽象的东西/BackBoom.cs index 11d46f5..7d47ab8 100644 --- a/Assets/Scripts/抽象的东西/BackBoom.cs +++ b/Assets/Scripts/抽象的东西/BackBoom.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Experimental.Rendering.Universal; using UnityEngine.UIElements; public class BackBoom : MonoBehaviour @@ -32,7 +33,8 @@ public class BackBoom : MonoBehaviour void AddLight() { Vector2 pos = new Vector2(Random.Range(left.position.x,right.position.x),Random.Range(up.position.y,down.position.y)); - Instantiate(boomLight, pos, Quaternion.identity); + var light2D = Instantiate(boomLight, pos, Quaternion.identity).GetComponent(); + light2D.pointLightInnerRadius = Random.Range(3f, 5.79f); } } diff --git a/Assets/Sound effect/电报接收.wav b/Assets/Sound effect/电报接收.wav new file mode 100644 index 0000000..03d4cfe Binary files /dev/null and b/Assets/Sound effect/电报接收.wav differ diff --git a/Assets/Sound effect/电报接收.wav.meta b/Assets/Sound effect/电报接收.wav.meta new file mode 100644 index 0000000..814c57d --- /dev/null +++ b/Assets/Sound effect/电报接收.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fe43d2d742288694da55d50cbdab82af +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound effect/电键2.wav b/Assets/Sound effect/电键2.wav new file mode 100644 index 0000000..87ac192 Binary files /dev/null and b/Assets/Sound effect/电键2.wav differ diff --git a/Assets/Sound effect/电键2.wav.meta b/Assets/Sound effect/电键2.wav.meta new file mode 100644 index 0000000..de83d03 --- /dev/null +++ b/Assets/Sound effect/电键2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 70e9196dbc23a684ca9fb14ae6c3adf2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/CG动画/父亲离去动画(新).mp4 b/Assets/Sprites/CG动画/父亲离去动画(新).mp4 new file mode 100644 index 0000000..4f2768b Binary files /dev/null and b/Assets/Sprites/CG动画/父亲离去动画(新).mp4 differ diff --git a/Assets/Sprites/CG动画/父亲离去动画(新).mp4.meta b/Assets/Sprites/CG动画/父亲离去动画(新).mp4.meta new file mode 100644 index 0000000..96218a2 --- /dev/null +++ b/Assets/Sprites/CG动画/父亲离去动画(新).mp4.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: d4e94fe6d171ec641bc089d8f065626a +VideoClipImporter: + externalObjects: {} + serializedVersion: 2 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 0 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/wu.mat b/Assets/Sprites/wu.mat new file mode 100644 index 0000000..918a540 --- /dev/null +++ b/Assets/Sprites/wu.mat @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: wu + m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 6882f66c07e7cbb408a94236877cbe4f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Sprites/wu.mat.meta b/Assets/Sprites/wu.mat.meta new file mode 100644 index 0000000..ccdb075 --- /dev/null +++ b/Assets/Sprites/wu.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 788c09d58e6776142bf4e02988bb84d6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/雾气.png b/Assets/Sprites/雾气.png new file mode 100644 index 0000000..99cd985 Binary files /dev/null and b/Assets/Sprites/雾气.png differ diff --git a/Assets/Sprites/雾气.png.meta b/Assets/Sprites/雾气.png.meta new file mode 100644 index 0000000..e8f366f --- /dev/null +++ b/Assets/Sprites/雾气.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6882f66c07e7cbb408a94236877cbe4f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/AC/挡板.controller b/Assets/游戏内动画资源/AC/挡板.controller new file mode 100644 index 0000000..30a96b6 --- /dev/null +++ b/Assets/游戏内动画资源/AC/挡板.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9181479486801250677 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u6321\u677F\u53D7\u51FB" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3249868358162034791} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, 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: d7b536e7e34de504499458f633c87462, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5499684810336606104 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6769934733709652515} + m_Position: {x: 371.90918, y: 247.24619, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9181479486801250677} + m_Position: {x: 513.8648, y: 87.54609, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6769934733709652515} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u6321\u677F" + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsFiring + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5499684810336606104} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1582300803789662027 +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: IsFiring + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9181479486801250677} + 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 &3249868358162034791 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsFiring + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6769934733709652515} + 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 &6769934733709652515 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u7A7A" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1582300803789662027} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, 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: d9aacbb94a38d2940a11d96e999e6a2e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/游戏内动画资源/AC/挡板.controller.meta b/Assets/游戏内动画资源/AC/挡板.controller.meta new file mode 100644 index 0000000..e48f528 --- /dev/null +++ b/Assets/游戏内动画资源/AC/挡板.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c973c024a749ba4cbfe712823b1b17d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/AM/逐帧动画/挡板受击.anim b/Assets/游戏内动画资源/AM/逐帧动画/挡板受击.anim new file mode 100644 index 0000000..aa179d4 --- /dev/null +++ b/Assets/游戏内动画资源/AM/逐帧动画/挡板受击.anim @@ -0,0 +1,74 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u6321\u677F\u53D7\u51FB" + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 8f312ab61bc01d64694aaef0428dcc97, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 93fcf8d5cf7d5594f8d8dfe3ff772b1e, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: 810a96396dce98f4c852aa5c343075c1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 8f312ab61bc01d64694aaef0428dcc97, type: 3} + - {fileID: 21300000, guid: 93fcf8d5cf7d5594f8d8dfe3ff772b1e, type: 3} + - {fileID: 21300000, guid: 810a96396dce98f4c852aa5c343075c1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.13333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/游戏内动画资源/AM/逐帧动画/挡板受击.anim.meta b/Assets/游戏内动画资源/AM/逐帧动画/挡板受击.anim.meta new file mode 100644 index 0000000..57abd4f --- /dev/null +++ b/Assets/游戏内动画资源/AM/逐帧动画/挡板受击.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7b536e7e34de504499458f633c87462 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/Resource/挡板受击.meta b/Assets/游戏内动画资源/Resource/挡板受击.meta new file mode 100644 index 0000000..fc2041b --- /dev/null +++ b/Assets/游戏内动画资源/Resource/挡板受击.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09b5ed4edbbd98645a24877b8ca01159 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/Resource/挡板受击/挡板 1.png b/Assets/游戏内动画资源/Resource/挡板受击/挡板 1.png new file mode 100644 index 0000000..fd4d1fe Binary files /dev/null and b/Assets/游戏内动画资源/Resource/挡板受击/挡板 1.png differ diff --git a/Assets/游戏内动画资源/Resource/挡板受击/挡板 1.png.meta b/Assets/游戏内动画资源/Resource/挡板受击/挡板 1.png.meta new file mode 100644 index 0000000..a327d3a --- /dev/null +++ b/Assets/游戏内动画资源/Resource/挡板受击/挡板 1.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 8f312ab61bc01d64694aaef0428dcc97 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/Resource/挡板受击/挡板 2.png b/Assets/游戏内动画资源/Resource/挡板受击/挡板 2.png new file mode 100644 index 0000000..dcf907f Binary files /dev/null and b/Assets/游戏内动画资源/Resource/挡板受击/挡板 2.png differ diff --git a/Assets/游戏内动画资源/Resource/挡板受击/挡板 2.png.meta b/Assets/游戏内动画资源/Resource/挡板受击/挡板 2.png.meta new file mode 100644 index 0000000..509105b --- /dev/null +++ b/Assets/游戏内动画资源/Resource/挡板受击/挡板 2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 93fcf8d5cf7d5594f8d8dfe3ff772b1e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/游戏内动画资源/Resource/挡板受击/挡板 3.png b/Assets/游戏内动画资源/Resource/挡板受击/挡板 3.png new file mode 100644 index 0000000..d658c64 Binary files /dev/null and b/Assets/游戏内动画资源/Resource/挡板受击/挡板 3.png differ diff --git a/Assets/游戏内动画资源/Resource/挡板受击/挡板 3.png.meta b/Assets/游戏内动画资源/Resource/挡板受击/挡板 3.png.meta new file mode 100644 index 0000000..89f4bb2 --- /dev/null +++ b/Assets/游戏内动画资源/Resource/挡板受击/挡板 3.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 810a96396dce98f4c852aa5c343075c1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 9a6667e..0235313 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,16 +9,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb + value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898d91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc