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

bin/json/game_battleready.json

@@ -1283,33 +1283,5 @@
     "AssistTeam": 0,
     "CanFriendHelp": 0,
     "Numrounds": 0
-  },
-  {
-    "id": 207,
-    "PlayType": 0,
-    "HeroCount": 5,
-    "readyScene": "scenesfight_role_interface_04",
-    "battleScenes": [
-      "scenesfight_08"
-    ],
-    "HideAlienSpace": 0,
-    "ShowBuff": 0,
-    "RuleTips": {
-      "key": "",
-      "text": ""
-    },
-    "battleEvents": [],
-    "ScoreGroupID": 0,
-    "disableAiCamera": 0,
-    "ChoseCamp": [],
-    "DisableCamp": [],
-    "DefaultHero": 720018,
-    "ChoseHero": [],
-    "DisableHero": [],
-    "LockSlots": [],
-    "HeroCheck": [],
-    "AssistTeam": 0,
-    "CanFriendHelp": 0,
-    "Numrounds": 0
   }
 ]

modules/battle/modelBattle.go

@@ -321,6 +321,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
 			Team:    masters,
 		}
 	}
+
 	return
 }
 

modules/warorder/api_buylv.go

@@ -70,6 +70,13 @@ func (this *apiComp) BuyLv(session comm.IUserSession, req *pb.WarorderBuyLvReq)
 		}
 		return
 	}
+
+	need := this.module.ModuleTools.GetGlobalConf().Passcheck4GetLvCos
+	lv := req.Lv - dwarorder.Lv
+	if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: need.A, T: need.T, N: need.N * lv}}, true); errdata != nil {
+		return
+	}
+
 	exp = dwarorder.Exp - expconf.Parameter
 	if dwarorder.Lv >= req.Lv {
 		errdata = &pb.ErrorData{