diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index 4023d41..2d5b9db 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: 6.399998 m_Colors: - - Center: {r: 0.576797, g: 0.23002703, b: 0, a: 0} + - Center: {r: 0.6742085, g: 0.2503847, 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 161ae73..08f1d95 100644 --- a/Assets/Prefabs/投掷系统/投掷物.prefab +++ b/Assets/Prefabs/投掷系统/投掷物.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 4018427281142380166} - component: {fileID: 4018427281142380167} - component: {fileID: 4018427281142380164} + - component: {fileID: 8403612127672763802} m_Layer: 0 m_Name: "\u6295\u63B7\u7269" m_TagString: "\u6295\u63B7\u7269" @@ -121,3 +122,15 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 1, y: 1} m_Direction: 0 +--- !u!114 &8403612127672763802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4018427281142380165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 621395b8c0d84a847a7f7f6e059e43a0, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/角色/小孩.prefab b/Assets/Prefabs/角色/小孩.prefab index 1861d5c..84d90bf 100644 --- a/Assets/Prefabs/角色/小孩.prefab +++ b/Assets/Prefabs/角色/小孩.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1692961902559028648} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.9, y: -0.76, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3719369086825294709} @@ -44,6 +44,7 @@ GameObject: - component: {fileID: 1692961902718145227} - component: {fileID: 1692961902718145226} - component: {fileID: 1692961902718145223} + - component: {fileID: 921260772} m_Layer: 0 m_Name: "\u5C0F\u5B69" m_TagString: Player @@ -147,7 +148,7 @@ MonoBehaviour: m_EditorClassIdentifier: catched: {fileID: 0} missile: {fileID: 4018427281142380165, guid: 628f0c1ef857ddd4687c94b8ba9b1aa6, type: 3} - throwOffset: {fileID: 0} + throwOffset: {fileID: 1692961902559028647} --- !u!114 &1692961902718145223 MonoBehaviour: m_ObjectHideFlags: 0 @@ -242,7 +243,19 @@ MonoBehaviour: m_ActionId: beabb251-6f14-495d-9364-88119e0f9bf0 m_ActionName: NullMap/New action - m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1692961902718145226} + m_TargetAssemblyTypeName: M_Player, Assembly-CSharp + m_MethodName: OnThrowQuit + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_ActionId: 078b3370-2cb6-4574-9156-0146ae814573 m_ActionName: PlayerInThrowing/Quit[/Keyboard/k] - m_PersistentCalls: @@ -298,6 +311,104 @@ MonoBehaviour: m_DefaultActionMap: PlayerNormal m_SplitScreenIndex: -1 m_Camera: {fileID: 0} +--- !u!120 &921260772 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5563886958839055788} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2bcc72af9791dfb448148e231fb8c7ee, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 10 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 0.13888931 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 --- !u!1001 &3957130042712587998 PrefabInstance: m_ObjectHideFlags: 0 @@ -323,11 +434,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8768629961683683037, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0009851903 + value: -0.0009849519 objectReference: {fileID: 0} - target: {fileID: -8768629961683683037, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0009602383 + value: 0.00095999986 objectReference: {fileID: 0} - target: {fileID: -8768629961683683037, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -339,7 +450,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7914289121446776058, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0005945936 + value: 0.0005950108 objectReference: {fileID: 0} - target: {fileID: -7914289121446776058, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -355,7 +466,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7274282554946910137, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0021401048 + value: 0.002155304 objectReference: {fileID: 0} - target: {fileID: -7274282554946910137, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -371,11 +482,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6734166163963399142, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0012998283 + value: 0.0013000667 objectReference: {fileID: 0} - target: {fileID: -6734166163963399142, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.02864492 + value: -0.028644443 objectReference: {fileID: 0} - target: {fileID: -6734166163963399142, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -387,11 +498,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6001402528758460064, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0008700788 + value: -0.0008699596 objectReference: {fileID: 0} - target: {fileID: -6001402528758460064, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.00000047683716 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6001402528758460064, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -459,7 +570,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5583197367595257359, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: -5583197367595257359, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -475,7 +586,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5247984839549073334, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00000021606684 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: -5247984839549073334, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -495,7 +606,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4385646031045499151, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.0008551851 + value: -0.0008554235 objectReference: {fileID: 0} - target: {fileID: -4385646031045499151, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -507,11 +618,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4264577982327312459, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0026249886 + value: 0.0026097298 objectReference: {fileID: 0} - target: {fileID: -4264577982327312459, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.024820268 + value: -0.02482003 objectReference: {fileID: 0} - target: {fileID: -4264577982327312459, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -519,7 +630,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3942798046597374264, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0021202192 + value: 0.0021199808 objectReference: {fileID: 0} - target: {fileID: -3942798046597374264, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -535,7 +646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3732212491034922717, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.002754502 + value: -0.0027549788 objectReference: {fileID: 0} - target: {fileID: -3732212491034922717, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -559,11 +670,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2539634155857041622, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.002064973 + value: -0.002080232 objectReference: {fileID: 0} - target: {fileID: -2539634155857041622, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.00000048428774 + value: -0.000000007450581 objectReference: {fileID: 0} - target: {fileID: -2539634155857041622, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -579,7 +690,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2160634030733310723, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.00000044703484 + value: 0.000000923872 objectReference: {fileID: 0} - target: {fileID: -2160634030733310723, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -591,11 +702,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1059228187761910039, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0005751252 + value: -0.000575006 objectReference: {fileID: 0} - target: {fileID: -1059228187761910039, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.0029606223 + value: -0.002960503 objectReference: {fileID: 0} - target: {fileID: -1059228187761910039, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -607,7 +718,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -943491706676852375, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0010942295 + value: 0.0010797083 objectReference: {fileID: 0} - target: {fileID: -943491706676852375, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -623,7 +734,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -518390201096889253, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.009690076 + value: -0.009689957 objectReference: {fileID: 0} - target: {fileID: -518390201096889253, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -639,7 +750,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -184478776732042136, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0016445816 + value: 0.0016450584 objectReference: {fileID: 0} - target: {fileID: -184478776732042136, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -655,7 +766,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1957782921838011948, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00000062584877 + value: 0.000000007450581 objectReference: {fileID: 0} - target: {fileID: 1957782921838011948, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -687,11 +798,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2207641786743455394, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0002246052 + value: 0.00022490323 objectReference: {fileID: 0} - target: {fileID: 2207641786743455394, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.00000047683716 + value: 0.00000023841858 objectReference: {fileID: 0} - target: {fileID: 2207641786743455394, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -703,7 +814,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2300005457862149712, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0000010058284 + value: 0.000015258789 objectReference: {fileID: 0} - target: {fileID: 2300005457862149712, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -719,7 +830,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2566878901993916379, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.00091956556 + value: 0.00093524903 objectReference: {fileID: 0} - target: {fileID: 2566878901993916379, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -775,11 +886,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4812338330836884733, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00000052154064 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4812338330836884733, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0000009536743 + value: 0.0000011920929 objectReference: {fileID: 0} - target: {fileID: 4812338330836884733, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -791,11 +902,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5072364404068036212, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.00034476817 + value: 0.00034500659 objectReference: {fileID: 0} - target: {fileID: 5072364404068036212, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.0004800409 + value: -0.00048051775 objectReference: {fileID: 0} - target: {fileID: 5072364404068036212, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -807,11 +918,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5209907848668345870, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.0014502779 + value: 0.0014500394 objectReference: {fileID: 0} - target: {fileID: 5209907848668345870, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0004399866 + value: 0.00044046342 objectReference: {fileID: 0} - target: {fileID: 5209907848668345870, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -823,7 +934,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5452683758599913015, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.00079936534 + value: 0.000800021 objectReference: {fileID: 0} - target: {fileID: 5452683758599913015, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -839,11 +950,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5475140650991618958, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0007702708 + value: -0.0007700324 objectReference: {fileID: 0} - target: {fileID: 5475140650991618958, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.039560854 + value: -0.039560378 objectReference: {fileID: 0} - target: {fileID: 5475140650991618958, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.y @@ -851,11 +962,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6082399734885695883, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.002190426 + value: 0.002205208 objectReference: {fileID: 0} - target: {fileID: 6082399734885695883, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0008600205 + value: 0.00086049736 objectReference: {fileID: 0} - target: {fileID: 6082399734885695883, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -867,7 +978,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6172366585893201328, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.002234757 + value: -0.0022349954 objectReference: {fileID: 0} - target: {fileID: 6172366585893201328, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y @@ -879,11 +990,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7045094786651869979, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: 0.00000028312206 + value: 0.000000044703484 objectReference: {fileID: 0} - target: {fileID: 7045094786651869979, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.00000035762787 + value: 0.00000059604645 objectReference: {fileID: 0} - target: {fileID: 7045094786651869979, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -899,7 +1010,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7316714418794174679, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0020947903 + value: 0.0020950288 objectReference: {fileID: 0} - target: {fileID: 7316714418794174679, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -907,11 +1018,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7963621343228913669, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.00000037252903 + value: 0.000000014901161 objectReference: {fileID: 0} - target: {fileID: 7963621343228913669, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0000058338046 + value: 0.000005595386 objectReference: {fileID: 0} - target: {fileID: 7963621343228913669, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -923,11 +1034,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x - value: -0.0013350099 + value: -0.0013348907 objectReference: {fileID: 0} - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: 0.0014649332 + value: 0.0014650524 objectReference: {fileID: 0} - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x @@ -935,7 +1046,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.y - value: 0.48853534 + value: 0.48853546 objectReference: {fileID: 0} - target: {fileID: 9036679573997064456, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.x @@ -943,7 +1054,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9036679573997064456, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Center.y - value: -0.0000006109476 + value: -0.0000007301569 objectReference: {fileID: 0} - target: {fileID: 9036679573997064456, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3} propertyPath: m_Bounds.m_Extent.x diff --git a/Assets/Scenes/各种系统测试与陈列.unity b/Assets/Scenes/各种系统测试与陈列.unity index 448a885..d427f44 100644 --- a/Assets/Scenes/各种系统测试与陈列.unity +++ b/Assets/Scenes/各种系统测试与陈列.unity @@ -1307,11 +1307,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 3945938556576538518, guid: 77c170410751adc43b3804b6a3f59d3b, type: 3} m_PrefabInstance: {fileID: 381999398} m_PrefabAsset: {fileID: 0} ---- !u!4 &421694489 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 1692961901516479215} - m_PrefabAsset: {fileID: 0} --- !u!1 &461367559 GameObject: m_ObjectHideFlags: 0 @@ -1779,7 +1774,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604041686} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -12.36, y: -0.86, z: -10} + m_LocalPosition: {x: -11.909999, y: -0.86, z: -10} m_LocalScale: {x: 40.825, y: 10.626138, z: 1} m_Children: - {fileID: 2009057140} @@ -1822,7 +1817,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 2658040340377940378} + m_Follow: {fileID: 1346050984} m_Lens: FieldOfView: 60 OrthographicSize: 4 @@ -2041,7 +2036,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_LocalPosition.x - value: -21.27 + value: -25.22 objectReference: {fileID: 0} - target: {fileID: 3118168874406839344, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_LocalPosition.y @@ -2085,7 +2080,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3118168874406839345, guid: a33f3ee35358b11469af30e9a746a630, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a33f3ee35358b11469af30e9a746a630, type: 3} @@ -2670,9 +2665,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 929368894} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -20.94, y: -0.67, z: 0} + m_LocalPosition: {x: -22.63, y: -0.67, z: 0} m_LocalScale: {x: 7.8272, y: 7.8272, z: 7.8272} - m_Children: [] + m_Children: + - {fileID: 1935402051} m_Father: {fileID: 293805376} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2767,8 +2763,9 @@ MonoBehaviour: m_EditorClassIdentifier: point1: {fileID: 788577771} point2: {fileID: 1209357885} - walkSpeed: 10 + walkSpeed: 0 rushSpeed: 1 + missiles: [] --- !u!1 &969830747 GameObject: m_ObjectHideFlags: 0 @@ -3552,109 +3549,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1310739312 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 1692961901516479215} - m_PrefabAsset: {fileID: 0} ---- !u!120 &1310739313 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1310739312} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 1} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 1 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.23611069 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 0 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 --- !u!1 &1318196405 GameObject: m_ObjectHideFlags: 0 @@ -3765,7 +3659,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1334261266} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -12.36, y: -0.86, z: -10} + m_LocalPosition: {x: -11.909999, y: -0.86, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1894615460} @@ -3968,6 +3862,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345602143} m_CullTransparentMesh: 1 +--- !u!1001 &1346050983 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1601657821} + m_Modifications: + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.x + value: -14.91 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.y + value: 0.06 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + propertyPath: m_Name + value: "\u5C0F\u5B69" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} +--- !u!4 &1346050984 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} + m_PrefabInstance: {fileID: 1346050983} + m_PrefabAsset: {fileID: 0} --- !u!1 &1355607312 GameObject: m_ObjectHideFlags: 0 @@ -4824,7 +4780,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 745750434} - - {fileID: 2658040340377940378} + - {fileID: 1346050984} - {fileID: 1272973346} m_Father: {fileID: 0} m_RootOrder: 1 @@ -5484,6 +5440,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 6516117755271630970, guid: 5ad2f573d77b68149b5b3270cac7842f, type: 3} m_PrefabInstance: {fileID: 6516117756632472972} m_PrefabAsset: {fileID: 0} +--- !u!1 &1935402050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1935402051} + - component: {fileID: 1935402052} + m_Layer: 0 + m_Name: "\u542C\u89C9\u8303\u56F4" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1935402051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935402050} + 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: 929368895} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1935402052 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935402050} + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.45, y: 1.1} + m_EdgeRadius: 0 --- !u!1001 &1936744432 PrefabInstance: m_ObjectHideFlags: 0 @@ -6311,84 +6324,6 @@ MonoBehaviour: - {x: 0.5, y: -0.5, z: 0} - {x: 0.5, y: 0.5, z: 0} - {x: -0.5, y: 0.5, z: 0} ---- !u!1001 &1692961901516479215 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1601657821} - m_Modifications: - - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.x - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.y - value: -0.76 - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: throwOffset - value: - objectReference: {fileID: 421694489} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalScale.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.x - value: -15.36 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.06 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_Name - value: "\u5C0F\u5B69" - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} ---- !u!4 &2658040340377940378 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 1692961901516479215} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6516117756632472972 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/第二关.unity b/Assets/Scenes/第二关.unity index 0fc34ab..1a0aa8e 100644 --- a/Assets/Scenes/第二关.unity +++ b/Assets/Scenes/第二关.unity @@ -978,46 +978,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1598010456} m_Modifications: - - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.x - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_LocalPosition.y - value: -0.76 - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 921260771} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnThrowQuit - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: M_Player, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145223, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - propertyPath: throwOffset - value: - objectReference: {fileID: 921260769} - target: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} propertyPath: m_RootOrder value: 0 @@ -1073,125 +1033,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 3719369086825294709, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} m_PrefabInstance: {fileID: 921260767} m_PrefabAsset: {fileID: 0} ---- !u!4 &921260769 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1692961902559028647, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 921260767} - m_PrefabAsset: {fileID: 0} ---- !u!1 &921260770 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5563886958839055788, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 921260767} - m_PrefabAsset: {fileID: 0} ---- !u!114 &921260771 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1692961902718145226, guid: e0481b76b4057fd4fad09cc46028b53a, type: 3} - m_PrefabInstance: {fileID: 921260767} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 921260770} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e2c1a0de69ef6d468a14db32ebf68fe, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!120 &921260772 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 921260770} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 2bcc72af9791dfb448148e231fb8c7ee, 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 1} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 1 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 0.13888931 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 0 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 --- !u!1 &1031032739 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/具象物体/Missile.cs b/Assets/Scripts/具象物体/Missile.cs index 9f5760c..d4af25c 100644 --- a/Assets/Scripts/具象物体/Missile.cs +++ b/Assets/Scripts/具象物体/Missile.cs @@ -2,9 +2,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Missile : Interactive +public class Missile : MonoBehaviour { - //投掷物类,控制投掷。系统还十分不完善。 + //投掷物类,用来控制投掷物 // Start is called before the first frame update void Start() { @@ -16,12 +16,4 @@ public class Missile : Interactive { } - public override void OnCall() - { - //当投掷物被触发交互 - //1.通知玩家进入投掷状态 - FindObjectOfType().EnterThrowingState(); - //2.后续物理相关修改 - // - } } diff --git a/Assets/Scripts/具象物体/Missile.cs.meta b/Assets/Scripts/具象物体/Missile.cs.meta index a9fec29..bedfcf3 100644 --- a/Assets/Scripts/具象物体/Missile.cs.meta +++ b/Assets/Scripts/具象物体/Missile.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea9b46e6ad9699a4399143d3a1fb6409 +guid: 621395b8c0d84a847a7f7f6e059e43a0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/具象物体/MissileHeap.cs b/Assets/Scripts/具象物体/MissileHeap.cs new file mode 100644 index 0000000..323fd9b --- /dev/null +++ b/Assets/Scripts/具象物体/MissileHeap.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MissileHeap : Interactive +{ + //投掷物堆类,控制投掷。系统还十分不完善。 + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + public override void OnCall() + { + //当投掷物被触发交互 + //1.通知玩家进入投掷状态 + FindObjectOfType().EnterThrowingState(); + //2.后续物理相关修改 + // + } +} diff --git a/Assets/Scripts/具象物体/MissileHeap.cs.meta b/Assets/Scripts/具象物体/MissileHeap.cs.meta new file mode 100644 index 0000000..a9fec29 --- /dev/null +++ b/Assets/Scripts/具象物体/MissileHeap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ea9b46e6ad9699a4399143d3a1fb6409 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/具象物体/Patrolman.cs b/Assets/Scripts/具象物体/Patrolman.cs index 290d55a..f177fd0 100644 --- a/Assets/Scripts/具象物体/Patrolman.cs +++ b/Assets/Scripts/具象物体/Patrolman.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEditor; public class Patrolman : MonoBehaviour { @@ -19,12 +20,18 @@ public class Patrolman : MonoBehaviour private Transform target;//当前目标位置 private bool isInterrupt = false;//记录目前是否被石头落地的声音所吸引 private float PVelocity = -1f;//记录上一帧的速度,默认上一帧往右走 + private Transform auditoryRange;//听觉范围子物体 + [SerializeField][ReadOnly] + private List missiles;//投掷物列表,巡逻者会自动往搜索听觉范围内的投掷物 // Start is called before the first frame update void Start() { target = point1;//初始化起始目标为巡逻点1 speed = walkSpeed;//初始化瞬间速度为走路速度 + auditoryRange = transform.Find("听觉范围");//找到子物体听觉范围 + auditoryRange.gameObject.AddComponent();//给子物体听觉范围填上碰撞监测代码 + missiles = new List();//初始化投掷物列表 } // Update is called once per frame @@ -69,5 +76,62 @@ public class Patrolman : MonoBehaviour PVelocity = velocity; } + void OnTriggerEnter2D(Collider2D other) + { + if(other.gameObject.tag == "Player") Debug.Log("玩家进入了监测区"); + } + //在听觉范围中调用,加入一个监听中的投掷物 + public void AddAMissile(Missile missile){missiles.Add(missile);} + //在听觉范围中调用,移除一个监听中的投掷物 + public void RemoveAMissile(Missile missile){missiles.Remove(missile);} + // for(int i = 0; i < missiles.Count; i++) + // { + // if(missiles[i].Equals(missile)) + // { + // missiles.Remove(missile); + // } + // } + + + + private class AuditoryRange : MonoBehaviour + { + void OnTriggerEnter2D(Collider2D other) + { + if(other.tag == "投掷物") + { + //当有投掷物进入听觉范围,把他加入监控内的投掷物列表 + GetComponentInParent().AddAMissile(other.GetComponent()); + } + } + + void OnTriggerExit2D(Collider2D other) + { + if(other.tag == "投掷物") + { + //当有投掷物离开听觉范围,把他移出监控内的投掷物列表 + GetComponentInParent().RemoveAMissile(other.GetComponent()); + } + } + } + + //制造一个只读的变量,不要动这些 + public class ReadOnlyAttribute : PropertyAttribute{} + [CustomPropertyDrawer(typeof(ReadOnlyAttribute))] + public class ReadOnlyDrawer : PropertyDrawer + { + public override float GetPropertyHeight(SerializedProperty property, GUIContent label) + { + return EditorGUI.GetPropertyHeight(property, label, true); + } + + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) + { + GUI.enabled = false; + EditorGUI.PropertyField(position, property, label, true); + GUI.enabled = true; + } + } + // } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 0f2e120..1c913bd 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,22 +18,22 @@ EditorUserSettings: value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 + value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb + value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb + value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb + value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18 flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7