diff --git a/src/shared/protocols/event/christmas/PtlOpen.ts b/src/shared/protocols/event/christmas/PtlOpen.ts index f0129c6..1dc8168 100644 --- a/src/shared/protocols/event/christmas/PtlOpen.ts +++ b/src/shared/protocols/event/christmas/PtlOpen.ts @@ -23,6 +23,8 @@ export type christmas = { taskval: { [id: string]: number } /**任务领取标识 */ taskfinish: string[] + /**小游戏挑战次数 */ + gamenum: number /**普通战令奖励集合 奖励id */ pt: number[] /**高级战令奖励集合 奖励id */ @@ -36,7 +38,7 @@ export type christmas = { /**装扮值 */ val: number /**签到标识 */ - qiandao:string[], + qiandao:number[], /**刷新时间 */ refresh: number } \ No newline at end of file diff --git a/src/shared/protocols/event/christmas/huodong.json b/src/shared/protocols/event/christmas/huodong.json index 2f9d42e..cea9f66 100644 --- a/src/shared/protocols/event/christmas/huodong.json +++ b/src/shared/protocols/event/christmas/huodong.json @@ -2,11 +2,11 @@ "hdid" : 91029302193, "htype" : 8, "stype" : 800, - "ttype" : 1, - "stime" : 60, - "rtime" : 90, - "etime" : 90, - "name" : "xinfupeiyang", + "ttype" : 0, + "stime" : 1702396800, + "rtime" : 1703088000, + "etime" : 1703088000, + "name" : "christmas", "icon" : "icon_xfdj", "showtime" : "根据玩家注册时间，游戏返回时复写", "data" : { @@ -52,24 +52,51 @@ } }, "gameneed": [{"a": "attr", "t":"jinbi", "n": 1}], - "game": [0,1,2,3,4,5], - "zhanling":[ - { - "val": 1, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 2, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] - }, - { - "val": 3, - "pt": [{"a": "attr", "t":"jinbi", "n": 1}], - "gj": [{"a": "attr", "t":"jinbi", "n": 1}] - } - ], + "game": [0,1, 2, 3, 4, 5], + "gamefree": 3, + "zhanling":[{ + "val": 1, + "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] + }, + { + "val": 2, + "pt": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "gj": [{"a": "attr", "t":"rmbmoney", "n": 100},{"a": "attr", "t":"jinbi", "n": 1}] + }, + { + "val": 3, + "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] + },{ + "val": 4, + "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] + }, + { + "val": 5, + "pt": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "gj": [{"a": "attr", "t":"rmbmoney", "n": 100},{"a": "attr", "t":"jinbi", "n": 1}] + }, + { + "val": 6, + "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] + },{ + "val": 7, + "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] + }, + { + "val": 8, + "pt": [{"a": "attr", "t":"rmbmoney", "n": 100}], + "gj": [{"a": "attr", "t":"rmbmoney", "n": 100},{"a": "attr", "t":"jinbi", "n": 1}] + }, + { + "val": 9, + "pt": [{"a": "attr", "t":"jinbi", "n": 1}], + "gj": [{"a": "attr", "t":"jinbi", "n": 1},{"a": "attr", "t":"jinbi", "n": 1}] + }], "zlpayid":"ycmb_1_1", "libao": { "1": { diff --git a/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts new file mode 100644 index 0000000..4c04b9b --- /dev/null +++ b/src/shared/protocols/msg_s2c/MsgPushGiftChange.ts @@ -0,0 +1 @@ +export type MsgPushGiftChange = 1; diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 6ce1b25..218afc9 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -237,6 +237,7 @@ import { MsgPayResult } from './msg_s2c/MsgPayResult'; import { MsgPeijianChange } from './msg_s2c/MsgPeijianChange'; import { MsgPlayerChange } from './msg_s2c/MsgPlayerChange'; import { MsgPrivate } from './msg_s2c/MsgPrivate'; +import { MsgPushGiftChange } from './msg_s2c/MsgPushGiftChange'; import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; @@ -1636,6 +1637,7 @@ export interface ServiceType { "msg_s2c/PeijianChange": MsgPeijianChange, "msg_s2c/PlayerChange": MsgPlayerChange, "msg_s2c/Private": MsgPrivate, + "msg_s2c/PushGiftChange": MsgPushGiftChange, "msg_s2c/SendGift": MsgSendGift, "msg_s2c/ShiwuChange": MsgShiwuChange, "msg_s2c/TaskChange": MsgTaskChange, @@ -2937,91 +2939,96 @@ export const serviceProto: ServiceProto = { }, { "id": 238, - "name": "msg_s2c/SendGift", + "name": "msg_s2c/PushGiftChange", "type": "msg" }, { "id": 239, - "name": "msg_s2c/ShiwuChange", + "name": "msg_s2c/SendGift", "type": "msg" }, { "id": 240, - "name": "msg_s2c/TaskChange", + "name": "msg_s2c/ShiwuChange", "type": "msg" }, { "id": 241, - "name": "msg_s2c/Xianshilibao", + "name": "msg_s2c/TaskChange", "type": "msg" }, { "id": 242, + "name": "msg_s2c/Xianshilibao", + "type": "msg" + }, + { + "id": 243, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 246, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 247, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 256, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3029,32 +3036,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 257, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 261, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 262, "name": "Bingo", "type": "api", "conf": { @@ -3062,142 +3069,142 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 263, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 264, "name": "SyncBtn", "type": "api" }, { - "id": 264, + "id": 265, "name": "Test", "type": "api" }, { - "id": 265, + "id": 266, "name": "pushgift/Open", "type": "api" }, { - "id": 266, + "id": 267, "name": "qjzzd/Fight", "type": "api" }, { - "id": 267, + "id": 268, "name": "qjzzd/Open", "type": "api" }, { - "id": 268, + "id": 269, "name": "rank/Open", "type": "api" }, { - "id": 269, + "id": 270, "name": "shiwu/Concise", "type": "api" }, { - "id": 270, + "id": 271, "name": "shiwu/Extract", "type": "api" }, { - "id": 271, + "id": 272, "name": "shiwu/GetList", "type": "api" }, { - "id": 272, + "id": 273, "name": "shiwu/LvUp", "type": "api" }, { - "id": 273, + "id": 274, "name": "shiwu/Recast", "type": "api" }, { - "id": 274, + "id": 275, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 275, + "id": 276, "name": "shiwu/Wear", "type": "api" }, { - "id": 276, + "id": 277, "name": "shootGame/Open", "type": "api" }, { - "id": 277, + "id": 278, "name": "shootGame/Rec", "type": "api" }, { - "id": 278, + "id": 279, "name": "shop/Buy", "type": "api" }, { - "id": 279, + "id": 280, "name": "shop/Open", "type": "api" }, { - "id": 280, + "id": 281, "name": "shop/Refresh", "type": "api" }, { - "id": 281, + "id": 282, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 282, + "id": 283, "name": "sign/GetPrize", "type": "api" }, { - "id": 283, + "id": 284, "name": "sign/Open", "type": "api" }, { - "id": 284, + "id": 285, "name": "slzd/Aim", "type": "api" }, { - "id": 285, + "id": 286, "name": "slzd/BuyNum", "type": "api" }, { - "id": 286, + "id": 287, "name": "slzd/Fight", "type": "api" }, { - "id": 287, + "id": 288, "name": "slzd/FightLog", "type": "api" }, { - "id": 288, + "id": 289, "name": "slzd/MyRank", "type": "api" }, { - "id": 289, + "id": 290, "name": "slzd/Open", "type": "api", "conf": { @@ -3207,77 +3214,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 290, + "id": 291, "name": "slzd/OpenFort", "type": "api" }, { - "id": 291, + "id": 292, "name": "slzd/Rec", "type": "api" }, { - "id": 292, + "id": 293, "name": "slzd/Refresh", "type": "api" }, { - "id": 293, + "id": 294, "name": "slzd/Slot", "type": "api" }, { - "id": 294, + "id": 295, "name": "tanxian/Event", "type": "api" }, { - "id": 295, + "id": 296, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 296, + "id": 297, "name": "tanxian/Fight", "type": "api" }, { - "id": 297, + "id": 298, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 298, + "id": 299, "name": "tanxian/Open", "type": "api" }, { - "id": 299, + "id": 300, "name": "tanxian/Receive", "type": "api" }, { - "id": 300, + "id": 301, "name": "task/AllFinsh", "type": "api" }, { - "id": 301, + "id": 302, "name": "task/Finsh", "type": "api" }, { - "id": 302, + "id": 303, "name": "task/Open", "type": "api" }, { - "id": 303, + "id": 304, "name": "user/CDKEY", "type": "api" }, { - "id": 304, + "id": 305, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3285,197 +3292,197 @@ export const serviceProto: ServiceProto = { } }, { - "id": 305, + "id": 306, "name": "user/ChangeName", "type": "api" }, { - "id": 306, + "id": 307, "name": "user/Fight", "type": "api" }, { - "id": 307, + "id": 308, "name": "user/GetInfo", "type": "api" }, { - "id": 308, + "id": 309, "name": "user/InfoOpen", "type": "api" }, { - "id": 309, + "id": 310, "name": "user/Login", "type": "api" }, { - "id": 310, + "id": 311, "name": "user/Ping", "type": "api" }, { - "id": 311, + "id": 312, "name": "user/Renown", "type": "api" }, { - "id": 312, + "id": 313, "name": "user/RenownBuy", "type": "api" }, { - "id": 313, + "id": 314, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 314, + "id": 315, "name": "user/RenownOpen", "type": "api" }, { - "id": 315, + "id": 316, "name": "user/Tujian", "type": "api" }, { - "id": 316, + "id": 317, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 317, + "id": 318, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 318, + "id": 319, "name": "weixiuchang/Open", "type": "api" }, { - "id": 319, + "id": 320, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 320, + "id": 321, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 321, + "id": 322, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 322, + "id": 323, "name": "wzry/BaoMing", "type": "api" }, { - "id": 323, + "id": 324, "name": "wzry/catFightLog", "type": "api" }, { - "id": 324, + "id": 325, "name": "wzry/CatGroup", "type": "api" }, { - "id": 325, + "id": 326, "name": "wzry/DldFight", "type": "api" }, { - "id": 326, + "id": 327, "name": "wzry/DldRefre", "type": "api" }, { - "id": 327, + "id": 328, "name": "wzry/JingCai", "type": "api" }, { - "id": 328, + "id": 329, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 329, + "id": 330, "name": "wzry/Open", "type": "api" }, { - "id": 330, + "id": 331, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 331, + "id": 332, "name": "wzry/Wzzd", "type": "api" }, { - "id": 332, + "id": 333, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 333, + "id": 334, "name": "xstask/AllGet", "type": "api" }, { - "id": 334, + "id": 335, "name": "xstask/Get", "type": "api" }, { - "id": 335, + "id": 336, "name": "xstask/LvUp", "type": "api" }, { - "id": 336, + "id": 337, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 337, + "id": 338, "name": "xstask/Open", "type": "api" }, { - "id": 338, + "id": 339, "name": "xstask/Receive", "type": "api" }, { - "id": 339, + "id": 340, "name": "xstask/Refresh", "type": "api" }, { - "id": 340, + "id": 341, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 341, + "id": 342, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 342, + "id": 343, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 343, + "id": 344, "name": "zhanqianbushu/Up", "type": "api" } @@ -8645,6 +8652,13 @@ export const serviceProto: ServiceProto = { }, { "id": 5, + "name": "gamenum", + "type": { + "type": "Number" + } + }, + { + "id": 6, "name": "pt", "type": { "type": "Array", @@ -8654,7 +8668,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 6, + "id": 7, "name": "gj", "type": { "type": "Array", @@ -8664,14 +8678,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 7, + "id": 8, "name": "pay", "type": { "type": "Boolean" } }, { - "id": 8, + "id": 9, "name": "libao", "type": { "type": "Interface", @@ -8684,7 +8698,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 9, + "id": 10, "name": "select", "type": { "type": "Interface", @@ -8703,24 +8717,24 @@ export const serviceProto: ServiceProto = { } }, { - "id": 10, + "id": 11, "name": "val", "type": { "type": "Number" } }, { - "id": 11, + "id": 12, "name": "qiandao", "type": { "type": "Array", "elementType": { - "type": "String" + "type": "Number" } } }, { - "id": 12, + "id": 13, "name": "refresh", "type": { "type": "Number" @@ -17937,6 +17951,10 @@ export const serviceProto: ServiceProto = { } } }, + "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { + "type": "Literal", + "literal": 1 + }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": {