Merge branch 'cn/develop' into cn/publish/preview

熊润斐
2 parents 889380fd 3dd204eb
Showing 4 changed files with 10 additions and 7 deletions Show diff stats
src/models/Daily.lua
src/services/pvpd.lua
src/shared/ModelBaseMysql.lua
src/utils/MysqlUtil.lua
@@ -33,6 +33,7 @@ Daily.schema = {
 	curPool 		= {"number", 0},		-- 属性卡池当前索引
 	drawHeroCnt		= {"number", 0},		-- 每日抽卡次数
+	treasureBase	= {"number", 0}, 		-- 资源值
 	treasureList 	= {"table", {}}, 		--挂机图鉴
 }
@@ -64,6 +65,8 @@ function Daily:refreshDailyData(notify)
 			if self:getProperty(field) > 0 then
 				dataMap[field] = 0
 			end
+		elseif field == "id" then
+            -- skip
 		elseif field == "treasureList" then
 			dataMap[field] = self:getTreasrueList()
 		elseif field ~= "key" then
@@ -142,8 +145,6 @@ function Daily:checkTreasureExpired(treasureAttr, treasureList)
 				end
 				curInfo = clone(treasureAttr)
 			end
-		else
-			curInfo = clone(treasureAttr)
 		end
 	else
 		curInfo = clone(treasureAttr)
@@ -303,7 +304,7 @@ end
 function Daily:buyTreasure(treasureList)
 	local boughtTreasurer = {}
-	local treasureBase = globalCsv.idle_treasure_base
+	local treasureBase = self:getProperty("treasureBase")
 	for id, val in pairs(treasureList) do
 		treasureBase = treasureBase - val.treasure_value
 		if treasureBase < 0 then
@@ -313,7 +314,7 @@ function Daily:buyTreasure(treasureList)
 			boughtTreasurer[id] = val
 		end
 	end
-	--self:updateProperty({field = "treasureBase", value = treasureBase})
+	self:updateProperty({field = "treasureBase", value = treasureBase})
 	return boughtTreasurer
 end
@@ -340,6 +341,7 @@ function Daily:getTreasrueList()
 	self:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
 	self:updateProperty({field = "treasureList", value = treasureList})
+	self:updateProperty({field = "treasureBase", value = treasureBase})
 	return treasureList
 end
 skynet = require "skynet"
 local json = require("shared.json")
 redisproxy = require("shared.redisproxy")
+mysqlproxy = require("shared.mysqlproxy")
 local cluster = require "skynet.cluster"
 local serverId = tonumber(skynet.getenv("servId"))
 datacenter = require "skynet.datacenter"
@@ -503,8 +503,8 @@ function ModelBaseMysql:updateFields(fields)
         sql = string_format(sql, tbName, table.concat(tmp, ","), self.pri_key, self:getKey())
         local res = mysqlproxy:query(sql)
         if res["errno"] then
-            skynet.error(sql)
-            skynet.error(res["err"])
+            skynet.error("error sql:"..sql)
+            skynet.error("error str:"..res["err"])
             return false
         end
     end
@@ -57,7 +57,7 @@ function roleExists(roleId)
 end
 function roleUidExists(uid)
-    local res = mysqlproxy:query(string.format("SELECT `name` FROM `Role` WHERE `uid` = %s", uid))
+    local res = mysqlproxy:query(string.format("SELECT `name` FROM `Role` WHERE `uid` = '%s'", uid))
     if res["errno"] or not next(res) then
         return false
     end