移动

Assets/GameAssets/Toolset/XFrame/Example/Scripts/Manager/GameMain.cs

@@ -14,6 +14,7 @@ public class GameMain : MonoBehaviour {
     public static bool model =false;
     public static bool tiao =true;
     public static bool visit = false;
+    public static bool skip = true;
     private void Start()
     {
         GameObject.Find("UIRoot1").SetActive(false);

Assets/Resources/UIPanel/Training_pilot_panl.prefab

@@ -590,6 +590,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5F00\u59CB\u63A8\u6F14"
+--- !u!1 &624020513036876333
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6708533476933354608}
+  - component: {fileID: 2860036571858398482}
+  - component: {fileID: 8091933020044678664}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6708533476933354608
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 624020513036876333}
+  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: 5855821741515730287}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -97.9, y: 0}
+  m_SizeDelta: {x: 140, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2860036571858398482
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 624020513036876333}
+  m_CullTransparentMesh: 0
+--- !u!114 &8091933020044678664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 624020513036876333}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9622642, g: 0.9395693, b: 0.9395693, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5F00\u59CB\u6F14\u7EC3"
 --- !u!1 &2664863769300752706
 GameObject:
   m_ObjectHideFlags: 0
@@ -1248,6 +1326,7 @@ RectTransform:
   - {fileID: 5855821741812748369}
   - {fileID: 5855821741593404593}
   - {fileID: 5855821741361037919}
+  - {fileID: 6708533476933354608}
   m_Father: {fileID: 5855821741811488939}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resources/model/石块8.prefab

@@ -111,7 +111,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 75f73a7e7a437e941a6dd73c2db32a79, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  slider: {fileID: 0}
+  number: 
+  slider: {fileID: 3685411069112664631}
 --- !u!1001 &5515017896990763470
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -247,3 +248,15 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5515017896990763470}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &3685411069112664631 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 9199853869177154553, guid: 7017c7b79d757504f854be4ac64f5fb0,
+    type: 3}
+  m_PrefabInstance: {fileID: 5515017896990763470}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/StreamingAssets/MainSetting.txt

@@ -1 +1 @@
-serverIP=172.16.1.105
+serverIP=172.16.1.114

Assets/StreamingAssets/confing.txt

@@ -1 +1 @@
-172.16.1.105
+172.16.1.114

Assets/Temp/Scripts/Secondarymovement.cs

@@ -13,6 +13,13 @@ public class Secondarymovement : MonoBehaviour
     private float time1 = 3;
     private float timer = 0;
     private Coroutine myCoroutine;
+    void Awake()
+    {
+        if (GameMain.skip ==false)
+        {
+            transform.gameObject.GetComponent<Secondarymovement>().enabled = false;
+        }
+    }
     void Start()
     {
         secondarymovements.Add(this);

Assets/Temp/Scripts/View_Panel2.cs

@@ -269,6 +269,7 @@ public class View_Panel2 : XUIPanel
         MyNetMQClient.instance._netMqListener.SubTopic(GlobalFlag.roomID);
         if (GlobalFlag.field_Char1 == "学校")
         {
+            GameMain.skip = false;
             SceneLoad.Instance.SceneChange("AdamTraining_pilot_terminal_panl 1");
 
             //SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
@@ -277,6 +278,7 @@ public class View_Panel2 : XUIPanel
         }
         else if (GlobalFlag.field_Char1 == "山地")
         {
+            GameMain.skip = false;
             SceneLoad.Instance.SceneChange("AdamTraining_pilot_terminal_panl 3");
             //SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 3");
             //View_Panel2Attatch.view_Panel2Attatch.StartCoroutine(View_Panel2Attatch.view_Panel2Attatch.Loadscene("AdamTraining_pilot_terminal_panl 3"));
@@ -554,6 +556,7 @@ public class View_Panel2 : XUIPanel
         ///想定编辑
         scenario_btn.onClick.AddListener(() =>
         {
+            GameMain.skip = true;
             SceneLoad.Instance.SceneChange("Contingenc_yediting_panl");
             //SceneManager.LoadScene("Contingenc_yediting_panl");
         });

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.16234669, g: 0.305964, b: 0.66810375, a: 1}
+  m_IndirectSpecularColor: {r: 0.1623297, g: 0.30608305, b: 0.66887206, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -71443,7 +71443,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 399728328
+  randSeed: 80512609
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574
@@ -100096,7 +100096,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 17, y: 16}
+  m_SizeDelta: {x: 16, y: 2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6368481658622910619
 MonoBehaviour:
@@ -100117,7 +100117,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a2d1dd9b90bfdb418c5d4d37afa0058, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 21b98a85bb9ca4643bbe9cc7c36aae8a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -100170,7 +100170,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 16, y: 2}
+  m_SizeDelta: {x: 17, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6368481658713299309
 MonoBehaviour:
@@ -100191,7 +100191,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 21b98a85bb9ca4643bbe9cc7c36aae8a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1a2d1dd9b90bfdb418c5d4d37afa0058, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1