Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_herostarup.json

@@ -1526,7 +1526,13 @@
     "needracestar": 5,
     "needracenum": 5,
     "gold": 10000,
-    "starup": []
+    "starup": [
+      {
+        "a": "item",
+        "t": "90001",
+        "n": 1
+      }
+    ]
   },
   {
     "key": 94,
@@ -1619,7 +1625,13 @@
     "needracestar": 5,
     "needracenum": 5,
     "gold": 10000,
-    "starup": []
+    "starup": [
+      {
+        "a": "item",
+        "t": "90002",
+        "n": 1
+      }
+    ]
   },
   {
     "key": 100,
@@ -3468,7 +3480,13 @@
     "needracestar": 4,
     "needracenum": 4,
     "gold": 10000,
-    "starup": []
+    "starup": [
+      {
+        "a": "item",
+        "t": "90003",
+        "n": 1
+      }
+    ]
   },
   {
     "key": 213,

comm/const.go

@@ -372,8 +372,8 @@ const (
 	Rtype11 TaskType = 11 //赠送X次友情点
 	Rtype12 TaskType = 12 //使用好友助战英雄xx次
 	Rtype13 TaskType = 13 //更换X次助战英雄
-	Rtype14 TaskType = 14 //累计xx次普通招募
-	Rtype15 TaskType = 15 //累计xx次阵营招募
+	//Rtype14 TaskType = 14 //累计xx次普通招募
+	//Rtype15 TaskType = 15 //累计xx次阵营招募
 	Rtype16 TaskType = 16 //招募获得xx品质英雄xx个
 	Rtype17 TaskType = 17 //普通招募十连，获得xx个以上xx星英雄
 	Rtype18 TaskType = 18 //xx次普通招募

modules/hero/api_drawCard.go

@@ -241,10 +241,10 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 				this.module.ModuleRtask.SendToRtask(session, comm.Rtype17, 1, k)
 			}
 		}
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype14, req.DrawCount)
+		//this.module.ModuleRtask.SendToRtask(session, comm.Rtype14, req.DrawCount)
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype18, req.DrawCount)
 	} else { // 阵营招募
-		this.module.ModuleRtask.SendToRtask(session, comm.Rtype15, req.DrawCount)
+		//this.module.ModuleRtask.SendToRtask(session, comm.Rtype15, req.DrawCount)
 		this.module.ModuleRtask.SendToRtask(session, comm.Rtype19, req.DrawCount)
 		if drawCount == 10 {
 			this.module.ModuleRtask.SendToRtask(session, comm.Rtype91, 1) // 阵营10连