From 1b76877d76bade24fbae856c6c5709c49c6689e6 Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Mon, 26 Jul 2021 17:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E7=AE=80=E5=8D=95?= =?UTF-8?q?=E5=B8=83=E7=BD=AE=E2=80=9C=E5=BA=8F=E7=AB=A0-=E6=88=98?= =?UTF-8?q?=E5=9C=BA=E2=80=9D=E7=9A=84=E6=B5=81=E7=A8=8B=E5=8C=96=201.?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=BA=E7=89=A9=E5=A4=A7=E5=B0=8F=202.?= =?UTF-8?q?=E9=99=90=E5=88=B6=E4=BA=86=E6=91=84=E5=83=8F=E6=9C=BA=E7=9A=84?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=8C=83=E5=9B=B4=203.=E5=B8=83=E7=BD=AE?= =?UTF-8?q?=E4=BA=86=E4=B8=89=E4=B8=AA=E7=94=B5=E8=AF=9D=E7=BA=BF=204.?= =?UTF-8?q?=E5=B8=83=E7=BD=AE=E4=BA=86=E8=BD=B0=E7=82=B8=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animations/GreenAlien.controller | 160 ++-- .../Effects/Wave/Attack_Wave/AWM0.mat | 4 +- Assets/Prefabs/轰炸区系统/炮弹.prefab | 4 +- Assets/Prefabs/轰炸区系统/阴影.prefab | 2 +- Assets/Scenes/动画测试与预览.unity | 237 +++-- Assets/Scenes/序章-家中.unity | 2 +- Assets/Scenes/序章-战场.unity | 829 +++++++++++++++++- Assets/Scripts/AbstractItem/BombingArea.cs | 6 +- UserSettings/EditorUserSettings.asset | 20 +- 9 files changed, 1090 insertions(+), 174 deletions(-) diff --git a/Assets/FungusExamples/JumpingPrax/Animations/GreenAlien.controller b/Assets/FungusExamples/JumpingPrax/Animations/GreenAlien.controller index 5abdc79..3e10b34 100644 --- a/Assets/FungusExamples/JumpingPrax/Animations/GreenAlien.controller +++ b/Assets/FungusExamples/JumpingPrax/Animations/GreenAlien.controller @@ -3,10 +3,11 @@ --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: GreenAlien - serializedVersion: 2 + serializedVersion: 5 m_AnimatorParameters: - m_Name: AmIJumping m_Type: 4 @@ -15,109 +16,144 @@ AnimatorController: m_DefaultBool: 0 m_Controller: {fileID: 9100000} m_AnimatorLayers: - - serializedVersion: 3 + - serializedVersion: 5 m_Name: Base Layer m_StateMachine: {fileID: 110700000} m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: -1 - m_StateMachineMotionSetIndex: 0 m_DefaultWeight: 0 m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} --- !u!1101 &110100000 -Transition: - serializedVersion: 2 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: - m_SrcState: {fileID: 110249473} - m_DstState: {fileID: 110200000} - m_TransitionDuration: .819999993 - m_TransitionOffset: 0 m_Conditions: - m_ConditionMode: 1 m_ConditionEvent: AmIJumping m_EventTreshold: 0 - m_ExitTime: .899999976 - m_Atomic: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110200000} m_Solo: 0 m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.82 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 1 + m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1101 &110188867 -Transition: - serializedVersion: 2 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: - m_SrcState: {fileID: 110200000} - m_DstState: {fileID: 110249473} - m_TransitionDuration: 1.92999995 - m_TransitionOffset: 0 m_Conditions: - m_ConditionMode: 2 m_ConditionEvent: AmIJumping m_EventTreshold: 0 - m_ExitTime: .782608688 - m_Atomic: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 110249473} m_Solo: 0 m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 1.93 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 1 + m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 --- !u!1102 &110200000 -State: - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: JumpingAlien m_Speed: 1 m_CycleOffset: 0 - m_Motions: - - {fileID: 7400000, guid: 17211c9c495eb420d9d368946530f2a4, type: 2} - m_ParentStateMachine: {fileID: 110700000} + m_Transitions: + - {fileID: 110188867} + m_StateMachineBehaviours: [] m_Position: {x: 312, y: 12, 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: 17211c9c495eb420d9d368946530f2a4, type: 2} m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &110249473 -State: - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: New State m_Speed: 1 m_CycleOffset: 0 - m_Motions: - - {fileID: 0} - m_ParentStateMachine: {fileID: 110700000} + m_Transitions: + - {fileID: 110100000} + m_StateMachineBehaviours: [] m_Position: {x: 0, y: -60, 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: 0} m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &110700000 -StateMachine: - serializedVersion: 2 - m_ObjectHideFlags: 3 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Base Layer - m_DefaultState: {fileID: 110249473} - m_States: - - {fileID: 110200000} - - {fileID: 110249473} - m_ChildStateMachine: [] - m_ChildStateMachinePosition: [] - m_OrderedTransitions: - data: - first: {fileID: 110249473} - second: - - {fileID: 110100000} - data: - first: {fileID: 110200000} - second: - - {fileID: 110188867} - m_MotionSetCount: 1 + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 110200000} + m_Position: {x: 312, y: 12, z: 0} + - serializedVersion: 1 + m_State: {fileID: 110249473} + m_Position: {x: 0, y: -60, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 48, y: 24, 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: 110249473} diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index a0c7fdc..ab55a5c 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -42,8 +42,8 @@ Material: - WaveCount: 50 - WaveIntensity_1: 0.02 - WaveIntensity_2: 1 - - WaveSpread_Value: 0 + - WaveSpread_Value: 11.199994 m_Colors: - - Center: {r: 0.09301913, g: 0.27770394, b: 0, a: 0} + - Center: {r: 0.4856287, g: 0.3092804, 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 122e4ef..1dd6c36 100644 --- a/Assets/Prefabs/轰炸区系统/炮弹.prefab +++ b/Assets/Prefabs/轰炸区系统/炮弹.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6293088924721911990} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.07, y: 0.3648218, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -72,7 +72,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Prefabs/轰炸区系统/阴影.prefab b/Assets/Prefabs/轰炸区系统/阴影.prefab index babd711..26e5549 100644 --- a/Assets/Prefabs/轰炸区系统/阴影.prefab +++ b/Assets/Prefabs/轰炸区系统/阴影.prefab @@ -70,7 +70,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} m_FlipX: 0 diff --git a/Assets/Scenes/动画测试与预览.unity b/Assets/Scenes/动画测试与预览.unity index 63be117..63c16b3 100644 --- a/Assets/Scenes/动画测试与预览.unity +++ b/Assets/Scenes/动画测试与预览.unity @@ -123,6 +123,68 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &490062777 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 703923301} + m_Modifications: + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1747961 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalPosition.y + value: -4.8024907 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalPosition.z + value: 3.2978365 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4545971525194460214, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + propertyPath: m_Name + value: "\u4E3B\u89D2" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: -663710891385756399, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} +--- !u!4 &490062778 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -5731401102379117568, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} + m_PrefabInstance: {fileID: 490062777} + m_PrefabAsset: {fileID: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -206,6 +268,57 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &703923299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 703923301} + - component: {fileID: 703923300} + m_Layer: 0 + m_Name: "\u4EBA\u7269" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &703923300 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703923299} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e6c8911b364c01240bf3b362b783f883, 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!4 &703923301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703923299} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.914796, y: 0.9224905, z: -3.2978365} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 490062778} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1167304730 PrefabInstance: m_ObjectHideFlags: 0 @@ -229,6 +342,18 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.6567551 objectReference: {fileID: 0} + - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.x + value: 2.5576658 + objectReference: {fileID: 0} + - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.y + value: 0.000000064268825 + objectReference: {fileID: 0} + - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99999225 + objectReference: {fileID: 0} - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -241,21 +366,13 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.0039366493 objectReference: {fileID: 0} - - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 0.99999225 - objectReference: {fileID: 0} - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalPosition.x - value: 2.5576658 - objectReference: {fileID: 0} - - target: {fileID: 2963418977626722768, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalPosition.y - value: 0.000000064268825 + - target: {fileID: 5380615811545232268, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 0.86689305 objectReference: {fileID: 0} - target: {fileID: 5380615811545232268, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.x @@ -269,10 +386,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.49849415 objectReference: {fileID: 0} - - target: {fileID: 5380615811545232268, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 0.86689305 - objectReference: {fileID: 0} - target: {fileID: 5380615811545232268, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 @@ -281,6 +394,18 @@ PrefabInstance: propertyPath: m_Name value: "\u4ED6\u7238" objectReference: {fileID: 0} + - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.x + value: 1.932262 + objectReference: {fileID: 0} + - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00000011835591 + objectReference: {fileID: 0} + - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97989863 + objectReference: {fileID: 0} - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -293,21 +418,13 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.19949615 objectReference: {fileID: 0} - - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 0.97989863 - objectReference: {fileID: 0} - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalPosition.x - value: 1.932262 - objectReference: {fileID: 0} - - target: {fileID: 5712957261676253381, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalPosition.y - value: -0.00000011835591 + - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_RootOrder + value: 1 objectReference: {fileID: 0} - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalPosition.x @@ -321,6 +438,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 6.3364797 objectReference: {fileID: 0} + - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.x value: -0 @@ -333,14 +454,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5834292675243222042, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -353,6 +466,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6386618607660783136, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 0.05014148 + objectReference: {fileID: 0} - target: {fileID: 6386618607660783136, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.x value: 0 @@ -361,10 +478,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.99874216 objectReference: {fileID: 0} - - target: {fileID: 6386618607660783136, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 0.05014148 - objectReference: {fileID: 0} - target: {fileID: 6386618607660783136, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 @@ -377,6 +490,22 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0.9583135 objectReference: {fileID: 0} + - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.x + value: 1.8194977 + objectReference: {fileID: 0} + - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000012366127 + objectReference: {fileID: 0} + - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7365725 + objectReference: {fileID: 0} + - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.y value: 0 @@ -385,25 +514,21 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.67635864 objectReference: {fileID: 0} - - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7365725 - objectReference: {fileID: 0} - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalPosition.x - value: 1.8194977 + value: 2.2873657 objectReference: {fileID: 0} - - target: {fileID: 7302741182621479858, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalPosition.y - value: 0.00000012366127 + value: 0.0000019362749 + objectReference: {fileID: 0} + - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} + propertyPath: m_LocalRotation.w + value: 0.970033 objectReference: {fileID: 0} - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalRotation.x @@ -417,22 +542,10 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0.24297324 objectReference: {fileID: 0} - - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalRotation.w - value: 0.970033 - objectReference: {fileID: 0} - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalPosition.x - value: 2.2873657 - objectReference: {fileID: 0} - - target: {fileID: 8224345494664629997, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} - propertyPath: m_LocalPosition.y - value: 0.0000019362749 - objectReference: {fileID: 0} - target: {fileID: 8771163755905657798, guid: 52c78dac9f3bb9a449367f6062fb1433, type: 3} propertyPath: m_LocalPosition.x value: 1.5502996 diff --git a/Assets/Scenes/序章-家中.unity b/Assets/Scenes/序章-家中.unity index bb60e0c..736aa8f 100644 --- a/Assets/Scenes/序章-家中.unity +++ b/Assets/Scenes/序章-家中.unity @@ -5009,7 +5009,7 @@ MonoBehaviour: shellSpeed: 10 shellFallingTime: 1 shellShadowRangeOfChange: 0.1 - shellShadowPositionYOffSet: 1.5 + shellShadowPositionYOffSet: 0.3 rateOfChangeOfThrowingAngle: 1 strengthOfThrowing: 8 --- !u!4 &2039349954 diff --git a/Assets/Scenes/序章-战场.unity b/Assets/Scenes/序章-战场.unity index 32ed165..790b4dc 100644 --- a/Assets/Scenes/序章-战场.unity +++ b/Assets/Scenes/序章-战场.unity @@ -130,6 +130,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1633485123} m_Modifications: + - target: {fileID: 1777921847428221704, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} + propertyPath: m_Size.y + value: 3.4 + objectReference: {fileID: 0} - target: {fileID: 1777921847428221707, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} propertyPath: m_Name value: "\u5C0F\u5B69" @@ -138,13 +142,25 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} propertyPath: m_LocalPosition.x - value: -4.33 + value: -8.37 objectReference: {fileID: 0} - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} propertyPath: m_LocalPosition.y - value: -2.0566175 + value: 0.24 objectReference: {fileID: 0} - target: {fileID: 1777921847428221709, guid: 85b0eb4dab1e554449db812cd5c570e9, type: 3} propertyPath: m_LocalPosition.z @@ -326,7 +342,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 3.43 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -350,7 +366,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 56435766} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.4000001, y: 0.49338245, z: -9.900214} + m_LocalPosition: {x: -5.37, y: 0.77, z: -9.900214} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1049093360} @@ -495,6 +511,130 @@ Transform: m_Father: {fileID: 493331770} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &221943869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 221943870} + - component: {fileID: 221943873} + - component: {fileID: 221943872} + - component: {fileID: 221943871} + m_Layer: 0 + m_Name: "\u7535\u8BDD\u7EBF (2)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &221943870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221943869} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.32, y: 1.56, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1006989818} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &221943871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221943869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3aac6ccb22f7aa3428b69462001463ed, type: 3} + m_Name: + m_EditorClassIdentifier: + m_interface: {fileID: 466905106} + isRepared: 0 +--- !u!61 &221943872 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221943869} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &221943873 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221943869} + 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: 2 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + 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!1 &363919958 GameObject: m_ObjectHideFlags: 0 @@ -519,7 +659,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 363919958} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.2228749, y: 10.902307, z: -7.0532846} + m_LocalPosition: {x: -2.2228749, y: 9.5, z: -7.0532846} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1073926322} @@ -528,6 +668,83 @@ Transform: m_Father: {fileID: 1803085805} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &466905106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 466905107} + - component: {fileID: 466905109} + - component: {fileID: 466905108} + m_Layer: 5 + m_Name: "\u4FEE\u7535\u8BDD\u7EBF\u754C\u9762" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &466905107 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466905106} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_Children: + - {fileID: 2141584033} + - {fileID: 1837461866} + m_Father: {fileID: 927359185} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.61048114, y: 0.20600002} + m_AnchorMax: {x: 0.86200005, y: 0.572} + m_AnchoredPosition: {x: -432.00006, y: -3.900055} + m_SizeDelta: {x: 297, y: 142} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &466905108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466905106} + 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.21960786, g: 0.21960786, b: 0.21960786, a: 0} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &466905109 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 466905106} + m_CullTransparentMesh: 1 --- !u!1 &493331769 GameObject: m_ObjectHideFlags: 0 @@ -573,7 +790,7 @@ GameObject: - component: {fileID: 496175138} m_Layer: 0 m_Name: "\u4E2D\u5C42\u5730\u9762" - m_TagString: Untagged + m_TagString: "\u5730\u9762" m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -617,7 +834,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1830823525 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 9d3a8f78f5e9bd7489125fde7292c0e3, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -656,7 +873,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.05, y: -2.38} + m_Offset: {x: -0.05, y: -1.47} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -667,7 +884,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 20.53, y: 3.2} + m_Size: {x: 25.14, y: 3.2} m_EdgeRadius: 0 --- !u!50 &496175138 Rigidbody2D: @@ -772,6 +989,106 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &927359184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 927359185} + - component: {fileID: 927359188} + - component: {fileID: 927359187} + - component: {fileID: 927359186} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &927359185 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927359184} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 466905107} + m_Father: {fileID: 2044422407} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &927359186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927359184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &927359187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927359184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &927359188 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927359184} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &963972580 GameObject: m_ObjectHideFlags: 3 @@ -859,6 +1176,92 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1006989817 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1803085805} + m_Modifications: + - target: {fileID: 3945938555658400084, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3945938555658400084, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3945938555658400085, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalPosition.x + value: -2.23 + objectReference: {fileID: 0} + - target: {fileID: 3945938555658400085, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalPosition.y + value: 1.56 + objectReference: {fileID: 0} + - target: {fileID: 3945938555658400087, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_interface + value: + objectReference: {fileID: 466905106} + - target: {fileID: 3945938556576538516, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_Name + value: "\u7535\u8BDD\u7EBF\u4EEC" + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538517, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: OKCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalPosition.x + value: -5.7633314 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalPosition.y + value: -1.9987121 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.40322465 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} +--- !u!4 &1006989818 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} + m_PrefabInstance: {fileID: 1006989817} + m_PrefabAsset: {fileID: 0} --- !u!1 &1049093359 GameObject: m_ObjectHideFlags: 0 @@ -1098,7 +1501,7 @@ MonoBehaviour: shellSpeed: 10 shellFallingTime: 1 shellShadowRangeOfChange: 0.1 - shellShadowPositionYOffSet: 1.5 + shellShadowPositionYOffSet: 0.3 rateOfChangeOfThrowingAngle: 1 strengthOfThrowing: 8 --- !u!4 &1258254500 @@ -1113,7 +1516,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1373134508 GameObject: @@ -1127,7 +1530,7 @@ GameObject: - component: {fileID: 1373134510} - component: {fileID: 1373134509} m_Layer: 0 - m_Name: CM vcam1 + m_Name: "\u6444\u50CF\u673A\u53C2\u6570" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1172,7 +1575,7 @@ MonoBehaviour: m_Follow: {fileID: 5949027} m_Lens: FieldOfView: 60 - OrthographicSize: 5 + OrthographicSize: 3.43 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -1193,7 +1596,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373134508} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.4000001, y: 0.49338245, z: -9.900214} + m_LocalPosition: {x: -5.37, y: 0.77, z: -9.900214} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 963972581} @@ -1256,7 +1659,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1807069099 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -10 m_Sprite: {fileID: 21300000, guid: 73aaed0dfbc59ef42b89ded235d94f04, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6080,7 +6483,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1537313301} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -5.7454453, y: -0.42769313, z: -7.6436377} + m_LocalPosition: {x: -5.27, y: 1.85, z: -7.6436377} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1803085805} @@ -6110,7 +6513,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633485122} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.07, y: 2.02, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5949027} @@ -6173,7 +6576,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1680875127 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: -9 m_Sprite: {fileID: 21300000, guid: 011f61b8373d5024784a0541fac6a846, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6193,7 +6596,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1677427149} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.9554454, y: 1.342307, z: 0.5263625} + m_LocalPosition: {x: -1.9554454, y: 0.36, z: 0.5263625} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1803085805} @@ -6209,7 +6612,6 @@ GameObject: m_Component: - component: {fileID: 1686602596} - component: {fileID: 1686602595} - - component: {fileID: 1686602597} m_Layer: 0 m_Name: "\u9760\u8FD1\u6444\u50CF\u673A\u7684\u5730\u9762" m_TagString: Untagged @@ -6256,7 +6658,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1898344561 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 76c04914745385d4f96c35e5bc95b702, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -6276,26 +6678,136 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1686602594} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.9554454, y: -1.5076929, z: 0.5263625} + m_LocalPosition: {x: -0.15, y: -0.92, z: 0.5263625} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1803085805} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1686602597 +--- !u!1 &1700859674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1700859675} + - component: {fileID: 1700859678} + - component: {fileID: 1700859677} + - component: {fileID: 1700859676} + m_Layer: 0 + m_Name: "\u7535\u8BDD\u7EBF (3)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1700859675 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1700859674} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.47, y: 1.56, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1006989818} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1700859676 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686602594} + m_GameObject: {fileID: 1700859674} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69c08ecd162c9144b9de9ce144669c83, type: 3} + m_Script: {fileID: 11500000, guid: 3aac6ccb22f7aa3428b69462001463ed, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 56435769} - moveRate: 0 + m_interface: {fileID: 466905106} + isRepared: 0 +--- !u!61 &1700859677 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1700859674} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1700859678 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1700859674} + 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: 2 + m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + 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!1 &1803085804 GameObject: m_ObjectHideFlags: 0 @@ -6320,7 +6832,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1803085804} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.9554454, y: -1.4423069, z: -0.5263625} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1686602596} @@ -6331,9 +6843,86 @@ Transform: - {fileID: 1402141438} - {fileID: 363919959} - {fileID: 1537313304} + - {fileID: 1006989818} + - {fileID: 2116293276} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1837461865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1837461866} + - component: {fileID: 1837461868} + - component: {fileID: 1837461867} + m_Layer: 5 + m_Name: "\u8FDB\u5EA6\u6761" + m_TagString: "\u8FDB\u5EA6\u6761" + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1837461866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837461865} + 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: 466905107} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.2732673, y: 0.23600002} + m_AnchorMax: {x: 0.72315717, y: 0.80067426} + m_AnchoredPosition: {x: 0.5, y: -3.9999619} + m_SizeDelta: {x: -79, y: -26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1837461867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837461865} + 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: 1, 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.31 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1837461868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1837461865} + m_CullTransparentMesh: 1 --- !u!1 &1935890965 GameObject: m_ObjectHideFlags: 0 @@ -6441,6 +7030,37 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &2044422406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2044422407} + m_Layer: 0 + m_Name: "---\u62BD\u8C61\u7684\u4E1C\u897F---" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2044422407 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2044422406} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.06417028, y: -1.0285301, z: -8.588372} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 927359185} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2087774247 GameObject: m_ObjectHideFlags: 0 @@ -6483,10 +7103,10 @@ PolygonCollider2D: m_AutoTiling: 0 m_Points: m_Paths: - - - {x: 3.996519, y: 9.044941} - - {x: -20.570332, y: 9.443918} - - {x: -20.466574, y: -4.078896} - - {x: 4.1171794, y: -4.182702} + - - {x: -0.2089696, y: 7.842169} + - {x: -21.108624, y: 8.337871} + - {x: -20.744125, y: -2.9728556} + - {x: -0.26914454, y: -3.1124098} --- !u!4 &2087774249 Transform: m_ObjectHideFlags: 0 @@ -6501,3 +7121,148 @@ Transform: m_Father: {fileID: 1049093360} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2116293275 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1803085805} + m_Modifications: + - target: {fileID: 3166212250367666321, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_Color.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666321, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666322, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_Name + value: "\u8F70\u70B8\u533A" + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalPosition.x + value: -4.4 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalPosition.y + value: 0.6412881 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalPosition.z + value: -1.6291499 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} +--- !u!4 &2116293276 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3166212250367666323, guid: 1d53f5a85cbf57b48b0b6faf88c1ded0, type: 3} + m_PrefabInstance: {fileID: 2116293275} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2141584032 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2141584033} + - component: {fileID: 2141584035} + - component: {fileID: 2141584034} + m_Layer: 5 + m_Name: "\u8FDB\u5EA6\u6761\u80CC\u666F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2141584033 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141584032} + 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: 466905107} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.2732673, y: 0.23600002} + m_AnchorMax: {x: 0.72315717, y: 0.80067426} + m_AnchoredPosition: {x: 0.5, y: -3.9999619} + m_SizeDelta: {x: -79, y: -26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2141584034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141584032} + 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: 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_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 &2141584035 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141584032} + m_CullTransparentMesh: 1 diff --git a/Assets/Scripts/AbstractItem/BombingArea.cs b/Assets/Scripts/AbstractItem/BombingArea.cs index 01d4e66..f89f262 100644 --- a/Assets/Scripts/AbstractItem/BombingArea.cs +++ b/Assets/Scripts/AbstractItem/BombingArea.cs @@ -7,6 +7,8 @@ public class BombingArea : MonoBehaviour // Start is called before the first frame update private bool bombing = false;//是否正在轰炸 public GameObject shell;//炮弹游戏物体 + // [Tooltip("炮弹阴影Y轴的偏移量")] + // public float shellShadowYOffset;//炮弹阴影Y轴的偏移量，因为复杂原因，必须使用此变量调整阴影的Y位置 private float minimumTimeInterval; private float maximumTimeInterval;//生成炮弹的最小和最大时间间隔 @@ -44,8 +46,8 @@ public class BombingArea : MonoBehaviour if(leftTime <= 0f) { Instantiate(shell,//生成炮弹 - player.transform.position + //以玩家位置 - new Vector3(Random.Range(-maxOffSetOfShell,maximumTimeInterval),//加上水平方向的偏移量 + player.transform.position + //以玩家位置 + new Vector3(Random.Range(-maxOffSetOfShell,maxOffSetOfShell),//加上水平方向的偏移量 shellHeight,0),//竖直方向给高度 Quaternion.identity); leftTime = Random.Range(minimumTimeInterval,maximumTimeInterval); diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 935ac0a..1fa6aa8 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,20 +15,20 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 flags: 0