pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
hahwu 2024-12-24 12:04:59 +08:00
parent a2139b3ad4
commit 3d63153d66
12 changed files with 3655 additions and 3398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/conf/mergeData/MergeDataCfg.go
View File

@ -137,13 +137,24 @@ func GetMaxLvById(Id int) int {
return gamedata.ParseInt(data["MaxLv"]) return gamedata.ParseInt(data["MaxLv"])
} }
func GetEmitMinLvById(Id int) int { // 根据Id获取发射器最小等级
data, err := gamedata.GetDataByIntKey(CFG_NAME, Id) func GetEmitMinLvById(Id string) int {
data, err := gamedata.GetDataByKey(CFG_MERGE_EMIT, Id)
if err != nil { if err != nil {
log.Debug("GetMaxLvById GetOne Id:%v not found", Id) log.Debug("GetMaxLvById GetOne Id:%v not found", Id)
return 0 return 0
} }
return gamedata.ParseInt(data["Emit_Min_Lv"]) return gamedata.GetIntValue(data, "Emit_Min_Lv")
}
// 根据Id获取发射器修正系数
func GetEmitRatio(Id string) float64 {
data, err := gamedata.GetDataByKey(CFG_MERGE_EMIT, Id)
if err != nil {
log.Debug("GetMaxLvById GetOne Id:%v not found", Id)
return 0
}
return gamedata.GetFloatValue(data, "Ratio")
} }
func GetMaxLvByColor(Color string) int { func GetMaxLvByColor(Color string) int {

9
src/server/game/ChargeFunc.go
View File

@ -2,6 +2,7 @@ package game
import ( import (
"server/game/mod/piggyBank" "server/game/mod/piggyBank"
"server/msg"
"server/pkg/github.com/name5566/leaf/log" "server/pkg/github.com/name5566/leaf/log"
) )
@ -15,7 +16,7 @@ func Charge(p *Player, ChargeId int) {
func PlayroomFire(p *Player, ChargeId int) { func PlayroomFire(p *Player, ChargeId int) {
PlayroomMod := p.PlayMod.getPlayroomMod() PlayroomMod := p.PlayMod.getPlayroomMod()
Item := PlayroomMod.Fire(ChargeId) Item := PlayroomMod.Fire(ChargeId)
err := p.HandleItem(Item, "Playroom") err := p.HandleItem(Item, msg.ITEM_POP_LABEL_Playroom.String())
if err != nil { if err != nil {
log.Debug("ChargeFire err : %s", err) log.Debug("ChargeFire err : %s", err)
} }
@ -25,7 +26,7 @@ func PlayroomFire(p *Player, ChargeId int) {
func PiggyBankFire(p *Player, ChargeId int) { func PiggyBankFire(p *Player, ChargeId int) {
PiggyBankMod := p.PlayMod.getPiggyBankMod() PiggyBankMod := p.PlayMod.getPiggyBankMod()
Item := PiggyBankMod.Fire(ChargeId) Item := PiggyBankMod.Fire(ChargeId)
err := p.HandleItem(Item, "PiggyBank") err := p.HandleItem(Item, msg.ITEM_POP_LABEL_PiggyBank.String())
if err != nil { if err != nil {
log.Debug("ChargeFire err : %s", err) log.Debug("ChargeFire err : %s", err)
} }
@ -43,7 +44,7 @@ func PiggyBankFire(p *Player, ChargeId int) {
func ChargeFire(p *Player, ChargeId int) { func ChargeFire(p *Player, ChargeId int) {
ChargeMod := p.PlayMod.getChargeMod() ChargeMod := p.PlayMod.getChargeMod()
Item := ChargeMod.Fire(ChargeId) Item := ChargeMod.Fire(ChargeId)
err := p.HandleItem(Item, "Charge") err := p.HandleItem(Item, msg.ITEM_POP_LABEL_Charge.String())
if err != nil { if err != nil {
log.Debug("ChargeFire err : %s", err) log.Debug("ChargeFire err : %s", err)
} }
@ -58,7 +59,7 @@ func EndlessFire(p *Player, ChargeId int) {
if Item == nil { if Item == nil {
return return
} }
err := p.HandleItem(Item, "Endless") err := p.HandleItem(Item, msg.ITEM_POP_LABEL_Endless.String())
if err != nil { if err != nil {
log.Debug("ChargeFire err : %s", err) log.Debug("ChargeFire err : %s", err)
} }

4
src/server/game/Gm.go
View File

@ -28,11 +28,11 @@ func ReqGmCommand(args []interface{}) error {
case "additem": case "additem":
id, _ := strconv.Atoi(arg[1]) id, _ := strconv.Atoi(arg[1])
num, _ := strconv.Atoi(arg[2]) num, _ := strconv.Atoi(arg[2])
player.HandleItem([]*item.Item{item.NewItem(id, num)}, "GM") player.HandleItem([]*item.Item{item.NewItem(id, num)}, msg.ITEM_POP_LABEL_GM.String())
case "subitem": case "subitem":
id, _ := strconv.Atoi(arg[1]) id, _ := strconv.Atoi(arg[1])
num, _ := strconv.Atoi(arg[2]) num, _ := strconv.Atoi(arg[2])
player.HandleItem([]*item.Item{item.NewItem(id, -num)}, "GM") player.HandleItem([]*item.Item{item.NewItem(id, -num)}, msg.ITEM_POP_LABEL_GM.String())
case "reset_order": case "reset_order":
player.PlayMod.mod_list.Order.Step = 0 player.PlayMod.mod_list.Order.Step = 0
player.PlayMod.mod_list.Order.InitData() player.PlayMod.mod_list.Order.InitData()

2
src/server/game/PlayerBaseMod.go
View File

@ -644,7 +644,7 @@ func (p *PlayerBaseData) AddExp(exp int) (int, error) {
}) })
} }
if len(UpLevelItem) > 0 { if len(UpLevelItem) > 0 {
err := p.M_Player.HandleItem(UpLevelItem, "LevUpReward") err := p.M_Player.HandleItem(UpLevelItem, msg.ITEM_POP_LABEL_LevUpReward.String())
if err != nil { if err != nil {
return 0, err return 0, err
} }

2
src/server/game/PlayerChessMod.go
View File

@ -206,7 +206,7 @@ func (p *PlayerChessData) HandleChess(handle_list []*msg.ChessHandle) error {
ReduceEneny := int(math.Pow(2, float64(EnergyPow))) * addChessCostEnergy ReduceEneny := int(math.Pow(2, float64(EnergyPow))) * addChessCostEnergy
itemList = append(itemList, &item.Item{Id: item.ITEM_ENERGY_ID, Num: -ReduceEneny}) itemList = append(itemList, &item.Item{Id: item.ITEM_ENERGY_ID, Num: -ReduceEneny})
} }
err := p.M_Player.HandleItem(itemList, "HandleChess") err := p.M_Player.HandleItem(itemList, msg.ITEM_POP_LABEL_HandleChess.String())
if err != nil { if err != nil {
return err return err
} }

2
src/server/game/PlayerFunc.go
View File

@ -235,7 +235,7 @@ func handle(p *Player, m *msg.Msg) error {
if m.Extra != nil { if m.Extra != nil {
Items = m.Extra.([]*item.Item) Items = m.Extra.([]*item.Item)
} }
p.HandleItem(Items, "") p.HandleItem(Items, proto.ITEM_POP_LABEL_Friendtreasure.String())
} }
// #region 以下是处理系统请求 // #region 以下是处理系统请求
return nil return nil

86
src/server/game/RegisterNetworkFunc.go
View File

@ -196,7 +196,7 @@ func ReqGetHandbookReward(args []interface{}) error {
} }
var itemList []*item.Item var itemList []*item.Item
itemList = append(itemList, &item.Item{Id: item.ITEM_ENERGY_ID, Num: 5}) itemList = append(itemList, &item.Item{Id: item.ITEM_ENERGY_ID, Num: 5})
err = player.HandleItem(itemList, "HandbookReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_HandbookReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGetHandbookReward{ player.SendErrClienRes(&msg.ResGetHandbookReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -278,7 +278,7 @@ func ReqRewardOrder(args []interface{}) error {
return err return err
} }
err = player.HandleItem(Item, "OrderReward") err = player.HandleItem(Item, msg.ITEM_POP_LABEL_OrderReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResRewardOrder{ player.SendErrClienRes(&msg.ResRewardOrder{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -352,7 +352,7 @@ func ReqDecorate(args []interface{}) error {
DecorateId := int(req.DecorateId) DecorateId := int(req.DecorateId)
AreaId := int(req.AreaId) AreaId := int(req.AreaId)
CostItem := DecorateMod.GetDecorateCostItem(AreaId, DecorateId) CostItem := DecorateMod.GetDecorateCostItem(AreaId, DecorateId)
err := player.HandleItem(CostItem, "DecorateCost") // 扣除道具 err := player.HandleItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResDecorate{ player.SendErrClienRes(&msg.ResDecorate{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -369,7 +369,7 @@ func ReqDecorate(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(AddItem, "DecorateAdd") // 增加道具 err = player.HandleItem(AddItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResDecorate{ player.SendErrClienRes(&msg.ResDecorate{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -421,7 +421,7 @@ func ReqDecorateAll(args []interface{}) error {
PlayerBaseMod := player.GetPlayerBaseMod() PlayerBaseMod := player.GetPlayerBaseMod()
CostItem, AddItem, DecorateNum, DecorateList := DecorateMod.DecorateAll(PlayerBaseMod.GetStar()) CostItem, AddItem, DecorateNum, DecorateList := DecorateMod.DecorateAll(PlayerBaseMod.GetStar())
err := player.HandleItem(CostItem, "DecorateCost") // 扣除道具 err := player.HandleItem(CostItem, msg.ITEM_POP_LABEL_DecorateCost.String()) // 扣除道具
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResDecorateAll{ player.SendErrClienRes(&msg.ResDecorateAll{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -430,7 +430,7 @@ func ReqDecorateAll(args []interface{}) error {
return err return err
} }
err = player.HandleItem(AddItem, "DecorateAdd") // 增加道具 err = player.HandleItem(AddItem, msg.ITEM_POP_LABEL_DecorateAdd.String()) // 增加道具
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResDecorateAll{ player.SendErrClienRes(&msg.ResDecorateAll{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -589,7 +589,7 @@ func ReqBuyChessBagGrid(args []interface{}) error {
proto.Unmarshal(buf, req) proto.Unmarshal(buf, req)
ChessMod := player.PlayMod.getChessMod() ChessMod := player.PlayMod.getChessMod()
CostItem := ChessMod.GetBuyChessBagGridCost() CostItem := ChessMod.GetBuyChessBagGridCost()
err := player.HandleItem(CostItem, "BuyChessBagGrid") err := player.HandleItem(CostItem, msg.ITEM_POP_LABEL_BuyChessBagGrid.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResBuyChessBagGrid{ player.SendErrClienRes(&msg.ResBuyChessBagGrid{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -630,7 +630,7 @@ func ReqChessEx(args []interface{}) error {
var itemList []*item.Item var itemList []*item.Item
item := item.NewItem(item.ITEM_DIAMOND_ID, int(req.CostDia)) item := item.NewItem(item.ITEM_DIAMOND_ID, int(req.CostDia))
itemList = append(itemList, item) itemList = append(itemList, item)
err := player.HandleItem(itemList, "ChessEx") err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResChessEx{ player.SendErrClienRes(&msg.ResChessEx{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -691,7 +691,7 @@ func ReqCardCollectReward(args []interface{}) error {
return err return err
} }
err = player.HandleItem(itemList, "CardCollectReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_CardCollectReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResCardCollectReward{ player.SendErrClienRes(&msg.ResCardCollectReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -732,7 +732,7 @@ func ReqExStarReward(args []interface{}) error {
return err return err
} }
err = player.HandleItem(itemList, "ExStarReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_ExStarReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResExStarReward{ player.SendErrClienRes(&msg.ResExStarReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -761,7 +761,7 @@ func ReqAllCollectReward(args []interface{}) error {
return err return err
} }
err = player.HandleItem(itemList, "AllCollectReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_AllCollectReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResAllCollectReward{ player.SendErrClienRes(&msg.ResAllCollectReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -792,7 +792,7 @@ func ReqGuideReward(args []interface{}) error {
return err return err
} }
player.args["ResItemPopId"] = int(req.Id) player.args["ResItemPopId"] = int(req.Id)
err = player.HandleItem(itemList, "GuideReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuideReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGuideReward{ player.SendErrClienRes(&msg.ResGuideReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -823,7 +823,7 @@ func ReqGetDailyTaskReward(args []interface{}) error {
return err return err
} }
player.args["ResItemPopId"] = int(req.Id) player.args["ResItemPopId"] = int(req.Id)
err = player.HandleItem(itemList, "DailyTaskReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_DailyTaskReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGetDailyTaskReward{ player.SendErrClienRes(&msg.ResGetDailyTaskReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -859,7 +859,7 @@ func ReqGetDailyWeekReward(args []interface{}) error {
return err return err
} }
player.args["ResItemPopId"] = int(req.Id) player.args["ResItemPopId"] = int(req.Id)
err = player.HandleItem(itemList, "DailyWeekReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_DailyWeekReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGetDailyWeekReward{ player.SendErrClienRes(&msg.ResGetDailyWeekReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -950,7 +950,7 @@ func ReqBuyEnergy(args []interface{}) error {
proto.Unmarshal(buf, req) proto.Unmarshal(buf, req)
BaseMod := player.PlayMod.getBaseMod() BaseMod := player.PlayMod.getBaseMod()
Item, Energy, Diamond := BaseMod.BuyEnergy(int(req.Energy)) Item, Energy, Diamond := BaseMod.BuyEnergy(int(req.Energy))
err := player.HandleItem(Item, "BuyEnergy") err := player.HandleItem(Item, msg.ITEM_POP_LABEL_BuyEnergy.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResBuyEnergy{ player.SendErrClienRes(&msg.ResBuyEnergy{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -985,7 +985,7 @@ func ReqGetSevenLoginReward(args []interface{}) error {
return err return err
} }
player.args["ResItemPopId"] = int(req.Id) player.args["ResItemPopId"] = int(req.Id)
err = player.HandleItem(itemList, "SevenLoginReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_SevenLoginRewardLabel.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGetSevenLoginReward{ player.SendErrClienRes(&msg.ResGetSevenLoginReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -1021,7 +1021,7 @@ func ReqGetMonthLoginReward(args []interface{}) error {
return err return err
} }
player.args["ResItemPopId"] = int(req.Id) player.args["ResItemPopId"] = int(req.Id)
err = player.HandleItem(itemList, "MonthLoginReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MonthLoginReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGetMonthLoginReward{ player.SendErrClienRes(&msg.ResGetMonthLoginReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -1051,7 +1051,7 @@ func ReqFastProduceReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "FastProduceReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_FastProduceReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResFastProduceReward{ player.SendErrClienRes(&msg.ResFastProduceReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -1081,7 +1081,7 @@ func ReqLimitSenceReward(args []interface{}) error {
} }
Id, Items := limitedTimeEventMod.GetSceneDashReward() Id, Items := limitedTimeEventMod.GetSceneDashReward()
player.args["ResItemPopId"] = Id player.args["ResItemPopId"] = Id
err := player.HandleItem(Items, "LimitSenceReward") err := player.HandleItem(Items, msg.ITEM_POP_LABEL_LimitSenceReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResLimitSenceReward{ player.SendErrClienRes(&msg.ResLimitSenceReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -1830,7 +1830,7 @@ func ReqGetMailReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "MailReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MailReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGetMailReward{ player.SendErrClienRes(&msg.ResGetMailReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -1882,7 +1882,7 @@ func ReqFreeShop(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(Item, "FreeShop") err = player.HandleItem(Item, msg.ITEM_POP_LABEL_FreeShop.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResFreeShop{ player.SendErrClienRes(&msg.ResFreeShop{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -1925,7 +1925,7 @@ func ReqBuyChessShop(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(Item, "ChessShop") err = player.HandleItem(Item, msg.ITEM_POP_LABEL_ChessShop.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResBuyChessShop{ player.SendErrClienRes(&msg.ResBuyChessShop{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2018,7 +2018,7 @@ func ReqRefreshChessShop(args []interface{}) error {
ChessMod := player.PlayMod.getChessMod() ChessMod := player.PlayMod.getChessMod()
ChargeMod.InitChessShop(ChessMod.GetEmitList()) ChargeMod.InitChessShop(ChessMod.GetEmitList())
Cost := []*item.Item{item.NewItem(item.ITEM_DIAMOND_ID, -20)} Cost := []*item.Item{item.NewItem(item.ITEM_DIAMOND_ID, -20)}
err := player.HandleItem(Cost, "RefreshChessShop") err := player.HandleItem(Cost, msg.ITEM_POP_LABEL_RefreshChessShop.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResRefreshChessShop{ player.SendErrClienRes(&msg.ResRefreshChessShop{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2048,7 +2048,7 @@ func ReqEndlessReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "EndlessReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_EndlessReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResEndlessReward{ player.SendErrClienRes(&msg.ResEndlessReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2088,7 +2088,7 @@ func ReqPiggyBankReward(args []interface{}) error {
_, player, _ := ParseArgs(args) _, player, _ := ParseArgs(args)
PiggyBankMod := player.PlayMod.getPiggyBankMod() PiggyBankMod := player.PlayMod.getPiggyBankMod()
itemList := PiggyBankMod.Fire(0) itemList := PiggyBankMod.Fire(0)
err := player.HandleItem(itemList, "PiggyBankReward") err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_PiggyBankReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPiggyBankReward{ player.SendErrClienRes(&msg.ResPiggyBankReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2148,7 +2148,7 @@ func ReqChampshipReward(args []interface{}) error {
_, player, _ := ParseArgs(args) _, player, _ := ParseArgs(args)
ChampshipMod := player.PlayMod.getChampshipMod() ChampshipMod := player.PlayMod.getChampshipMod()
itemList := ChampshipMod.GetReward() itemList := ChampshipMod.GetReward()
err := player.HandleItem(itemList, "ChampshipReward") err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResChampshipReward{ player.SendErrClienRes(&msg.ResChampshipReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2185,7 +2185,7 @@ func ReqLimitEventReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "LimitEventReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_LimitEventReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResLimitEventReward{ player.SendErrClienRes(&msg.ResLimitEventReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2284,7 +2284,7 @@ func ReqChampshipRankReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "ChampshipRankReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChampshipRankReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResChampshipRankReward{ player.SendErrClienRes(&msg.ResChampshipRankReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2422,7 +2422,7 @@ func ReqGetInviteReward(args []interface{}) error {
log.Debug("ReqGetInviteReward err :%v", err) log.Debug("ReqGetInviteReward err :%v", err)
return err return err
} }
err = player.HandleItem(Items, "invite") err = player.HandleItem(Items, msg.ITEM_POP_LABEL_invite.String())
if err != nil { if err != nil {
log.Debug("ReqGetInviteReward err :%v", err) log.Debug("ReqGetInviteReward err :%v", err)
return err return err
@ -2481,7 +2481,7 @@ func ReqSelectLimitEvent(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(Items, "SelectLimitEvent") err = player.HandleItem(Items, msg.ITEM_POP_LABEL_SelectLimitEvent.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResSelectLimitEvent{ player.SendErrClienRes(&msg.ResSelectLimitEvent{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2537,7 +2537,7 @@ func ReqMiningTake(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "MiningTake") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MiningTake.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResMiningTake{ player.SendErrClienRes(&msg.ResMiningTake{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2571,7 +2571,7 @@ func ReqMiningReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "MiningReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_MiningReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResMiningReward{ player.SendErrClienRes(&msg.ResMiningReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2591,7 +2591,7 @@ func ReqGuessColor(args []interface{}) error {
proto.Unmarshal(buf, req) proto.Unmarshal(buf, req)
GuessColorMod := player.PlayMod.getGuessColorMod() GuessColorMod := player.PlayMod.getGuessColorMod()
Items := GuessColorMod.FirstIn() Items := GuessColorMod.FirstIn()
err := player.HandleItem(Items, "GuessColor") err := player.HandleItem(Items, msg.ITEM_POP_LABEL_GuessColor.String())
if err != nil { if err != nil {
return err return err
} }
@ -2652,7 +2652,7 @@ func ReqGuessColorReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(itemList, "GuessColorReward") err = player.HandleItem(itemList, msg.ITEM_POP_LABEL_GuessColorReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResGuessColorReward{ player.SendErrClienRes(&msg.ResGuessColorReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2707,7 +2707,7 @@ func ReqRaceReward(args []interface{}) error {
}) })
return err return err
} }
err = player.HandleItem(Items, "RaceReward") err = player.HandleItem(Items, msg.ITEM_POP_LABEL_RaceReward.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResRaceReward{ player.SendErrClienRes(&msg.ResRaceReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2860,7 +2860,7 @@ func ReqPlayroomGame(args []interface{}) error {
PlayroomMod.ResetGame() PlayroomMod.ResetGame()
} }
err := player.HandleItem(Items, "playroomGame") err := player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomGame{ player.SendErrClienRes(&msg.ResPlayroomGame{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2893,7 +2893,7 @@ func ReqPlayroomSelectReward(args []interface{}) error {
proto.Unmarshal(buf, req) proto.Unmarshal(buf, req)
PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod := player.PlayMod.getPlayroomMod()
Items := PlayroomMod.SelectReward(int(req.Id)) Items := PlayroomMod.SelectReward(int(req.Id))
err := player.HandleItem(Items, "playroomGame") err := player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomGame.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomSelectReward{ player.SendErrClienRes(&msg.ResPlayroomSelectReward{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -2987,7 +2987,7 @@ func ReqPlayroomDraw(args []interface{}) error {
return err return err
} }
player.args["ResItemPopId"] = Id player.args["ResItemPopId"] = Id
err = player.HandleItem(Items, "playroomDraw") err = player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomDraw.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomDraw{ player.SendErrClienRes(&msg.ResPlayroomDraw{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -3012,7 +3012,7 @@ func ReqPlayroomChip(args []interface{}) error {
proto.Unmarshal(buf, req) proto.Unmarshal(buf, req)
PlayroomMod := player.PlayMod.getPlayroomMod() PlayroomMod := player.PlayMod.getPlayroomMod()
Items := PlayroomMod.RemoveChip(int(req.Num)) Items := PlayroomMod.RemoveChip(int(req.Num))
err := player.HandleItem(Items, "playroomChip") err := player.HandleItem(Items, msg.ITEM_POP_LABEL_PlayroomChip.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomChip{ player.SendErrClienRes(&msg.ResPlayroomChip{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -3049,7 +3049,7 @@ func ReqPlayroomFlip(args []interface{}) error {
if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PET_THIEF) { if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PET_THIEF) {
Items1 = item.Merge(Items1, Items1) Items1 = item.Merge(Items1, Items1)
} }
err = player.HandleItem(Items1, "playroomFlip") err = player.HandleItem(Items1, msg.ITEM_POP_LABEL_PlayroomFlip.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomFlip{ player.SendErrClienRes(&msg.ResPlayroomFlip{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -3114,7 +3114,7 @@ func ReqPlayroomOutline(args []interface{}) error {
var itemList []*item.Item var itemList []*item.Item
item := item.NewItem(item.ITEM_DIAMOND_ID, int(req.CostDia)) item := item.NewItem(item.ITEM_DIAMOND_ID, int(req.CostDia))
itemList = append(itemList, item) itemList = append(itemList, item)
err := player.HandleItem(itemList, "ChessEx") err := player.HandleItem(itemList, msg.ITEM_POP_LABEL_ChessEx.String())
if err != nil { if err != nil {
player.SendErrClienRes(&msg.ResPlayroomOutline{ player.SendErrClienRes(&msg.ResPlayroomOutline{
Code: msg.RES_CODE_FAIL, Code: msg.RES_CODE_FAIL,
@ -3238,7 +3238,7 @@ func ReqFriendTreasureFilp(args []interface{}) error {
return err return err
} }
err = player.HandleItem(Items, "FriendTreasureFilp") err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendtreasureFilp.String())
if err != nil { if err != nil {
player.SendErrClienRes( player.SendErrClienRes(
&msg.ResFriendTreasureFilp{ &msg.ResFriendTreasureFilp{
@ -3281,7 +3281,7 @@ func ReqFriendTreasureEnd(args []interface{}) error {
Extra: []*item.Item{item.NewItem(item.ITEM_STAR_ID, FriendItemNum)}, Extra: []*item.Item{item.NewItem(item.ITEM_STAR_ID, FriendItemNum)},
}) })
} }
err = player.HandleItem(Items, "FriendTreasureEnd") err = player.HandleItem(Items, msg.ITEM_POP_LABEL_FriendtreasureEnd.String())
if err != nil { if err != nil {
player.SendErrClienRes( player.SendErrClienRes(
&msg.ResFriendTreasureEnd{ &msg.ResFriendTreasureEnd{

5
src/server/game/UnitTest.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"server/game/mod/order" "server/game/mod/order"
"server/game/mod/sevenLogin" "server/game/mod/sevenLogin"
"server/msg"
) )
func UnitEndlessReward(p *Player) error { func UnitEndlessReward(p *Player) error {
@ -18,7 +19,7 @@ func UnitEndlessReward(p *Player) error {
if Item == nil { if Item == nil {
return fmt.Errorf("item is nil") return fmt.Errorf("item is nil")
} }
err = p.HandleItem(Item, "Endless") err = p.HandleItem(Item, msg.ITEM_POP_LABEL_Endless.String())
if err != nil { if err != nil {
return err return err
} }
@ -50,7 +51,7 @@ func UnitOrder(p *Player) error {
ChessMod := p.PlayMod.getChessMod() ChessMod := p.PlayMod.getChessMod()
OrderMod.OrderList = make(map[int]order.Order) OrderMod.OrderList = make(map[int]order.Order)
for i := 0; i < 150; i++ { for i := 0; i < 150; i++ {
err := OrderMod.CreateNormalOrder(6, ChessMod.GetEmitList(), 3) err := OrderMod.CreateNormalOrder(7, ChessMod.GetEmitList(), 3)
if err != nil { if err != nil {
return err return err
} }

6
src/server/game/admin.go
View File

@ -37,10 +37,14 @@ func AdminPlayerInfo(args []interface{}) error {
res := make(map[string]interface{}) res := make(map[string]interface{})
res["Name"] = player.PlayMod.getBaseMod().NickName res["Name"] = player.PlayMod.getBaseMod().NickName
res["AreaId"] = player.PlayMod.getDecorateMod().GetAreaId() res["AreaId"] = player.PlayMod.getDecorateMod().GetAreaId()
res["ChargeMoney"] = player.PlayMod.getChargeMod().Charge res["Charge"] = player.PlayMod.getChargeMod().Charge
res["Level"] = player.GetPlayerBaseMod().GetLevel() res["Level"] = player.GetPlayerBaseMod().GetLevel()
res["Diamond"] = player.GetPlayerBaseMod().GetDiamond() res["Diamond"] = player.GetPlayerBaseMod().GetDiamond()
res["Star"] = player.GetPlayerBaseMod().GetStar() res["Star"] = player.GetPlayerBaseMod().GetStar()
res["Energy"] = player.GetPlayerBaseMod().GetEnergy()
res["Diamond"] = player.GetPlayerBaseMod().GetDiamond()
res["Mac"] = player.GetPlayerBaseMod().GetName()
res["Login"] = player.GetPlayerBaseMod().Data.LoginTime
JsonBuff, err := json.Marshal(res) JsonBuff, err := json.Marshal(res)
if err != nil { if err != nil {
return err return err

2
src/server/game/mod/chess/Chess.go
View File

@ -406,7 +406,7 @@ func (cb *ChessBorad) PutChessInBag(Grid, ChessId, EmitId int) error {
func (cb *ChessBorad) TakeChessOutBag(Grid int) error { func (cb *ChessBorad) TakeChessOutBag(Grid int) error {
if Grid < 0 { if Grid < 0 {
cb.RemoveHonor(-Grid) cb.RemoveHonor(-Grid)
cb.AddChess(Grid) cb.AddChess(-Grid)
return nil return nil
} }
GridInfo, ok := cb.ChessBag.List[Grid] GridInfo, ok := cb.ChessBag.List[Grid]

6
src/server/game/mod/order/OrderFunc.go
View File

@ -201,9 +201,11 @@ func checkA1High(ChessList []int, Emit int, EnergyMul int) bool {
func getChesslvRange(Emit int, EnergyMul int) (int, int) { func getChesslvRange(Emit int, EnergyMul int) (int, int) {
RandEmitLv := mergeDataCfg.GetLvById(Emit) RandEmitLv := mergeDataCfg.GetLvById(Emit)
EmitId := mergeDataCfg.GetEmitId(Emit)
RandMaxLv := mergeDataCfg.GetMaxLvById(Emit) RandMaxLv := mergeDataCfg.GetMaxLvById(Emit)
RandEmitMinLv := mergeDataCfg.GetEmitMinLvById(Emit) RandEmitMinLv := mergeDataCfg.GetEmitMinLvById(EmitId)
m := int(float64(1+RandEmitLv-RandEmitMinLv) / float64(1+RandMaxLv-RandEmitMinLv) * 100) Ratio := mergeDataCfg.GetEmitRatio(EmitId)
m := int(float64(1+RandEmitLv-RandEmitMinLv) / float64(1+RandMaxLv-RandEmitMinLv) / Ratio * 100)
ChessMinLev := orderCfg.GetLvMin(EnergyMul) ChessMinLev := orderCfg.GetLvMin(EnergyMul)
ChessMaxLev := orderCfg.GetLvMax(EnergyMul, m) ChessMaxLev := orderCfg.GetLvMax(EnergyMul, m)
return ChessMinLev, ChessMaxLev return ChessMinLev, ChessMaxLev

6912
src/server/msg/Gameapi.pb.go
View File

File diff suppressed because it is too large Load Diff