蓝色星空 1 year ago
parent
commit
efccfef4b6

+ 3 - 5
Assets/Game/ShowChoose/ChooseManager.cs

@@ -13,8 +13,8 @@ public class ChooseManager : MonoBehaviour,IController
     private IQueueSystem mQueueSystem;
     void Awake()
     {
-       // transform.localPosition = new Vector3(0,0,500f);
-        StartCoroutine(ControlTip());
+        // transform.localPosition = new Vector3(0,0,500f);
+        Invoke("ControlTip",3);
         ShowDevice.SetActive(true);
 
         ShowHide_Toggle.onValueChanged.AddListener(ShowHideLevel3);
@@ -52,10 +52,8 @@ public class ChooseManager : MonoBehaviour,IController
         BladeServerManager.Instance.isDaoHang = true;
     }
 
-    private IEnumerator ControlTip()
+    private void ControlTip()
     {
-        Tip.SetActive(true);
-        yield return new WaitForSeconds(3);
         Tip.SetActive(false);
     }
 

+ 4 - 4
Assets/Game/ShowChoose/ShowChoose.prefab

@@ -2673,7 +2673,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4294177779
   m_fontColor: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -2686,7 +2686,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -2717,7 +2717,7 @@ MonoBehaviour:
   checkPaddingRequired: 0
   m_isRichText: 1
   m_parseCtrlCharacters: 1
-  m_isOrthographic: 0
+  m_isOrthographic: 1
   m_isCullingEnabled: 0
   m_horizontalMapping: 0
   m_verticalMapping: 0
@@ -3346,7 +3346,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3779195109198954011
 RectTransform:
   m_ObjectHideFlags: 0

+ 99 - 3
Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -2326,6 +2326,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 1680626387826341901}
+        m_TargetAssemblyTypeName: GHZLangChao.StartXunJian, Assembly-CSharp
+        m_MethodName: back
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &2868682805589335164
 GameObject:
   m_ObjectHideFlags: 0
@@ -3825,7 +3837,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1747231391923182931}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 4432301762418485245}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4286795572442301046
 GameObject:
   m_ObjectHideFlags: 0
@@ -9081,42 +9105,114 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -200
       objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
+      objectReference: {fileID: 4432301762418485245}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+      value: 
       objectReference: {fileID: 1680626387826341901}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: SetActive
+      objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
       value: End
       objectReference: {fileID: 0}
     - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: UnityEngine.GameObject, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
       value: GHZLangChao.StartXunJian, Assembly-CSharp
       objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2801564913960114947, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 4097044596298465705, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 264
       objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
+      objectReference: {fileID: 4432301762418485245}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
+      value: 
       objectReference: {fileID: 1680626387826341901}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: SetActive
+      objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
       value: End
       objectReference: {fileID: 0}
     - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: UnityEngine.GameObject, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
       value: GHZLangChao.StartXunJian, Assembly-CSharp
       objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4285441740163874500, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 4545954292119370596, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_text
       value: "\u5B8C\u6210"
@@ -13857,7 +13953,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7281372740226316556, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7281372740226316556, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
@@ -13969,7 +14065,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 8872112054106962604, guid: 7a90b1574b243db46a13f4c5243925bf, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument

+ 2 - 2
Assets/Game/ShowXunJian/StartXunJian.cs

@@ -36,8 +36,8 @@ namespace GHZLangChao
             transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
             Transform Player = OpenXRCamera.Instance.head;
             Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
-            transform.position = OpenXRCamera.Instance.head.position + Player.forward * 1.8f;
-            transform.position = new Vector3(transform.position.x, y, transform.position.z);
+            transform.position = OpenXRCamera.Instance.head.position + Player.forward * 2.5f;
+            transform.position = new Vector3(transform.position.x, y+0.65f, transform.position.z);
         }
         public void Next()
         {