diff --git a/Assets/GameAssets/t.renderTexture b/Assets/GameAssets/t.renderTexture index 1c8da4a6..07fab6c4 100644 --- a/Assets/GameAssets/t.renderTexture +++ b/Assets/GameAssets/t.renderTexture @@ -13,8 +13,8 @@ RenderTexture: m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 serializedVersion: 3 - m_Width: 256 - m_Height: 256 + m_Width: 1920 + m_Height: 1080 m_AntiAliasing: 1 m_MipCount: -1 m_DepthFormat: 2 diff --git a/Assets/Material/bule.mat b/Assets/Material/bule.mat new file mode 100644 index 00000000..e1cef947 --- /dev/null +++ b/Assets/Material/bule.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: bule + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.08582822, g: 0.013883919, b: 0.9811321, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Material/bule.mat.meta b/Assets/Material/bule.mat.meta new file mode 100644 index 00000000..5b70ae5e --- /dev/null +++ b/Assets/Material/bule.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad9b6f211aa7f56408a0fc152bd1acde +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/model/重点攻击目标1.prefab b/Assets/Resources/model/重点攻击目标1.prefab index fd70792c..fff19e63 100644 --- a/Assets/Resources/model/重点攻击目标1.prefab +++ b/Assets/Resources/model/重点攻击目标1.prefab @@ -251,10 +251,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: da4f9608fdc20254fb802a981fd78164, type: 3} - m_FontSize: 14 + m_FontSize: 7 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 7 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -322,7 +322,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2} + - {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2605,7 +2605,7 @@ Transform: m_GameObject: {fileID: 8425345772495991571} 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_LocalScale: {x: 4, y: 4, z: 4} m_Children: - {fileID: 4546932034029822561} - {fileID: 404141722055020978} @@ -2660,7 +2660,7 @@ MonoBehaviour: toggle5: {fileID: 8932471483062020681} toggle6: {fileID: 64890494959671527} toggle7: {fileID: 4401106011680143311} - frequency: + frequency: UHF gamepos: {fileID: 1001764166187808509} --- !u!54 &-3761067737480147572 Rigidbody: diff --git a/Assets/Resources/model/重点攻击目标2.prefab b/Assets/Resources/model/重点攻击目标2.prefab index feb799f1..23cdb276 100644 --- a/Assets/Resources/model/重点攻击目标2.prefab +++ b/Assets/Resources/model/重点攻击目标2.prefab @@ -255,10 +255,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: da4f9608fdc20254fb802a981fd78164, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1860,7 +1860,7 @@ Transform: m_GameObject: {fileID: 5062416000507490738} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 100, z: 0} - m_LocalScale: {x: 5, y: 1, z: 5} + m_LocalScale: {x: 15, y: 1, z: 15} m_Children: [] m_Father: {fileID: 8425345772495695667} m_RootOrder: 4 @@ -1891,7 +1891,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2} + - {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/model/重点攻击目标3.prefab b/Assets/Resources/model/重点攻击目标3.prefab index de15d76e..cb72caed 100644 --- a/Assets/Resources/model/重点攻击目标3.prefab +++ b/Assets/Resources/model/重点攻击目标3.prefab @@ -176,10 +176,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: da4f9608fdc20254fb802a981fd78164, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -247,7 +247,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2} + - {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2778,7 +2778,7 @@ Transform: m_GameObject: {fileID: 8425345772495991571} 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_LocalScale: {x: 3, y: 3, z: 3} m_Children: - {fileID: 4546932034029822561} - {fileID: 404141722055020978} diff --git a/Assets/StreamingAssets/IPPort.txt b/Assets/StreamingAssets/IPPort.txt index aad86cc0..298829e4 100644 --- a/Assets/StreamingAssets/IPPort.txt +++ b/Assets/StreamingAssets/IPPort.txt @@ -1 +1 @@ -192.168.97.15:48888 \ No newline at end of file +127.0.0.1:48888 \ No newline at end of file diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt index 580a6ef8..e56ea71e 100644 --- a/Assets/StreamingAssets/confing.txt +++ b/Assets/StreamingAssets/confing.txt @@ -1 +1 @@ -192.168.97.15 \ No newline at end of file +127.0.0.1 \ No newline at end of file diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 4f9ca853..951d5e2c 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.064977646, g: 0.12177726, b: 0.26585305, a: 1} + m_IndirectSpecularColor: {r: 0.030100383, g: 0.03369107, b: 0.03534769, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -19185,7 +19185,7 @@ GameObject: - component: {fileID: 338894530} - component: {fileID: 338894529} m_Layer: 12 - m_Name: RawImage + m_Name: redRawImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -37471,7 +37471,7 @@ GameObject: - component: {fileID: 628155342} - component: {fileID: 628155341} m_Layer: 12 - m_Name: RawImage + m_Name: blueRawImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -50243,6 +50243,89 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1371902099} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1378295486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1378295489} + - component: {fileID: 1378295488} + - component: {fileID: 1378295487} + m_Layer: 0 + m_Name: SatelliteImagery + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1378295487 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378295486} + m_Enabled: 1 +--- !u!20 &1378295488 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378295486} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 1179 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1378295489 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378295486} + m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: -208, y: 234, z: 478} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!1 &1388943276 GameObject: m_ObjectHideFlags: 0 @@ -50976,6 +51059,7 @@ MonoBehaviour: mastermanagement: {fileID: 147647013} postureBtn: {fileID: 1594140421} teacherBtn: {fileID: 1565322412} + satelliteImagery: {fileID: 1378295486} --- !u!4 &1436809530 Transform: m_ObjectHideFlags: 0 @@ -62067,11 +62151,31 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1763512969820302134, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2844544340460311774, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3691389793902075663, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_Name value: TaishiPanel objectReference: {fileID: 0} + - target: {fileID: 4067507273071413915, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4655910692261985928, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_LocalPosition.x @@ -62135,7 +62239,7 @@ PrefabInstance: - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -42.02 objectReference: {fileID: 0} - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} @@ -62145,7 +62249,7 @@ PrefabInstance: - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: -84.03992 objectReference: {fileID: 0} - target: {fileID: 5302966787058760566, guid: c3d92615a09597d46aa740923029c15d, type: 3} @@ -62177,6 +62281,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5761932689335332442, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6177095287316444031, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6273397859833311949, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_AnchorMax.x @@ -62187,6 +62301,26 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6565284257349228199, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6877681873123360158, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7799910916288438750, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8589009349407657109, guid: c3d92615a09597d46aa740923029c15d, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8596415491165714378, guid: c3d92615a09597d46aa740923029c15d, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -64036,12 +64170,12 @@ MonoBehaviour: m_EditorClassIdentifier: redObjs: [] blueObjs: [] - redContanier: {fileID: 1720385561} - blueContanier: {fileID: 996536656} + redContanier: {fileID: 996536656} + blueContanier: {fileID: 1720385561} deviceBtnItem: {fileID: 633993627584584296, guid: fd27e404fb7dcc3499a0c8fabd75e0c1, type: 3} - redShowImage: {fileID: 338894529} - blueShowImage: {fileID: 628155341} + redShowImage: {fileID: 628155341} + blueShowImage: {fileID: 338894529} --- !u!1 &1720385560 GameObject: m_ObjectHideFlags: 0 @@ -65490,10 +65624,10 @@ MonoBehaviour: colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8} colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1} colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} - colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2} + colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1} colorClouds: {r: 1, g: 1, b: 1, a: 1} - colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1} + colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1} colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1} colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1} displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]' @@ -65831,7 +65965,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 29685531 + randSeed: 42535375 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -93297,7 +93431,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6368481658342163399 RectTransform: m_ObjectHideFlags: 0 @@ -93311,7 +93445,7 @@ RectTransform: m_Children: - {fileID: 6368481658622910618} m_Father: {fileID: 6368481659683372804} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -93591,80 +93725,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 768.8542, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6368481658457444944 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6368481658457444957} - m_CullTransparentMesh: 0 ---- !u!224 &6368481658457444946 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6368481658457444957} - 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: 6368481659683372804} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: -20, y: -60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6368481658457444947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6368481658457444957} - 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: e599ddb3de901044c963ca3416886a37, 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!1 &6368481658457444957 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6368481658457444946} - - component: {fileID: 6368481658457444944} - - component: {fileID: 6368481658457444947} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!114 &6368481658496817020 MonoBehaviour: m_ObjectHideFlags: 0 @@ -94297,7 +94357,7 @@ RectTransform: m_Children: - {fileID: 6368481658713299308} m_Father: {fileID: 6368481659683372804} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -94365,7 +94425,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &6368481659336096942 MonoBehaviour: m_ObjectHideFlags: 0 @@ -94707,7 +94767,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6368481659683372804} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -94838,47 +94898,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6368481659683372804} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 26.300049} - m_SizeDelta: {x: -20, y: -60} + m_AnchoredPosition: {x: -71, y: -28.6} + m_SizeDelta: {x: 167.36975, y: -41.188477} m_Pivot: {x: 0.5, y: 0.5} ---- !u!328 &6368481659655708049 -VideoPlayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6368481659655708051} - m_Enabled: 1 - m_VideoClip: {fileID: 0} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: _MainTex - m_RenderMode: 2 - m_AspectRatio: 2 - m_DataSource: 0 - m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 - m_TargetAudioSources: - - {fileID: 0} - m_DirectAudioVolumes: - - 1 - m_Url: - m_EnabledAudioTracks: 01 - m_DirectAudioMutes: 00 - m_ControlledAudioTrackCount: 1 - m_PlayOnAwake: 1 - m_SkipOnDrop: 1 - m_Looping: 0 - m_WaitForFirstFrame: 1 - m_FrameReadyEventEnabled: 0 --- !u!1 &6368481659655708051 GameObject: m_ObjectHideFlags: 0 @@ -94890,7 +94916,6 @@ GameObject: - component: {fileID: 6368481659655708048} - component: {fileID: 6368481659655708055} - component: {fileID: 6368481659655708054} - - component: {fileID: 6368481659655708049} m_Layer: 0 m_Name: video-both m_TagString: Untagged @@ -95156,7 +95181,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6368481658457444946} - {fileID: 6368481659655708048} - {fileID: 6368481659512411791} - {fileID: 6368481658342163399} @@ -95209,6 +95233,7 @@ GameObject: - component: {fileID: 6368481659683372804} - component: {fileID: 6368481659683372858} - component: {fileID: 6368481659683372805} + - component: {fileID: 6368481659683372808} m_Layer: 0 m_Name: video-star m_TagString: Untagged @@ -95216,6 +95241,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &6368481659683372808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6368481659683372807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!222 &6368481659683372858 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs b/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs index a83bb98e..5497be7a 100644 --- a/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs +++ b/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs @@ -28,6 +28,10 @@ public class DeviceBtnItem : MonoBehaviour id = _id; selfName = _selfName; selfText.text = _selfName; + if (_selfName == "自杀式无人机" || _selfName.Contains("地面无线电干扰") || _selfName.Contains("微波武器")) + { + selfBtn.interactable = false; + } } } diff --git a/Assets/Zion/Scripts/Adam/Components/PostureController.cs b/Assets/Zion/Scripts/Adam/Components/PostureController.cs index 76a17fcd..0fdb0568 100644 --- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs +++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs @@ -15,6 +15,7 @@ public class PostureController : MonoBehaviour public RawImage redShowImage; public RawImage blueShowImage; private DroneViewDisplay droneViewDisplay; + // Start is called before the first frame update void Awake() { @@ -32,7 +33,9 @@ public class PostureController : MonoBehaviour { GetSceneInfo(); } - + /// + /// red 地面设备 blue 无人机 + /// private void GetSceneInfo() { redObjs = deviceManager.devices.Where(x => x != null && x.gameObject.layer == 11).ToList(); @@ -83,8 +86,28 @@ public class PostureController : MonoBehaviour { DeviceBtnItem obj = Instantiate(deviceBtnItem, contanier); obj.SetInfo(id, objName); + obj.selfBtn.onClick.AddListener(() => { + if (objName.Contains("电子侦察无人机")) + { + redShowImage.transform.parent.GetComponent().enabled = true; + } + else + { + redShowImage.transform.parent.GetComponent().enabled = false; + } + + if (objName.Contains("频谱探测") || objName.Contains("雷达")) + { + + blueShowImage.transform.parent.GetComponent().enabled = true; + } + else + { + blueShowImage.transform.parent.GetComponent().enabled = false; + + } OnDeviceBtn(id, redOrBlue); }); @@ -96,14 +119,12 @@ public class PostureController : MonoBehaviour if (string.IsNullOrEmpty(id)) return; if (redOrBlue == 0) { - RenderTexture t = droneViewDisplay.renderTextureTo(id); - redShowImage.texture = t; + redShowImage.texture = droneViewDisplay.renderTextureTo(id); } else { blueShowImage.texture = droneViewDisplay.renderTextureTo(id); } - Debug.Log(id); } } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 87956c09..7538f02c 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -38,18 +38,30 @@ public class GameManager : MonoSingleton public Mastermanagement mastermanagement; + /// + /// 进入导调 + /// public Button postureBtn; + /// + /// 进入态势 + /// public Button teacherBtn; - + /// + /// 卫星影像 + /// + public GameObject satelliteImagery; // Start is called before the first frame update private void Awake() { + satelliteImagery.SetActive(false); postureBtn.onClick.AddListener(() => { + satelliteImagery.SetActive(false); ChangeView(0); }); teacherBtn.onClick.AddListener(() => { + satelliteImagery.SetActive(true); ChangeView(2); }); SyncCreateRoom.getroomusersRequset += OnGetRoomUsers; @@ -174,7 +186,7 @@ public class GameManager : MonoSingleton AddPlayers(spt); DeviceManager.Instance.OnInit(); DeviceManager.Instance.isStartRehearsing = GlobalFlag.isStartRehearsing; - Debug.Log(" GlobalFlag.blueOrRed----"+ GlobalFlag.blueOrRed); + Debug.Log(" GlobalFlag.blueOrRed----" + GlobalFlag.blueOrRed); } @@ -201,7 +213,7 @@ public class GameManager : MonoSingleton UnmannedAerialVehicleUI.Instance.unmannedAerialVehicleManage = unmannedAerialVehicleManage; UnmannedAerialVehicleUI.Instance.ShowButton(); - DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage,true); + DroneViewDisplay.Instance.CreateUI(unmannedAerialVehicleManage, true); } } } @@ -315,7 +327,7 @@ public class GameManager : MonoSingleton break; case "BandSetting"://设备频段设置 - if (data[1]=="WRJ") + if (data[1] == "WRJ") { UnmannedAerialVehicleManage unmannedAerialVehicleManage = UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Find(x => x.equipmentCommon.deviceID == data[2]); if (unmannedAerialVehicleManage) @@ -325,7 +337,7 @@ public class GameManager : MonoSingleton } else if (data[1] == "ZYMB") { - HighPriorityTarget highPriorityTarget= HighPriorityTarget.HighPriorityTargets.Find(x=>x.Number == data[2]); + HighPriorityTarget highPriorityTarget = HighPriorityTarget.HighPriorityTargets.Find(x => x.Number == data[2]); if (highPriorityTarget) { highPriorityTarget.FrequencyGamepos(data[3]); @@ -466,7 +478,7 @@ public class GameManager : MonoSingleton device.GetComponent().SetTipsColor(); DroneViewDisplay.Instance.CreateUI(device.GetComponent(), false); } - + } private void OnGetRoomUsers(string obj) diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index 489ed567..ec61309c 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -221,7 +221,7 @@ public class RadarManger : MonoBehaviour { case "转台转速:": TurntableSpeed = weaponitemone[i].para_value; - RadarRotationSpeed(TurntableSpeed); + //RadarRotationSpeed(TurntableSpeed); break; case "探测距离:": DetectionRange = weaponitemone[i].para_value;