diff --git a/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go b/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go index 2c8229a7..0abe1805 100644 --- a/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go +++ b/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go @@ -288,6 +288,15 @@ func GetFastCD() int { return gamedata.GetIntValue(data, "Value") } +func GetPaybackDay() int { + data, err := gamedata.GetDataByKey(CFG_LIMITED_TIME_EVENT_CONST, "payback_day") + if err != nil { + log.Debug("GetPaybackDay err:%v", err) + return 0 + } + return gamedata.GetIntValue(data, "Value") +} + // 招财猫 func GetMoneyCat(Id int) (float64, int) { diff --git a/src/server/game/PlayerChessMod.go b/src/server/game/PlayerChessMod.go index b304aa7f..7db2efc0 100644 --- a/src/server/game/PlayerChessMod.go +++ b/src/server/game/PlayerChessMod.go @@ -144,6 +144,7 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa HandbookMod := player.PlayMod.getHandbookMod() var addChessCostEnergy int var buyChess int + LimitPush := false // 限时事件推送 TriggerList := make([]*quest.Trigger, 0) itemList := make([]*item.Item, 0) AddChessList := make([]int, 0) @@ -203,6 +204,14 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa if checkChess(ChessId, BaseMod.GetEnergyMul(), ChessMod.GetEmitList()) { // 在订单中无法生成的棋子 出售获得原价宠物币 items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: mergeDataCfg.GetStarById(ChessId)}} } + LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() + if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_PAYBACK_DAY) { + err = LimitedTimeEventMod.SubPaybackDay() + if err == nil { + items = []*item.Item{{Id: item.ITEM_STAR_ID, Num: mergeDataCfg.GetStarById(ChessId)}} + } + LimitPush = true + } if err != nil { return err } @@ -236,6 +245,9 @@ func (p *PlayerChessData) HandleChess(player *Player, handle_list []*msg.ChessHa LimitedTimeEventMod := player.PlayMod.getLimitedTimeEventMod() if LimitedTimeEventMod.CheckExist(limitedTimeEvent.EVENT_TYPE_CAT_TRICK) { LimitedTimeEventMod.AddCatTrickEnergy(addChessCostEnergy) + LimitPush = true + } + if LimitPush { player.PushClientRes(LimitedTimeEventMod.BackData()) } player.QuestTriggerList(TriggerList) diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go index a1cb1da3..c0a462ed 100644 --- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go +++ b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go @@ -25,6 +25,7 @@ const ( EVENT_TYPE_MONEY_CAT = 12 // 招财猫 EVENT_TYPE_LUCKY_CAT = 13 // 幸运猫 EVENT_TYPE_CAT_TRICK = 14 // 猫咪戏法 + EVENT_TYPE_PAYBACK_DAY = 15 // 回收日 ) const ( @@ -72,6 +73,10 @@ type CatTrickInfo struct { Type int } +type PaybackDay struct { + count int +} + func (l *LimitedTimeEventMod) InitData(Lv int) { if l.EventList == nil { l.EventList = make(map[int]*LTEInfo) @@ -378,6 +383,21 @@ func (l *LimitedTimeEventMod) AddCatTrickEnergy(Energy int) { d.Energy += Energy } +func (l *LimitedTimeEventMod) SubPaybackDay() error { + if l.EventList[EVENT_TYPE_PAYBACK_DAY] == nil { + return fmt.Errorf("PaybackDay event not exist") + } + d := l.EventList[EVENT_TYPE_PAYBACK_DAY].D.(*PaybackDay) + if d.count <= 0 { + return fmt.Errorf("PaybackDay count is 0") + } + d.count-- + if d.count <= 0 { + delete(l.EventList, EVENT_TYPE_PAYBACK_DAY) + } + return nil +} + func (l *LimitedTimeEventMod) GetCatTrickReward() ([]*item.Item, error) { if l.EventList[EVENT_TYPE_CAT_TRICK] == nil { return nil, fmt.Errorf("CatTrick event not exist") @@ -399,7 +419,7 @@ func (l *LimitedTimeEventMod) GetCatTrickReward() ([]*item.Item, error) { }, nil } -// 获取超级订单奖励 +// #region 事件信息初始化 func initEventInfo(E *LTEInfo, EventType int) { switch EventType { case EVENT_TYPE_FAST_PRODUCE: @@ -417,6 +437,11 @@ func initEventInfo(E *LTEInfo, EventType int) { E.D = &LuckyCat{ Earnings: 0, } + case EVENT_TYPE_PAYBACK_DAY: + + E.D = &PaybackDay{ + count: limitedTimeEventCfg.GetPaybackDay(), + } case EVENT_TYPE_CAT_TRICK: Type := limitedTimeEventCfg.GetCatTrickType(int(E.Remian)) E.D = &CatTrick{ @@ -438,6 +463,9 @@ func addEventInfo(E *LTEInfo, EventType int) { Id: len(d.List) + 1, Type: limitedTimeEventCfg.GetCatTrickType(int(E.Remian)), }) + case EVENT_TYPE_PAYBACK_DAY: + d := E.D.(*PaybackDay) + d.count += limitedTimeEventCfg.GetPaybackDay() } } @@ -459,6 +487,9 @@ func getLimitEventMsg(t int, e *LTEInfo) *msg.LimitEvent { Param[msg.LimitEventParam_CAT_TRICK_ENERGY.String()] = int32(Energy) info := d.List[0] Param[msg.LimitEventParam_CAT_TRICK_TYPE.String()] = int32(info.Type) + case EVENT_TYPE_PAYBACK_DAY: + d := e.D.(*PaybackDay) + Param[msg.LimitEventParam_PAYBACK_DAY_COUNT.String()] = int32(d.count) } return &msg.LimitEvent{ EndTime: int32(e.StartT + e.Remian), diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index 97102e15..7f8bcdec 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -480,6 +480,7 @@ const ( TIME_LINE_TYPE_LOG_TYPE_HANDBOOK_UPVOTE TIME_LINE_TYPE = 17 // 图鉴点赞 TIME_LINE_TYPE_LOG_TYPE_CHARGE_SEND TIME_LINE_TYPE = 18 // 充值赠送 TIME_LINE_TYPE_LOG_TYPE_CHARGE_RECEIVED TIME_LINE_TYPE = 19 // 充值接受 + TIME_LINE_TYPE_LOG_TYPE_WISH TIME_LINE_TYPE = 20 // 心愿单 ) // Enum value maps for TIME_LINE_TYPE. @@ -503,6 +504,7 @@ var ( 17: "LOG_TYPE_HANDBOOK_UPVOTE", 18: "LOG_TYPE_CHARGE_SEND", 19: "LOG_TYPE_CHARGE_RECEIVED", + 20: "LOG_TYPE_WISH", } TIME_LINE_TYPE_value = map[string]int32{ "DEFAULT": 0, @@ -523,6 +525,7 @@ var ( "LOG_TYPE_HANDBOOK_UPVOTE": 17, "LOG_TYPE_CHARGE_SEND": 18, "LOG_TYPE_CHARGE_RECEIVED": 19, + "LOG_TYPE_WISH": 20, } ) @@ -612,9 +615,10 @@ func (CHESS_EX_TYPE) EnumDescriptor() ([]byte, []int) { type LimitEventParam int32 const ( - LimitEventParam_LEP_NONE LimitEventParam = 0 //无 - LimitEventParam_CAT_TRICK_ENERGY LimitEventParam = 1 //猫咪能量 - LimitEventParam_CAT_TRICK_TYPE LimitEventParam = 2 //猫咪类型 + LimitEventParam_LEP_NONE LimitEventParam = 0 //无 + LimitEventParam_CAT_TRICK_ENERGY LimitEventParam = 1 //猫咪能量 + LimitEventParam_CAT_TRICK_TYPE LimitEventParam = 2 //猫咪类型 + LimitEventParam_PAYBACK_DAY_COUNT LimitEventParam = 3 //回收日 ) // Enum value maps for LimitEventParam. @@ -623,11 +627,13 @@ var ( 0: "LEP_NONE", 1: "CAT_TRICK_ENERGY", 2: "CAT_TRICK_TYPE", + 3: "PAYBACK_DAY_COUNT", } LimitEventParam_value = map[string]int32{ - "LEP_NONE": 0, - "CAT_TRICK_ENERGY": 1, - "CAT_TRICK_TYPE": 2, + "LEP_NONE": 0, + "CAT_TRICK_ENERGY": 1, + "CAT_TRICK_TYPE": 2, + "PAYBACK_DAY_COUNT": 3, } ) @@ -12660,6 +12666,7 @@ func (x *ResFriendCardMsg) GetMsgList() []*ResFriendCard { return nil } +// 好友心愿单请求列表 type ReqWishApplyList struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -12741,6 +12748,7 @@ func (x *ResWishApplyList) GetApplyList() []*ResFriendApplyInfo { return nil } +// 同意好友心愿单请求 type ReqWishApply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -24443,7 +24451,7 @@ var file_proto_Gameapi_proto_rawDesc = []byte{ 0x41, 0x43, 0x45, 0x10, 0x03, 0x12, 0x1a, 0x0a, 0x16, 0x41, 0x43, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x47, 0x49, 0x46, 0x54, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x41, 0x43, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x44, - 0x44, 0x5f, 0x47, 0x49, 0x46, 0x54, 0x10, 0x05, 0x2a, 0xfb, 0x03, 0x0a, 0x0e, 0x54, 0x49, 0x4d, + 0x44, 0x5f, 0x47, 0x49, 0x46, 0x54, 0x10, 0x05, 0x2a, 0x8e, 0x04, 0x0a, 0x0e, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x4c, 0x49, 0x4e, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x52, 0x49, 0x45, 0x4e, 0x44, 0x5f, 0x41, 0x50, 0x50, 0x4c, @@ -24475,20 +24483,23 @@ var file_proto_Gameapi_proto_rawDesc = []byte{ 0x0a, 0x14, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x47, 0x45, 0x5f, 0x53, 0x45, 0x4e, 0x44, 0x10, 0x12, 0x12, 0x1c, 0x0a, 0x18, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x47, 0x45, 0x5f, 0x52, 0x45, 0x43, 0x45, - 0x49, 0x56, 0x45, 0x44, 0x10, 0x13, 0x2a, 0x75, 0x0a, 0x0d, 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, - 0x45, 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x48, 0x45, 0x53, 0x53, - 0x5f, 0x45, 0x58, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x43, 0x48, - 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x42, 0x55, 0x42, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x12, - 0x10, 0x0a, 0x0c, 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x42, 0x4f, 0x58, 0x10, - 0x02, 0x12, 0x16, 0x0a, 0x12, 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x51, 0x55, - 0x49, 0x43, 0x4b, 0x5f, 0x42, 0x55, 0x59, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x48, 0x45, - 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x2a, 0x49, 0x0a, - 0x0f, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, - 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x45, 0x50, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x14, - 0x0a, 0x10, 0x43, 0x41, 0x54, 0x5f, 0x54, 0x52, 0x49, 0x43, 0x4b, 0x5f, 0x45, 0x4e, 0x45, 0x52, - 0x47, 0x59, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x41, 0x54, 0x5f, 0x54, 0x52, 0x49, 0x43, - 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x02, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2e, 0x2f, 0x6d, - 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x56, 0x45, 0x44, 0x10, 0x13, 0x12, 0x11, 0x0a, 0x0d, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x57, 0x49, 0x53, 0x48, 0x10, 0x14, 0x2a, 0x75, 0x0a, 0x0d, 0x43, 0x48, 0x45, + 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x48, + 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x13, 0x0a, + 0x0f, 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x42, 0x55, 0x42, 0x42, 0x4c, 0x45, + 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x42, + 0x4f, 0x58, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, + 0x5f, 0x51, 0x55, 0x49, 0x43, 0x4b, 0x5f, 0x42, 0x55, 0x59, 0x10, 0x03, 0x12, 0x12, 0x0a, 0x0e, + 0x43, 0x48, 0x45, 0x53, 0x53, 0x5f, 0x45, 0x58, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x10, 0x04, + 0x2a, 0x60, 0x0a, 0x0f, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x45, 0x50, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, + 0x00, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x41, 0x54, 0x5f, 0x54, 0x52, 0x49, 0x43, 0x4b, 0x5f, 0x45, + 0x4e, 0x45, 0x52, 0x47, 0x59, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x43, 0x41, 0x54, 0x5f, 0x54, + 0x52, 0x49, 0x43, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x10, 0x02, 0x12, 0x15, 0x0a, 0x11, 0x50, + 0x41, 0x59, 0x42, 0x41, 0x43, 0x4b, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x43, 0x4f, 0x55, 0x4e, 0x54, + 0x10, 0x03, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2e, 0x2f, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var (