Commit ee168ba8517e04a4b38aed6c944591e7b451c235
1 parent
f4c28991
Exists in
master
提交DDT
Showing
2 changed files
with
1 additions
and
260 deletions
Show diff stats
src/WorldTester/msg_recv.go
| 1 | 1 | package main |
| 2 | 2 | |
| 3 | 3 | import ( |
| 4 | - // "WorldTester/conf" | |
| 5 | - db "WorldTester/db" | |
| 6 | 4 | "WorldTester/pb" |
| 7 | 5 | "common/logger" |
| 8 | 6 | "log" |
| 9 | - "math/rand" | |
| 10 | 7 | "net" |
| 11 | 8 | ) |
| 12 | 9 | |
| 13 | 10 | func init() { |
| 14 | 11 | RegisterMessage(pb.MSGID_MsgID_Logon_Response, &pb.ResponseLogon{}, LoginResponseHandler) |
| 15 | - RegisterMessage(pb.MSGID_MsgID_CreateClub_Response, &pb.ResponseCreateClub{}, CreateClubResponseHandler) | |
| 16 | - RegisterMessage(pb.MSGID_MsgID_JoinClub_Notice, &pb.NoticeJoinClub{}, JoinClubNoticeHandler) | |
| 17 | - RegisterMessage(pb.MSGID_MsgID_ClubSnapshotList_Notice, &pb.NoticeClubSnapshotList{}, GetClubListNoticeHandler) | |
| 18 | 12 | |
| 19 | - RegisterMessage(pb.MSGID_MsgID_ClubCreaterInfo_Notice, &pb.NoticeClubCreaterInfo{}, GetClubCreaterInfoNoticeHandler) | |
| 20 | - RegisterMessage(pb.MSGID_MsgID_ClubMemberSnapshotList_Notice, &pb.NoticeClubMemberSnapshotList{}, GetClubMemberSnapshotListHandler) | |
| 21 | - RegisterMessage(pb.MSGID_MsgID_PurchaseClubLevel_Notice, &pb.NoticePurchaseClubLevel{}, PurchaseClubLevelHandler) | |
| 22 | - RegisterMessage(pb.MSGID_MsgID_RechargeClubFund_Response, &pb.ResponseRechargeClubFund{}, RechargeClubFundHandler) | |
| 23 | 13 | |
| 24 | - RegisterMessage(pb.MSGID_MsgID_GrantClubFund_Response, &pb.ResponseGrantClubFund{}, GrantClubFundRespHandler) | |
| 25 | - RegisterMessage(pb.MSGID_MsgID_ModifyClubInfo_Response, &pb.ResponseModifyClubInfo{}, ModifyClubInfoRespHandler) | |
| 26 | - | |
| 27 | - RegisterMessage(pb.MSGID_MsgID_SearchClubInfo_Notice, &pb.NoticeSearchClubInfo{}, GetSearchClubInfoHandler) | |
| 28 | - RegisterMessage(pb.MSGID_MsgID_GetUserData_Notice, &pb.NoticeGetUserData{}, GetGetUserDataHandler) | |
| 29 | - | |
| 30 | -} | |
| 31 | - | |
| 32 | -func GetClubMemberSnapshotListHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 33 | - log.Println("GetClubMemberSnapshotListHandler-header.PlayerID:", header.PlayerID) | |
| 34 | - resp := msg.(*pb.NoticeClubMemberSnapshotList) | |
| 35 | - Clubids, _ := db.GetAdminClubs(int(header.PlayerID)) | |
| 36 | - for _, clubid := range Clubids { | |
| 37 | - for _, info := range resp.Snapshots { | |
| 38 | - log.Println("info.ClubName", info.MemberName) | |
| 39 | - SendModifyClubMember(GetPlayer(header.PlayerID), int32(clubid), info.MemberUid) | |
| 40 | - SendGrantClubFund(GetPlayer(header.PlayerID), int32(clubid), info.MemberUid) | |
| 41 | - } | |
| 42 | - } | |
| 43 | - | |
| 44 | -} | |
| 45 | - | |
| 46 | -func ModifyClubMemberNoticeHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 47 | - log.Println("ModifyClubMemberNoticeHandler-header.PlayerID:", header.PlayerID) | |
| 48 | - resp := msg.(*pb.NoticeModifyClubMember) | |
| 49 | - log.Println("CreatePlayerName", resp.TargetPlayerName) | |
| 50 | -} | |
| 51 | - | |
| 52 | -func ModifyClubInfoRespHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 53 | - log.Println("ModifyClubInfoRespHandler-header.PlayerID:", header.PlayerID) | |
| 54 | - resp := msg.(*pb.ResponseModifyClubInfo) | |
| 55 | - log.Println("ModifyClubInfoRespHandler", resp.Error) | |
| 56 | 14 | } |
| 57 | 15 | |
| 58 | -func GrantClubFundRespHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 59 | - log.Println("ModifyClubMemberNoticeHandler-header.PlayerID:", header.PlayerID) | |
| 60 | - resp := msg.(*pb.ResponseGrantClubFund) | |
| 61 | - log.Println("GrantClubFundRespHandler", resp.Error) | |
| 62 | -} | |
| 63 | - | |
| 64 | -func RechargeClubFundHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 65 | - log.Println("RechargeClubFundHandler-header.PlayerID:", header.PlayerID) | |
| 66 | - resp := msg.(*pb.ResponseRechargeClubFund) | |
| 67 | - log.Println("RechargeClubFundHandler", resp.Error) | |
| 68 | -} | |
| 69 | - | |
| 70 | -func PurchaseClubLevelHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 71 | - log.Println("PurchaseClubLevelHandler-header.PlayerID:", header.PlayerID) | |
| 72 | - resp := msg.(*pb.NoticePurchaseClubLevel) | |
| 73 | - log.Println("ExpireTime", resp.ExpireTime) | |
| 74 | -} | |
| 75 | - | |
| 76 | -func GetClubCreaterInfoNoticeHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 77 | - log.Println("GetClubCreaterInfoNoticeHandler-header.PlayerID:", header.PlayerID) | |
| 78 | - resp := msg.(*pb.NoticeClubCreaterInfo) | |
| 79 | - log.Println("CreatePlayerName", resp.CreatePlayerName) | |
| 80 | -} | |
| 81 | - | |
| 82 | -func GetSearchClubInfoHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 83 | - log.Println("GetSearchClubInfoHandler-header.PlayerID:", header.PlayerID) | |
| 84 | - resp := msg.(*pb.NoticeSearchClubInfo) | |
| 85 | - log.Println("CreatePlayerName", resp.Snapshots.ClubName) | |
| 86 | -} | |
| 87 | - | |
| 88 | -func GetGetUserDataHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 89 | - log.Println("GetGetUserDataHandler-header.PlayerID:", header.PlayerID) | |
| 90 | - resp := msg.(*pb.NoticeGetUserData) | |
| 91 | - log.Println("UserName", resp.UserName) | |
| 92 | -} | |
| 93 | 16 | |
| 94 | 17 | func LoginResponseHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { |
| 95 | 18 | resp := msg.(*pb.ResponseLogon) |
| ... | ... | @@ -114,132 +37,3 @@ func LoginResponseHandler(conn net.Conn, header pb.MessageHeader, msg interface{ |
| 114 | 37 | } |
| 115 | 38 | } |
| 116 | 39 | |
| 117 | -func CreateClubResponseHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 118 | - resp := msg.(*pb.ResponseCreateClub) | |
| 119 | - logger.Info("create club response message noti:%+v header:%+v", *resp, header) | |
| 120 | - log.Println("create club response message noti:%+v header:%+v", *resp, header) | |
| 121 | - | |
| 122 | - v := m_map_players.Get(header.PlayerID) | |
| 123 | - if v == nil { | |
| 124 | - logger.Info("recvd create message response:%+v header:%+v not found playerid", *resp, header) | |
| 125 | - return | |
| 126 | - } | |
| 127 | - // if resp.Error != 1 { | |
| 128 | - // logger.Info("uid %d create room failed with error:%+v", header.PlayerID, resp.Error) | |
| 129 | - // return | |
| 130 | - // } | |
| 131 | - | |
| 132 | - player := v.(*PlayerInfo) | |
| 133 | - log.Println("CreateClubResponseHandler-player.isHost:", player.isHost) | |
| 134 | - if player.isHost { | |
| 135 | - | |
| 136 | - SendGetClubList(player) | |
| 137 | - } | |
| 138 | -} | |
| 139 | - | |
| 140 | -func JoinClubNoticeHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 141 | - log.Println("JoinClubNoticeHandler-header.PlayerID:", header.PlayerID) | |
| 142 | - resp := msg.(*pb.NoticeJoinClub) | |
| 143 | - player := GetPlayer(header.PlayerID) | |
| 144 | - if player == nil { | |
| 145 | - logger.Info("uid not found uid:%+v", header.PlayerID) | |
| 146 | - return | |
| 147 | - } | |
| 148 | - | |
| 149 | - SendJoinClubReply(player, 1, resp.ClubId, resp.ClubUid) | |
| 150 | - | |
| 151 | -} | |
| 152 | - | |
| 153 | -func GetClubListNoticeHandler(conn net.Conn, header pb.MessageHeader, msg interface{}) { | |
| 154 | - log.Println("GetClubListNoticeHandler-header.PlayerID:", header.PlayerID) | |
| 155 | - resp := msg.(*pb.NoticeClubSnapshotList) | |
| 156 | - for _, Clubinfo := range resp.List { | |
| 157 | - log.Println("Clubinfo.ClubName", Clubinfo.ClubName) | |
| 158 | - | |
| 159 | - if createrid, err := db.GetClubCreaterId(int(Clubinfo.ClubId)); err == nil { | |
| 160 | - player := GetPlayer(uint32(createrid)) | |
| 161 | - if player != nil { | |
| 162 | - log.Println("$$$createrid:", createrid) | |
| 163 | - SendSearchClubInfo(player, Clubinfo.ClubId) | |
| 164 | - SendGetClubCreaterInfo(player, Clubinfo.ClubId) | |
| 165 | - SendGetClubMemberSnapshotList(player, Clubinfo.ClubId) | |
| 166 | - | |
| 167 | - } | |
| 168 | - } | |
| 169 | - } | |
| 170 | -} | |
| 171 | - | |
| 172 | -func getHostPlayer(room *RoomInfo) *PlayerInfo { | |
| 173 | - for _, uid := range room.ids { | |
| 174 | - p := m_map_players.Get(uid) | |
| 175 | - player, _ := p.(*PlayerInfo) | |
| 176 | - if player.isHost == true { | |
| 177 | - return player | |
| 178 | - } | |
| 179 | - } | |
| 180 | - return nil | |
| 181 | -} | |
| 182 | -func getRoomHostID(rid uint32) uint32 { | |
| 183 | - v := m_map_rooms.Get(rid) | |
| 184 | - if v == nil { | |
| 185 | - return 0 | |
| 186 | - } | |
| 187 | - room, _ := v.(*RoomInfo) | |
| 188 | - host := getHostPlayer(room) | |
| 189 | - if host == nil { | |
| 190 | - return 0 | |
| 191 | - } | |
| 192 | - return host.uid | |
| 193 | -} | |
| 194 | - | |
| 195 | -func getMyAction(player *PlayerInfo, minbet uint32) (ignore bool, action pb.ActionType, bet uint32) { | |
| 196 | - //r := rand.Intn(100) | |
| 197 | - ignore = true | |
| 198 | - //action = pb.ActionType_Enum_Action_Null | |
| 199 | - bet = 0 | |
| 200 | - /* | |
| 201 | - if r < 10 { | |
| 202 | - //10%概率不做动作，让服务器做超时 | |
| 203 | - return | |
| 204 | - } | |
| 205 | - */ | |
| 206 | - ignore = false | |
| 207 | - if minbet == 0 { | |
| 208 | - //fold or check | |
| 209 | - r := rand.Intn(100) | |
| 210 | - if r < 10 { | |
| 211 | - action = pb.ActionType_Enum_Action_Fold | |
| 212 | - } else if r < 30 { | |
| 213 | - action = pb.ActionType_Enum_Action_Bet | |
| 214 | - bet = 50 | |
| 215 | - } else { | |
| 216 | - action = pb.ActionType_Enum_Action_Check | |
| 217 | - } | |
| 218 | - } else { | |
| 219 | - //call or raise or allin or fold | |
| 220 | - r := rand.Intn(100) | |
| 221 | - if r < 20 { | |
| 222 | - action = pb.ActionType_Enum_Action_Raise | |
| 223 | - bet = 2 * (minbet - player.roundBet) | |
| 224 | - if bet > player.leftMoney { | |
| 225 | - bet = minbet - player.roundBet | |
| 226 | - action = pb.ActionType_Enum_Action_Call | |
| 227 | - if bet > player.leftMoney { | |
| 228 | - bet = 0 | |
| 229 | - action = pb.ActionType_Enum_Action_Fold | |
| 230 | - } | |
| 231 | - } | |
| 232 | - } else if r < 30 { | |
| 233 | - action = pb.ActionType_Enum_Action_Fold | |
| 234 | - } else if r < 95 { | |
| 235 | - action = pb.ActionType_Enum_Action_Call | |
| 236 | - bet = minbet - player.roundBet | |
| 237 | - } else { | |
| 238 | - action = pb.ActionType_Enum_Action_Allin | |
| 239 | - bet = player.leftMoney | |
| 240 | - } | |
| 241 | - } | |
| 242 | - player.leftMoney -= bet | |
| 243 | - logger.Info("bet money uid:%v bet:%v left:%v roundbet:%v", player.uid, bet, player.leftMoney, player.roundBet) | |
| 244 | - return | |
| 245 | -} | ... | ... |
src/WorldTester/msg_send.go
| 1 | 1 | package main |
| 2 | 2 | |
| 3 | 3 | import ( |
| 4 | - db "WorldTester/db" | |
| 5 | 4 | pb "WorldTester/pb" |
| 6 | 5 | "bytes" |
| 7 | 6 | "common/logger" |
| ... | ... | @@ -139,65 +138,13 @@ func SendCreateClub(player *PlayerInfo) { |
| 139 | 138 | } |
| 140 | 139 | |
| 141 | 140 | func SendJoinClub(player *PlayerInfo) { |
| 142 | - log.Println("SendJoinClub") | |
| 143 | - var req pb.RequestJoinClub | |
| 144 | - var cids []int | |
| 145 | - for _, vv := range m_map_club_creater.Items() { | |
| 146 | - creater := vv.(*PlayerInfo) | |
| 147 | - if creater != nil { | |
| 148 | - clubIds, err := db.GetCreatedClubs(int(creater.uid)) | |
| 149 | - if err != nil { | |
| 150 | - log.Println("SendJoinClub-GetCreaterIdClubId-err:", err) | |
| 151 | - break | |
| 152 | - } | |
| 153 | - cids = append(cids, clubIds...) | |
| 154 | - } | |
| 155 | - } | |
| 156 | 141 | |
| 157 | - cids = RemoveDuplicates(cids) | |
| 158 | 142 | |
| 159 | - log.Println("cids:", cids) | |
| 143 | + log.Println("cids:", 1) | |
| 160 | 144 | |
| 161 | - req.ClubUid = int32(player.uid) | |
| 162 | - for _, clubId := range cids { | |
| 163 | - req.ClubId = int32(clubId) | |
| 164 | - player.seq++ | |
| 165 | - SendMessage(player.conn, player.seq, player.uid, player.rid, pb.MSGID_MsgID_JoinClub_Request, &req) | |
| 166 | - log.Println("SendJoinClub-SendMessage-clubId:", clubId, " player.uid:", player.uid) | |
| 167 | - } | |
| 168 | -} | |
| 169 | 145 | |
| 170 | -func SendGetClubList(player *PlayerInfo) { | |
| 171 | - log.Println("SendGetClubList") | |
| 172 | - var req pb.RequestClubSnapshotList | |
| 173 | - req.Uid = int32(player.uid) | |
| 174 | - player.seq++ | |
| 175 | - SendMessage(player.conn, player.seq, player.uid, player.rid, pb.MSGID_MsgID_ClubSnapshotList_Request, &req) | |
| 176 | 146 | } |
| 177 | 147 | |
| 178 | -func SendGetClubCreaterInfo(player *PlayerInfo, ClubId int32) { | |
| 179 | - log.Println("SendGetClubCreaterInfo") | |
| 180 | - var req pb.RequestClubCreaterInfo | |
| 181 | - req.ClubId = ClubId | |
| 182 | - player.seq++ | |
| 183 | - SendMessage(player.conn, player.seq, player.uid, player.rid, pb.MSGID_MsgID_ClubCreaterInfo_Request, &req) | |
| 184 | -} | |
| 185 | - | |
| 186 | -func SendSearchClubInfo(player *PlayerInfo, ClubId int32) { | |
| 187 | - log.Println("SendSearchClubInfo") | |
| 188 | - var req pb.RequestSearchClubInfo | |
| 189 | - req.ClubId = ClubId | |
| 190 | - player.seq++ | |
| 191 | - SendMessage(player.conn, player.seq, player.uid, player.rid, pb.MSGID_MsgID_SearchClubInfo_Request, &req) | |
| 192 | -} | |
| 193 | - | |
| 194 | -func SendUserData(player *PlayerInfo, uId int32) { | |
| 195 | - log.Println("SendUserData") | |
| 196 | - var req pb.RequestGetUserData | |
| 197 | - req.UserId = uId | |
| 198 | - player.seq++ | |
| 199 | - SendMessage(player.conn, player.seq, player.uid, player.rid, pb.MSGID_MsgID_GetUserData_Request, &req) | |
| 200 | -} | |
| 201 | 148 | |
| 202 | 149 | func SendMessage(conn net.Conn, seq uint32, uid uint32, rid uint32, msgid pb.MSGID, msg interface{}) { |
| 203 | 150 | tmp, err := proto.Marshal(msg.(proto.Message)) | ... | ... |