同步到其它电脑

Assets/GameAssets/Prefebs/Main Camera.prefab

@@ -0,0 +1,276 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8716064937965754120
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8716064937965754117}
+  - component: {fileID: 8716064937965754118}
+  - component: {fileID: 8716064937965754116}
+  - component: {fileID: 8716064937965754115}
+  - component: {fileID: 8716064937965754114}
+  - component: {fileID: 8716064937965754113}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &8716064937965754117
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8716064937965754120}
+  m_LocalRotation: {x: 0.38686386, y: -0.10340534, z: 0.04370654, w: 0.91527784}
+  m_LocalPosition: {x: 114.28273, y: 305.18033, z: -95.789764}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 23, y: 0, z: 0}
+--- !u!20 &8716064937965754118
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8716064937965754120}
+  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.01
+  far clip plane: 3000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 600
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!114 &8716064937965754116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8716064937965754120}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 46e88e8cd30abac4a95b7f37021920b3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  boost: 5
+  positionLerpTime: 0.2
+  mouseSensitivityCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0.5
+      inSlope: 0
+      outSlope: 5
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 2.5
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  rotationLerpTime: 0.01
+  invertY: 0
+--- !u!114 &8716064937965754115
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8716064937965754120}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _fillAlpha: 0
+  _downsampleFactor: 4
+  _iterations: 3
+  _blurMinSpread: 0.65
+  _blurSpread: 0.25
+  _blurIntensity: 0.3
+  _blurDirections: 0
+  _blitter: {fileID: 0}
+  _antiAliasing: 0
+  _presets:
+  - _name: Default
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 2
+    _blurMinSpread: 0.65
+    _blurSpread: 0.25
+    _blurIntensity: 0.3
+    _blurDirections: 0
+  - _name: Wide
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 4
+    _blurMinSpread: 0.65
+    _blurSpread: 0.25
+    _blurIntensity: 0.3
+    _blurDirections: 0
+  - _name: Strong
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 2
+    _blurMinSpread: 0.5
+    _blurSpread: 0.15
+    _blurIntensity: 0.325
+    _blurDirections: 0
+  - _name: Speed
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 1
+    _blurMinSpread: 0.75
+    _blurSpread: 0
+    _blurIntensity: 0.35
+    _blurDirections: 0
+  - _name: Quality
+    _fillAlpha: 0
+    _downsampleFactor: 2
+    _iterations: 3
+    _blurMinSpread: 0.5
+    _blurSpread: 0.5
+    _blurIntensity: 0.28
+    _blurDirections: 0
+  - _name: Solid 1px
+    _fillAlpha: 0
+    _downsampleFactor: 1
+    _iterations: 1
+    _blurMinSpread: 1
+    _blurSpread: 0
+    _blurIntensity: 1
+    _blurDirections: 2
+  - _name: Solid 2px
+    _fillAlpha: 0
+    _downsampleFactor: 1
+    _iterations: 2
+    _blurMinSpread: 1
+    _blurSpread: 0
+    _blurIntensity: 1
+    _blurDirections: 2
+--- !u!114 &8716064937965754114
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8716064937965754120}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  volumeTrigger: {fileID: 8716064937965754117}
+  volumeLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  stopNaNPropagation: 1
+  finalBlitToCameraTarget: 0
+  antialiasingMode: 0
+  temporalAntialiasing:
+    jitterSpread: 0.75
+    sharpness: 0.25
+    stationaryBlending: 0.95
+    motionBlending: 0.85
+  subpixelMorphologicalAntialiasing:
+    quality: 2
+  fastApproximateAntialiasing:
+    fastMode: 0
+    keepAlpha: 0
+  fog:
+    enabled: 1
+    excludeSkybox: 1
+  debugLayer:
+    lightMeter:
+      width: 512
+      height: 256
+      showCurves: 1
+    histogram:
+      width: 512
+      height: 256
+      channel: 3
+    waveform:
+      exposure: 0.12
+      height: 256
+    vectorscope:
+      size: 256
+      exposure: 0.12
+    overlaySettings:
+      linearDepth: 0
+      motionColorIntensity: 4
+      motionGridSize: 64
+      colorBlindnessType: 0
+      colorBlindnessStrength: 1
+  m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
+  m_ShowToolkit: 1
+  m_ShowCustomSorter: 1
+  breakBeforeColorGrading: 0
+  m_BeforeTransparentBundles: []
+  m_BeforeStackBundles: []
+  m_AfterStackBundles: []
+--- !u!114 &8716064937965754113
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8716064937965754120}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 742a411dd9a26724987a249edeb313b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  userID: 0
+  userName: 
+  roomID: 0
+  isPlayer: 0
+  selfAnimation: {fileID: 0}
+  selfCamera: {fileID: 0}

Assets/GameAssets/Prefebs/Main Camera.prefab.meta

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

Assets/Temp/Scripts/View_Panel2.cs

@@ -218,7 +218,7 @@ public class View_Panel2 : XUIPanel
         roomModelDropdown.onValueChanged.Invoke(0);
 
         CreateSubject();
-        Debug.Log(GlobalFlag.currentUser.role_code);
+        Debug.Log("GlobalFlag.currentUser==" + GlobalFlag.currentUser.role_code);
         switch (GlobalFlag.currentUser.role_code)
         {
             //超级管理员	00
@@ -264,6 +264,7 @@ public class View_Panel2 : XUIPanel
     public void OnJoinRoom(string msg)
     {
         Debug.Log("OnJoinRoom===" + msg);
+        SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
     }
     public async void GetAllRoomData()
     {
@@ -485,10 +486,9 @@ public class View_Panel2 : XUIPanel
             GameMain.model = false;
             //加入房间
             string RoomName = "joinroom " + currentRoomName;
-            Debug.Log(currentRoomName);
             _ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName);
             //SceneManager.LoadScene("Training_pilot_terminal_panl");
-            SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
+
 
         });
         ///进入导调
@@ -541,6 +541,7 @@ public class View_Panel2 : XUIPanel
             Storm_and_capture_panl.gameObject.SetActive(true);
             currentRoomData = await AsyncWebReq.Get<RSData.RoomSubjectData>("http://111.229.30.246:48888/Handler/Practice.ashx?action=querypracticesubject&PracticeId=" + roomItem.name);
             currentRoomName = roomItem.name;
+            GlobalFlag.roomID = roomItem.name;
             Debug.Log(" roomItem.nameID==" + roomItem.name);
             CreateSubjectItem(currentRoomData.data);
         });
@@ -746,7 +747,7 @@ public class View_Panel2 : XUIPanel
                 CreateRoomBase(returnRoomId.data, currentRoomName);
                 //创建房间
                 string RoomName = "createroom " + returnRoomId.data;
-                GlobalFlag.roomID = returnRoomId.data;
+
                 _ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName);
             }
             else

Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity

@@ -917,289 +917,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &90795399
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 90795402}
-  - component: {fileID: 90795401}
-  - component: {fileID: 90795400}
-  - component: {fileID: 90795403}
-  - component: {fileID: 90795404}
-  - component: {fileID: 90795405}
-  - component: {fileID: 90795406}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!81 &90795400
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  m_Enabled: 1
---- !u!20 &90795401
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  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.01
-  far clip plane: 3000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 600
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 0
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &90795402
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  m_LocalRotation: {x: 0.38686386, y: -0.10340534, z: 0.04370654, w: 0.91527784}
-  m_LocalPosition: {x: 114.28273, y: 305.18033, z: -95.789764}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 23, y: 0, z: 0}
---- !u!114 &90795403
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 46e88e8cd30abac4a95b7f37021920b3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  boost: 5
-  positionLerpTime: 0.2
-  mouseSensitivityCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0.5
-      inSlope: 0
-      outSlope: 5
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 1
-      value: 2.5
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  rotationLerpTime: 0.01
-  invertY: 0
---- !u!114 &90795404
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _fillAlpha: 0
-  _downsampleFactor: 4
-  _iterations: 3
-  _blurMinSpread: 0.65
-  _blurSpread: 0.25
-  _blurIntensity: 0.3
-  _blurDirections: 0
-  _blitter: {fileID: 0}
-  _antiAliasing: 0
-  _presets:
-  - _name: Default
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Wide
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 4
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Strong
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.5
-    _blurSpread: 0.15
-    _blurIntensity: 0.325
-    _blurDirections: 0
-  - _name: Speed
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 1
-    _blurMinSpread: 0.75
-    _blurSpread: 0
-    _blurIntensity: 0.35
-    _blurDirections: 0
-  - _name: Quality
-    _fillAlpha: 0
-    _downsampleFactor: 2
-    _iterations: 3
-    _blurMinSpread: 0.5
-    _blurSpread: 0.5
-    _blurIntensity: 0.28
-    _blurDirections: 0
-  - _name: Solid 1px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 1
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
-  - _name: Solid 2px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 2
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
---- !u!114 &90795405
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  volumeTrigger: {fileID: 90795402}
-  volumeLayer:
-    serializedVersion: 2
-    m_Bits: 256
-  stopNaNPropagation: 1
-  finalBlitToCameraTarget: 0
-  antialiasingMode: 0
-  temporalAntialiasing:
-    jitterSpread: 0.75
-    sharpness: 0.25
-    stationaryBlending: 0.95
-    motionBlending: 0.85
-  subpixelMorphologicalAntialiasing:
-    quality: 2
-  fastApproximateAntialiasing:
-    fastMode: 0
-    keepAlpha: 0
-  fog:
-    enabled: 1
-    excludeSkybox: 1
-  debugLayer:
-    lightMeter:
-      width: 512
-      height: 256
-      showCurves: 1
-    histogram:
-      width: 512
-      height: 256
-      channel: 3
-    waveform:
-      exposure: 0.12
-      height: 256
-    vectorscope:
-      size: 256
-      exposure: 0.12
-    overlaySettings:
-      linearDepth: 0
-      motionColorIntensity: 4
-      motionGridSize: 64
-      colorBlindnessType: 0
-      colorBlindnessStrength: 1
-  m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
-  m_ShowToolkit: 1
-  m_ShowCustomSorter: 1
-  breakBeforeColorGrading: 0
-  m_BeforeTransparentBundles: []
-  m_BeforeStackBundles: []
-  m_AfterStackBundles: []
---- !u!114 &90795406
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 90795399}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 742a411dd9a26724987a249edeb313b4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  userID: 0
-  userName: 
-  roomID: 0
-  isPlayer: 0
-  selfAnimation: {fileID: 0}
-  selfCamera: {fileID: 0}
 --- !u!1 &91360180
 GameObject:
   m_ObjectHideFlags: 0
@@ -1316,7 +1033,7 @@ Transform:
   m_LocalScale: {x: 85.66619, y: 85.66619, z: 85.66619}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!1 &135544787 stripped
 GameObject:
@@ -1443,7 +1160,7 @@ RectTransform:
   - {fileID: 284678593}
   - {fileID: 1703180990}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3130,7 +2847,7 @@ PrefabInstance:
     - target: {fileID: -8679921383154817045, guid: 0a7e2330d22eb904d828bb934f7517e5,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 0a7e2330d22eb904d828bb934f7517e5,
         type: 3}
@@ -6519,7 +6236,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1001 &1165536734
 PrefabInstance:
@@ -7350,7 +7067,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c260c07d86b8be64aba997343826b2e9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  playerTransformPrefab: {fileID: 90795406}
+  playerTransformPrefab: {fileID: 8716064937965754113, guid: efe92e3dbc7b77747979793b50eb6456,
+    type: 3}
   spawnPos: {fileID: 1618372688}
   userIds: 
 --- !u!4 &1436809530
@@ -7365,7 +7083,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1436809531
 MonoBehaviour:
@@ -7429,8 +7147,8 @@ MonoBehaviour:
   solidLineMaterial: {fileID: 2100000, guid: 497f92c1eb331f549acf8ff65a57427a, type: 2}
   ployMaterial: {fileID: 2100000, guid: 497f92c1eb331f549acf8ff65a57427a, type: 2}
   tapGesture: {fileID: 1436809532}
-  mCamera: {fileID: 90795401}
+  mCamera: {fileID: 0}
-  simpleCameraController: {fileID: 90795403}
+  simpleCameraController: {fileID: 0}
   wrjManager: {fileID: 1436809531}
   buleInstruct: {fileID: 125837377}
   instructs: []
@@ -8033,7 +7751,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1619882330
 GameObject:
@@ -8177,7 +7895,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1655945865
 PrefabInstance:
@@ -8921,7 +8639,7 @@ RectTransform:
   - {fileID: 1192297517}
   - {fileID: 923388778}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -9156,7 +8874,7 @@ Transform:
   - {fileID: 1095573349}
   - {fileID: 317830998}
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1746513315
 GameObject:
@@ -9378,7 +9096,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1769214933
 PrefabInstance:
@@ -11613,7 +11331,7 @@ Transform:
   - {fileID: 4900298107138641668}
   - {fileID: 4900298105518847837}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4900298106786792355
 GameObject:

Assets/Zion/Scenes/SampleScene.unity

@@ -2996,7 +2996,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &2118805283
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Zion/Scripts/Adam/GameManager.cs

@@ -8,22 +8,30 @@ using UnityEngine.UI;
 
 public class GameManager : MonoBehaviour
 {
-
     public SyncPlayerTransform playerTransformPrefab;
     public Transform spawnPos;
-    public List<int> userIds = new List<int>();
+    public List<ulong> userIds = new List<ulong>();
     // Start is called before the first frame update
-    void Start()
+    private void Start()
     {
         SyncCreateRoom.getroomusersRequset += OnGetRoomUsers;
         SyncCreateRoom.onlineRequset += OnOtherPlayerOnline;
         SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
+        spt.gameObject.SetActive(true);
         spt.gameObject.transform.position = spawnPos.position;
         spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles;
         spt.SetPlayerInfo(ulong.Parse(GlobalFlag.currentUser.user_id), GlobalFlag.currentUser.login_name, ulong.Parse(GlobalFlag.roomID), true);
-        string msg = string.Format("getroomusers ");
+        userIds.Add(ulong.Parse(GlobalFlag.currentUser.user_id));
-        _ = SyncCreateRoom.SendMessageAsync(msg);
+    }
 
+
+    public void Update()
+    {
+        if (Input.GetKeyDown("t"))
+        {
+            string msg = "getroomusers ";
+            _ = SyncCreateRoom.SendMessageAsync(msg);
+        }
     }
 
     public void OnOtherPlayerOnline(string msg)
@@ -40,10 +48,11 @@ public class GameManager : MonoBehaviour
         switch (data[0])
         {
             case "online":
-                int userId = int.Parse(data[1]);
+                ulong userId = ulong.Parse(data[1]);
                 if (!userIds.Contains(userId))
                 {
                     SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
+                    spt.gameObject.SetActive(true);
                     spt.gameObject.transform.position = spawnPos.position;
                     spt.gameObject.transform.eulerAngles = spawnPos.eulerAngles;
                     spt.SetPlayerInfo(ulong.Parse(data[1]), data[2], ulong.Parse(data[3]), false);
@@ -56,6 +65,7 @@ public class GameManager : MonoBehaviour
 
     private void OnGetRoomUsers(string obj)
     {
+        if (string.IsNullOrWhiteSpace(obj)) return;
         string[] data = obj.Split(';');
         Debug.Log("datas=" + data[0]);
         for (int i = 0; i < data.Length; i++)
@@ -63,20 +73,17 @@ public class GameManager : MonoBehaviour
             int index = i;
             string[] userInfo = data[index].Split(',');
             SyncPlayerTransform spt = Instantiate(playerTransformPrefab);
+            spt.gameObject.SetActive(true);
             spt.SetPlayerInfo(ulong.Parse(userInfo[0]), userInfo[1], ulong.Parse(userInfo[2]), false);
             spt.transform.position = new Vector3(spawnPos.position.x + index * 0.5f, spawnPos.position.y, spawnPos.position.z + index * 0.5f);
             spt.transform.eulerAngles = spawnPos.eulerAngles;
-            userIds.Add(int.Parse(userInfo[0]));
+            userIds.Add(ulong.Parse(userInfo[0]));
         }
-        string msg = string.Format("send2room "+ "online");
+        //string msg = string.Format("send2room " + "online");
-        _ = SyncCreateRoom.SendMessageAsync(msg);
+        //_ = SyncCreateRoom.SendMessageAsync(msg);
     }
 
-    // Update is called once per frame
-    void Update()
-    {
 
-    }
 
     public void OnBack()
     {

Assets/Zion/Scripts/Adam/ToolsBootstrap.cs

@@ -44,27 +44,29 @@ public class ToolsBootstrap : MonoBehaviour
     /// <param name="state"></param>
     public void SwitchSet2DMap(int state)
     {
-        simpleCameraController.enabled = false;
+        if (mCamera != null)
-        if (state == 1)
         {
-            buleInstruct.SetActive(false);
+            simpleCameraController.enabled = false;
-            mCamera.transform.position = new Vector3(-118f, 163f, -409f);
+            if (state == 1)
-            mCamera.transform.eulerAngles = new Vector3(23f, 0f, 0f);
+            {
-            mCamera.orthographic = false;
+                buleInstruct.SetActive(false);
-            simpleCameraController.enabled = true;
+                mCamera.transform.position = new Vector3(-118f, 163f, -409f);
-            Switch2DModel(false);
+                mCamera.transform.eulerAngles = new Vector3(23f, 0f, 0f);
-        }
+                mCamera.orthographic = false;
-        else if (state == 2)
+                simpleCameraController.enabled = true;
-        {
+                Switch2DModel(false);
-            buleInstruct.SetActive(true);
+            }
-            mCamera.transform.position = new Vector3(0, 556f, -10f);
+            else if (state == 2)
-            mCamera.transform.eulerAngles = new Vector3(90f, 0f, 0f);
+            {
-            mCamera.orthographic = true;
+                buleInstruct.SetActive(true);
-            Switch2DModel(true);
+                mCamera.transform.position = new Vector3(0, 556f, -10f);
-        }
+                mCamera.transform.eulerAngles = new Vector3(90f, 0f, 0f);
-        else
+                mCamera.orthographic = true;
-        {
+                Switch2DModel(true);
-
+            }
+            else
+            {
+            }
         }
     }
 
@@ -80,14 +82,17 @@ public class ToolsBootstrap : MonoBehaviour
 
     public void SetAttackTargetView()
     {
-        simpleCameraController.enabled = false;
+        if (mCamera != null)
-        mCamera.transform.position = new Vector3(114.282f, 305.2f, -95.7f);
+        {
-        mCamera.transform.eulerAngles = new Vector3(45.8f, -13f, 0f);
+            simpleCameraController.enabled = false;
-        mCamera.orthographic = false;
+            mCamera.transform.position = new Vector3(114.282f, 305.2f, -95.7f);
-        tapGesture.SetLayerMask(1 << 10);
+            mCamera.transform.eulerAngles = new Vector3(45.8f, -13f, 0f);
-        wrjManager.currentWRJ.isAuto = false;
+            mCamera.orthographic = false;
-        wrjManager.wrjMenuSetPanel.gameObject.SetActive(false);
+            tapGesture.SetLayerMask(1 << 10);
-        simpleCameraController.enabled = true;
+            wrjManager.currentWRJ.isAuto = false;
+            wrjManager.wrjMenuSetPanel.gameObject.SetActive(false);
+            simpleCameraController.enabled = true;
+        }
     }
 
     private void Update()

Assets/Zion/Scripts/Adam/UIBootstrap.cs

@@ -52,9 +52,23 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
         }
         if (Input.GetKeyDown("i"))
         {
-            string info = "send2room "+"进入房间";
+            string info = "send2room " + "进入房间";
             Debug.Log(info);
             _ = AdamSync.SyncCreateRoom.SendMessageAsync(info);
         }
     }
+    private void OnDisable()
+    {
+        Debug.Log("OnDisable");
+        AdamSync.SyncCreateRoom.getRoomsRequset -= OnGetRooms;
+        AdamSync.SyncCreateRoom.getroomusersRequset -= OnGetRoomsUsers;
+        AdamSync.SyncCreateRoom.onlineRequset -= OnGetRoomsInfo;
+    }
+    private void OnDestory()
+    {
+        Debug.Log("OnDestory");
+        AdamSync.SyncCreateRoom.getRoomsRequset -= OnGetRooms;
+        AdamSync.SyncCreateRoom.getroomusersRequset -= OnGetRoomsUsers;
+        AdamSync.SyncCreateRoom.onlineRequset -= OnGetRoomsInfo;
+    }
 }

Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs

@@ -31,8 +31,8 @@ namespace AdamSync
             }
             else
             {
-                string palyerJoinRoom = "joinroom " + "";
+                //string palyerJoinRoom = "joinroom " + "";
-                _ = SyncCreateRoom.SendMessageAsync(palyerJoinRoom);
+                //_ = SyncCreateRoom.SendMessageAsync(palyerJoinRoom);
             }
         }
     }

Assets/Zion/Scripts/Adam/Utility/Sync/ContectServer.cs

@@ -12,6 +12,7 @@ namespace AdamSync
         // Start is called before the first frame update
         private async void Awake()
         {
+            Debug.Log("Net");
             DontDestroyOnLoad(gameObject);
             SceneManager.LoadScene("SampleScene");
             //try

Assets/Zion/Scripts/Adam/Utility/Sync/SyncCreateRoom.cs

@@ -59,7 +59,7 @@ namespace AdamSync
 
         public static async Task ReadMessagesAsync(NetworkStream stream, CancellationToken cancellationToken)
         {
-            byte[] buffer = new byte[4096];
+            byte[] buffer = new byte[8192];
             while (!cancellationToken.IsCancellationRequested)
             {
                 try

Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs

@@ -10,16 +10,16 @@ namespace AdamSync
 
         private void Start()
         {
-            SyncCreateRoom.playerInfoRequset += ReceivePlayInfo;
+            //SyncCreateRoom.playerInfoRequset += ReceivePlayInfo;
-            if (isPlayer)
+            //if (isPlayer)
-            {
+            //{
-                StartCoroutine(SendMsg());
+            //    StartCoroutine(SendMsg());
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                //string msg = string.Format("send2room online," + GlobeFlag.userID + "," + GlobeFlag.userName + "," + GlobeFlag.roomID);
+            //    //string msg = string.Format("send2room online," + GlobeFlag.userID + "," + GlobeFlag.userName + "," + GlobeFlag.roomID);
-                //_ = SyncCreateRoom.SendMessageAsync(msg);
+            //    //_ = SyncCreateRoom.SendMessageAsync(msg);
-            }
+            //}
         }
 
         private IEnumerator SendMsg()