diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go index fc3a78bd..39fc56c1 100644 --- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go +++ b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go @@ -62,7 +62,8 @@ type MoneyCat struct { } type LuckyCat struct { - Earnings int + Earnings int + MaxEarings int } type CatTrick struct { @@ -475,8 +476,10 @@ func initEventInfo(E *LTEInfo, EventType int) { Mul: 1.1, } case EVENT_TYPE_LUCKY_CAT: + MaxEarning := limitedTimeEventCfg.GetLuckyCatMaxEarning(int(E.Remian)) E.D = &LuckyCat{ - Earnings: 0, + Earnings: 0, + MaxEarings: MaxEarning, } case EVENT_TYPE_PAYBACK_DAY: @@ -504,6 +507,10 @@ func addEventInfo(E *LTEInfo, EventType, Duration int) { Id: len(d.List) + 1, Type: limitedTimeEventCfg.GetCatTrickType(Duration), }) + case EVENT_TYPE_LUCKY_CAT: + MaxEarning := limitedTimeEventCfg.GetLuckyCatMaxEarning(int(E.Remian)) + d := E.D.(*LuckyCat) + d.MaxEarings += MaxEarning case EVENT_TYPE_PAYBACK_DAY: d := E.D.(*PaybackDay) d.count += limitedTimeEventCfg.GetPaybackDay() @@ -524,6 +531,9 @@ func getLimitEventMsg(t int, e *LTEInfo) *msg.LimitEvent { d := e.D.(*MoneyCat) Cd = int(d.EndTime) Mul = d.Mul + case EVENT_TYPE_LUCKY_CAT: + d := e.D.(*LuckyCat) + Param[msg.LimitEventParam_LUCKY_CAT_EARNINGS.String()] = int32(d.MaxEarings) case EVENT_TYPE_CAT_TRICK: d := e.D.(*CatTrick) Energy := d.Energy diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index a7cadce8..1ac9058a 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -640,7 +640,7 @@ const ( TIME_LINE_TYPE_LOG_TYPE_CARD_EX_SUCCESS_1 TIME_LINE_TYPE = 10 // 卡牌交换成功 TIME_LINE_TYPE_LOG_TYPE_CARD_EX_SUCCESS_2 TIME_LINE_TYPE = 11 // 卡牌交换成功 TIME_LINE_TYPE_LOG_TYPE_FRIEND_DELETE TIME_LINE_TYPE = 14 // 删除好友 - TIME_LINE_TYPE_LOG_TYPE_PLAYROOM_VISIT TIME_LINE_TYPE = 15 // 拜访玩家 + TIME_LINE_TYPE_LOG_TYPE_PLAYROOM_VISIT TIME_LINE_TYPE = 15 // 非小猫游戏，他人偷走了玩家的猫币 TIME_LINE_TYPE_LOG_TYPE_HANDBOOK TIME_LINE_TYPE = 16 // 图鉴收集 TIME_LINE_TYPE_LOG_TYPE_HANDBOOK_UPVOTE TIME_LINE_TYPE = 17 // 图鉴点赞 TIME_LINE_TYPE_LOG_TYPE_CHARGE_SEND TIME_LINE_TYPE = 18 // 充值赠送 @@ -650,6 +650,11 @@ const ( TIME_LINE_TYPE_LOG_TYPE_PLAYROOM_UPVOTE TIME_LINE_TYPE = 22 // playroom点赞 TIME_LINE_TYPE_LOG_TYPE_PLAYROOM_CHAMPSHIP TIME_LINE_TYPE = 23 // 竞标赛排名 TIME_LINE_TYPE_LOG_TYPE_TREASURE TIME_LINE_TYPE = 24 // 宠物宝藏 + TIME_LINE_TYPE_LOG_TYPE_CARD_SEND_ACCEPT TIME_LINE_TYPE = 25 // 收到赠送卡牌 + TIME_LINE_TYPE_LOG_TYPE_PLAYROOM_CAT_WIN TIME_LINE_TYPE = 26 // 小猫游戏，给小猫成功装箱 + TIME_LINE_TYPE_LOG_TYPE_PLAYROOM_CAT_LOSE TIME_LINE_TYPE = 27 // 小猫游戏，装箱小猫未成功 + TIME_LINE_TYPE_LOG_TYPE_CARD_GIVE_ACCEPT TIME_LINE_TYPE = 28 // 接受卡牌请求 + TIME_LINE_TYPE_LOG_TYPE_FRIEND_INVITE TIME_LINE_TYPE = 29 // 邀请注册 ) // Enum value maps for TIME_LINE_TYPE. @@ -678,6 +683,11 @@ var ( 22: "LOG_TYPE_PLAYROOM_UPVOTE", 23: "LOG_TYPE_PLAYROOM_CHAMPSHIP", 24: "LOG_TYPE_TREASURE", + 25: "LOG_TYPE_CARD_SEND_ACCEPT", + 26: "LOG_TYPE_PLAYROOM_CAT_WIN", + 27: "LOG_TYPE_PLAYROOM_CAT_LOSE", + 28: "LOG_TYPE_CARD_GIVE_ACCEPT", + 29: "LOG_TYPE_FRIEND_INVITE", } TIME_LINE_TYPE_value = map[string]int32{ "DEFAULT": 0, @@ -703,6 +713,11 @@ var ( "LOG_TYPE_PLAYROOM_UPVOTE": 22, "LOG_TYPE_PLAYROOM_CHAMPSHIP": 23, "LOG_TYPE_TREASURE": 24, + "LOG_TYPE_CARD_SEND_ACCEPT": 25, + "LOG_TYPE_PLAYROOM_CAT_WIN": 26, + "LOG_TYPE_PLAYROOM_CAT_LOSE": 27, + "LOG_TYPE_CARD_GIVE_ACCEPT": 28, + "LOG_TYPE_FRIEND_INVITE": 29, } ) @@ -841,10 +856,11 @@ func (LANG_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_PAYBACK_DAY_COUNT LimitEventParam = 3 //回收日 + LimitEventParam_LEP_NONE LimitEventParam = 0 //无 + LimitEventParam_CAT_TRICK_ENERGY LimitEventParam = 1 //猫咪能量 + LimitEventParam_CAT_TRICK_TYPE LimitEventParam = 2 //猫咪类型 + LimitEventParam_PAYBACK_DAY_COUNT LimitEventParam = 3 //回收日 + LimitEventParam_LUCKY_CAT_EARNINGS LimitEventParam = 4 //幸运猫 ) // Enum value maps for LimitEventParam. @@ -854,12 +870,14 @@ var ( 1: "CAT_TRICK_ENERGY", 2: "CAT_TRICK_TYPE", 3: "PAYBACK_DAY_COUNT", + 4: "LUCKY_CAT_EARNINGS", } LimitEventParam_value = map[string]int32{ - "LEP_NONE": 0, - "CAT_TRICK_ENERGY": 1, - "CAT_TRICK_TYPE": 2, - "PAYBACK_DAY_COUNT": 3, + "LEP_NONE": 0, + "CAT_TRICK_ENERGY": 1, + "CAT_TRICK_TYPE": 2, + "PAYBACK_DAY_COUNT": 3, + "LUCKY_CAT_EARNINGS": 4, } ) @@ -25188,7 +25206,7 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\rACCOUNT_LOGIN\x10\x00\x12\x0e\n" + "\n" + "CODE_LOGIN\x10\x01\x12\x10\n" + - "\fDEVICE_LOGIN\x10\x02*\x84\x05\n" + + "\fDEVICE_LOGIN\x10\x02*\x9d\x06\n" + "\x0eTIME_LINE_TYPE\x12\v\n" + "\aDEFAULT\x10\x00\x12\x19\n" + "\x15LOG_TYPE_FRIEND_APPLY\x10\x01\x12\x1a\n" + @@ -25213,7 +25231,12 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x1aLOG_TYPE_FRIEND_BECOME_NPC\x10\x15\x12\x1c\n" + "\x18LOG_TYPE_PLAYROOM_UPVOTE\x10\x16\x12\x1f\n" + "\x1bLOG_TYPE_PLAYROOM_CHAMPSHIP\x10\x17\x12\x15\n" + - "\x11LOG_TYPE_TREASURE\x10\x18*\x9b\x01\n" + + "\x11LOG_TYPE_TREASURE\x10\x18\x12\x1d\n" + + "\x19LOG_TYPE_CARD_SEND_ACCEPT\x10\x19\x12\x1d\n" + + "\x19LOG_TYPE_PLAYROOM_CAT_WIN\x10\x1a\x12\x1e\n" + + "\x1aLOG_TYPE_PLAYROOM_CAT_LOSE\x10\x1b\x12\x1d\n" + + "\x19LOG_TYPE_CARD_GIVE_ACCEPT\x10\x1c\x12\x1a\n" + + "\x16LOG_TYPE_FRIEND_INVITE\x10\x1d*\x9b\x01\n" + "\rCHESS_EX_TYPE\x12\x11\n" + "\rCHESS_EX_NONE\x10\x00\x12\x13\n" + "\x0fCHESS_EX_BUBBLE\x10\x01\x12\x10\n" + @@ -25223,12 +25246,13 @@ const file_proto_Gameapi_proto_rawDesc = "" + " CHESS_EX_EVENT_LITTLE_APPRENTICE\x10\x05*%\n" + "\tLANG_TYPE\x12\v\n" + "\aLANG_CN\x10\x00\x12\v\n" + - "\aLANG_EN\x10\x01*`\n" + + "\aLANG_EN\x10\x01*x\n" + "\x0fLimitEventParam\x12\f\n" + "\bLEP_NONE\x10\x00\x12\x14\n" + "\x10CAT_TRICK_ENERGY\x10\x01\x12\x12\n" + "\x0eCAT_TRICK_TYPE\x10\x02\x12\x15\n" + - "\x11PAYBACK_DAY_COUNT\x10\x03B\bZ\x06../msgb\x06proto3" + "\x11PAYBACK_DAY_COUNT\x10\x03\x12\x16\n" + + "\x12LUCKY_CAT_EARNINGS\x10\x04B\bZ\x06../msgb\x06proto3" var ( file_proto_Gameapi_proto_rawDescOnce sync.Once