diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 4b44b67d..c1589f35 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -123,7 +123,7 @@ Transform: m_Children: - {fileID: 114525538} m_Father: {fileID: 5512074156260461627} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6350339116943227109 MonoBehaviour: @@ -175,7 +175,7 @@ Transform: m_LocalScale: {x: 0.09868923, y: 0.09868923, z: 0.09868923} m_Children: [] m_Father: {fileID: 5512074156260461627} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1868832763 MeshFilter: @@ -276,7 +276,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 34767209977200763} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.242, z: -4.46} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -413,6 +413,25 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!95 &7837082619273855066 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138956548591105957} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f69a267091a4b2e4c9f6ad1a4994c5d4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1971089552420747189 GameObject: m_ObjectHideFlags: 0 @@ -576,7 +595,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5512074156260461627} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!20 &5366621233820033847 Camera: @@ -1050,6 +1069,37 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5241641214988965997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1598205627575314422} + m_Layer: 11 + m_Name: Rotation_Angle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1598205627575314422 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5241641214988965997} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.01242843, y: -0.127, z: -0.153} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8245684177115831463} + m_Father: {fileID: 5512074156260461627} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5232132838033057162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1184,19 +1234,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6305143471408041679} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2.59} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3081213705923538669} - {fileID: 8244023309181403033} - {fileID: 8390304855597536859} - m_Father: {fileID: 5266046645074515435} - m_RootOrder: 2 + m_Father: {fileID: 6865737300552731159} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 960, y: 539.95} m_SizeDelta: {x: 130, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6305143471408041676 @@ -1265,7 +1315,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6865737300552731157} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 2.59} + m_LocalPosition: {x: 0, y: 0.05, z: 2.59} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7222213072416684655} @@ -1273,6 +1323,9 @@ Transform: - {fileID: 4583632407061898182} - {fileID: 7888230650824579511} - {fileID: 5266046645074515435} + - {fileID: 7049978149805136274} + - {fileID: 6513129680526216909} + - {fileID: 6305143471408041678} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1431,6 +1484,7 @@ MonoBehaviour: detectionRadius: 600 isEngagedTarget: 0 gxWRJCamera: {fileID: 6382256847466738257} + Rotation_Angle: {fileID: 1598205627575314422} dzWRJCamera: {fileID: 5366621233820033847} batteryLife: 1 classificationWindResistance: 1 @@ -1472,7 +1526,7 @@ GameObject: m_Layer: 11 m_Name: "Camera\u5149\u5B66" m_TagString: Untagged - m_Icon: {fileID: 0} + m_Icon: {fileID: 7250588514170254948, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 @@ -1483,13 +1537,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7326748669528570608} - m_LocalRotation: {x: 0.17382409, y: -0, z: -0, w: 0.98477674} - m_LocalPosition: {x: 0, y: 0, z: 0.173} + m_LocalRotation: {x: 0.30070576, y: 0, z: 0, w: 0.953717} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5512074156260461627} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 20.02, y: 0, z: 0} + m_Father: {fileID: 1598205627575314422} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 35, y: 0, z: 0} --- !u!20 &6382256847466738257 Camera: m_ObjectHideFlags: 0 @@ -1575,10 +1629,7 @@ RectTransform: 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: 7049978149805136274} - - {fileID: 6513129680526216909} - - {fileID: 6305143471408041678} + m_Children: [] m_Father: {fileID: 6865737300552731159} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1687,17 +1738,17 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} @@ -1751,18 +1802,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} ---- !u!4 &7888230650824579511 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - m_PrefabInstance: {fileID: 2480616969672327800} - m_PrefabAsset: {fileID: 0} --- !u!1 &6311100753636855780 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} m_PrefabInstance: {fileID: 2480616969672327800} m_PrefabAsset: {fileID: 0} +--- !u!4 &7888230650824579511 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, + type: 3} + m_PrefabInstance: {fileID: 2480616969672327800} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2498570764477447715 PrefabInstance: m_ObjectHideFlags: 0 @@ -2538,17 +2589,17 @@ PrefabInstance: - target: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} @@ -2692,18 +2743,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &5512074156260461627 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2498570764477447715} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5512074156260461626 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2498570764477447715} - m_PrefabAsset: {fileID: 0} --- !u!114 &4610455937839310686 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -2716,12 +2755,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &5512074156260461626 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2498570764477447715} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5512074156260461627 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2498570764477447715} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1138956548591105957 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3270411768248797574, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2498570764477447715} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5514169232507334764 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 5266046645074515435} + m_TransformParent: {fileID: 6865737300552731159} m_Modifications: - target: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -2826,22 +2883,22 @@ PrefabInstance: - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -2.59 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -2851,7 +2908,7 @@ PrefabInstance: - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_RootOrder - value: 1 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -2871,12 +2928,12 @@ PrefabInstance: - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 960 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 539.95 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -3172,30 +3229,6 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} ---- !u!114 &6262023449843827082 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5514169232507334764} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &110317182079341201 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5514169232507334764} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1885673261310054197 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3208,18 +3241,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8819152810871452006 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5514169232507334764} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2028789305539509067 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3262,6 +3283,30 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5514169232507334764} m_PrefabAsset: {fileID: 0} +--- !u!114 &110317182079341201 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5514169232507334764} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6262023449843827082 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5514169232507334764} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &5373553619706430310 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3274,6 +3319,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8819152810871452006 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5514169232507334764} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8108767849280698377 PrefabInstance: m_ObjectHideFlags: 0 @@ -3314,17 +3371,17 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} @@ -3395,7 +3452,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 5266046645074515435} + m_TransformParent: {fileID: 6865737300552731159} m_Modifications: - target: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -3500,22 +3557,22 @@ PrefabInstance: - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -2.59 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -3525,7 +3582,7 @@ PrefabInstance: - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_RootOrder - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -3545,12 +3602,12 @@ PrefabInstance: - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 960 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 539.95 objectReference: {fileID: 0} - target: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} @@ -3851,18 +3908,6 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} ---- !u!114 &4744025336127579705 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &4193460165237867982 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3911,6 +3956,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4744025336127579705 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2851464892156488724 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5257004626334551120 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3941,15 +4010,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2851464892156488724 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/GameAssets/Prefebs/Models/无人机.prefab b/Assets/GameAssets/Prefebs/Models/无人机.prefab index 6515ec39..9fae865d 100644 --- a/Assets/GameAssets/Prefebs/Models/无人机.prefab +++ b/Assets/GameAssets/Prefebs/Models/无人机.prefab @@ -188,7 +188,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 25 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5846624891131315951 MeshFilter: @@ -267,7 +267,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 17 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7403007509377082155 MeshFilter: @@ -472,7 +472,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 34 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6449768767250952506 MeshFilter: @@ -551,7 +551,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 32 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9110751227612428408 MeshFilter: @@ -709,7 +709,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 39 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8132551788138158038 MeshFilter: @@ -1058,7 +1058,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 10 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5593103044107370535 MeshFilter: @@ -1163,12 +1163,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1362648357805035386} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 2 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &461427921058167752 MeshFilter: @@ -1326,7 +1327,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 28 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3730015501349836071 MeshFilter: @@ -1405,7 +1406,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 36 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7744790146160191244 MeshFilter: @@ -1558,12 +1559,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1595306279640455296} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 8 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3098299749473934658 MeshFilter: @@ -1748,12 +1750,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1684256186392494296} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 1 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3881461860221357483 MeshFilter: @@ -1832,7 +1835,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 16 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3671730534534457308 MeshFilter: @@ -1942,7 +1945,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 22 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8581212918347764517 MeshFilter: @@ -2180,7 +2183,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 20 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5317541240759287100 MeshFilter: @@ -2287,18 +2290,8 @@ Transform: m_LocalPosition: {x: -0, y: 0, z: 4.656613e-10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 665623205918322262} - - {fileID: 998801433179548154} - - {fileID: 6901673943140307789} - - {fileID: 7064935087701169197} - - {fileID: 7903690790553634174} - - {fileID: 7433316422604070335} - - {fileID: 2787196477917601341} - {fileID: 6856289437772310168} - - {fileID: 2044544396897332022} - - {fileID: 5683496175203316074} - {fileID: 8719475429864185101} - - {fileID: 3711947013758074026} - {fileID: 2192093910724259623} - {fileID: 6810562569988121801} - {fileID: 2774721298216360947} @@ -2327,15 +2320,26 @@ Transform: - {fileID: 4893360768612527855} - {fileID: 5762908338098044374} - {fileID: 8230217222103388666} - - {fileID: 6313663634904194376} - {fileID: 4118397022661748572} - - {fileID: 8093198378688515090} - {fileID: 5055964434485617698} - {fileID: 2477770287312861129} - {fileID: 6203966583753646602} - {fileID: 1361130808876400934} + - {fileID: 6393090505998556021} + - {fileID: 7903690790553634174} + - {fileID: 6901673943140307789} + - {fileID: 7433316422604070335} + - {fileID: 5683496175203316074} + - {fileID: 665623205918322262} + - {fileID: 998801433179548154} + - {fileID: 2787196477917601341} + - {fileID: 2044544396897332022} + - {fileID: 6313663634904194376} + - {fileID: 8093198378688515090} + - {fileID: 3711947013758074026} + - {fileID: 7064935087701169197} m_Father: {fileID: 627519565659796380} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1942349658375407419 GameObject: @@ -2446,7 +2450,7 @@ Transform: m_Children: - {fileID: 8696536634762254386} m_Father: {fileID: 627519565659796380} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2080531949991335759 GameObject: @@ -2765,7 +2769,7 @@ Transform: m_Children: - {fileID: 3896276077652580592} m_Father: {fileID: 627519565659796380} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2588404670654898136 GameObject: @@ -2900,13 +2904,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2728999157984905666} - m_LocalRotation: {x: 0.000000001317089, y: -0.70710665, z: 0.0000000013170885, w: 0.7071069} - m_LocalPosition: {x: 0.03249997, y: -0.046400003, z: 0.000000005122274} + m_LocalRotation: {x: -0.000000029801274, y: -0.70710665, z: 1.0453932e-12, w: 0.70710695} + m_LocalPosition: {x: 0.032498345, y: -0.046399914, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1768444312966152406} - m_Father: {fileID: 627519565659796380} - m_RootOrder: 0 + m_Father: {fileID: 6337880493703294638} + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2733722726797675878 GameObject: @@ -3208,7 +3212,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 31 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3064125407533561129 MeshFilter: @@ -3399,7 +3403,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 43 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &560600390515323277 MeshFilter: @@ -3478,7 +3482,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 33 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8590854671063688863 MeshFilter: @@ -3636,7 +3640,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 26 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8304548639030284485 MeshFilter: @@ -3712,7 +3716,6 @@ Transform: m_LocalPosition: {x: -0.005308582, y: -0.28303838, z: -0.092826985} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6393090505998556021} - {fileID: 8782296371657534033} - {fileID: 2697261765599735169} - {fileID: 4162410983835363363} @@ -3752,7 +3755,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 46 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6694428839416364308 MeshFilter: @@ -4278,7 +4281,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 14 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8331002738551420985 MeshFilter: @@ -4437,7 +4440,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 41 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7072429202119783168 MeshFilter: @@ -4516,7 +4519,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 13 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5616893318749143037 MeshFilter: @@ -4755,7 +4758,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 18 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2131449609919108133 MeshFilter: @@ -4913,7 +4916,7 @@ Transform: m_Children: - {fileID: 8389930083865613966} m_Father: {fileID: 627519565659796380} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4158008641671143042 GameObject: @@ -5044,7 +5047,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 12 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8649661642218943370 MeshFilter: @@ -5154,7 +5157,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 21 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7770669613628064059 MeshFilter: @@ -5228,12 +5231,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4439010448365307200} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 11 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6788947770026351102 MeshFilter: @@ -5374,7 +5378,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 44 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &581191103028511740 MeshFilter: @@ -5514,7 +5518,7 @@ Transform: m_Children: - {fileID: 4725504921444794230} m_Father: {fileID: 627519565659796380} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4687800576461722785 GameObject: @@ -5580,7 +5584,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 27 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6437408826333535842 MeshFilter: @@ -5690,7 +5694,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 7 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7173763192904213543 MeshFilter: @@ -5769,7 +5773,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 24 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8244008685485373605 MeshFilter: @@ -5843,12 +5847,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5306828213091990550} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 0 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2381520187925678976 MeshFilter: @@ -5927,7 +5932,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 19 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &745567630696570125 MeshFilter: @@ -6190,12 +6195,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5548939811809070090} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 9 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1901576257987211918 MeshFilter: @@ -6274,7 +6280,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 37 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6918599282021226455 MeshFilter: @@ -6727,12 +6733,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6217363383763783101} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 42 + m_RootOrder: 45 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9182952176740693306 MeshFilter: @@ -6806,12 +6813,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6275463669341657630} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 4 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1868651032715272483 MeshFilter: @@ -6890,7 +6898,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 23 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2280052644555380760 MeshFilter: @@ -6969,7 +6977,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 29 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6594428921975620461 MeshFilter: @@ -7079,7 +7087,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 45 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1820976927815121778 MeshFilter: @@ -7394,12 +7402,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7295080886044044123} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 6 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8607688359011672606 MeshFilter: @@ -7558,7 +7567,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 38 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5291412552394796504 MeshFilter: @@ -7778,7 +7787,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 15 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2161664032816477204 MeshFilter: @@ -8155,7 +8164,7 @@ Transform: m_Children: - {fileID: 7045147356778381040} m_Father: {fileID: 627519565659796380} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7843269873682666027 GameObject: @@ -8457,7 +8466,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 35 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5598407014656804160 MeshFilter: @@ -8635,7 +8644,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 30 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2719415897156162844 MeshFilter: @@ -8790,11 +8799,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8388702017840119405} m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 3 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3906021069371899831 MeshFilter: @@ -8899,12 +8908,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8627126292391934702} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 5 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9538561580650204 MeshFilter: @@ -9309,12 +9319,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9095172582606846513} - m_LocalRotation: {x: -9.347399e-36, y: -5.9458306e-19, z: -1.5720932e-17, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalRotation: {x: 0.000000014901159, y: 0.00000002328306, z: -0.000000029800841, + w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6337880493703294638} - m_RootOrder: 40 + m_RootOrder: 44 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2279542903445715415 MeshFilter: diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index 8459501c..e346a0f1 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -1527,6 +1527,9 @@ public class Scenariopage : MonoBehaviour queren_btnn3.onClick.AddListener(() => { ispbaocun = true; + environment_setting_btn.gameObject.SetActive(true); + model_list_btn.gameObject.SetActive(true); + object_list_btn.gameObject.SetActive(true); contingency_list_panl.gameObject.SetActive(false); Scenariofile_panl.gameObject.SetActive(true); model_panl.gameObject.SetActive(false); diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index f780c379..24ae6caf 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.16233954, g: 0.30609617, b: 0.6688702, a: 1} + m_IndirectSpecularColor: {r: 0.1622766, g: 0.30692616, b: 0.67379403, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6771,7 +6771,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 125837377} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -488, y: 293, z: -56} + m_LocalPosition: {x: -409, y: 293, z: 75} m_LocalScale: {x: 85.66619, y: 85.66619, z: 85.66619} m_Children: [] m_Father: {fileID: 0} @@ -72521,7 +72521,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 106899812 + randSeed: 168024906 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index e85069ab..ab9c0fac 100644 Binary files a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity and b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity differ diff --git a/Assets/Zion/Scenes/InitConnect.unity b/Assets/Zion/Scenes/InitConnect.unity index a5b31601..90891f11 100644 --- a/Assets/Zion/Scenes/InitConnect.unity +++ b/Assets/Zion/Scenes/InitConnect.unity @@ -904,6 +904,7 @@ MonoBehaviour: Field_Char1: Field_Char2: Field_Char3: + sceneRoots: [] subjectInfo: [] traininginformations: [] thinkDevicesData: diff --git a/Assets/Zion/Scripts/Adam/Components/SimpleCameraController.cs b/Assets/Zion/Scripts/Adam/Components/SimpleCameraController.cs index a3fd9c6d..b11797f1 100644 --- a/Assets/Zion/Scripts/Adam/Components/SimpleCameraController.cs +++ b/Assets/Zion/Scripts/Adam/Components/SimpleCameraController.cs @@ -18,6 +18,7 @@ namespace UnityTemplateProjects public float x; public float y; public float z; + public void SetFromTransform(Transform t) { @@ -52,7 +53,16 @@ namespace UnityTemplateProjects public void UpdateTransform(Transform t) { t.eulerAngles = new Vector3(pitch, yaw, roll); - t.position = new Vector3(x, y, z); + if (y > 140) + { + + t.position = new Vector3(x, y, z); + } + else + { + + t.position = new Vector3(x, 140, z); + } } } diff --git a/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs b/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs index b0223f64..3b60dcf0 100644 --- a/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs +++ b/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs @@ -16,8 +16,13 @@ namespace AdamSync public Animation selfAnimation; public Camera selfCamera; + public RectTransform rect; + void Start() + { + + } - + protected string GetSyncData() { return string.Format("{0};{1},{2},{3};{4},{5},{6}", userID, transform.position.x, transform.position.y, transform.position.z, transform.eulerAngles.x, transform.eulerAngles.y, transform.eulerAngles.z); diff --git a/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs b/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs index 855d54d1..e4cc97d9 100644 --- a/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs +++ b/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; @@ -11,11 +12,45 @@ namespace AdamSync private void OnInit() { SyncCreateRoom.playerInfoRequset += ReceivePlayInfo; - + } - + void Start() + { + selfCamera = GetComponent(); + rect = GameObject.Find("MainCanvas").GetComponent(); + } + void Update() + { + if (selfCamera != null) + { + if (selfCamera.transform.position.y > 500) + { + if (Input.GetMouseButton(2)) + { + if (RectTransformUtility.RectangleContainsScreenPoint(rect, Input.mousePosition)) + { + float mouseX = Input.GetAxis("Mouse X") * 10f * Time.deltaTime; + float mouseY = Input.GetAxis("Mouse Y") * 10f * Time.deltaTime; + selfCamera.transform.Translate(Vector3.down * mouseY * 60f); + selfCamera.transform.Translate(Vector3.left * mouseX * 60f); + } + } + Debug.Log(""); + float scrollInput = Input.GetAxis("Mouse ScrollWheel"); + if (scrollInput != 0) + { + float newOrthoSize = selfCamera.orthographicSize - scrollInput * 50; + selfCamera.orthographicSize = newOrthoSize; + } + } + } + + + + } + private IEnumerator SendMsg() { while (true) diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 9188ec1c..9c7bef17 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -119,6 +119,10 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// public Camera gxWRJCamera; /// + /// 光学无人机视角 + /// + public Transform Rotation_Angle; + /// /// 电子侦察无人机 /// public Camera dzWRJCamera; @@ -335,6 +339,10 @@ public class UnmannedAerialVehicleManage : MonoBehaviour // Update is called once per frame void Update() { + if (isStartRehearsing) + { + Rotation_Angle.transform.Rotate(Vector3.up*10*Time.deltaTime); + } if (isStartRehearsing) { gamePos.gameObject.SetActive(true);