Merge branch 'release' into bugfix

# Conflicts:
#	src/api_s2c/email/ApiAllRemove.ts

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);

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);

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": [