From 0edfd0e7662250fd80f084004165675aed944a96 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Sat, 20 Jan 2024 16:03:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameAssets/Prefebs/Main Camera.prefab | 2 +- .../Prefebs/Models/moder/无人机List.prefab | 524 ++++++++++++++---- Assets/Temp/Scripts/Login_panl.cs | 4 +- Assets/Temp/Scripts/View_Panel2.cs | 10 +- .../AdamTraining_pilot_terminal_panl 1.unity | 4 +- .../Scripts/Adam/Components/Face2Camera.cs | 61 ++ .../Adam/Components/Face2Camera.cs.meta | 11 + .../Zion/Scripts/Adam/Components/On3DClick.cs | 4 +- Assets/Zion/Scripts/Adam/DeviceManager.cs | 14 + Assets/Zion/Scripts/Adam/DragController.cs | 4 +- Assets/Zion/Scripts/Adam/GameManager.cs | 13 +- Assets/Zion/Scripts/Adam/UIBootstrap.cs | 2 +- .../Adam/Utility/Sync/SyncCreateRoom.cs | 2 +- .../Scripts/ModelFunction/EquipmentCommon.cs | 8 +- .../UAV/UnmannedAerialVehicle.cs | 10 +- .../UAV/UnmannedAerialVehicleManage.cs | 42 +- 16 files changed, 551 insertions(+), 164 deletions(-) create mode 100644 Assets/Zion/Scripts/Adam/Components/Face2Camera.cs create mode 100644 Assets/Zion/Scripts/Adam/Components/Face2Camera.cs.meta diff --git a/Assets/GameAssets/Prefebs/Main Camera.prefab b/Assets/GameAssets/Prefebs/Main Camera.prefab index 7715b910..4aebc851 100644 --- a/Assets/GameAssets/Prefebs/Main Camera.prefab +++ b/Assets/GameAssets/Prefebs/Main Camera.prefab @@ -64,7 +64,7 @@ Camera: field of view: 60 orthographic: 0 orthographic size: 600 - m_Depth: -1 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 32567 diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 1fe7fbf4..4c10998a 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -1,5 +1,148 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &114525537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114525538} + - component: {fileID: 114525540} + - component: {fileID: 114525539} + m_Layer: 11 + m_Name: New Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &114525538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114525537} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.17600001, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_Children: [] + m_Father: {fileID: 420644308} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &114525540 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114525537} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!102 &114525539 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114525537} + m_Text: Hello World + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 1 + m_Alignment: 1 + m_TabSize: 4 + m_FontSize: 150 + m_FontStyle: 1 + m_RichText: 1 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!1 &420644307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 420644308} + - component: {fileID: 6350339116943227109} + m_Layer: 11 + m_Name: Tips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &420644308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420644307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.175, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 114525538} + m_Father: {fileID: 5512074156260461627} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6350339116943227109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420644307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da6a5242a46d21d46835a2ae419d48fe, type: 3} + m_Name: + m_EditorClassIdentifier: + mainCamera: {fileID: 0} + invertBack: 0 + isEnableVertical: 1 + isEnableLerp: 0 + lerpTime: 1 + _distance: 10 --- !u!1 &34767209977200763 GameObject: m_ObjectHideFlags: 0 @@ -364,6 +507,8 @@ MonoBehaviour: dataLinkCommunicationFrequency: 1 electronicReconnaissanceCapability: 1 opticalReconnaissanceCapability: 1 + allColliders: [] + attackColliders1: [] --- !u!1 &7326748669528570608 GameObject: m_ObjectHideFlags: 0 @@ -374,7 +519,6 @@ GameObject: m_Component: - component: {fileID: 8245684177115831463} - component: {fileID: 6382256847466738257} - - component: {fileID: 4942465351206027101} m_Layer: 11 m_Name: Camera m_TagString: Untagged @@ -403,7 +547,7 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7326748669528570608} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} @@ -424,7 +568,7 @@ Camera: field of view: 60 orthographic: 0 orthographic size: 5 - m_Depth: 0 + m_Depth: -1 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -439,14 +583,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!81 &4942465351206027101 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7326748669528570608} - m_Enabled: 1 --- !u!1001 &87581316664468991 PrefabInstance: m_ObjectHideFlags: 0 @@ -1204,6 +1340,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -1301,12 +1442,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &8062921474742261735 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 87581316664468991} - m_PrefabAsset: {fileID: 0} --- !u!114 &2044690712093867138 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -1319,6 +1454,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &8062921474742261735 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 87581316664468991} + m_PrefabAsset: {fileID: 0} --- !u!1001 &715777664892440568 PrefabInstance: m_ObjectHideFlags: 0 @@ -2076,6 +2217,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -2948,6 +3094,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -3820,6 +3971,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -4692,6 +4848,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -5564,6 +5725,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -6436,6 +6602,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -7308,6 +7479,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -7405,6 +7581,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &8520896806561604225 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 1770522258813735065} + m_PrefabAsset: {fileID: 0} --- !u!114 &415806151353551332 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -7417,12 +7599,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &8520896806561604225 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1770522258813735065} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1952625762317888975 PrefabInstance: m_ObjectHideFlags: 0 @@ -8180,6 +8356,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -8277,12 +8458,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &8488010052738047959 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1952625762317888975} - m_PrefabAsset: {fileID: 0} --- !u!114 &454312886544757938 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -8295,6 +8470,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &8488010052738047959 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 1952625762317888975} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2092430464794464480 PrefabInstance: m_ObjectHideFlags: 0 @@ -9052,6 +9233,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -9149,12 +9335,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &8348451640861860600 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2092430464794464480} - m_PrefabAsset: {fileID: 0} --- !u!114 &26700038631426461 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -9167,6 +9347,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &8348451640861860600 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2092430464794464480} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2303540555920778128 PrefabInstance: m_ObjectHideFlags: 0 @@ -9924,6 +10110,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -10021,6 +10212,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &8153123965611774344 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2303540555920778128} + m_PrefabAsset: {fileID: 0} --- !u!114 &189366751241648877 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -10033,12 +10230,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &8153123965611774344 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2303540555920778128} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2498570764477447715 PrefabInstance: m_ObjectHideFlags: 0 @@ -10251,6 +10442,11 @@ PrefabInstance: propertyPath: unmannedAerialVehicleManage value: objectReference: {fileID: 6644830064356880066} + - target: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: tips + value: + objectReference: {fileID: 114525539} - target: {fileID: 2254950790765467284, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -11668,6 +11864,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -12540,6 +12741,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -12637,6 +12843,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &5167349154997552048 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2982643334479475112} + m_PrefabAsset: {fileID: 0} --- !u!114 &3761472913846298837 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -12649,12 +12861,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &5167349154997552048 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2982643334479475112} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3048292988923725988 PrefabInstance: m_ObjectHideFlags: 0 @@ -13412,6 +13618,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -13509,12 +13720,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &4944900371505117884 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 3048292988923725988} - m_PrefabAsset: {fileID: 0} --- !u!114 &3970666008213377497 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -13527,6 +13732,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &4944900371505117884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 3048292988923725988} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3662279832116246199 PrefabInstance: m_ObjectHideFlags: 0 @@ -14284,6 +14495,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -15156,6 +15372,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -15253,6 +15474,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &6331659836092723443 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 4110930979306373867} + m_PrefabAsset: {fileID: 0} --- !u!114 &2619933972551867286 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -15265,12 +15492,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &6331659836092723443 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 4110930979306373867} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4880875880639175748 PrefabInstance: m_ObjectHideFlags: 0 @@ -16028,6 +16249,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -16125,12 +16351,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &3273620095990738524 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 4880875880639175748} - m_PrefabAsset: {fileID: 0} --- !u!114 &6839647458606122297 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -16143,6 +16363,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &3273620095990738524 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 4880875880639175748} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5511666963674910243 PrefabInstance: m_ObjectHideFlags: 0 @@ -16900,6 +17126,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -16997,6 +17228,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &2499279008215596091 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 5511666963674910243} + m_PrefabAsset: {fileID: 0} --- !u!114 &5848568455846123358 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -17009,12 +17246,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &2499279008215596091 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5511666963674910243} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5521732607769453082 PrefabInstance: m_ObjectHideFlags: 0 @@ -17772,6 +18003,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -17869,12 +18105,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &2482403066424627202 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5521732607769453082} - m_PrefabAsset: {fileID: 0} --- !u!114 &5905968906451827559 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -17887,6 +18117,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &2482403066424627202 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 5521732607769453082} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5554079564960066622 PrefabInstance: m_ObjectHideFlags: 0 @@ -18644,6 +18880,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -18741,6 +18982,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &2577865565644119590 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 5554079564960066622} + m_PrefabAsset: {fileID: 0} --- !u!114 &5783492806809580867 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -18753,12 +19000,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &2577865565644119590 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5554079564960066622} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6233801842401300491 PrefabInstance: m_ObjectHideFlags: 0 @@ -19516,6 +19757,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -19613,6 +19859,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &4057900896101589523 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 6233801842401300491} + m_PrefabAsset: {fileID: 0} --- !u!114 &5464551210618669430 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -19625,12 +19877,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &4057900896101589523 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6233801842401300491} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6236486983173705355 PrefabInstance: m_ObjectHideFlags: 0 @@ -20388,6 +20634,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -20485,6 +20736,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &4061707263712443539 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 6236486983173705355} + m_PrefabAsset: {fileID: 0} --- !u!114 &5466074992090322934 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -20497,12 +20754,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &4061707263712443539 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6236486983173705355} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6531287970344790646 PrefabInstance: m_ObjectHideFlags: 0 @@ -21260,6 +21511,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -21357,6 +21613,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &3778991970646513774 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 6531287970344790646} + m_PrefabAsset: {fileID: 0} --- !u!114 &5185013363439366923 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -21369,12 +21631,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3778991970646513774 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6531287970344790646} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7240302650516732980 PrefabInstance: m_ObjectHideFlags: 0 @@ -22132,6 +22388,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -22229,6 +22490,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &768107848365297196 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 7240302650516732980} + m_PrefabAsset: {fileID: 0} --- !u!114 &8731825496423425353 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -22241,12 +22508,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &768107848365297196 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 7240302650516732980} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7437457271094913390 PrefabInstance: m_ObjectHideFlags: 0 @@ -23004,6 +23265,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -23101,12 +23367,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &713047693628054390 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 7437457271094913390} - m_PrefabAsset: {fileID: 0} --- !u!114 &8818103163389751315 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -23119,6 +23379,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &713047693628054390 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 7437457271094913390} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8108767849280698377 PrefabInstance: m_ObjectHideFlags: 0 @@ -23971,6 +24237,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -24843,6 +25114,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -25715,6 +25991,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -26587,6 +26868,11 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061222380075069409, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer @@ -26684,6 +26970,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!4 &1550832753322196951 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 8887797578038627791} + m_PrefabAsset: {fileID: 0} --- !u!114 &7350113383591171250 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, @@ -26696,9 +26988,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &1550832753322196951 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 8887797578038627791} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Temp/Scripts/Login_panl.cs b/Assets/Temp/Scripts/Login_panl.cs index b5cd66ac..44e59e39 100644 --- a/Assets/Temp/Scripts/Login_panl.cs +++ b/Assets/Temp/Scripts/Login_panl.cs @@ -68,7 +68,7 @@ public class Login_panl : MonoBehaviour { if (b) { - Debug.Log(s); + //Debug.Log(s); LoginRoot rot = new LoginRoot(); rot = JsonMapper.ToObject(s); //JsonData jd = JsonMapper.ToObject(s); @@ -104,7 +104,7 @@ public class Login_panl : MonoBehaviour public void OnRegist(string msg) { - Debug.Log("OnRegist====" + msg); + //Debug.Log("OnRegist====" + msg); } private void Clearaway() diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs index 74c97061..98d6fe3d 100644 --- a/Assets/Temp/Scripts/View_Panel2.cs +++ b/Assets/Temp/Scripts/View_Panel2.cs @@ -220,7 +220,7 @@ public class View_Panel2 : XUIPanel roomModelDropdown.onValueChanged.Invoke(0); CreateSubject(); - Debug.Log("GlobalFlag.currentUser==" + GlobalFlag.currentUser.role_code); + //Debug.Log("GlobalFlag.currentUser==" + GlobalFlag.currentUser.role_code); switch (GlobalFlag.currentUser.role_code) { //超级管理员 00 @@ -255,7 +255,7 @@ public class View_Panel2 : XUIPanel public void OnJoinRoom(string msg) { - Debug.Log("OnJoinRoom ViewPanel===" + msg); + //Debug.Log("OnJoinRoom ViewPanel===" + msg); SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1"); } public async void GetAllRoomData() @@ -456,7 +456,7 @@ public class View_Panel2 : XUIPanel selector_panl.gameObject.SetActive(true); CreateAllUser(userData.data); EliminateAccount(); - Debug.Log($"currentSubjectID+currentSeatID={ currentSubjectID }={currentSeatID}"); + //Debug.Log($"currentSubjectID+currentSeatID={ currentSubjectID }={currentSeatID}"); }); if (GlobalFlag.currentUser.role_code.Equals("04") || GlobalFlag.currentUser.role_code.Equals("05") || GlobalFlag.currentUser.role_code.Equals("02")) { @@ -547,7 +547,7 @@ public class View_Panel2 : XUIPanel GlobalFlag.currentThinkId = roomItem.name; UIBootstrap.Instance.GetSceneData(GlobalFlag.practiceId); UIBootstrap.Instance.GetAllDeviceData(); - Debug.Log(" roomItem.nameID==" + roomItem.name); + //Debug.Log(" roomItem.nameID==" + roomItem.name); CreateSubjectItem(currentRoomData.data); }); } @@ -733,7 +733,7 @@ public class View_Panel2 : XUIPanel { submitInstruct.text = "提交成功"; GlobalFlag.practiceSeatId = practiceSeatId; - Debug.LogError(GlobalFlag.practiceSeatId); + //Debug.LogError(GlobalFlag.practiceSeatId); } else { diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 65a112fb..ab8dcac9 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.16286224, g: 0.30626324, b: 0.6662026, a: 1} + m_IndirectSpecularColor: {r: 0.1623278, g: 0.30647233, b: 0.67099607, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -63570,7 +63570,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 104423687 + randSeed: 256023359 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/Components/Face2Camera.cs b/Assets/Zion/Scripts/Adam/Components/Face2Camera.cs new file mode 100644 index 00000000..57e4c575 --- /dev/null +++ b/Assets/Zion/Scripts/Adam/Components/Face2Camera.cs @@ -0,0 +1,61 @@ +using UnityEngine; + +/// +/// 面向相机 +/// +public class Face2Camera : MonoBehaviour +{ + //主相机 + public Camera mainCamera; + //翻转背面 + public bool invertBack; + //是否启用垂直方向上的朝向 + //设为false时 仅在水平方向上面向相机 + public bool isEnableVertical = true; + //是否启用插值运算 + public bool isEnableLerp; + //插值到目标值所需的时间 isEnableLerp为true时起作用 + [Range(0.01f, 1f), SerializeField] private float lerpTime = 1f; + + public float _distance;//最大距离 + + Vector3 initScale; + + private void Start() + { + if (mainCamera == null) + { + mainCamera = Camera.main ?? FindObjectOfType(); + } + + initScale = transform.localScale; + } + + private void Update() + { + if (mainCamera == null) + return; + + Vector3 forward = (isEnableVertical + ? -mainCamera.transform.forward + : Vector3.ProjectOnPlane((mainCamera.transform.position - transform.position).normalized, Vector3.up)) + * (invertBack ? 1 : -1); + + transform.forward = !isEnableLerp ? forward + : Vector3.Lerp(transform.forward, forward, 1f - Mathf.Exp(Mathf.Log(1f - .99f) / lerpTime * Time.deltaTime)); + + float distance = Vector3.Distance(Camera.main.transform.position, transform.position);//不断变化的距离 + float scale = distance / _distance; + if (scale > 10f) + scale = 10f; + transform.localScale = initScale * scale; + } + + //public Face2Camera Set(Camera mainCamera, bool invertBack, bool isEnableVertical) + //{ + // this.mainCamera = mainCamera; + // this.invertBack = invertBack; + // this.isEnableVertical = isEnableVertical; + // return this; + //} +} \ No newline at end of file diff --git a/Assets/Zion/Scripts/Adam/Components/Face2Camera.cs.meta b/Assets/Zion/Scripts/Adam/Components/Face2Camera.cs.meta new file mode 100644 index 00000000..08c4b506 --- /dev/null +++ b/Assets/Zion/Scripts/Adam/Components/Face2Camera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: da6a5242a46d21d46835a2ae419d48fe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Zion/Scripts/Adam/Components/On3DClick.cs b/Assets/Zion/Scripts/Adam/Components/On3DClick.cs index 90e1597f..42f1c9a2 100644 --- a/Assets/Zion/Scripts/Adam/Components/On3DClick.cs +++ b/Assets/Zion/Scripts/Adam/Components/On3DClick.cs @@ -20,12 +20,12 @@ public class On3DClick : MonoBehaviour private void OnMouseEnter() { selfHighlight.ConstantOn(Color.green); - Debug.Log("OnMouseEnter"); + //Debug.Log("OnMouseEnter"); } private void OnMouseExit() { selfHighlight.ConstantOff(); - Debug.Log("OnMouseExit"); + //Debug.Log("OnMouseExit"); } } diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index f44bb6a1..d8a72e05 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -80,6 +80,20 @@ public class DeviceManager : MonoSingleton devices.Add(d); } } + + public int GetPlayerDevice() + { + List temp = new List(); + for (int i = 0; i < devices.Count; i++) + { + if (devices[i].isPlayer) + { + temp.Add(devices[i].gameObject); + } + } + return temp.Count; + } + /// /// 获取光学无人机和自杀式无人机 /// diff --git a/Assets/Zion/Scripts/Adam/DragController.cs b/Assets/Zion/Scripts/Adam/DragController.cs index ccb4aea0..1b001c2c 100644 --- a/Assets/Zion/Scripts/Adam/DragController.cs +++ b/Assets/Zion/Scripts/Adam/DragController.cs @@ -23,7 +23,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, { if (isDragWRJ) { - if (DragManager.Instance.devices.Count == GameManager.Instance.wrjCount) + if (DeviceManager.Instance.GetPlayerDevice() == GameManager.Instance.wrjCount) { return; } @@ -84,7 +84,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, RaycastHit hitInfo; if (Physics.Raycast(ray, out hitInfo, 1000, 1 << 8)) { - Debug.Log("daadad"); + //Debug.Log("daadad"); target.transform.localPosition = hitInfo.point; } else diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index ba093039..ad381756 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -130,7 +130,7 @@ public class GameManager : MonoSingleton Teacher.gameObject.SetActive(false); student.gameObject.SetActive(true); GlobalFlag.isStartRehearsing = (UIBootstrap.Instance.GetRoomStateById(GlobalFlag.roomID) == 1); - Debug.Log($"isStartRehearsing={ GlobalFlag.isStartRehearsing}"); + //Debug.Log($"isStartRehearsing={ GlobalFlag.isStartRehearsing}"); if (GlobalFlag.isStartRehearsing) { spt.GetComponent().cullingMask = -1; @@ -216,6 +216,7 @@ public class GameManager : MonoSingleton { yield return new WaitForSeconds(0.5f); string[] data = msg.Split(','); + //Debug.Log($"{data[0]}+{data[1]}"); switch (data[0]) { case "online": @@ -378,13 +379,15 @@ public class GameManager : MonoSingleton device.GetComponent().wrjModel = (WRJModel)wrjModelCount; } - device.GetComponent().deviceID = data.id; - device.GetComponent().FillInTheData(data.list_para); Debug.Log($"是否是player{data.r3 == GlobalFlag.currentUser.user_id}"); + device.GetComponent().FillInTheData(data.list_para); + device.GetComponent().deviceID = data.id; if (data.r3 == GlobalFlag.currentUser.user_id) { device.GetComponent().isPlayer = true; } + if (device.GetComponent()) + device.GetComponent().SetTipsColor(); } private void OnGetRoomUsers(string obj) @@ -417,7 +420,7 @@ public class GameManager : MonoSingleton } } } - Debug.Log($"OnGetRoomUsers={obj}"); + //Debug.Log($"OnGetRoomUsers={obj}"); SpawnDevice(); string msg = $"send2room online,{ulong.Parse(GlobalFlag.currentUser.user_id)},{GlobalFlag.currentUser.login_name},{ulong.Parse(GlobalFlag.roomID)}"; _ = SyncCreateRoom.SendMessageAsync(msg); @@ -442,7 +445,7 @@ public class GameManager : MonoSingleton public void SetModelValue() { string info = UIBootstrap.Instance.currentSceneInfo.data.DeviceContent; - Debug.Log(info); + //Debug.Log(info); if (info.Length > 0 && !string.IsNullOrWhiteSpace(info)) { modelsInfo = Jsonanalyze.FromJson>(info); diff --git a/Assets/Zion/Scripts/Adam/UIBootstrap.cs b/Assets/Zion/Scripts/Adam/UIBootstrap.cs index c533b562..7b4f8ddd 100644 --- a/Assets/Zion/Scripts/Adam/UIBootstrap.cs +++ b/Assets/Zion/Scripts/Adam/UIBootstrap.cs @@ -22,7 +22,7 @@ public class UIBootstrap : MonoSingleton private async void Start() { sceneInfoUrl = Url_GetSceneInfo; - Debug.LogError(Url_GetAllThinkData); + //Debug.LogError(Url_GetAllThinkData); editinformation = await AsyncWebReq.Post(Url_GetAllThinkData, null); for (int i = 0; i < editinformation.data.Count; i++) { diff --git a/Assets/Zion/Scripts/Adam/Utility/Sync/SyncCreateRoom.cs b/Assets/Zion/Scripts/Adam/Utility/Sync/SyncCreateRoom.cs index a387845f..ffc91c47 100644 --- a/Assets/Zion/Scripts/Adam/Utility/Sync/SyncCreateRoom.cs +++ b/Assets/Zion/Scripts/Adam/Utility/Sync/SyncCreateRoom.cs @@ -73,7 +73,7 @@ namespace AdamSync if (commands.Length > 0) { - Debug.Log($"commands[0]===={commands[0]}"); + //Debug.Log($"commands[0]===={commands[0]}"); switch (commands[0]) { case "regist": diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 1bc5869b..90081d9d 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -32,11 +32,13 @@ public class EquipmentCommon : MonoBehaviour { if (_isPlayer != value) { + ISPlayer = value; _isPlayer = value; OnActivationIsPlayer?.Invoke(_isPlayer); } } } + public bool ISPlayer; public event System.Action OnActivationIsPlayer; private bool _isPlayer = false; @@ -164,8 +166,8 @@ public class EquipmentCommon : MonoBehaviour break; case "蜂群无人机": UnmannedAerialVehicleManage unmannedAerialVehicleManage = GetComponent(); - unmannedAerialVehicleManage.FillInTheData(weaponitemone); unmannedAerialVehicleManage.MatrixFormation(30, 1); + unmannedAerialVehicleManage.FillInTheData(weaponitemone); break; case "频谱探测": Spectrumdetection spectrumdetection = GetComponent(); @@ -198,10 +200,10 @@ public class EquipmentCommon : MonoBehaviour string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains); WWWForm wWWForm = new WWWForm(); wWWForm.AddField("data", uploadLogMainJson); - Debug.Log(uploadLogMainJson); + //Debug.Log(uploadLogMainJson); StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => { - Debug.Log(data); + //Debug.Log(data); })); } diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs index 96e297f0..ca38f8b9 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs @@ -71,6 +71,8 @@ public class UnmannedAerialVehicle : MonoBehaviour /// public GameObject explodePrefab; + public TextMesh tips; + public Transform attackTarget; private void OnTriggerEnter(Collider other) { @@ -83,14 +85,6 @@ public class UnmannedAerialVehicle : MonoBehaviour } } - /// - /// 设置无人机类型 - /// - /// - public void SetWRJModel(WRJModel _wrjModel) - { - wrjModel = _wrjModel; - } /// diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index f9bede5f..7cea0dd2 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -478,8 +478,21 @@ public class UnmannedAerialVehicleManage : MonoBehaviour StartCoroutine(WeaponitemoneDataAddition()); } SwitchWRJModel(); + } } + + /// + /// 设置tips颜色 + /// + public void SetTipsColor() + { + if (equipmentCommon.isPlayer) + unmannedAerialVehicles[0].tips.color = Color.green; + else + unmannedAerialVehicles[0].tips.color = Color.red; + } + /// /// 雷达检测无人机身上得RSC /// @@ -573,18 +586,21 @@ public class UnmannedAerialVehicleManage : MonoBehaviour yield return new WaitForSeconds(0.01f); for (int i = 0; i < unmannedAerialVehicles.Count; i++) { - if (unmannedAerialVehicles[i] != null) + UnmannedAerialVehicle uav = unmannedAerialVehicles[i]; + if (uav != null) { - unmannedAerialVehicles[i].unmannedAerialVehicleManage = this; - unmannedAerialVehicles[i].batteryLife = batteryLife; - unmannedAerialVehicles[i].classificationWindResistance = classificationWindResistance; - unmannedAerialVehicles[i].maximumFlyingSpeed = maximumFlyingSpeed; - unmannedAerialVehicles[i].RCS = RCS; - unmannedAerialVehicles[i].satellitePositioningFrequency = satellitePositioningFrequency; - unmannedAerialVehicles[i].dataLinkCommunicationFrequency = dataLinkCommunicationFrequency; - unmannedAerialVehicles[i].electronicReconnaissanceCapability = electronicReconnaissanceCapability; - unmannedAerialVehicles[i].opticalReconnaissanceCapability = opticalReconnaissanceCapability; - unmannedAerialVehicles[i].wrjModel = wrjModel; + uav.unmannedAerialVehicleManage = this; + uav.batteryLife = batteryLife; + uav.classificationWindResistance = classificationWindResistance; + uav.maximumFlyingSpeed = maximumFlyingSpeed; + uav.RCS = RCS; + uav.satellitePositioningFrequency = satellitePositioningFrequency; + uav.dataLinkCommunicationFrequency = dataLinkCommunicationFrequency; + uav.electronicReconnaissanceCapability = electronicReconnaissanceCapability; + uav.opticalReconnaissanceCapability = opticalReconnaissanceCapability; + uav.wrjModel = wrjModel; + if (uav.tips != null) + uav.tips.text = wrjModel.ToString(); } } } @@ -728,8 +744,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour BoxCollider box = transform.GetComponent(); if (box) { - Debug.Log("cols..:" + cols); - Debug.Log("rows..:" + rows); + //Debug.Log("cols..:" + cols); + //Debug.Log("rows..:" + rows); box.center = new Vector3(cols - 1, 0, -(wrjCount - 1)); box.size = new Vector3(cols * 2, 1, 2 * wrjCount); }