From cbc6973f91d74d4fb136455821e0513e8b35cae6 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Tue, 28 Apr 2020 17:52:39 +0800
Subject: [PATCH] 天赋bug 日志调整

---
 src/actions/HeroAction.lua  |  3 ++-
 src/actions/StoreAction.lua |  2 +-
 src/models/RoleLog.lua      | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua
index 0cff03a..0ea93d2 100644
--- a/src/actions/HeroAction.lua
+++ b/src/actions/HeroAction.lua
@@ -105,6 +105,7 @@ function _M.talentRpc(agent, data)
 	if not curData then return 4 end
 
 	if index == 0 then
+		if not csvdb["unit_talentCsv"][curStage + 1] then return 11 end
 		--是否进阶
 		local max = true
 		for i = 1, 4 do
@@ -119,7 +120,7 @@ function _M.talentRpc(agent, data)
 				talent = talent:setv(i, 0)
 			end
 		else
-			return 3
+			return 12
 		end
 	else
 		
diff --git a/src/actions/StoreAction.lua b/src/actions/StoreAction.lua
index 6aedb49..e32aadb 100644
--- a/src/actions/StoreAction.lua
+++ b/src/actions/StoreAction.lua
@@ -28,7 +28,7 @@ function _M.rechargeRpc(agent , data)
 	local rmb = dataSet.rmb
 	role:updateProperty({field = "rmbC", delta = rmb})
 	
-	role:log("role_action", {desc = "recharge", int1 = id})
+	role:log("role_action", {desc = "recharge", int1 = id, int2 = rmb})
 
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({diamond = diamondCount}))
 	return true
diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua
index 740b40d..9ed9ea7 100644
--- a/src/models/RoleLog.lua
+++ b/src/models/RoleLog.lua
@@ -36,7 +36,7 @@ local LogType = {
 
 -- 如要修改 要提前修改 _template mapping -- 对应 mapping 为 gamelog-*
 local Mapping = {
-	-- 预留一些数据格式
+	-- 预留一些数据格式  担心integer 范围不够用 将 通用的int* 全部换为long
 	common = {
 		desc = "keyword",--索引的短字符串
 		ucode = "keyword",--关联日志对应ucode
@@ -46,15 +46,15 @@ local Mapping = {
 		text1 = "text",  --长字符串不索引的类型
 		-- 五个不同类型的数字 基本上满足数量要求 尽量从低到高用
 		short1 = "short", 
-		int1 = "integer",
-		int2 = "integer",
+		int1 = "long",
+		int2 = "long",
 		long1 = "long",
 		float1 = "float",
 
 		-- 底层使用的 一些参数
-		cint1 = "integer",
-		cint2 = "integer",
-		cint3 = "integer",
+		cint1 = "long",
+		cint2 = "long",
+		cint3 = "long",
 	}
 }
 
--
libgit2 0.21.2