diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
index 0808e4f4..36b4dcc4 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab
@@ -64,8 +64,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 6d2572505295e674588b10138cfe14c7, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -108,8 +108,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchoredPosition: {x: -5, y: 0}
+ m_SizeDelta: {x: -10, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3800596686037306028
CanvasRenderer:
@@ -138,8 +138,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: b14184f9878b4c149adec23c3e50cfd3, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -248,7 +248,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+ m_Sprite: {fileID: 21300000, guid: 9101faefbb4e15042a70d4b2680f9428, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -804,8 +804,8 @@ RectTransform:
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.0000095367, y: -28.28}
- m_SizeDelta: {x: 124.028076, y: 19.424133}
+ m_AnchoredPosition: {x: 0.6, y: -21.5}
+ m_SizeDelta: {x: 120, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &608716198515631330
MonoBehaviour:
@@ -853,7 +853,7 @@ MonoBehaviour:
m_MinValue: 0.5
m_MaxValue: 1
m_WholeNumbers: 0
- m_Value: 0
+ m_Value: 0.5
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
@@ -866,6 +866,84 @@ MonoBehaviour:
PointerDown:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &3898838145366328544
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3913350106438329020}
+ - component: {fileID: 8227438278438575012}
+ - component: {fileID: 3697615474328600314}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3913350106438329020
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3898838145366328544}
+ 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: 9020723963205404447}
+ m_RootOrder: 3
+ 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.1, y: -49.1}
+ m_SizeDelta: {x: 80, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8227438278438575012
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3898838145366328544}
+ m_CullTransparentMesh: 0
+--- !u!114 &3697615474328600314
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3898838145366328544}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9716981, g: 0.93961376, b: 0.93961376, a: 1}
+ m_RaycastTarget: 1
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 20
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
--- !u!1 &3937812184738743398
GameObject:
m_ObjectHideFlags: 0
@@ -1615,6 +1693,7 @@ MonoBehaviour:
batteryLife: 1
classificationWindResistance: 1
maximumFlyingSpeed: 1
+ speedtext: {fileID: 3697615474328600314}
RCS: 1
satellitePositioningFrequency: 1
dataLinkCommunicationFrequency: 1
@@ -1687,6 +1766,7 @@ RectTransform:
- {fileID: 32362716923635516}
- {fileID: 6402137036825572936}
- {fileID: 6827470219295874954}
+ - {fileID: 3913350106438329020}
m_Father: {fileID: 7180026123191704634}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3312,18 +3392,6 @@ PrefabInstance:
- {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
- {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
---- !u!114 &5372963352097099058 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
- type: 3}
- m_PrefabInstance: {fileID: 6738463286047272674}
- 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 &946356274003191237 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b,
@@ -3360,21 +3428,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!114 &1189649587738053663 stripped
+--- !u!114 &5372963352097099058 stripped
MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b,
- type: 3}
- m_PrefabInstance: {fileID: 6738463286047272674}
- 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 &5179907296229891844 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b,
+ m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 6738463286047272674}
m_PrefabAsset: {fileID: 0}
@@ -3396,12 +3452,36 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &1189649587738053663 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ m_PrefabInstance: {fileID: 6738463286047272674}
+ 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 &5433276239701250114 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b,
type: 3}
m_PrefabInstance: {fileID: 6738463286047272674}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &5179907296229891844 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ m_PrefabInstance: {fileID: 6738463286047272674}
+ 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!224 &5433276239701250115 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b,
@@ -3870,6 +3950,18 @@ PrefabInstance:
- {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
- {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
+--- !u!114 &3933866982345749146 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b,
+ type: 3}
+ m_PrefabInstance: {fileID: 7365093489755617725}
+ 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 &3114167497287670592 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b,
@@ -3930,18 +4022,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!114 &3933866982345749146 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b,
- type: 3}
- m_PrefabInstance: {fileID: 7365093489755617725}
- 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 &8153024518836165229 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b,
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
index 3c2451d8..e3860195 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
@@ -141,6 +141,10 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
///
public string maximumFlyingSpeed;
///
+ /// 最大飞行速度显示
+ ///
+ public Text speedtext;
+ ///
/// RCS
///
public string RCS;
@@ -420,6 +424,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
// //}
//}
//Judgingdistance();
+ speedtext.text = flySpeedSlider.value.ToString("f2");
}