liuqilin преди 7 години
родител
ревизия
017d810147
променени са 4 файла, в които са добавени 9 реда и са изтрити 10 реда
  1. 3 2
      Assets/Resource/Logo.unity
  2. 2 2
      Assets/Script/SFS/Manager/BaseConnector.cs
  3. 4 4
      Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs
  4. 0 2
      第四期.txt

+ 3 - 2
Assets/Resource/Logo.unity

@@ -445,9 +445,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
+  DebugMode: 1
   CatchException: 0
-  DebugModeGo: {fileID: 0}
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/Script/SFS/Manager/BaseConnector.cs

@@ -9,8 +9,8 @@ public abstract class BaseConnector
     public GardenSmartFox GardenSmartFox;
 
     public static int TcpPort = 9933;
-    public static string Host = "121.199.20.79";
-    //public static string Host = "127.0.0.1";
+    //public static string Host = "121.199.20.79";
+    public static string Host = "127.0.0.1";
     public static string Zone = "GardenTest";
 
     public Action<BaseEvent> onConnectSucceed;

+ 4 - 4
Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -225,7 +225,7 @@ public class SFSPlazaRoomManager
             }
         );
 
-        JoinRoomCoroutine = DelayCall.Call(20f, () => { OnJoinPlazaRoomError(JoinRoomResult.Unknown); });
+        JoinRoomCoroutine = DelayCall.Call(5f, () => { OnJoinPlazaRoomError(JoinRoomResult.Unknown); });
     }
 
     public void TryEnterPlazaRoom()
@@ -246,15 +246,15 @@ public class SFSPlazaRoomManager
 
             if (JoinRoomResult == JoinRoomResult.RoomFullError)
             {
-                Bubble.Show(null, Language.GetStr("UI", "Z_RoomFull"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG(); }, null, false);
+                Bubble.Show(null, Language.GetStr("UI", "Z_RoomFull"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG(); ManaAudio.MusicTheme.TweenForAudio(); }, null, false);
             }
             else if (JoinRoomResult == JoinRoomResult.RoomExpireError)
             {
-                Bubble.Show(null, Language.GetStr("UI", "Z_RoomExpire"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG(); }, null, false);
+                Bubble.Show(null, Language.GetStr("UI", "Z_RoomExpire"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG(); ManaAudio.MusicTheme.TweenForAudio(); }, null, false);
             }
             else
             {
-                Bubble.Show(null, Language.GetStr("UI", "Z_Unknown"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG(); }, null, false);
+                Bubble.Show(null, Language.GetStr("UI", "Z_Unknown"), null, null, () => { ManaReso.Get("V_BlackMask").TweenForCG(); ManaAudio.MusicTheme.TweenForAudio(); }, null, false);
             }
         }
     }

+ 0 - 2
第四期.txt

@@ -1,7 +1,5 @@
 机器人最大个数有Bug
 
-进入房间黑屏后退出没有音效了
-
 开启公告
 
 过一段时间数据库会关闭的问题