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

Merge branch 'develop' into sdk

Browse Source
This commit is contained in:
hahwu 2026-04-29 11:51:09 +08:00
commit a6b86759e8
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/conf/merge_data/merge_data_cfg.go
View File

@ -232,7 +232,7 @@ func GetSellNumById(Id int) int {
func GetEmitProduceType(Id int) []string {
data, err := gamedata.GetDataByIntKey(CFG_NAME, Id)
if err != nil {
log.Debug("GetEmitProduceType GetOne Id:%v not found", Id)
//log.Debug("GetEmitProduceType GetOne Id:%v not found", Id)
return []string{}
}

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

@ -271,7 +271,7 @@ func ReqGmCommand_(player *Player, Command string) error {
N: ChampshipMod.GetN(),
},
End: GoUtil.ZeroTimestamp() + 86400, // 第二天零点删除
HandleType: MsgMod.HANDLE_MDO_CHAMPSHIP_INRANK,
HandleType: MsgMod.HANDLE_MOD_CHAMPSHIP_INRANK,
}
SendMsgToCenterAsync(m)
case "resetUserInfo":

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

@ -22,7 +22,7 @@ type MessageMiddleware func(MessageHandlerFunc) MessageHandlerFunc
var save_msg_type = []int{
msg.HANDLE_MOD_PLAYER_MSG,
msg.HANDLE_MDO_CHAMPSHIP_INRANK,
msg.HANDLE_MOD_CHAMPSHIP_INRANK,
msg.HANDLE_MOD_USER_VAR_SET,
}
@ -176,7 +176,7 @@ func (m *MessageMgr) CenterRegister() {
m.RegisterHandler(msg.HANDLE_MOD_USER_VAR_SET, MessageHandlerFunc(SetUserVarDataHandler))
m.RegisterHandler(msg.HANDLE_MOD_USER_VAR_GET, MessageHandlerFunc(GetUserVarDataHandler))
m.RegisterHandler(msg.HANDLE_MOD_CATNIP_PARTNER, MessageHandlerFunc(CatnipPartnerHandler))
m.RegisterHandler(msg.HANDLE_MDO_CHAMPSHIP_INRANK, MessageHandlerFunc(ChampshipInRankHandler))
m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_INRANK, MessageHandlerFunc(ChampshipInRankHandler))
m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_RANK_INFO, MessageHandlerFunc(ChampshipRankInfoHandler))
m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_RANK_LIST, MessageHandlerFunc(ChampshipRankListHandler))
m.RegisterHandler(msg.HANDLE_MOD_CHAMPSHIP_PRE_RANK, MessageHandlerFunc(ChampshipRankPreHandler))

6
src/server/game/mod/msg/Msg.go
View File

@ -51,7 +51,7 @@ const (
HANDLE_MOD_USER_VAR_GET = 20010 // 获取玩家变量
HANDLE_MOD_USER_VAR_SET = 20011 // 设置玩家变量
HANDLE_MOD_REPLY_PLAYER_MSG = 20012 // 回复玩家消息
HANDLE_MDO_CHAMPSHIP_INRANK = 20013 // 锦标赛入榜
HANDLE_MOD_CHAMPSHIP_INRANK = 20013 // 锦标赛入榜
HANDLE_MOD_CHAMPSHIP_RANK_INFO = 20014 // 锦标赛排名信息
HANDLE_MOD_CHAMPSHIP_RANK_LIST = 20015 // 锦标赛排行榜
HANDLE_MOD_CHAMPSHIP_PRE_RANK = 20016 // 锦标赛上期排名
@ -239,8 +239,8 @@ func formatHandleType(handleType int) string {
return "HANDLE_MOD_USER_VAR_SET"
case HANDLE_MOD_REPLY_PLAYER_MSG:
return "HANDLE_MOD_REPLY_PLAYER_MSG"
case HANDLE_MDO_CHAMPSHIP_INRANK:
return "HANDLE_MDO_CHAMPSHIP_INRANK"
case HANDLE_MOD_CHAMPSHIP_INRANK:
return "HANDLE_MOD_CHAMPSHIP_INRANK"
case HANDLE_MOD_CHAMPSHIP_RANK_INFO:
return "HANDLE_MOD_CHAMPSHIP_RANK_INFO"
case HANDLE_MOD_CHAMPSHIP_RANK_LIST:

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

@ -1190,7 +1190,7 @@ func (p *Player) HandleInChampshipRank() {
N: ChampshipMod.GetN(),
},
End: GoUtil.ZeroTimestamp() + 86400, // 第二天零点删除
HandleType: MsgMod.HANDLE_MDO_CHAMPSHIP_INRANK,
HandleType: MsgMod.HANDLE_MOD_CHAMPSHIP_INRANK,
}
SendMsgToCenterAsync(m)
}

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

@ -3328,7 +3328,7 @@ func ReqPlayroomSelectReward(player *Player, req *msg.ReqPlayroomSelectReward) e
if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PET_THIEF) {
player.GetPetThiefReward(target)
}
player.AddPlayroomChip(int(req.Id))
player.AddPlayroomChip(target)
player.TeLog("finish_mini_game", map[string]interface{}{
"mini_game_type": PlayroomMod.GetGameId(),
"is_chip": true,