Browse Source

局域网修改

DGJQN 2 years ago
parent
commit
f46447cc6e

BIN
Assets/CScript.zip


+ 7 - 0
Assets/CScript.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 05651f67ba8e6894d992401f1695d545
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/CScript/App/AppManager.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using CScript.Utilities;
@@ -148,7 +148,7 @@ namespace CScript.App
         private void ConectServerHandler()
         {
            // _server.Init("127.0.0.1", 5555);
-            _server.Init("192.168.50.120", 5555);
+            _server.Init("192.168.50.17", 5555);
             _server.Connect();
         }
         private void ConnectSuccess(bool result, string reason)

BIN
Assets/GHZAlter.zip


+ 7 - 0
Assets/GHZAlter.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f2d1cecab7c3ea44b90574bd70873f69
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 376 - 15
Assets/GHZAlter/LANScene.unity

@@ -363,7 +363,7 @@ RectTransform:
   m_Children:
   - {fileID: 4695612440369256485}
   m_Father: {fileID: 1996614597}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -474,7 +474,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &150047292
 Transform:
   m_ObjectHideFlags: 0
@@ -482,15 +482,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 150047291}
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.70710677}
-  m_LocalPosition: {x: -0.3, y: 0, z: 1}
-  m_LocalScale: {x: 0.95, y: -0.95, z: 0.95}
+  m_LocalRotation: {x: -0.000000022351742, y: 0.17364818, z: -0.000000059604645, w: 0.98480785}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 998851290}
   - {fileID: 1547896533}
   - {fileID: 820634558}
-  m_Father: {fileID: 1996614597}
-  m_RootOrder: 1
+  m_Father: {fileID: 1211878897}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.00001}
 --- !u!213 &165266535
 Sprite:
@@ -722,7 +722,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &170996825
 Transform:
   m_ObjectHideFlags: 0
@@ -1226,6 +1226,99 @@ Sprite:
   m_PhysicsShape: []
   m_Bones: []
   m_SpriteID: 
+--- !u!1 &352104662
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 352104666}
+  - component: {fileID: 352104665}
+  - component: {fileID: 352104664}
+  - component: {fileID: 352104663}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!65 &352104663
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 352104662}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &352104664
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 352104662}
+  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: 2100000, guid: 7599d13e8a7077941bef55e03041cba4, type: 2}
+  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!33 &352104665
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 352104662}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &352104666
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 352104662}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.40105143, y: 0.08856193, z: 3.63}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!213 &430248729
 Sprite:
   m_ObjectHideFlags: 0
@@ -1436,6 +1529,105 @@ Sprite:
   m_PhysicsShape: []
   m_Bones: []
   m_SpriteID: 
+--- !u!1 &534462639
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 534462643}
+  - component: {fileID: 534462642}
+  - component: {fileID: 534462641}
+  - component: {fileID: 534462640}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &534462640
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 534462639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &534462641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 534462639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &534462642
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 534462639}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &534462643
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 534462639}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1.439}
+  m_LocalScale: {x: 0.001, y: 0.001, z: 1}
+  m_Children:
+  - {fileID: 1937394606}
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1002, y: 429}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!213 &592733683
 Sprite:
   m_ObjectHideFlags: 0
@@ -1662,7 +1854,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &605887974
 Transform:
   m_ObjectHideFlags: 0
@@ -2132,7 +2324,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &708753447
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3085,7 +3277,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1097794227
 Transform:
   m_ObjectHideFlags: 0
@@ -3381,6 +3573,7 @@ Transform:
   m_Children:
   - {fileID: 1202045569}
   - {fileID: 117129727}
+  - {fileID: 150047292}
   - {fileID: 2053553224}
   m_Father: {fileID: 1996614597}
   m_RootOrder: 0
@@ -4477,7 +4670,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1996614597}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1513873572
 MonoBehaviour:
@@ -4829,6 +5022,80 @@ Sprite:
   m_PhysicsShape: []
   m_Bones: []
   m_SpriteID: 
+--- !u!1 &1714372033
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1714372034}
+  - component: {fileID: 1714372035}
+  m_Layer: 0
+  m_Name: Eye Left (1)
+  m_TagString: Finish
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1714372034
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714372033}
+  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: 232404037}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &1714372035
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714372033}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
+  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.01
+  far clip plane: 1000
+  field of view: 24.2
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 535
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 0
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
 --- !u!213 &1804741085
 Sprite:
   m_ObjectHideFlags: 0
@@ -5669,6 +5936,91 @@ Sprite:
   m_PhysicsShape: []
   m_Bones: []
   m_SpriteID: 
+--- !u!1 &1937394605
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1937394606}
+  - component: {fileID: 1937394608}
+  - component: {fileID: 1937394607}
+  - component: {fileID: 1937394609}
+  m_Layer: 5
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1937394606
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1937394605}
+  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: 534462643}
+  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: 32, y: 0}
+  m_SizeDelta: {x: -219.8883, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1937394607
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1937394605}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!222 &1937394608
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1937394605}
+  m_CullTransparentMesh: 0
+--- !u!114 &1937394609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1937394605}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01f102fb27baadb47b93e7c370d7b60c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ca: {fileID: 1714372035}
 --- !u!213 &1950227961
 Sprite:
   m_ObjectHideFlags: 0
@@ -5897,7 +6249,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1996614597
 Transform:
   m_ObjectHideFlags: 0
@@ -5910,7 +6262,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1211878897}
-  - {fileID: 150047292}
   - {fileID: 15006404}
   - {fileID: 1513873571}
   m_Father: {fileID: 0}
@@ -5996,7 +6347,7 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 1211878897}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6839,6 +7190,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: GamePlayer
       objectReference: {fileID: 0}
+    - target: {fileID: 4064046323467180137, guid: 5a96b12e2f4bbff40b9511a6e9ba306c,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5a96b12e2f4bbff40b9511a6e9ba306c, type: 3}
 --- !u!1 &55286686569760582
@@ -33244,6 +33600,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: EditorModelManager
       objectReference: {fileID: 0}
+    - target: {fileID: 7196200538630244912, guid: 91e459d552b9fdb4fb0d93e68297b326,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7196200538630244916, guid: 91e459d552b9fdb4fb0d93e68297b326,
         type: 3}
       propertyPath: m_Pivot.x

+ 30 - 17
Assets/GHZAlter/NetWorkLAN/client.cs

@@ -10,6 +10,7 @@ using System.Threading;
 using UnityEngine;
 using UnityEngine.UI;
 using BeinLab.Util;
+using UnityEngine.Networking;
 
 public class client : MonoBehaviour
 {
@@ -30,7 +31,7 @@ public class client : MonoBehaviour
     {
         ipPath = Application.persistentDataPath + "/Ipconfig/" + "ip.txt";
         Debug.Log(ipPath);
-        SettingIP();
+       StartCoroutine(  SettingIP());
         // ClickConnect();
 
         TimerMgr.Instance.CreateTimer(()=> { SendData(); }, 0.1f, -1);
@@ -51,24 +52,35 @@ public class client : MonoBehaviour
         }
     }
 
-    private void SettingIP()
+    IEnumerator  SettingIP()
     {
+        yield return new WaitForSeconds(0.2f);
         if (File.Exists(ipPath))
         {
-            FileStream fileStream = new FileStream(ipPath, FileMode.Open, FileAccess.Read);
-            fileStream.Seek(0, SeekOrigin.Begin);
-            //创建文件长度缓冲区
-            byte[] bytes = new byte[fileStream.Length];
-            //读取文件
-            fileStream.Read(bytes, 0, (int)fileStream.Length);
-            //释放文件读取流
-            fileStream.Close();
-            fileStream.Dispose();
-            fileStream = null;
-
-            inputIp = System.Text.Encoding.Default.GetString(bytes);
-           // inputIp = System.BitConverter.ToString(bytes);
-            ClickConnect();
+            var webRequest = UnityWebRequest.Get(ipPath);
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.error != null)
+            {
+                Debug.Log("通信中");
+                yield return webRequest;
+            }
+            var downloadHandler = webRequest.downloadHandler;
+            if (!downloadHandler.isDone)
+            {
+                Debug.Log("下载中");
+                yield return downloadHandler;
+            }
+            else
+            {
+                Debug.Log("下载成功");
+            
+                Debug.Log(downloadHandler.data);
+                // if (!File.Exists(Application.dataPath + "/Resources/YourVideoName.mp4"))
+                inputIp = System.Text.Encoding.Default.GetString(downloadHandler.data);
+                ClickConnect();
+            }
+    
         }
         else
         {
@@ -79,7 +91,8 @@ public class client : MonoBehaviour
             UTF8Encoding encoding = new UTF8Encoding();
             FileWriter.Write(encoding.GetBytes("192.168.50.211"), 0, encoding.GetByteCount("192.168.50.211"));
             FileWriter.Close();
-            SettingIP();
+            Application.Quit();
+           
         }
     }
 

+ 53 - 0
Assets/GHZAlter/TestThreadCamera.cs

@@ -0,0 +1,53 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.UI;
+
+public class TestThreadCamera : MonoBehaviour
+{
+    public Camera ca;
+    Texture2D screenShot;
+    // Start is called before the first frame update
+    void Start()
+    {
+        RenderTexture rt = new RenderTexture(640, 480, 0, RenderTextureFormat.ARGB32);
+   
+        ca.targetTexture = rt;
+        screenShot = new Texture2D(ca.targetTexture.width,ca.targetTexture.height,TextureFormat.RGBA32, false);
+        StartCoroutine(GetRenederFPS());
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    byte[] bts;
+    IEnumerator GetRenederFPS()
+    {
+        while (true)
+        {
+            var req = AsyncGPUReadback.Request(ca.targetTexture,0, TextureFormat.RGBA32);
+            yield return new WaitUntil(() => req.done);
+            if (!req.hasError)
+            {
+
+                if (bts == null)
+                {
+                    bts = new byte[req.layerDataSize];
+                }
+                req.GetData<byte>().CopyTo(bts);
+                screenShot.LoadRawTextureData(bts);
+                screenShot.Apply();
+                //  tex.SetPixels32(req.GetData<Color32>().ToArray());
+                this.GetComponent<RawImage>().texture = screenShot;
+            }
+            else
+            {
+                Debug.LogError("Error AsyncGPUReadbackRequest.hasError");
+            }
+        }
+    }
+}

+ 11 - 0
Assets/GHZAlter/TestThreadCamera.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 01f102fb27baadb47b93e7c370d7b60c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resources/VuforiaConfiguration.asset

@@ -22,7 +22,7 @@ MonoBehaviour:
     useDelayedLoadingObjectTargets: 0
     modelTargetRecoWhileExtendedTracked: 1
     version: 8.5.9
-    eulaAcceptedVersions: '{"Values":["8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","0.0","9.2","9.4","9.8","10.3","10.2","9.1"]}'
+    eulaAcceptedVersions: '{"Values":["8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","0.0","9.2","9.4","9.8","10.3","10.2","9.1","10.11","10.12","10.13"]}'
   database:
     disableModelExtraction: 0
   videoBackground:

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/3/17 17:31:03
+Build from SK-20211220VCWK at 2023/4/23 15:57:01

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -186,7 +186,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.shadowcreator.MRStudio
+    Android: com.shadowcreator.MRStudioLan
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 26

+ 1 - 1
ProjectSettings/TagManager.asset

@@ -16,7 +16,7 @@ TagManager:
   - 
   - fouces
   - rtc
-  - 
+  - NotCamera
   - 
   - 
   -