设备信息

Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane
设备信息
2023-11-16 15:20:38 +08:00 · 2023-11-16 15:19:18 +08:00 · 2023-11-16 15:18:51 +08:00
60 changed files with 6583 additions and 8277 deletions
--- a/Assets/3rdParty/ZCalendar/Scripts/ZCalendarDemo.cs
+++ b/Assets/3rdParty/ZCalendar/Scripts/ZCalendarDemo.cs
@ -55,7 +55,7 @@ public class ZCalendarDemo : MonoBehaviour
    private void ZCalendar_ChoiceDayEvent(ZCalendarDayItem obj)
    {
        Debug.Log($"选择的日期：{obj.Day}");
-        day_txt.text = obj.Day.ToString()+"日";
+        day_txt.text = obj.Day.ToString()+" ";
    }

    /// <summary>
--- a/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs
+++ b/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs
@ -111,8 +111,8 @@ namespace ZTools
        {
            txtYear.text = year + "年";
            txtMonth.text = month + "月";
-            year_txt.text=year.ToString()+"年";
-            month_txt.text=month.ToString()+"月";
+            year_txt.text=year.ToString()+"-";
+            month_txt.text=month.ToString()+"-";
        }
    }
 }
--- a/Assets/Resources/UIPanel/Deviceimage.prefab
+++ b/Assets/Resources/UIPanel/Deviceimage.prefab
@ -30,7 +30,7 @@ RectTransform:
  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
  m_Children: []
  m_Father: {fileID: 670992771482304321}
-  m_RootOrder: 3
+  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}
@ -66,7 +66,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 70
+    m_FontSize: 60
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 0
@ -77,125 +77,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: "\u65E0\u4EBA\u673A"
--- !u!1 &670992770340322415
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 670992770340322414}
-  - component: {fileID: 670992770340322323}
-  - component: {fileID: 670992770340322320}
-  - component: {fileID: 670992770340322321}
-  m_Layer: 5
-  m_Name: shanchu_btn11
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &670992770340322414
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 670992770340322415}
-  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: 670992771482304321}
-  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: 108, y: 0}
-  m_SizeDelta: {x: 19, y: 19}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &670992770340322323
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 670992770340322415}
-  m_CullTransparentMesh: 0
--- !u!114 &670992770340322320
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 670992770340322415}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 99eed431e50c98747987d7977b87cb8e, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &670992770340322321
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 670992770340322415}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 21300000, guid: bb0fdf4dc2b95964db131777ed884626, type: 3}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 670992770340322320}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
+  m_Text: "\u63A2\u6D4B\u96F7\u8FBE"
 --- !u!1 &670992770485996166
 GameObject:
  m_ObjectHideFlags: 0
@ -340,13 +222,12 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 670992771482304350}
-  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, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 670992770485996169}
  - {fileID: 670992771952057177}
-  - {fileID: 670992770340322414}
  - {fileID: 670992770160588140}
  m_Father: {fileID: 0}
  m_RootOrder: 0
@ -420,7 +301,7 @@ GameObject:
  - component: {fileID: 670992771952057179}
  - component: {fileID: 670992771952057176}
  m_Layer: 5
-  m_Name: shezhi_btn11
+  m_Name: shezhi_btn111
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -442,7 +323,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: 78, y: 0}
+  m_AnchoredPosition: {x: 100, y: 0}
  m_SizeDelta: {x: 20, y: 20}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &670992771952057178
--- a/Assets/Resources/UIPanel/Propertypanl.prefab
+++ b/Assets/Resources/UIPanel/Propertypanl.prefab
@ -128,7 +128,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: 108, y: 0}
+  m_AnchoredPosition: {x: 100, y: 0}
  m_SizeDelta: {x: 19, y: 19}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9154487428553252519
--- a/Assets/Resources/UIPanel/Valuerangepanl.prefab
+++ b/Assets/Resources/UIPanel/Valuerangepanl.prefab
--- a/Assets/Resources/UIPanel/Valuerangepanl.prefab.meta
+++ b/Assets/Resources/UIPanel/Valuerangepanl.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2ac9048583d0af747848ea5faaf1843a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/model.meta
+++ b/Assets/Resources/model.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3520345ae076bd5488b2dce425334925
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameAssets/Models/装饰模型/树木/AlaskaCedar_Desktop.prefab
+++ b/Assets/GameAssets/Models/装饰模型/树木/AlaskaCedar_Desktop.prefab
@ -599,6 +599,7 @@ GameObject:
  - component: {fileID: 7829669740838320043}
  - component: {fileID: 7267417487069733231}
  - component: {fileID: 8775413967743458551}
+  - component: {fileID: -2049888067688520692}
  m_Layer: 0
  m_Name: AlaskaCedar_Desktop
  m_TagString: Untagged
@ -684,6 +685,18 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
+--- !u!114 &-2049888067688520692
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6553805073764058552}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &6686214748945133564
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/GameAssets/Models/装饰模型/树木/AlaskaCedar_Desktop.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/树木/AlaskaCedar_Desktop.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/树木/Black_Gum_Desktop.prefab
+++ b/Assets/GameAssets/Models/装饰模型/树木/Black_Gum_Desktop.prefab
@ -197,6 +197,7 @@ GameObject:
  - component: {fileID: 1041212833127720484}
  - component: {fileID: 432555675943301344}
  - component: {fileID: 1950967012242263416}
+  - component: {fileID: -4759746366415762853}
  m_Layer: 0
  m_Name: Black_Gum_Desktop
  m_TagString: Untagged
@ -271,6 +272,18 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
+--- !u!114 &-4759746366415762853
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4046616580009825335}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4327745105398580846
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/GameAssets/Models/装饰模型/树木/Black_Gum_Desktop.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/树木/Black_Gum_Desktop.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/树木/Broadleaf_Mobile.prefab
+++ b/Assets/GameAssets/Models/装饰模型/树木/Broadleaf_Mobile.prefab
@ -139,6 +139,7 @@ GameObject:
  - component: {fileID: 2430132228143627729}
  - component: {fileID: 3011235745134324501}
  - component: {fileID: 3808228642382272141}
+  - component: {fileID: -284508668300683553}
  m_Layer: 0
  m_Name: Broadleaf_Mobile
  m_TagString: Untagged
@ -213,6 +214,18 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
+--- !u!114 &-284508668300683553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1721159809252478914}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5757104094444707894
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/GameAssets/Models/装饰模型/树木/Broadleaf_Mobile.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/树木/Broadleaf_Mobile.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveA.prefab
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveA.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 2086019925139201850}
  - component: {fileID: 374199543015586600}
  - component: {fileID: 3658909455203201479}
+  - component: {fileID: -2041733528308973030}
  m_Layer: 0
  m_Name: RockConcaveA
  m_TagString: Untagged
@ -79,3 +80,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &-2041733528308973030
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5050371156226701136}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveA.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveA.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveB.prefab
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveB.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 2400845754208743515}
  - component: {fileID: 6048467949853906883}
  - component: {fileID: 7482081800425394853}
+  - component: {fileID: 2445408897092019937}
  m_Layer: 0
  m_Name: RockConcaveB
  m_TagString: Untagged
@ -79,3 +80,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &2445408897092019937
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3200879299148678642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveB.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockConcaveB.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockCubicA.prefab
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockCubicA.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 4611692685077761899}
  - component: {fileID: 4269744575406527863}
  - component: {fileID: 6617323859367702976}
+  - component: {fileID: -7253824314848726279}
  m_Layer: 0
  m_Name: RockCubicA
  m_TagString: Untagged
@ -79,3 +80,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &-7253824314848726279
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5346679626917615762}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockCubicA.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockCubicA.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockLarge.prefab
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockLarge.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 7649872025984398493}
  - component: {fileID: 4405810134801499303}
  - component: {fileID: 6642280662882806322}
+  - component: {fileID: -2416236415148628081}
  m_Layer: 0
  m_Name: RockLarge
  m_TagString: Untagged
@ -79,3 +80,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &-2416236415148628081
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5661657103867419842}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockLarge.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockLarge.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockLargeB.prefab
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockLargeB.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 6878844990489039417}
  - component: {fileID: 6236882849544735891}
  - component: {fileID: 408022939273112783}
+  - component: {fileID: 2350409653445455609}
  m_Layer: 0
  m_Name: RockLargeB
  m_TagString: Untagged
@ -79,3 +80,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &2350409653445455609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4054585445774317016}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockLargeB.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockLargeB.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockWide.prefab
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockWide.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 5393303279412653176}
  - component: {fileID: 6746884647345799980}
  - component: {fileID: 8598187154241148076}
+  - component: {fileID: -2140843712736423540}
  m_Layer: 0
  m_Name: RockWide
  m_TagString: Untagged
@ -79,3 +80,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &-2140843712736423540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6857164364381362615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/岩石/RockWide.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/岩石/RockWide.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/车/SM_AE86.prefab
+++ b/Assets/GameAssets/Models/装饰模型/车/SM_AE86.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 5078319586233466798}
  - component: {fileID: 8202756229782941707}
  - component: {fileID: 6211304039146407105}
+  - component: {fileID: -5200469951853559481}
  m_Layer: 0
  m_Name: SM_AE86
  m_TagString: Untagged
@ -82,3 +83,15 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+--- !u!114 &-5200469951853559481
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5562508959717975316}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/车/SM_AE86.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/车/SM_AE86.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋1.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋1.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 4731870605961831074}
  - component: {fileID: 7572459980866577534}
  - component: {fileID: 6286250390502481955}
+  - component: {fileID: -2378745174655524748}
  m_Layer: 0
  m_Name: "\u4E09\u95F4\u74E6\u5C4B1"
  m_TagString: Untagged
@ -102,3 +103,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -8242865620289776873, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &-2378745174655524748
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8476122692440285401}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋1.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋1.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋2.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋2.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 8323422052746780341}
  - component: {fileID: 3249439252282446369}
  - component: {fileID: 8135469602913645892}
+  - component: {fileID: -5452841400578023942}
  m_Layer: 0
  m_Name: "\u4E09\u95F4\u74E6\u5C4B2"
  m_TagString: Untagged
@ -99,3 +100,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 2911764366034700985, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &-5452841400578023942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9137682553976692200}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋2.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋2.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋3.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋3.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 972978806330041394}
  - component: {fileID: 5520218864486473478}
  - component: {fileID: 2447168533342094289}
+  - component: {fileID: -557128323279170517}
  m_Layer: 0
  m_Name: "\u4E09\u95F4\u74E6\u5C4B3"
  m_TagString: Untagged
@ -100,3 +101,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 2560173201981733167, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &-557128323279170517
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3331668122385453770}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋3.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋3.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋4.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋4.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 6188002718703674012}
  - component: {fileID: 1692816591560785398}
  - component: {fileID: 8491530211266251523}
+  - component: {fileID: 6772539971832022552}
  m_Layer: 0
  m_Name: "\u4E09\u95F4\u74E6\u5C4B4"
  m_TagString: Untagged
@ -99,3 +100,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 7157353233683290967, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &6772539971832022552
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7531427545832157203}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋4.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋4.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋5.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋5.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 2314097394157860822}
  - component: {fileID: 6630534527493016398}
  - component: {fileID: 7015549720486789848}
+  - component: {fileID: -5936411970569244370}
  m_Layer: 0
  m_Name: "\u4E09\u95F4\u74E6\u5C4B5"
  m_TagString: Untagged
@ -99,3 +100,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 5068762440668701953, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &-5936411970569244370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3440031206501345430}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋5.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋5.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋6.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋6.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 2043419560848396750}
  - component: {fileID: 6153104353978247116}
  - component: {fileID: 7400724255179128396}
+  - component: {fileID: 8217628853072962942}
  m_Layer: 0
  m_Name: "\u4E09\u95F4\u74E6\u5C4B6"
  m_TagString: Untagged
@ -98,3 +99,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 2370872802840639940, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &8217628853072962942
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4285294750562751955}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋6.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/三间瓦屋6.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/二层小楼.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/二层小楼.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 7385838031977359243}
  - component: {fileID: 6843476969774983472}
  - component: {fileID: 3087372226588388427}
+  - component: {fileID: -7222735246391525041}
  m_Layer: 0
  m_Name: "\u4E8C\u5C42\u5C0F\u697C"
  m_TagString: Untagged
@ -100,3 +101,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -1674483174953623296, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &-7222735246391525041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5793210758962281504}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/二层小楼.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/二层小楼.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/储物间1.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/储物间1.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 9105947880979727231}
  - component: {fileID: 1498312164161050734}
  - component: {fileID: 5579291102487340630}
+  - component: {fileID: -5547545840669829608}
  m_Layer: 0
  m_Name: "\u50A8\u7269\u95F41"
  m_TagString: Untagged
@ -94,3 +95,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -3618827996900150765, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &-5547545840669829608
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6061462163366925166}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/储物间1.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/储物间1.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/楼房/储物间2.prefab
+++ b/Assets/GameAssets/Models/装饰模型/楼房/储物间2.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 7109820058511744169}
  - component: {fileID: 3406251380244263531}
  - component: {fileID: 6212912259104216893}
+  - component: {fileID: 5219261304409304116}
  m_Layer: 0
  m_Name: "\u50A8\u7269\u95F42"
  m_TagString: Untagged
@ -94,3 +95,15 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -8020255840142772000, guid: 6c6bdfaefccde0843b0f662ffaf6a5fd, type: 3}
+--- !u!114 &5219261304409304116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1163328458188600851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/GameAssets/Models/装饰模型/楼房/储物间2.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/楼房/储物间2.prefab.meta
--- a/Assets/GameAssets/Models/装饰模型/车/大众.prefab
+++ b/Assets/GameAssets/Models/装饰模型/车/大众.prefab
@ -720,6 +720,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3771677015790060651}
+  - component: {fileID: -4515001707235925234}
  m_Layer: 0
  m_Name: "\u5927\u4F17"
  m_TagString: Untagged
@ -754,6 +755,18 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &-4515001707235925234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4547616306154462929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f69ad4143a75ab04eb2460a58ce4c386, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4982169233991085778
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/GameAssets/Models/装饰模型/车/大众.prefab.meta
+++ b/Assets/GameAssets/Models/装饰模型/车/大众.prefab.meta
--- a/Assets/StreamingAssets.meta
+++ b/Assets/StreamingAssets.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2867c644cac2f7b488d4acbc11bd2ea4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Temp/Scripts/Deviceinformation.cs
+++ b/Assets/Temp/Scripts/Deviceinformation.cs
@ -10,17 +10,22 @@ public class Deviceinformation : MonoBehaviour
    public InputField number_input;//输入的个数
    public Toggle Options_toggle;//是否勾选状态

-    public void Weapon(string  name,string  number, Action cation)
+    public void Weapon(string name, string number,string one,Action action)
    {
        weapon_text.text = name;
-        number_input.text = number;
-        Options_toggle.onValueChanged.AddListener((iosn) =>
+        number_input.text = number.ToString();
+        if (one == "0")
        {
-            if (iosn)
-            {
-                cation?.Invoke();
-            }
+            Options_toggle.isOn = false;
+        }
+        else if (one == "1")
+        {
+            Options_toggle.isOn = true;
+        }
+        Options_toggle.onValueChanged.AddListener((ison) =>
+        {
+            action?.Invoke();
        });
-        
+
    }
 }
--- a/Assets/Temp/Scripts/Managementtxt.cs
+++ b/Assets/Temp/Scripts/Managementtxt.cs
@ -10,23 +10,23 @@ public class UserInfo
    /// <summary>
    /// 
    /// </summary>
-    public string user_id ;
+    public string user_id;
    /// <summary>
    /// 
    /// </summary>
-    public string login_name ;
+    public string login_name;
    /// <summary>
    /// 1#士兵
    /// </summary>
-    public string real_name ;
+    public string real_name;
    /// <summary>
    /// 
    /// </summary>
-    public string role_code ;
+    public string role_code;
    /// <summary>
    /// 士兵
    /// </summary>
-    public string role_name ;
+    public string role_name;

 }
 [Serializable]
@ -35,15 +35,15 @@ public class LoginRoot
    /// <summary>
    /// 
    /// </summary>
-    public bool state ;
+    public bool state;
    /// <summary>
    /// 
    /// </summary>
-    public string message ;
+    public string message;
    /// <summary>
    /// 
    /// </summary>
-    public UserInfo data ;
+    public UserInfo data;
 }
 #endregion
 //想定编辑信息类
@ -53,15 +53,15 @@ public class Editinformation
    /// <summary>
    /// 
    /// </summary>
-    public bool state ;
+    public bool state;
    /// <summary>
    /// 
    /// </summary>
-    public string message ;
+    public string message;
    /// <summary>
    /// 
    /// </summary>
-    public List<Thinkingfile> data ;
+    public List<Thinkingfile> data;
 }
 [Serializable]
 public class Thinkingfile
@ -69,99 +69,99 @@ public class Thinkingfile
    /// <summary>
    /// 
    /// </summary>
-    public string Id ;
+    public string Id;
    /// <summary>
    /// 1017占领高地
    /// </summary>
-    public string Name ;
+    public string Name;
    /// <summary>
    /// 协同训练
    /// </summary>
-    public string PracticeMode ;
+    public string PracticeMode;
    /// <summary>
    /// 
    /// </summary>
-    public string Icon ;
+    public string Icon;
    /// <summary>
    /// 
    /// </summary>
-    public string VirtualPath ;
+    public string VirtualPath;
    /// <summary>
    /// 
    /// </summary>
-    public string DeviceContent ;
+    public string DeviceContent;
    /// <summary>
    /// 
    /// </summary>
-    public string SubjectContent ;
+    public string SubjectContent;
    /// <summary>
    /// 
    /// </summary>
-    public string OperateSupport ;
+    public string OperateSupport;
    /// <summary>
    /// 
    /// </summary>
-    public string CreateTime ;
+    public string CreateTime;
    /// <summary>
    /// 
    /// </summary>
-    public string Memo ;
+    public string Memo;
    /// <summary>
    /// 
    /// </summary>
-    public string UpdateTime ;
+    public string UpdateTime;
    /// <summary>
    /// 
    /// </summary>
-    public string IsDeleted ;
+    public string IsDeleted;
    /// <summary>
    /// 
    /// </summary>
-    public string EnvTime ;
+    public string EnvTime;
    /// <summary>
    /// 
    /// </summary>
-    public string EnvRain ;
+    public string EnvRain;
    /// <summary>
    /// 
    /// </summary>
-    public string EnvSnow ;
+    public string EnvSnow;
    /// <summary>
    /// 
    /// </summary>
-    public string EnvWindSpeed ;
+    public string EnvWindSpeed;
    /// <summary>
    /// 
    /// </summary>
-    public string EnvWindDir ;
+    public string EnvWindDir;
    /// <summary>
    /// 
    /// </summary>
-    public string EnvLight ;
+    public string EnvLight;
    /// <summary>
    /// 
    /// </summary>
-    public string Field_Decimal1 ;
+    public string Field_Decimal1;
    /// <summary>
    /// 
    /// </summary>
-    public string Field_Decimal2 ;
+    public string Field_Decimal2;
    /// <summary>
    /// 
    /// </summary>
-    public string Field_Decimal3 ;
+    public string Field_Decimal3;
    /// <summary>
    /// 
    /// </summary>
-    public string Field_Char1 ;
+    public string Field_Char1;
    /// <summary>
    /// 
    /// </summary>
-    public string Field_Char2 ;
+    public string Field_Char2;
    /// <summary>
    /// 
    /// </summary>
-    public string Field_Char3 ;
+    public string Field_Char3;
    /// <summary>
    /// 设置天气的类
    /// </summary> 
@ -201,19 +201,19 @@ public class Traininginformation
    /// <summary>
    /// 
    /// </summary>
-    public string Id ;
+    public string Id;
    /// <summary>
    /// 
    /// </summary>
-    public string Name ;
+    public string Name;
    /// <summary>
    /// 岗位训练
    /// </summary>
-    public string PracticeMode ;
+    public string PracticeMode;
    /// <summary>
    /// 
    /// </summary>
-    public List<SubjectsInfoItemm> subjectsInfo ;
+    public List<SubjectsInfoItemm> subjectsInfo;
 }
 [Serializable]
 public class SubjectsInfoItemm
@ -221,43 +221,43 @@ public class SubjectsInfoItemm
    /// <summary>
    /// 
    /// </summary>
-    public string subjectId ;
+    public string subjectId;
    /// <summary>
    /// 1023-1红蓝对抗
    /// </summary>
-    public string subjectName ;
+    public string subjectName;
    /// <summary>
    /// 
    /// </summary>
-    public int index ;
+    public int index;
    /// <summary>
    /// 
    /// </summary>
-    public string stepInfo ;
+    public string stepInfo;
    /// <summary>
    /// 
    /// </summary>
-    public int SubTime ;
+    public int SubTime;
    /// <summary>
    /// 
    /// </summary>
-    public string seatInfo ;
+    public string seatInfo;
    /// <summary>
    /// 红蓝对抗
    /// </summary>
-    public string mode ;
+    public string mode;
    /// <summary>
    /// 丘陵
    /// </summary>
-    public string earth ;
+    public string earth;
    /// <summary>
    /// 
    /// </summary>
-    public List<SeatInfosItemm> seatInfos ;
+    public List<SeatInfosItemm> seatInfos;
    /// <summary>
    /// 
    /// </summary>
-    public List<TrainDestListItem> TrainDestList ;
+    public List<TrainDestListItem> TrainDestList;
 }
 [Serializable]
 public class TrainDestListItem
@ -265,23 +265,23 @@ public class TrainDestListItem
    /// <summary>
    /// 
    /// </summary>
-    public string TrainId ;
+    public string TrainId;
    /// <summary>
    /// 目标一
    /// </summary>
-    public string TrainDest ;
+    public string TrainDest;
    /// <summary>
    /// 
    /// </summary>
-    public string TrainGrade ;
+    public string TrainGrade;
    /// <summary>
    /// 
    /// </summary>
-    public string redseatIds ;
+    public string redseatIds;
    /// <summary>
    /// 
    /// </summary>
-    public string blueseatIds ;
+    public string blueseatIds;
 }
 [Serializable]
 public class SeatInfosItemm
@ -289,19 +289,19 @@ public class SeatInfosItemm
    /// <summary>
    /// 
    /// </summary>
-    public string seatId ;
+    public string seatId;
    /// <summary>
    /// 1#士兵
    /// </summary>
-    public string seatName ;
+    public string seatName;
    /// <summary>
    /// 
    /// </summary>
-    public string seatno ;
+    public string seatno;
    /// <summary>
    /// 
    /// </summary>
-    public string role ;
+    public string role;
 }
 public class Devuce
 {
@ -309,8 +309,115 @@ public class Devuce
    /// 雷达
    /// </summary>
    public string device_name { get; set; }
-/// <summary>
-/// 
-/// </summary>
-public int device_count { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public int device_count { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int r1 { get; set; }
+}
+
+public class DataItem1
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string id { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string think_id { get; set; }
+    /// <summary>
+    /// 蜂群无人机
+    /// </summary>
+    public string device_name { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string device_count { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string r1 { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string r2 { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string r3 { get; set; }
+}
+
+public class Weaponitem
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool state { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string message { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<DataItem1> data { get; set; }
+}
+public class Weaponitemone
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool state { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string message { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<Aircraft> data { get; set; }
+}
+public class Aircraft
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public string id { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string think_device_id { get; set; }
+    /// <summary>
+    /// 抗风等级
+    /// </summary>
+    public string para_name { get; set; }
+    /// <summary>
+    /// 下拉框
+    /// </summary>
+    public string para_type { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string para_value { get; set; }
+    /// <summary>
+    /// 级
+    /// </summary>
+    public string para_unit { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string r1 { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string r2 { get; set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string r3 { get; set; }
 }
--- a/Assets/Temp/Scripts/Modeldata.cs
+++ b/Assets/Temp/Scripts/Modeldata.cs
@ -0,0 +1,31 @@
+using DG.Tweening;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Modeldata : MonoBehaviour
+{
+    private string path = "model/";//获取预设体的值
+    private string modename = null;
+    public Modelequipment modelequipment;//对应的模型路径
+    void Start()
+    {
+        modename = transform.name.Replace("(Clone)", "");//消除克隆的物体克隆的名字
+        modelequipment.str = path + modename;//获取预设体的路径
+    }
+
+    public void SetPos()//获取物体最终初始化的值
+    {
+        modelequipment.x = transform.position.x;
+        modelequipment.y = transform.position.y;
+        modelequipment.z = transform.position.z;
+    }
+}
+[System.Serializable]
+public class Modelequipment//模型类的路径和位置参数
+{
+    public string str;
+    public float x;
+    public float y;
+    public float z;
+}
--- a/Assets/Temp/Scripts/Modeldata.cs.meta
+++ b/Assets/Temp/Scripts/Modeldata.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f69ad4143a75ab04eb2460a58ce4c386
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Temp/Scripts/Scenariopage.cs
+++ b/Assets/Temp/Scripts/Scenariopage.cs
--- a/Assets/Temp/Scripts/Time.cs
+++ b/Assets/Temp/Scripts/Time.cs
@ -12,6 +12,7 @@ namespace YL
        private int hour;
        private int minute;
        private int second;
+
        private int year;
        private int month;
        private int day;
@ -26,12 +27,13 @@ namespace YL
            hour = DateTime.Now.Hour;
            minute = DateTime.Now.Minute;
            second = DateTime.Now.Second;
+           
            year = DateTime.Now.Year;
            month = DateTime.Now.Month;
            day = DateTime.Now.Day;


-            time.text = string.Format("{0:D4}年{1:D2}月{2:D2}日" + "{3:D2}:{4:D2}:{5:D2}", year, month, day, hour, minute, second);
+            time.text = string.Format("{0:D4}-{1:D2}-{2:D2}" + " {3:D2}:{4:D2}:{5:D2}", year, month, day, hour, minute,second);
        }
    }
 }
--- a/Assets/Temp/Scripts/TimeHM.cs
+++ b/Assets/Temp/Scripts/TimeHM.cs
@ -9,6 +9,7 @@ public class TimeHM : MonoBehaviour
    public Text time_text;
    public int when;
    public int points;
+    public int times;
    void Start()
    {

@ -19,6 +20,7 @@ public class TimeHM : MonoBehaviour
    {
        when = DateTime.Now.Hour;
        points = DateTime.Now.Minute;
-        time_text.text =string.Format("{0:D2} : {1:D2}", when, points);
+        times = DateTime.Now.Second;
+        time_text.text =string.Format("{0:D2}:{1:D2}:{2:D2}",when,points,times);
    }
 }
--- a/Assets/Temp/Scripts/Valuerangepanl.cs
+++ b/Assets/Temp/Scripts/Valuerangepanl.cs
@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Valuerangepanl : MonoBehaviour
+{
+    public Slider stored;//储能间隔时间
+    public Slider injure;//毁伤累积作用的时间
+    public Slider disturb;//干扰距离
+    public Slider angle;//干扰的角度
+    public Text stored_text;//显示时间
+    public Text injure_text;//毁伤累计作用的时间
+    public Text disturb_text;//干扰距离显示
+    public Text angle_text;//干扰角度显示
+    public Button cancel1_btn;//取消按钮
+    public Button cancel2_btn;//取消按钮
+    public Button queren_btn;//确认按钮
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Assets/Temp/Scripts/Valuerangepanl.cs.meta
+++ b/Assets/Temp/Scripts/Valuerangepanl.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc58d6fa99d4eac4ab6dc73912d26cba
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
+++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity
--- a/Assets/Zion/Scripts/Adam/DragController.cs
+++ b/Assets/Zion/Scripts/Adam/DragController.cs
@ -45,8 +45,10 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
                }
                model.GetComponent<WRJController>().huoPaoControllerList = huoPaoCtrls;
            }
-            DragManager.Instance.AddObj(model);
-            DragManager.Instance.Addtext(modelname_text.text);
+            DragManager.Instance.AddObj(model);//把对应模型传入链表
+            //DragManager.Instance.Addobj1(model);//
+            //model.GetComponent<Modeldata>().SetPos();//重新获取该模型的位置的值
+            DragManager.Instance.Addtext(modelname_text.text);//把对应名字存入链表
            model = null;
        }
    }
--- a/Assets/Zion/Scripts/Adam/DragManager.cs
+++ b/Assets/Zion/Scripts/Adam/DragManager.cs
@ -1,22 +1,25 @@
 using Cysharp.Threading.Tasks.Triggers;
+using LitJson;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.UI;
 using XFrame.Core.Utils;

 public class DragManager : MonoSingleton<DragManager>
 {
-    public List<GameObject> deviceimages = new List<GameObject>();
-    public List<string> modellist=new List<string>();
+    public List<Modelequipment> deviceimages1 = new List<Modelequipment>();//把最终场景中存在的模型放入链表当中
+    public List<GameObject> deviceimages = new List<GameObject>();//把最开始生成在场景中的模型存入链表
+    public List<string> modellist = new List<string>();//存入最开始场景生成模型的名字

-    public Dictionary<string, int> model = new Dictionary<string, int>(); 
+    public Dictionary<string,int> model = new Dictionary<string,int>();
    void Start()
    {
-       
+
    }

-    // Update is called once per frame
+
    void Update()
    {

@ -32,11 +35,31 @@ public class DragManager : MonoSingleton<DragManager>
    //}
    public void AddObj(GameObject obj)
    {
-        deviceimages.Add(obj);
+        deviceimages.Add(obj);//把生成的预设体放入链表当中
+    }
+    public void Addobj1(GameObject obj)
+    {
+        deviceimages1.Add(obj.GetComponent<Modeldata>().modelequipment);//把场景中存在的的模型放入链表当众
    }
    public void Addtext(string name)
    {
-        modellist.Add(name);
+        modellist.Add(name);//把UI上模型对应的名字存入链表
+    }
+
+    public string Modelinformation()
+    {
+        string josn = Newtonsoft.Json.JsonConvert.SerializeObject(deviceimages1);//把对象转json
+        Debug.Log(josn);
+
+
+        var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Modelequipment>>(josn);//把json序列化成对象
+        list.ForEach(item =>//ForEach方法快速遍历
+        {
+            var obj = Resources.Load<GameObject>(item.str);//获取对应的需预设体路径
+            GameObject game = Instantiate(obj);//生成预设体
+            game.transform.localPosition = new Vector3(item.x, item.y, item.z);//赋给对应模型的位置
+        });
+        return josn;
    }

 }
Author	SHA1	Message	Date
yulong	2bdddc664b	设备信息	2023-11-16 15:20:38 +08:00
yulong	035b05cb89	Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane	2023-11-16 15:19:18 +08:00
yulong	8b8d6d1a23	设备信息	2023-11-16 15:18:51 +08:00