Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane
This commit is contained in:
commit
ee13ce5954
|
@ -1133,6 +1133,8 @@ GameObject:
|
|||
- component: {fileID: 4945192092127442099}
|
||||
- component: {fileID: 3580237231501703517}
|
||||
- component: {fileID: 5295066473010366807}
|
||||
- component: {fileID: 3941116819074061100}
|
||||
- component: {fileID: 6329341053095260549}
|
||||
m_Layer: 5
|
||||
m_Name: title_text (1)
|
||||
m_TagString: Untagged
|
||||
|
@ -1154,14 +1156,15 @@ RectTransform:
|
|||
- {fileID: 230054807675041568}
|
||||
- {fileID: 7706105290623578778}
|
||||
- {fileID: 9206023972079475004}
|
||||
- {fileID: 1137569647742812745}
|
||||
m_Father: {fileID: 4190038652482202517}
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -183.49998}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 22, y: -183.49998}
|
||||
m_SizeDelta: {x: 464, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3580237231501703517
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1199,6 +1202,45 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &3941116819074061100
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2727821764040346910}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 20
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 50
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 1
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!114 &6329341053095260549
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2727821764040346910}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &2942340668309588499
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2071,11 +2113,11 @@ RectTransform:
|
|||
m_Father: {fileID: 4190038651910504641}
|
||||
m_RootOrder: 1
|
||||
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: 11, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 143.5, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4190038650875065007
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3075,11 +3117,11 @@ RectTransform:
|
|||
m_Father: {fileID: 4190038651910504641}
|
||||
m_RootOrder: 2
|
||||
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: 146, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 267, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4190038651060920355
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5130,7 +5172,7 @@ 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: 14, y: 0}
|
||||
m_AnchoredPosition: {x: -64.1, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4190038651390846521
|
||||
|
@ -7487,11 +7529,11 @@ RectTransform:
|
|||
m_Father: {fileID: 4190038651910504641}
|
||||
m_RootOrder: 0
|
||||
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: -140, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4190038651803341053
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7854,6 +7896,8 @@ GameObject:
|
|||
- component: {fileID: 4190038651910504641}
|
||||
- component: {fileID: 4190038651910504643}
|
||||
- component: {fileID: 4190038651910504640}
|
||||
- component: {fileID: 6363664874879101845}
|
||||
- component: {fileID: 8494038987304265896}
|
||||
m_Layer: 5
|
||||
m_Name: title_text
|
||||
m_TagString: Untagged
|
||||
|
@ -7875,14 +7919,15 @@ RectTransform:
|
|||
- {fileID: 4190038651803341043}
|
||||
- {fileID: 4190038650875065005}
|
||||
- {fileID: 4190038651060920353}
|
||||
- {fileID: 8240872020776645259}
|
||||
m_Father: {fileID: 4190038651724809342}
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -183.25}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 22, y: -183.25}
|
||||
m_SizeDelta: {x: 464, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4190038651910504643
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7920,6 +7965,45 @@ MonoBehaviour:
|
|||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &6363664874879101845
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4190038651910504646}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 20
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 50
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 1
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!114 &8494038987304265896
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4190038651910504646}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &4190038651921601884
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -11524,8 +11608,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: -140, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_AnchoredPosition: {x: -193.23, y: 0}
|
||||
m_SizeDelta: {x: 257.78772, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4190038652671870831
|
||||
CanvasRenderer:
|
||||
|
@ -11699,7 +11783,7 @@ 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: 144.2, y: 0}
|
||||
m_AnchoredPosition: {x: 59.2, y: 0}
|
||||
m_SizeDelta: {x: 22.43179, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4190038652698338221
|
||||
|
@ -11933,6 +12017,7 @@ RectTransform:
|
|||
- {fileID: 4190038652671870829}
|
||||
- {fileID: 4190038651390846527}
|
||||
- {fileID: 4190038652698338210}
|
||||
- {fileID: 4036781676757694502}
|
||||
m_Father: {fileID: 4190038651164879948}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -13185,6 +13270,84 @@ MonoBehaviour:
|
|||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &4385813009482101890
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8240872020776645259}
|
||||
- component: {fileID: 979665411195211285}
|
||||
- component: {fileID: 6370347929646856348}
|
||||
m_Layer: 5
|
||||
m_Name: Text (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8240872020776645259
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4385813009482101890}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4190038651910504641}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 390.5, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &979665411195211285
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4385813009482101890}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6370347929646856348
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4385813009482101890}
|
||||
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.9811321, g: 0.9579922, b: 0.9579922, 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: 80
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 80
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u59D3\u540D"
|
||||
--- !u!1 &4475928254623415761
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -13449,7 +13612,7 @@ 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: 14, y: 0}
|
||||
m_AnchoredPosition: {x: -61.5, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2176008285287546079
|
||||
|
@ -13493,6 +13656,84 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5B66\u5458"
|
||||
--- !u!1 &4847897242321775004
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5879966130008923138}
|
||||
- component: {fileID: 5528630206416109667}
|
||||
- component: {fileID: 7231620545527878295}
|
||||
m_Layer: 5
|
||||
m_Name: Text (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5879966130008923138
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4847897242321775004}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7082100192815767800}
|
||||
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: 179.55, y: 0}
|
||||
m_SizeDelta: {x: 349.68298, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5528630206416109667
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4847897242321775004}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7231620545527878295
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4847897242321775004}
|
||||
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.9487807, b: 0.9487807, 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: 80
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 80
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: xxxxx
|
||||
--- !u!1 &4926619566913156542
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -13662,11 +13903,11 @@ RectTransform:
|
|||
m_Father: {fileID: 4945192092127442099}
|
||||
m_RootOrder: 1
|
||||
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: 11, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 143.5, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &1225597306991518397
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -13708,6 +13949,162 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5C97\u4F4D"
|
||||
--- !u!1 &5607768828871206131
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4036781676757694502}
|
||||
- component: {fileID: 5592217797208583881}
|
||||
- component: {fileID: 4148366134583843225}
|
||||
m_Layer: 5
|
||||
m_Name: Text (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4036781676757694502
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5607768828871206131}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4190038652731363790}
|
||||
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: 181.1, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5592217797208583881
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5607768828871206131}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4148366134583843225
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5607768828871206131}
|
||||
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.9487807, b: 0.9487807, 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: 80
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 80
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: xxxxx
|
||||
--- !u!1 &5926302419538806274
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1137569647742812745}
|
||||
- component: {fileID: 7584295644428425608}
|
||||
- component: {fileID: 5265640705956772723}
|
||||
m_Layer: 5
|
||||
m_Name: Text (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1137569647742812745
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5926302419538806274}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4945192092127442099}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 390.5, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7584295644428425608
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5926302419538806274}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5265640705956772723
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5926302419538806274}
|
||||
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.9811321, g: 0.9579922, b: 0.9579922, 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: 80
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 80
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u59D3\u540D"
|
||||
--- !u!1 &5962784559225462056
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -13829,11 +14226,11 @@ RectTransform:
|
|||
m_Father: {fileID: 4945192092127442099}
|
||||
m_RootOrder: 0
|
||||
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: -140, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7937883062393521498
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -14167,11 +14564,11 @@ RectTransform:
|
|||
m_Father: {fileID: 4945192092127442099}
|
||||
m_RootOrder: 2
|
||||
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: 146, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 267, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 120}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8816062479920780392
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -14639,8 +15036,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: -140, y: 0}
|
||||
m_SizeDelta: {x: 300, y: 120}
|
||||
m_AnchoredPosition: {x: -191.9, y: 3}
|
||||
m_SizeDelta: {x: 264.1194, y: 120}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3779895817405140378
|
||||
CanvasRenderer:
|
||||
|
@ -14715,6 +15112,7 @@ RectTransform:
|
|||
- {fileID: 1083924912694991654}
|
||||
- {fileID: 9190886317051332668}
|
||||
- {fileID: 5225389281259718268}
|
||||
- {fileID: 5879966130008923138}
|
||||
m_Father: {fileID: 4918790080607414966}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -14861,7 +15259,7 @@ 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: 144.2, y: 0}
|
||||
m_AnchoredPosition: {x: 62.7, y: 0}
|
||||
m_SizeDelta: {x: 22.43179, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &637174404967429875
|
||||
|
|
|
@ -715,6 +715,7 @@ public class View_Panel2 : XUIPanel
|
|||
{
|
||||
item.transform.GetChild(2).GetComponent<Toggle>().graphic.color = Color.green;
|
||||
GlobalFlag.practiceSeatId = item.name;
|
||||
item.transform.GetChild(3).GetComponent<Text>().text = GlobalFlag.currentUser.login_name;
|
||||
isAssigned = true;
|
||||
}
|
||||
}
|
||||
|
@ -758,6 +759,7 @@ public class View_Panel2 : XUIPanel
|
|||
{
|
||||
item.transform.GetChild(2).GetComponent<Toggle>().graphic.color = Color.green;
|
||||
GlobalFlag.practiceSeatId = item.name;
|
||||
item.transform.GetChild(3).GetComponent<Text>().text = GlobalFlag.currentUser.login_name;
|
||||
isAssigned = true;
|
||||
}
|
||||
}
|
||||
|
@ -798,6 +800,11 @@ public class View_Panel2 : XUIPanel
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 科目选择界面 提交按钮
|
||||
/// </summary>
|
||||
/// <param name="practiceSeatId"></param>
|
||||
/// <param name="accout"></param>
|
||||
public async void OnEditorSeatInfo(string practiceSeatId, string accout)
|
||||
{
|
||||
PData.UpdatePracticeSeatData upsd = new PData.UpdatePracticeSeatData();
|
||||
|
@ -806,7 +813,6 @@ public class View_Panel2 : XUIPanel
|
|||
{
|
||||
submitInstruct.text = "提交成功";
|
||||
GlobalFlag.practiceSeatId = practiceSeatId;
|
||||
//Debug.LogError(GlobalFlag.practiceSeatId);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -819,6 +825,8 @@ public class View_Panel2 : XUIPanel
|
|||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 席位分配面板提交按钮和取消人员选择按钮
|
||||
/// </summary>
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
@ -22,6 +22,7 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
public Button startFormationBtn;
|
||||
public Button submitFormationBtn;
|
||||
public Button cancelFormationBtn;
|
||||
public Dropdown ungroup;
|
||||
public bool isStartFormation;
|
||||
public List<FormationInfo> formationInfos = new List<FormationInfo>();
|
||||
public FormationInfo formationInfo;
|
||||
|
@ -37,6 +38,13 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
startFormationBtn.onClick.AddListener(OnStartFormation);
|
||||
submitFormationBtn.onClick.AddListener(OnSubmit);
|
||||
cancelFormationBtn.onClick.AddListener(OnCancel);
|
||||
ungroup.onValueChanged.AddListener((a) =>
|
||||
{
|
||||
string info = ungroup.options[a].text;
|
||||
int groupId = int.Parse(info.Replace("组", string.Empty));
|
||||
UngroupByGroupID(groupId);
|
||||
ungroup.options.Remove(ungroup.options[a]);
|
||||
});
|
||||
CheckBtns(0);
|
||||
}
|
||||
|
||||
|
@ -45,6 +53,17 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
startFormationBtn.gameObject.SetActive(index == 0);
|
||||
submitFormationBtn.gameObject.SetActive(index == 1);
|
||||
cancelFormationBtn.gameObject.SetActive(index == 1);
|
||||
if (formationInfos.Count > 0)
|
||||
{
|
||||
if (index == 1)
|
||||
ungroup.gameObject.SetActive(false);
|
||||
else
|
||||
ungroup.gameObject.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
ungroup.gameObject.SetActive(index == 2);
|
||||
}
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
@ -69,13 +88,51 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
formationIDs.Add(uavmTemp.equipmentCommon.deviceID);
|
||||
}
|
||||
}
|
||||
Debug.Log("拾取");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 解组
|
||||
/// </summary>
|
||||
private void OnUngroupDropdown()
|
||||
{
|
||||
ungroup.ClearOptions();
|
||||
List<Dropdown.OptionData> listTemp = new List<Dropdown.OptionData>();
|
||||
if (formationInfos.Count > 0)
|
||||
{
|
||||
for (int i = 0; i < formationInfos.Count; i++)
|
||||
{
|
||||
int index = i;
|
||||
Dropdown.OptionData optionData = new Dropdown.OptionData();
|
||||
optionData.text = $"组{formationInfos[index].groupIndex}";
|
||||
listTemp.Add(optionData);
|
||||
}
|
||||
}
|
||||
ungroup.AddOptions(listTemp);
|
||||
}
|
||||
/// <summary>
|
||||
/// 通过 dropdown 按钮 解组
|
||||
/// </summary>
|
||||
/// <param name="groupID"></param>
|
||||
private void UngroupByGroupID(int groupID)
|
||||
{
|
||||
List<UnmannedAerialVehicleManage> uavms = GroupUAVM(groupID);
|
||||
if (uavms.Count == 0) return;
|
||||
for (int i = 0; i < uavms.Count; i++)
|
||||
{
|
||||
int index = i;
|
||||
uavms[index].groupId = -1;
|
||||
uavms[index].isGroup = false;
|
||||
uavms[index].SetGroupTipsAndDatabaseInfo(-1);
|
||||
uavms[index].positions.Clear();
|
||||
}
|
||||
RemoveGroupWRJByID(groupID);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设置组中得无人机所有航线
|
||||
/// </summary>
|
||||
|
@ -163,6 +220,20 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
formationInfos.Remove(formationInfos[j]);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 通过ID 移除 无人机组
|
||||
/// </summary>
|
||||
/// <param name="groupID"></param>
|
||||
|
||||
public void RemoveGroupWRJByID(int groupID)
|
||||
{
|
||||
for (int j = 0; j < formationInfos.Count; j++)
|
||||
{
|
||||
int index = j;
|
||||
if (formationInfos[index].groupIndex == groupID)
|
||||
formationInfos.Remove(formationInfos[index]);
|
||||
}
|
||||
}
|
||||
|
||||
private List<UnmannedAerialVehicleManage> GroupUAVM(int uavmGroupID)
|
||||
{
|
||||
|
@ -197,12 +268,67 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
{
|
||||
infoTemp += formationIDs[i] + ",";
|
||||
}
|
||||
SendGroupToOther(formationInfos.Count.ToString(), infoTemp);
|
||||
string id = CheckMissingNum().ToString();
|
||||
SendGroupToOther(id, infoTemp);
|
||||
formationIDs.Clear();
|
||||
CheckBtns(0);
|
||||
OnUngroupDropdown();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检测ID数组中少哪些数组
|
||||
/// </summary>
|
||||
private int CheckMissingNum()
|
||||
{
|
||||
List<int> groupIDs = new List<int>();
|
||||
List<int> missingNum = new List<int>();
|
||||
for (int i = 0; i < formationInfos.Count; i++)
|
||||
{
|
||||
if (!groupIDs.Contains(formationInfos[i].groupIndex))
|
||||
groupIDs.Add(formationInfos[i].groupIndex);
|
||||
}
|
||||
if (groupIDs.Count > 0)
|
||||
{
|
||||
missingNum = FindMissingNumbers(groupIDs);
|
||||
if (missingNum.Count > 0)
|
||||
return missingNum[0];
|
||||
else
|
||||
return formationInfos.Count;
|
||||
}
|
||||
else
|
||||
return formationInfos.Count;
|
||||
}
|
||||
/// <summary>
|
||||
/// 计算int数组中缺少的数字
|
||||
/// </summary>
|
||||
/// <param name="numbers"></param>
|
||||
/// <returns></returns>
|
||||
private List<int> FindMissingNumbers(List<int> numbers)
|
||||
{
|
||||
List<int> missingNumbers = new List<int>();
|
||||
int[] temp = numbers.ToArray();
|
||||
Array.Sort(temp); // 对数组进行排序
|
||||
|
||||
if (temp[0] != 0)
|
||||
{
|
||||
for (int i = 0; i < temp[0]; i++)
|
||||
{
|
||||
missingNumbers.Add(i);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < temp.Length - 1; i++)
|
||||
{
|
||||
if (temp[i + 1] - temp[i] > 1)
|
||||
{
|
||||
for (int j = temp[i] + 1; j < temp[i + 1]; j++)
|
||||
{
|
||||
missingNumbers.Add(j);
|
||||
}
|
||||
}
|
||||
}
|
||||
return missingNumbers;
|
||||
}
|
||||
private char[] separators = { ',' }; // 设置分隔符为逗号
|
||||
public void OnReciveMsg(string reciveInfo)
|
||||
{
|
||||
|
@ -235,6 +361,7 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
formationInfos.Add(formationInfo);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void SetGroupInfo()
|
||||
|
@ -279,7 +406,7 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// 动态添加已经生成得数据
|
||||
/// 退出或者 掉线之后重新进入场景中, 动态添加已经生成得数据
|
||||
/// </summary>
|
||||
public void WhenSpawn()
|
||||
{
|
||||
|
@ -305,6 +432,8 @@ public class FormationManager : MonoSingleton<FormationManager>
|
|||
}
|
||||
}
|
||||
}
|
||||
OnUngroupDropdown();
|
||||
CheckBtns(0);
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
|
|
|
@ -239,7 +239,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
UnmannedAerialVehicle uav = unmannedAerialVehicles[0];
|
||||
if (uav != null)
|
||||
{
|
||||
uav.tips.text = uav.tips.text + "\n" + "组" + index.ToString();
|
||||
if (index != -1)
|
||||
uav.tips.text = uav.tips.text + "\n" + "组" + index.ToString();
|
||||
else
|
||||
{
|
||||
string[] lines = uav.tips.text.Split(new[] { "\n" }, StringSplitOptions.None);
|
||||
lines[1] = "";
|
||||
uav.tips.text = lines[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
|
@ -849,8 +856,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
/// <param name="interferingFrequency">干扰频率</param>
|
||||
/// <param name="interferenceAngle">干扰角度</param>
|
||||
/// <param name="ground">地面的图层</param>
|
||||
public void CheckSatellitePositioningFrequency(
|
||||
string interferenceMode)
|
||||
public void CheckSatellitePositioningFrequency(string interferenceMode)
|
||||
{
|
||||
|
||||
if (interferenceMode == "驱离")
|
||||
|
@ -877,8 +883,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
|
|||
public void ChanagerFlySpeed(float speed)
|
||||
{
|
||||
maximumFlyingSpeed = speed.ToString();
|
||||
string nowData = string.Format("{0},{1},{2},{3}", "FlySpeed", "WRJ", equipmentCommon.deviceID, electronicReconnaissanceCapability);
|
||||
MyNetMQClient.instance.Send(maximumFlyingSpeed);
|
||||
string nowData = string.Format("{0},{1},{2},{3}", "FlySpeed", "WRJ", equipmentCommon.deviceID, maximumFlyingSpeed);
|
||||
MyNetMQClient.instance.Send(nowData);
|
||||
equipmentCommon.SetDatabaseInfo("r4", maximumFlyingSpeed);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue