diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat index 44f8ade1..846a590c 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat +++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat @@ -32,8 +32,8 @@ Material: - _dispStrength: 1 - _overBright: 1 m_Colors: - - _AmbientTint: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003} + - _AmbientTint: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2} - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1} - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Zion/Scenes/InitConnect.unity b/Assets/Zion/Scenes/InitConnect.unity index a5126104..65d97e7b 100644 --- a/Assets/Zion/Scenes/InitConnect.unity +++ b/Assets/Zion/Scenes/InitConnect.unity @@ -206,6 +206,10 @@ MonoBehaviour: state: message: data: [] + currentRoomData: + state: + message: + data: [] --- !u!1 &2132962757 GameObject: m_ObjectHideFlags: 0 @@ -236,7 +240,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isLinkAgain: 0 - serverIP: 192.168.6.63 + serverIP: 127.0.0.1 port: 12345 --- !u!4 &2132962759 Transform: diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 3a928722..30158b75 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -221,6 +221,8 @@ public class GameManager : MonoSingleton public async void CheckRoomState() { RoomState roomState = await AsyncWebReq.Post("http://111.229.30.246:48888/Handler/Practice.ashx?action=updatestate&Id=" + GlobalFlag.roomID + "&state=1", null); + + Debug.Log($"GamemanagerRoomState={ roomState.message}"); if (roomState.message == "success") { GlobalFlag.isStartRehearsing = true; @@ -353,12 +355,12 @@ public class GameManager : MonoSingleton private void OnDisable() { Debug.Log("OnDisable"); - Reset(); + Leaverroom(); } - private void Reset() + private void Leaverroom() { SyncCreateRoom.getroomusersRequset -= OnGetRoomUsers; SyncCreateRoom.send2roomRequset -= OnRoomInfo;