Merge branch 'master' into feng/equip

gaofengduan
2 parents 1c24ba6e b96f8839
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
src/actions/CarAction.lua
src/models/Hero.lua
@@ -28,8 +28,8 @@ function _M.makePotionRpc( agent, data )
 	end
 	local cost = potionData.material:toNumMap()
-	for _, n in pairs(cost) do
-		n = n * count
+	for k, n in pairs(cost) do
+		cost[k] = n * count
 	end
 	if not role:checkItemEnough(cost) then
 		return 5
@@ -76,8 +76,8 @@ function _M.equipUpRpc( agent, data )
 	end
 	local cost = equipData.cost:toNumMap()
-	for _, n in pairs(cost) do
-		n = n * count
+	for k, n in pairs(cost) do
+		cost[k] = n * count
 	end
 	if not role:checkItemEnough(cost) then
 		return 4
@@ -8,7 +8,7 @@ Hero.schema = {
 	type 		= {"number", 0},
 	level		= {"number", 1},		-- 等级
 	breakL		= {"number", 0},		-- 突破等级
-	wakeL		= {"number", 0},		-- 觉醒等级
+	wakeL		= {"number", 1},		-- 觉醒等级
 	skillL		= {"string", ""},		-- 技能等级 1=1 2=1 3=1
 	talent		= {"string", ""},		-- 0=阶段 1=1 2=1 3=1 4=1 四个天赋当前阶段的等级  阶段默认为1  等级默认为0
 	battleV		= {"number", 0},		-- 保存战斗力