Merge branch 'bugfix' into tr/publish

熊润斐
2 parents 0da2b316 9e91460a
Showing 2 changed files with 20 additions and 12 deletions Show diff stats
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -508,9 +508,10 @@ local MethodType = {
 		mission_id	= true, --关卡ID
 		mission_herolist = true, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
 		mission_success_rate = true, -- 大成功几率
-		mission_reward = true, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_reward = "json", -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
 		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-失败)
 		mission_roundtime = true, -- 完成耗时（秒）
+		mission_cleartype = true, -- 1-开始; 2-完成(领取奖励时）
 	},
 	hero_talent = { --英雄精进（原英雄天赋升级）  TODO
 		hero_id = true, --英雄ID
@@ -542,20 +543,26 @@ local function isIos(self)
 	return sid == 2
 end
  
-local appid, sdkId
+local sdkId
+local AppId = {
+	[1] = 4787,
+	[2] = 4788,
+	[3] = 4789,
+}
 local function getBaseLog(self)
 	local uid = self:getProperty("uid")
-	if not appid then
-		appid, sdkId = string.match(uid, "(.*)_(.*)")
-		if not appid then
+	local sid = self:getProperty("sid")
+	if not sdkId then
+		_, sdkId = string.match(uid, "(.*)_(.*)")
+		if not _ then
 			sdkId = uid
-			appid = 0
 		end
 	end
+
 	local log = {
 		server_id = server_id,
 		timestamp = skynet.timex(),
-		app_id = appid,
+		app_id = AppId[sid] or 0,
 		plat_id = isIos(self) and 0 or 1,
 		sdk_uid = sdkId,
 		account_id = uid,
@@ -356,13 +356,14 @@ function RolePlugin.bind(Role)
 			if not self:costDiamond(pms) then
 				return
 			end
-			itemCountT[ItemId.Diamond] = nil
 		end
 		for itemId, count in pairs(itemCountT) do
-			pms.itemId = itemId
-			pms.count = - count
-			self:addItem(pms)
-			self:itemDeltaEvent(pms)
+			if itemId ~= ItemId.Diamond then
+				pms.itemId = itemId
+				pms.count = - count
+				self:addItem(pms)
+				self:itemDeltaEvent(pms)
+			end
 		end
 		return true
 	end