From bc417b6301c99a8a0aa8d304204077a9ae6d5ca7 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 24 Mar 2026 15:53:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E8=AE=A2=E5=8D=95=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=9D=A1=E4=BB=B6=E5=B9=B6=E6=B2=A1=E6=9C=89=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/message_handler.go | 301 +++--- src/server/game/mod/chess/Chess.go | 312 ++++--- src/server/game/register_network_func.go | 1088 +++++++++++----------- src/server/game/req_func_friend.go | 12 +- 4 files changed, 877 insertions(+), 836 deletions(-) diff --git a/src/server/game/message_handler.go b/src/server/game/message_handler.go index c378ef09..3ef57bc0 100644 --- a/src/server/game/message_handler.go +++ b/src/server/game/message_handler.go @@ -73,18 +73,18 @@ func (p *Player) handle(m *msg.Msg) error { return nil } p.AddLog(m.From, friend.LOG_TYPE_FRIEND_APPLY, "", m.SendT) - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendApplyNotify{ - Player: PlayerSimpleData, + Player: playerSimpleData, Type: friend.FRIEND_NOTIFY_APPLY, Time: int32(GoUtil.Now()), }) case msg.HADNLE_TYPE_AGREE: // 同意好友申请 FriendMod := p.PlayMod.getFriendMod() FriendMod.AgreeApply(m.From) - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendApplyNotify{ - Player: PlayerSimpleData, + Player: playerSimpleData, Type: friend.FRIEND_NOTIFY_AGREE, Time: int32(GoUtil.Now()), }) @@ -97,18 +97,18 @@ func (p *Player) handle(m *msg.Msg) error { FriendMod := p.PlayMod.getFriendMod() FriendMod.DelFriend(m.From) p.AddLog(m.From, friend.LOG_TYPE_FRIEND_APPLY, "", m.SendT) - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendApplyNotify{ - Player: PlayerSimpleData, + Player: playerSimpleData, Type: friend.FRIEND_NOTIFY_DEL, Time: int32(GoUtil.Now()), }) case msg.HANDLE_TYPE_REFUSE: // 拒绝好友申请 FriendMod := p.PlayMod.getFriendMod() FriendMod.RefuseApply(m.From) - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendApplyNotify{ - Player: PlayerSimpleData, + Player: playerSimpleData, Type: friend.FRIEND_NOTIFY_REFUSE, Time: int32(GoUtil.Now()), }) @@ -199,7 +199,7 @@ func (p *Player) handle(m *msg.Msg) error { return nil } CardMod := p.PlayMod.getCardMod() - OtherUid, err := CardMod.DelRequestCard(cardInfo.BUid) + otherUid, err := CardMod.DelRequestCard(cardInfo.BUid) FriendMod := p.PlayMod.getFriendMod() FriendMod.SetCardInfo(&cardInfo) if err != nil { // 同意失败，请求已失效 @@ -207,7 +207,7 @@ func (p *Player) handle(m *msg.Msg) error { FriendMgrSend(msg) return nil } - for k, v := range OtherUid { // 通知好友请求已结束 + for k, v := range otherUid { // 通知好友请求已结束 v.Status = card.STATUS_CARD_GIVE_3 FriendMgrSend(&msg.Msg{Type: msg.HANDLE_TYPE_REG_CARD_FINISH, From: k, Extra: &v}) CardMod.DelRequestCard(k) @@ -299,8 +299,15 @@ func (p *Player) handle(m *msg.Msg) error { case msg.HANDLE_TYPE_CHAMPSHIP_NOTIFY: // # 锦标赛排名变动通知 p.BackChampship() case msg.HANDLE_TYPE_CHAMPSHIP_RESULT: // # 好友锦标赛结果 - Extra := GoUtil.IntSlice(m.Extra) - p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CHAMPSHIP, fmt.Sprintf("%d_%d", Extra[0], Extra[1]), m.SendT) + extra := GoUtil.IntSlice(m.Extra) + var gameId, rank int + if len(extra) >= 2 { + gameId = extra[0] + rank = extra[1] + } else { + return nil + } + p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_CHAMPSHIP, fmt.Sprintf("%d_%d", gameId, rank), m.SendT) case msg.HANDLE_TYPE_TREASURE_RESULT: // 好友宝藏结果 // 暂未处理 case msg.HANDLE_TYPE_MAIL: // 邮件操作 @@ -382,14 +389,14 @@ func (p *Player) handle(m *msg.Msg) error { FriendMod.Interact(m.From, friend.INTERACT_TYPE_UPVOTE, m.SendT) p.AddLog(m.From, friend.LOG_TYPE_HANDBOOK_UPVOTE, "", m.SendT) case msg.HANDLE_TYPE_SEND_CHARGE: // 收到好友赠送的充值礼包 - C, ok := m.Extra.(*ChargeExtra) + chargeExtra, ok := m.Extra.(*ChargeExtra) if !ok { - C = &ChargeExtra{} + chargeExtra = &ChargeExtra{} } - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) MailMod := p.PlayMod.getMailMod() - mt, mc, mt_en, mc_en := mailCfg.GetChargeSendMail(PlayerSimpleData.Name) - items := p.ChargeItem(C.ChargeId) + mt, mc, mt_en, mc_en := mailCfg.GetChargeSendMail(playerSimpleData.Name) + items := p.ChargeItem(chargeExtra.ChargeId) mailId := MailMod.SendMail(&mail.MailStruct{ Title: mt, Content: mc, @@ -405,9 +412,9 @@ func (p *Player) handle(m *msg.Msg) error { if !ok { Content = "" } - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) MailMod := p.PlayMod.getMailMod() - mt, mc, mt_en, mc_en := mailCfg.GetChargeReceiveMail(PlayerSimpleData.Name, Content) + mt, mc, mt_en, mc_en := mailCfg.GetChargeReceiveMail(playerSimpleData.Name, Content) mailId := MailMod.SendMail(&mail.MailStruct{ Title: mt, Content: mc, @@ -436,21 +443,21 @@ func (p *Player) handle(m *msg.Msg) error { p.NotifyPlayroomKiss() case msg.HANDLE_TYPE_CATNIP_INVITE: // 邀请好友参与猫咪游戏 CatnipMod := p.PlayMod.getCatnipMod() - catnipMsg, ok := m.Extra.(CatnipMsg) + catnipMsg, ok := m.Extra.(map[string]interface{}) if !ok { return nil } activityId := p.GetActivityId(activity.ACT_TYPE_CATNIP) - if activityId != catnipMsg.ActivityId { // 活动ID不匹配 + if activityId != catnipMsg["ActivityId"] { // 活动ID不匹配 return nil } CatnipMod.BeInvited(int(m.From), m.SendT) FriendMod := p.PlayMod.getFriendMod() - replyInfo := FriendMod.AddReplyInfo(m.From, friend.REPLY_TYPE_CATNIP, fmt.Sprintf("%d", catnipMsg.GameId), m.End, nil) - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + replyInfo := FriendMod.AddReplyInfo(m.From, friend.REPLY_TYPE_CATNIP, fmt.Sprintf("%d", catnipMsg["GameId"]), m.End, nil) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendReplyNotify{ Info: &proto.ResFriendReply{ - Player: PlayerSimpleData, + Player: playerSimpleData, Param: replyInfo.Param, Type: int32(replyInfo.Type), Id: int32(replyInfo.Id), @@ -460,56 +467,56 @@ func (p *Player) handle(m *msg.Msg) error { }) case msg.HANDLE_TYPE_CATNIP_AGREE: // 同意好友参与猫咪游戏 CatnipMod := p.PlayMod.getCatnipMod() - catnipMsg, ok := m.Extra.(CatnipMsg) + catnipMsg, ok := m.Extra.(map[string]interface{}) if !ok { return nil } activityId := p.GetActivityId(activity.ACT_TYPE_CATNIP) - if activityId != catnipMsg.ActivityId { // 活动ID不匹配 + if activityId != catnipMsg["ActivityId"] { // 活动ID不匹配 return nil } - CatnipMod.BeAgree(catnipMsg.GameId, int(m.From)) + CatnipMod.BeAgree(GoUtil.Int(catnipMsg["GameId"]), int(m.From)) case msg.HANDLE_TYPE_CATNIP_AGREE_DEL: // 同意好友参与猫咪游戏后删除邀请 CatnipMod := p.PlayMod.getCatnipMod() - catnipMsg, ok := m.Extra.(CatnipMsg) + catnipMsg, ok := m.Extra.(map[string]interface{}) if !ok { return nil } activityId := p.GetActivityId(activity.ACT_TYPE_CATNIP) - if activityId != catnipMsg.ActivityId { // 活动ID不匹配 + if activityId != catnipMsg["ActivityId"] { // 活动ID不匹配 return nil } - CatnipMod.DelInvited(catnipMsg.GameId, int(m.From)) + CatnipMod.DelInvited(GoUtil.Int(catnipMsg["GameId"]), int(m.From)) case msg.HANDLE_TYPE_CATNIP_REFUSE: // 拒绝好友参与猫咪游戏 CatnipMod := p.PlayMod.getCatnipMod() - catnipMsg, ok := m.Extra.(CatnipMsg) + catnipMsg, ok := m.Extra.(map[string]interface{}) if !ok { return nil } activityId := p.GetActivityId(activity.ACT_TYPE_CATNIP) - if activityId != catnipMsg.ActivityId { // 活动ID不匹配 + if activityId != catnipMsg["ActivityId"] { // 活动ID不匹配 return nil } - CatnipMod.DelInvited(catnipMsg.GameId, int(m.From)) + CatnipMod.DelInvited(GoUtil.Int(catnipMsg["GameId"]), int(m.From)) case msg.HANDLE_TYPE_CATNIP_GROWTH: CatnipMod := p.PlayMod.getCatnipMod() - catnipMsg, ok := m.Extra.(CatnipMsg) + catnipMsg, ok := m.Extra.(map[string]interface{}) if !ok { return nil } activityId := p.GetActivityId(activity.ACT_TYPE_CATNIP) - if activityId != catnipMsg.ActivityId { // 活动ID不匹配 + if activityId != catnipMsg["ActivityId"] { // 活动ID不匹配 return nil } - CatnipMod.GrowthByUid(m.From, catnipMsg.Growth) - if catnipMsg.FriendItems > 0 { - Items := catnipCfg.GetItemCost(activityId, catnipMsg.FriendItems) + CatnipMod.GrowthByUid(m.From, GoUtil.Int(catnipMsg["Growth"])) + if GoUtil.Int(catnipMsg["FriendItems"]) > 0 { + Items := catnipCfg.GetItemCost(activityId, GoUtil.Int(catnipMsg["FriendItems"])) FriendMod := p.PlayMod.getFriendMod() replyInfo := FriendMod.AddReplyInfo(m.From, friend.REPLY_TYPE_CATNIP_ITEMS, "", m.End, Items) - PlayerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) + playerSimpleData := G_GameLogicPtr.GetResSimplePlayerByUid(m.From) p.PushClientRes(&proto.ResFriendReplyNotify{ Info: &proto.ResFriendReply{ - Player: PlayerSimpleData, + Player: playerSimpleData, Param: replyInfo.Param, Type: int32(replyInfo.Type), Id: int32(replyInfo.Id), @@ -627,11 +634,11 @@ func (p *Player) CatnipGrowthMsg(To, Id, Growth, FriendItems int) error { To: To, Type: msg.HANDLE_TYPE_CATNIP_GROWTH, SendT: GoUtil.Now(), - Extra: CatnipMsg{ - ActivityId: activityId, - GameId: Id, - Growth: Growth, - FriendItems: FriendItems, + Extra: map[string]interface{}{ + "ActivityId": activityId, + "GameId": Id, + "Growth": Growth, + "FriendItems": FriendItems, }, }) return nil @@ -727,28 +734,28 @@ func (p *Player) EmitRetireTrigger2() { allChess[Color] = struct{}{} } } - RetireEmit := ChessMod.GetRetireEmit() - for k, v := range RetireEmit { + retireEmit := ChessMod.GetRetireEmit() + for k, v := range retireEmit { if k == "" { continue } if v != 1 { continue } - RetireLv := mergeDataCfg.GetEmitRetire(k) - if RetireLv > BaseMod.GetLevel() { + retireLv := mergeDataCfg.GetEmitRetire(k) + if retireLv > BaseMod.GetLevel() { continue } - NeedFinishOrder := false - Produce := mergeDataCfg.GetEmitOrderProduce(k) - for _, v1 := range Produce { + needFinishOrder := false + produce := mergeDataCfg.GetEmitOrderProduce(k) + for _, v1 := range produce { if _, ok := allChess[v1]; ok { - NeedFinishOrder = true + needFinishOrder = true break } } - if NeedFinishOrder { + if needFinishOrder { continue } ChessMod.RetireOrder(k) @@ -758,36 +765,36 @@ func (p *Player) EmitRetireTrigger2() { return } } - RetireEmit1 := ChessMod.GetRetireEmit() - for k, v := range RetireEmit1 { + retireEmit1 := ChessMod.GetRetireEmit() + for k, v := range retireEmit1 { if k == "" { continue } if v != 2 { continue } - ChessList := ChessMod.GetRetireChess(k) + chessList := ChessMod.GetRetireChess(k) // 清理完成 - if len(ChessList) == 0 { + if len(chessList) == 0 { ChessMod.FinishRetire(k) ChargeMod := p.PlayMod.getChargeMod() ChargeMod.InitChessShop(ChessMod.GetEmitList()) p.ChargeBackData() continue } - OrderMod.CreateCleanOrder(ChessList) + OrderMod.CreateCleanOrder(chessList) return } } func NotifyChampshipResult(Uid, Rank int) { - PlayerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(Uid) - if PlayerSimpleData == nil { + playerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(Uid) + if playerSimpleData == nil { return } now := GoUtil.Now() serveropenday := GoUtil.GetServerOpenDay() - for _, v := range PlayerSimpleData.Friend { + for _, v := range playerSimpleData.Friend { if CheckPlayerLose(v) { continue } @@ -803,20 +810,20 @@ func NotifyChampshipResult(Uid, Rank int) { } func (player *Player) GetPetOrderItemExp() int { - OrderItemCfgList := playroomCfg.GetOrderItemList() - itemList := make([]*item.Item, 0) - ItemMod := player.PlayMod.getItemMod() - for _, v := range OrderItemCfgList { - num := ItemMod.GetItem(v) + orderItemCfgList := playroomCfg.GetOrderItemList() + items := make([]*item.Item, 0) + itemMod := player.PlayMod.getItemMod() + for _, v := range orderItemCfgList { + num := itemMod.GetItem(v) if num <= 0 { continue } - itemList = append(itemList, &item.Item{ + items = append(items, &item.Item{ Id: v, Num: num, }) } - return playroomCfg.GetPetOrderItemExpByList(itemList) + return playroomCfg.GetPetOrderItemExpByList(items) } // 触发生成新的固定订单 @@ -829,32 +836,32 @@ func (player *Player) TriggerOrder(lv int, Type string, Emit []int, EnergyMul in fixedOrder++ } } - OrderList := make(map[int]order.Order, len(OrderMod.OrderList)) + orderList := make(map[int]order.Order, len(OrderMod.OrderList)) for k, v := range OrderMod.OrderList { - OrderList[k] = v + orderList[k] = v } // 触发生成新的固定订单 for _, v := range triggerOrderList { if GoUtil.InArray(v.Id, OrderMod.FinishOrder) { continue } - orderInfo, exists := OrderList[v.Id] + orderInfo, exists := orderList[v.Id] if exists && v.Preview == "" { continue } // 预览条件不为空且未存在且未完成 if v.Preview != "" && !exists && !GoUtil.InArray(v.Id, OrderMod.FinishOrder) { - if OrderMod.CheckCondition(lv, v.Preview, Type, Emit, fixedOrder, OrderList) { + if OrderMod.CheckCondition(lv, v.Preview, Type, Emit, fixedOrder, orderList) { OrderMod.AddFixOrder(v.Id, v.MergeList, order.Preview_type, v.Items) } } if v.Appear != "" { - if OrderMod.CheckCondition(lv, v.Appear, Type, Emit, fixedOrder, OrderList) { - Type := order.Fixed_type - OrderType := orderCfg.GetOrderType(v.Id) - if OrderType != 0 { - Type = OrderType + if OrderMod.CheckCondition(lv, v.Appear, Type, Emit, fixedOrder, orderList) { + vType := order.Fixed_type + orderType := orderCfg.GetOrderType(v.Id) + if orderType != 0 { + vType = orderType } player.TeLog("preset_order_birth", map[string]interface{}{ "order_id": v.Id, @@ -866,7 +873,7 @@ func (player *Player) TriggerOrder(lv int, Type string, Emit []int, EnergyMul in orderInfo.Type = order.Fixed_type OrderMod.OrderList[v.Id] = orderInfo } else { - OrderMod.AddFixOrder(v.Id, v.MergeList, Type, v.Items) + OrderMod.AddFixOrder(v.Id, v.MergeList, vType, v.Items) if v.Id == 78 { OrderMod.Retire("D") OrderMod.AutoEmit = append(OrderMod.AutoEmit, "D") @@ -1030,9 +1037,9 @@ func (player *Player) CreatePetOrder() { continue } var items []*item.Item - Star := order.GetOrderStar(v.MergeId, ChessMod.GetStarEmitList()) + star := order.GetOrderStar(v.MergeId, ChessMod.GetStarEmitList()) // Star = int(float64(Star)*float64(OrderFactor)/1000) * 10 - items = player.GetPetOrderReward(Star, items) + items = player.GetPetOrderReward(star, items) if len(items) == 1 && items[0].Id == item.ITEM_STAR_ID { v.Type = order.Common_type } else { @@ -1246,7 +1253,7 @@ func (p *Player) AddHighOrder() { OrderMod := p.PlayMod.getOrderMod() BaseMod := p.PlayMod.getBaseMod() ChessMod := p.PlayMod.getChessMod() - LastChess := OrderMod.LastOrder.MergeId[len(OrderMod.LastOrder.MergeId)-1] + lastChess := OrderMod.LastOrder.MergeId[len(OrderMod.LastOrder.MergeId)-1] maxId := 0 for k := range OrderMod.GetOrderList() { maxId = max(maxId, k) @@ -1254,51 +1261,53 @@ func (p *Player) AddHighOrder() { if maxId == 0 || BaseMod.GetLevel() < 12 { return } - NewChess := OrderMod.GetOrderList()[maxId].MergeId[0] - LastColor := mergeDataCfg.GetColorById(LastChess) - NewColor := mergeDataCfg.GetColorById(NewChess) - LastEmitId := order.GetEmitByColor(ChessMod.GetOrderEmit(), LastColor) - AddNewEmitId := order.GetEmitByColor(ChessMod.GetOrderEmit(), NewColor) - var Product []string - Product = append(Product, mergeDataCfg.GetEmitProduceType(LastEmitId)...) - Product = append(Product, mergeDataCfg.GetEmitProduceType(AddNewEmitId)...) - ChessMap := make(map[string]int) - ChessList := ChessMod.GetUnlockChessList() - for _, v := range ChessList { + newChess := OrderMod.GetOrderList()[maxId].MergeId[0] + lastColor := mergeDataCfg.GetColorById(lastChess) + newColor := mergeDataCfg.GetColorById(newChess) + lastEmitId := order.GetEmitByColor(ChessMod.GetOrderEmit(), lastColor) + addNewEmitId := order.GetEmitByColor(ChessMod.GetOrderEmit(), newColor) + var product []string + product = append(product, mergeDataCfg.GetEmitProduceType(lastEmitId)...) + product = append(product, mergeDataCfg.GetEmitProduceType(addNewEmitId)...) + chessMap := make(map[string]int) + chessList := ChessMod.GetUnlockChessList() + chessBagList := ChessMod.GetChessBagList() + chessList = append(chessList, chessBagList...) + for _, v := range chessList { ChessType := mergeDataCfg.GetTypeById(v) if ChessType != "Product" { continue } Color := mergeDataCfg.GetColorById(v) - if GoUtil.InStringArray(Color, Product) { + if GoUtil.InStringArray(Color, product) { continue } - if v > ChessMap[Color] { - ChessMap[Color] = v + if v > chessMap[Color] { + chessMap[Color] = v } } RetireProduceColor := ChessMod.GetRetireProduceColor() - for Color, ChessId := range ChessMap { - EmitId := order.GetEmitByColor(ChessMod.GetOrderEmit(), Color) - _, ChessMaxLv := getChesslvRange(EmitId, BaseMod.GetEnergyMul(), OrderMod.IsCharge) - NewLev2 := mergeDataCfg.DynamicLev(ChessMaxLv, EmitId, Color) - NewLev3 := order.AdjustLev(NewLev2, BaseMod.GetEnergyMul()) - ChessLv := mergeDataCfg.GetLvById(ChessId) + for Color, ChessId := range chessMap { + emitId := order.GetEmitByColor(ChessMod.GetOrderEmit(), Color) + _, ChessMaxLv := getChesslvRange(emitId, BaseMod.GetEnergyMul(), OrderMod.IsCharge) + newLev2 := mergeDataCfg.DynamicLev(ChessMaxLv, emitId, Color) + newLev3 := order.AdjustLev(newLev2, BaseMod.GetEnergyMul()) + chessLv := mergeDataCfg.GetLvById(ChessId) chessColor := mergeDataCfg.GetColorById(ChessId) // 退役产物不生成订单 if GoUtil.InStringArray(chessColor, RetireProduceColor) { continue } - if NewLev3 >= ChessLv { + if newLev3 >= chessLv { continue } - Add := true + add := true for _, v := range OrderMod.GetOrderList() { if GoUtil.InArray(ChessId, v.MergeId) { - Add = false + add = false } } - if Add { + if add { OrderMod.AddExtraOrder([]int{ChessId}) return } @@ -1313,28 +1322,30 @@ func (p *Player) AddHighOrder() { func (p *Player) AddHighOrder2() { OrderMod := p.PlayMod.getOrderMod() ChessMod := p.PlayMod.getChessMod() - ChessList := ChessMod.GetUnlockChessList() - ChessMap := make(map[int]int) - for _, v := range ChessList { - Lv := mergeDataCfg.GetLvById(v) - MaxLv := mergeDataCfg.GetMaxLvById(v) - if Lv != MaxLv { + chessList := ChessMod.GetUnlockChessList() + chessBagList := ChessMod.GetChessBagList() + chessList = append(chessList, chessBagList...) + chessMap := make(map[int]int) + for _, v := range chessList { + lv := mergeDataCfg.GetLvById(v) + maxLv := mergeDataCfg.GetMaxLvById(v) + if lv != maxLv { continue } - Type := mergeDataCfg.GetTypeById(v) - if Type != "Product" { + chessType := mergeDataCfg.GetTypeById(v) + if chessType != "Product" { continue } - ChessMap[v]++ + chessMap[v]++ } - RetireProduceColor := ChessMod.GetRetireProduceColor() - for ChessId, Num := range ChessMap { + retireProduceColor := ChessMod.GetRetireProduceColor() + for ChessId, Num := range chessMap { if Num < 2 { continue } chessColor := mergeDataCfg.GetColorById(ChessId) // 退役产物不生成订单 - if GoUtil.InStringArray(chessColor, RetireProduceColor) { + if GoUtil.InStringArray(chessColor, retireProduceColor) { continue } add := true @@ -1354,7 +1365,7 @@ func (p *Player) AddHighOrder2() { func (p *Player) DeleteHighOrder() { OrderMod := p.PlayMod.getOrderMod() ChessMod := p.PlayMod.getChessMod() - ChessList := ChessMod.GetUnlockChessList() + chessList := ChessMod.GetUnlockChessList() for k, v := range OrderMod.GetOrderList() { if v.Type != order.Extra_type { continue @@ -1364,7 +1375,7 @@ func (p *Player) DeleteHighOrder() { } chessId := v.MergeId[0] chessNum := len(v.MergeId) - elementNum := GoUtil.ElemNumber(ChessList, chessId) + elementNum := GoUtil.ElemNumber(chessList, chessId) if elementNum < chessNum { OrderMod.DeleteOrder(k) } @@ -1372,28 +1383,28 @@ func (p *Player) DeleteHighOrder() { } func (p *Player) FormatPetOrderItem(Items []*item.Item) []*item.Item { - var NewItems []*item.Item + var newItems []*item.Item PlayroomMod := p.PlayMod.getPlayroomMod() for _, v := range Items { if v.Id != item.ITEM_PLAYROOM_BOX_LOW_ID && v.Id != item.ITEM_PLAYROOM_BOX_MID_ID && v.Id != item.ITEM_PLAYROOM_BOX_HIGH_ID { - NewItems = append(NewItems, v) + newItems = append(newItems, v) continue } - var OrderItem map[int][]int + var orderItem map[int][]int switch v.Id { case item.ITEM_PLAYROOM_BOX_LOW_ID: - OrderItem = playroomCfg.GetOrderItemByGrade(1) + orderItem = playroomCfg.GetOrderItemByGrade(1) case item.ITEM_PLAYROOM_BOX_MID_ID: - OrderItem = playroomCfg.GetOrderItemByGrade(2) + orderItem = playroomCfg.GetOrderItemByGrade(2) default: - OrderItem = playroomCfg.GetOrderItemByGrade(3) + orderItem = playroomCfg.GetOrderItemByGrade(3) } feed := PlayroomMod.GetPhysiology(playroom.PHYSIOLOGY_TYPE_FEED) feedItem := p.GetPlayroomFood() feedPlo := playroomCfg.GetItemAddPhysiology(feedItem) if feed != nil && feed.Num+feedPlo <= 1 { - RandList := OrderItem[1] - NewItems = append(NewItems, item.NewItem(GoUtil.RandSlice(RandList), 1)) + randList := orderItem[1] + newItems = append(newItems, item.NewItem(GoUtil.RandSlice(randList), 1)) continue } clean := PlayroomMod.GetPhysiology(playroom.PHYSIOLOGY_TYPE_CLEAN) @@ -1401,50 +1412,50 @@ func (p *Player) FormatPetOrderItem(Items []*item.Item) []*item.Item { cleanPlo := playroomCfg.GetItemAddPhysiology(cleanItem) // 卫生值低于等于5点，优先产出清洁类物品 if clean != nil && clean.Num+cleanPlo <= 5 { - RandList := OrderItem[2] - NewItems = append(NewItems, item.NewItem(GoUtil.RandSlice(RandList), 1)) + randList := orderItem[2] + newItems = append(newItems, item.NewItem(GoUtil.RandSlice(randList), 1)) continue } - var RandList []int - for k, v1 := range OrderItem { + var randList []int + for k, v1 := range orderItem { if k == 1 || k == 2 { continue } - RandList = append(RandList, v1...) + randList = append(randList, v1...) } - NewItems = append(NewItems, item.NewItem(GoUtil.RandSlice(RandList), 1)) + newItems = append(newItems, item.NewItem(GoUtil.RandSlice(randList), 1)) } - return NewItems + return newItems } func (player *Player) GetPlayroomFood() map[int]int { ItemMod := player.PlayMod.getItemMod() - Item := make(map[int]int) + items := make(map[int]int) for k, v := range ItemMod.Data { ItemType := itemCfg.GetItemType(k) if ItemType == item.ITEM_TYPE_PLAYROOM_PET { Effect := itemCfg.GetItemEffect(k) if Effect == 1 { - Item[k] = v + items[k] = v } } } - return Item + return items } func (player *Player) GetPlayroomClean() map[int]int { ItemMod := player.PlayMod.getItemMod() - Item := make(map[int]int) + items := make(map[int]int) for k, v := range ItemMod.Data { - ItemType := itemCfg.GetItemType(k) - if ItemType == item.ITEM_TYPE_PLAYROOM_PET { - Effect := itemCfg.GetItemEffect(k) - if Effect == 2 { - Item[k] = v + itemType := itemCfg.GetItemType(k) + if itemType == item.ITEM_TYPE_PLAYROOM_PET { + effect := itemCfg.GetItemEffect(k) + if effect == 2 { + items[k] = v } } } - return Item + return items } func (player *Player) IsWeeklyDiscount() bool { diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go index bfd6be2b..c2fd7d3e 100644 --- a/src/server/game/mod/chess/Chess.go +++ b/src/server/game/mod/chess/Chess.go @@ -74,9 +74,9 @@ func (cb *ChessBorad) IsEmpty() bool { // 初始化棋盘 func (cb *ChessBorad) InitData() { - StartMerge := startMergeCfg.GetStartChessList() + startMerge := startMergeCfg.GetStartChessList() cb.EmitList = make(map[int]int) - cb.ChessList = StartMerge + cb.ChessList = startMerge if cb.ChessBag.List == nil { cb.ChessBag.List = make(map[int]ChessBagGrid) InitNum := mergeDataCfg.GetChessBagInitNum() @@ -141,11 +141,11 @@ func (cb *ChessBorad) GetChessBuf() []int { // 棋子合成 func (cb *ChessBorad) ComposeChess(id int) (int, error) { - CfgRecord, err := mergeDataCfg.GetOne(id) + cfgRecord, err := mergeDataCfg.GetOne(id) if err != nil { return 0, errors.New("配置错误") } - if CfgRecord.Lv == CfgRecord.MaxLv { + if cfgRecord.Lv == cfgRecord.MaxLv { return 0, errors.New("已达最大等级") } count := 0 @@ -161,8 +161,8 @@ func (cb *ChessBorad) ComposeChess(id int) (int, error) { if count < 2 { return 0, errors.New("次数不足" + fmt.Sprintf("Id: %d", id)) } - ChessType := mergeDataCfg.GetTypeById(id) - if ChessType == "Emitter" { + chessType := mergeDataCfg.GetTypeById(id) + if chessType == "Emitter" { cb.EmitList[id+1]++ cb.EmitList[id] -= 2 } @@ -199,8 +199,8 @@ func (cb *ChessBorad) AddChess(id int) error { cb.ChessBuff = append(cb.ChessBuff, id) return nil } - ChessType := mergeDataCfg.GetTypeById(id) - if ChessType == "Emitter" { + chessType := mergeDataCfg.GetTypeById(id) + if chessType == "Emitter" { cb.EmitList[id]++ } cb.ChessList = append(cb.ChessList, id) @@ -209,21 +209,21 @@ func (cb *ChessBorad) AddChess(id int) error { // 购买棋子 func (cb *ChessBorad) BuyChess(id int) (int, error) { - CfgRecord, err := mergeDataCfg.GetOne(id) + cfgRecord, err := mergeDataCfg.GetOne(id) if err != nil { return 0, errors.New("配置错误") } cb.ChessList = append(cb.ChessList, id) - ChessType := mergeDataCfg.GetTypeById(id) - if ChessType == "Emitter" { + chessType := mergeDataCfg.GetTypeById(id) + if chessType == "Emitter" { cb.EmitList[id]++ } - return CfgRecord.SellNum, nil + return cfgRecord.SellNum, nil } // 出售棋子 func (cb *ChessBorad) SellChess(id int) ([]*item.Item, error) { - CfgRecord, err := mergeDataCfg.GetOne(id) + cfgRecord, err := mergeDataCfg.GetOne(id) if err != nil { return nil, errors.New("配置错误") } @@ -243,24 +243,24 @@ func (cb *ChessBorad) SellChess(id int) ([]*item.Item, error) { cb.ChessList = newList var items []*item.Item - switch CfgRecord.SellType { + switch cfgRecord.SellType { case "star": - items = append(items, &item.Item{Id: item.ITEM_STAR_ID, Num: CfgRecord.SellNum}) + items = append(items, &item.Item{Id: item.ITEM_STAR_ID, Num: cfgRecord.SellNum}) case "diamond": - items = append(items, &item.Item{Id: item.ITEM_DIAMOND_ID, Num: CfgRecord.SellNum}) + items = append(items, &item.Item{Id: item.ITEM_DIAMOND_ID, Num: cfgRecord.SellNum}) case "energy": - items = append(items, &item.Item{Id: item.ITEM_ENERGY_ID, Num: CfgRecord.SellNum}) + items = append(items, &item.Item{Id: item.ITEM_ENERGY_ID, Num: cfgRecord.SellNum}) case "Racing Battery": - items = append(items, &item.Item{Id: item.ITEM_RACING_BATTERY_ID, Num: CfgRecord.SellNum}) + items = append(items, &item.Item{Id: item.ITEM_RACING_BATTERY_ID, Num: cfgRecord.SellNum}) } return items, nil } // 移除棋子 -func (cb *ChessBorad) RemoveChess(Id int) error { +func (cb *ChessBorad) RemoveChess(id int) error { find := false for k, v := range cb.ChessList { - if v == Id { + if v == id { cb.ChessList = append(cb.ChessList[:k], cb.ChessList[k+1:]...) find = true break @@ -269,11 +269,11 @@ func (cb *ChessBorad) RemoveChess(Id int) error { if !find { return errors.New("chess id not exist") } - ChessType := mergeDataCfg.GetTypeById(Id) - if ChessType == "Emitter" { - v, ok := cb.EmitList[Id] + chessType := mergeDataCfg.GetTypeById(id) + if chessType == "Emitter" { + v, ok := cb.EmitList[id] if v > 0 && ok { - cb.EmitList[Id]-- + cb.EmitList[id]-- } } return nil @@ -282,39 +282,39 @@ func (cb *ChessBorad) RemoveChess(Id int) error { // emitListToSlice 将 EmitList 过滤并转换为发射器 ID 列表。 // retireFilter 为 true 时过滤已退役的发射器。 func (cb *ChessBorad) emitListToSlice(retireFilter bool) []int { - EM := make(map[string]int) + emitMap := make(map[string]int) for k, v := range cb.EmitList { if v <= 0 { delete(cb.EmitList, k) continue } - EmitID := mergeDataCfg.GetEmitId(k) - if EmitID == "" { + emitID := mergeDataCfg.GetEmitId(k) + if emitID == "" { continue } - if retireFilter && cb.Retire[EmitID] >= EMIT_RETIRE_START { + if retireFilter && cb.Retire[emitID] >= EMIT_RETIRE_START { continue } if mergeDataCfg.GetEmitType(k) == "sub" { continue } - EM[EmitID] = max(EM[EmitID], k) + emitMap[emitID] = max(emitMap[emitID], k) } for _, v := range cb.ChessBag.List { - EmitID := mergeDataCfg.GetEmitId(v.ChessId) - if EmitID == "" { + emitID := mergeDataCfg.GetEmitId(v.ChessId) + if emitID == "" { continue } - if retireFilter && cb.Retire[EmitID] >= EMIT_RETIRE_START { + if retireFilter && cb.Retire[emitID] >= EMIT_RETIRE_START { continue } if mergeDataCfg.GetEmitType(v.ChessId) == "sub" { continue } - EM[EmitID] = max(EM[EmitID], (v.ChessId)) + emitMap[emitID] = max(emitMap[emitID], (v.ChessId)) } - result := make([]int, 0, len(EM)) - for _, v := range EM { + result := make([]int, 0, len(emitMap)) + for _, v := range emitMap { result = append(result, v) } if !retireFilter { @@ -336,7 +336,7 @@ func (cb *ChessBorad) GetEmitList() []int { } // 完成订单 移除棋子 -func (cb *ChessBorad) FinishOrder(ChessId []int) error { +func (cb *ChessBorad) FinishOrder(chessId []int) error { unlockChessList := cb.GetUnlockChessList() unlockChessMap := make(map[int]int) for _, v := range unlockChessList { @@ -344,13 +344,13 @@ func (cb *ChessBorad) FinishOrder(ChessId []int) error { } var boardChess []int - var BagChess []int - for _, v := range ChessId { + var bagChess []int + for _, v := range chessId { if unlockChessMap[v] > 0 { unlockChessMap[v]-- boardChess = append(boardChess, v) } else { - BagChess = append(BagChess, v) + bagChess = append(bagChess, v) } } for _, v := range boardChess { @@ -359,7 +359,7 @@ func (cb *ChessBorad) FinishOrder(ChessId []int) error { return err } } - for _, v := range BagChess { + for _, v := range bagChess { err := cb.FinishOrderChessByBag(v) if err != nil { return err @@ -369,37 +369,47 @@ func (cb *ChessBorad) FinishOrder(ChessId []int) error { } // 完成订单 移除棋子 -func (cb *ChessBorad) FinishOrderChess(Chess int) error { +func (cb *ChessBorad) FinishOrderChess(chess int) error { for k, v := range cb.ChessList { - if v == Chess { + if v == chess { cb.ChessList = append(cb.ChessList[:k], cb.ChessList[k+1:]...) return nil } } - return fmt.Errorf("order finish board chess id：%d not exist", Chess) + return fmt.Errorf("order finish board chess id：%d not exist", chess) +} + +func (cb *ChessBorad) GetChessBagList() []int { + var chessBag []int + for _, v := range cb.ChessBag.List { + if v.ChessId > 0 { + chessBag = append(chessBag, v.ChessId) + } + } + return chessBag } // 完成订单 移除棋子 -func (cb *ChessBorad) FinishOrderChessByBag(Chess int) error { +func (cb *ChessBorad) FinishOrderChessByBag(chess int) error { for k, v := range cb.ChessBag.List { - if v.ChessId == Chess { + if v.ChessId == chess { cb.ChessBag.List[k] = ChessBagGrid{} return nil } } - return fmt.Errorf("order finish bag chess id：%d not exist", Chess) + return fmt.Errorf("order finish bag chess id：%d not exist", chess) } // 棋子转换 -func (cb *ChessBorad) ExChess(OldChessId, NewChessId int) error { - if OldChessId > 0 { - newList, b := GoUtil.PopElemSlice(cb.ChessList, OldChessId) +func (cb *ChessBorad) ExChess(oldChessId, newChessId int) error { + if oldChessId > 0 { + newList, b := GoUtil.PopElemSlice(cb.ChessList, oldChessId) if !b { return fmt.Errorf("ExChess chess id not exist") } cb.ChessList = newList } - return cb.AddChess(NewChessId) + return cb.AddChess(newChessId) } // 增加棋盘缓冲器 @@ -407,82 +417,82 @@ func (cb *ChessBorad) AddChessBuff(chess int) { cb.ChessBuff = append(cb.ChessBuff, chess) } -func (cb *ChessBorad) AddHonor(Id int) { - cb.Honor[Id] = 1 +func (cb *ChessBorad) AddHonor(id int) { + cb.Honor[id] = 1 } -func (cb *ChessBorad) RemoveHonor(Id int) { - delete(cb.Honor, Id) +func (cb *ChessBorad) RemoveHonor(id int) { + delete(cb.Honor, id) } // 从暂存区添加棋子到棋盘 -func (cb *ChessBorad) GetChessFromBuff(Chess int) error { +func (cb *ChessBorad) GetChessFromBuff(chess int) error { for i, v := range cb.ChessBuff { - if v == Chess { + if v == chess { cb.ChessBuff = append(cb.ChessBuff[:i], cb.ChessBuff[i+1:]...) - return cb.AddChess(Chess) + return cb.AddChess(chess) } } return errors.New("chess id not exist") } // 扣除零件 -func (cb *ChessBorad) LosePart(PartId int, Num int) error { - v, ok := cb.PartBag.List[PartId] - if !ok || v.Num < Num { - return errors.New("part id not exist or num not enough" + fmt.Sprintf("PartId: %d, Num: %d, ok: %v", PartId, Num, ok)) +func (cb *ChessBorad) LosePart(partId int, num int) error { + v, ok := cb.PartBag.List[partId] + if !ok || v.Num < num { + return errors.New("part id not exist or num not enough" + fmt.Sprintf("PartId: %d, Num: %d, ok: %v", partId, num, ok)) } - v.Num -= Num - cb.PartBag.List[PartId] = v + v.Num -= num + cb.PartBag.List[partId] = v return nil } // 返回数据 func (cb *ChessBorad) BackData() *msg.ResPlayerChessInfo { - var ChessBagGrids []*msg.ChessBagGrid + var chessBagGrids []*msg.ChessBagGrid for k, v := range cb.ChessBag.List { - ChessBagGrids = append(ChessBagGrids, &msg.ChessBagGrid{ + chessBagGrids = append(chessBagGrids, &msg.ChessBagGrid{ Id: int32(k), ChessId: int32(v.ChessId), EmitId: int32(v.EmitId), }) } - var PartBagGrids []*msg.PartBagGrid + var partBagGrids []*msg.PartBagGrid for k, v := range cb.PartBag.List { - PartBagGrids = append(PartBagGrids, &msg.PartBagGrid{ + partBagGrids = append(partBagGrids, &msg.PartBagGrid{ PartId: int32(k), Count: int32(v.Num), }) } - Re := make([]string, 0, len(cb.Retire)) + retire := make([]string, 0, len(cb.Retire)) for k, v := range cb.Retire { if v == EMIT_RETIRE_END { - Re = append(Re, k) + retire = append(retire, k) } } - Ho := make([]int32, 0, len(cb.Honor)) + honor := make([]int32, 0, len(cb.Honor)) for k := range cb.Honor { - Ho = append(Ho, int32(k)) + honor = append(honor, int32(k)) } - Rw := make([]string, 0, len(cb.RetireReward)) + retireReward := make([]string, 0, len(cb.RetireReward)) for k, v := range cb.RetireReward { if v { - Rw = append(Rw, k) + retireReward = append(retireReward, k) } } return &msg.ResPlayerChessInfo{ ChessList: GoUtil.SliceIntToInt32(cb.ChessList), ChessBuff: GoUtil.SliceIntToInt32(cb.ChessBuff), - RetireEmit: Re, - RetireReward: Rw, - Honor: Ho, + RetireEmit: retire, + RetireReward: retireReward, + Honor: honor, ChessBag: &msg.ChessBag{ - ChessBagGrids: ChessBagGrids, + ChessBagGrids: chessBagGrids, ChessBuyCnt: int32(cb.ChessBag.Buy), ChessFreeCnt: int32(cb.ChessBag.Free), }, PartBag: &msg.PartBag{ - PartBagGrids: PartBagGrids, + PartBagGrids: partBagGrids, }, } } @@ -494,8 +504,8 @@ func (cb *ChessBorad) BuyChessBagGrid() error { cb.ChessBag.Free-- return nil } - MaxBuy := mergeDataCfg.GetChessBagBugNum() - if cb.ChessBag.Buy >= MaxBuy { + maxBuy := mergeDataCfg.GetChessBagBugNum() + if cb.ChessBag.Buy >= maxBuy { return fmt.Errorf("ChessBag can buy is full") } cb.ChessBag.Buy++ @@ -507,31 +517,31 @@ func (cb *ChessBorad) GetBuyChessBagGridCost() []*item.Item { if cb.ChessBag.Free > 0 { return nil } - NeedDiamond := 10 + 15*cb.ChessBag.Buy - return []*item.Item{{Id: item.ITEM_DIAMOND_ID, Num: -NeedDiamond}} + needDiamond := 10 + 15*cb.ChessBag.Buy + return []*item.Item{{Id: item.ITEM_DIAMOND_ID, Num: -needDiamond}} } // 升级触发解锁棋盘背包 -func (cb *ChessBorad) TriggerChessBagUnlock(Lv int) bool { - UnlockPack := userCfg.GetUnlockPack(Lv) - if UnlockPack > 0 { - cb.ChessBag.Free += UnlockPack +func (cb *ChessBorad) TriggerChessBagUnlock(lv int) bool { + unlockPack := userCfg.GetUnlockPack(lv) + if unlockPack > 0 { + cb.ChessBag.Free += unlockPack return true } return false } // 将棋子放入背包 -func (cb *ChessBorad) PutChessInBag(Grid, ChessId, EmitId int) error { - err := cb.RemoveChess(ChessId) +func (cb *ChessBorad) PutChessInBag(grid, chessId, emitId int) error { + err := cb.RemoveChess(chessId) if err != nil { return err } - if Grid == 0 { // 背包id为0且发射器已退役奖励已领取 直接放入荣誉室 - cb.AddHonor(ChessId) + if grid == 0 { // 背包id为0且发射器已退役奖励已领取 直接放入荣誉室 + cb.AddHonor(chessId) return nil } - v, ok := cb.ChessBag.List[Grid] + v, ok := cb.ChessBag.List[grid] if !ok { return errors.New("ChessBag Grid unlock") } @@ -539,50 +549,50 @@ func (cb *ChessBorad) PutChessInBag(Grid, ChessId, EmitId int) error { if v.ChessId > 0 { return errors.New("ChessBag Grid is not empty") } - cb.ChessBag.List[Grid] = ChessBagGrid{ - ChessId: ChessId, - EmitId: EmitId, + cb.ChessBag.List[grid] = ChessBagGrid{ + ChessId: chessId, + EmitId: emitId, } return nil } // 将零件放入背包 -func (cb *ChessBorad) PutPartInBag(ChessId int) error { - err := cb.RemoveChess(ChessId) +func (cb *ChessBorad) PutPartInBag(chessId int) error { + err := cb.RemoveChess(chessId) if err != nil { return err } - ChessLv := mergeDataCfg.GetLvById(ChessId) - ChessMaxLv := mergeDataCfg.GetMaxLvById(ChessId) + ChessLv := mergeDataCfg.GetLvById(chessId) + ChessMaxLv := mergeDataCfg.GetMaxLvById(chessId) if ChessLv != ChessMaxLv { // 零件只能放入满级棋子 return errors.New("part Lv is not max") } if cb.PartBag.List == nil { cb.PartBag.List = make(map[int]PartBagGrid) } - Num := cb.PartBag.List[ChessId].Num - cb.PartBag.List[ChessId] = PartBagGrid{ - PartId: ChessId, + Num := cb.PartBag.List[chessId].Num + cb.PartBag.List[chessId] = PartBagGrid{ + PartId: chessId, Num: Num + 1, } return nil } // 将棋子从背包取出 -func (cb *ChessBorad) TakeChessOutBag(Grid int) (int, error) { - if Grid < 0 { - cb.RemoveHonor(-Grid) - cb.AddChess(-Grid) +func (cb *ChessBorad) TakeChessOutBag(grid int) (int, error) { + if grid < 0 { + cb.RemoveHonor(-grid) + cb.AddChess(-grid) return 0, nil } - GridInfo, ok := cb.ChessBag.List[Grid] + GridInfo, ok := cb.ChessBag.List[grid] if !ok { return 0, errors.New("ChessBag Grid unlock") } if GridInfo.ChessId == 0 { return 0, errors.New("ChessBag Grid is empty") } - cb.ChessBag.List[Grid] = ChessBagGrid{} + cb.ChessBag.List[grid] = ChessBagGrid{} return GridInfo.ChessId, cb.AddChess(GridInfo.ChessId) } @@ -607,42 +617,42 @@ func (cb *ChessBorad) GetRetireEmit() map[string]int { } // 获取退役发射器的棋子列表 -func (cb *ChessBorad) GetRetireChess(EmitType string) []int { - v, ok := cb.RetireChessMap[EmitType] +func (cb *ChessBorad) GetRetireChess(emitType string) []int { + v, ok := cb.RetireChessMap[emitType] if !ok { return nil } if len(v) == 1 { - cb.RetireChessMap[EmitType] = nil + cb.RetireChessMap[emitType] = nil return v } if len(v) == 0 { return nil } - cb.RetireChessMap[EmitType] = v[2:] + cb.RetireChessMap[emitType] = v[2:] return v[:2] } // 开始退役 -func (cb *ChessBorad) BeginRetire(EmitType string) error { +func (cb *ChessBorad) BeginRetire(emitType string) error { if cb.Retire == nil { cb.Retire = make(map[string]int) } - _, ok := cb.Retire[EmitType] + _, ok := cb.Retire[emitType] if ok { return errors.New("chess has been retired") } - cb.Retire[EmitType] = EMIT_RETIRE_START + cb.Retire[emitType] = EMIT_RETIRE_START return nil } // 退役棋子处理 -func (cb *ChessBorad) RetireOrder(EmitType string) error { - if cb.Retire[EmitType] != 1 { +func (cb *ChessBorad) RetireOrder(emitType string) error { + if cb.Retire[emitType] != 1 { return errors.New("chess has not been retired") } chess := make([]int, 0, len(cb.ChessMap)) - EmitProduct := mergeDataCfg.GetEmitOrderProduce(EmitType) + EmitProduct := mergeDataCfg.GetEmitOrderProduce(emitType) for k, v := range cb.ChessMap { arr := strings.Split(k, "@") Color := mergeDataCfg.GetColorById(int(v)) @@ -652,31 +662,31 @@ func (cb *ChessBorad) RetireOrder(EmitType string) error { } sort.Sort(sort.Reverse(sort.IntSlice(chess))) - cb.RetireChessMap[EmitType] = chess - cb.Retire[EmitType] = EMIT_RETIRE_ING + cb.RetireChessMap[emitType] = chess + cb.Retire[emitType] = EMIT_RETIRE_ING return nil } // 完成退役 -func (cb *ChessBorad) FinishRetire(EmitType string) error { - _, ok := cb.Retire[EmitType] +func (cb *ChessBorad) FinishRetire(emitType string) error { + _, ok := cb.Retire[emitType] if !ok { return errors.New("chess has not been retired") } - cb.Retire[EmitType] = EMIT_RETIRE_END + cb.Retire[emitType] = EMIT_RETIRE_END return nil } // 获取资源宝箱奖励 -func (cb *ChessBorad) SourceChest(ChessId int) ([]*item.Item, error) { - err := cb.RemoveChess(ChessId) +func (cb *ChessBorad) SourceChest(chessId int) ([]*item.Item, error) { + err := cb.RemoveChess(chessId) if err != nil { return nil, err } - if ChessId == CHESS_SOURCE_CHEST { + if chessId == CHESS_SOURCE_CHEST { return mergeDataCfg.GetSourceChestItem(), nil } - if ChessId == CHESS_HIGH_SOURCE_CHEST { + if chessId == CHESS_HIGH_SOURCE_CHEST { return mergeDataCfg.GetHighSourceChestItem(), nil } @@ -684,16 +694,16 @@ func (cb *ChessBorad) SourceChest(ChessId int) ([]*item.Item, error) { } // 降低棋子等级 -func (cb *ChessBorad) SeparateChess(ChessId int) (int, error) { - ChessLv := mergeDataCfg.GetLvById(ChessId) - if ChessLv == 1 { +func (cb *ChessBorad) SeparateChess(chessId int) (int, error) { + chessLv := mergeDataCfg.GetLvById(chessId) + if chessLv == 1 { return 0, errors.New("chess lv is 1") } - ChessType := mergeDataCfg.GetTypeById(ChessId) - if ChessType != "Product" { + chessType := mergeDataCfg.GetTypeById(chessId) + if chessType != "Product" { return 0, errors.New("chess type is not product") } - err := cb.RemoveChess(ChessId) + err := cb.RemoveChess(chessId) if err != nil { return 0, err } @@ -701,25 +711,25 @@ func (cb *ChessBorad) SeparateChess(ChessId int) (int, error) { if err != nil { return 0, err } - ChessColor := mergeDataCfg.GetColorById(ChessId) - NewChess := mergeDataCfg.GetChessIdByLvAndColor(ChessLv-1, ChessColor) - cb.AddChess(NewChess) - cb.AddChess(NewChess) - return NewChess, nil + chessColor := mergeDataCfg.GetColorById(chessId) + newChess := mergeDataCfg.GetChessIdByLvAndColor(chessLv-1, chessColor) + cb.AddChess(newChess) + cb.AddChess(newChess) + return newChess, nil } // 提高棋子等级 -func (cb *ChessBorad) UpgradeChess(ChessId int) (int, error) { - ChessLv := mergeDataCfg.GetLvById(ChessId) - ChessMaxLv := mergeDataCfg.GetMaxLvById(ChessId) - if ChessLv == ChessMaxLv { +func (cb *ChessBorad) UpgradeChess(chessId int) (int, error) { + chessLv := mergeDataCfg.GetLvById(chessId) + chessMaxLv := mergeDataCfg.GetMaxLvById(chessId) + if chessLv == chessMaxLv { return 0, errors.New("chess lv is max") } - ChessType := mergeDataCfg.GetTypeById(ChessId) - if ChessType != "Product" { + chessType := mergeDataCfg.GetTypeById(chessId) + if chessType != "Product" { return 0, errors.New("chess type is not product") } - err := cb.RemoveChess(ChessId) + err := cb.RemoveChess(chessId) if err != nil { return 0, err } @@ -727,9 +737,9 @@ func (cb *ChessBorad) UpgradeChess(ChessId int) (int, error) { if err != nil { return 0, err } - NewChess := mergeDataCfg.GetChessIdByLvAndColor(ChessLv+1, mergeDataCfg.GetColorById(ChessId)) - cb.AddChess(NewChess) - return NewChess, nil + newChess := mergeDataCfg.GetChessIdByLvAndColor(chessLv+1, mergeDataCfg.GetColorById(chessId)) + cb.AddChess(newChess) + return newChess, nil } func (cb *ChessBorad) GetPartBag() map[int]int { @@ -740,14 +750,14 @@ func (cb *ChessBorad) GetPartBag() map[int]int { return res } -func (cb *ChessBorad) GetRetireReward(Id string) ([]*item.Item, error) { - if cb.RetireReward[Id] == true { +func (cb *ChessBorad) GetRetireReward(id string) ([]*item.Item, error) { + if cb.RetireReward[id] == true { return nil, errors.New("emit retire reward has been get") } - if cb.Retire[Id] != EMIT_RETIRE_END { + if cb.Retire[id] != EMIT_RETIRE_END { return nil, errors.New("emit not finish retire") } - cb.RetireReward[Id] = true + cb.RetireReward[id] = true return mergeDataCfg.GetRetireReward(), nil } diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index e276000f..8adad8b3 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -64,10 +64,10 @@ func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { if err != nil { return err } - Uid := int(detail.DwUin) - PlayerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(Uid) - if PlayerSimpleData == nil { - log.Debug("玩家不存在, Uid:%d", Uid) + uid := int(detail.DwUin) + playerSimpleData := G_GameLogicPtr.GetSimplePlayerByUid(uid) + if playerSimpleData == nil { + log.Debug("玩家不存在, Uid:%d", uid) player.SendErrClienRes(&msg.ResPlayerBriefProfileData{ DwUin: detail.DwUin, }) @@ -75,13 +75,13 @@ func ReqPlayerBriefProfileDataFunc(player *Player, buf []byte) error { } player.PushClientRes(&msg.ResPlayerBriefProfileData{ DwUin: detail.DwUin, - ImageFrame: int32(PlayerSimpleData.Avatar), - ImageIcon: int32(PlayerSimpleData.Face), - DecorateCnt: int32(PlayerSimpleData.Decorate), - PicURL: PlayerSimpleData.FaceBookPic, - ActiveTime: int32(max(PlayerSimpleData.Loginout, PlayerSimpleData.Login)), - NickName: PlayerSimpleData.Name, - SetEmoji: GoUtil.MapIntToInt32(PlayerSimpleData.Emoji), + ImageFrame: int32(playerSimpleData.Avatar), + ImageIcon: int32(playerSimpleData.Face), + DecorateCnt: int32(playerSimpleData.Decorate), + PicURL: playerSimpleData.FaceBookPic, + ActiveTime: int32(max(playerSimpleData.Loginout, playerSimpleData.Login)), + NickName: playerSimpleData.Name, + SetEmoji: GoUtil.MapIntToInt32(playerSimpleData.Emoji), }) return nil } @@ -92,16 +92,16 @@ func ReqFriendPlayerSimple(player *Player, buf []byte) error { if err != nil { return err } - Uid := int(detail.Uid) - PlayerSimpleData := G_GameLogicPtr.GetResFriendPlayerByUid(Uid) - if PlayerSimpleData == nil { - log.Debug("玩家不存在, Uid:%d", Uid) + uid := int(detail.Uid) + playerSimpleData := G_GameLogicPtr.GetResFriendPlayerByUid(uid) + if playerSimpleData == nil { + log.Debug("玩家不存在, Uid:%d", uid) return errors.New("玩家不存在") } FriendMod := player.PlayMod.getFriendMod() - PlayerSimpleData.AddTime = FriendMod.GetAddTime(Uid) - PlayerSimpleData.Interact = FriendMod.GetInteractTime(Uid) - player.PushClientRes(PlayerSimpleData) + playerSimpleData.AddTime = FriendMod.GetAddTime(uid) + playerSimpleData.Interact = FriendMod.GetInteractTime(uid) + player.PushClientRes(playerSimpleData) return nil } @@ -150,10 +150,10 @@ func RegSetEneryFunc(player *Player, buf []byte) error { if err != nil { return err } - MaxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) + maxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player) BaseMod := player.PlayMod.getBaseMod() - EnergyMul := BaseMod.GetEnergyMul() - if int(req.EnergyMul) > EnergyMul && int(req.EnergyMul) > MaxEnergyMul { + energyMul := BaseMod.GetEnergyMul() + if int(req.EnergyMul) > energyMul && int(req.EnergyMul) > maxEnergyMul { player.SendErrClienRes(&msg.ResSetEnergyMul{ ResultCode: msg.RES_CODE_FAIL, Msg: "能量倍数超过最大值", @@ -167,10 +167,10 @@ func RegSetEneryFunc(player *Player, buf []byte) error { }) player.PlayMod.getBaseMod().SetEnergyMul(int(req.EnergyMul)) OrderMod := player.PlayMod.getOrderMod() - Lv := player.GetPlayerBaseMod().GetLevel() - Emit := player.PlayMod.getChessMod().GetOrderEmit() - ChessList := player.PlayMod.getChessMod().GetUnlockChessList() - OrderMod.ChangeEnergyMul(Lv, Emit, int(req.EnergyMul), ChessList) + lv := player.GetPlayerBaseMod().GetLevel() + emit := player.PlayMod.getChessMod().GetOrderEmit() + chessList := player.PlayMod.getChessMod().GetUnlockChessList() + OrderMod.ChangeEnergyMul(lv, emit, int(req.EnergyMul), chessList) player.InitOrderItem() player.PlayMod.save() player.PushClientRes(OrderMod.BackData()) @@ -221,8 +221,8 @@ func RegHandbookAllReward(player *Player, buf []byte) error { if err != nil { return err } - AllChess := mergeDataCfg.GetAllChessBySeries(req.Type) - Items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, AllChess) + allChess := mergeDataCfg.GetAllChessBySeries(req.Type) + items, err := player.PlayMod.getHandbookMod().CollectItem(req.Type, allChess) if err != nil { player.SendErrClienRes(&msg.ResHandbookAllReward{ Code: msg.RES_CODE_FAIL, @@ -230,7 +230,7 @@ func RegHandbookAllReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_HandbookAllReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_HandbookAllReward.String()) if err != nil { player.SendErrClienRes(&msg.ResHandbookAllReward{ Code: msg.RES_CODE_FAIL, @@ -256,7 +256,7 @@ func RegHandbookAllReward(player *Player, buf []byte) error { }) player.TeLog("collection_like", map[string]interface{}{ "collection_type": req.Type, - "collection_reward": Items, + "collection_reward": items, }) player.PushClientRes(player.PlayMod.getHandbookMod().BackData()) player.PlayMod.save() @@ -273,17 +273,17 @@ func ReqRewardOrder(player *Player, buf []byte) error { OrderMod := player.PlayMod.getOrderMod() ChessMod := player.PlayMod.getChessMod() LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() - Item, mergeList, OrderType, Star, err := OrderMod.RewardOrder(int(req.OrderId)) - if OrderType == order.Pet_type { - Item = player.FormatPetOrderItem(Item) + items, mergeList, orderType, star, err := OrderMod.RewardOrder(int(req.OrderId)) + if orderType == order.Pet_type { + items = player.FormatPetOrderItem(items) } - if OrderType == order.Super_type { + if orderType == order.Super_type { virtualEnergy := order.GetVirtualEnergy(mergeList, ChessMod.GetStarEmitList()) superOrderItem := limitedTimeEventCfg.GetSuperOrderReward(virtualEnergy) - Item = item.Merge(Item, superOrderItem) + items = item.Merge(items, superOrderItem) } - ActItem := player.GetActivityItem(GoUtil.Int32ToInt(req.ActType)) - Item = item.Merge(Item, ActItem) + actItem := player.GetActivityItem(GoUtil.Int32ToInt(req.ActType)) + items = item.Merge(items, actItem) if !OrderMod.CheckSuperOrder() { if LimitedTimeEventMod.RemoveSuperOrder() { player.PushClientRes(&msg.LimitEventNotify{ @@ -293,25 +293,25 @@ func ReqRewardOrder(player *Player, buf []byte) error { } } if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_METEOR_SHOW) { //流星雨活动 - AddItem := LimitedTimeEventMod.GetMeteorReward(mergeList, ChessMod.GetStarEmitList()) - if len(AddItem) > 0 { + addItem := LimitedTimeEventMod.GetMeteorReward(mergeList, ChessMod.GetStarEmitList()) + if len(addItem) > 0 { player.TeLog("time_limited_event_action", map[string]interface{}{ "event_type": limitedTimeEventCfg.GetEventName(limitedTimeEvent.EVENT_TYPE_METEOR_SHOW), - "item_list": AddItem, + "item_list": addItem, }) } - Item = item.Merge(Item, AddItem) + items = item.Merge(items, addItem) } if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_MONEY_CAT) { //招财猫活动 - if OrderType != order.Super_type { - AddItem := LimitedTimeEventMod.GetMoneyCatReward(mergeList) - if len(AddItem) > 0 { + if orderType != order.Super_type { + addItem := LimitedTimeEventMod.GetMoneyCatReward(mergeList) + if len(addItem) > 0 { player.TeLog("time_limited_event_action", map[string]interface{}{ "event_type": limitedTimeEventCfg.GetEventName(limitedTimeEvent.EVENT_TYPE_MONEY_CAT), - "item_list": AddItem, + "item_list": addItem, }) } - Item = item.Merge(Item, AddItem) + items = item.Merge(items, addItem) } } if err != nil { @@ -331,7 +331,7 @@ func ReqRewardOrder(player *Player, buf []byte) error { return err } - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_OrderReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_OrderReward.String()) if err != nil { player.SendErrClienRes(&msg.ResRewardOrder{ Code: msg.RES_CODE_FAIL, @@ -341,9 +341,9 @@ func ReqRewardOrder(player *Player, buf []byte) error { } if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CHEST_RAIN) { //宝箱雨活动 - ChestRainItems := LimitedTimeEventMod.GetChestReward(mergeList, ChessMod.GetStarEmitList()) + chestRainItems := LimitedTimeEventMod.GetChestReward(mergeList, ChessMod.GetStarEmitList()) player.args["ResItemPopId"] = req.OrderId - err = player.HandleItem(ChestRainItems, msg.ITEM_POP_LABEL_LimitEventChestRain.String()) + err = player.HandleItem(chestRainItems, msg.ITEM_POP_LABEL_LimitEventChestRain.String()) if err != nil { player.SendErrClienRes(&msg.ResRewardOrder{ Code: msg.RES_CODE_FAIL, @@ -352,14 +352,14 @@ func ReqRewardOrder(player *Player, buf []byte) error { return err } - if len(ChestRainItems) > 0 { + if len(chestRainItems) > 0 { player.PushClientRes(&msg.ResChessRainReward{ - Items: item.ItemToMsg(ChestRainItems), + Items: item.ItemToMsg(chestRainItems), Id: 0, }) player.TeLog("time_limited_event_action", map[string]interface{}{ "event_type": limitedTimeEventCfg.GetEventName(limitedTimeEvent.EVENT_TYPE_CHEST_RAIN), - "item_list": ChestRainItems, + "item_list": chestRainItems, }) } } @@ -377,7 +377,7 @@ func ReqRewardOrder(player *Player, buf []byte) error { player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_FINISHORDER}) order_star_reward := 0 order_item_reward := []int{} - for _, v := range Item { + for _, v := range items { if v.Id == item.ITEM_STAR_ID { order_star_reward += v.Num } else { @@ -385,32 +385,26 @@ func ReqRewardOrder(player *Player, buf []byte) error { } } preset_order_group := 0 - if OrderType != order.Preview_type && OrderType != order.Fixed_type { + if orderType != order.Preview_type && orderType != order.Fixed_type { preset_order_group = -1 } preset_order_group, preset_order_step := orderCfg.GetStartOrderInfo(int(req.OrderId)) player.TeLog("order_finish", map[string]interface{}{ "order_id": int(req.OrderId), "order_item_id": mergeList, - "order_type": OrderType, + "order_type": orderType, "order_star_reward": order_star_reward, "order_item_reward": order_item_reward, - "order_star_value": Star, + "order_star_value": star, "preset_order_group": preset_order_group, "preset_order_step": preset_order_step, }) - player.PetItemGetLog(Item, nil, "Order") + player.PetItemGetLog(items, nil, "Order") player.EmitRetireTrigger2() Lv := player.GetPlayerBaseMod().GetLevel() EnergyMul := player.PlayMod.getBaseMod().GetEnergyMul() Emit := ChessMod.GetOrderEmit() player.TriggerSeedSource() - //NewOrder := TriggerSeedOrder(player) - // if NewOrder == nil || len(NewOrder.MergeId) == 0 { - // OrderMod.CreateOrder(Lv, Emit, EnergyMul) - // } else { - // OrderMod.CreateOrderSeed(NewOrder) - // } player.TriggerOrder(Lv, order.TRIGGER_TYPE_ORDER, Emit, EnergyMul) player.AddOrder() player.AddHighOrder() @@ -424,22 +418,22 @@ func ReqRewardOrder(player *Player, buf []byte) error { // 锦标赛增加积分 if player.GetPlayerBaseMod().GetLevel() >= 17 { - ChessList := make([]int, 0) + chessList := make([]int, 0) for _, v := range mergeList { color := mergeDataCfg.GetColorById(v) - Emit := order.GetEmitByColor(ChessMod.GetStarEmitList(), color) - EmitType := mergeDataCfg.GetEmitType(Emit) - if EmitType == "auto" { + emit := order.GetEmitByColor(ChessMod.GetStarEmitList(), color) + emitType := mergeDataCfg.GetEmitType(emit) + if emitType == "auto" { continue } - ChessList = append(ChessList, v) + chessList = append(chessList, v) } ChampshipMod := player.PlayMod.getChampshipMod() - ChampshipMod.AddScore(ChessList) + ChampshipMod.AddScore(chessList) player.HandleInChampshipRank() } FriendTreasureMod := player.PlayMod.getFriendTreasureMod() - FriendTreasureMod.AddStar(Star/20, player.GetOrderFactor()) + FriendTreasureMod.AddStar(star/20, player.GetOrderFactor()) player.PushClientRes(FriendTreasureMod.NotifyStar()) // 限时事件增加进度 LimitedTimeEventMod.AddProgress(player.GetPlayerBaseMod().GetLevel()) @@ -470,7 +464,7 @@ func ReqDelOrder(player *Player, buf []byte) error { return err } OrderMod := player.PlayMod.getOrderMod() - DelOrder, err := OrderMod.DelOrder(int(req.OrderId)) + delOrder, err := OrderMod.DelOrder(int(req.OrderId)) if err != nil { player.SendErrClienRes(&msg.ResDelOrder{ Code: msg.RES_CODE_FAIL, @@ -483,7 +477,7 @@ func ReqDelOrder(player *Player, buf []byte) error { }) player.TeLog("order_delete", map[string]interface{}{ "order_id": int(req.OrderId), - "order": DelOrder, + "order": delOrder, }) player.PushClientRes(OrderMod.BackData()) return nil @@ -497,12 +491,12 @@ func ReqDecorate(player *Player, buf []byte) error { return err } DecorateMod := player.PlayMod.getDecorateMod() - DecorateId := int(req.DecorateId) - AreaId := int(req.AreaId) + decorateId := int(req.DecorateId) + areaId := int(req.AreaId) LimitEventMod := player.PlayMod.getLimitedTimeEventMod() - DecorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) - CostItem, PetExp, PartItem := DecorateMod.GetDecorateCostItem(AreaId, DecorateId, DecorateOffIsExist) - err = player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 + decorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) + costItem, petExp, partItem := DecorateMod.GetDecorateCostItem(areaId, decorateId, decorateOffIsExist) + err = player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 if err != nil { player.SendErrClienRes(&msg.ResDecorate{ Code: msg.RES_CODE_FAIL, @@ -510,7 +504,7 @@ func ReqDecorate(player *Player, buf []byte) error { }) return err } - AddItem, err := DecorateMod.Decorate(AreaId, DecorateId) // 装饰 + addItem, err := DecorateMod.Decorate(areaId, decorateId) // 装饰 if err != nil { player.SendErrClienRes(&msg.ResDecorate{ Code: msg.RES_CODE_FAIL, @@ -520,8 +514,8 @@ func ReqDecorate(player *Player, buf []byte) error { } player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_DECORATE, A: []interface{}{1}}) EnergyItem := DecorateMod.GetDecorateAddEnergy(1) - AddItem = item.Merge(AddItem, EnergyItem) - err = player.HandleItem(AddItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具 + addItem = item.Merge(addItem, EnergyItem) + err = player.HandleItem(addItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具 if err != nil { player.SendErrClienRes(&msg.ResDecorate{ Code: msg.RES_CODE_FAIL, @@ -529,7 +523,7 @@ func ReqDecorate(player *Player, buf []byte) error { }) return err } - _, err = player.GetPlayerBaseMod().AddExp(player, 10, PetExp) + _, err = player.GetPlayerBaseMod().AddExp(player, 10, petExp) if err != nil { player.SendErrClienRes(&msg.ResDecorate{ Code: msg.RES_CODE_FAIL, @@ -537,14 +531,14 @@ func ReqDecorate(player *Player, buf []byte) error { }) return err } - if AddItem != nil { + if addItem != nil { player.TeLog("scene_reward", map[string]interface{}{ "deco_step_id": fmt.Sprintf("%d_%d", DecorateMod.AreaId, DecorateMod.Progress), - "item_list": AddItem, + "item_list": addItem, }) } // 跨越场景 - if DecorateMod.GetAreaId() != AreaId { // 解锁上报 + if DecorateMod.GetAreaId() != areaId { // 解锁上报 LimitEventMod := player.PlayMod.getLimitedTimeEventMod() if LimitEventMod.AddSenceDashTimes() { player.PushClientRes(LimitEventMod.BackData()) @@ -554,24 +548,24 @@ func ReqDecorate(player *Player, buf []byte) error { }) } player.TeLog("finish_deco", map[string]interface{}{ - "deco_step_id": fmt.Sprintf("%d_%d", AreaId, DecorateId), - "material_cost": PartItem, + "deco_step_id": fmt.Sprintf("%d_%d", areaId, decorateId), + "material_cost": partItem, }) FriendMod := player.PlayMod.getFriendMod() - if AreaId == 1 && DecorateId == 20 { + if areaId == 1 && decorateId == 20 { FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_RESTROOM, "") } - if AreaId == 1 && DecorateId == 29 { + if areaId == 1 && decorateId == 29 { FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_RESTAURANT, "") } - if AreaId == 1 && DecorateId == 36 { + if areaId == 1 && decorateId == 36 { FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_BATHROOM, "") } - if AreaId == 1 && DecorateId == 44 { + if areaId == 1 && decorateId == 44 { FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_CLOAKROOM, "") } - if AreaId != DecorateMod.AreaId { - FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_CHAPTER_SCENES, GoUtil.String(AreaId)) + if areaId != DecorateMod.AreaId { + FriendMod.AddActLog(friend.ACT_LOG_TYPE_COMPLETE_CHAPTER_SCENES, GoUtil.String(areaId)) } player.PlayMod.save() player.PushClientRes(DecorateMod.BackData()) @@ -592,20 +586,20 @@ func ReqDecorateAll(player *Player, buf []byte) error { return err } DecorateMod := player.PlayMod.getDecorateMod() - AreaId := DecorateMod.GetAreaId() - UnLockLv := decorateCfg.GetOneKeyDecorateUnlockLv() - if player.GetPlayerBaseMod().GetLevel() < UnLockLv { + areaId := DecorateMod.GetAreaId() + unLockLv := decorateCfg.GetOneKeyDecorateUnlockLv() + if player.GetPlayerBaseMod().GetLevel() < unLockLv { player.SendErrClienRes(&msg.ResDecorateAll{ Code: msg.RES_CODE_FAIL, - Msg: fmt.Sprintf("等级不足%d级", UnLockLv), + Msg: fmt.Sprintf("等级不足%d级", unLockLv), }) return errors.New("等级不足") } PlayerBaseMod := player.GetPlayerBaseMod() LimitEventMod := player.PlayMod.getLimitedTimeEventMod() - DecorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) - CostItem, AddItem, DecorateNum, DecorateList, Log, PetExp := DecorateMod.DecorateAll(PlayerBaseMod.GetStar(), DecorateOffIsExist) - err = player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 + decorateOffIsExist := LimitEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_DECORATE_OFF) + costItem, addItem, decorateNum, DecorateList, Log, PetExp := DecorateMod.DecorateAll(PlayerBaseMod.GetStar(), decorateOffIsExist) + err = player.HandleLoseItem(costItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具 if err != nil { player.SendErrClienRes(&msg.ResDecorateAll{ Code: msg.RES_CODE_FAIL, @@ -613,10 +607,10 @@ func ReqDecorateAll(player *Player, buf []byte) error { }) return err } - player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_DECORATE, A: []interface{}{DecorateNum}}) - EnergyItem := DecorateMod.GetDecorateAddEnergy(DecorateNum) - AddItem = item.Merge(AddItem, EnergyItem) - err = player.HandleItem(AddItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具 + player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_DECORATE, A: []interface{}{decorateNum}}) + EnergyItem := DecorateMod.GetDecorateAddEnergy(decorateNum) + addItem = item.Merge(addItem, EnergyItem) + err = player.HandleItem(addItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具 if err != nil { player.SendErrClienRes(&msg.ResDecorateAll{ Code: msg.RES_CODE_FAIL, @@ -624,7 +618,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { }) return err } - _, err = player.GetPlayerBaseMod().AddExp(player, 10*DecorateNum, PetExp) + _, err = player.GetPlayerBaseMod().AddExp(player, 10*decorateNum, PetExp) if err != nil { player.SendErrClienRes(&msg.ResDecorateAll{ Code: msg.RES_CODE_FAIL, @@ -634,7 +628,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { } deco_step_id := []string{} for _, v := range DecorateList { - deco_step_id = append(deco_step_id, fmt.Sprintf("%d_%d", AreaId, v)) + deco_step_id = append(deco_step_id, fmt.Sprintf("%d_%d", areaId, v)) } player.TeLog("one_click_decoration", map[string]interface{}{ "deco_step_id": fmt.Sprintf("%v", deco_step_id), @@ -645,7 +639,7 @@ func ReqDecorateAll(player *Player, buf []byte) error { player.TeLog("scene_reward", v.(map[string]interface{})) } } - if DecorateMod.GetAreaId() != AreaId { // 解锁上报 + if DecorateMod.GetAreaId() != areaId { // 解锁上报 LimitEventMod := player.PlayMod.getLimitedTimeEventMod() if LimitEventMod.AddSenceDashTimes() { player.PushClientRes(LimitEventMod.BackData()) @@ -673,7 +667,7 @@ func ReqAreaReward(player *Player, buf []byte) error { return err } DecorateMod := player.PlayMod.getDecorateMod() - RewardItem, err := DecorateMod.GetDecorateReward(int(req.AreaId)) + rewardItem, err := DecorateMod.GetDecorateReward(int(req.AreaId)) if err != nil { player.SendErrClienRes(&msg.ResAreaReward{ Code: msg.RES_CODE_FAIL, @@ -681,7 +675,7 @@ func ReqAreaReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(RewardItem, msg.ITEM_POP_LABEL_DecorateReward.String()) + err = player.HandleItem(rewardItem, msg.ITEM_POP_LABEL_DecorateReward.String()) if err != nil { player.SendErrClienRes(&msg.ResAreaReward{ Code: msg.RES_CODE_FAIL, @@ -702,6 +696,10 @@ func ReqAreaReward(player *Player, buf []byte) error { func UpdatePlayerChessDataFunc(player *Player, buf []byte) error { data := &PlayerChessData{} err := data.UpdatePlayerChessData(player, buf) + player.AddHighOrder() + player.AddHighOrder2() + player.InitOrderItem() + player.PushClientRes(player.PlayMod.getOrderMod().BackData()) player.RedBackData() player.UpdateUserInfo() return err @@ -718,13 +716,13 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error { HandbookMod := player.PlayMod.getHandbookMod() OrderMod := player.PlayMod.getOrderMod() BaseMod := player.PlayMod.getBaseMod() - ChessId := int(req.ChessId) - err = ChessMod.GetChessFromBuff(ChessId) - Update := HandbookMod.SetHandbook(ChessId) + chessId := int(req.ChessId) + err = ChessMod.GetChessFromBuff(chessId) + update := HandbookMod.SetHandbook(chessId) AddNewEmit := make([]int, 0) - if Update { + if update { player.PushClientRes(HandbookMod.BackData()) - AddNewEmit = append(AddNewEmit, ChessId) + AddNewEmit = append(AddNewEmit, chessId) } if err != nil { player.SendErrClienRes(&msg.ResGetChessFromBuff{ @@ -743,16 +741,16 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error { return err } player.TeLog("ReqGetChessFromBuff", map[string]interface{}{ - "chess_id": ChessId, + "chess_id": chessId, }) - Update = OrderMod.CreateExtraOrder([]int{ChessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel()) - triggerComposeChess(player, ChessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) + update = OrderMod.CreateExtraOrder([]int{chessId}, AddNewEmit, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel()) + triggerComposeChess(player, chessId, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) player.EmitRetireTrigger1() + player.AddHighOrder() + player.AddHighOrder2() + player.InitOrderItem() player.PlayMod.save() - if Update { - player.InitOrderItem() - player.PushClientRes(OrderMod.BackData()) - } + player.PushClientRes(OrderMod.BackData()) player.PushClientRes(ChessMod.BackData()) player.PushClientRes(&msg.ResGetChessFromBuff{ Code: msg.RES_CODE_SUCCESS, @@ -761,7 +759,7 @@ func ReqGetChessFromBuff(player *Player, buf []byte) error { return nil } -// 放置棋子进背包 +// 放置零件棋子进背包 func ReqPutPartInBag(player *Player, buf []byte) error { req := &msg.ReqPutPartInBag{} err := proto.Unmarshal(buf, req) @@ -844,7 +842,7 @@ func ReqTakeChessOutBag(player *Player, buf []byte) error { return err } ChessMod := player.PlayMod.getChessMod() - ChessId, err := ChessMod.TakeChessOutBag(int(req.BagId)) + chessId, err := ChessMod.TakeChessOutBag(int(req.BagId)) if err != nil { player.SendErrClienRes(&msg.ResTakeChessOutBag{ Code: msg.RES_CODE_FAIL, @@ -863,13 +861,13 @@ func ReqTakeChessOutBag(player *Player, buf []byte) error { } OrderMod := player.PlayMod.getOrderMod() BaseMod := player.PlayMod.getBaseMod() - Update := OrderMod.CreateExtraOrder([]int{ChessId}, nil, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel()) - if Update { + update := OrderMod.CreateExtraOrder([]int{chessId}, nil, ChessMod.GetUnlockChessList(), BaseMod.GetEnergyMul(), BaseMod.GetLevel()) + if update { player.PushClientRes(OrderMod.BackData()) } player.TeLog("ReqTakeChessOutBag", map[string]interface{}{ "bag_id": req.BagId, - "chess_id": ChessId, + "chess_id": chessId, }) player.InitOrderItem() player.PlayMod.save() @@ -888,8 +886,8 @@ func ReqBuyChessBagGrid(player *Player, buf []byte) error { return err } ChessMod := player.PlayMod.getChessMod() - CostItem := ChessMod.GetBuyChessBagGridCost() - err = player.HandleItem(CostItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String()) + costItem := ChessMod.GetBuyChessBagGridCost() + err = player.HandleItem(costItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyChessBagGrid{ Code: msg.RES_CODE_FAIL, @@ -911,10 +909,10 @@ func ReqBuyChessBagGrid(player *Player, buf []byte) error { player.PushClientRes(&msg.ResBuyChessBagGrid{ Code: msg.RES_CODE_SUCCESS, }) - if len(CostItem) > 0 { + if len(costItem) > 0 { player.TeLog("warehouse_unlock", map[string]interface{}{ "unlock_type": "diamond", - "unlock_cost": CostItem[0].Num, + "unlock_cost": costItem[0].Num, }) } return nil @@ -927,7 +925,7 @@ func ReqSeparateChess(player *Player, buf []byte) error { return err } ChessMod := player.PlayMod.getChessMod() - NewChess, err := ChessMod.SeparateChess(int(req.ChessId)) + newChess, err := ChessMod.SeparateChess(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResSeparateChess{ Code: msg.RES_CODE_FAIL, @@ -946,15 +944,15 @@ func ReqSeparateChess(player *Player, buf []byte) error { } player.TeLog("ReqSeparateChess", map[string]interface{}{ "chess_id": req.ChessId, - "new_chess": NewChess, + "new_chess": newChess, }) player.PlayMod.save() player.PushClientRes(ChessMod.BackData()) player.PushClientRes(&msg.ResSeparateChess{ Code: msg.RES_CODE_SUCCESS, }) - triggerComposeChess(player, NewChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) - triggerComposeChess(player, NewChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) + triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) + triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) player.TeLog("scissors_use", map[string]interface{}{ "scissors_item_id": int(req.ChessId), }) @@ -969,7 +967,7 @@ func ReqUpgradeChess(player *Player, buf []byte) error { return err } ChessMod := player.PlayMod.getChessMod() - NewChess, err := ChessMod.UpgradeChess(int(req.ChessId)) + newChess, err := ChessMod.UpgradeChess(int(req.ChessId)) if err != nil { player.SendErrClienRes(&msg.ResUpgradeChess{ Code: msg.RES_CODE_FAIL, @@ -988,11 +986,11 @@ func ReqUpgradeChess(player *Player, buf []byte) error { } player.TeLog("wand_use", map[string]interface{}{ "wand_item_id": req.ChessId, - "new_chess": NewChess, + "new_chess": newChess, }) Handbook := player.PlayMod.getHandbookMod() - Handbook.SetHandbook(NewChess) - triggerComposeChess(player, NewChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) + Handbook.SetHandbook(newChess) + triggerComposeChess(player, newChess, player.PlayMod.getBaseMod().EnergyMul, player.PlayMod.getChessMod().GetEmitList()) player.PlayMod.save() player.PushClientRes(ChessMod.BackData()) player.PushClientRes(&msg.ResUpgradeChess{ @@ -1099,8 +1097,8 @@ func ReqSourceChest(player *Player, buf []byte) error { return err } ChessMod := player.PlayMod.getChessMod() - ChestId := int(req.ChestId) - Items, err := ChessMod.SourceChest(ChestId) + chestId := int(req.ChestId) + items, err := ChessMod.SourceChest(chestId) if err != nil { player.SendErrClienRes(&msg.ResSourceChest{ Code: msg.RES_CODE_FAIL, @@ -1108,7 +1106,7 @@ func ReqSourceChest(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_SourceChest.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_SourceChest.String()) if err != nil { player.SendErrClienRes(&msg.ResSourceChest{ Code: msg.RES_CODE_FAIL, @@ -1127,8 +1125,8 @@ func ReqSourceChest(player *Player, buf []byte) error { } player.PlayMod.save() player.TeLog("ReqSourceChest", map[string]interface{}{ - "chest_id": ChestId, - "item_list": Items, + "chest_id": chestId, + "item_list": items, }) player.PushClientRes(ChessMod.BackData()) player.PushClientRes(&msg.ResSourceChest{ @@ -1233,7 +1231,7 @@ func ReqExStarReward(player *Player, buf []byte) error { return err } CardMod := player.PlayMod.getCardMod() - itemList, CostStar, err := CardMod.ExStarReward(int(req.Id)) + itemList, costStar, err := CardMod.ExStarReward(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResExStarReward{ Code: msg.RES_CODE_FAIL, @@ -1252,7 +1250,7 @@ func ReqExStarReward(player *Player, buf []byte) error { } player.TeLog("sticker_exchange", map[string]interface{}{ // "pack_id": int(req.Id), - "sticker_cost": CostStar, + "sticker_cost": costStar, "item_list": itemList, }) player.PlayMod.save() @@ -1589,8 +1587,8 @@ func ReqBuyEnergy(player *Player, buf []byte) error { } BaseMod := player.PlayMod.getBaseMod() ChargeMod := player.PlayMod.getChargeMod() - Item, Energy, Diamond := ChargeMod.BuyEnergy(player.IsWeeklyDiscount()) - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_BuyEnergy.String()) + items, energy, diamond := ChargeMod.BuyEnergy(player.IsWeeklyDiscount()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_BuyEnergy.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyEnergy{ Code: msg.RES_CODE_FAIL, @@ -1605,15 +1603,15 @@ func ReqBuyEnergy(player *Player, buf []byte) error { }) player.ChargeBackData() player.TeLog("buy_energy_diamond", map[string]interface{}{ - "diamond_cost": Diamond, - "energy_num": Energy, + "diamond_cost": diamond, + "energy_num": energy, }) return nil } func ReqGetEnergyByAD(player *Player, buf []byte) error { BaseMod := player.PlayMod.getBaseMod() - Item, err := BaseMod.GetEnergyByAD() + items, err := BaseMod.GetEnergyByAD() if err != nil { player.SendErrClienRes(&msg.ResGetEnergyByAD{ Code: msg.RES_CODE_FAIL, @@ -1621,7 +1619,7 @@ func ReqGetEnergyByAD(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_GetEnergyByAD.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetEnergyByAD.String()) if err != nil { player.SendErrClienRes(&msg.ResGetEnergyByAD{ Code: msg.RES_CODE_FAIL, @@ -1630,7 +1628,7 @@ func ReqGetEnergyByAD(player *Player, buf []byte) error { return err } player.TeLog("ReqGetEnergyByAD", map[string]interface{}{ - "item_list": Item, + "item_list": items, }) player.PlayMod.save() player.PushClientRes(BaseMod.BackData()) @@ -1718,10 +1716,10 @@ func ReqGetMonthLoginReward(player *Player, buf []byte) error { func ReqFastProduceInfo(player *Player, buf []byte) error { LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() - EndTime, Times := LimitedTimeEventMod.GetFastProduceInfo() + endTime, times := LimitedTimeEventMod.GetFastProduceInfo() player.PushClientRes(&msg.ResFastProduceInfo{ - EndTime: EndTime, - Num: int32(Times), + EndTime: endTime, + Num: int32(times), }) return nil } @@ -1772,7 +1770,7 @@ func ReqLimitSenceReward(player *Player, buf []byte) error { return fmt.Errorf("not exist") } - Id, Items, err := limitedTimeEventMod.GetSceneDashReward() + id, items, err := limitedTimeEventMod.GetSceneDashReward() if err != nil { player.SendErrClienRes(&msg.ResLimitSenceReward{ Code: msg.RES_CODE_FAIL, @@ -1780,8 +1778,8 @@ func ReqLimitSenceReward(player *Player, buf []byte) error { }) return err } - player.args["ResItemPopId"] = Id - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_LimitSenceReward.String()) + player.args["ResItemPopId"] = id + err = player.HandleItem(items, msg.ITEM_POP_LABEL_LimitSenceReward.String()) if err != nil { player.SendErrClienRes(&msg.ResLimitSenceReward{ Code: msg.RES_CODE_FAIL, @@ -1791,7 +1789,7 @@ func ReqLimitSenceReward(player *Player, buf []byte) error { } player.TeLog("ReqLimitSenceReward", map[string]interface{}{ "event_type": limitedTimeEvent.EVENT_TYPE_SENCE_DASH, - "item_list": Items, + "item_list": items, }) player.PlayMod.save() player.PushClientRes(&msg.ResLimitSenceReward{ @@ -1825,7 +1823,7 @@ func ReqCardGive(player *Player, buf []byte) error { } CardMod := player.PlayMod.getCardMod() - EndTime := GoUtil.Now() + 86400 + endTime := GoUtil.Now() + 86400 FriendMod := player.PlayMod.getFriendMod() err = CardMod.RequestCard() @@ -1844,18 +1842,18 @@ func ReqCardGive(player *Player, buf []byte) error { }) return fmt.Errorf("uid empty") } - CardId := int(req.CardId) - if CardId == 0 { // 请求交换的卡牌ID不为空 + cardId := int(req.CardId) + if cardId == 0 { // 请求交换的卡牌ID不为空 player.SendErrClienRes(&msg.ResCardGive{ Code: msg.RES_CODE_FAIL, Msg: "card id empty", }) return fmt.Errorf("card id empty") } - Id := GoUtil.CreateCardId(int(player.M_DwUin), 0, int(req.CardId)) + id := GoUtil.CreateCardId(int(player.M_DwUin), 0, int(req.CardId)) for _, v := range req.Uid { - Uid := int(v) - if !FriendMod.CheckFriend(Uid) { + uid := int(v) + if !FriendMod.CheckFriend(uid) { player.SendErrClienRes(&msg.ResCardGive{ Code: msg.RES_CODE_FAIL, Msg: "not friend", @@ -1863,16 +1861,16 @@ func ReqCardGive(player *Player, buf []byte) error { return fmt.Errorf("not friend") } CardInfo := &card.CardInfo{ - Id: Id, + Id: id, AUid: int(player.M_DwUin), - BUid: Uid, - CardId: CardId, + BUid: uid, + CardId: cardId, StartTime: GoUtil.Now(), - EndTime: EndTime, + EndTime: endTime, Type: card.TYPE_CARD_GIVE, Status: card.STATUS_CARD_GIVE_1, } - player.AddLog(Uid, friend.LOG_TYPE_CARD_GIVE, strconv.Itoa(CardId), GoUtil.Now()) + player.AddLog(uid, friend.LOG_TYPE_CARD_GIVE, strconv.Itoa(cardId), GoUtil.Now()) err = CardMod.AddRequestCard(CardInfo) // 添加请求卡牌 if err != nil { player.SendErrClienRes(&msg.ResCardGive{ @@ -1884,9 +1882,9 @@ func ReqCardGive(player *Player, buf []byte) error { m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_REQ_CARD, From: int(player.M_DwUin), - To: Uid, + To: uid, SendT: GoUtil.Now(), - End: EndTime, + End: endTime, Extra: *CardInfo, } FriendMgrSend(m) @@ -1898,7 +1896,7 @@ func ReqCardGive(player *Player, buf []byte) error { player.PushClientRes(CardMod.NotifyTimes()) player.PlayMod.save() player.TeLog("card_require", map[string]interface{}{ - "card_id": CardId, + "card_id": cardId, "player_id_target": req.Uid, }) return nil @@ -1912,8 +1910,8 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { return err } FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil { + cardInfo := FriendMod.GetCardInfo(req.Id) + if cardInfo == nil { player.SendErrClienRes(&msg.ResAgreeCardGive{ Code: msg.RES_CODE_FAIL, Msg: "card apply not exist", @@ -1921,7 +1919,7 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { return fmt.Errorf("card apply not exist") } CardMod := player.PlayMod.getCardMod() - err = player.SubCard(CardInfo.CardId) + err = player.SubCard(cardInfo.CardId) if err != nil { player.SendErrClienRes(&msg.ResAgreeCardGive{ Code: msg.RES_CODE_FAIL, @@ -1929,14 +1927,14 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { }) return fmt.Errorf("card not exist") } - CardInfo.Status = card.STATUS_CARD_GIVE_2 - CardInfo.EndTime = 0 + cardInfo.Status = card.STATUS_CARD_GIVE_2 + cardInfo.EndTime = 0 m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_AGREE_CARD, From: int(player.M_DwUin), - To: CardInfo.AUid, + To: cardInfo.AUid, SendT: GoUtil.Now(), - Extra: *CardInfo, + Extra: *cardInfo, } FriendMgrSend(m) player.PushClientRes(CardMod.NotifyCard()) @@ -1945,11 +1943,11 @@ func ReqAgreeCardGive(player *Player, buf []byte) error { Code: msg.RES_CODE_SUCCESS, Id: req.Id, }) - player.AddLog(CardInfo.AUid, friend.LOG_TYPE_CARD_GIVE_ACCEPT, strconv.Itoa(CardInfo.CardId), GoUtil.Now()) + player.AddLog(cardInfo.AUid, friend.LOG_TYPE_CARD_GIVE_ACCEPT, strconv.Itoa(cardInfo.CardId), GoUtil.Now()) player.PlayMod.save() player.TeLog("card_require_reply", map[string]interface{}{ - "card_id": CardInfo.CardId, - "player_id_requirer": CardInfo.AUid, + "card_id": cardInfo.CardId, + "player_id_requirer": cardInfo.AUid, }) return nil } @@ -1962,8 +1960,8 @@ func ReqRefuseCardGive(player *Player, buf []byte) error { return err } FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil { + cardInfo := FriendMod.GetCardInfo(req.Id) + if cardInfo == nil { player.SendErrClienRes(&msg.ResRefuseCardGive{ Code: msg.RES_CODE_FAIL, Msg: "card apply not exist", @@ -1977,16 +1975,16 @@ func ReqRefuseCardGive(player *Player, buf []byte) error { Id: req.Id, }) player.TeLog("ReqRefuseCardGive", map[string]interface{}{ - "card_id": CardInfo.CardId, + "card_id": cardInfo.CardId, }) now := GoUtil.Now() m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_REG_CARD_REFUSE, From: int(player.M_DwUin), - To: CardInfo.AUid, + To: cardInfo.AUid, SendT: now, End: now + 86400, - Extra: *CardInfo, + Extra: *cardInfo, } FriendMgrSend(m) return nil @@ -2000,8 +1998,8 @@ func ReqCardSend(player *Player, buf []byte) error { return err } CardMod := player.PlayMod.getCardMod() - CardId := int(req.CardId) - CardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), CardId) + cardId := int(req.CardId) + cardInfo, err := CardMod.SendCard(int(player.M_DwUin), int(req.Uid), cardId) if err != nil { player.SendErrClienRes(&msg.ResCardSend{ Code: msg.RES_CODE_FAIL, @@ -2009,21 +2007,21 @@ func ReqCardSend(player *Player, buf []byte) error { }) return err } - CardInfo.Emoji = int(req.Emoji) + cardInfo.Emoji = int(req.Emoji) m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_SEND_CARD, From: int(player.M_DwUin), To: int(req.Uid), SendT: GoUtil.Now(), End: GoUtil.Now() + 86400, - Extra: *CardInfo, + Extra: *cardInfo, } - player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_SEND, strconv.Itoa(CardId), GoUtil.Now()) + player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_SEND, strconv.Itoa(cardId), GoUtil.Now()) player.PushClientRes(&msg.ResCardSend{ Code: msg.RES_CODE_SUCCESS, }) player.TeLog("card_send", map[string]interface{}{ - "card_id": CardId, + "card_id": cardId, "player_id_target": int(req.Uid), }) player.PlayerDecoSetLog("emoji", int(req.Emoji), "card_send") @@ -2042,8 +2040,8 @@ func ReqCardExchange(player *Player, buf []byte) error { return err } CardMod := player.PlayMod.getCardMod() - CardId := int(req.CardId) - CardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), CardId) + cardId := int(req.CardId) + cardInfo, err := CardMod.ExchangeCard(int(player.M_DwUin), int(req.Uid), cardId) if err != nil { player.SendErrClienRes(&msg.ResCardExchange{ Code: msg.RES_CODE_FAIL, @@ -2051,16 +2049,16 @@ func ReqCardExchange(player *Player, buf []byte) error { }) return err } - CardInfo.Emoji = int(req.Emoji) + cardInfo.Emoji = int(req.Emoji) m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_EX_CARD, From: int(player.M_DwUin), To: int(req.Uid), SendT: GoUtil.Now(), End: GoUtil.Now() + 86400, - Extra: *CardInfo, + Extra: *cardInfo, } - player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_EX_SEND, fmt.Sprintf("%d", int(req.CardId)), GoUtil.Now()) + player.AddLog(int(req.Uid), friend.LOG_TYPE_CARD_EX_SEND, fmt.Sprintf("%d", cardId), GoUtil.Now()) player.PushClientRes(&msg.ResCardExchange{ Code: msg.RES_CODE_SUCCESS, @@ -2070,7 +2068,7 @@ func ReqCardExchange(player *Player, buf []byte) error { player.PushClientRes(CardMod.NotifyTimes()) FriendMgrSend(m) player.TeLog("card_exchange", map[string]interface{}{ - "card_id": CardId, + "card_id": cardId, "player_id_target": int(req.Uid), "is_gift": 0, }) @@ -2084,27 +2082,27 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { if err != nil { return err } - CardId := int(req.CardId) + cardId := int(req.CardId) CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil || CardInfo.EndTime < GoUtil.Now() { + cardInfo := FriendMod.GetCardInfo(req.Id) + if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() { player.SendErrClienRes(&msg.ResSelectCardExchange{ Code: msg.RES_CODE_FAIL, Msg: "exchange time out", }) return fmt.Errorf("exchange time out") } - if CardInfo.ExId != 0 { + if cardInfo.ExId != 0 { player.SendErrClienRes(&msg.ResSelectCardExchange{ Code: msg.RES_CODE_FAIL, Msg: "card already selected", }) return fmt.Errorf("card already selected") } - CardInfo.ExId = CardId - CardInfo.Status = card.STATUS_CARD_EX_2 - if cardCfg.CheckCardIsGold(CardInfo.CardId) || cardCfg.CheckCardIsGold(CardInfo.ExId) { + cardInfo.ExId = cardId + cardInfo.Status = card.STATUS_CARD_EX_2 + if cardCfg.CheckCardIsGold(cardInfo.CardId) || cardCfg.CheckCardIsGold(cardInfo.ExId) { err := CardMod.SubGoldTimes() if err != nil { player.SendErrClienRes(&msg.ResSelectCardExchange{ @@ -2115,8 +2113,8 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { } } FriendMod.DelCardInfo(req.Id) - player.AddLog(CardInfo.AUid, friend.LOG_TYPE_CARD_SELECT_SEND, fmt.Sprintf("%d", CardInfo.ExId), GoUtil.Now()) - err = player.SubCard(CardId) + player.AddLog(cardInfo.AUid, friend.LOG_TYPE_CARD_SELECT_SEND, fmt.Sprintf("%d", cardInfo.ExId), GoUtil.Now()) + err = player.SubCard(cardId) if err != nil { player.SendErrClienRes(&msg.ResSelectCardExchange{ Code: msg.RES_CODE_FAIL, @@ -2134,15 +2132,15 @@ func ReqSelectCardExchange(player *Player, buf []byte) error { m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_SELECT_EX_CARD, From: int(player.M_DwUin), - To: CardInfo.AUid, + To: cardInfo.AUid, SendT: GoUtil.Now(), - Extra: *CardInfo, + Extra: *cardInfo, } FriendMgrSend(m) player.TeLog("card_exchange_reply", map[string]interface{}{ - "palyer_id_giver": CardInfo.AUid, - "card_id_giver": CardInfo.CardId, - "card_id_reply": CardInfo.ExId, + "palyer_id_giver": cardInfo.AUid, + "card_id_giver": cardInfo.CardId, + "card_id_reply": cardInfo.ExId, }) return nil } @@ -2156,19 +2154,19 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error { } CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) + cardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil || CardInfo.EndTime < GoUtil.Now() { + if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() { player.SendErrClienRes(&msg.ResAgreeCardExchange{ Code: msg.RES_CODE_FAIL, Msg: "exchange time out", }) return fmt.Errorf("exchange time out") } - player.AddCard(CardInfo.ExId) - CardMod.DelExCard(CardInfo) + player.AddCard(cardInfo.ExId) + CardMod.DelExCard(cardInfo) FriendMod.DelCardInfo(req.Id) - if cardCfg.CheckCardIsGold(CardInfo.CardId) || cardCfg.CheckCardIsGold(CardInfo.ExId) { + if cardCfg.CheckCardIsGold(cardInfo.CardId) || cardCfg.CheckCardIsGold(cardInfo.ExId) { err := CardMod.SubGoldTimes() if err != nil { player.SendErrClienRes(&msg.ResAgreeCardExchange{ @@ -2178,31 +2176,31 @@ func ReqAgreeCardExchange(player *Player, buf []byte) error { return err } } - player.AddLog(CardInfo.BUid, friend.LOG_TYPE_CARD_EX_SUCCESS_1, fmt.Sprintf("%d_%d", CardInfo.CardId, CardInfo.ExId), GoUtil.Now()) - CardInfo.Status = card.STATUS_CARD_EX_3 - CardInfo.EndTime = 0 + player.AddLog(cardInfo.BUid, friend.LOG_TYPE_CARD_EX_SUCCESS_1, fmt.Sprintf("%d_%d", cardInfo.CardId, cardInfo.ExId), GoUtil.Now()) + cardInfo.Status = card.STATUS_CARD_EX_3 + cardInfo.EndTime = 0 player.PlayMod.save() player.PushClientRes(CardMod.NotifyCard()) player.PushClientRes(&msg.ResAgreeCardExchange{ Code: msg.RES_CODE_SUCCESS, Id: req.Id, - Emoji: int32(CardInfo.Emoji), + Emoji: int32(cardInfo.Emoji), }) m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_ARGREE_EX_CARD, From: int(player.M_DwUin), - To: CardInfo.BUid, - Extra: *CardInfo, + To: cardInfo.BUid, + Extra: *cardInfo, SendT: GoUtil.Now(), } player.PushClientRes(CardMod.NotifyCard()) player.PushClientRes(CardMod.NotifyTimes()) FriendMgrSend(m) player.TeLog("card_exchange_finish", map[string]interface{}{ - "player_id_giver": CardInfo.AUid, - "card_id_giver": CardInfo.CardId, - "card_id_reply": CardInfo.ExId, - "player_id_reply": CardInfo.BUid, + "player_id_giver": cardInfo.AUid, + "card_id_giver": cardInfo.CardId, + "card_id_reply": cardInfo.ExId, + "player_id_reply": cardInfo.BUid, }) return nil } @@ -2215,15 +2213,15 @@ func ReqRefuseCardSelect(player *Player, buf []byte) error { return err } FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil { + cardInfo := FriendMod.GetCardInfo(req.Id) + if cardInfo == nil { player.SendErrClienRes(&msg.ResRefuseCardSelect{ Code: msg.RES_CODE_FAIL, Msg: "exchange time out", }) return fmt.Errorf("exchange time out") } - if CardInfo.Status != 1 { + if cardInfo.Status != 1 { player.SendErrClienRes(&msg.ResRefuseCardSelect{ Code: msg.RES_CODE_FAIL, Msg: "card is not select status", @@ -2234,8 +2232,8 @@ func ReqRefuseCardSelect(player *Player, buf []byte) error { m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_REFUSE_SELECT_CARD, From: int(player.M_DwUin), - To: CardInfo.AUid, - Extra: *CardInfo, + To: cardInfo.AUid, + Extra: *cardInfo, SendT: GoUtil.Now(), } FriendMgrSend(m) @@ -2256,15 +2254,15 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error { } CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil || CardInfo.EndTime < GoUtil.Now() { + cardInfo := FriendMod.GetCardInfo(req.Id) + if cardInfo == nil || cardInfo.EndTime < GoUtil.Now() { player.SendErrClienRes(&msg.ResRefuseCardExchange{ Code: msg.RES_CODE_FAIL, Msg: "exchange time out", }) return fmt.Errorf("exchange time out") } - if CardInfo.Status != 2 { + if cardInfo.Status != 2 { player.SendErrClienRes(&msg.ResRefuseCardExchange{ Code: msg.RES_CODE_FAIL, Msg: "card is not status 2", @@ -2272,9 +2270,9 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error { return fmt.Errorf("card is not status 2") } FriendMod.DelCardInfo(req.Id) - player.AddCard(CardInfo.CardId) - CardMod.DelExCard(CardInfo) - CardMod.AddExTimes(CardInfo) + player.AddCard(cardInfo.CardId) + CardMod.DelExCard(cardInfo) + CardMod.AddExTimes(cardInfo) player.PlayMod.save() player.PushClientRes(&msg.ResRefuseCardExchange{ Code: msg.RES_CODE_SUCCESS, @@ -2283,8 +2281,8 @@ func ReqRefuseCardExchange(player *Player, buf []byte) error { m := &MsqMod.Msg{ Type: MsqMod.HANDLE_TYPE_REFUSE_EX_CARD, From: int(player.M_DwUin), - To: CardInfo.BUid, - Extra: *CardInfo, + To: cardInfo.BUid, + Extra: *cardInfo, SendT: GoUtil.Now(), } player.PushClientRes(CardMod.NotifyCard()) @@ -2302,8 +2300,8 @@ func ReqGetFriendCard(player *Player, buf []byte) error { } CardMod := player.PlayMod.getCardMod() FriendMod := player.PlayMod.getFriendMod() - CardInfo := FriendMod.GetCardInfo(req.Id) - if CardInfo == nil || CardInfo.EndTime != 0 { + cardInfo := FriendMod.GetCardInfo(req.Id) + if cardInfo == nil || cardInfo.EndTime != 0 { player.SendErrClienRes(&msg.ResGetFriendCard{ Code: msg.RES_CODE_FAIL, Msg: "exchange time out", @@ -2311,18 +2309,18 @@ func ReqGetFriendCard(player *Player, buf []byte) error { return fmt.Errorf("exchange time out") } FriendMod.DelCardInfo(req.Id) - player.AddCard(CardInfo.CardId) - uid := CardInfo.AUid - if CardInfo.Type == card.TYPE_CARD_GIVE { - uid = CardInfo.BUid + player.AddCard(cardInfo.CardId) + uid := cardInfo.AUid + if cardInfo.Type == card.TYPE_CARD_GIVE { + uid = cardInfo.BUid } - player.AddLog(uid, friend.LOG_TYPE_CARD_SEND_ACCEPT, fmt.Sprintf("%d", CardInfo.CardId), GoUtil.Now()) + player.AddLog(uid, friend.LOG_TYPE_CARD_SEND_ACCEPT, fmt.Sprintf("%d", cardInfo.CardId), GoUtil.Now()) player.PlayMod.save() player.PushClientRes(&msg.ResGetFriendCard{ Code: msg.RES_CODE_SUCCESS, Id: req.Id, - CardId: int32(CardInfo.CardId), - Emoji: int32(CardInfo.Emoji), + CardId: int32(cardInfo.CardId), + Emoji: int32(cardInfo.Emoji), }) player.PushClientRes(CardMod.NotifyCard()) return nil @@ -2345,17 +2343,17 @@ func ReqRank(player *Player, buf []byte) error { }, SendT: GoUtil.Now(), } - RankInfo := G_GameLogicPtr.RankMgrCall(m).(*RankInfo) + rankInfo := G_GameLogicPtr.RankMgrCall(m).(*RankInfo) res := make(map[int32]*msg.ResPlayerSimple) - for k, rank := range RankInfo.List { + for k, rank := range rankInfo.List { res[int32(k+1)] = G_GameLogicPtr.GetResSimplePlayerByUid(rank.Uid) } player.PushClientRes(&msg.ResRank{ Type: req.Type, RankList: res, - MyRank: int32(RankInfo.MyRank), - MyScore: float32(RankInfo.MyScore), + MyRank: int32(rankInfo.MyRank), + MyScore: float32(rankInfo.MyScore), }) return nil } @@ -2503,7 +2501,7 @@ func ReqDeleteMail(player *Player, buf []byte) error { // 领取商店免费奖励 func ReqFreeShop(player *Player, buf []byte) error { ChargeMod := player.PlayMod.getChargeMod() - Item, err := ChargeMod.FireFreeShop() + items, err := ChargeMod.FireFreeShop() if err != nil { player.SendErrClienRes(&msg.ResFreeShop{ Code: msg.RES_CODE_FAIL, @@ -2511,7 +2509,14 @@ func ReqFreeShop(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_FreeShop.String()) + if len(items) == 0 { + player.SendErrClienRes(&msg.ResFreeShop{ + Code: msg.RES_CODE_FAIL, + Msg: "no reward", + }) + return fmt.Errorf("no reward") + } + err = player.HandleItem(items, msg.ITEM_POP_LABEL_FreeShop.String()) if err != nil { player.SendErrClienRes(&msg.ResFreeShop{ Code: msg.RES_CODE_FAIL, @@ -2526,8 +2531,8 @@ func ReqFreeShop(player *Player, buf []byte) error { }) player.TeLog("gift_free", map[string]interface{}{ "gift_type": "store", - "item_id": Item[0].Id, - "num": Item[0].Num, + "item_id": items[0].Id, + "num": items[0].Num, }) return nil } @@ -2540,7 +2545,7 @@ func ReqBuyChessShop(player *Player, buf []byte) error { return err } ChargeMod := player.PlayMod.getChargeMod() - LostItem, Item, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) + lostItems, items, _, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { player.SendErrClienRes(&msg.ResBuyChessShop{ Code: msg.RES_CODE_FAIL, @@ -2548,7 +2553,11 @@ func ReqBuyChessShop(player *Player, buf []byte) error { }) return err } - err = player.HandleLoseItem(LostItem, "ChessShop") + var lostNum int + if len(lostItems) > 0 { + lostNum = lostItems[0].Num + } + err = player.HandleLoseItem(lostItems, "ChessShop") if err != nil { player.SendErrClienRes(&msg.ResBuyChessShop2{ Code: msg.RES_CODE_FAIL, @@ -2556,7 +2565,7 @@ func ReqBuyChessShop(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Item, msg.ITEM_POP_LABEL_ChessShop.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_ChessShop.String()) if err != nil { player.SendErrClienRes(&msg.ResBuyChessShop{ Code: msg.RES_CODE_FAIL, @@ -2568,7 +2577,7 @@ func ReqBuyChessShop(player *Player, buf []byte) error { "item_id": int(req.Id), "change_num": 1, "cost_type": "diamond", - "cost_num": -LostItem[0].Num, + "cost_num": -lostNum, }) player.PlayMod.save() player.ChargeBackData() @@ -2576,7 +2585,7 @@ func ReqBuyChessShop(player *Player, buf []byte) error { Code: msg.RES_CODE_SUCCESS, }) player.TeLog("buy_product_diamond", map[string]interface{}{ - "diamond_cost": -LostItem[0].Num, + "diamond_cost": -lostNum, "product_id": int(req.Id), "product_name": mergeDataCfg.GetNameById(int(req.Id)), }) @@ -2591,7 +2600,7 @@ func ReqBuyChessShop2(player *Player, buf []byte) error { return err } ChargeMod := player.PlayMod.getChargeMod() - LostItem, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) + lostItems, _, ChessId, err := ChargeMod.BuyChess(int(req.Id), player.IsWeeklyDiscount()) if err != nil { player.SendErrClienRes(&msg.ResBuyChessShop2{ Code: msg.RES_CODE_FAIL, @@ -2599,7 +2608,7 @@ func ReqBuyChessShop2(player *Player, buf []byte) error { }) return err } - err = player.HandleLoseItem(LostItem, "ChessShop") + err = player.HandleLoseItem(lostItems, "ChessShop") if err != nil { player.SendErrClienRes(&msg.ResBuyChessShop2{ Code: msg.RES_CODE_FAIL, @@ -2625,11 +2634,15 @@ func ReqBuyChessShop2(player *Player, buf []byte) error { }) return err } + var lostNum int + if len(lostItems) > 0 { + lostNum = lostItems[0].Num + } player.TeLog("store_buy", map[string]interface{}{ "item_id": int(req.Id), "change_num": 1, "cost_type": "diamond", - "cost_num": LostItem[0].Num, + "cost_num": lostNum, }) player.PlayMod.save() player.ChargeBackData() @@ -2637,7 +2650,7 @@ func ReqBuyChessShop2(player *Player, buf []byte) error { Code: msg.RES_CODE_SUCCESS, }) player.TeLog("buy_product_diamond", map[string]interface{}{ - "diamond_cost": LostItem[0].Num, + "diamond_cost": lostNum, "product_id": int(req.Id), "product_name": mergeDataCfg.GetNameById(int(req.Id)), }) @@ -2649,8 +2662,8 @@ func ReqRefreshChessShop(player *Player, buf []byte) error { ChargeMod := player.PlayMod.getChargeMod() ChessMod := player.PlayMod.getChessMod() ChargeMod.InitChessShop(ChessMod.GetEmitList()) - Cost := []*item.Item{item.NewItem(item.ITEM_DIAMOND_ID, -20)} - err := player.HandleItem(Cost, msg.ITEM_POP_LABEL_RefreshChessShop.String()) + costItems := []*item.Item{item.NewItem(item.ITEM_DIAMOND_ID, -20)} + err := player.HandleItem(costItems, msg.ITEM_POP_LABEL_RefreshChessShop.String()) if err != nil { player.SendErrClienRes(&msg.ResRefreshChessShop{ Code: msg.RES_CODE_FAIL, @@ -2696,16 +2709,16 @@ func ReqEndlessReward(player *Player, buf []byte) error { player.PushClientRes(&msg.ResEndlessReward{ Code: msg.RES_CODE_SUCCESS, }) - Ids := make([]int, 0) - Nums := make([]int, 0) + ids := make([]int, 0) + nums := make([]int, 0) for _, v := range itemList { - Ids = append(Ids, v.Id) - Nums = append(Nums, v.Num) + ids = append(ids, v.Id) + nums = append(nums, v.Num) } player.TeLog("gift_ad", map[string]interface{}{ "gift_type": "endless", - "item_id": Ids, - "item_number": Nums, + "item_id": ids, + "item_number": nums, }) return nil } @@ -2748,12 +2761,12 @@ func ReqCreateOrderSn(player *Player, buf []byte) error { if err != nil { return err } - OrderSn, err := player.CreateOrderSn(req) + orderSn, err := player.CreateOrderSn(req) if err != nil { return err } player.PushClientRes(&msg.ResCreateOrderSn{ - OrderSn: OrderSn, + OrderSn: orderSn, }) return nil } @@ -2769,7 +2782,7 @@ func ReqChampshipReward(player *Player, buf []byte) error { todayActivityId, _ := player.GetChampshipActivityId() DecorateMod := player.PlayMod.getDecorateMod() orderFactor := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) - RewardId := ChampshipMod.Reward + rewardId := ChampshipMod.Reward itemList := ChampshipMod.GetReward(todayActivityId, orderFactor) err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String()) if err != nil { @@ -2785,13 +2798,13 @@ func ReqChampshipReward(player *Player, buf []byte) error { player.PushClientRes(&msg.ResChampshipReward{ Code: msg.RES_CODE_SUCCESS, }) - MaxId := champshipCfg.GetMaxRewardId() - if MaxId == ChampshipMod.Reward { + maxId := champshipCfg.GetMaxRewardId() + if maxId == ChampshipMod.Reward { FriendMod := player.PlayMod.getFriendMod() FriendMod.AddActLog(friend.ACT_LOG_TYPE_GET_CHAMPIONSHIP_PRIZE, "") player.UpdateUserInfo() } - for i := RewardId + 1; i <= ChampshipMod.Reward; i++ { + for i := rewardId + 1; i <= ChampshipMod.Reward; i++ { items, _ := champshipCfg.GetRewardItems(i) player.TeLog("championship_reward", map[string]interface{}{ "season_id": GoUtil.ZeroTimestamp(), @@ -2987,12 +3000,12 @@ func ReqGetInviteReward(player *Player, buf []byte) error { } InviteMod := player.PlayMod.getInviteMod() curIndex := InviteMod.GetIndex - Items, err := InviteMod.GetReward(int(req.GetIndex)) + items, err := InviteMod.GetReward(int(req.GetIndex)) if err != nil { log.Debug("ReqGetInviteReward err :%v", err) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_invite.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_invite.String()) if err != nil { log.Debug("ReqGetInviteReward err :%v", err) return err @@ -3027,21 +3040,21 @@ func ReqAutoAddInviteFriend(player *Player, buf []byte) error { return err } FriendMod := player.PlayMod.getFriendMod() - Uid := int(req.Id) - if Uid == 0 && Uid == int(player.M_DwUin) { + uid := int(req.Id) + if uid == 0 && uid == int(player.M_DwUin) { player.PushClientRes(&msg.ResAutoAddInviteFriend{ ResultCode: int32(msg.RES_CODE_FAIL), }) - return fmt.Errorf("uid wrong %d", Uid) + return fmt.Errorf("uid wrong %d", uid) } - FriendMod.AddFriend(Uid) + FriendMod.AddFriend(uid) player.PlayMod.save() player.PushClientRes(&msg.ResAutoAddInviteFriend{ ResultCode: 1, }) FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), - To: Uid, + To: uid, Type: MsqMod.HANDLE_TYPE_INVITE_ADD_FRIEND, SendT: GoUtil.Now(), }) @@ -3059,8 +3072,8 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { return err } FriendMod := player.PlayMod.getFriendMod() - Uid, err := GetUidByFaceBook(req.Id) - if Uid == 0 || Uid == int(player.M_DwUin) { + uid, err := GetUidByFaceBook(req.Id) + if uid == 0 || uid == int(player.M_DwUin) { player.PushClientRes(&msg.ResAutoAddInviteFriend2{ ResultCode: 0, }) @@ -3074,14 +3087,14 @@ func ReqAutoAddInviteFriend2(player *Player, buf []byte) error { log.Debug("ReqAutoAddInviteFriend2 err :%v", err) return err } - FriendMod.AddFriend(Uid) + FriendMod.AddFriend(uid) player.PlayMod.save() player.PushClientRes(&msg.ResAutoAddInviteFriend2{ ResultCode: 1, }) FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), - To: Uid, + To: uid, Type: MsqMod.HANDLE_TYPE_INVITE_ADD_FRIEND, SendT: GoUtil.Now(), }) @@ -3100,7 +3113,7 @@ func ReqSelectLimitEvent(player *Player, buf []byte) error { } LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() BaseMod := player.PlayMod.getBaseMod() - Items, EventType, OrderNum, RewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy()) + items, eventType, orderNum, rewardList, err := LimitedTimeEventMod.SelectProgressReward(int(req.Id), BaseMod.GetLevel(), BaseMod.GetEnergy()) if err != nil { player.SendErrClienRes(&msg.ResSelectLimitEvent{ Code: msg.RES_CODE_FAIL, @@ -3108,7 +3121,7 @@ func ReqSelectLimitEvent(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_SelectLimitEvent.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_SelectLimitEvent.String()) if err != nil { player.SendErrClienRes(&msg.ResSelectLimitEvent{ Code: msg.RES_CODE_FAIL, @@ -3117,9 +3130,9 @@ func ReqSelectLimitEvent(player *Player, buf []byte) error { return err } player.TeLog("time_limited_slot", map[string]interface{}{ - "slot_order_number": OrderNum, - "slot_reward_list": RewardList, - "slot_reward": limitedTimeEventCfg.GetEventName(EventType), + "slot_order_number": orderNum, + "slot_reward_list": rewardList, + "slot_reward": limitedTimeEventCfg.GetEventName(eventType), }) player.PlayMod.save() player.PushClientRes(LimitedTimeEventMod.BackData()) @@ -3144,17 +3157,17 @@ func ReqMiningTake(player *Player, buf []byte) error { return err } MiningMod := player.PlayMod.getMiningMod() - ActivityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) - Status := player.GetActivityStatus(activity.ACT_TYPE_MINING) - if Status != ACT_STATUS_START { + activityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) + status := player.GetActivityStatus(activity.ACT_TYPE_MINING) + if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResMiningTake{ Code: msg.RES_CODE_FAIL, Msg: "activity not start", }) return fmt.Errorf("activity not start") } - LoseItem := miningCfg.GetLoseItem(ActivityInfo.Id) - err = player.HandleLoseItem(LoseItem, "MiningLose") + loseItem := miningCfg.GetLoseItem(activityInfo.Id) + err = player.HandleLoseItem(loseItem, "MiningLose") if err != nil { player.SendErrClienRes(&msg.ResMiningTake{ Code: msg.RES_CODE_FAIL, @@ -3189,8 +3202,8 @@ func ReqMiningTake(player *Player, buf []byte) error { // 领取关卡奖励 func ReqMiningReward(player *Player, buf []byte) error { MiningMod := player.PlayMod.getMiningMod() - Status := player.GetActivityStatus(activity.ACT_TYPE_MINING) - if Status != ACT_STATUS_START { + status := player.GetActivityStatus(activity.ACT_TYPE_MINING) + if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResMiningReward{ Code: msg.RES_CODE_FAIL, Msg: "activity not start", @@ -3199,7 +3212,7 @@ func ReqMiningReward(player *Player, buf []byte) error { } DecorateMod := player.PlayMod.getDecorateMod() orderFactor := orderCfg.GetOrderFactor(DecorateMod.GetAreaId()) - itemList, Mining, err := MiningMod.GetReward(orderFactor) + itemList, mining, err := MiningMod.GetReward(orderFactor) if err != nil { player.SendErrClienRes(&msg.ResMiningReward{ Code: msg.RES_CODE_FAIL, @@ -3215,13 +3228,13 @@ func ReqMiningReward(player *Player, buf []byte) error { }) return err } - ActivityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) + activityInfo := player.GetActivityInfo(activity.ACT_TYPE_MINING) aId := 0 - if ActivityInfo != nil { - aId = ActivityInfo.Id + if activityInfo != nil { + aId = activityInfo.Id } player.TeLog("finish_level", map[string]interface{}{ - "expend_token_num": Mining, + "expend_token_num": mining, "level_id": MiningMod.Pass - 1, "event_id": aId, }) @@ -3241,8 +3254,8 @@ func ReqGuessColor(player *Player, buf []byte) error { return err } GuessColorMod := player.PlayMod.getGuessColorMod() - Items := GuessColorMod.FirstIn() - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_GuessColor.String()) + items := GuessColorMod.FirstIn() + err = player.HandleItem(items, msg.ITEM_POP_LABEL_GuessColor.String()) if err != nil { return err } @@ -3258,8 +3271,8 @@ func ReqGuessColorTake(player *Player, buf []byte) error { if err != nil { return err } - Status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) - if Status != ACT_STATUS_START { + status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) + if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorTake{ Code: msg.RES_CODE_FAIL, Msg: "activity not start", @@ -3267,8 +3280,8 @@ func ReqGuessColorTake(player *Player, buf []byte) error { return fmt.Errorf("activity not start") } GuessColorMod := player.PlayMod.getGuessColorMod() - LoseItem := GuessColorMod.GetLoseItem() - err = player.HandleLoseItem(LoseItem, "GuessColorLose") + loseItems := GuessColorMod.GetLoseItem() + err = player.HandleLoseItem(loseItems, "GuessColorLose") if err != nil { player.SendErrClienRes(&msg.ResGuessColorTake{ Code: msg.RES_CODE_FAIL, @@ -3276,11 +3289,11 @@ func ReqGuessColorTake(player *Player, buf []byte) error { }) return err } - var M map[int32]int32 + var m map[int32]int32 if req.Map != nil { - M = req.Map.Map + m = req.Map.Map } - GuessColorMod.Take(M, req.OMap) + GuessColorMod.Take(m, req.OMap) player.TeLog("ReqGuessColorTake", map[string]interface{}{ "map": req.Map.Map, "o_map": req.OMap, @@ -3298,8 +3311,8 @@ func ReqGuessColorReward(player *Player, buf []byte) error { if err != nil { return err } - Status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) - if Status != ACT_STATUS_START { + status := player.GetActivityStatus(activity.ACT_TYPE_GUESS_COLOR) + if status != ACT_STATUS_START { player.SendErrClienRes(&msg.ResGuessColorReward{ Code: msg.RES_CODE_FAIL, Msg: "activity not start", @@ -3307,7 +3320,7 @@ func ReqGuessColorReward(player *Player, buf []byte) error { return fmt.Errorf("activity not start") } GuessColorMod := player.PlayMod.getGuessColorMod() - itemList, err := GuessColorMod.GetReward() + items, err := GuessColorMod.GetReward() if err != nil { player.SendErrClienRes(&msg.ResGuessColorReward{ Code: msg.RES_CODE_FAIL, @@ -3315,7 +3328,7 @@ func ReqGuessColorReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuessColorReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_GuessColorReward.String()) if err != nil { player.SendErrClienRes(&msg.ResGuessColorReward{ Code: msg.RES_CODE_FAIL, @@ -3324,7 +3337,7 @@ func ReqGuessColorReward(player *Player, buf []byte) error { return err } player.TeLog("guess_color_finish", map[string]interface{}{ - "item_list": itemList, + "item_list": items, }) player.PlayMod.save() player.GuessColorBackData() @@ -3368,7 +3381,7 @@ func ReqRaceReward(player *Player, buf []byte) error { return err } RaceMod := player.PlayMod.getRaceMod() - Items, err := RaceMod.GetReward() + items, err := RaceMod.GetReward() if err != nil { player.SendErrClienRes(&msg.ResRaceReward{ Code: msg.RES_CODE_FAIL, @@ -3376,7 +3389,7 @@ func ReqRaceReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_RaceReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_RaceReward.String()) if err != nil { player.SendErrClienRes(&msg.ResRaceReward{ Code: msg.RES_CODE_FAIL, @@ -3386,7 +3399,7 @@ func ReqRaceReward(player *Player, buf []byte) error { } player.RaceBackData() player.TeLog("ReqRaceReward", map[string]interface{}{ - "item_list": Items, + "item_list": items, }) player.PushClientRes(&msg.ResRaceReward{ Code: msg.RES_CODE_SUCCESS, @@ -3408,50 +3421,50 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Targer := int(req.Uid) + target := int(req.Uid) if req.Uid == 0 { - Targer = PlayroomMod.GetTarget() + target = PlayroomMod.GetTarget() } if req.Uid == -1 { - Targer = player.GetVisitorPlayer() + target = player.GetVisitorPlayer() } - if Targer == 0 { - player.PlayroomVisit(Targer) + if target == 0 { + player.PlayroomVisit(target) return nil } - PlayerData := G_GameLogicPtr.GetSimplePlayerByUid(Targer) + PlayerData := G_GameLogicPtr.GetSimplePlayerByUid(target) if PlayerData == nil { - return fmt.Errorf("ReqPlayroomInfo player %d not found", Targer) + return fmt.Errorf("ReqPlayroomInfo player %d not found", target) } - PlayroomMod.SetTarget(Targer) + PlayroomMod.SetTarget(target) player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_VISITROOM}) if PlayerData.Loginout > 0 && PlayerData.Loginout < GoUtil.Now()-int64(playroomCfg.GetGameOutline()) { - GameType := PlayroomMod.RandGameType() - PlayroomMod.SetGameId(GameType) - Star := min(500, max(PlayerData.Star/10, 10)) + gameType := PlayroomMod.RandGameType() + PlayroomMod.SetGameId(gameType) + star := min(500, max(PlayerData.Star/10, 10)) ChessMod := player.PlayMod.getChessMod() - EmitList := ChessMod.GetOrderEmit() - ColorList := make([]string, 0) - for _, v := range EmitList { - Color := mergeDataCfg.GetEmitProduceChessType(v) - ColorList = append(ColorList, Color...) + emitList := ChessMod.GetOrderEmit() + colorList := make([]string, 0) + for _, v := range emitList { + color := mergeDataCfg.GetEmitProduceChessType(v) + colorList = append(colorList, color...) } - RandList := make([]int, 0) + randList := make([]int, 0) for _, v := range PlayerData.Chess { - Color := mergeDataCfg.GetColorById(v) - Lv := mergeDataCfg.GetLvById(v) - if GoUtil.InStringArray(Color, ColorList) && Lv <= 8 && Lv != 0 { - RandList = append(RandList, v) + color := mergeDataCfg.GetColorById(v) + lv := mergeDataCfg.GetLvById(v) + if GoUtil.InStringArray(color, colorList) && lv <= 8 && lv != 0 { + randList = append(randList, v) } } - RandList = GoUtil.UniqueInts(RandList) - if len(RandList) == 0 { - PlayroomMod.SetGameReward3(Star) - } else if len(RandList) == 1 { - PlayroomMod.SetGameReward2(RandList[0], Star) + randList = GoUtil.UniqueInts(randList) + if len(randList) == 0 { + PlayroomMod.SetGameReward3(star) + } else if len(randList) == 1 { + PlayroomMod.SetGameReward2(randList[0], star) } else { - ChessList := GoUtil.RandSliceNum(RandList, 2) - PlayroomMod.SetGameReward(ChessList[0], ChessList[1], Star) + chessList := GoUtil.RandSliceNum(randList, 2) + PlayroomMod.SetGameReward(chessList[0], chessList[1], star) } } else { PlayroomMod.SetGameId(playroom.GAME_TYPE_FILP) @@ -3462,7 +3475,7 @@ func ReqPlayroomInfo(player *Player, buf []byte) error { PlayroomMod.SetGameRewardFlip(addNumFunc(100), addNumFunc(500), addNumFunc(2000)) } player.PlayMod.save() - player.PlayroomVisit(Targer) + player.PlayroomVisit(target) return nil } @@ -3474,7 +3487,7 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Items, PType, err := PlayroomMod.Interact(int(req.Id), int(req.Type)) + items, pType, err := PlayroomMod.Interact(int(req.Id), int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomInteract{ Code: msg.RES_CODE_FAIL, @@ -3482,7 +3495,7 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { }) return err } - err = player.HandleLoseItem(Items, "PlayroomInteract") + err = player.HandleLoseItem(items, "PlayroomInteract") if err != nil { player.SendErrClienRes(&msg.ResPlayroomInteract{ Code: msg.RES_CODE_FAIL, @@ -3493,8 +3506,8 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { if GoUtil.InArray(int(req.Id), playroomCfg.GetInteractIdBath()) { player.SetPlayroomKiss(0, int(player.M_DwUin)) } - PExp := playroomCfg.GetInteractPExp(int(req.Id)) - _, err = player.GetPlayerBaseMod().AddExp(player, 0, PExp) + pExp := playroomCfg.GetInteractPExp(int(req.Id)) + _, err = player.GetPlayerBaseMod().AddExp(player, 0, pExp) if err != nil { player.SendErrClienRes(&msg.ResPlayroomInteract{ Code: msg.RES_CODE_FAIL, @@ -3505,7 +3518,7 @@ func ReqPlayroomInteract(player *Player, buf []byte) error { PlayroomMod.AddInteractNum(BaseMod.GetLevel()) player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_INTERACT, A: []interface{}{int(req.Id)}}) player.PlayMod.save() - player.LimitedTimePlayroomTrigger_(PType) + player.LimitedTimePlayroomTrigger_(pType) player.NotifyPlayroomKiss() player.TeLog("playroom_interact", map[string]interface{}{ "interact_id": int(req.Id), @@ -3551,16 +3564,16 @@ func ReqPlayroomGame(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Target := PlayroomMod.GetTarget() - if Target == 0 { + target := PlayroomMod.GetTarget() + if target == 0 { player.SendErrClienRes(&msg.ResPlayroomGame{ Code: msg.RES_CODE_FAIL, Msg: "no target", }) return fmt.Errorf("no target") } - Items := player.GetPlayroomGameReward(int(req.Type), 0) - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + items := player.GetPlayroomGameReward(int(req.Type), 0) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomGame{ Code: msg.RES_CODE_FAIL, @@ -3571,7 +3584,7 @@ func ReqPlayroomGame(player *Player, buf []byte) error { now := GoUtil.Now() FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), - To: Target, + To: target, Type: MsqMod.HANDLE_TYPE_PLAYROOM_GAME, SendT: now, End: now + sevendays, @@ -3580,9 +3593,9 @@ func ReqPlayroomGame(player *Player, buf []byte) error { Emoji: int(req.EmojiId), }, }) - ItemsMsg := make(map[int32]*msg.ItemInfo, 0) + itemsMsg := make(map[int32]*msg.ItemInfo, 0) for k, v := range PlayroomMod.GameReward { - ItemsMsg[int32(k)] = &msg.ItemInfo{ + itemsMsg[int32(k)] = &msg.ItemInfo{ Id: int32(v.Id), Num: int32(v.Num), } @@ -3590,7 +3603,7 @@ func ReqPlayroomGame(player *Player, buf []byte) error { player.TeLog("finish_mini_game", map[string]interface{}{ "mini_game_type": PlayroomMod.GetGameId(), "is_chip": false, - "item_list": Items, + "item_list": items, }) PlayroomMod.ResetGame() player.PlayroomBackData() @@ -3598,7 +3611,7 @@ func ReqPlayroomGame(player *Player, buf []byte) error { player.PushClientRes(&msg.ResPlayroomGame{ Code: msg.RES_CODE_SUCCESS, Type: req.Type, - Items: ItemsMsg, + Items: itemsMsg, }) player.PlayMod.save() return nil @@ -3612,8 +3625,8 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Items := player.GetPlayroomGameReward(playroom.GAME_RESULT_HIGH, int(req.Id)) - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + items := player.GetPlayroomGameReward(playroom.GAME_RESULT_HIGH, int(req.Id)) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomSelectReward{ Code: msg.RES_CODE_FAIL, @@ -3621,9 +3634,9 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { }) return err } - GameId := PlayroomMod.GetGameId() - Target := PlayroomMod.GetTarget() - if GameId == 0 || Target == 0 { + gameId := PlayroomMod.GetGameId() + target := PlayroomMod.GetTarget() + if gameId == 0 || target == 0 { player.SendErrClienRes(&msg.ResPlayroomSelectReward{ Code: msg.RES_CODE_FAIL, Msg: "no game or target", @@ -3633,11 +3646,11 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { now := GoUtil.Now() FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), - To: Target, + To: target, Type: MsqMod.HANDLE_TYPE_PLAYROOM_LOSE, SendT: now, End: now + sevendays, - Item: Items, + Item: items, Extra: GameResult{ T: PlayroomMod.GetGameId(), Emoji: int(req.EmojiId), @@ -3645,13 +3658,13 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { }) LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PET_THIEF) { - player.GetPetThiefReward(Target) + player.GetPetThiefReward(target) } player.AddPlayroomChip(int(req.Id)) player.TeLog("finish_mini_game", map[string]interface{}{ "mini_game_type": PlayroomMod.GetGameId(), "is_chip": true, - "item_list": Items, + "item_list": items, }) player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_PLAYROOM_GAME}) FriendMod := player.PlayMod.getFriendMod() @@ -3660,7 +3673,7 @@ func ReqPlayroomSelectReward(player *Player, buf []byte) error { PlayroomMod.ResetGame() player.PlayerDecoSetLog("emoji", int(req.EmojiId), "playroom_select_reward") player.PlayroomBackData() - go NotifyPetroomGame(Target) + go NotifyPetroomGame(target) player.PlayMod.save() player.PushClientRes(&msg.ResPlayroomSelectReward{ Code: msg.RES_CODE_SUCCESS, @@ -3684,7 +3697,7 @@ func ReqPlayroomWork(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Items, err := PlayroomMod.Work() + items, err := PlayroomMod.Work() if err != nil { player.SendErrClienRes(&msg.ResPlayroomWork{ Code: msg.RES_CODE_FAIL, @@ -3693,11 +3706,11 @@ func ReqPlayroomWork(player *Player, buf []byte) error { return err } // 开始工作 设置定时器 - if Items != nil { + if items != nil { LimitedTimePlayroomWorkTrigger(player) player.UpdateUserInfo() } - err = player.HandleLoseItem(Items, "playroomWork") + err = player.HandleLoseItem(items, "playroomWork") if err != nil { player.SendErrClienRes(&msg.ResPlayroomWork{ Code: msg.RES_CODE_FAIL, @@ -3732,7 +3745,7 @@ func ReqPlayroomRest(player *Player, buf []byte) error { // 抽取转盘 func ReqPlayroomDraw(player *Player, buf []byte) error { PlayroomMod := player.PlayMod.getPlayroomMod() - Id, Items, err := PlayroomMod.Draw() + id, items, err := PlayroomMod.Draw() if err != nil { player.SendErrClienRes(&msg.ResPlayroomDraw{ Code: msg.RES_CODE_FAIL, @@ -3740,8 +3753,8 @@ func ReqPlayroomDraw(player *Player, buf []byte) error { }) return err } - player.args["ResItemPopId"] = Id - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomDraw.String()) + player.args["ResItemPopId"] = id + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomDraw.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomDraw{ Code: msg.RES_CODE_FAIL, @@ -3753,12 +3766,12 @@ func ReqPlayroomDraw(player *Player, buf []byte) error { // player.PlayroomBackData() player.PushClientRes(PlayroomMod.NotifyMood()) player.TeLog("playroom_draw", map[string]interface{}{ - "draw_id": Id, - "item_list": Items, + "draw_id": id, + "item_list": items, }) player.PushClientRes(&msg.ResPlayroomDraw{ Code: msg.RES_CODE_SUCCESS, - Id: int32(Id), + Id: int32(id), }) return nil } @@ -3771,7 +3784,7 @@ func ReqPlayroomChip(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Items, ChipNum, err := PlayroomMod.RemoveChip(req.Uid) + items, chipNum, err := PlayroomMod.RemoveChip(req.Uid) if err != nil { player.SendErrClienRes(&msg.ResPlayroomChip{ Code: msg.RES_CODE_FAIL, @@ -3779,7 +3792,7 @@ func ReqPlayroomChip(player *Player, buf []byte) error { }) return err } - err = player.HandleLoseItem(Items, msg.ITEM_POP_LABEL_PlayroomChip.String()) + err = player.HandleLoseItem(items, msg.ITEM_POP_LABEL_PlayroomChip.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomChip{ Code: msg.RES_CODE_FAIL, @@ -3788,9 +3801,9 @@ func ReqPlayroomChip(player *Player, buf []byte) error { return err } player.TeLog("remove_chip", map[string]interface{}{ - "remove_chip_number": ChipNum, + "remove_chip_number": chipNum, }) - for range ChipNum { + for range chipNum { player.SubPlayroomChip(int(player.M_DwUin)) } player.PlayMod.save() @@ -3810,7 +3823,7 @@ func ReqPlayroomFlip(player *Player, buf []byte) error { } PlayroomMod := player.PlayMod.getPlayroomMod() - CardId, err := PlayroomMod.FlipCard(int(req.Id)) + cardId, err := PlayroomMod.FlipCard(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomFlip{ Code: msg.RES_CODE_FAIL, @@ -3819,7 +3832,7 @@ func ReqPlayroomFlip(player *Player, buf []byte) error { return err } player.TeLog("playroom_flip", map[string]interface{}{ - "CardID": CardId, + "CardID": cardId, "Id": req.Id, }) player.PlayMod.save() @@ -3827,7 +3840,7 @@ func ReqPlayroomFlip(player *Player, buf []byte) error { player.PushClientRes(&msg.ResPlayroomFlip{ Code: msg.RES_CODE_SUCCESS, Id: req.Id, - CardId: int32(CardId), + CardId: int32(cardId), }) return nil } @@ -3909,8 +3922,8 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - AddItems, CostItem := PlayroomMod.BuyItem(int(req.Id)) - if CostItem == nil { + addItems, costItems := PlayroomMod.BuyItem(int(req.Id)) + if costItems == nil { err := fmt.Errorf("can not buy item") player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -3919,7 +3932,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { return err } - err = player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) + err = player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -3927,7 +3940,7 @@ func ReqPlayroomBuyItem(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(AddItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) + err = player.HandleItem(addItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -3952,7 +3965,7 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Items, err := PlayroomMod.GiveUpvote(int(req.Id)) + items, err := PlayroomMod.GiveUpvote(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomUpvote{ Code: msg.RES_CODE_FAIL, @@ -3960,7 +3973,7 @@ func ReqPlayroomUpvote(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomUpvote.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomUpvote.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomUpvote{ Code: msg.RES_CODE_FAIL, @@ -4029,7 +4042,7 @@ func ReqPlayroomTask(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Items, err := PlayroomMod.GetDailyTaskReward(int(req.Id)) + items, err := PlayroomMod.GetDailyTaskReward(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomTask{ Code: msg.RES_CODE_FAIL, @@ -4037,7 +4050,7 @@ func ReqPlayroomTask(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomTask.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomTask.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomTask{ Code: msg.RES_CODE_FAIL, @@ -4045,10 +4058,10 @@ func ReqPlayroomTask(player *Player, buf []byte) error { }) return err } - Type := playroomCfg.GetDailyTaskType(int(req.Id)) + dailyType := playroomCfg.GetDailyTaskType(int(req.Id)) player.TeLog("room_daily_task", map[string]interface{}{ "task_id": req.Id, - "is_reward": PlayroomMod.DailyTaskCanReward(Type), + "is_reward": PlayroomMod.DailyTaskCanReward(dailyType), }) player.PlayMod.save() player.PushClientRes(&msg.ResPlayroomTask{ @@ -4066,7 +4079,7 @@ func ReqPlayroomTaskReward(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Id, Items, err := PlayroomMod.GetTaskReward(int(req.Type)) + id, items, err := PlayroomMod.GetTaskReward(int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResPlayroomTaskReward{ Code: msg.RES_CODE_FAIL, @@ -4074,8 +4087,8 @@ func ReqPlayroomTaskReward(player *Player, buf []byte) error { }) return err } - player.args["ResItemPopId"] = Id - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomTaskReward.String()) + player.args["ResItemPopId"] = id + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomTaskReward.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomTaskReward{ Code: msg.RES_CODE_FAIL, @@ -4085,13 +4098,13 @@ func ReqPlayroomTaskReward(player *Player, buf []byte) error { } player.TeLog("playroom_task_reward", map[string]interface{}{ "task_type": req.Type, - "reward_id": Id, - "reward": Items, + "reward_id": id, + "reward": items, }) player.PlayMod.save() player.PushClientRes(&msg.ResPlayroomTaskReward{ Code: msg.RES_CODE_SUCCESS, - Id: int32(Id), + Id: int32(id), Type: req.Type, }) player.NotifyPlayroomTask() @@ -4134,8 +4147,8 @@ func ReqPlayroomOutline(player *Player, buf []byte) error { ChessMod := player.PlayMod.getChessMod() if req.CostDia < 0 { var itemList []*item.Item - item := item.NewItem(item.ITEM_DIAMOND_ID, int(req.CostDia)) - itemList = append(itemList, item) + itemInfo := item.NewItem(item.ITEM_DIAMOND_ID, int(req.CostDia)) + itemList = append(itemList, itemInfo) err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomOutline{ @@ -4192,7 +4205,7 @@ func ReqPlayroomShop(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - AddItems, LoseItem, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount()) + addItems, loseItems, err := PlayroomMod.ShopBuy(int(req.Id), int(req.Num), player.IsWeeklyDiscount()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomShop{ Code: msg.RES_CODE_FAIL, @@ -4201,8 +4214,8 @@ func ReqPlayroomShop(player *Player, buf []byte) error { return err } // 消耗道具为0则为广告获取 - if LoseItem[0].Num == 0 { - err := PlayroomMod.AdWatch(AddItems[0].Id) + if len(loseItems) > 0 && loseItems[0].Num == 0 { + err := PlayroomMod.AdWatch(addItems[0].Id) if err != nil { player.SendErrClienRes(&msg.ResPlayroomBuyItem{ Code: msg.RES_CODE_FAIL, @@ -4211,7 +4224,7 @@ func ReqPlayroomShop(player *Player, buf []byte) error { return err } } - err = player.HandleLoseItem(LoseItem, msg.ITEM_POP_LABEL_PlayroomShop.String()) + err = player.HandleLoseItem(loseItems, msg.ITEM_POP_LABEL_PlayroomShop.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomShop{ Code: msg.RES_CODE_FAIL, @@ -4219,7 +4232,7 @@ func ReqPlayroomShop(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(AddItems, msg.ITEM_POP_LABEL_PlayroomShop.String()) + err = player.HandleItem(addItems, msg.ITEM_POP_LABEL_PlayroomShop.String()) if err != nil { player.SendErrClienRes(&msg.ResPlayroomShop{ Code: msg.RES_CODE_FAIL, @@ -4230,9 +4243,9 @@ func ReqPlayroomShop(player *Player, buf []byte) error { player.TeLog("playroom_shop", map[string]interface{}{ "shop_id": req.Id, "num": req.Num, - "reward": AddItems, + "reward": addItems, }) - player.PetItemGetLog(AddItems, LoseItem, "Shop") + player.PetItemGetLog(addItems, loseItems, "Shop") player.PlayMod.save() player.PushClientRes(PlayroomMod.NotifyMood()) player.PlayroomBackData() @@ -4287,7 +4300,7 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error { return err } FriendTreasureMod := player.PlayMod.getFriendTreasureMod() - Items, Uid, err := FriendTreasureMod.Flip(int(req.Pos)) + items, uid, err := FriendTreasureMod.Flip(int(req.Pos)) if err != nil { player.SendErrClienRes( &msg.ResFriendTreasureFilp{ @@ -4298,18 +4311,18 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error { return err } now := GoUtil.Now() - if Uid != 0 && Items != nil { + if uid != 0 && items != nil { FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), - To: int(Uid), + To: int(uid), Type: MsqMod.HANDLE_TYPE_TREASURE_RESULT, - Extra: Items[0].Num, + Extra: items[0].Num, SendT: now, End: now + sevendays, }) } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendtreasureFilp.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_FriendtreasureFilp.String()) if err != nil { player.SendErrClienRes( &msg.ResFriendTreasureFilp{ @@ -4321,8 +4334,8 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error { } player.TeLog("friend_treasure_filp", map[string]interface{}{ "pos": req.Pos, - "items": Items, - "uid": Uid, + "items": items, + "uid": uid, }) player.PlayMod.save() player.PushClientRes(&msg.ResFriendTreasureFilp{ @@ -4333,7 +4346,7 @@ func ReqFriendTreasureFilp(player *Player, buf []byte) error { func ReqFriendTreasureEnd(player *Player, buf []byte) error { FriendTreasureMod := player.PlayMod.getFriendTreasureMod() - Items, FriendItemNum, err := FriendTreasureMod.EndGame(player.GetOrderFactor()) + items, friendItemNum, err := FriendTreasureMod.EndGame(player.GetOrderFactor()) if err != nil { player.SendErrClienRes( &msg.ResFriendTreasureEnd{ @@ -4347,7 +4360,7 @@ func ReqFriendTreasureEnd(player *Player, buf []byte) error { for _, v := range FriendTreasureMod.List { ItemNum := 0 if v.Status == 1 { - ItemNum = FriendItemNum + ItemNum = friendItemNum } FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), @@ -4358,7 +4371,7 @@ func ReqFriendTreasureEnd(player *Player, buf []byte) error { Extra: []*item.Item{item.NewItem(item.ITEM_STAR_ID, ItemNum)}, }) } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendtreasureEnd.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_FriendtreasureEnd.String()) if err != nil { player.SendErrClienRes( &msg.ResFriendTreasureEnd{ @@ -4374,7 +4387,7 @@ func ReqFriendTreasureEnd(player *Player, buf []byte) error { player.TeLog("pet_treasure_open", map[string]interface{}{ "pet_treasure_step": FriendTreasureMod.Shift, "pet_treasure_box": FriendTreasureMod.BoxItems, - "pet_treasure_reward": append(Items, FriendTreasureMod.BoxItems...), + "pet_treasure_reward": append(items, FriendTreasureMod.BoxItems...), }) FriendTreasureMod.ResetGame() player.PlayMod.save() @@ -4405,7 +4418,7 @@ func ReqCardHandbookReward(player *Player, buf []byte) error { return err } CardMod := player.PlayMod.getCardMod() - Items, err := CardMod.GetHandbookReward(int(req.CardId)) + items, err := CardMod.GetHandbookReward(int(req.CardId)) if err != nil { player.SendErrClienRes(&msg.ResCardHandbookReward{ Code: msg.RES_CODE_FAIL, @@ -4413,7 +4426,7 @@ func ReqCardHandbookReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_CardHandbookReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_CardHandbookReward.String()) if err != nil { player.SendErrClienRes(&msg.ResCardHandbookReward{ Code: msg.RES_CODE_FAIL, @@ -4423,7 +4436,7 @@ func ReqCardHandbookReward(player *Player, buf []byte) error { } player.TeLog("card_handbook_reward", map[string]interface{}{ "CardId": int(req.CardId), - "Items": Items, + "Items": items, }) player.PlayMod.save() player.PushClientRes(&msg.ResCardHandbookReward{ @@ -4478,21 +4491,21 @@ func ReqCollect(player *Player, buf []byte) error { return err } CollectMod := player.PlayMod.getCollectMod() - Type := collectCfg.GetRewardType(int(req.Id)) - Num := 0 - AreaType := "" - switch Type { + rewardType := collectCfg.GetRewardType(int(req.Id)) + var num int + var areaType string + switch rewardType { case collect.COLLECT_TYPE_EMOJI: - AreaType = "emoji" - Num = player.PlayMod.getEmojiMod().GetEmojiNum() + areaType = "emoji" + num = player.PlayMod.getEmojiMod().GetEmojiNum() case collect.COLLECT_TYPE_FACE: // 增加默认头像1个 - AreaType = "face" - Num = player.PlayMod.getFaceMod().GetFaceNum() + 1 + areaType = "face" + num = player.PlayMod.getFaceMod().GetFaceNum() + 1 case collect.COLLECT_TYPE_AVATAR: - AreaType = "avatar" - Num = player.PlayMod.getAvatarMod().GetAvatarNum() + areaType = "avatar" + num = player.PlayMod.getAvatarMod().GetAvatarNum() } - Items, err := CollectMod.GetReward(int(req.Id), Num, player.GetOrderFactor()) + items, err := CollectMod.GetReward(int(req.Id), num, player.GetOrderFactor()) if err != nil { player.SendErrClienRes(&msg.ResCollect{ Code: msg.RES_CODE_FAIL, @@ -4500,7 +4513,7 @@ func ReqCollect(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_Collect.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_Collect.String()) if err != nil { player.SendErrClienRes(&msg.ResCollect{ Code: msg.RES_CODE_FAIL, @@ -4514,9 +4527,9 @@ func ReqCollect(player *Player, buf []byte) error { Code: msg.RES_CODE_SUCCESS, }) player.TeLog("playerdeco_warehouse_unlock", map[string]interface{}{ - "area_type": AreaType, + "area_type": areaType, "Id": int(req.Id), - "Items": Items, + "Items": items, }) return nil } @@ -4529,17 +4542,18 @@ func ReqSellChessNum(player *Player, buf []byte) error { return err } data, _ := mergeDataCfg.GetOne(int(req.ChessId)) - Num := data.SellNum + num := data.SellNum limitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if limitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PAYBACK_DAY) { - Num = data.Star + num = data.Star } player.PushClientRes(&msg.ResSellChessNum{ - Num: int32(Num), + Num: int32(num), }) return nil } +// 设置宠物装扮 func ReqPlayroomDressSet(player *Player, buf []byte) error { req := &msg.ReqPlayroomDressSet{} err := proto.Unmarshal(buf, req) @@ -4547,7 +4561,7 @@ func ReqPlayroomDressSet(player *Player, buf []byte) error { return err } PlayroomMod := player.PlayMod.getPlayroomMod() - Parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet)) + parts, _, error := PlayroomMod.PlayroomDressSet(GoUtil.MapInt32ToInt(req.DressSet)) if error != nil { player.SendErrClienRes(&msg.ResPlayroomDressSet{ Code: msg.RES_CODE_FAIL, @@ -4555,7 +4569,7 @@ func ReqPlayroomDressSet(player *Player, buf []byte) error { }) return error } - player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_PETDRESS, A: []interface{}{Parts}}) + player.QuestTrigger(&quest.Trigger{Label: quest.TRIGGER_LABEL_PETDRESS, A: []interface{}{parts}}) player.PlayMod.save() //player.PetDecoSetLog(Diff) player.PlayroomBackData() @@ -4565,6 +4579,7 @@ func ReqPlayroomDressSet(player *Player, buf []byte) error { return nil } +// 设置宠物挂件 弃用 func ReqPlayroomPetAirSet(player *Player, buf []byte) error { req := &msg.ReqPlayroomPetAirSet{} err := proto.Unmarshal(buf, req) @@ -4588,6 +4603,7 @@ func ReqPlayroomPetAirSet(player *Player, buf []byte) error { return nil } +// 幸运猫活动领取奖励 func ReqLimitEventLuckyCat(player *Player, buf []byte) error { req := &msg.ReqLimitEventLuckyCat{} LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() @@ -4672,14 +4688,15 @@ func ReqAddGiftReward(player *Player, buf []byte) error { } +// 领取活动奖励 func ReqActivityReward(player *Player, buf []byte) error { req := &msg.ReqActivityReward{} err := proto.Unmarshal(buf, req) if err != nil { return err } - ActivityInfo := player.GetActivityInfo(int(req.Id)) - if ActivityInfo == nil { + activityInfo := player.GetActivityInfo(int(req.Id)) + if activityInfo == nil { player.SendErrClienRes(&msg.ResActivityReward{ Code: msg.RES_CODE_FAIL, Msg: "activity not exist", @@ -4687,7 +4704,7 @@ func ReqActivityReward(player *Player, buf []byte) error { return fmt.Errorf("activity not exist") } ActivityMod := player.PlayMod.getActivityMod() - Items, err := ActivityMod.GetReward(int(req.Id)) + items, err := ActivityMod.GetReward(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResActivityReward{ Code: msg.RES_CODE_FAIL, @@ -4695,7 +4712,7 @@ func ReqActivityReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_ActivityReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_ActivityReward.String()) if err != nil { player.SendErrClienRes(&msg.ResActivityReward{ Code: msg.RES_CODE_FAIL, @@ -4705,7 +4722,7 @@ func ReqActivityReward(player *Player, buf []byte) error { } player.TeLog("activity_reward", map[string]interface{}{ "Id": int(req.Id), - "Items": Items, + "Items": items, }) player.PlayMod.save() player.InitActivity() @@ -4762,7 +4779,7 @@ func ReqCatTrickReward(player *Player, buf []byte) error { }) return fmt.Errorf("cat trick event not exist") } - Items, err := LimitedTimeEventMod.GetCatTrickReward() + items, err := LimitedTimeEventMod.GetCatTrickReward() if err != nil { player.SendErrClienRes(&msg.ResCatTrickReward{ Code: msg.RES_CODE_FAIL, @@ -4770,7 +4787,7 @@ func ReqCatTrickReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_CatTrickReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatTrickReward.String()) if err != nil { player.SendErrClienRes(&msg.ResCatTrickReward{ Code: msg.RES_CODE_FAIL, @@ -4779,7 +4796,7 @@ func ReqCatTrickReward(player *Player, buf []byte) error { return err } player.TeLog("cat_trick_reward", map[string]interface{}{ - "Items": Items, + "Items": items, }) player.PlayMod.save() player.PushClientRes(LimitedTimeEventMod.BackData()) @@ -4816,7 +4833,7 @@ func ReqAddWish(player *Player, buf []byte) error { return err } ChargeMod := player.PlayMod.getChargeMod() - Items, err := ChargeMod.AddWish(int(req.Id), int(req.Type)) + items, err := ChargeMod.AddWish(int(req.Id), int(req.Type)) if err != nil { player.SendErrClienRes(&msg.ResAddWish{ Code: msg.RES_CODE_FAIL, @@ -4824,8 +4841,8 @@ func ReqAddWish(player *Player, buf []byte) error { }) return err } - if Items != nil { - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_AddWish.String()) + if items != nil { + err = player.HandleItem(items, msg.ITEM_POP_LABEL_AddWish.String()) if err != nil { player.SendErrClienRes(&msg.ResAddWish{ Code: msg.RES_CODE_FAIL, @@ -4837,7 +4854,7 @@ func ReqAddWish(player *Player, buf []byte) error { player.TeLog("wish_add", map[string]interface{}{ "Id": int(req.Id), "Type": int(req.Type), - "Items": Items, + "Items": items, }) player.PlayMod.save() player.PushClientRes(&msg.ResAddWish{ @@ -4853,7 +4870,7 @@ func ReqGetWish(player *Player, buf []byte) error { return err } ChargeMod := player.PlayMod.getChargeMod() - Items, err := ChargeMod.GetWish() + items, err := ChargeMod.GetWish() if err != nil { player.SendErrClienRes(&msg.ResGetWish{ Code: msg.RES_CODE_FAIL, @@ -4861,8 +4878,8 @@ func ReqGetWish(player *Player, buf []byte) error { }) return err } - if Items != nil { - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_GetWish.String()) + if items != nil { + err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetWish.String()) if err != nil { player.SendErrClienRes(&msg.ResGetWish{ Code: msg.RES_CODE_FAIL, @@ -4872,7 +4889,7 @@ func ReqGetWish(player *Player, buf []byte) error { } } player.TeLog("wish_get", map[string]interface{}{ - "wish": Items, + "wish": items, }) player.PlayMod.save() player.PushClientRes(&msg.ResGetWish{ @@ -4922,9 +4939,9 @@ func ReqWishApplyList(player *Player, buf []byte) error { return err } FriendMod := player.PlayMod.getFriendMod() - List := FriendMod.GetWishApply() + list := FriendMod.GetWishApply() rs := make([]*msg.ResFriendApplyInfo, 0) - for _, v := range List { + for _, v := range list { PD := G_GameLogicPtr.GetResSimplePlayerByUid(0) if PD == nil { continue @@ -4981,16 +4998,16 @@ func ReqGuidePlayroom(player *Player, buf []byte) error { return err } GuideMod := player.PlayMod.getGuideMod() - B := GuideMod.GetPlayroomGuide() - if B { + isReward := GuideMod.GetPlayroomGuide() + if isReward { player.SendErrClienRes(&msg.ResGuidePlayroom{ Code: msg.RES_CODE_FAIL, Msg: "已领取", }) return fmt.Errorf("已领取") } - Items := []*item.Item{item.NewItem(int(req.Id), 1)} - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String()) + items := []*item.Item{item.NewItem(int(req.Id), 1)} + err = player.HandleItem(items, msg.ITEM_POP_LABEL_PlayroomGame.String()) if err != nil { player.SendErrClienRes(&msg.ResWishApply{ Code: msg.RES_CODE_FAIL, @@ -5046,9 +5063,9 @@ func ReqPlayroomGameShowReward(player *Player, buf []byte) error { if err != nil { return err } - Items := player.GetPlayroomGameReward(int(req.Type), int(req.SelectId)) + items := player.GetPlayroomGameReward(int(req.Type), int(req.SelectId)) player.PushClientRes(&msg.ResPlayroomGameShowReward{ - Items: item.ItemToMsg(Items), + Items: item.ItemToMsg(items), }) return nil } @@ -5091,15 +5108,15 @@ func ReqCatnipInvite(player *Player, buf []byte) error { if err != nil { return err } - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipInvite{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", }) return fmt.Errorf("activity not active") } - ActivityInfo := player.GetActivityInfo(ActivityId) + activityInfo := player.GetActivityInfo(activityId) CatnipMod := player.PlayMod.getCatnipMod() err = CatnipMod.Invite(int(req.Uid), int(req.Id)) if err != nil { @@ -5116,14 +5133,13 @@ func ReqCatnipInvite(player *Player, buf []byte) error { From: int(player.M_DwUin), To: int(req.Uid), Type: MsqMod.HANDLE_TYPE_CATNIP_INVITE, - End: ActivityInfo.EndT, - Extra: CatnipMsg{ - ActivityId: ActivityId, - GameId: int(req.Id), + End: activityInfo.EndT, + Extra: map[string]interface{}{ + "ActivityId": activityId, + "GameId": int(req.Id), }, SendT: GoUtil.Now(), }) - //player.CatnipBackData() player.PlayMod.save() player.PushClientRes(&msg.ResCatnipInvite{ Code: msg.RES_CODE_SUCCESS, @@ -5139,9 +5155,9 @@ func ReqCatnipAgree(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - ActivityInfo := player.GetActivityInfo(ActivityId) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + activityInfo := player.GetActivityInfo(activityId) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipAgree{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", @@ -5156,7 +5172,7 @@ func ReqCatnipAgree(player *Player, buf []byte) error { }) return err } - err = player.SetCatnipPartner(int(req.Id), int(req.Uid), ActivityInfo.EndT) + err = player.SetCatnipPartner(int(req.Id), int(req.Uid), activityInfo.EndT) if err != nil { player.SendErrClienRes(&msg.ResCatnipAgree{ Code: msg.RES_CODE_FAIL, @@ -5171,9 +5187,9 @@ func ReqCatnipAgree(player *Player, buf []byte) error { From: int(player.M_DwUin), To: int(req.Uid), Type: MsqMod.HANDLE_TYPE_CATNIP_AGREE, - Extra: CatnipMsg{ - ActivityId: ActivityId, - GameId: int(req.Id), + Extra: map[string]interface{}{ + "ActivityId": activityId, + "GameId": int(req.Id), }, SendT: GoUtil.Now(), }) @@ -5194,8 +5210,8 @@ func ReqCatnipMultiply(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipMultiply{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", @@ -5230,15 +5246,15 @@ func ReqCatnipPlay(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", }) return fmt.Errorf("activity not active") } - Id, Growth, PartnerId, Items, ItemCost, FriendItems, err := CatnipMod.Play(int(req.Id)) + id, growth, partnerId, items, costItems, friendItems, err := CatnipMod.Play(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_FAIL, @@ -5246,7 +5262,7 @@ func ReqCatnipPlay(player *Player, buf []byte) error { }) return err } - err = player.HandleLoseItem(ItemCost, msg.ITEM_POP_LABEL_CatnipPlay.String()) + err = player.HandleLoseItem(costItems, msg.ITEM_POP_LABEL_CatnipPlay.String()) if err != nil { player.SendErrClienRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_FAIL, @@ -5254,7 +5270,7 @@ func ReqCatnipPlay(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_CatnipPlay.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipPlay.String()) if err != nil { player.SendErrClienRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_FAIL, @@ -5262,20 +5278,24 @@ func ReqCatnipPlay(player *Player, buf []byte) error { }) return err } + var expendNum int + if len(costItems) > 0 { + expendNum = costItems[0].Num + } player.TeLog("cats_garden_expend_token", map[string]interface{}{ - "friends_ID": PartnerId, + "friends_ID": partnerId, "multiple": CatnipMod.GetMultiple(), - "expend_num": ItemCost[0].Num, - "get_award": Items, + "expend_num": expendNum, + "get_award": items, }) - if Growth > 0 { - player.CatnipGrowthMsg(PartnerId, int(req.Id), Growth, FriendItems*CatnipMod.Mul) + if growth > 0 { + player.CatnipGrowthMsg(partnerId, int(req.Id), growth, friendItems*CatnipMod.Mul) } //player.CatnipBackData() player.PlayMod.save() player.PushClientRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_SUCCESS, - Id: int32(Id), + Id: int32(id), }) return nil } @@ -5288,15 +5308,15 @@ func ReqCatnipReward(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", }) return fmt.Errorf("activity not active") } - Items, GameInfo, err := CatnipMod.Reward(int(req.Id)) + items, gameInfo, err := CatnipMod.Reward(int(req.Id)) if err != nil { player.SendErrClienRes(&msg.ResCatnipReward{ Code: msg.RES_CODE_FAIL, @@ -5304,7 +5324,7 @@ func ReqCatnipReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_CatnipReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipReward.String()) if err != nil { player.SendErrClienRes(&msg.ResCatnipReward{ Code: msg.RES_CODE_FAIL, @@ -5314,9 +5334,9 @@ func ReqCatnipReward(player *Player, buf []byte) error { } player.TeLog("cats_garden_stage_reward", map[string]interface{}{ "Id": int(req.Id), - "friends_ID": GameInfo.Partner, - "friends_get_num": GameInfo.PartnerAdd, - "user_get_num": GameInfo.Progress - GameInfo.PartnerAdd, + "friends_ID": gameInfo.Partner, + "friends_get_num": gameInfo.PartnerAdd, + "user_get_num": gameInfo.Progress - gameInfo.PartnerAdd, }) //player.CatnipBackData() player.PlayMod.save() @@ -5334,15 +5354,15 @@ func ReqCatnipGrandReward(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipPlay{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", }) return fmt.Errorf("activity not active") } - Items, err := CatnipMod.GrandReward() + items, err := CatnipMod.GrandReward() if err != nil { player.SendErrClienRes(&msg.ResCatnipGrandReward{ Code: msg.RES_CODE_FAIL, @@ -5350,7 +5370,7 @@ func ReqCatnipGrandReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_CatnipGrandReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_CatnipGrandReward.String()) if err != nil { player.SendErrClienRes(&msg.ResCatnipGrandReward{ Code: msg.RES_CODE_FAIL, @@ -5359,7 +5379,7 @@ func ReqCatnipGrandReward(player *Player, buf []byte) error { return err } player.TeLog("cats_garden_final_reward", map[string]interface{}{ - "get_reward": Items, + "get_reward": items, }) //player.CatnipBackData() player.PlayMod.save() @@ -5376,8 +5396,8 @@ func ReqCatnipRefuse(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipRefuse{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", @@ -5400,9 +5420,9 @@ func ReqCatnipRefuse(player *Player, buf []byte) error { To: int(req.Uid), Type: MsqMod.HANDLE_TYPE_CATNIP_REFUSE, SendT: GoUtil.Now(), - Extra: CatnipMsg{ - ActivityId: player.GetActivityId(activity.ACT_TYPE_CATNIP), - GameId: int(req.Id), + Extra: map[string]interface{}{ + "ActivityId": player.GetActivityId(activity.ACT_TYPE_CATNIP), + "GameId": int(req.Id), }, }) //player.CatnipBackData() @@ -5421,8 +5441,8 @@ func ReqActPass(player *Player, buf []byte) error { func ReqActPassReward(player *Player, buf []byte) error { PassMod := player.PlayMod.getPassMod() - Items, NewLevel := PassMod.GetRewardItems() - err := player.HandleItem(Items, msg.ITEM_POP_LABEL_ActPassReward.String()) + items, newLevel := PassMod.GetRewardItems() + err := player.HandleItem(items, msg.ITEM_POP_LABEL_ActPassReward.String()) if err != nil { player.SendErrClienRes(&msg.ResActPassReward{ Code: msg.RES_CODE_FAIL, @@ -5431,13 +5451,13 @@ func ReqActPassReward(player *Player, buf []byte) error { return err } player.TeLog("act_pass_reward", map[string]interface{}{ - "NewLevel": NewLevel, - "Items": Items, + "NewLevel": newLevel, + "Items": items, }) player.PlayMod.save() player.PushClientRes(&msg.ResActPassReward{ Code: msg.RES_CODE_SUCCESS, - RewardLevel: GoUtil.IntToInt32(NewLevel), + RewardLevel: GoUtil.IntToInt32(newLevel), }) return nil } @@ -5449,7 +5469,7 @@ func ReqGetChessRetireReward(player *Player, buf []byte) error { return err } ChessMod := player.PlayMod.getChessMod() - Items, err := ChessMod.GetRetireReward(req.Id) + items, err := ChessMod.GetRetireReward(req.Id) if err != nil { player.SendErrClienRes(&msg.ResGetChessRetireReward{ Code: msg.RES_CODE_FAIL, @@ -5457,7 +5477,7 @@ func ReqGetChessRetireReward(player *Player, buf []byte) error { }) return err } - err = player.HandleItem(Items, msg.ITEM_POP_LABEL_GetChessRetireReward.String()) + err = player.HandleItem(items, msg.ITEM_POP_LABEL_GetChessRetireReward.String()) if err != nil { player.SendErrClienRes(&msg.ResGetChessRetireReward{ Code: msg.RES_CODE_FAIL, @@ -5467,7 +5487,7 @@ func ReqGetChessRetireReward(player *Player, buf []byte) error { } player.TeLog("get_chess_retire_reward", map[string]interface{}{ "EmitSerise": req.Id, - "Items": Items, + "Items": items, }) player.PushClientRes(ChessMod.BackData()) player.PlayMod.save() @@ -5485,17 +5505,17 @@ func ReqCatnipEmoji(player *Player, buf []byte) error { return err } CatnipMod := player.PlayMod.getCatnipMod() - ActivityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) - if ActivityId == 0 { + activityId := player.GetActivityId(activity.ACT_TYPE_CATNIP) + if activityId == 0 { player.SendErrClienRes(&msg.ResCatnipEmoji{ Code: msg.RES_CODE_FAIL, Msg: "activity not active", }) return fmt.Errorf("activity not active") } - GameInfo := CatnipMod.GetGameInfo(int(req.Id)) + gameInfo := CatnipMod.GetGameInfo(int(req.Id)) CatnipMod.SetSendEmoji(int(req.Id), int(req.EmojiId)) - if GameInfo.Partner == 0 { + if gameInfo.Partner == 0 { player.SendErrClienRes(&msg.ResCatnipEmoji{ Code: msg.RES_CODE_FAIL, Msg: "no partner", @@ -5504,7 +5524,7 @@ func ReqCatnipEmoji(player *Player, buf []byte) error { } FriendMgrSend(&MsqMod.Msg{ From: int(player.M_DwUin), - To: GameInfo.Partner, + To: gameInfo.Partner, Type: MsqMod.HANDLE_TYPE_CATNIP_SEND_EMOJI, Extra: int(req.EmojiId), }) diff --git a/src/server/game/req_func_friend.go b/src/server/game/req_func_friend.go index 84129415..2a3a4e04 100644 --- a/src/server/game/req_func_friend.go +++ b/src/server/game/req_func_friend.go @@ -452,9 +452,9 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { From: int(player.M_DwUin), To: int(ReplyInfo.Uid), Type: MsqMod.HANDLE_TYPE_CATNIP_AGREE, - Extra: CatnipMsg{ - ActivityId: ActivityId, - GameId: int(GameId), + Extra: map[string]interface{}{ + "ActivityId": ActivityId, + "GameId": int(GameId), }, SendT: now, End: now + sevendays, @@ -465,9 +465,9 @@ func ReqFriendReplyHandle(player *Player, buf []byte) error { From: int(player.M_DwUin), To: int(v), Type: MsqMod.HANDLE_TYPE_CATNIP_AGREE, - Extra: CatnipMsg{ - ActivityId: ActivityId, - GameId: int(GameId), + Extra: map[string]interface{}{ + "ActivityId": ActivityId, + "GameId": int(GameId), }, SendT: now, End: now + sevendays,