Skip to content

Commit ebf43ad

Browse files
TastSongTastSong
committed
fin match room
1 parent 13a7913 commit ebf43ad

File tree

4 files changed

+47
-65
lines changed

4 files changed

+47
-65
lines changed

‎CrazyCar/Assets/Resources/Pages/MatchRoomUI.prefab

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ GameObject:
266266
m_Icon: {fileID: 0}
267267
m_NavMeshLayer: 0
268268
m_StaticEditorFlags: 0
269-
m_IsActive: 1
269+
m_IsActive: 0
270270
--- !u!224 &227309175312426105
271271
RectTransform:
272272
m_ObjectHideFlags: 0
@@ -1087,8 +1087,8 @@ RectTransform:
10871087
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10881088
m_AnchorMin: {x: 0, y: 0}
10891089
m_AnchorMax: {x: 1, y: 1}
1090-
m_AnchoredPosition: {x: 0, y: 0}
1091-
m_SizeDelta: {x: 0, y: 0}
1090+
m_AnchoredPosition: {x: -2.7299042, y: 0}
1091+
m_SizeDelta: {x: -58.0145, y: 0}
10921092
m_Pivot: {x: 0.5, y: 0.5}
10931093
--- !u!222 &227309175729713920
10941094
CanvasRenderer:
@@ -1122,14 +1122,14 @@ MonoBehaviour:
11221122
m_Font: {fileID: 12800000, guid: 7f47410f368bf40f4b4be4929906c9c9, type: 3}
11231123
m_FontSize: 36
11241124
m_FontStyle: 0
1125-
m_BestFit: 0
1126-
m_MinSize: 0
1127-
m_MaxSize: 50
1125+
m_BestFit: 1
1126+
m_MinSize: 10
1127+
m_MaxSize: 36
11281128
m_Alignment: 4
11291129
m_AlignByGeometry: 0
11301130
m_RichText: 1
1131-
m_HorizontalOverflow: 1
1132-
m_VerticalOverflow: 1
1131+
m_HorizontalOverflow: 0
1132+
m_VerticalOverflow: 0
11331133
m_LineSpacing: 1
11341134
m_Text: "\u8BF7\u8F93\u51654\u4F4D\u6570\u623F\u95F4\u53F7"
11351135
--- !u!114 &227309175729713921
@@ -1790,7 +1790,7 @@ MonoBehaviour:
17901790
m_SelectOnDown: {fileID: 0}
17911791
m_SelectOnLeft: {fileID: 0}
17921792
m_SelectOnRight: {fileID: 0}
1793-
m_Transition: 3
1793+
m_Transition: 1
17941794
m_Colors:
17951795
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
17961796
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -1811,7 +1811,7 @@ MonoBehaviour:
18111811
m_SelectedTrigger: Selected
18121812
m_DisabledTrigger: Disabled
18131813
m_Interactable: 1
1814-
m_TargetGraphic: {fileID: 0}
1814+
m_TargetGraphic: {fileID: 227309176056240359}
18151815
m_OnClick:
18161816
m_PersistentCalls:
18171817
m_Calls: []
@@ -2682,9 +2682,9 @@ RectTransform:
26822682
m_Father: {fileID: 227309175593416842}
26832683
m_RootOrder: 1
26842684
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2685-
m_AnchorMin: {x: 0, y: 0}
2686-
m_AnchorMax: {x: 0, y: 0}
2687-
m_AnchoredPosition: {x: 0, y: 0}
2685+
m_AnchorMin: {x: 0, y: 1}
2686+
m_AnchorMax: {x: 0, y: 1}
2687+
m_AnchoredPosition: {x: 400.0001, y: -90}
26882688
m_SizeDelta: {x: 160, y: 108}
26892689
m_Pivot: {x: 0.5, y: 0.5}
26902690
--- !u!222 &227309176943480741
@@ -2861,7 +2861,7 @@ MonoBehaviour:
28612861
m_SelectOnDown: {fileID: 0}
28622862
m_SelectOnLeft: {fileID: 0}
28632863
m_SelectOnRight: {fileID: 0}
2864-
m_Transition: 3
2864+
m_Transition: 1
28652865
m_Colors:
28662866
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
28672867
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -2882,7 +2882,7 @@ MonoBehaviour:
28822882
m_SelectedTrigger: Selected
28832883
m_DisabledTrigger: Disabled
28842884
m_Interactable: 1
2885-
m_TargetGraphic: {fileID: 0}
2885+
m_TargetGraphic: {fileID: 1206956903418930336}
28862886
m_OnClick:
28872887
m_PersistentCalls:
28882888
m_Calls: []
@@ -3358,7 +3358,6 @@ GameObject:
33583358
- component: {fileID: 4135002128903941661}
33593359
- component: {fileID: 4135002128917388060}
33603360
- component: {fileID: 4135002128917388061}
3361-
- component: {fileID: 227309176746144434}
33623361
m_Layer: 5
33633362
m_Name: CreateRoomUI
33643363
m_TagString: Untagged
@@ -3421,30 +3420,6 @@ CanvasRenderer:
34213420
m_PrefabAsset: {fileID: 0}
34223421
m_GameObject: {fileID: 4135002128917388063}
34233422
m_CullTransparentMesh: 1
3424-
--- !u!114 &227309176746144434
3425-
MonoBehaviour:
3426-
m_ObjectHideFlags: 0
3427-
m_CorrespondingSourceObject: {fileID: 0}
3428-
m_PrefabInstance: {fileID: 0}
3429-
m_PrefabAsset: {fileID: 0}
3430-
m_GameObject: {fileID: 4135002128917388063}
3431-
m_Enabled: 1
3432-
m_EditorHideFlags: 0
3433-
m_Script: {fileID: 11500000, guid: 5116887a62b1642eebeeced80576e354, type: 3}
3434-
m_Name:
3435-
m_EditorClassIdentifier:
3436-
moveAnimType: 0
3437-
moveAnimInfos:
3438-
- direction: 2
3439-
moveDistance: 144
3440-
target: {fileID: 227309175519795725}
3441-
- direction: 0
3442-
moveDistance: 144
3443-
target: {fileID: 1206956902806248562}
3444-
- direction: 1
3445-
moveDistance: 144
3446-
target: {fileID: 7223548206439793774}
3447-
duration: 0.2
34483423
--- !u!1 &4410424219378362291
34493424
GameObject:
34503425
m_ObjectHideFlags: 0
@@ -3962,7 +3937,7 @@ MonoBehaviour:
39623937
m_SelectOnDown: {fileID: 0}
39633938
m_SelectOnLeft: {fileID: 0}
39643939
m_SelectOnRight: {fileID: 0}
3965-
m_Transition: 3
3940+
m_Transition: 1
39663941
m_Colors:
39673942
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
39683943
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -3983,7 +3958,7 @@ MonoBehaviour:
39833958
m_SelectedTrigger: Selected
39843959
m_DisabledTrigger: Disabled
39853960
m_Interactable: 1
3986-
m_TargetGraphic: {fileID: 0}
3961+
m_TargetGraphic: {fileID: 7223548206918171836}
39873962
m_OnClick:
39883963
m_PersistentCalls:
39893964
m_Calls: []
@@ -4118,7 +4093,7 @@ PrefabInstance:
41184093
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41194094
type: 3}
41204095
propertyPath: m_AnchorMax.y
4121-
value: 0
4096+
value: 1
41224097
objectReference: {fileID: 0}
41234098
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41244099
type: 3}
@@ -4128,7 +4103,7 @@ PrefabInstance:
41284103
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41294104
type: 3}
41304105
propertyPath: m_AnchorMin.y
4131-
value: 0
4106+
value: 1
41324107
objectReference: {fileID: 0}
41334108
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41344109
type: 3}
@@ -4178,12 +4153,12 @@ PrefabInstance:
41784153
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41794154
type: 3}
41804155
propertyPath: m_AnchoredPosition.x
4181-
value: 0
4156+
value: 259.91003
41824157
objectReference: {fileID: 0}
41834158
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41844159
type: 3}
41854160
propertyPath: m_AnchoredPosition.y
4186-
value: 0
4161+
value: -90
41874162
objectReference: {fileID: 0}
41884163
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
41894164
type: 3}
@@ -4255,7 +4230,7 @@ PrefabInstance:
42554230
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
42564231
type: 3}
42574232
propertyPath: m_AnchorMax.y
4258-
value: 0
4233+
value: 1
42594234
objectReference: {fileID: 0}
42604235
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
42614236
type: 3}
@@ -4265,7 +4240,7 @@ PrefabInstance:
42654240
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
42664241
type: 3}
42674242
propertyPath: m_AnchorMin.y
4268-
value: 0
4243+
value: 1
42694244
objectReference: {fileID: 0}
42704245
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
42714246
type: 3}
@@ -4315,12 +4290,12 @@ PrefabInstance:
43154290
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
43164291
type: 3}
43174292
propertyPath: m_AnchoredPosition.x
4318-
value: 0
4293+
value: 540.09015
43194294
objectReference: {fileID: 0}
43204295
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
43214296
type: 3}
43224297
propertyPath: m_AnchoredPosition.y
4323-
value: 0
4298+
value: -90
43244299
objectReference: {fileID: 0}
43254300
- target: {fileID: 6089250482449875506, guid: b3904004b4fd6964a9892798f17376a4,
43264301
type: 3}

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,22 @@ public void MatchRoomEixt() {
5454

5555
public void MatchRoomJoin() {
5656
MatchRoomConnect();
57-
StringBuilder sb = new StringBuilder();
58-
JsonWriter w = new JsonWriter(sb);
59-
w.WriteObjectStart();
60-
w.WritePropertyName("msg_type");
61-
w.Write((int)MsgType.MatchRoomCreate);
62-
w.WritePropertyName("timestamp");
63-
w.Write(Util.GetTime());
64-
w.WritePropertyName("room_id");
65-
w.Write(this.GetModel<IMatchModel>().RoomId);
66-
w.WritePropertyName("uid");
67-
w.Write(this.GetModel<IUserModel>().Uid);
68-
w.WriteObjectEnd();
69-
Debug.LogError("MatchRoomJoin : " + sb.ToString());
70-
this.GetSystem<IWebSocketSystem>().SendMsgToServer(sb.ToString());
57+
Util.DelayExecuteWithSecond(1.4f, () => {
58+
StringBuilder sb = new StringBuilder();
59+
JsonWriter w = new JsonWriter(sb);
60+
w.WriteObjectStart();
61+
w.WritePropertyName("msg_type");
62+
w.Write((int)MsgType.MatchRoomJoin);
63+
w.WritePropertyName("timestamp");
64+
w.Write(Util.GetTime());
65+
w.WritePropertyName("room_id");
66+
w.Write(this.GetModel<IMatchModel>().RoomId);
67+
w.WritePropertyName("uid");
68+
w.Write(this.GetModel<IUserModel>().Uid);
69+
w.WriteObjectEnd();
70+
Debug.LogError("MatchRoomJoin : " + sb.ToString());
71+
this.GetSystem<IWebSocketSystem>().SendMsgToServer(sb.ToString());
72+
});
7173
}
7274

7375
public void MatchRoomStatus() {

‎CrazyCar/Assets/Scripts/UI/Match/MatchRoomUI.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class MatchRoomUI : MonoBehaviour, IController {
1515
private void OnEnable() {
1616
createBtn.interactable = true;
1717
joinBtn.interactable = true;
18+
inputField.text = "";
1819
statusUI.gameObject.SetActiveFast(false);
1920
}
2021

@@ -47,6 +48,9 @@ private void Start() {
4748
}
4849

4950
private void OnMatchRoomCreateOrJoinSucc(MatchRoomCreateOrJoinSuccEvent e) {
51+
inputField.text = "";
52+
createBtn.interactable = true;
53+
joinBtn.interactable = true;
5054
statusUI.gameObject.SetActiveFast(true);
5155
}
5256

‎CrazyCarDB/CrazyCar.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ create table if not exists `match_class`(
400400
`cid` int unsigned auto_increment,
401401
`star` int not null, /*同Star*/
402402
`map_id` int not null,
403-
`room_id` VARCHAR(40) not null,
403+
`room_id` VARCHAR(40),
404404
`limit_time` int not null,
405405
`class_name` VARCHAR(40) not null,
406406
`times` int not null,
@@ -415,6 +415,7 @@ insert into match_class (star, map_id, room_id, limit_time, class_name, times, s
415415
values
416416
(1, 1, '0011', 70, "几何风光", 3, 1633519472, 1633519472);
417417
select cid from match_class where room_id = '0011' and start_time = 1633519472;
418+
insert into match_class (star, map_id, room_id, limit_time, class_name, times, start_time, enroll_time) values (2, 0, "1121",120, "TastSong", 1, 1652146822, 1652146792);
418419
select* from match_class;
419420

420421
/*match_record*/

0 commit comments

Comments
 (0)