neo 1 рік тому
батько
коміт
84ee11cd13
2 змінених файлів з 16 додано та 16 видалено
  1. 9 9
      nodes/game/interface/room.lua
  2. 7 7
      nodes/match/service/srvRoom.lua

+ 9 - 9
nodes/game/interface/room.lua

@@ -36,13 +36,13 @@ function root:room_create_room(role, msg)
36 36
 
37 37
     -- 检查箱子
38 38
     if not boxAdapt:battle_is_box_list_valid(battleBoxList) then
39
-        return code.UNKNOWN
39
+        return code.BATTLE.CREATE_BOX_VALID
40 40
     end
41 41
     -- 对战人数限制
42 42
     local minPlayCount = boxAdapt:battle_const("min_play_count") or 2
43 43
     local maxPlayCount = boxAdapt:battle_const("max_play_count") or 3
44 44
     if playCount < minPlayCount or playCount > maxPlayCount then
45
-        return code.UNKNOWN
45
+        return code.BATTLE.CREATE_PLAY_COUNT_ERR
46 46
     end
47 47
     -- 消耗
48 48
     local price = boxAdapt:battle_get_box_price(battleBoxList)
@@ -82,12 +82,12 @@ function root:room_player_enter(role, msg)
82 82
     local ok = util_match:is_room_exist(roomId)
83 83
     if not ok then
84 84
         -- 房间不存在
85
-        return code.UNKNOWN
85
+        return code.BATTLE.ENTER_ROOM_NOT_EXIST
86 86
     end
87 87
     ok = util_match:enter_room(uid, roomId)
88 88
     if not ok then
89 89
         -- 进入房间失败
90
-        return code.UNKNOWN
90
+        return code.BATTLE.ENTER_PLAYER_EXIST
91 91
     end
92 92
 
93 93
     -- 通知在线玩家
@@ -125,18 +125,18 @@ function root:room_stand_up(role, msg)
125 125
     local roomId = battleData:get_room_id()
126 126
     -- 玩家未进入房间
127 127
     if is_empty(roomId) then
128
-        return code.UNKNOWN
128
+        return code.BATTLE.STAND_NOT_ENTER_ROOM
129 129
     end
130 130
     -- 房间状态
131 131
     local status = util_match:get_room_status(roomId)
132 132
     if status ~= 0 then
133
-        return code.UNKNOWN
133
+        return code.BATTLE.STAND_BATTLE_START
134 134
     end
135 135
     -- 房间是否存在
136 136
     local ok = util_match:stand_up(uid, roomId)
137 137
     if not ok then
138 138
         -- 玩家未坐下
139
-        return code.UNKNOWN
139
+        return code.BATTLE.STAND_NOT_SEAT_DOWN
140 140
     end
141 141
     -- 玩家解绑房间信息 - 且返还房费
142 142
     util_match:unband_room(uid, "seat")
@@ -158,12 +158,12 @@ function root:room_player_leave(role, msg)
158 158
     local roomId = battleData:get_room_id(uid)
159 159
     -- 玩家未进入房间
160 160
     if is_empty(roomId) then
161
-        return code.UNKNOWN
161
+        return code.BATTLE.LEAVE_NOT_ENTER_ROOM
162 162
     end
163 163
     -- 房间状态
164 164
     local status = util_match:get_room_status(roomId)
165 165
     if status > 0 then
166
-        return code.UNKNOWN
166
+        return code.BATTLE.LEAVE_BATTLE_START
167 167
     end
168 168
 
169 169
     -- 通知在线玩家 - 站起

+ 7 - 7
nodes/match/service/srvRoom.lua

@@ -26,19 +26,19 @@ function root.seat_down(uid, roomId, seatId)
26 26
     -- 房间是否存在
27 27
     if not util_match:is_room_exist(roomId) then
28 28
         -- 房间不存在
29
-        util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
29
+        util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_ROOM_NOT_EXIST})
30 30
         return
31 31
     end
32 32
     local seatUid = util_match:get_seat_player(roomId, seatId)
33 33
     if not is_empty(seatUid) then
34 34
         -- 座位已占用
35
-        util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
35
+        util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_PLAYER_EXIST})
36 36
         return
37 37
     end
38 38
     local status = util_match:get_room_status(roomId)
39 39
     if status ~= 0 then
40 40
         -- 房间状态错误
41
-        util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
41
+        util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_BATTLE_START})
42 42
         return
43 43
     end
44 44
     -- 进入房间
@@ -49,12 +49,12 @@ function root.seat_down(uid, roomId, seatId)
49 49
         if roomId == _roomId then
50 50
             -- 相同位置
51 51
             if roomPlayerInfo.seatId == seatId then
52
-                util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
52
+                util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_SAME_PLACE})
53 53
                 return
54 54
             end
55 55
             if not util_match:seat_down(uid, roomId, seatId) then
56 56
                 -- 房间/座位不存在
57
-                util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
57
+                util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_NOT_ENTER_ROOM})
58 58
                 return
59 59
             end
60 60
             -- 未坐下
@@ -77,7 +77,7 @@ function root.seat_down(uid, roomId, seatId)
77 77
         -- 房间状态
78 78
         local status = util_match:get_room_status(_roomId)
79 79
         if status > 0 then
80
-            util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
80
+            util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_BATTLE_START})
81 81
             return
82 82
         end
83 83
 
@@ -105,7 +105,7 @@ function root.seat_down(uid, roomId, seatId)
105 105
     end
106 106
     if not util_match:seat_down(uid, roomId, seatId) then
107 107
         -- 房间/座位不存在
108
-        util_user:user_proto_notify("on_room_seat_down", {code = code.UNKNOWN})
108
+        util_user:user_proto_notify("on_room_seat_down", {code = code.BATTLE.SEAT_NOT_ENTER_ROOM})
109 109
         return
110 110
     end
111 111
     -- 玩家绑定房间信息 - 且消耗道具