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

bin/json/game_loading.json

@@ -65,7 +65,7 @@
   {
     "id": 1008,
     "scene": "businessScene",
-    "image": "ld_5v5_bg",
+    "image": "ld_mh_bg_sd",
     "prompt": {
       "key": "loading_Sheet1_prompt_8",
       "text": "商人们经常乘着巨怪列车外出，回来时总会带些新奇的小玩意。"

bin/json/game_skillafteratk.json

@@ -28762,7 +28762,7 @@
     "Argu": [
       1,
       4,
-      3000
+      600
     ],
     "FollowSK": [
       255005312

modules/task/api_receive.go

@@ -1,6 +1,7 @@
 package task
 
 import (
+	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
@@ -15,10 +16,13 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.TaskReceive
 		code = pb.ErrorCode_TaskIdEmpty
 	} else if req.TaskTag == 0 {
 		code = pb.ErrorCode_TaskTagEmpty
+	} else {
+		code = pb.ErrorCode_ReqParameterError
 	}
 	errdata = &pb.ErrorData{
-		Code:  code,
+		Code:    code,
-		Title: code.ToString(),
+		Title:   code.ToString(),
+		Message: fmt.Sprintf("Id:%v tag:%v", req.Id, req.TaskTag),
 	}
 	return
 }