配置更新

bin/json/game_drawcard.json

@@ -318,9 +318,9 @@
     "key": 36,
     "recruitment_type": 1,
     "card_pool_type": "base_pool1",
-    "star": 5,
+    "star": 3,
     "race": 4,
-    "id": "45003",
+    "id": "13001",
     "weight": 1000
   },
   {

bin/json/game_global.json

@@ -104,8 +104,8 @@
     "camp3_pool1": "camp3_pool",
     "camp4_pool1": "camp4_pool",
     "base_pool1": {
-      "s": 1,
+      "s": 0,
-      "e": 60,
+      "e": 600,
       "p": "base_pool1"
     },
     "base_pool2": {

bin/json/game_rdtaskside.json

@@ -226,28 +226,6 @@
     ],
     "storyEnd": 0,
     "nextTid": 100202,
-    "reward": [],
-    "CD": 0,
-    "endTid": -1
-  },
-  {
-    "id": 2002,
-    "objType": 1,
-    "location": "middle",
-    "modelaction": "",
-    "modelstate": 0,
-    "rotation": {
-      "x": 0,
-      "y": -180,
-      "z": 0
-    },
-    "point": "model_02",
-    "storyBegin": 202,
-    "chooseId": [
-      20003
-    ],
-    "storyEnd": 0,
-    "nextTid": 0,
     "reward": [
       {
         "ChooseId": 20001,
@@ -273,6 +251,28 @@
     "CD": 0,
     "endTid": -1
   },
+  {
+    "id": 2002,
+    "objType": 1,
+    "location": "middle",
+    "modelaction": "",
+    "modelstate": 0,
+    "rotation": {
+      "x": 0,
+      "y": -180,
+      "z": 0
+    },
+    "point": "model_02",
+    "storyBegin": 202,
+    "chooseId": [
+      20003
+    ],
+    "storyEnd": 0,
+    "nextTid": 0,
+    "reward": [],
+    "CD": 0,
+    "endTid": -1
+  },
   {
     "id": 2003,
     "objType": 1,

modules/hero/api_drawCard.go

@@ -169,7 +169,12 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		}
 		randomIndex := this.module.modelHero.GetRandW(sz)
 
-		szCards = append(szCards, _data[int32(star)][randomIndex].Id)
+		if v, ok := _data[int32(star)]; ok {
+			if int32(len(v)) > randomIndex {
+				szCards = append(szCards, v[randomIndex].Id)
+			}
+		}
+
 	}
 	// 更新record 配置信息
 	update := map[string]interface{}{}