Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/json/herogrow_ewai.json
#	src/json/huodong.json5
#	src/json/item.json
#	src/json/pay.json

src/api_s2c/event/shouchong/ApiOpen.ts

@@ -1,11 +1,14 @@
 import { ApiCall } from "tsrpc";
 import { ReqOpen, ResOpen } from "../../../shared/protocols/event/shouchong/PtlOpen";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqOpen, ResOpen>) {
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    let data = await G.mongodb.cEvent('shouchongzhigou').findOne({uid: call.uid, type: 'shouchongzhigou'})
+
+    let payIds = R.compose(R.map(i=>i.payid),R.values())(G.gc.shouchong)
 
     call.succ({
-        payNum: call.conn.gud.payExp / 10,
-        receive: Object.fromEntries(Object.keys(G.gc.shouchong).map(k => [k, data?.receive?.[k] || []]))
-    });
+        receive: data?.receive || {},
+        buyLog: await PayFun.getPayLogs(call.uid, payIds)
+    })
 }

src/api_s2c/event/shouchong/ApiReceive.ts

@@ -3,26 +3,29 @@ import { PlayerFun } from '../../../public/player';
 import {ReqReceive, ResReceive} from "../../../shared/protocols/event/shouchong/PtlReceive";
 import {PublicShared} from '../../../shared/public/public';
 import {HongDianChange} from "../../hongdian/fun";
+import {PayFun} from "../../../public/pay";
 
 export default async function (call: ApiCall<ReqReceive, ResReceive>) {
 
     let conf = G.gc.shouchong[call.req.k];
-
     if (!conf) return call.error(globalThis.lng.pata_getprize_1);
 
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    let payLog = await PayFun.getPayLog(call.uid, conf.payid)
+    if (!payLog) return call.errorCode(-1)
+
+    let data = await G.mongodb.cEvent('shouchongzhigou').findOne({ uid: call.uid, type: 'shouchongzhigou' });
 
     let recArr = data?.receive?.[call.req.k] || [];
 
-    if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
+    // if (call.conn.gud.payExp < conf.paynum) return call.error(globalThis.lng.event_kfkh_9);
 
     if (recArr.length >= conf.prize.length) return call.error(globalThis.lng.event_kfkh_3);
 
     if (recArr.slice(-1)[0] && PublicShared.getToDayZeroTime() < recArr.slice(-1)[0]) return call.error(globalThis.lng.event_kfkh_10);
 
     await PlayerFun.sendPrize(call, conf.prize[recArr.length]);
-    await G.mongodb.cEvent('shouchong').updateOne(
-        { uid: call.uid, type: 'shouchong' },
+    await G.mongodb.cEvent('shouchongzhigou').updateOne(
+        { uid: call.uid, type: 'shouchongzhigou' },
         { $push: G.mongodb.createTreeObj({ key: 'receive', k: call.req.k, val: G.time }) },
         { upsert: true }
     );
@@ -40,17 +43,16 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
 }
 
 export async function getShouChongRedPoint(call: ApiCall) {
-    let res = { show: false };
-    let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    // let data = await G.mongodb.cEvent('shouchong').findOne({ uid: call.uid, type: 'shouchong' });
+    //
+    // for (let [id, conf] of Object.entries(G.gc.shouchong)) {
+    //     let rec = data?.receive?.[id] || [];
+    //     if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
+    //     if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
+    //         res = { show: true };
+    //         break;
+    //     }
+    // }
 
-    for (let [id, conf] of Object.entries(G.gc.shouchong)) {
-        let rec = data?.receive?.[id] || [];
-        if (call.conn.gud.payExp / 10 < conf.paynum || rec.length >= conf.prize.length) continue;
-        if (rec.length == 0 || rec.slice(-1)[0] < PublicShared.getToDayZeroTime(G.time)) {
-            res = { show: true };
-            break;
-        }
-    }
-
-    return res;
+    return {show: false};
 }

src/api_s2c/gonghui/ApiGetList.ts

@@ -2,20 +2,46 @@ import {ApiCall} from "tsrpc";
 import {GHManage} from '../../public/gonghui/manage';
 import {ReqGetList, ResGetList} from "../../shared/protocols/gonghui/PtlGetList";
 
+async function getGongHuiZhanli(ghId:string):Promise<number>{
+    //如果redis里有，则直接返回
+    let zhanliRes = await G.ioredis.get(`gongHuiZhanLi:${ghId}`);
+    if(zhanliRes){
+        return parseInt(zhanliRes);
+    }
+
+    let GHData = await GHManage.getGHList();
+    let ghs = Object.values(GHData).map(item => item.data).filter(i => !!i.players);
+    let fuids = R.flatten(ghs.map(i => i.players.map(j => j.uid)))
+    let allRoles = await G.mongodb.find('user',{uid: {$in: fuids}},['uid','power'])
+    let zhanlis = Object.fromEntries(allRoles.map(r => [r.uid, r.power]));
+
+    
+    for (let gh of ghs) {
+        let uids = gh.players.map(p => p.uid);
+        let zhanli = uids.map(u => (zhanlis[u] || 0)).reduce((a, b) => a + b);
+        //重设redis的值，有效期1小时
+        G.ioredis.setex(`gongHuiZhanLi:${gh._id}`,3600, zhanli);
+
+        if(gh._id == ghId){
+            zhanliRes = zhanli;
+        }
+    }
+
+    return parseInt(zhanliRes||"0");
+}
+
 export default async function (call: ApiCall<ReqGetList, ResGetList>) {
 
     let arr: ResGetList['list'] = [];
     let GHData = await GHManage.getGHList();
     let ghs = Object.values(GHData).map(item => item.data).filter(i => !!i.players);
-
-    let fuids = R.flatten(ghs.map(i => i.players.map(j => j.uid)))
-
-    let allRoles = await G.mongodb.find('user',{uid: {$in: fuids}},['uid','power'])
-    let zhanlis = Object.fromEntries(allRoles.map(r => [r.uid, r.power]));
-
+    // let fuids = R.flatten(ghs.map(i => i.players.map(j => j.uid)))
+    // let allRoles = await G.mongodb.find('user',{uid: {$in: fuids}},['uid','power'])
+    // let zhanlis = Object.fromEntries(allRoles.map(r => [r.uid, r.power]));
     for (let gh of ghs) {
-        let uids = gh.players.map(p => p.uid);
-        let zhanli = uids.map(u => (zhanlis[u] || 0)).reduce((a, b) => a + b);
+        //let uids = gh.players.map(p => p.uid);
+        //let zhanli = uids.map(u => (zhanlis[u] || 0)).reduce((a, b) => a + b);
+        let zhanli = await getGongHuiZhanli(gh._id);
         arr.push({
             gh: gh,
             zhanli: zhanli

src/json/attr.json

@@ -108,5 +108,25 @@
     "sicon": "icon_heroBox_11",
     "describe": "tlsd_guess_prize_3",
     "advancedEffects": "ani_xiangzikuang"
+  },
+  "shengdanExp": {
+    "id": "shengdanExp",
+    "name": "intr_attr_name_13",
+    "undefined": "圣诞战令经验",
+    "colour": 5,
+    "icon": "icon_sdhd_item_1",
+    "sicon": "icon_sdhd_item_1",
+    "describe": "intr_attr_describe_13",
+    "advancedEffects": "ani_xiangzikuang"
+  },
+  "shengdanBullet": {
+    "id": "shengdanBullet",
+    "name": "intr_attr_name_14",
+    "undefined": "圣诞子弹",
+    "colour": 5,
+    "icon": "icon_chegaipq",
+    "sicon": "icon_chegaipq",
+    "describe": "intr_attr_describe_14",
+    "advancedEffects": "ani_xiangzikuang"
   }
 }

src/json/herogrow_ewai.json

@@ -22,41 +22,41 @@
   "5": {
     "id": 5,
     "jieji": 4,
-    "ewai_buff": 0.4
+    "ewai_buff": 40
   },
   "6": {
     "id": 6,
     "jieji": 5,
-    "ewai_buff": 0.5
+    "ewai_buff": 50
   },
   "7": {
     "id": 7,
     "jieji": 6,
-    "ewai_buff": 0.6
+    "ewai_buff": 60
   },
   "8": {
     "id": 8,
     "jieji": 7,
-    "ewai_buff": 0.8
+    "ewai_buff": 80
   },
   "9": {
     "id": 9,
     "jieji": 8,
-    "ewai_buff": 1
+    "ewai_buff": 100
   },
   "10": {
     "id": 10,
     "jieji": 9,
-    "ewai_buff": 1.2
+    "ewai_buff": 120
   },
   "11": {
     "id": 11,
     "jieji": 10,
-    "ewai_buff": 1.4
+    "ewai_buff": 140
   },
   "12": {
     "id": 12,
     "jieji": 11,
-    "ewai_buff": 1.8
+    "ewai_buff": 180
   }
 }

src/json/huobanzhaomu.json5

@@ -7,7 +7,7 @@
     {
         total: 2,
         gudKey: 'loginDays',
-        prize: [{a: 'hero', t: '4013', n: 1}]
+        prize: [{a: 'hero', t: '4005', n: 1}]
     },
     {
         total: 1,

src/json/huodong.json5

@@ -2469,7 +2469,7 @@
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
-                            'pval': 300,
+                            'pval': 250,
                             'cond': [],
                             'stype': 118
                         },
@@ -2478,12 +2478,21 @@
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
-                            'pval': 400,
+                            'pval': 300,
                             'cond': [],
                             'stype': 118
                         },
                         '2006': {
-                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 40}],
+                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
+                            'tujing': '',
+                            'title': 'intr_yczm_day_des_2',
+                            'type': 2,
+                            'pval': 400,
+                            'cond': [],
+                            'stype': 118
+                        },
+                        '2007': {
+                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
@@ -2608,7 +2617,7 @@
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
-                            'pval': 300,
+                            'pval': 250,
                             'cond': [],
                             'stype': 118
                         },
@@ -2617,12 +2626,21 @@
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
-                            'pval': 400,
+                            'pval': 300,
                             'cond': [],
                             'stype': 118
                         },
                         '2006': {
-                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '600', 'n': 40}],
+                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
+                            'tujing': '',
+                            'title': 'intr_yczm_day_des_2',
+                            'type': 2,
+                            'pval': 400,
+                            'cond': [],
+                            'stype': 118
+                        },
+                        '2007': {
+                            'prize': [{'a': 'item', 't': '4', 'n': 10}, {'a': 'item', 't': '619', 'n': 1}],
                             'tujing': '',
                             'title': 'intr_yczm_day_des_2',
                             'type': 2,
@@ -3291,116 +3309,462 @@
         "task" : {
             "1":   {
                 "pval" : 1,
-                "stype" : "",
+                "stype" : "128",
                 "cond": [],
                 "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 100
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "rmbmoney",
+                        "n" : 200
+                    },
                     {
                         "a" : "item",
                         "t" : "1",
-                        "n" : 500000
+                        "n" : 100000
                     }
                 ],
                 "des" : "intr_cszl_des_1"
             },
               "2":   {
-                "pval" : 1,
-                "stype" : "101",
+                "pval" : 300,
+                "stype" : "116",
                 "cond": [],
                 "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 200
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 3
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "600",
+                        "n" : 5
+                    },
                     {
                         "a" : "item",
                         "t" : "1",
                         "n" : 500000
                     }
                 ],
-                "des" : "intr_cszl_des_1"
+                "des" : "intr_cszl_des_2"
             },
               "3":   {
-                "pval" : 2,
-                "stype" : "101",
+                "pval" : 1000,
+                "stype" : "116",
                 "cond": [],
                 "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 300
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 5
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "600",
+                        "n" : 10
+                    },
                     {
                         "a" : "item",
                         "t" : "1",
-                        "n" : 500000
+                        "n" : 1000000
                     }
                 ],
-                "des" : "intr_cszl_des_1"
+                "des" : "intr_cszl_des_3"
+            },
+              "4":   {
+                "pval" : 2000,
+                "stype" : "116",
+                "cond": [],
+                "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 150
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "6",
+                        "n" : 10
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "1",
+                        "n" : 200000
                     }
+                ],
+                "des" : "intr_cszl_des_4"
+            },
+              "5":   {
+                "pval" : 3,
+                "stype" : "142",
+                "cond": [2],
+                "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 100
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "2",
+                        "n" : 500
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "1",
+                        "n" : 200000
+                    }
+                ],
+                "des" : "intr_cszl_des_5"
+            },
+              "6":   {
+                "pval" : 3,
+                "stype" : "122",
+                "cond": [],
+                "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 200
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "12",
+                        "n" : 400
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "1",
+                        "n" : 200000
+                    }
+                ],
+                "des" : "intr_cszl_des_6"
+            },
+              "7":   {
+                "pval" : 1,
+                "stype" : "155",
+                "cond": [],
+                "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 100
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "rmbmoney",
+                        "n" : 200
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "1",
+                        "n" : 100000
+                    }
+                ],
+                "des" : "intr_cszl_des_7"
+            },
+              "8":   {
+                "pval" : 1,
+                "stype" : "127",
+                "cond": [],
+                "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 100
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "21",
+                        "n" : 50
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "1",
+                        "n" : 100000
+                    }
+                ],
+                "des" : "intr_cszl_des_8"
+            },
+              "9":   {
+                "pval" : 1,
+                "stype" : "154",
+                "cond": [],
+                "prize" : [
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanExp",
+                        "n" : 100
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "shengdanBullet",
+                        "n" : 2
+                    },
+                    {
+                        "a" : "attr",
+                        "t" : "jinbi",
+                        "n" : 100000
+                    },
+                    {
+                        "a" : "item",
+                        "t" : "1",
+                        "n" : 100000
+                    }
+                ],
+                "des" : "intr_cszl_des_9"
+            },
         },
 		//玩游戏需要消耗
-        "gameneed": [{"a": "attr", "t":"jinbi", "n": 1}],
+        "gameneed": [{"a": "attr", "t":"shengdanBullet", "n": 1}],
 		//玩游戏拿分
         "game": [5,10,20,30,50],
+		//免费玩游戏次数
+		"gamefree": 3,
 		//战令
         "zhanling":[
             {
                 "val": 2500,
                 "pt": [{"a": "item", "t":"1", "n": 200000}],
-                "gj": [{"a": "item", "t":"50101", "n": 1},{"a": "item", "t":"1", "n": 500000}]
+                "gj": [{"a": "item", "t":"50009", "n": 1},{"a": "item", "t":"1", "n": 500000}]
             },
             {
-                "val": 2,
+                "val": 5000,
                 "pt": [{"a": "attr", "t":"rmbmoney", "n": 500}],
-                "gj": [{"a": "attr", "t":"jinbi", "n": 1}]
+                "gj": [{"a": "item", "t":"23", "n": 2000},{"a": "item", "t":"1", "n": 500000}]
             },
             {
-                "val": 3,
-                "pt": [{"a": "attr", "t":"jinbi", "n": 1}],
-                "gj": [{"a": "attr", "t":"jinbi", "n": 1}]
+                "val": 7500,
+                "pt": [{"a": "item", "t":"50104", "n": 1}],
+                "gj": [{"a": "item", "t":"9", "n": 100},{"a": "item", "t":"10", "n": 800}]
+            },
+            {
+                "val": 10000,
+                "pt": [{"a": "item", "t":"4", "n": 10}],
+                "gj": [{"a": "item", "t":"28", "n": 5000},{"a": "item", "t":"605", "n": 2}]
+            },
+            {
+                "val": 12500,
+                "pt": [{"a": "item", "t":"2", "n": 500}],
+                "gj": [{"a": "item", "t":"9", "n": 150},{"a": "item", "t":"10", "n": 1500}]
+            },
+            {
+                "val": 15000,
+                "pt": [{"a": "item", "t":"600", "n": 10}],
+                "gj": [{"a": "item", "t":"605", "n": 2},{"a": "item", "t":"28", "n": 10000}]
+            },
+            {
+                "val": 17500,
+                "pt": [{"a": "item", "t":"600", "n": 10}],
+                "gj": [{"a": "item", "t":"605", "n": 2},{"a": "item", "t":"28", "n": 20000}]
+            },
+            {
+                "val": 20000,
+                "pt": [{"a": "item", "t":"10", "n": 800}],
+                "gj": [{"a": "item", "t":"600", "n": 20},{"a": "item", "t":"28", "n": 20000}]
+            },
+            {
+                "val": 22500,
+                "pt": [{"a": "attr", "t":"rmbmoney", "n": 2000}],
+                "gj": [{"a": "item", "t":"600", "n": 20},{"a": "item", "t":"28", "n": 20000}]
             }
         ],
-		//战令PayID
         "zlpayid":"ycmb_1_1",
 		//活动礼包
         "libao": {
               "1": {
                 "payid": "",
-                "buynum": 2,
-                "basep": [{"a": "attr", "t":"rmbmoney", "n": 1}],
-                "des" : "intr_cszl_des_1",
+                "buynum": 1,
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 100}],
+                "des" : "intr_cszl_des_10",
                 "dlz": [
                     {
-                        "1": {"a": "attr", "t":"rmbmoney", "n": 1},
-                        "2": {"a": "attr", "t":"rmbmoney", "n": 2},
-                        "3": {"a": "attr", "t":"rmbmoney", "n": 3}
-                    },
-                    {
-                        "1": {"a": "attr", "t":"rmbmoney", "n": 1},
-                        "2": {"a": "attr", "t":"rmbmoney", "n": 2},
-                        "3": {"a": "attr", "t":"rmbmoney", "n": 3}
+                        "1": {"a": "attr", "t":"jinbi", "n": 100000},
+                        "2": {"a": "item", "t":"1", "n": 50000}
                     }
                 ]
             },
             "2": {
-                "payid": "ycmb_1_2",
+                "payid": "pay_name_sdhd_libao_2",
                 "buynum": 2,
-                "basep": [{"a": "attr", "t":"rmbmoney", "n": 2}],
-                "des" : "intr_cszl_des_2",
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 120}],
+                "des" : "intr_cszl_des_11",
                 "dlz": [
                     {
-                        "1": {"a": "attr", "t":"rmbmoney", "n": 1},
-                        "2": {"a": "attr", "t":"rmbmoney", "n": 2},
-                        "3": {"a": "attr", "t":"rmbmoney", "n": 3}
+                        "1": {"a": "item", "t":"2", "n": 400},
+                        "2": {"a": "item", "t":"12", "n": 200}
                     },
                     {
-                        "1": {"a": "attr", "t":"rmbmoney", "n": 1},
-                        "2": {"a": "attr", "t":"rmbmoney", "n": 2},
-                        "3": {"a": "attr", "t":"rmbmoney", "n": 3}
+                        "1": {"a": "attr", "t":"jinbi", "n": 1000000},
+                        "2": {"a": "item", "t":"1", "n": 500000}
                     }
                 ]
+            },
+            "3": {
+                "payid": "pay_name_sdhd_libao_3",
+                "buynum": 2,
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 300}],
+                "des" : "intr_cszl_des_12",
+                "dlz": [
+                    {
+                        "1": {"a": "item", "t":"9", "n": 500},
+                        "2": {"a": "item", "t":"10", "n": 100}
+                    },
+                    {
+                        "1": {"a": "item", "t":"9", "n": 500},
+                        "2": {"a": "item", "t":"10", "n": 100}
+                    },
+                    {
+                        "1": {"a": "item", "t":"9", "n": 500},
+                        "2": {"a": "item", "t":"10", "n": 100}
                     }
+                ]
+            },
+            "4": {
+                "payid": "pay_name_sdhd_libao_4",
+                "buynum": 5,
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 680}],
+                "des" : "intr_cszl_des_12",
+                "dlz": [
+                    {
+                        "1": {"a": "item", "t":"615", "n": 1},
+                        "2": {"a": "item", "t":"18", "n": 200}
+                    },
+                    {
+                        "1": {"a": "item", "t":"615", "n": 1},
+                        "2": {"a": "item", "t":"18", "n": 200}
+                    },
+                    {
+                        "1": {"a": "item", "t":"615", "n": 1},
+                        "2": {"a": "item", "t":"18", "n": 200}
+                    }
+                ]
+            },
+            "5": {
+                "payid": "pay_name_sdhd_libao_5",
+                "buynum": 9,
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 1280}],
+                "des" : "intr_cszl_des_13",
+                "dlz": [
+                    {
+                        "1": {"a": "item", "t":"600", "n": 10},
+                        "2": {"a": "item", "t":"605", "n": 2},
+                        "3": {"a": "item", "t":"606", "n": 1}
+                    },
+                    {
+                        "1": {"a": "item", "t":"600", "n": 10},
+                        "2": {"a": "item", "t":"605", "n": 2},
+                        "3": {"a": "item", "t":"606", "n": 1}
+                    },
+                    {
+                        "1": {"a": "item", "t":"1", "n": 5000000},
+                        "2": {"a": "attr", "t":"jinbi", "n": 10000000}
+                    }
+                ]
+            },
+            "6": {
+                "payid": "pay_name_sdhd_libao_6",
+                "buynum": 9,
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 3280}],
+                "des" : "intr_cszl_des_14",
+                "dlz": [
+                    {
+                        "1": {"a": "item", "t":"600", "n": 20},
+                        "2": {"a": "item", "t":"5002", "n": 10},
+                        "3": {"a": "item", "t":"5004", "n": 10}
+                    },
+                    {
+                        "1": {"a": "item", "t":"600", "n": 20},
+                        "2": {"a": "item", "t":"5002", "n": 10},
+                        "3": {"a": "item", "t":"5004", "n": 10}
+                    },
+                    {
+                        "1": {"a": "item", "t":"1", "n": 10000000},
+                        "2": {"a": "item", "t":"12", "n": 1000},
+                        "3": {"a": "item", "t":"2", "n": 2000},
+                        "4": {"a": "item", "t":"18", "n": 500}
+                    }
+                ]
+            },
+             "7": {
+                "payid": "pay_name_sdhd_libao_7",
+                "buynum": 9,
+                "basep": [{"a": "attr", "t":"rmbmoney", "n": 6480}],
+                "des" : "intr_cszl_des_14",
+                "dlz": [
+                    {
+                        "1": {"a": "item", "t":"600", "n": 30},
+                        "2": {"a": "item", "t":"5002", "n": 20},
+                        "3": {"a": "item", "t":"5004", "n": 20}
+                    },
+                    {
+                        "1": {"a": "item", "t":"600", "n": 30},
+                        "2": {"a": "item", "t":"5002", "n": 20},
+                        "3": {"a": "item", "t":"5004", "n": 20}
+                    },
+                    {
+                        "1": {"a": "item", "t":"605", "n": 4},
+                        "2": {"a": "item", "t":"606", "n": 2},
+                        "3": {"a": "item", "t":"18", "n": 1000},
+                        "4": {"a": "item", "t":"23", "n": 1000000}
+                    }
+                ]
+            },
         },
 		//签到奖励
         "qiandao": [
-           [{"a": "attr", "t":"jinbi", "n": 1}],
-           [{"a": "attr", "t":"jinbi", "n": 1}],
-           [{"a": "attr", "t":"jinbi", "n": 1}],
-           [{"a": "attr", "t":"jinbi", "n": 1}],
-           [{"a": "attr", "t":"jinbi", "n": 1}],
-           [{"a": "attr", "t":"jinbi", "n": 1}],
-           [{"a": "attr", "t":"jinbi", "n": 1}]
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"4", "n": 10},{"a": "item", "t":"1", "n": 300000}],
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "attr", "t":"rmbmoney", "n": 300},{"a": "item", "t":"1", "n": 300000}],
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"12", "n": 300},{"a": "item", "t":"1", "n": 300000}],
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"9", "n": 200},{"a": "item", "t":"1", "n": 300000}],
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"2", "n": 400},{"a": "item", "t":"1", "n": 300000}],
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"27", "n": 5000},{"a": "item", "t":"1", "n": 300000}],
+           [{"a": "attr", "t":"shengdanExp", "n": 100},{"a": "attr", "t":"shengdanBullet", "n": 1},{"a": "item", "t":"4", "n": 10},{"a": "item", "t":"1", "n": 300000}],
 				]
 			}
 	},
@@ -3408,7 +3772,7 @@
         "hdid" : 9000,   // 唯一活动id   周末礼包
         "htype" : 9,  // 后端唯一识别标识
         "stype" : 900,  // 前端唯一识别标识（看前端需要是否修改）
-        "ttype" : 0,    // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
+        "ttype" : 4,    // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
         "stime" : 0,  // 活动开始天数
         "rtime" : 30,   // 活动显示结束天数
         "etime" : 30,   // 活动实际结束
@@ -3485,10 +3849,27 @@
                     free: false,
                     payId: 'czlb_1',
                     buyNum: 1,
-                    prize:{"1":[{'a': 'item', 't': '13', 'n': 600}],
-                           "2":[{'a': 'item', 't': '13', 'n': 600}],
-                           "3":[{'a': 'item', 't': '13', 'n': 600}]
+                    prize: [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
                     }
+                ],
+                "recPrize1": [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
+                    }
+                ],
+                "recPrize2": [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
+                    }
+                ]
                 },
                 {
 					id: '2',
@@ -3497,10 +3878,27 @@
                     free: false,
                     payId: 'czlb_2',
                     buyNum: 1,
-                    prize: {"1":[{'a': 'item', 't': '13', 'n': 600}],
-                            "2":[{'a': 'item', 't': '13', 'n': 600}],
-                            "3":[{'a': 'item', 't': '13', 'n': 600}]
+                    prize: [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
                     }
+                ],
+                "recPrize1": [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
+                    }
+                ],
+                "recPrize2": [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
+                    }
+                ]
                 },
                 {
 					id: '3',
@@ -3509,10 +3907,82 @@
                     free: false,
                     payId: 'czlb_3',
                     buyNum: 1,
-                    prize: {"1":[{'a': 'item', 't': '13', 'n': 600}],
-                            "2":[{'a': 'item', 't': '13', 'n': 600}],
-                            "3":[{'a': 'item', 't': '13', 'n': 600}]
+                    prize: [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
                     }
+                ],
+                "recPrize1": [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
+                    }
+                ],
+                "recPrize2": [
+                    {
+                        "a": "item",
+                        "t": "13",
+                        "n": 600
+                    }
+                ]
+                }
+            ]
+        }
+    },
+    {
+        "hdid" : 11000,   // 唯一活动id   消费竞赛
+        "htype" : 11,  // 后端唯一识别标识
+        "stype" : 1100,  // 前端唯一识别标识（看前端需要是否修改）
+        "ttype" : 0,    // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
+        "stime" : 0,  // 活动开始天数
+        "rtime" : 30,   // 活动显示结束天数
+        "etime" : 30,   // 活动实际结束
+        "name": "xfjs",
+		"icon": "icon_xfjs",
+        "showtime" : "仅供参考，会复写正确值",    // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。
+        "data" : {
+            //活动文本描述
+            intr: "xfjstips_1",
+            intr: "xfjstips_2",
+            //排名
+            rank: [
+                {
+                    id: '1',
+					name: 'xfjstips_3',
+                    rank:[1],
+					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 20000}],
+                    prize: [{'a': 'item', 't': '13', 'n': 600}]
+                },
+                {
+                    id: '2',
+					name: 'xfjstips_4',
+                    rank:[2],
+					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 18000}],
+                    prize: [{'a': 'item', 't': '13', 'n': 600}]
+                },
+                {
+                    id: '3',
+					name: 'xfjstips_5',
+                    rank:[3],
+					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 16000}],
+                    prize: [{'a': 'item', 't': '13', 'n': 600}]
+                },
+                {
+                    id: '4',
+					name: 'xfjstips_6',
+                    rank:[4,10],
+					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 14000}],
+                    prize: [{'a': 'item', 't': '13', 'n': 600}]
+                },
+                {
+                    id: '5',
+					name: 'xfjstips_7',
+                    rank:[11,30],
+					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 12000}],
+                    prize: [{'a': 'item', 't': '13', 'n': 600}]
                 }
             ]
         }

src/json/item.json

@@ -2075,6 +2075,7 @@
   "637": {
     "id": 637,
     "name": "intr_item_name_637",
+    "undefined": "使用后可以选择获得巴拉莱卡、罗贝尔特中的一个干部",
     "type": 2,
     "sort": 1,
     "colour": 6,
@@ -3993,6 +3994,24 @@
     "payId": "",
     "advancedEffects": ""
   },
+  "50009": {
+    "id": 50009,
+    "name": "playerheadFrame_name_23",
+    "undefined": "使用后解锁头像框“圣诞氛围”",
+    "type": 7,
+    "sort": 1,
+    "colour": 4,
+    "way": [],
+    "go": "",
+    "icon": "txk_028",
+    "describe": "intr_item_describe_50009",
+    "diaoluo": 23,
+    "useNeed": [],
+    "usePrize": [],
+    "selecPrize": [],
+    "payId": "",
+    "advancedEffects": ""
+  },
   "50101": {
     "id": 50101,
     "name": "playerChatFrame_name_6",
@@ -4044,7 +4063,26 @@
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
+  },
+  "50104": {
+    "id": 50104,
+    "name": "playerChatFrame_name_8",
+    "undefined": "使用后解锁聊天框“圣诞快乐”",
+    "type": 8,
+    "sort": 1,
+    "colour": 4,
+    "way": [],
+    "go": "",
+    "icon": "lt_dhk14",
+    "describe": "intr_item_describe_50104",
+    "diaoluo": 8,
+    "useNeed": [],
+    "usePrize": [],
+    "selecPrize": [],
+    "payId": "",
+    "advancedEffects": ""
   },
   "50201": {
     "id": 50201,
@@ -4054,13 +4092,15 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_017",
     "describe": "intr_item_describe_50201",
     "diaoluo": 16,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
   },
   "50202": {
     "id": 50202,
@@ -4070,13 +4110,15 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_011",
     "describe": "intr_item_describe_50202",
     "diaoluo": 17,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
   },
   "50203": {
     "id": 50203,
@@ -4086,13 +4128,15 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_005",
     "describe": "intr_item_describe_50203",
     "diaoluo": 18,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
   },
   "50204": {
     "id": 50204,
@@ -4102,13 +4146,15 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_004",
     "describe": "intr_item_describe_50204",
     "diaoluo": 19,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
   },
   "50205": {
     "id": 50205,
@@ -4118,13 +4164,15 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_024",
     "describe": "intr_item_describe_50205",
     "diaoluo": 20,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
   },
   "50206": {
     "id": 50206,
@@ -4134,13 +4182,15 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_013",
     "describe": "intr_item_describe_50206",
     "diaoluo": 21,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
   },
   "50207": {
     "id": 50207,
@@ -4150,13 +4200,51 @@
     "sort": 1,
     "colour": 4,
     "way": [],
+    "go": "",
     "icon": "txk_021",
     "describe": "intr_item_describe_50207",
     "diaoluo": 22,
     "useNeed": [],
     "usePrize": [],
     "selecPrize": [],
-    "payId": ""
+    "payId": "",
+    "advancedEffects": ""
+  },
+  "50301": {
+    "id": 50301,
+    "name": "playerModel_name_3",
+    "undefined": "使用后解锁主角造型“圣诞庆典：男”",
+    "type": 6,
+    "sort": 1,
+    "colour": 5,
+    "way": [],
+    "go": "",
+    "icon": 100011,
+    "describe": "intr_item_describe_50208",
+    "diaoluo": 3,
+    "useNeed": [],
+    "usePrize": [],
+    "selecPrize": [],
+    "payId": "",
+    "advancedEffects": "ani_xiangzikuang"
+  },
+  "50302": {
+    "id": 50302,
+    "name": "playerModel_name_4",
+    "undefined": "使用后解锁主角造型“圣诞庆典：女”",
+    "type": 6,
+    "sort": 1,
+    "colour": 5,
+    "way": [],
+    "go": "",
+    "icon": 100021,
+    "describe": "intr_item_describe_50209",
+    "diaoluo": 4,
+    "useNeed": [],
+    "usePrize": [],
+    "selecPrize": [],
+    "payId": "",
+    "advancedEffects": "ani_xiangzikuang"
   },
   "60101": {
     "id": 60101,

src/json/kfcb_content.json

@@ -10,7 +10,13 @@
       2
     ],
     "content": "kfcb_des_1",
-    "text": "kfcb_text_1"
+    "text": "kfcb_text_1",
+    "payIds": [
+      "kfcb_libao_1",
+      "kfcb_libao_2",
+      "kfcb_libao_3",
+      "kfcb_libao_7"
+    ]
   },
   "2": {
     "id": 2,
@@ -23,7 +29,12 @@
       4
     ],
     "content": "kfcb_des_2",
-    "text": "kfcb_text_2"
+    "text": "kfcb_text_2",
+    "payIds": [
+      "kfcb_libao_4",
+      "kfcb_libao_5",
+      "kfcb_libao_6"
+    ]
   },
   "3": {
     "id": 3,
@@ -36,7 +47,11 @@
       6
     ],
     "content": "kfcb_des_3",
-    "text": "kfcb_text_3"
+    "text": "kfcb_text_3",
+    "payIds": [
+      "kfcb_libao_1",
+      "kfcb_libao_2"
+    ]
   },
   "4": {
     "id": 4,
@@ -49,7 +64,11 @@
       8
     ],
     "content": "kfcb_des_4",
-    "text": "kfcb_text_4"
+    "text": "kfcb_text_4",
+    "payIds": [
+      "kfcb_libao_2",
+      "kfcb_libao_3"
+    ]
   },
   "5": {
     "id": 5,
@@ -62,7 +81,12 @@
       10
     ],
     "content": "kfcb_des_5",
-    "text": "kfcb_text_5"
+    "text": "kfcb_text_5",
+    "payIds": [
+      "kfcb_libao_1",
+      "kfcb_libao_2",
+      "kfcb_libao_3"
+    ]
   },
   "6": {
     "id": 6,
@@ -75,7 +99,12 @@
       12
     ],
     "content": "kfcb_des_6",
-    "text": "kfcb_text_6"
+    "text": "kfcb_text_6",
+    "payIds": [
+      "kfcb_libao_1",
+      "kfcb_libao_2",
+      "kfcb_libao_3"
+    ]
   },
   "7": {
     "id": 7,
@@ -88,6 +117,11 @@
       14
     ],
     "content": "kfcb_des_7",
-    "text": "kfcb_text_7"
+    "text": "kfcb_text_7",
+    "payIds": [
+      "kfcb_libao_1",
+      "kfcb_libao_2",
+      "kfcb_libao_3"
+    ]
   }
 }

src/json/openCond.json

@@ -1313,5 +1313,31 @@
     "display": {
       "lv": 15
     }
+  },
+  "shengdanhuodong": {
+    "name": "shengdanhuodong",
+    "undefined": "圣诞活动",
+    "and": {
+      "lv": 15
+    },
+    "or": {},
+    "time": 0,
+    "tips": "openCond_tips_96",
+    "display": {
+      "lv": 15
+    }
+  },
+  "yuandanhuodong": {
+    "name": "yuandanhuodong",
+    "undefined": "元旦活动",
+    "and": {
+      "lv": 15
+    },
+    "or": {},
+    "time": 0,
+    "tips": "openCond_tips_96",
+    "display": {
+      "lv": 15
+    }
   }
 }

src/json/pay.json

@@ -305,7 +305,12 @@
       {
         "a": "attr",
         "t": "rmbmoney",
-        "n": 680
+        "n": 1360
+      },
+      {
+        "a": "item",
+        "t": "609",
+        "n": 1
       }
     ],
     "firstPayPrize": [],
@@ -331,12 +336,12 @@
       {
         "a": "attr",
         "t": "rmbmoney",
-        "n": 300
+        "n": 600
       },
       {
         "a": "item",
         "t": "24",
-        "n": 10
+        "n": 30
       }
     ],
     "firstPayPrize": [],
@@ -362,12 +367,12 @@
       {
         "a": "attr",
         "t": "rmbmoney",
-        "n": 300
+        "n": 600
       },
       {
-        "a": "item",
-        "t": "6",
-        "n": 20
+        "a": "attr",
+        "t": "jinbi",
+        "n": 10000000
       }
     ],
     "firstPayPrize": [],
@@ -393,12 +398,12 @@
       {
         "a": "attr",
         "t": "rmbmoney",
-        "n": 680
+        "n": 1360
       },
       {
         "a": "item",
         "t": "4",
-        "n": 10
+        "n": 20
       }
     ],
     "firstPayPrize": [],
@@ -928,7 +933,7 @@
       },
       {
         "a": "hero",
-        "t": "4005",
+        "t": "4006",
         "n": 1
       },
       {
@@ -1025,7 +1030,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 300
+        "n": 60
       }
     ],
     "prize": [
@@ -1205,7 +1210,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 300
+        "n": 680
       }
     ],
     "prize": [
@@ -1241,7 +1246,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 300
+        "n": 680
       }
     ],
     "prize": [
@@ -1277,7 +1282,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 300
+        "n": 680
       }
     ],
     "prize": [
@@ -1313,7 +1318,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 300
+        "n": 1280
       }
     ],
     "prize": [
@@ -1906,7 +1911,7 @@
       {
         "a": "attr",
         "t": "payExp",
-        "n": 6480
+        "n": 3280
       }
     ],
     "prize": [
@@ -1990,7 +1995,7 @@
       }
     ],
     "firstPayPrize": [],
-    "name": "pay_name_136Gift4",
+    "name": "pay_name_136Gift3",
     "undefined": "1元礼包",
     "time": 86400,
     "buys": 0,
@@ -2062,7 +2067,7 @@
       }
     ],
     "firstPayPrize": [],
-    "name": "pay_name_136Gift4",
+    "name": "pay_name_136Gift6",
     "undefined": "6元礼包",
     "time": 86400,
     "buys": 0,
@@ -2070,6 +2075,26 @@
     "front": {},
     "currency": "CNY"
   },
+  "136GiftAll": {
+    "id": "136GiftAll",
+    "money": 60,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 600
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_136Gift2",
+    "undefined": "每日礼包全买",
+    "time": 86400,
+    "buys": 0,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
   "xianshizhaomu_gift_1": {
     "id": "xianshizhaomu_gift_1",
     "money": 30,
@@ -4183,33 +4208,7 @@
         "n": 60
       }
     ],
-    "prize": [
-      {
-        "a": "hero",
-        "t": "4002",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "rmbmoney",
-        "n": 120
-      },
-      {
-        "a": "item",
-        "t": "12",
-        "n": 500
-      },
-      {
-        "a": "item",
-        "t": "1",
-        "n": 50000
-      },
-      {
-        "a": "attr",
-        "t": "jinbi",
-        "n": 100000
-      }
-    ],
+    "prize": [],
     "firstPayPrize": [],
     "name": "pay_name_shouchong_1",
     "undefined": "首充礼包_6",
@@ -4229,33 +4228,7 @@
         "n": 300
       }
     ],
-    "prize": [
-      {
-        "a": "hero",
-        "t": "5001",
-        "n": 1
-      },
-      {
-        "a": "attr",
-        "t": "rmbmoney",
-        "n": 600
-      },
-      {
-        "a": "item",
-        "t": "12",
-        "n": 1500
-      },
-      {
-        "a": "item",
-        "t": "1",
-        "n": 300000
-      },
-      {
-        "a": "attr",
-        "t": "jinbi",
-        "n": 300000
-      }
-    ],
+    "prize": [],
     "firstPayPrize": [],
     "name": "pay_name_shouchong_2",
     "undefined": "首充礼包_30",
@@ -4275,33 +4248,7 @@
         "n": 980
       }
     ],
-    "prize": [
-      {
-        "a": "hero",
-        "t": "5001",
-        "n": 1
-      },
-      {
-        "a": "equip",
-        "t": "1009",
-        "n": 1
-      },
-      {
-        "a": "equip",
-        "t": "2009",
-        "n": 1
-      },
-      {
-        "a": "equip",
-        "t": "3009",
-        "n": 1
-      },
-      {
-        "a": "equip",
-        "t": "4009",
-        "n": 1
-      }
-    ],
+    "prize": [],
     "firstPayPrize": [],
     "name": "pay_name_shouchong_3",
     "undefined": "首充礼包_98",
@@ -4360,7 +4307,7 @@
     "prize": [
       {
         "a": "item",
-        "t": "607",
+        "t": "626",
         "n": 20
       },
       {
@@ -4911,5 +4858,204 @@
     "front": {},
     "currency": "CNY"
   },
-  "undefined": {}
+  "sdhd_zhanling_1": {
+    "id": "sdhd_zhanling_1",
+    "money": 128,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_zhanling_1",
+    "undefined": "圣诞战令_1",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_zhanling_2": {
+    "id": "sdhd_zhanling_2",
+    "money": 198,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1980
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_zhanling_1",
+    "undefined": "圣诞战令_2",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_zhanling_3": {
+    "id": "sdhd_zhanling_3",
+    "money": 328,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 3280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_zhanling_1",
+    "undefined": "圣诞战令_3",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_1": {
+    "id": "sdhd_libao_1",
+    "money": 0.5,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_1",
+    "undefined": "圣诞自选_1",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_2": {
+    "id": "sdhd_libao_2",
+    "money": 6,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_2",
+    "undefined": "圣诞自选_2",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_3": {
+    "id": "sdhd_libao_3",
+    "money": 30,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_3",
+    "undefined": "圣诞自选_3",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_4": {
+    "id": "sdhd_libao_4",
+    "money": 68,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_4",
+    "undefined": "圣诞自选_4",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_5": {
+    "id": "sdhd_libao_5",
+    "money": 128,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_5",
+    "undefined": "圣诞自选_5",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_6": {
+    "id": "sdhd_libao_6",
+    "money": 328,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_6",
+    "undefined": "圣诞自选_6",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  },
+  "sdhd_libao_7": {
+    "id": "sdhd_libao_7",
+    "money": 648,
+    "payExp": [
+      {
+        "a": "attr",
+        "t": "payExp",
+        "n": 1280
+      }
+    ],
+    "prize": [],
+    "firstPayPrize": [],
+    "name": "pay_name_sdhd_libao_7",
+    "undefined": "圣诞自选_7",
+    "time": -1,
+    "buys": 1,
+    "needVip": 0,
+    "front": {},
+    "currency": "CNY"
+  }
 }

src/json/payEmail.json5

@@ -26,7 +26,7 @@
             day: 7,
             title: 'title_email_zhongshenka_day7', 
             content: 'intr_email_zhongshenka_day7', 
-            prize: [{ a: 'item', t: '4', n: 10 },{ a: 'item', t: '9', n: 200 }] 
+            prize: [{ a: 'item', t: '4', n: 10 },{ a: 'item', t: '1', n: 5000000 }] 
         }
     ],
     chaozhiyueka: [

src/json/playerChatFrame.json

@@ -118,5 +118,22 @@
     },
     "colour": 3,
     "ani": ""
+  },
+  "8": {
+    "id": 8,
+    "name": "playerChatFrame_name_8",
+    "img": "lt_dhk14",
+    "cond": [
+      "time",
+      -1
+    ],
+    "undefined": "圣诞庆典获得",
+    "intr": "playerChatFrame_des_8",
+    "sort": 8,
+    "buff": {
+      "defpro": 0.01
+    },
+    "colour": 3,
+    "ani": ""
   }
 }

src/json/playerHead.json

@@ -26,7 +26,7 @@
     "intr": "intr_playerinfo_intr_2",
     "sort": 2,
     "buff": {},
-    "colour": 2,
+    "colour": 1,
     "ani": ""
   },
   "1001": {

src/json/playerHeadFrame.json

@@ -208,7 +208,7 @@
   "13": {
     "id": 13,
     "name": "playerheadFrame_name_13",
-    "undefined": "购买战令获得",
+    "undefined": "购买悬赏令获得，解锁后伤害加成+2%（限时30天）",
     "img": "txk_002",
     "cond": [
       "time",
@@ -216,14 +216,16 @@
     ],
     "intr": "playerheadFrame_des_13",
     "sort": 13,
-    "buff": {},
+    "buff": {
+      "dpspro": 0.02
+    },
     "colour": 4,
     "ani": ""
   },
   "14": {
     "id": 14,
     "name": "playerheadFrame_name_14",
-    "undefined": "铁笼死斗晋级八强获得",
+    "undefined": "铁笼死斗晋级八强获得，解锁后防御加成+1%（限时7天）",
     "img": "txk_003",
     "cond": [
       "time",
@@ -231,14 +233,16 @@
     ],
     "intr": "playerheadFrame_des_14",
     "sort": 14,
-    "buff": {},
+    "buff": {
+      "defpro": 0.01
+    },
     "colour": 4,
     "ani": ""
   },
   "15": {
     "id": 15,
     "name": "playerheadFrame_name_15",
-    "undefined": "购买名望特权礼包获得",
+    "undefined": "购买名望特权礼包获得，解锁后伤害加成+1%",
     "img": "txk_020",
     "cond": [
       "time",
@@ -255,7 +259,7 @@
   "16": {
     "id": 16,
     "name": "playerheadFrame_name_16",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后攻击加成+1%",
     "img": "txk_017",
     "cond": [
       "time",
@@ -272,7 +276,7 @@
   "17": {
     "id": 17,
     "name": "playerheadFrame_name_17",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后防御加成+1%",
     "img": "txk_011",
     "cond": [
       "time",
@@ -289,7 +293,7 @@
   "18": {
     "id": 18,
     "name": "playerheadFrame_name_18",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后生命加成+1%",
     "img": "txk_005",
     "cond": [
       "time",
@@ -306,7 +310,7 @@
   "19": {
     "id": 19,
     "name": "playerheadFrame_name_19",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后攻击加成+1%",
     "img": "txk_004",
     "cond": [
       "time",
@@ -323,7 +327,7 @@
   "20": {
     "id": 20,
     "name": "playerheadFrame_name_20",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后防御加成+1%",
     "img": "txk_024",
     "cond": [
       "time",
@@ -340,7 +344,7 @@
   "21": {
     "id": 21,
     "name": "playerheadFrame_name_21",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后生命加成+1%",
     "img": "txk_013",
     "cond": [
       "time",
@@ -357,7 +361,7 @@
   "22": {
     "id": 22,
     "name": "playerheadFrame_name_22",
-    "undefined": "开服冲榜活动获得",
+    "undefined": "开服冲榜活动获得，解锁后伤害加成+1%",
     "img": "txk_021",
     "cond": [
       "time",
@@ -370,5 +374,22 @@
     },
     "colour": 4,
     "ani": ""
+  },
+  "23": {
+    "id": 23,
+    "name": "playerheadFrame_name_23",
+    "undefined": "圣诞庆典活动获得，解锁后生命加成+1%",
+    "img": "txk_028",
+    "cond": [
+      "time",
+      -1
+    ],
+    "intr": "playerheadFrame_des_23",
+    "sort": 23,
+    "buff": {
+      "hppro": 0.01
+    },
+    "colour": 4,
+    "ani": ""
   }
 }

src/json/playerModel.json

@@ -33,6 +33,44 @@
       "colour": 1,
       "mwSpine": "ani_mingwangnv",
       "fireHead": "img_lih1"
+    },
+    "3": {
+      "type": 1,
+      "id": 3,
+      "name": "playerModel_name_3",
+      "head": 100011,
+      "img": 100011,
+      "cond": [
+        "time",
+        -1
+      ],
+      "intr": "playerModel_des_3",
+      "sort": 3,
+      "buff": {
+        "defpro": 0.02
+      },
+      "colour": 5,
+      "mwSpine": "ani_mingwangnan",
+      "fireHead": "img_lih21"
+    },
+    "4": {
+      "type": 1,
+      "id": 4,
+      "name": "playerModel_name_4",
+      "head": 100021,
+      "img": 100021,
+      "cond": [
+        "time",
+        -1
+      ],
+      "intr": "playerModel_des_4",
+      "sort": 4,
+      "buff": {
+        "atkpro": 0.02
+      },
+      "colour": 5,
+      "mwSpine": "ani_mingwangnv",
+      "fireHead": "img_lih11"
     }
   }
 }

src/json/shop.json

@@ -495,5 +495,36 @@
     "vip": [],
     "npcImg": 3011,
     "npcText": "intr_shopCom_text_10"
+  },
+  "13": {
+    "id": 13,
+    "type": 12,
+    "name": "wsw_wz_dhsd",
+    "undefined": "兑换商店",
+    "openCond": [
+      "lv",
+      15
+    ],
+    "autoRefreshTime": 0,
+    "recoilRefreshNeed": [],
+    "recoilRefreshNum": 0,
+    "freeRefreshInterval": 0,
+    "freeRefreshNum": 0,
+    "shopItems": [
+      4001
+    ],
+    "showItem": [
+      {
+        "a": "attr",
+        "t": "jinbi",
+        "n": 0
+      },
+      {
+        "a": "attr",
+        "t": "rmbmoney",
+        "n": 0
+      }
+    ],
+    "vip": []
   }
 }

src/json/shopItem.json

@@ -3918,6 +3918,31 @@
         9999
       ],
       "vipAddbuyNum": []
+    },
+    {
+      "id": 4001,
+      "a": "item",
+      "t": 4,
+      "n": 10,
+      "p": 1,
+      "colour": 4,
+      "buyNum": -1,
+      "openDay": 1,
+      "buyNeed": [
+        {
+          "a": "item",
+          "t": "15",
+          "n": 2800
+        }
+      ],
+      "sale": 10,
+      "needVip": 0,
+      "needZCCG": 0,
+      "lv": [
+        1,
+        9999
+      ],
+      "vipAddbuyNum": []
     }
   ],
   "4002": [

src/json/shouchong.json

@@ -3,18 +3,30 @@
 		"paynum": 6,
 		"payid":"shouchong_1",
 		"cartoon": {
-			"hero": 5001
+			"hero": 4013
 		},
 		"prize": [
 			[
 				{
 					"a": "hero",
-					"t": "5001",
+					"t": "4013",
 					"n": 1
 				},
 				{
 					"a": "attr",
-					"t": "jinbi",
+					"t": "rmbmoney",
+					"n": 120
+				}
+			],
+			[
+				{
+					"a": "item",
+					"t": "4",
+					"n": 10
+				},
+				{
+					"a": "item",
+					"t": "1",
 					"n": 100000
 				}
 			],
@@ -22,24 +34,12 @@
 				{
 					"a": "item",
 					"t": "12",
-					"n": 200
+					"n": 100
 				},
 				{
 					"a": "attr",
 					"t": "jinbi",
-					"n": 200000
-				}
-			],
-			[
-				{
-					"a": "item",
-					"t": "12",
-					"n": 200
-				},
-				{
-					"a": "attr",
-					"t": "jinbi",
-					"n": 300000
+					"n": 100000
 				}
 			]
 		]
@@ -51,6 +51,18 @@
 			"img": 5001
 		},
 		"prize": [
+			[
+				{
+					"a": "hero",
+					"t": "5001",
+					"n": 1
+				},
+				{
+					"a": "attr",
+					"t": "rmbmoney",
+					"n": 600
+				}
+			],
 			[
 				{
 					"a": "equip",
@@ -63,18 +75,6 @@
 					"n": 1
 				}
 			],
-			[
-				{
-					"a": "equip",
-					"t": "3009",
-					"n": 1
-				},
-				{
-					"a": "item",
-					"t": "2",
-					"n": 1000
-				}
-			],
 			[
 				{
 					"a": "equip",
@@ -82,9 +82,9 @@
 					"n": 1
 				},
 				{
-					"a": "item",
-					"t": "2",
-					"n": 1000
+					"a": "equip",
+					"t": "3009",
+					"n": 1
 				}
 			]
 		]
@@ -93,43 +93,43 @@
 		"paynum": 98,
 		"payid":"shouchong_3",
 		"cartoon": {
-			"hero": 5002
+			"hero": 5001
 		},
 		"prize": [
 			[
 				{
 					"a": "hero",
-					"t": "5002",
+					"t": "5001",
 					"n": 1
 				},
+				{
+					"a": "attr",
+					"t": "rmbmoney",
+					"n": 1960
+				}
+			],
+			[
+				{
+					"a": "item",
+					"t": "12",
+					"n": 3000
+				},
+				{
+					"a": "item",
+					"t": "1",
+					"n": 3000000
+				}
+			],
+			[
 				{
 					"a": "item",
 					"t": "4",
-					"n": 10
-				}
-			],
-			[
-				{
-					"a": "equip",
-					"t": "1010",
-					"n": 1
+					"n": 50
 				},
 				{
-					"a": "item",
-					"t": "2",
-					"n": 2000
-				}
-			],
-			[
-				{
-					"a": "equip",
-					"t": "3010",
-					"n": 1
-				},
-				{
-					"a": "item",
-					"t": "2",
-					"n": 2000
+					"a": "attr",
+					"t": "jinbi",
+					"n": 5000000
 				}
 			]
 		]

src/json/task.json

@@ -1202,13 +1202,13 @@
           "n": 100000
         }
       ],
-      "pval": 2,
+      "pval": 1,
       "name": "intr_task_name_2007",
       "intr": "intr_task_intr_2007",
       "pretask": 2015,
       "followtask": 2017,
       "cond": [
-        1
+        2
       ],
       "tiaozhuan": 67,
       "order": 17,
@@ -1467,13 +1467,13 @@
           "n": 100000
         }
       ],
-      "pval": 3,
+      "pval": 1,
       "name": "intr_task_name_2016",
       "intr": "intr_task_intr_2016",
       "pretask": 2022,
       "followtask": 2024,
       "cond": [
-        1
+        3
       ],
       "tiaozhuan": 67,
       "order": 24,
@@ -1619,13 +1619,13 @@
           "n": 200000
         }
       ],
-      "pval": 4,
+      "pval": 2,
       "name": "intr_task_name_2016",
       "intr": "intr_task_intr_2016",
       "pretask": 2026,
       "followtask": 2028,
       "cond": [
-        1
+        2
       ],
       "tiaozhuan": 67,
       "order": 28,
@@ -3016,13 +3016,13 @@
           "n": 100000
         }
       ],
-      "pval": 3,
+      "pval": 2,
       "name": "intr_task_name_2016",
       "intr": "intr_task_intr_2016",
       "pretask": 2064,
       "followtask": 2066,
       "cond": [
-        2
+        3
       ],
       "tiaozhuan": 67,
       "order": 66,
@@ -3350,13 +3350,13 @@
           "n": 100000
         }
       ],
-      "pval": 4,
+      "pval": 3,
       "name": "intr_task_name_2016",
       "intr": "intr_task_intr_2016",
       "pretask": 2073,
       "followtask": 2075,
       "cond": [
-        2
+        3
       ],
       "tiaozhuan": 67,
       "order": 75,

src/module/collection_event.ts

@@ -26,6 +26,9 @@ export type eventType = {
     shouchong: {
         receive: k_v<number[]>;
     };
+    shouchongzhigou: {
+        receive: k_v<number[]>;
+    };
     kaifukuanghuan: Omit<ResOpen, 'day' | 'taskFinished'>;
     dayjijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;
     dengjijijin: Omit<ResOpenJiJin, 'isPay' | 'finished'>;

src/setMongodb.ts

@@ -2,6 +2,7 @@ import {
     Collection,
     CreateIndexesOptions,
     Db,
+    FindCursor,
     IndexDescription,
     IndexSpecification,
     MongoClient,
@@ -18,6 +19,7 @@ import {HuoDongFun} from './public/huodongfun';
 import {zbsGroup} from './api_s2c/hbzb/zbs/fun';
 import {clusterRunOnce} from './clusterUtils';
 import { PublicShared } from './shared/public/public';
+import { addGameLog } from './gameLog';
 
 const indexs: Partial<{ [k in keyof MongodbCollections]: IndexDescription[] }> = {
     item: [
@@ -637,3 +639,26 @@ export class _mongodb {
         return this.db.indexInformation(name)
     }
 }
+
+//@ts-ignore
+FindCursor.prototype._toArray = FindCursor.prototype.toArray;
+//@ts-ignore
+FindCursor.prototype.toArray = async function(){
+    let rss = await this._toArray();
+
+    //如果返回的数据超过50条
+    if(rss.length>50){
+        addGameLog("system","findCount",null,{
+            collection: this.namespace.collection,
+            db:this.namespace.db,
+            count:rss.length
+        })
+        console.log("system,findCount",{
+            collection: this.namespace.collection,
+            db:this.namespace.db,
+            count:rss.length
+        })
+        console.trace();
+    }
+    return rss;
+}

src/shared/protocols/event/shouchong/PtlOpen.ts

@@ -8,8 +8,10 @@ export type ReqOpen = {
 };
 
 export type ResOpen = {
-    payNum: number;
     receive: {
         [k: string]: number[];
     };
+    buyLog:{
+        [k: string]: any;
+    }
 };

src/shared/protocols/serviceProto.ts

@@ -10262,13 +10262,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "properties": [
                 {
                     "id": 0,
-                    "name": "payNum",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 1,
                     "name": "receive",
                     "type": {
                         "type": "Interface",
@@ -10282,6 +10275,19 @@ export const serviceProto: ServiceProto<ServiceType> = {
                             }
                         }
                     }
+                },
+                {
+                    "id": 1,
+                    "name": "buyLog",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Any"
+                            }
+                        }
+                    }
                 }
             ]
         },