Commit dff17021bdc54c543d01c93755862b79f31e405f
1 parent
aa487faa
fix
Showing
3 changed files
with
22 additions
and
22 deletions
Show diff stats
cmd/gameserver/action/HeroAction.go
| @@ -15,6 +15,26 @@ import ( | @@ -15,6 +15,26 @@ import ( | ||
| 15 | ) | 15 | ) |
| 16 | 16 | ||
| 17 | /* | 17 | /* |
| 18 | +HeroEquipReferRpc 穿戴/脱 装备 | ||
| 19 | + 2: 装备不存在 | ||
| 20 | +*/ | ||
| 21 | +func HeroEquipReferRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) { | ||
| 22 | + req := pb.HeroEquipReferRar{} | ||
| 23 | + if err := proto.Unmarshal(msg.GetData(), &req); err != nil { | ||
| 24 | + logger.Error("loginRpc err: %v", err) | ||
| 25 | + return 1, nil | ||
| 26 | + } | ||
| 27 | + for _, equipInfo := range req.EquipIds { | ||
| 28 | + ret := role.EquipmentRefer(equipInfo.EquipId, req.HeroId, req.Refer, equipInfo.Pos) | ||
| 29 | + if ret != 0 { | ||
| 30 | + logger.Error("ret: %d, equipId: %s, heroId: %s, refer: %d, pos:%d", ret, equipInfo.EquipId, req.HeroId, req.Refer, equipInfo.Pos) | ||
| 31 | + } | ||
| 32 | + | ||
| 33 | + } | ||
| 34 | + return 0, nil | ||
| 35 | +} | ||
| 36 | + | ||
| 37 | +/* | ||
| 18 | EquipmentDelRpc 删除装备 | 38 | EquipmentDelRpc 删除装备 |
| 19 | 2 删除失败 | 39 | 2 删除失败 |
| 20 | */ | 40 | */ |
cmd/gameserver/action/RoleAction.go
| @@ -85,26 +85,6 @@ func ChangeTeamRpc(role *models.RoleModel, msg components.IMessage) (int32, inte | @@ -85,26 +85,6 @@ func ChangeTeamRpc(role *models.RoleModel, msg components.IMessage) (int32, inte | ||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | /* | 87 | /* |
| 88 | -HeroEquipReferRpc 穿戴/脱 装备 | ||
| 89 | - 2: 装备不存在 | ||
| 90 | -*/ | ||
| 91 | -func HeroEquipReferRpc(role *models.RoleModel, msg components.IMessage) (int32, interface{}) { | ||
| 92 | - req := pb.HeroEquipReferRar{} | ||
| 93 | - if err := proto.Unmarshal(msg.GetData(), &req); err != nil { | ||
| 94 | - logger.Error("loginRpc err: %v", err) | ||
| 95 | - return 1, nil | ||
| 96 | - } | ||
| 97 | - for _, equipInfo := range req.EquipIds { | ||
| 98 | - ret := role.EquipmentRefer(equipInfo.EquipId, req.HeroId, req.Refer, equipInfo.Pos) | ||
| 99 | - if ret != 0 { | ||
| 100 | - logger.Error("ret: %d, equipId: %s, heroId: %s, refer: %d, pos:%d", ret, equipInfo.EquipId, req.HeroId, req.Refer, equipInfo.Pos) | ||
| 101 | - } | ||
| 102 | - | ||
| 103 | - } | ||
| 104 | - return 0, nil | ||
| 105 | -} | ||
| 106 | - | ||
| 107 | -/* | ||
| 108 | RoleClearItemsRpc 删除物品 | 88 | RoleClearItemsRpc 删除物品 |
| 109 | 2 删除失败 | 89 | 2 删除失败 |
| 110 | */ | 90 | */ |
| @@ -195,7 +175,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i | @@ -195,7 +175,7 @@ func RoleEndBattleRpc(role *models.RoleModel, msg components.IMessage) (int32, i | ||
| 195 | } | 175 | } |
| 196 | } | 176 | } |
| 197 | //award | 177 | //award |
| 198 | - reward = role.Award(reward, &pb.LogConf{Desc: "in_battle", Int1: string(chapterInfo.ChapterId), Int2: string(chapterCount)}) | 178 | + reward = role.Award(reward, &pb.LogConf{Desc: "out_battle", Int1: string(chapterInfo.ChapterId), Int2: string(chapterCount)}) |
| 199 | 179 | ||
| 200 | //exp | 180 | //exp |
| 201 | var amount int32 | 181 | var amount int32 |