diff --git a/game-server/app/services/funcSwitchService.ts b/game-server/app/services/funcSwitchService.ts
index 82ac8c6e8..145874c71 100644
--- a/game-server/app/services/funcSwitchService.ts
+++ b/game-server/app/services/funcSwitchService.ts
@@ -13,7 +13,7 @@ export async function switchOnFunc(roleId: string, type: number, param: number,
      
     let funcs = new Array<{id: number, desc: string, script: string}>(), addFuncs = new Array<number>();
     for(let obj of dicFuncSwitch) {
-        if(obj.conditionType == type && !dataFuncs.includes(obj.id) && obj.param == param) {
+        if(obj.conditionType == type && !dataFuncs.includes(obj.id) && obj.param <= param) {
             funcs.push({id: obj.id, desc: obj.desc, script: obj.script});
             addFuncs.push(obj.id);
         }
diff --git a/game-server/config.js b/game-server/config.js
index 2abb43604..9245f0435 100644
--- a/game-server/config.js
+++ b/game-server/config.js
@@ -4,9 +4,13 @@ function main (){
   if (args.length !== 1) {
     return console.log('参数请填写环境变量');
   }
+  let env = args[0];
+  if(args[0] == 'stable') {
+    env = 'production';
+  } 
 
   let configObject = {
-      env: args[0]
+      env: env
   };
   let result = JSON.stringify(configObject);
 
diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts
index 36243e3ab..1b35a30a0 100644
--- a/shared/consts/constModules/sysConst.ts
+++ b/shared/consts/constModules/sysConst.ts
@@ -73,22 +73,14 @@ export const DEFAULT_ITEMS = [
   {"id": 17050, "count": 99999999},
   {"id": 17051, "count": 99999999},
   {"id": 17052, "count": 99999999},
-  {"id": 21001, "count": 99999999},
-  {"id": 21002, "count": 99999999},
-  {"id": 21003, "count": 99999999},
-  {"id": 21004, "count": 99999999},
-  {"id": 21005, "count": 99999999},
-  {"id": 21006, "count": 99999999},
-  {"id": 21007, "count": 99999999},
-  {"id": 21008, "count": 99999999},
+  
   {"id": 21009, "count": 99999999},
-  {"id": 21010, "count": 99999999},
   {"id": 21011, "count": 99999999},
   {"id": 21012, "count": 99999999},
-  {"id": 21013, "count": 99999999},
   {"id": 21014, "count": 99999999},
   {"id": 21015, "count": 99999999},
-  {"id": 21043, "count": 99999999},
+  {"id": 21042, "count": 99999999},
+  
   {"id": 42083, "count": 9999},
   {"id": 42084, "count": 9999},
   {"id": 42085, "count": 9999},
diff --git a/shared/resource/jsons/dic_zyz_event.json b/shared/resource/jsons/dic_zyz_event.json
index 2684a962b..86d35dc0d 100644
--- a/shared/resource/jsons/dic_zyz_event.json
+++ b/shared/resource/jsons/dic_zyz_event.json
@@ -161,7 +161,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -178,7 +178,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&60",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -195,7 +195,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31001&500",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -212,7 +212,7 @@
         "actorIDForQuestion": 14,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -229,7 +229,7 @@
         "actorIDForQuestion": 14,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -246,7 +246,7 @@
         "actorIDForQuestion": 12,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -263,7 +263,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&50|5&1|11004&1",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 2001,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -280,7 +280,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&100|5&1|11004&1",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 2002,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -297,7 +297,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31001&500",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "21&40",
         "warId": 2003,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -314,7 +314,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -331,7 +331,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&60",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -348,7 +348,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31001&500",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -365,7 +365,7 @@
         "actorIDForQuestion": 14,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -382,7 +382,7 @@
         "actorIDForQuestion": 14,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -399,7 +399,7 @@
         "actorIDForQuestion": 12,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -416,7 +416,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&50|5&1|11004&1",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 2001,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -433,7 +433,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&100|5&1|11004&1",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 2002,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -450,7 +450,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31001&500",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "41&100",
         "warId": 2003,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -467,7 +467,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -484,7 +484,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&60",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -501,7 +501,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31001&500",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -518,7 +518,7 @@
         "actorIDForQuestion": 14,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -535,7 +535,7 @@
         "actorIDForQuestion": 14,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -552,7 +552,7 @@
         "actorIDForQuestion": 12,
         "winReward": "1&1|31002&50",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 0,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -569,7 +569,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&50|5&1|11004&1",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 2001,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -586,7 +586,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31002&100|5&1|11004&1",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 2002,
         "weight": 1,
         "movePointArray": "26&27&28&29",
@@ -603,7 +603,7 @@
         "actorIDForQuestion": 0,
         "winReward": "31001&500",
         "loseReward": "31001&10",
-        "suitLevel": "1&20",
+        "suitLevel": "61&100",
         "warId": 2003,
         "weight": 1,
         "movePointArray": "26&27&28&29",