英雄最大等级限制

bin/json/game_worldtask.json

@@ -4581,11 +4581,11 @@
       "key": "worldtask_world_task_npctxt_122",
       "text": "商队任务1-任意1装备+3"
     },
-    "npc": 500010,
+    "npc": 50010,
     "completetask": [
       15000001
     ],
-    "deliver_npc": 500018,
+    "deliver_npc": 50018,
     "auto_accept": 0,
     "reword": [
       {
@@ -4617,11 +4617,11 @@
       "key": "worldtask_world_task_npctxt_123",
       "text": "商队任务1-任意2装备+3"
     },
-    "npc": 500020,
+    "npc": 50020,
     "completetask": [
       15000002
     ],
-    "deliver_npc": 500028,
+    "deliver_npc": 50028,
     "auto_accept": 0,
     "reword": [
       {
@@ -4653,11 +4653,11 @@
       "key": "worldtask_world_task_npctxt_124",
       "text": "商队任务1-任意3装备+3"
     },
-    "npc": 500030,
+    "npc": 50030,
     "completetask": [
       15000003
     ],
-    "deliver_npc": 500038,
+    "deliver_npc": 50038,
     "auto_accept": 0,
     "reword": [
       {
@@ -4689,11 +4689,11 @@
       "key": "worldtask_world_task_npctxt_125",
       "text": "商队任务2-维京远征2次"
     },
-    "npc": 500040,
+    "npc": 50040,
     "completetask": [
       15000004
     ],
-    "deliver_npc": 500048,
+    "deliver_npc": 50048,
     "auto_accept": 0,
     "reword": [
       {
@@ -4725,11 +4725,11 @@
       "key": "worldtask_world_task_npctxt_126",
       "text": "商队任务3-维京远征4次"
     },
-    "npc": 500050,
+    "npc": 50050,
     "completetask": [
       15000005
     ],
-    "deliver_npc": 500058,
+    "deliver_npc": 50058,
     "auto_accept": 0,
     "reword": [
       {

modules/caravan/api_getstory.go

@@ -67,7 +67,7 @@ func (this *apiComp) GetStory(session comm.IUserSession, req *pb.CaravanGetStory
 		update["task"] = list.Taskid
 		update["tasktime"] = list.Tasktime
 	}
-	this.configure.GetAllEquipmentConfigure()
+
 	this.module.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update)
 
 	resp.Data = list

modules/hero/model_hero.go

@@ -467,6 +467,15 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex
 	preLv = curLv
 	var maxLv int32 // 校验等级达到上限
 	maxLv = this.module.configure.GetHeroMaxLv(hero.Star)
+	// 校验玩家等级
+	if _user := this.module.ModuleUser.GetUser(session.GetUserId()); _user != nil {
+		if expConf := this.module.configure.GetPlayerlvConf(_user.Lv); expConf == nil {
+			if maxLv > expConf.HeroLv {
+				maxLv = expConf.HeroLv // 英雄最大等级限制
+			}
+		}
+	}
+
 	_data := this.module.configure.GetHeroLv(curLv)
 	if _data != nil {
 		var maxExp int32