上传代码配置

bin/json/game_annulartask_library.json

@@ -4,7 +4,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100010,
+    "itemid": 1010,
     "itemwt": 1000,
     "min": 0
   },
@@ -13,7 +13,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100020,
+    "itemid": 1020,
     "itemwt": 1000,
     "min": 0
   },
@@ -22,7 +22,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100030,
+    "itemid": 1030,
     "itemwt": 1000,
     "min": 0
   },
@@ -31,7 +31,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100040,
+    "itemid": 1040,
     "itemwt": 1000,
     "min": 0
   },
@@ -40,7 +40,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100050,
+    "itemid": 1050,
     "itemwt": 1000,
     "min": 0
   },
@@ -49,7 +49,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100060,
+    "itemid": 1060,
     "itemwt": 1000,
     "min": 0
   },
@@ -58,7 +58,7 @@
     "assembleid": 60000010,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100070,
+    "itemid": 1070,
     "itemwt": 1000,
     "min": 0
   },
@@ -67,7 +67,7 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100080,
+    "itemid": 1080,
     "itemwt": 1000,
     "min": 0
   },
@@ -76,7 +76,7 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100090,
+    "itemid": 1090,
     "itemwt": 1000,
     "min": 0
   },
@@ -85,7 +85,7 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100100,
+    "itemid": 1100,
     "itemwt": 1000,
     "min": 0
   },
@@ -94,7 +94,7 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100110,
+    "itemid": 1110,
     "itemwt": 1000,
     "min": 0
   },
@@ -103,7 +103,7 @@
     "assembleid": 60000020,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100120,
+    "itemid": 1120,
     "itemwt": 1000,
     "min": 0
   },
@@ -112,7 +112,7 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100130,
+    "itemid": 1130,
     "itemwt": 1000,
     "min": 0
   },
@@ -121,7 +121,7 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100140,
+    "itemid": 1140,
     "itemwt": 1000,
     "min": 0
   },
@@ -130,7 +130,7 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100150,
+    "itemid": 1150,
     "itemwt": 1000,
     "min": 0
   },
@@ -139,7 +139,7 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100160,
+    "itemid": 1160,
     "itemwt": 1000,
     "min": 0
   },
@@ -148,7 +148,7 @@
     "assembleid": 60000030,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100170,
+    "itemid": 1170,
     "itemwt": 1000,
     "min": 0
   },
@@ -157,7 +157,7 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100180,
+    "itemid": 1180,
     "itemwt": 1000,
     "min": 0
   },
@@ -166,7 +166,7 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100190,
+    "itemid": 1190,
     "itemwt": 1000,
     "min": 0
   },
@@ -175,7 +175,7 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100200,
+    "itemid": 1200,
     "itemwt": 1000,
     "min": 0
   },
@@ -184,7 +184,7 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100210,
+    "itemid": 1210,
     "itemwt": 1000,
     "min": 0
   },
@@ -193,7 +193,7 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100220,
+    "itemid": 1220,
     "itemwt": 1000,
     "min": 0
   },
@@ -202,7 +202,7 @@
     "assembleid": 60000040,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100230,
+    "itemid": 1230,
     "itemwt": 1000,
     "min": 0
   },
@@ -211,7 +211,7 @@
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100240,
+    "itemid": 1240,
     "itemwt": 1000,
     "min": 0
   },
@@ -220,7 +220,7 @@
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100250,
+    "itemid": 1250,
     "itemwt": 1000,
     "min": 0
   },
@@ -229,7 +229,7 @@
     "assembleid": 60000050,
     "lvstart": 1,
     "lvend": 999,
-    "itemid": 100260,
+    "itemid": 1260,
     "itemwt": 1000,
     "min": 0
   }

bin/json/game_worldall.json

@@ -301,5 +301,200 @@
       "text": ""
     },
     "reword": []
+  },
+  {
+    "id": 1120,
+    "name": {
+      "key": "worldtask_world_all_name_22",
+      "text": "日常测试12"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1130,
+    "name": {
+      "key": "worldtask_world_all_name_23",
+      "text": "日常测试13"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1140,
+    "name": {
+      "key": "worldtask_world_all_name_24",
+      "text": "日常测试14"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1150,
+    "name": {
+      "key": "worldtask_world_all_name_25",
+      "text": "日常测试15"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1160,
+    "name": {
+      "key": "worldtask_world_all_name_26",
+      "text": "日常测试16"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1170,
+    "name": {
+      "key": "worldtask_world_all_name_27",
+      "text": "日常测试17"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1180,
+    "name": {
+      "key": "worldtask_world_all_name_28",
+      "text": "日常测试18"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1190,
+    "name": {
+      "key": "worldtask_world_all_name_29",
+      "text": "日常测试19"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1200,
+    "name": {
+      "key": "worldtask_world_all_name_30",
+      "text": "日常测试20"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1210,
+    "name": {
+      "key": "worldtask_world_all_name_31",
+      "text": "日常测试21"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1220,
+    "name": {
+      "key": "worldtask_world_all_name_32",
+      "text": "日常测试22"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1230,
+    "name": {
+      "key": "worldtask_world_all_name_33",
+      "text": "日常测试23"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1240,
+    "name": {
+      "key": "worldtask_world_all_name_34",
+      "text": "日常测试24"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1250,
+    "name": {
+      "key": "worldtask_world_all_name_35",
+      "text": "日常测试25"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
+  },
+  {
+    "id": 1260,
+    "name": {
+      "key": "worldtask_world_all_name_36",
+      "text": "日常测试26"
+    },
+    "task_icon": "",
+    "task_txt": {
+      "key": "",
+      "text": ""
+    },
+    "reword": []
   }
 ]

modules/guildgve/api_challengefinish.go

@@ -18,6 +18,7 @@ func (this *apiComp) ChallengeFinishCheck(session comm.IUserSession, req *pb.Gui
 // 获取工会boos战信息
 func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGveChallengeFinishReq) (errdata *pb.ErrorData) {
 	var (
+		user   *pb.DBUser
 		conf   *cfg.GameGuildBossData
 		member *pb.DBGuildMember
 		score  *cfg.GameGuildBossScoreData
@@ -63,11 +64,18 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ReqParameterError,
 			Title:   pb.ErrorCode_ReqParameterError.ToString(),
-			Message: fmt.Sprintf("Boosticket is ", member.Boosticket),
+			Message: fmt.Sprintf("Boosticket is %d", member.Boosticket),
+		}
+		return
+	}
+	if user = this.module.ModuleUser.GetUser(session.GetUserId()); user != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Title:   pb.ErrorCode_DBError.ToString(),
+			Message: "no found user data!",
 		}
 		return
 	}
-
 	lock, _ := this.module.modelGuildGve.userlock(req.Guildid)
 	err = lock.Lock()
 	if err != nil {
@@ -92,9 +100,16 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
 
 				record := &pb.DBGveRecord{
 					User: &pb.DBSimpleUser{
-						Uid: session.GetUserId(),
+						Uid:      session.GetUserId(),
+						Nickname: user.Name,
+						Skin:     user.CurSkin,
+						Sex:      user.Gender,
+						Lv:       user.Lv,
 					},
 					Formation: make([]*pb.DBSimpleHero, 0),
+					Time:      configure.Now().Unix(),
+					Rating:    score.Id,
+					Harm:      req.Report.Harm,
 				}
 				for i, v := range req.Report.Info.Redflist[0].Team {
 					if int32(i) == req.Report.Info.Redflist[0].Leadpos && v != nil {