Skip to content

Commit 138cd33

Browse files
TastSongTastSong
committed
match room ui
1 parent 29275e2 commit 138cd33

File tree

4 files changed

+57
-11
lines changed

4 files changed

+57
-11
lines changed

‎CrazyCar/Assets/Prefabs/Match/Player.prefab

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ MonoBehaviour:
6868
m_Calls: []
6969
m_FontData:
7070
m_Font: {fileID: 12800000, guid: e3dd0e5a4752b4540bb4803f4f043eae, type: 3}
71-
m_FontSize: 14
72-
m_FontStyle: 0
71+
m_FontSize: 24
72+
m_FontStyle: 1
7373
m_BestFit: 0
74-
m_MinSize: 10
74+
m_MinSize: 2
7575
m_MaxSize: 40
7676
m_Alignment: 4
7777
m_AlignByGeometry: 0
7878
m_RichText: 1
7979
m_HorizontalOverflow: 1
8080
m_VerticalOverflow: 1
8181
m_LineSpacing: 1
82-
m_Text: .....
82+
m_Text: Test
8383
--- !u!1 &6089250482278913722
8484
GameObject:
8585
m_ObjectHideFlags: 0

‎CrazyCar/Assets/Scenes/Login.unity

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4021,6 +4021,37 @@ CanvasRenderer:
40214021
m_PrefabAsset: {fileID: 0}
40224022
m_GameObject: {fileID: 1915218733}
40234023
m_CullTransparentMesh: 0
4024+
--- !u!1 &1917019765
4025+
GameObject:
4026+
m_ObjectHideFlags: 0
4027+
m_CorrespondingSourceObject: {fileID: 0}
4028+
m_PrefabInstance: {fileID: 0}
4029+
m_PrefabAsset: {fileID: 0}
4030+
serializedVersion: 6
4031+
m_Component:
4032+
- component: {fileID: 1917019766}
4033+
m_Layer: 0
4034+
m_Name: New Game Object
4035+
m_TagString: Untagged
4036+
m_Icon: {fileID: 0}
4037+
m_NavMeshLayer: 0
4038+
m_StaticEditorFlags: 0
4039+
m_IsActive: 1
4040+
--- !u!4 &1917019766
4041+
Transform:
4042+
m_ObjectHideFlags: 0
4043+
m_CorrespondingSourceObject: {fileID: 0}
4044+
m_PrefabInstance: {fileID: 0}
4045+
m_PrefabAsset: {fileID: 0}
4046+
m_GameObject: {fileID: 1917019765}
4047+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4048+
m_LocalPosition: {x: 0, y: 0, z: 0}
4049+
m_LocalScale: {x: 1, y: 1, z: 1}
4050+
m_ConstrainProportionsScale: 0
4051+
m_Children: []
4052+
m_Father: {fileID: 0}
4053+
m_RootOrder: 7
4054+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
40244055
--- !u!1 &1996475885
40254056
GameObject:
40264057
m_ObjectHideFlags: 0

‎CrazyCar/Assets/Scripts/System/MatchRoomSystem.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void MatchRoomCreate() {
4343
w.WritePropertyName("uid");
4444
w.Write(this.GetModel<IUserModel>().Uid);
4545
w.WriteObjectEnd();
46-
Debug.LogError("MatchRoomCreate : " + sb.ToString());
46+
Debug.Log("MatchRoomCreate : " + sb.ToString());
4747
this.GetSystem<IWebSocketSystem>().SendMsgToServer(sb.ToString());
4848
});
4949
}
@@ -67,7 +67,7 @@ public void MatchRoomJoin() {
6767
w.WritePropertyName("uid");
6868
w.Write(this.GetModel<IUserModel>().Uid);
6969
w.WriteObjectEnd();
70-
Debug.LogError("MatchRoomJoin : " + sb.ToString());
70+
Debug.Log("MatchRoomJoin : " + sb.ToString());
7171
this.GetSystem<IWebSocketSystem>().SendMsgToServer(sb.ToString());
7272
});
7373
}
@@ -85,7 +85,7 @@ public void MatchRoomStatus() {
8585
w.WritePropertyName("uid");
8686
w.Write(this.GetModel<IUserModel>().Uid);
8787
w.WriteObjectEnd();
88-
Debug.LogError("MatchRoomStatus : " + sb.ToString());
88+
Debug.Log("MatchRoomStatus : " + sb.ToString());
8989
this.GetSystem<IWebSocketSystem>().SendMsgToServer(sb.ToString());
9090
}
9191

@@ -110,13 +110,13 @@ public void MatchRoomStart() {
110110
w.WritePropertyName("start_time");
111111
w.Write(Util.GetTime() / 1000 + 30);
112112
w.WriteObjectEnd();
113-
Debug.LogError("MatchRoomStart : " + sb.ToString());
113+
Debug.Log("MatchRoomStart : " + sb.ToString());
114114
this.GetSystem<IWebSocketSystem>().SendMsgToServer(sb.ToString());
115115
}
116116

117117
public void OnCreateMsg(JsonData recJD) {
118118
int code = (int)recJD["code"];
119-
Debug.LogError("OnCreateMsg = " + code);
119+
Debug.Log("OnCreateMsg = " + code);
120120
if (code == 200) {
121121
this.GetModel<IMatchModel>().IsHouseOwner = true;
122122
this.SendEvent<MatchRoomCreateOrJoinSuccEvent>();
@@ -135,7 +135,7 @@ public void OnExitMsg(JsonData recJD) {
135135

136136
public void OnJoinMsg(JsonData recJD) {
137137
int code = (int)recJD["code"];
138-
Debug.LogError("OnJoinMsg = " + recJD.ToJson());
138+
Debug.Log("OnJoinMsg = " + recJD.ToJson());
139139
if (code == 200) {
140140
this.GetModel<IMatchModel>().IsHouseOwner = false;
141141
this.SendEvent<MatchRoomCreateOrJoinSuccEvent>();
@@ -150,7 +150,7 @@ public void OnJoinMsg(JsonData recJD) {
150150

151151
public void OnStatusMsg(JsonData recJD) {
152152
int code = (int)recJD["code"];
153-
Debug.LogError("OnStatusMsg = " + recJD.ToJson());
153+
Debug.Log("OnStatusMsg = " + recJD.ToJson());
154154
if (code == 200) {
155155
JsonData players = recJD["players"];
156156
var infos = this.GetModel<IMatchModel>().MemberInfoDic;

‎CrazyCarServer/src/main/java/CrazyCarServer/MatchRoomWebSocket.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,21 @@ public void sendToUser(String message, String roomId) {
208208
@OnError
209209
public void onError(Session session, Throwable error) {
210210
System.out.println("发生错误");
211+
if (webSocketSet.containsKey(id)) {
212+
webSocketSet.remove(id);
213+
if (MatchRoomWebSocket.roomMap.containsKey(roomId)){
214+
for(int i = 0;i < MatchRoomWebSocket.roomMap.get(roomId).size(); i ++){
215+
if(MatchRoomWebSocket.roomMap.get(roomId).get(i).uid == curUid){
216+
MatchRoomWebSocket.roomMap.get(roomId).remove(i);
217+
if(MatchRoomWebSocket.roomMap.get(roomId).size() == 0){
218+
MatchRoomWebSocket.roomMap.remove(roomId);
219+
}
220+
break;
221+
}
222+
}
223+
}
224+
subOnlineCount();
225+
}
211226
error.printStackTrace();
212227
}
213228

0 commit comments

Comments
 (0)