Merge branch 'master' into dev

# Conflicts: # src/shared/protocols/hongdian/PtlGet.ts # src/shared/protocols/pushgift/PtlItemNoEnough.ts # src/shared/protocols/serviceProto.ts
2023-12-23 11:48:20 +08:00 · 2023-12-23 11:48:20 +08:00 · 8c3907c370
commit 8c3907c370
parent 712c85ff64 f8298f08e9
8 changed files with 44 additions and 91 deletions
--- a/src/api_s2c/email/ApiAllReceive.ts
+++ b/src/api_s2c/email/ApiAllReceive.ts
@ -6,7 +6,7 @@ import {ReqAllReceive, ResAllReceive} from "../../shared/protocols/email/PtlAllR
 export default async function (call: ApiCall<ReqAllReceive, ResAllReceive>) {
    // 筛选出有奖励并且未领取的邮件
    let emailList = (await EmailFun.getAllEmail(call.uid, false)).filter(email => (
-        email.prizeData.prize.length > 0 && !email.prizeData?.isGet
+        email.prizeData?.prize.length > 0 && !email.prizeData?.isGet
    ));

    if (emailList.length < 1) return call.error(globalThis.lng.email_1);
--- a/src/api_s2c/email/ApiAllRemove.ts
+++ b/src/api_s2c/email/ApiAllRemove.ts
@ -3,9 +3,9 @@ import { EmailFun } from '../../public/email';
 import { ReqAllRemove, ResAllRemove } from "../../shared/protocols/email/PtlAllRemove";

 export default async function (call: ApiCall<ReqAllRemove, ResAllRemove>) {
-    // 筛选出没有奖励已读邮件和已经领取过奖励的邮件
+    //  邮件已读 并且 (没有奖励 或者 (有奖励 并且 领取了))
    let emailList = (await EmailFun.getAllEmail(call.uid, true)).filter(email => (
-        (email.emailRead && email.prizeData.prize.length <= 0) || email.prizeData.isGet
+        email.emailRead && (!email.prizeData || (email.prizeData?.prize.length > 0 && email.prizeData?.isGet))
    ));

    if (emailList.length < 1) return call.error(globalThis.lng.email_2);
--- a/src/json/pay.json
+++ b/src/json/pay.json
@ -2522,37 +2522,6 @@
    "fanLiBi": 200,
    "currency": "CNY"
  },
-  "136Gift1": {
-    "id": "136Gift1",
-    "money": 60,
-    "payExp": [
-      {
-        "a": "attr",
-        "t": "payExp",
-        "n": 600
-      }
-    ],
-    "prize": [
-      {
-        "a": "item",
-        "t": "14",
-        "n": 50
-      },
-      {
-        "a": "attr",
-        "t": "jingxuanbi",
-        "n": 10
-      }
-    ],
-    "firstPayPrize": [],
-    "name": "pay_name_136Gift2",
-    "undefined": "136礼包打包购买",
-    "time": 604800,
-    "buys": 0,
-    "needVip": 0,
-    "front": {},
-    "currency": "CNY"
-  },
  "136Gift2": {
    "id": "136Gift2",
    "money": 1,
@ -2689,7 +2658,7 @@
    "buys": 0,
    "needVip": 0,
    "front": {},
-    "fanLiBi": 900,
+    "fanLiBi": 950,
    "currency": "CNY"
  },
  "xianshizhaomu_gift_1": {
--- a/src/json/shopItem.json
+++ b/src/json/shopItem.json
@ -6407,11 +6407,11 @@
  "10006": [
    {
      "id": 10006,
-      "a": "attr",
-      "t": "jinbi",
-      "n": 1000000,
+      "a": "item",
+      "t": 37,
+      "n": 1,
      "p": 1,
-      "colour": 3,
+      "colour": 4,
      "buyNum": -1,
      "openDay": 1,
      "buyNeed": [
--- a/src/json/tuisonglibao.json
+++ b/src/json/tuisonglibao.json
@ -13,7 +13,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "2": {
    "id": 2,
@ -29,7 +29,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "3": {
    "id": 3,
@ -46,7 +46,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "4": {
    "id": 4,
@ -63,7 +63,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "5": {
    "id": 5,
@ -80,7 +80,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "6": {
    "id": 6,
@ -97,7 +97,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "7": {
    "id": 7,
@ -114,7 +114,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "8": {
    "id": 8,
@ -131,7 +131,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "9": {
    "id": 9,
@ -148,7 +148,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "10": {
    "id": 10,
@ -165,7 +165,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "11": {
    "id": 11,
@ -182,7 +182,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "12": {
    "id": 12,
@ -199,7 +199,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "13": {
    "id": 13,
@ -216,7 +216,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "14": {
    "id": 14,
@ -233,7 +233,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "15": {
    "id": 15,
@ -250,7 +250,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "16": {
    "id": 16,
@ -267,7 +267,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "17": {
    "id": 17,
@ -284,7 +284,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "18": {
    "id": 18,
@ -301,7 +301,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "djlb"
+    "icon": "gkts"
  },
  "101": {
    "id": 101,
@ -396,7 +396,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "402": {
    "id": 402,
@ -411,7 +411,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "403": {
    "id": 403,
@ -427,7 +427,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "404": {
    "id": 404,
@ -443,7 +443,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "405": {
    "id": 405,
@ -459,7 +459,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "406": {
    "id": 406,
@ -475,7 +475,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "407": {
    "id": 407,
@ -491,7 +491,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "408": {
    "id": 408,
@ -507,7 +507,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "409": {
    "id": 409,
@ -523,7 +523,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "410": {
    "id": 410,
@ -539,7 +539,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "411": {
    "id": 411,
@ -555,7 +555,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "412": {
    "id": 412,
@ -571,7 +571,7 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  },
  "413": {
    "id": 413,
@ -587,6 +587,6 @@
    "time": 3600,
    "displayCD": 3600,
    "scale": 3000,
-    "icon": "gkts"
+    "icon": "djlb"
  }
 }
--- a/src/module/collection_event.ts
+++ b/src/module/collection_event.ts
@ -52,8 +52,8 @@ export type eventType = {
    qirichongzhi: Omit<ResOpenQirichongzhi, 'finished'>;
    jierihuodong: Omit<ResOpenJierihuodong, 'taskFinish'> & { refreshTime: number; };
    kaifujingsai: ResOpenKaifujingsai;
-    zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; }
-    pobinglibao: ResOpenPobinglibao;
+    zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; };
+    pobinglibao: ResOpenPobinglibao
    payForDiamond: {
        [time: number]: number
    }
--- a/src/shared/protocols/pushgift/PtlItemNoEnough.ts
+++ b/src/shared/protocols/pushgift/PtlItemNoEnough.ts
@ -1,5 +1,3 @@
-import {Gift} from "../../../module/collection_pushgift";
-
 export type ReqItemNoEnough = {
    need: { a: string, t: string }
 }
--- a/src/shared/protocols/serviceProto.ts
+++ b/src/shared/protocols/serviceProto.ts
@ -15322,14 +15322,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
                    "id": 38,
                    "type": {
                        "type": "Literal",
-                        "literal": "leichonglibao"
+                        "literal": "payForDiamond"
                    }
                },
                {
                    "id": 39,
                    "type": {
                        "type": "Literal",
-                        "literal": "payForDiamond"
+                        "literal": "leichonglibao"
                    }
                }
            ]
@ -20265,21 +20265,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                    "id": 2,
                    "name": "t",
                    "type": {
-                        "type": "Union",
-                        "members": [
-                            {
-                                "id": 0,
-                                "type": {
-                                    "type": "Number"
-                                }
-                            },
-                            {
-                                "id": 1,
-                                "type": {
-                                    "type": "String"
-                                }
-                            }
-                        ]
+                        "type": "Number"
                    }
                },
                {