DGJ преди 1 година
родител
ревизия
e4478dda28

+ 1 - 0
Assets/Game/Blue/Service/ILoginService.cs

@@ -26,6 +26,7 @@ namespace GHZLangChao
 
         private IEnumerator LoginImitate()
         {
+            UICallManager.Instance.MachineRoomInit(""); // 初始化
             yield return new WaitForSeconds(0.1f);
             this.SendEvent<LoginSuccessEvent>();
         }

+ 2 - 1
Assets/Game/ShowChoose/ChooseManager.cs

@@ -16,12 +16,13 @@ public class ChooseManager : MonoBehaviour
 
     public void GotoXunJian()
     {
-
+        Debug.Log("DGJ   =====>GotoXunJian ");
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowXunJian);
     }
 
     public void GotoSupport()
     {
+        Debug.Log("DGJ   =====>GotoSupport ");
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowRTC);
     }
 

+ 2 - 1
Assets/Game/ShowLogin/LangChaoLogin.cs

@@ -18,7 +18,8 @@ namespace GHZLangChao
 
         private void LoginSuccess(LoginSuccessEvent e)
         {
-            UICallManager.Instance.MachineRoomInit(""); // 初始化
+            
+          
 
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         }

+ 106 - 3
Assets/Scenes/LangChaoDemo2.unity

@@ -2658,6 +2658,103 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1920, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &251655434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 251655438}
+  - component: {fileID: 251655437}
+  - component: {fileID: 251655436}
+  - component: {fileID: 251655435}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!65 &251655435
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 251655434}
+  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 &251655436
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 251655434}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: fc1b6cd8da653e3448dcdb722ada2ebc, 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
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &251655437
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 251655434}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &251655438
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 251655434}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 2, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 39
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &258612956
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2665,6 +2762,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 102144601}
     m_Modifications:
+    - target: {fileID: 604547950963967445, guid: 1f19c6a2eb9f83340a868c4c9fd2d104, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 604547950963967446, guid: 1f19c6a2eb9f83340a868c4c9fd2d104, type: 3}
       propertyPath: m_LocalRotation.w
       value: 0
@@ -2755,7 +2856,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 604547952892512393, guid: 1f19c6a2eb9f83340a868c4c9fd2d104, type: 3}
       propertyPath: m_CullingMask.m_Bits
-      value: 2568
+      value: 2147483647
       objectReference: {fileID: 0}
     - target: {fileID: 604547952892512398, guid: 1f19c6a2eb9f83340a868c4c9fd2d104, type: 3}
       propertyPath: m_IsActive
@@ -12852,6 +12953,8 @@ MonoBehaviour:
   rightLine: {fileID: 0}
   isDataInit: 0
   listRoomName: []
+  zhezhao: {fileID: 0}
+  listZheZhao: []
   listObjes: []
 --- !u!1 &1016915732
 GameObject:
@@ -18472,7 +18575,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1564295166}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5eb3897621f42f24c84f2bb9119a2097, type: 3}
+  m_Script: {fileID: 11500000, guid: ccfb359ce40a63e459fd70f7152ab8bd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!4 &1564295168
@@ -20250,7 +20353,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1803535594}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ccfb359ce40a63e459fd70f7152ab8bd, type: 3}
   m_Name: 

+ 1 - 1
Assets/Scripts/UICallManager.cs

@@ -321,7 +321,7 @@ public class UICallManager : MonoSingleton<UICallManager>
     public void MachineRoomInit( string msg)
     {
 
-
+        Debug.Log("DGJ  ===>  MachineRoomInit  ");
 
         MachineRoomManager.Instance.Init();
     }