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

熊润斐
2 parents efabf9d8 54fdf821
Showing 44 changed files with 1808 additions and 424 deletions Show diff stats
config/develop.lua
run.sh
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.lua
src/actions/EmailAction.lua
src/actions/FriendAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/HttpAction.lua
src/actions/PvpAction.lua
src/actions/RoleAction.lua
src/actions/SeaportAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/agent.lua
@@ -16,3 +16,8 @@ redis_host = &quot;127.0.0.1&quot;
 redis_port = 6100
 redis_db = 1
 redis_auth = nil
+
+mysql_host = "127.0.0.1"
+mysql_port = 3306
+mysql_user = "root"
+mysql_password = "123456"
 \ No newline at end of file
@@ -10,10 +10,10 @@ fi
 pid=`cat skynet.pid`
 run=`ps aux | grep skynet | grep -v grep | grep -c $pid`
-if [ $run = 1 ]; then
+if [[ $run = 1 ]]; then
     echo "服务端正在运行"
     exit 0
 fi
 skynet/skynet config/${config}.lua
-echo "服务端启动完毕"
 \ No newline at end of file
+echo "服务端启动完毕"
@@ -27,7 +27,11 @@ STRUCT_VERSION = 3 -- 数据结构版本
 IOS_SID = 4 -- 判断是不是ios设备
 UO_SID = 6 -- 判断是不是联运渠道
+MAX_SVR_ID = 10000
 MAX_ROLE_NUM = 1000000
+MAX_HERO_NUM = 1000000 -- 英雄的id = roleId * MAX_HERO_NUM + index
+MAX_RUNE_NUM = 1000000 -- 铭文的id = roleId * MAX_RUNE_NUM + index
+MAX_SPARK_NUM = 1000000 -- 火花的id = roleId * MAX_SPARK_NUM + index
 -- 属性枚举
 AttsEnum = {
 	hp = 1,				-- 血量
@@ -130,9 +134,10 @@ ItemStartId = {
 ItemId = {
 	Gold = 1,  -- 金币
 	Exp = 2,  -- 经验
-	Diamond = 3,  -- 钻石
+	Jade = 3,  -- 虹光玉
 	PlayerExp = 4,  -- 突破材料
 	FriendPoint = 5,  -- 友情点
+	Diamond = 8,	-- 钻石
 	BreakCost = 10,  -- 突破材料
 	EquipUp = 11, -- 装备升级材料
 	DinerCoin = 12, --后勤物资
@@ -144,6 +149,7 @@ ItemId = {
 	PvpKey = 22, -- pvp钥匙
 	LunchFragment = 23,
 	RuneFragment = 24,
+	RecruitmentCard = 70, -- 招募券
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
 	AdvPower = 4701, -- 拾荒体力
@@ -53,6 +53,8 @@ actionCodes = {
 	Role_accuseRpc = 137,		-- 举报
 	Role_loadSparks = 138,		
 	Role_updateSpark = 139,		-- 更新火花
+	Role_diamondConvertRpc = 140, -- 钻石兑换成别的物品
+	Role_getTimeGiftRpc = 141,
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -125,6 +127,7 @@ actionCodes = {
 	Hang_endWorkBattleRpc = 267,
 	Hang_workBattleInfoRpc = 268,
 	Hang_getWorkRewardRpc = 269,
+	Hang_unlockChapterRpc = 270,
 	Diner_updateProperty = 300,
 	Diner_addSellRpc = 301,
@@ -251,6 +254,7 @@ actionCodes = {
 	Activity_advLevelRpc = 671,
 	Activity_buyBattleCommandLvlRpc = 672,
 	Activity_returnerTaskRpc = 673,
+	Activity_actNewUserTaskRpc = 674,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -320,6 +320,47 @@ function _M.actBattleCommandTaskRpc(agent, data)
 	return true
 end
+function _M.actNewUserTaskRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local taskId = msg.id
+	local calTask = role:getProperty("nbTask") or {}
+	local record = calTask["r"] or {}
+	local flag = record[taskId] or 0
+	if flag == 1 then return 1 end
+	local open, actId = role.activity:isOpen("NewUserTask")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not open then return 2 end
+	if not actData then return 3 end
+
+	local taskList = csvdb["activity_taskCsv"][actData.condition]
+	if not taskList then return 4 end
+	local taskCfg = taskList[taskId]
+	if not taskCfg then return 5 end
+	if taskCfg.key ~= actData.condition then return 6 end
+
+	if (calTask[taskId] or 0) < taskCfg.condition1 then return 7 end
+
+	record[taskId] = 1
+	calTask["r"] = record
+
+	role:updateProperty({field = "nbTask", value = calTask})
+
+	local reward, change = role:award(taskCfg.reward, {log = {desc = "newUserTask"}})
+
+	role:log("activity", {
+		activity_id = taskId, -- 活动ID（或活动指定任务的ID）
+		activity_type = role.activity.ActivityType.NewUserTask, -- 活动类型，见活动类型枚举表
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
+	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
+
+	SendPacket(actionCodes.Activity_actNewUserTaskRpc, MsgPack.pack(role:packReward(reward, change)))
+
+	return true
+end
+
 function _M.exchangeRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -1013,16 +1054,6 @@ function _M.friendHelpRpc(agent, data)
 	local actData = role.activity:getActData("FriendEnergy") or {}
-	local function getIds()
-		local ids = {}
-		local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
-		for i = 1, #friends , 2 do
-			local objId = tonumber(friends[i])
-			ids[objId] = 1
-		end
-		return ids
-	end
-
 	if oper == 1 then -- 赠送好友能量
 		local giveAE = actData.giveAE or {}
 		local objId = msg.roleId
@@ -1032,7 +1063,7 @@ function _M.friendHelpRpc(agent, data)
 		if not objId then
 			return 3
 		end
-		if not redisproxy:hexists(FRIEND_KEY:format(roleId), objId) then
+		if not role.friends[objId] then
 			result = 2
 		end
 		if giveAE[objId] then
@@ -1078,7 +1109,6 @@ function _M.friendHelpRpc(agent, data)
 		local gift2 = gifts[2]
 		local limit = actData.limit or 0
 		local cmd1, cmd2 = 0, 0
-		local ids = getIds()
 		local members = {}
 		local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
@@ -1087,7 +1117,7 @@ function _M.friendHelpRpc(agent, data)
 		end
 		redisproxy:pipelining(function(red)
-			for friendId, _ in pairs(ids) do
+			for friendId, _ in pairs(role.friends) do
 				if not giveAE[friendId] then
 					giveAE[friendId] = 1
 					award[gift1[1]] = (award[gift1[1]] or 0) + gift1[2]
@@ -1153,13 +1183,12 @@ function _M.friendHelpRpc(agent, data)
 	local ids = {}
 	local members = {}
-	local friendIds = getIds()
 	local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
 	for _, id in pairs(temp) do
 		members[tonumber(id)] = 1
 	end
-	for id, _ in pairs(friendIds) do
+	for id, _ in pairs(role.friends) do
 		if members[id] then
 			ids[id] = 1
 		end
@@ -1294,8 +1323,8 @@ function _M.buyBattleCommandLvlRpc(agent, data)
 	end
 	if cost == 0 then return 5 end
-	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 6 end
-	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
+	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 6 end
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
 	actData["lvl"] = nextLvl
 	role.activity:updateActData("BattleCommand", actData)
@@ -381,8 +381,8 @@ function _M.quickHangRpc(agent, data)
 	local cost = math.ceil((info.time - skynet.timex()) / 3600 * globalCsv.adv_idle_quicken)
-	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return end
-	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "advQuickHang", int1 = chapterId}})
+	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return end
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "advQuickHang", int1 = chapterId}})
 	info.time = 0
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
@@ -494,6 +494,7 @@ function _M.endHangRpc(agent, data)
 	role:checkTaskEnter("AdvHang", {})
 	role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt})
+	role:checkTaskEnter("AdvHangTime", {count = math.ceil(adv_idle_time / 3600)})
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
 	return true
@@ -508,10 +509,10 @@ function _M.buyAdvCountRpc(agent , data)
 	local cost
 	if isEl then
 		if math.illegalNum(count, 1, globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC")) then return end
-		cost = {[ItemId.Diamond] = count * globalCsv.adv_endless_daily_buy_cost}
+		cost = {[ItemId.Jade] = count * globalCsv.adv_endless_daily_buy_cost}
 	else
 		if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
-		cost = {[ItemId.Diamond] = count * globalCsv.adv_daily_buy_cost}
+		cost = {[ItemId.Jade] = count * globalCsv.adv_daily_buy_cost}
 	end
@@ -1029,8 +1030,8 @@ function _M.refreshSupportRpc(agent, data)
 	if cr < al then  --免费
 		role.dailyData:updateProperty({field = "advSupRe", delta = 1})
 	else -- 付费
-		if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}) then return end
-		role:costItems({[ItemId.Diamond] = globalCsv.adv_support_refresh_cost}, {log = {desc = "advReSupport"}})
+		if not role:checkItemEnough({[ItemId.Jade] = globalCsv.adv_support_refresh_cost}) then return end
+		role:costItems({[ItemId.Jade] = globalCsv.adv_support_refresh_cost}, {log = {desc = "advReSupport"}})
 	end
 	role:advRandomSupportEffect()
@@ -13,9 +13,28 @@ function _M.makePotionRpc( agent, data )
 	local count = msg.count
 	if count < 1 then return 0 end
 	local potionBag = role:getProperty("potionBag")
-	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 1)
+	local dishTree = role.dinerData:getProperty("dishTree")
+	local potionLv = dishTree:getv(potionId, 1)
 	if potionLv < 1 then return 1 end
+	local talentSet = csvdb["diner_talentCsv"][potionId]
+	if not talentSet then
+		return 10
+	end
+
+	local talentData = talentSet[potionLv]
+	if not talentData then
+		return 11
+	end
+	local limit = talentData.pointFront:toNumMap()
+	for k,v in pairs(limit) do
+		local lv = dishTree:getv(k, 0)
+		if lv < v then
+			return 12
+		end
+	end
+
+
 	local potionSet = csvdb["adv_potionCsv"][potionId]
 	if not potionSet then return 2 end
@@ -253,7 +253,7 @@ function _M.expediteSellRpc( agent, data )
 	end
 	local diamond = globalCsv.diner_sell_quick_cost[count]
 	if diamond > 0 then
-		local cost = {[ItemId.Diamond] = diamond}
+		local cost = {[ItemId.Jade] = diamond}
 		if not role:checkItemEnough(cost) then
 			return 2
 		end
@@ -612,7 +612,7 @@ function _M.refreshTaskRpc( agent, data )
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
-	--local cost = {[ItemId.Diamond] = 40}
+	--local cost = {[ItemId.Jade] = 40}
 	--if not role:checkItemEnough(cost) then
 	--	return 1
 	--end
@@ -709,6 +709,20 @@ function _M.addWantFoodRpc(agent , data)
 		local foodData = csvdb["diner_materialCsv"][itemId]
 		if not foodData then return 3 end
 		if foodData.unlock ~= 0 then
+			-- 遍历adv_potion 
+			for potionId, _ in pairs(csvdb["adv_potionCsv"]) do
+				local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
+				if potionLv < 1 then return 4 end
+
+				local potionSet = csvdb["adv_potionCsv"][potionId]
+				if not potionSet then return 5 end
+
+				local potionData = potionSet[potionLv]
+				if not potionData then return 6 end
+
+				local cost = potionData.material:toNumMap()
+				if not cost[itemId] then return 7 end
+			end
 			if not role:checkHangPass(foodData.unlock) then
 				return 4
 			end
@@ -3,22 +3,32 @@ local tarr2tab = table.array2Table
 local function loadEmails(roleId)
 	local emails = {}
-	local rds = string.format(R_EMAIL, roleId)
-	local ids = redisproxy:lrange(rds, 0, EMAIL_LIMIT - 1)
-	local redret = redisproxy:pipelining(function (red)
-		for _, id in ipairs(ids) do
-			red:hgetall(string.format("email:%d:%s", roleId, id))
-		end
-	end)
-	for index, id in ipairs(ids) do
-		local email = require("models.Email").new({key = string.format("email:%d:%s", roleId, id)})
-		if email:load(tarr2tab(redret[index])) then
+	local res = mysqlproxy:query(string.format("SELECT * FROM `Email` WHERE `roleId` = %s", roleId))
+	for _, data in ipairs(res) do
+		local email = require("models.Email").new({key = string.format("%d",data.id), id=data.id})
+		if email:load(data) then
 			table.insert(emails, email)
 		end
 	end
 	return emails
 end
+local function delExpireEmails(roleId)
+	local sql = [[
+		DELETE FROM Email
+		WHERE id IN (
+			SELECT id FROM (
+			  SELECT id
+			  FROM Email WHERE roleId=%s
+			  ORDER BY createtime DESC, id desc
+			  LIMIT %s, 100000
+			) a
+		);
+	]]
+	sql = string.format(sql, roleId, EMAIL_LIMIT)
+	mysqlproxy:query(sql)
+end
+
 function _M.listRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
@@ -51,7 +61,7 @@ function _M.listRpc(agent, data)
 			if flag and ( not email.mid or tonum(email.mid) == mid ) 
 				and ( not email.endtime or tonum(email.endtime) > now )then
 				local time = math.max(tonum(email.timestamp, 0) , tonum(email.createtime))
-				redisproxy:insertEmail({
+				mysqlproxy:insertEmail({
 					roleId = roleId, 
 					emailId = 0,
 					createtime = time,
@@ -64,6 +74,7 @@ function _M.listRpc(agent, data)
 			end
 		end
 	end
+	delExpireEmails(roleId)
 	local emails = loadEmails(roleId)
 	for _, email in ipairs(emails) do
@@ -100,7 +111,7 @@ function _M.drawAllAttachRpc(agent, data)
 	for _, email in ipairs(emails) do
 		local attachments = getEmailAttachments(email)
 		if attachments ~= "" then
-			email:setProperty("status", 2)
+			email:setProperty("status", 2, true)
 			email:log(role, 2)
 			ids[email:getProperty("id")] = 1
 			for key, v in pairs(attachments:toNumMap()) do
@@ -120,16 +131,15 @@ function _M.drawAttachRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
-	local rds = string.format(R_EMAIL_ITEM, roleId, id)
-	local email = require("models.Email").new({key = rds})
+	local email = require("models.Email").new({key = string.format("%d", id), id = id})
 	if not email:load() then return end
 	local attachments = getEmailAttachments(email)
 	if attachments == "" then return end
 	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = id}})
-	email:setProperty("status", 2)
+	email:setProperty("status", 2, true)
 	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
 	role:mylog("mail_action", {desc = "draw_attach", int1 = id, key1 = email:getProperty("title"), key2 = attachments})
@@ -143,11 +153,10 @@ function _M.checkRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
-	local emailRds = string.format("email:%d:%s", roleId, id)
-	local email = require("models.Email").new({key = emailRds})
+	local email = require("models.Email").new({key = string.format("%d", id), id = id})
 	if not email:load() then return end
-	email:setProperty("status", 1)
+	email:setProperty("status", 1, true)
 	email:log(role, 1)
 	role:mylog("mail_action", {desc = "check_mail", int1 = id})
@@ -158,33 +167,21 @@ end
 function _M.delRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
-
-	local rds = string.format(R_EMAIL, roleId)
-	local ids = redisproxy:lrange(rds, 0, EMAIL_LIMIT - 1)
-	local now = skynet.timex()
 	local result = {}
-	local emailSet = csvdb["emailCsv"]
-
-	redisproxy:pipelining(function (red)
-		for _, id in ipairs(ids) do
-			local emailRds = string.format("email:%d:%s", roleId, id)
-			local email = require("models.Email").new({key = emailRds})
-			if email:load() then
-				local status = email:getProperty("status")
-				local attachments = email:getProperty("attachments")
-				local emailData = emailSet[email:getProperty("emailId")]
-				if emailData and attachments:len() == 0 then
-					attachments = emailData.attachment
-				end
-				if status == 2 or (status == 1 and attachments:len() == 0) then
-					email:log(role, 3)
-					red:lrem(rds, 0, id)
-					red:del(emailRds)
-					result[tonum(id)] = 1
-				end
-			end
+	local tmp = {}
+	local emails = loadEmails(roleId)
+	for _, email in ipairs(emails) do
+		local attachments = getEmailAttachments(email)
+
+		if email:getProperty("status") == 2 or (attachments == "" and email:getProperty("status") == 1) then
+			result[email:getProperty("id")] = 1
+			email:log(role, 3)
+			table.insert(tmp, email:getProperty("id"))
 		end
-	end)
+	end
+
+	mysqlproxy:query(string.format("DELETE FROM `Email` WHERE `id` in (%s)", table.concat(tmp, ",")))
+
 	for delId, _ in ipairs(result) do
 		role:mylog("mail_action", {desc = "del_mail", int1 = delId})
 	end
@@ -11,6 +11,7 @@ local table_unpack = table.unpack
 local table_find = table.find
 local table_nums = table.nums
 local math_random = math.randomInt
+require "utils.MysqlUtil"
 local _M = {}
@@ -23,12 +24,6 @@ local function formatArray(tb)
 	return t
 end
-local function checkFriendLimit(roleId)
-	roleId = tonumber(roleId)
-	local count = redisproxy:hlen(FRIEND_KEY:format(roleId))
-	return count < globalCsv.friendListLimit
-end
-
 local function addAndCheckApplyLimit(roleId, objId)
 	roleId = tonumber(roleId)
@@ -78,7 +73,7 @@ function _M.searchRpc(agent, data)
 	local objIds = {}
 	local tempId = tonumber(key)
 	if tempId then
-		if redisproxy:exists(string_format("role:%d", tempId)) then
+		if roleExists(tempId) then
 			objIds[tempId] = 1
 		end
 	end
@@ -92,13 +87,13 @@ function _M.searchRpc(agent, data)
 	for objId, _ in pairs(objIds) do
 		local online, info = getRoleInfo(objId)
 		local redret = redisproxy:pipelining(function (red)
-			red:hexists(FRIEND_KEY:format(roleId), objId)
 			red:zscore(FRIEND_APPLY_KEY:format(objId), roleId)
 			red:sismember(FRIEND_BLACK_KEY:format(roleId), objId)
 		end)
-		local isFriend = redret[1] == 1 and 1 or nil
-		local hadApply = redret[2] and 1 or nil
-		local inBlack = redret[3] == 1 and 1 or nil
+		
+		local isFriend = role.friends[objId] and 1 or nil
+		local hadApply = redret[1] and 1 or nil
+		local inBlack = redret[2] == 1 and 1 or nil
 		table.insert(searchList, table_merge({
 			roleId = objId, 
@@ -123,6 +118,7 @@ function _M.applyRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local objectId = msg.roleId
+	dump(msg)
 	if objectId == roleId then
 		return
@@ -130,44 +126,41 @@ function _M.applyRpc(agent, data)
 	local result = nil
 	local redret = redisproxy:pipelining(function (red)
-		red:exists(string_format("role:%d", objectId))
-		red:hexists(FRIEND_KEY:format(roleId), objectId)
 		red:zscore(FRIEND_APPLY_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
-		red:hlen(FRIEND_KEY:format(roleId))
-		red:hlen(FRIEND_KEY:format(objectId))
 	end)
+	dump(redret)
 	-- 玩家id不存在
-	if not result and redret[1] ~= 1 then
+	if not result and not roleExists(objectId) then
 		result = 1	
 	end
 	-- 已经有这个好友
-	if not result and redret[2] == 1 then
+	if not result and role.friends[objectId] then
 		result = 2
 	end
 	-- 已经申请
-	if not result and redret[3] then
+	if not result and redret[1] then
 		result = 3
 	end
 	-- 对方把你拉黑
-	if not result and redret[4] == 1 then
+	if not result and redret[2] == 1 then
 		result = 4
 	end
 	-- 你把对方拉黑了
-	if not result and redret[5] == 1 then
+	if not result and redret[3] == 1 then
 		result = 5
 	end
 	-- 自己好友已经满
-	if not result and redret[6] >= globalCsv.friendListLimit then
+	if not result and table.numbers(role.friends) >= globalCsv.friendListLimit then
 		result = 6
 	end
 	-- 对方的好友已满
-	if not result and redret[7] >= globalCsv.friendListLimit then
+	if not result and getFriendCount(objectId) >= globalCsv.friendListLimit then
 		result = 7
 	end
@@ -209,29 +202,28 @@ function _M.applyListRpc(agent, data)
 	return true
 end
-local function checkHandleApply(roleId, objectId, needAddNew) 
+local function checkHandleApply(role, objectId, needAddNew) 
 	needAddNew = needAddNew or 0
+	local roleId = role:getProperty("id")
 	local redret = redisproxy:pipelining(function (red)
-		red:hlen(FRIEND_KEY:format(roleId))
-		red:hlen(FRIEND_KEY:format(objectId))
 		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
 	end)
 	--自己好友满了
-	if (redret[1] + needAddNew) >= globalCsv.friendListLimit then
+	if (table.numbers(role.friends) + needAddNew) >= globalCsv.friendListLimit then
 		return 1
 	end
 	-- 对方好友满了
-	if redret[2] >= globalCsv.friendListLimit then
+	if getFriendCount(objectId) >= globalCsv.friendListLimit then
 		return 2
 	end
 	-- 对方把你拉黑
-	if redret[3] == 1 then
+	if redret[1] == 1 then
 		return 3
 	end
 	-- 你把对方拉黑了
-	if redret[4] == 1 then
+	if redret[2] == 1 then
 		return 4
 	end
@@ -255,14 +247,13 @@ function _M.handleApplyRpc(agent, data)
 			return
 		end
 		local curCount
-		result, curCount = checkHandleApply(roleId, objectId)
+		result, curCount = checkHandleApply(role, objectId)
 		if not result then
 			redisproxy:pipelining(function (red)
 				red:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
 				red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
-				red:hsetnx(FRIEND_KEY:format(roleId), objectId, newTag)
-				red:hsetnx(FRIEND_KEY:format(objectId), roleId, newTag)--告知对放有新好友
+				addFriend(roleId, objectId)
 			end)
 			local myInfo = role:friendSInfo()
 			myInfo.online = true
@@ -310,7 +301,7 @@ function _M.handleApplyRpc(agent, data)
 		local needAddInfo = {}
 		for _, objId in ipairs(allIds) do
 			objId = tonumber(objId)
-			local cr, curCount = checkHandleApply(roleId, objId, #needAdd)
+			local cr, curCount = checkHandleApply(role, objId, #needAdd)
 			if not cr then 
 				table.insert(needAdd, objId)
 				table.insert(needAddMy, objId)
@@ -335,12 +326,9 @@ function _M.handleApplyRpc(agent, data)
 				red:ZREM(FRIEND_APPLY_KEY:format(roleId), table_unpack(needAdd))
 				for _, objectId in pairs(needAdd) do
 					red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
-					red:hsetnx(FRIEND_KEY:format(objectId), roleId, newTag)--告知对放有新好友
+					addFriend(roleId, objectId)
 				end
 			end
-			if next(needAddMy) then
-				red:HMSET(FRIEND_KEY:format(roleId), table_unpack(needAddMy))
-			end
 		end)
 		local myInfo = role:friendSInfo()
 		myInfo.roleId = roleId
@@ -373,27 +361,21 @@ function _M.listRpc(agent, data)
 	local friendList = {}
 	local redret = redisproxy:pipelining(function (red)
-		red:hgetall(FRIEND_KEY:format(roleId))
 		red:SMEMBERS(FRIEND_POINT:format(roleId))
 	end)
-	local friends = redret[1]
-	local fpoint = formatArray(redret[2])
+	local fpoint = formatArray(redret[1])
 	local hadGet = role.dailyData:getProperty("getFP")
 	local hadGive = role.dailyData:getProperty("giveFP")
-	local clearRed = {}
-	for i = 1, #friends, 2 do
-		local id = friends[i]
-		local data = friends[i + 1]
-		local friendInfo = MsgPack.unpack(data)
-		id = tonumber(id)
+	local addNew = false 
+	for id, friend in pairs(role.friends) do
 		local online, info = getRoleInfo(id)
 		local roleInfo = {
 			roleId = id, 
 			online = online, 
-			addTime = friendInfo[1], 
-			isNew = friendInfo[2],
+			addTime = friend:getProperty("addTime"), 
+			isNew = friend:getProperty("isNew"),
 			pGive = hadGive[id],
 			pGet = hadGet[id] and -1 or (fpoint[id] and 1 or nil)
 		}
@@ -401,14 +383,12 @@ function _M.listRpc(agent, data)
 		friendList[#friendList + 1] = roleInfo
-		if friendInfo[2] then
-			friendInfo[2] = nil	--清除新好友标记
-			clearRed[#clearRed + 1] = id
-			clearRed[#clearRed + 1] = MsgPack.pack(friendInfo)
+		if roleInfo.isNew then
+			friend:setProperty("isNew", 0)	
+			addNew = true
 		end
 	end
-	if next(clearRed) then
-		redisproxy:hmset(FRIEND_KEY:format(roleId), table_unpack(clearRed))	--清除新好友标记
+	if addNew then
 		role:checkTaskEnter("AddFriend", {count = #friendList})
 	end
@@ -421,14 +401,14 @@ function _M.deleteRpc(agent, data)
 	local roleId = role:getProperty("id")
 	local msg = MsgPack.unpack(data)
 	local objectId = msg.roleId
-	if not redisproxy:exists(string_format("role:%d", objectId)) then
+	if not roleExists(objectId) then
 		return
 	end
 	-- 是否在好友列表中
-	if redisproxy:hexists(FRIEND_KEY:format(roleId), objectId) then
+	if role.friends[objectId] then
+		role.friends[objectId] = nil
 		redisproxy:pipelining(function (red)
-			red:hdel(FRIEND_KEY:format(roleId), objectId)
-			red:hdel(FRIEND_KEY:format(objectId), roleId)
+			delFriend(roleId, objectId)
 			red:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
 			red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
 		end)
@@ -450,7 +430,7 @@ function _M.blockRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local cmd = msg.cmd
 	local objectId = msg.roleId
-	if not redisproxy:exists(string_format("role:%d", objectId)) then
+	if not roleExists(objectId) then
 		return
 	end
@@ -463,8 +443,7 @@ function _M.blockRpc(agent, data)
 		-- 删除好友
 		if not result then
 			redisproxy:pipelining(function (red)
-				red:hdel(FRIEND_KEY:format(roleId), objectId)
-				red:hdel(FRIEND_KEY:format(objectId), roleId)
+				delFriend(roleId, objectId)
 				red:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
 				red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
 				red:sadd(FRIEND_BLACK_KEY:format(roleId), objectId)
@@ -511,19 +490,19 @@ function _M.infoRpc(agent, data)
 	local roleId = role:getProperty("id")
 	local msg = MsgPack.unpack(data)
 	local objectId = msg.roleId
-	if not redisproxy:exists(string_format("role:%d", objectId)) then
+
+	if not roleExists(objectId) then
 		return
 	end
 	local online, info = getRoleAllInfo(objectId)
 	local redret = redisproxy:pipelining(function (red)
-		red:hexists(FRIEND_KEY:format(roleId), objectId)
 		red:zscore(FRIEND_APPLY_KEY:format(objectId), roleId)
 		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
 	end)
-	local isFriend = redret[1] == 1 and 1 or nil
-	local hadApply = redret[2] == 1 and 1 or nil
-	local inBlack = redret[3] == 1 and 1 or nil
+	local isFriend = role.friends[objectId] and 1 or nil
+	local hadApply = redret[1] == 1 and 1 or nil
+	local inBlack = redret[2] == 1 and 1 or nil
 	local objInfo = table_merge({
 		roleId = objectId, 
@@ -551,7 +530,7 @@ function _M.pointRpc(agent, data)
 		if not result and giveP[objId] then 
 			result = 1
 		end
-		if not result and not redisproxy:hexists(FRIEND_KEY:format(roleId), objId) then
+		if not result and not role.friends[objId] then
 			result = 2
 		end
 		if not result then
@@ -586,11 +565,9 @@ function _M.pointRpc(agent, data)
 	elseif cmd == 3 then -- 一键赠送领取
 		-- 赠送
 		local giveP = role.dailyData:getProperty("giveFP")
-		local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
 		local change = 0
 		redisproxy:pipelining(function(red)
-			for i = 1, #friends , 2 do
-				local objId = tonumber(friends[i])
+			for objId, friend in pairs(role.friends) do
 				if not giveP[objId] then
 					giveP[objId] = 1
 					change = change + 1
@@ -645,22 +622,17 @@ function _M.randomRpc(agent, data)
 	local roleId = role:getProperty("id")
 	local redret = redisproxy:pipelining(function (red)
-		red:hgetall(FRIEND_KEY:format(roleId))
 		red:zrevrange(FRIEND_RECOMMEND, 0, globalCsv.friendRecommendLimit + globalCsv.friendListLimit + 10) --扩充10个
 		red:SMEMBERS(FRIEND_BLACK_KEY:format(roleId))
 	end)
-	local friends = {}
-	for i = 1, #redret[1], 2 do
-		friends[tonumber(redret[1][i])] = redret[1][i + 1]
-	end
-	local newList = redret[2]
-	local hadBlack = formatArray(redret[3])
+	local newList = redret[1]
+	local hadBlack = formatArray(redret[2])
 	local needRoleIds = {}
 	for _, newId in pairs(newList) do
 		local numNewId = tonumber(newId)
-		if numNewId ~= roleId and not friends[numNewId] and not hadBlack[numNewId] then
+		if numNewId ~= roleId and not role.friends[numNewId] and not hadBlack[numNewId] then
 			table.insert(needRoleIds, numNewId)
 		end
 	end
@@ -519,7 +519,7 @@ table.insert(helpDes, {&quot;发送邮件&quot;, &quot;email&quot;, &quot;id&quot;, &quot;奖励&quot;})
 function _M.email(role, pms)
 	local id = tonum(pms.pm1, 0)
 	local reward = pms.pm2
-	redisproxy:insertEmail({
+	mysqlproxy:insertEmail({
 		roleId = role:getProperty("id"), 
 		emailId = id,
 		createtime = skynet.timex(),
@@ -22,7 +22,8 @@ local function checkReward(role)
 		return false
 	end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
-	local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+	--local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+	local expCarbonData = hangInfo.expData or {}
 	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
 	local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
@@ -42,9 +43,9 @@ local function checkReward(role)
 	local items = role:getProperty("hangBag")
 	coinCount = (coinCount + coinDoubleCount) * expCoef
-	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * expCarbonData.money)
-	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * expCarbonData.exp)
-	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + coinCount * expCarbonData.playerExp)
+	items[ItemId.Gold] = math.floor((items[ItemId.Gold] or 0) + coinCount * (expCarbonData.money or 0))
+	items[ItemId.Exp] = math.floor((items[ItemId.Exp] or 0) + coinCount * (expCarbonData.exp or 0))
+	items[ItemId.PlayerExp] = math.floor((items[ItemId.PlayerExp] or 0) + (coinCount * expCarbonData.playerExp or 0))
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -137,6 +138,15 @@ function _M.startRpc( agent, data )
 		if not role:checkHangPass(preCarbonId) then return 2 end
 	end
+	local carbonId = msg.carbonId	-- 解锁章节id
+	local condition = globalCsv.idle_chapter_unlock[carbonId]
+	if condition then 
+		local unlockChapter = role:getProperty("unlockChap")
+		if not unlockChapter[carbonId] then
+			return 3 
+		end
+	end
+
 	if checkReward(role) then
 		role:updateProperty({field = "hangBag", value = role:getProperty("hangBag")})
 	end
@@ -144,7 +154,7 @@ function _M.startRpc( agent, data )
 	local hangInfo = role:getProperty("hangInfo")
 	local isNew = not hangInfo.carbonId
 	hangInfo.carbonId = carbonId
-	hangInfo.expCarbonId = isNew and carbonId or hangInfo.expCarbonId
+	--hangInfo.expCarbonId = isNew and carbonId or hangInfo.expCarbonId
 	local nowTime = skynet.timex()
 	if isNew then
 		hangInfo.coinTime = nowTime
@@ -279,15 +289,25 @@ function _M.endBattleRpc(agent, data)
 	local nextCarbonId = role:getNextCarbonId(carbonId)
 	-- 设置挂机关卡
 	if isWin then --and (hangInfo.carbonId or 0) < nextCarbonId then
-		if not hangInfo.expCarbonId then
-			hangInfo.expCarbonId = carbonId
-		else
-			local oldCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
-			local newCarbonData = csvdb["idle_battleCsv"][carbonId]
-			if oldCarbonData.money < newCarbonData.money then
-				hangInfo.expCarbonId = carbonId
-			end
+		local newCarbonData = csvdb["idle_battleCsv"][carbonId]
+		if newCarbonData then
+			local expData = hangInfo.expData or {}
+			expData.exp = (expData.exp or 0) + newCarbonData.exp
+			expData.money = (expData.money or 0) + newCarbonData.money
+			expData.playerExp = (expData.playerExp or 0) + newCarbonData.playerExp
+			hangInfo.expData = expData
 		end
+
+		--if not hangInfo.expCarbonId then
+		--	hangInfo.expCarbonId = carbonId
+		--else
+		--	local oldCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+		--	local newCarbonData = csvdb["idle_battleCsv"][carbonId]
+		--	if oldCarbonData.money < newCarbonData.money then
+		--		hangInfo.expCarbonId = carbonId
+		--	end
+		--end
+
 		--local cfg = csvdb["idle_battleCsv"][nextCarbonId]
 		--if cfg then
 		--	hangInfo.bossTime = skynet.timex() + cfg.idle_time
@@ -418,14 +438,15 @@ function _M.quickRpc(agent , data)
 	local hangInfo = role:getProperty("hangInfo")
 	if not hangInfo.carbonId then return end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
-	local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+	--local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+	local expCarbonData = hangInfo.expData or {}
 	local curCount = role.dailyData:getProperty("hangQC") + 1
 	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
 	if not costs[curCount] then return end
 	if costs[curCount] > 0 then
-		if not role:checkItemEnough({[ItemId.Diamond] = costs[curCount]}) then return end
-		role:costItems({[ItemId.Diamond] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
+		if not role:checkItemEnough({[ItemId.Jade] = costs[curCount]}) then return end
+		role:costItems({[ItemId.Jade] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	end
 	role.dailyData:updateProperty({field = "hangQC", value = curCount})
@@ -435,9 +456,9 @@ function _M.quickRpc(agent , data)
 	local coinCount = math.floor(time / globalCsv.idle_money_produce_cd)
 	local itemCount = math.floor(time / globalCsv.idle_item_produce_cd)
-	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * expCarbonData.money)
-	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * expCarbonData.exp)
-	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * expCarbonData.playerExp)
+	reward[ItemId.Gold] = math.floor((reward[ItemId.Gold] or 0) + coinCount * (expCarbonData.money or 0))
+	reward[ItemId.Exp] = math.floor((reward[ItemId.Exp] or 0) + coinCount * (expCarbonData.exp or 0))
+	reward[ItemId.PlayerExp] = math.floor((reward[ItemId.PlayerExp] or 0) + coinCount * (expCarbonData.playerExp or 0))
 	local pool = {}
 	for _, temp in pairs(carbonData.item:toArray()) do
@@ -502,9 +523,9 @@ function _M.buyBonusCountRpc(agent, data)
 	local lastCount = globalCsv.bonus_daily_buy_count * coef + extraCnt - bonusC[btype]["b"]
 	if math.illegalNum(count, 1, lastCount)  then return 1 end
-	if not role:checkItemEnough({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}) then return 2 end
+	if not role:checkItemEnough({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}) then return 2 end
-	role:costItems({[ItemId.Diamond] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
+	role:costItems({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
 	bonusC[btype]["b"] = bonusC[btype]["b"] + count
 	bonusC[btype]["c"] = bonusC[btype]["c"] - count
@@ -1022,11 +1043,11 @@ function _M.bagFieldRpc(agent, data)
 	if not costD then
 		return 1
 	end
-	if costD ~= 0 and not role:checkItemEnough({[ItemId.Diamond] = costD}) then
+	if costD ~= 0 and not role:checkItemEnough({[ItemId.Jade] = costD}) then
 		return 2
 	end
 	role:updateProperty({field = "hangBagLimit", value = curBL + 1})
-	role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "bagField"}})
+	role:costItems({[ItemId.Jade] = costD}, {log = {desc = "bagField"}})
 	SendPacket(actionCodes.Hang_bagFieldRpc, '')
 	return true
 end
@@ -1080,4 +1101,28 @@ function _M.selectTeamRpc(agent, data)
 	return true
 end
+function _M.unlockChapterRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local carbonId = msg.carbonId	-- 解锁章节id
+	local condition = globalCsv.idle_chapter_unlock[carbonId]
+	if not condition then return 1 end
+	local conditionMap = condition:toArray(true, "=")
+	local count, level = conditionMap[1],conditionMap[2]
+	local cnt = 0
+	for _, hero in pairs(role.heros) do
+		if hero:getProperty("level") >= level then
+			cnt = cnt + 1
+		end
+	end
+	if cnt < count then return 2 end
+
+	local unlockChapter = role:getProperty("unlockChap")
+	unlockChapter[carbonId] = 1
+	role:updateProperty({field="unlockChap", value = unlockChapter})
+
+	SendPacket(actionCodes.Hang_unlockChapterRpc, '')
+	return true
+end
+
 return _M
@@ -35,10 +35,18 @@ function _M.levelUpRpc( agent, data )
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
-	if hero:getProperty("level") >= hero:getMaxLevel() then return 2 end
-	local curData = csvdb["unit_expCsv"][hero:getProperty("level")]
+	local level = hero:getProperty("level")
+	if level >= hero:getMaxLevel() then return 2 end
+	local curData = csvdb["unit_expCsv"][level]
 	local cost = {[ItemId.Exp] = curData.exp, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 3 end
+
+	-- 通过指定关卡后才能升级英雄等级
+	local pass = globalCsv.unit_exp_level_pass[level + 1]
+	if pass then
+		if not role:checkHangPass(pass) then return 4 end
+	end
+
 	role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
 	local oldAttr = hero:getTotalAttrs()
@@ -69,12 +77,20 @@ function _M.breakRpc( agent, data )
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
+	local breakL = hero:getProperty("breakL")
 	if hero:getProperty("level") < hero:getMaxLevel() then return 2 end
-	if hero:getProperty("breakL") >= #csvdb["unit_breakCsv"] then return 3 end
-	local curData = csvdb["unit_breakCsv"][hero:getProperty("breakL")]
+	if breakL >= #csvdb["unit_breakCsv"] then return 3 end
+	local curData = csvdb["unit_breakCsv"][breakL]
 	if hero:getProperty("wakeL") < curData["starLimit"] then return 4 end
 	local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 4 end
+
+	-- 通过指定关卡后才能突破英雄
+	local pass = globalCsv.unit_break_level_pass[breakL + 1]
+	if pass then
+		if not role:checkHangPass(pass) then return 4 end
+	end
+
 	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
 	local oldAttr = hero:getTotalAttrs()
 	hero:updateProperty({field = "breakL", delta = 1})
@@ -131,7 +147,7 @@ function _M.wakeRpc(agent, data)
 	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
-	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
+	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel + 1})
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
 	end
@@ -648,11 +664,11 @@ function _M.getResetRewardRpc(agent, data)
 			totalCost[costArr[1]] = costArr[2]
 		else
 			local diamond = (costArr[2] - itemCount) * costArr[3]
-			if role:getItemCount(ItemId.Diamond) < diamond then
+			if role:getItemCount(ItemId.Jade) < diamond then
 				return 1
 			end
 			totalCost[costArr[1]] = itemCount
-			totalCost[ItemId.Diamond] = diamond
+			totalCost[ItemId.Jade] = diamond
 		end
 		--if pay and not role:costDiamond({count = globalCsv.unit_heroBack_cost or 200, log = {desc = "resetHero", int1 = msg.id}}) then
@@ -134,7 +134,37 @@ function _M.gm_action(query)
 		return isOn
 	end
 	-- 离线操作
-	local role = require("models.Role").new({key = string.format("role:%d", query.id)})
+	local role = require("models.Role").new({key = string.format("%d", query.id)})
+	local ret = role:load()
+	if not ret then
+		return "角色不存在"
+	end
+	role:loadAll()
+	role:startActionUcode()
+	local status = gmFuncs[query.cmd](role, query)
+	role:endActionUcode()
+	
+	return status
+end
+
+function _M.pay_action(query)
+	local gmFuncs = require "actions.GmAction"
+	if not query.cmd or not query.order or not gmFuncs[query.cmd] then return "指令不存在" end
+	local mysqlproxy = require "shared.mysqlproxy"
+	local res = mysqlproxy:query(string.format("SELECT roleid FROM `Order` WHERE `id` = %s", query.order))
+	if res[1] then 
+		query.id = res[1]["roleid"]
+	else
+		return "订单非法"
+	end
+	-- 在线操作
+	query.id = tonumber(query.id)
+	local isOn = proc_online(query.cmd, query.id, query)
+	if isOn ~= "not_online" then
+		return isOn
+	end
+	-- 离线操作
+	local role = require("models.Role").new({key = string.format("%d", query.id)})
 	local ret = role:load()
 	if not ret then
 		return "角色不存在"
@@ -241,7 +241,7 @@ function _M.buyCountRpc(agent, data)
 		return 1
 	end
-	local cost = {[ItemId.Diamond] = globalCsv.pvp_buy_cost * count}
+	local cost = {[ItemId.Jade] = globalCsv.pvp_buy_cost * count}
 	if not role:checkItemEnough(cost) then return 2 end
 	role:costItems(cost, {log = {desc = "buyPvpKey"}})
 	role:award({[ItemId.PvpKey] = count}, {log = {desc = "buyPvpKey"}})
@@ -14,6 +14,8 @@ local table_insert = table.insert
 local tconcat = table.concat
 local httpc = require("http.httpc")
+require "utils.MysqlUtil"
+
 local WAVE_HERO_NUMS = 150
 local WAVE_RUNE_NUMS = 150
 local WAVE_SPARK_NUMS = 150
@@ -85,8 +87,8 @@ function _M.loginRpc( agent, data )
 	local role = agent.role
 	-- 2
 	if not role then
-		local roleKey = string_format("role:%d", roleId)
-		if not redisproxy:exists(roleKey) then
+		local roleKey = string_format("%d", roleId)
+		if not roleExists(roleId) then
 			response.result = "DB_ERROR"
 			SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
 			return true
@@ -155,7 +157,7 @@ function _M.loginRpc( agent, data )
 		end
 	end
-	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
+	SERV_OPEN = getDbCfgVal("server_info", "server_start", "str_value")
 	role:changeStructVersion() -- 数据结构 版本更新
 	role:getAdvData(true) -- 清掉不合格的数据
@@ -344,7 +346,8 @@ function _M.createRpc(agent, data)
 	-- 再次检查uid
 	local uid = tostring(msg.uid)
-	local user = redisproxy:get(string_format("uid:%s", uid))
+	--local user = redisproxy:get(string_format("uid:%s", uid))
+	local res, user = roleUidExists(uid)
 	if user then
 		response.result = "SUCCESS"
 		response.roleName = user
@@ -367,7 +370,7 @@ function _M.createRpc(agent, data)
 	end
 	local roleName = setRoleName(msg.uid, roleId)
 	local newRole = require("models.Role").new({
-		key = string_format("role:%d", roleId),
+		key = string_format("%d", roleId),
 		id = roleId,
 		uid = tostring(msg.uid),
 		sid = msg.subId or 0,
@@ -387,6 +390,7 @@ function _M.createRpc(agent, data)
 		SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
 		return true
 	end
+	--newRole:loadRoleIncre()
 	newRole:startActionUcode()
 	newRole.sysVersion = msg.sysVersion
 	newRole.ip = agent.ip:toArray(false, ":")[1]
@@ -395,7 +399,7 @@ function _M.createRpc(agent, data)
 	newRole:award(globalCsv.birthItem, {log = {desc = "birth"}, notNotify = true})
 	-- 欢迎邮件
-	redisproxy:insertEmail({roleId = roleId, emailId = 1})
+	mysqlproxy:insertEmail({roleId = roleId, emailId = 1})
 	if msg.newuser then
 		newRole:log("onCreateAccount")
@@ -405,6 +409,8 @@ function _M.createRpc(agent, data)
 	if msg.newdevice then
 		newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
 	end
+	-- 整体保存一次
+	newRole:update()
 	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
@@ -425,9 +431,9 @@ function _M.createRpc(agent, data)
 						reward = reward:setv(itemId, count)
 					end
 					if back.reward[70] then
-						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward2, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
+						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward2, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
 					else
-						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
+						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
 					end
 					newRole:mylog("cbback", {key1 = uid, int2 = roleId})
 				end
@@ -487,6 +493,7 @@ function _M.changeNameRpc(agent, data)
 	})
 	role:changeCrossServerPvpSelfInfo("name")
+	role:checkTaskEnter("Rename", {})
 	SendPacket(actionCodes.Role_changeNameRpc, MsgPack.pack({result = 0}))
 	return true
 end
@@ -525,14 +532,19 @@ function _M.saleItemRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local backs = msg.backs
-	if not backs then return end
+	if not backs or not next(backs) then return 0 end
+
+	for itemId, count in pairs(backs) do
+		if math.illegalNum(count, 1, role:getItemCount(itemId)) then return 1 end
+		if globalCsv.unit_paster_ban[itemId] then return 2 end
+		local itemData = csvdb["itemCsv"][itemId]
+		if itemData.sell_effect == "" then return 3 end
+	end
 	local reward = {}
 	local fragCount = 0
 	for itemId, count in pairs(backs) do
-		if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 		local itemData = csvdb["itemCsv"][itemId]
-		if itemData.sell_effect == "" then return end
 		if itemData.type == ItemType.HeroFragment or itemData.type == ItemType.HeroFCommon then
 			fragCount = fragCount + count
 		end
@@ -643,8 +655,8 @@ function _M.openTimeBoxRpc(agent, data)
 			stopTime = nowTime + quick
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
 			local costKey = math.ceil(quick / (cost_pre[1] * 60)) * cost_pre[2]
-			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
-			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
+			if not role:checkItemEnough({[ItemId.Jade] = costKey}) then return 5 end
+			role:costItems({[ItemId.Jade] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		else
 			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
 		end
@@ -753,18 +765,14 @@ function _M.openSpeedUpBoxRpc(agent, data)
 		if useType == 1 then -- 挂机齿轮
 			local hangInfo = role:getProperty("hangInfo")
-			if not hangInfo.expCarbonId then
-				return 2
-			end
-			local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
-			reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.money * count
+			local expData = hangInfo.expData or {}
+			--local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+			reward[ItemId.Gold] = (reward[ItemId.Gold] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * (expData.money or 0) * count
 		elseif useType == 2 then -- 挂机经验
 			local hangInfo = role:getProperty("hangInfo")
-			if not hangInfo.expCarbonId then
-				return 3
-			end
-			local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
-			reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * carbonData.exp * count
+			local expData = hangInfo.expData or {}
+			--local carbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
+			reward[ItemId.Exp] = (reward[ItemId.Exp] or 0) + math.floor(time / globalCsv.idle_money_produce_cd) * (expData.exp or 0) * count
 		elseif useType == 3 then  -- 食材商人收入
 			local buildType = 6
 			local level = role.dinerData:getProperty("buildL"):getv(buildType, 1)
@@ -833,8 +841,8 @@ function _M.storyBookRewardRpc(agent, data)
 	role:log("carriage_video", {
 		carriage_video_type = storyBookData.type, --放映室类型，剧情CG:0, 角色CG:1, 主线剧情:2, 角色剧情:3, 活动剧情:4, 图鉴:5
 		carriage_video_id = storyId, --放映室片段ID
-		carriage_video_coinid = reward[ItemId.Diamond] and ItemId.Diamond or 0, --放映奖励货币类型，无奖励则填写0
-		carriage_video_coinnum = reward[ItemId.Diamond] or 0, --放映奖励货币数量，无奖励则填写0
+		carriage_video_coinid = reward[ItemId.Jade] and ItemId.Jade or 0, --放映奖励货币类型，无奖励则填写0
+		carriage_video_coinnum = reward[ItemId.Jade] or 0, --放映奖励货币数量，无奖励则填写0
 		carriage_video_item = reward, --放映奖励其他物品数量，json格式记录，{'itemid1':10,'itemid2':5,…………..}，无奖励则填写0
 	})
@@ -1153,21 +1161,20 @@ function _M.chatRpc(agent, data)
 			local objectId = msg.roleId
 			response.objId = objectId
 			local redret = redisproxy:pipelining(function(red)
-				red:exists(string.format("role:%d", objectId))
 				red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
 				red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
 			end)
-			if redret[1] ~= 1 then
+			if not roleExists(objectId) then
 				result = 1	
 				return
 			end
 			-- 你把对方拉黑拉黑
-			if redret[2] == 1 then
+			if redret[1] == 1 then
 				result = 2
 				return
 			end
 			-- 对方把你拉黑
-			local isBlock = redret[3] == 1
+			local isBlock = redret[2] == 1
 			local bin = MsgPack.pack(response)
 			if not isBlock then
@@ -1402,6 +1409,48 @@ function _M.goldBuyRpc(agent, data)
 	return true
 end
+function _M.diamondConvertRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	
+	local oper = msg.oper
+	if oper ~= 1 and oper ~= 2 then return 0 end
+
+	local cost = math.ceil(msg.cost or 0)
+	if cost <= 0 then return 1 end
+	if role:getAllDiamond() < cost then return 2 end
+
+	local get = globalCsv.legal_tender_cost * cost
+	role:costDiamond({count = cost, log = {desc = "convert", int1 = oper, int2 = get}})
+	local reward, change
+	if oper == 1 then -- 钻石兑换成虹光玉
+		reward, change = role:award({[ItemId.Jade] = get}, {log = {desc = "convert"}})
+	elseif oper == 2 then -- 钻石兑换成虹光玉再兑换成招募券
+		local old = role:getItemCount(ItemId.Jade)
+		get = old + get
+
+		local quan = math.floor(get/globalCsv.recruit_cost)
+		local remain = get - quan * globalCsv.recruit_cost
+
+		local allReward = {}
+		if remain > old then
+			allReward[ItemId.Jade] = remain - old
+		elseif remain == old then
+		else
+			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert"}})
+		end
+
+		if quan > 0 then
+			allReward[ItemId.RecruitmentCard] = quan
+		end
+
+		reward, change = role:award(allReward, {log = {desc = "convert"}})
+	end
+
+	SendPacket(actionCodes.Role_diamondConvertRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 function _M.getDownloadCvRewardRpc(agent, data)
 	local role = agent.role
 	local flag = role:getProperty("downCvR") or 0
@@ -1489,4 +1538,26 @@ function _M.accuseRpc(agent, data)
 	return true
 end
+function _M.getTimeGiftRpc(agent, data)
+	local role = agent.role
+
+	local GiftCsv = csvdb["time_giftCsv"]
+	local timeGift = role:getProperty("timeGift")
+	if timeGift >= #GiftCsv then return 0 end
+
+	local nextL = timeGift + 1
+	local gift = GiftCsv[nextL]
+	if not gift then return 1 end
+
+	local createtime = role:getProperty("ctime")
+	if skynet.timex() - createtime < gift.time then return 2 end
+
+	role:updateProperty({field = "timeGift", value = nextL})
+	local reward, change = role:award(gift.gift, {log = {desc = "giftTime", int1 = nextL}})
+	role:mylog("role_action", {desc = "giftTime", int1 = nextL})
+
+	SendPacket(actionCodes.Role_getTimeGiftRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -198,13 +198,13 @@ function _M.taskRpc(agent, data)
 		if quick and remainT > 0 then
 			local cost = math.ceil(remainT / 3600) * globalCsv.seaport_task_quick
-			if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 8 end
-			role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
+			if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 8 end
+			role:costItems({[ItemId.Jade] = cost}, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
 		end
 		local carbonCsv = csvdb["idle_battleCsv"]
-		local expCarbonId = role:getProperty("hangInfo").expCarbonId
-		if not carbonCsv[expCarbonId] then return 7 end
+		local expData = role:getProperty("hangInfo").expData or {}
+		--if not carbonCsv[expCarbonId] then return 7 end
 		local totalCoef = 0
 	    for _, heroId in ipairs(collect.team:toArray(true,"=")) do
@@ -222,8 +222,8 @@ function _M.taskRpc(agent, data)
 	        bigSuccess = true
 	    end
-		local money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
-		local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.exp_clear)
+		local money = math.ceil((expData.money or 0) / 5 * data.time * data.money_clear)
+		local exp = math.ceil((expData.exp or 0) / 5 * data.time * data.exp_clear)
 		local itemReward = data.item_clear_special:toNumMap()
 		itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
     	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
@@ -20,7 +20,6 @@ function _M.rechargeRpc(agent , data)
 	end
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
-
 	-- 测试的 直接发奖励了
 	skynet.timeout(10, function ()
 		role:handlePurchase({
@@ -107,8 +107,13 @@ function _M.endBattleRpc(agent, data)
 		--排行榜
 		role:setTowerRank(curLevel % 10000, towerType + 1)
+		local rewardStr = curTower.reward
+		if curTower.special_award ~= "" then
+			rewardStr = rewardStr .. " " .. curTower.special_award
+		end
+
 		curLevel = curLevel + 1
-		reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
+		reward, change = role:award(rewardStr, {log = {desc = "towerBattle", int1 = id}})
 		if towerType == 0 then
 			role:checkTaskEnter("TowerPass", {level = towerInfo.l})
 		end
@@ -12,6 +12,7 @@ local xxtea = require &quot;xxtea&quot;
 skynet = require "skynet"
 redisproxy = require "shared.redisproxy"
+mysqlproxy = require "shared.mysqlproxy"
 datacenter = require "skynet.datacenter"
 mcast_util = require "services/mcast_util"
 csvdb = require "shared.csvdata"
@@ -21,6 +21,17 @@ skynet.start(function()
 		})
 	end
+	-- 启动mysql
+	for i = 1, work_count do
+		local redisd = skynet.newservice("services/mysqld", i)
+		skynet.call(redisd, "lua", "open", {
+			host = skynet.getenv("mysql_host"),
+			port = tonumber(skynet.getenv("mysql_port")),
+			user = skynet.getenv("mysql_user"),
+			pwd = skynet.getenv("mysql_password"),
+		})
+	end
+
 	--启动log
 	if use_logd == 1 then
 		for i = 1, work_count * 2 do
-local Activity = class("Activity", require("shared.ModelBase"))
+local Activity = class("Activity", require("shared.ModelBaseMysql"))
 local string_format = string.format
 -- activity_ctr showType
@@ -39,6 +39,7 @@ Activity.ActivityType = {
 	HeroBackFree = 37, -- 无损耗归还
 	BattleCommandTask = 38, -- 战令任务活动
+	NewUserTask = 41,		-- 新用户任务
 }
 local function checkActivityType(activityType)
@@ -64,6 +65,7 @@ end
 Activity.schema = {
+	id 			= {"number", 0, "pri"},		-- 角色id
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
 	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
@@ -640,6 +642,110 @@ activityFunc[Activity.ActivityType.Exchange] = {
 	end,
 }
+-- 新用户活动任务 
+activityFunc[Activity.ActivityType.NewUserTask] = {
+	["init"] = function(self, actType, isCrossDay, notify)
+		local nbTask = self.owner:getProperty("nbTask")
+		nbTask = {}
+		self.owner:updateProperty({field="nbTask", value=nbTask})
+		local role = self.owner
+		local buildL = role.dinerData:getProperty("buildL")
+		local curLevel = buildL:getv(1, 1)
+		role:checkTaskEnter("DinerLevelUp", {level = curLevel})
+
+		role:checkTaskEnter("HeroLvlCollect", {})
+		role:checkTaskEnter("HeroQualityCollect", {})
+
+		local curPopular = role.dinerData:getProperty("popular")
+		role:checkTaskEnter("DinerPopular", {count = curPopular})
+
+		local rLevel = role:getProperty("level")
+		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
+
+		local towerInfo = role:getProperty("towerInfo")
+		role:checkTaskEnter("TowerPass", {count = towerInfo.l, type = 1})
+		--"PvpWin"
+		--role:checkTaskEnter("HangPass", {id = 0})
+		role:checkCalendaTask(true, 15, 3)
+		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("RuneQualityCollect", {})
+
+	end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actData = self.owner:getProperty("nbTask") or {}
+		local record = actData["r"] or {}
+		local actCfg = csvdb["activity_taskCsv"][actId]
+		if not actCfg then return end
+		local change = false
+		for taskId, cfg in pairs(actCfg) do
+			if cfg["resetType"] == 1 then 	-- 每日重置
+				record[taskId] = nil
+				actData[taskId] = nil
+				change = true
+			end
+		end
+		if change then
+			self.owner:updateProperty({field="nbTask", value=actData})
+		end
+	end,
+	["crossWeek"] = function(self, actType, notify, actId)
+		local actData = self.owner:getProperty("nbTask") or {}
+		local record = actData["r"] or {}
+		local actCfg = csvdb["activity_taskCsv"][actId]
+		if not actCfg then return end
+		local change = false
+		for taskId, cfg in pairs(actCfg) do
+			if cfg["resetType"] == 2 then 	-- 每周重置
+				record[taskId] = nil
+				actData[taskId] = nil
+				change = true
+			end
+		end
+		if change then
+			self.owner:updateProperty({field="nbTask", value=actData})
+		end
+	end,
+	["close"] = function(self, actType, notify)
+		self.owner:updateProperty({field="nbTask", value={}})
+	end,
+}
+
+-- 兑换
+activityFunc[Activity.ActivityType.Exchange] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		local actData = self:getActData(actType) or {}
+		actData[actId] = {}
+		self:updateActData(actType, actData, not notify)
+	end,
+	["login"] = function(self, actType, actId)
+		activityFunc[Activity.ActivityType.Exchange]["crossDay"](self, actType, true, actId)
+	end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType) or {}
+		local lastTs = actData["ts"] or 0
+		local timeNow = skynet.timex()
+		local cfg = csvdb["activity_ctrlCsv"][actId]
+		if not cfg then return end
+		local refreshTimes = cfg.condition2:toArray(false, "=")
+		for i = 1, #refreshTimes do
+			local rt = toUnixtime(refreshTimes[i]..string_format("%02x", RESET_TIME))
+			if timeNow >= rt and rt > lastTs then
+				lastTs = rt
+				actData = {}
+			end
+		end
+		if not next(actData) then
+			actData["ts"] = timeNow
+			self:updateActData(actType, actData, not notify)
+		end
+	end,
+	["close"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType) or {}
+		actData[actId] = nil
+		self:updateActData(actType, actData, not notify)
+	end,
+}
+
 -- 扭蛋机
 activityFunc[Activity.ActivityType.Gachakon] = {
 	["init"] = function(self, actType, isCrossDay, notify, actId)
@@ -942,17 +1048,11 @@ activityFunc[Activity.ActivityType.FriendEnergy] = {
 function Activity:getActFriendNew()
 	local roleId = self.owner:getProperty("id")
-	local friendIds = {}
-	local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
-	for i = 1, #friends , 2 do
-		local objId = tonumber(friends[i])
-		friendIds[objId] = 1
-	end
 	local ids = {}
 	local members = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
 	for _, id in pairs(members) do
-		if friendIds[tonumber(id)] then
+		if self.owner.friends[tonumber(id)] then
 			ids[tonumber(id)] = 1
 		end
 	end
@@ -986,7 +1086,7 @@ activityFunc[Activity.ActivityType.Crisis] = {
 							status = -1
 						end
-						self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+						self.owner:award(reward, {log = {desc = "activityCrisis"}, notNotify = not notify})
 					end
 					actData.task[id] = status
 					change = true
 -- 日常数据
-local Daily = class("Daily", require("shared.ModelBase"))
+local Daily = class("Daily", require("shared.ModelBaseMysql"))
 function Daily:ctor(properties)
 	Daily.super.ctor(self, properties)
 end
 Daily.schema = {
-	commentHero		= {"string", ""},		-- 单日评论食灵记录 type=1
+	id 				= {"number", 0, "pri"},		-- 角色id
+	commentHero		= {"string", "", "blob"},		-- 单日评论食灵记录 type=1
 	hangQC			= {"number", 0},		-- 挂机快速次数
 	dinerQC			= {"number", 0},		-- 贩卖加速次数
 	advElC			= {"number", 0},		-- 无尽次数（消耗体力）
-local Diner = class("Diner", require("shared.ModelBase"))
+local Diner = class("Diner", require("shared.ModelBaseMysql"))
 function Diner:ctor(properties)
 	Diner.super.ctor(self, properties)
 end
 Diner.schema = {
+	id 		= {"number", 0, "pri"},		-- 角色id
 	buildL 	= {"string", ""},			-- 家具等级 1=1 2=1 3=1
-	order 	= {"string", "[]"},			-- 特殊订单
-	sells 	= {"string", "[]"},			-- 贩卖位置
-	dishTree	= {"string", "1=1 101=1 201=1"},		-- 料理天赋
-	skillTree	= {"string", ""},		-- 支援天赋
+	order 	= {"string", "[]", "blob"},			-- 特殊订单
+	sells 	= {"string", "[]", "blob"},			-- 贩卖位置
+	dishTree	= {"string", "1=1 101=1 201=1", "blob"},		-- 料理天赋
+	skillTree	= {"string", "", "blob"},		-- 支援天赋
 	popular = {"number",0},          	-- 累计人气
 	expedite = {"number",1},         	--每日加速次数
 	gfood = {"table", {}},			-- 愿望食材 {{id = 123, st = 1232144},}
-local Email = class("Email", require("shared.ModelBase"))
+local Email = class("Email", require("shared.ModelBaseMysql"))
 function Email:ctor(properties)
 	Email.super.ctor(self, properties)
 end
 Email.schema = {
-    key     	= {"string"}, 	-- redis key
-    id 			= {"number", 0},	-- 数据库ID
+    id 			= {"number", 0, "pri_auto"},	-- 数据库ID
+    roleId		= {"number", 0, "index"},	-- 角色 ID
     emailId		= {"number", 0},	-- 邮件csv ID
     title 		= {"string", ""},	-- 邮件标题
     stitle		= {"string", ""}, 	-- 小标题
     content 	= {"string", ""},	-- 邮件正文
-    attachments	= {"string", ""},
+    attachments	= {"string", "", 512},
     status		= {"number", 0},	-- 邮件状态: 未读, 已读, 已领取
     createtime	= {"number", skynet.timex()},
     contentPms	= {"table", {}},
@@ -0,0 +1,15 @@
+local Friend = class("Friend", require("shared.ModelBaseMysql"))
+
+function Friend:ctor(properties)
+    Friend.super.ctor(self, properties)
+end
+
+Friend.schema = {
+    id          = {"number", 0, "pri_auto"},
+    roleid      = {"number", 0, "index"},
+    fid         = {"number", 0, "index"},
+    isNew       = {"number", 1},
+    addTime     = {"number", skynet.timex()},
+}
+
+return Friend
 \ No newline at end of file
-local Hero = class("Hero", require("shared.ModelBase"))
+local Hero = class("Hero", require("shared.ModelBaseMysql"))
 local HeroPlugin = import(".HeroPlugin")
 HeroPlugin.bind(Hero)
 Hero.schema = {
-	id 			= {"number"},
+	id 			= {"number", 0, "pri"},
+	roleid 		= {"number", 0, "index"},
 	type 		= {"number", 0},
 	level		= {"number", 1},		-- 等级
 	breakL		= {"number", 0},		-- 突破等级
@@ -37,9 +38,13 @@ function Hero:notifyUpdateProperty(field, newValue, oldValue)
 	self:notifyUpdateProperties(datas)
 end
+function Hero:getSimpleHeroId()
+	return self:getProperty("id") % (self:getProperty("roleid") * MAX_HERO_NUM)
+end
+
 function Hero:notifyUpdateProperties(params)
 	local updateData = {
-		id = self:getProperty("id"),
+		id = self:getSimpleHeroId(),
 		datas = params
 	}
 	SendPacket(actionCodes.Hero_updateProperty, MsgPack.pack(updateData))
-local Order = class("Order", require("shared.ModelBase"))
+local Order = class("Order", require("shared.ModelBaseMysql"))
 function Order:ctor(properties)
-	Order.super.ctor(self, properties)
+    Order.super.ctor(self, properties)
 end
 Order.schema = {
-    key     	= {"string"},       -- redis key
-    order 		= {"string"},      	-- 自己订单号
+	id 			= {"number", 0, "pri"}, -- 自己的订单号
+	roleid 		= {"number", 0, "index"},
+    --order 		= {"string"},      	-- 自己订单号
     rechargeId  = {"number", 0},
     transactionId = {"string", ""},
     createTime  = {"number", skynet.timex()},       -- 订单创建时间
-local Role = class("Role", require("shared.ModelBase"))
+local Role = class("Role", require("shared.ModelBaseMysql"))
 local RoleLog = import(".RoleLog")  --日志相关
 local RolePlugin = import(".RolePlugin")  --基础功能
@@ -25,6 +25,7 @@ function Role:ctor( properties )
 	self.storeData = nil
 	self.heros = {}
 	self.runeBag = {}
+	self.friends = {}
 	self.sparkBag = {}
 	self.advData = nil
 	self.activity = nil
@@ -41,11 +42,12 @@ function Role:ctor( properties )
 	self.sendMailFlag = false		--发送邮件标识
 end
+-- type, default value, key type, length
 Role.schema = {
-	id 					= {"number"},
+	id 					= {"number", 0, "pri"},
 	uid 				= {"string", ""},
 	name 				= {"string", ""},
-	intro				= {"string", ""},
+	intro				= {"string", "", "", 1024},
 	headId				= {"number", globalCsv.defaultHead},
 	sid 				= {"number", 0},
 	device 				= {"string", ""},
@@ -60,27 +62,29 @@ Role.schema = {
 	ignoreMt			= {"number", 0},  -- 忽略维护拦截
 	sversion			= {"number", STRUCT_VERSION or 0}, -- 重整数据版本
 	timeReset			= {"table", {}}, --重置轮回记录
+	jade				= {"number", 0}, -- 虹光玉
 	diamond				= {"number", 0}, -- 免费钻
 	reDiamond			= {"number", 0}, -- android充值钻
 	reDiamondIos		= {"number", 0}, -- ios充值钻
 	setting				= {"table", {}}, --设置
-	codeStr				= {"string", ""}, --已经领过的礼包码
+	codeStr				= {"string", "", "blob"}, --已经领过的礼包码
 	-- roleInfo
 	level 				= {"number", 1},
 	exp 				= {"number", 0},
-	items				= {"string", ""},
+	items				= {"string", "", "blob"},
 	expireItem			= {"table", {}}, --物品过期检查
 	funcOpen			= {"table", {}}, --功能是否开放
 	funcLv				= {"table", {}}, --功能等级
 	-- loveStatus			= {"string", ""}, --统计角色的最高 好感度等级 类型相关 -- type=loveL type=loveL
 	crown				= {"number", 0},	-- 看伴娘
 	silent				= {"number", 0}, --禁言解禁时间
+	timeGift 			= {"number", 0}, -- 创建角色时间礼包
 	bagLimit 			= {"table", globalCsv.store_limit_max},
 	--冒险相关
 	advPass				= {"table", {}}, -- 通关记录  {chapterId = layer}
-	advItems			= {"string", ""}, -- 冒险临时背包
+	advItems			= {"string", "", "blob"}, -- 冒险临时背包
 	advInfo				= {"table", {}}, -- 冒险关卡信息 
 	advTeam				= {"table", {}}, -- 冒险玩家队伍信息
 	advHang				= {"table", {}}, -- 挂机信息  -- {chapterId = {format = teaminfo, time = endtime}}
@@ -124,8 +128,8 @@ Role.schema = {
 	workBattle 			= {"table", {}},	-- 夜间玩法记录 {[1] = 1, [2] = 1, [3] = 1,  [4] = 1, round = 10} -- 第N天打了多少次 round 轮次
 	--引导相关
-	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
-	funcGuide 			= {"string",""}, -- 功能引导 0=0跳过次数(999永久跳过) 1=1功能1触发情况
+	newerGuide 			= {"string","1=1", "", 10}, -- 新手引导 master=slave
+	funcGuide 			= {"string","", "blob"}, -- 功能引导 0=0跳过次数(999永久跳过) 1=1功能1触发情况
 	pvpTC				= {"table", {}},		-- pvp 编队普通
 	pvpTSC				= {"table", {}},		-- pvp 他人可读的队伍信息
@@ -189,13 +193,18 @@ Role.schema = {
 	downCvR				= {"number", 0}, -- 下载cv扩展包奖励 
 	feedback			= {"table", {}}, -- 反馈相关信息  {flag = false, count = 0} 	flag是否评论过，count 提示次数
-	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
+	calTask				= {"table", {}}, -- 英雄帖活动 日历任务活动
 	bcTask				= {"table", {}}, -- 英雄令活动 日历任务活动 临时使用
+	nbTask				= {"table", {}}, -- 新用户活动
 	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
 	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}}
 	returner			= {"table", {}}, -- 回归者 {time = 12334233423, [1] = 1, [2] = 2, status = {[1] = 1}}
+
+	roleIncre			= {"table", {}},  -- 角色英雄，铭文，火花自增序列 {heroId = 1, runeId = 1, sparkId = 1}
+
+	unlockChap			= {"table", {}},	-- 解锁的章节
 }
@@ -345,6 +354,7 @@ function Role:data()
 		diamond = self:getAllDiamond(),
 		bagLimit = self:getProperty("bagLimit"),
 		silent = self:getProperty("silent"),
+		timeGift = self:getProperty("timeGift"),
 		advPass = self:getProperty("advPass"),
 		advInfo = self:getProperty("advInfo"),
@@ -427,10 +437,13 @@ function Role:data()
 		ctime = self:getProperty("ctime"),
 		calTask = self:getProperty("calTask"),
 		bcTask = self:getProperty("bcTask"),
+		nbTask = self:getProperty("nbTask"),
 		radioTask = self:getProperty("radioTask"),
 		seaport = self:getProperty("seaport"),
 		returner = self:getProperty("returner"),
+
+		unlockChap	= self:getProperty("unlockChap"),	-- 解锁的章节
 	}
 end
@@ -24,6 +24,20 @@ RoleCross.bind = function (Role)
 		return info
 	end
+	function Role:addFriend(friendId)
+		local res = mysqlproxy:query(string.format("SELECT * FROM `Friend` WHERE `roleid` = %s AND `fid` = %s;", self:getProperty("id"), friendId))
+		for _, data in ipairs(res) do
+			local friend = require("models.Friend").new({key = string.format("%d",data.id), id = data.id})
+			if friend:load(data) then
+				self.friends[friend:getProperty("fid")] = friend
+			end
+		end
+	end
+
+	function Role:delFriend(friendId)
+		self.friends[friendId] = nil
+	end
+
 	-- 好友队伍战斗信息
 	function Role:friendBattleInfo()
 		return self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTBC") or self:getProperty("hangTB")
@@ -231,33 +245,30 @@ local function getRoleKey(roleId)
 end
 function CMD.setProperty(roleId, field, value)
-	local value = packRoleField(field, value) 
-	if not value then return end
-	return redisproxy:hset(getRoleKey(roleId), field, value)
+	local tb = {}
+	tb[field] = value
+	return CMD.setProperties(roleId, tb)
 end
 function CMD.setProperties(roleId, fields)
-	local result = {}
-	for k,v in pairs(fields) do
-		local value = packRoleField(k, v)
-		if value then
-			result[#result + 1] = k
-			result[#result + 1] = value
-		end
-	end
-	return redisproxy:hmset(getRoleKey(roleId), table.unpack(result))
+	local role = require("models.Role").new({key = string.format("%s",roleId), id = roleId})
+	return role:updateFields(fields)
 end
 function CMD.getProperty(roleId, field)
-	return unpackRoleField(field ,redisproxy:hget(getRoleKey(roleId), field))
+	local ret = CMD.getProperties(roleId, {field})
+	return ret[field]
 end
 function CMD.getProperties(roleId, fields)
-	local returnValue = redisproxy:hmget(getRoleKey(roleId), table.unpack(fields))
+	local role = require("models.Role").new({key = string.format("%s",roleId), id = roleId})
 	local ret = {}
-	for index, key in ipairs(fields) do
-		ret[key] = unpackRoleField(key, returnValue[index])
+	local datas = role:loadFields(fields)
+	if datas then
+		for index, key in ipairs(fields) do
+			ret[key] = unpackRoleField(key, datas[key])
+		end
 	end
 	return ret
 end
@@ -0,0 +1,21 @@
+local RoleIncre = class("RoleIncre", require("shared.ModelBaseMysql"))
+
+function RoleIncre:ctor( properties )
+	RoleIncre.super.ctor(self, properties)
+end
+
+
+RoleIncre.schema = {
+	id 					= {"number", 0, "pri"},
+	heroId             = {"number", 0},
+	runeId             = {"number", 0},
+	sparkId            = {"number", 0},
+}
+
+function RoleIncre:increBy(keyName, val)
+    local curId = self:getProperty(keyName)
+    self:setProperty(keyName, curId + val)
+    return curId + val
+end
+
+return RoleIncre
 \ No newline at end of file
@@ -59,7 +59,9 @@ local ItemReason = {
 	advLevelStage = 143, -- 拾荒活动阶段奖励
 	towerBnous = 144, -- 爬塔到一定层数对某些功能的奖励
 	unknowShop = 145, -- 未知商店
-
+	convert = 146, -- 钻石兑换其他物品
+	giftTime = 147, -- 创角后的时间礼包
+	activityCrisis = 148, -- 物资危机奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -103,6 +105,7 @@ local ItemReason = {
 	calendaTask = 1009,	-- 英雄帖
 	actMilecrisis = 1010, -- 物资危机
 	battleCommandTask = 1011,	-- 将军令任务
+	newUserTask = 1012,	-- 新玩家任务
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -15,6 +15,8 @@ function RolePlugin.bind(Role)
 		self:loadDiner()
 		self:loadActivity()
 		self:loadStoreInfo()
+		--self:loadRoleIncre()
+		self:loadFriends()
 		self:loadSparks()
 	end
@@ -250,7 +252,7 @@ function RolePlugin.bind(Role)
 								local headData = csvdb["player_iconCsv"][itemId]
 								-- pvp 跨服竞技场奖励
 								if headData and headData.path == 2 then
-									redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
+									mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
 								end
 							end
 						end
@@ -459,7 +461,8 @@ function RolePlugin.bind(Role)
 	function Role:getAllDiamond()
 		local diamond = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
-		return self:getProperty("diamond") + diamond
+		--return self:getProperty("diamond") + diamond
+		return diamond
 	end
 	function Role:gainDiamond(params)
@@ -468,18 +471,18 @@ function RolePlugin.bind(Role)
 		if isnan(count) then
 			return false
 		end
-		local origind = self:getProperty("diamond")
+		local origind = 0 -- self:getProperty("diamond")
 		local originr = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
 		local origin = origind + originr
-		if params.isRecharge then
+		--if params.isRecharge then
 			if params.sid == IOS_SID then
 				self:incrProperty("reDiamondIos", count)
 			else
 				self:incrProperty("reDiamond", count)
 			end
-		else
-			self:incrProperty("diamond", count)
-		end
+		--else
+			--self:incrProperty("diamond", count)
+		--end
 		self:logItems(ItemId.Diamond, origin, count, params.log)
 		if params.log then
@@ -508,7 +511,7 @@ function RolePlugin.bind(Role)
 			return false
 		end
 		local isIos = self:getProperty("sid") == IOS_SID
-		local origind = self:getProperty("diamond")
+		local origind = 0 -- self:getProperty("diamond")
 		local originr = isIos and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
 		local origin = origind + originr
@@ -518,18 +521,20 @@ function RolePlugin.bind(Role)
 		if origin < count then
 			return false
 		end
-		local last = count
-		local costFirst = isIos and {"diamond", "reDiamondIos"} or {"diamond", "reDiamond"}
-		if params.isRecharge then
-			costFirst = isIos and {"reDiamondIos", "diamond"} or {"reDiamond", "diamond"}
-		end
-		last  = math.max(last - self:getProperty(costFirst[1]), 0)
-		if last < count then
-			self:incrProperty(costFirst[1], last - count)
-		end
-		if last > 0 then
-			self:incrProperty(costFirst[2], -last)
-		end
+		local diamondKey = isIos and "reDiamondIos" or "reDiamond"
+		self:incrProperty(diamondKey, -count)
+		--local last = count
+		--local costFirst = isIos and {"diamond", "reDiamondIos"} or {"diamond", "reDiamond"}
+		--if params.isRecharge then
+		--	costFirst = isIos and {"reDiamondIos", "diamond"} or {"reDiamond", "diamond"}
+		--end
+		--last  = math.max(last - self:getProperty(costFirst[1]), 0)
+		--if last < count then
+		--	self:incrProperty(costFirst[1], last - count)
+		--end
+		--if last > 0 then
+		--	self:incrProperty(costFirst[2], -last)
+		--end
 		self:logItems(ItemId.Diamond, origin, count, params.log)
@@ -551,6 +556,14 @@ function RolePlugin.bind(Role)
 		return true
 	end
+	function Role:increBy(field, val)
+		local roleIncre = self:getProperty("roleIncre")
+		local curId = roleIncre[field] or 0
+		roleIncre[field] = curId + val
+		self:setProperty("roleIncre", roleIncre)
+		return curId + val
+	end
+
 	function Role:addHero(params)
 		local roleId = self:getProperty("id")
 		local heroType = params.type
@@ -558,13 +571,12 @@ function RolePlugin.bind(Role)
 		local unitData = csvdb["unitCsv"][heroType] 
 		if not unitData then return false end
-		local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
-
-		redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
+		local heroId = self:increBy("heroId" , 1)
 		local heroInfo = {
-			key = string.format(R_HERO, roleId, heroId),
-			id 	= heroId,
+			key = string.format("%d",roleId * MAX_HERO_NUM + heroId),
+			id 	= roleId * MAX_HERO_NUM + heroId,
+			roleid = roleId,
 			type= heroType,
 			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
 		}
@@ -627,27 +639,33 @@ function RolePlugin.bind(Role)
 	function Role:loadHeros()
 		local roleId = self:getProperty("id")
-		local heroIds = redisproxy:smembers(string.format(R_HEROS, roleId))
-		local redret = redisproxy:pipelining(function (red)
-			for _, heroId in ipairs(heroIds) do
-				red:hgetall(string.format(R_HERO, roleId, heroId))
-			end
-		end)
-		for index, heroId in ipairs(heroIds) do
-			local hero = require("models.Hero").new({key = string.format(R_HERO, roleId, heroId)})
-			if hero:load(table.array2Table(redret[index])) then
+		local res = mysqlproxy:query(string.format("SELECT * FROM `Hero` WHERE `roleid` = %s", roleId))
+		for _, data in ipairs(res) do
+			local hero = require("models.Hero").new({key = string.format("%d",data.id), id=data.id})
+			if hero:load(data) then
 				hero.owner = self
-				self.heros[tonumber(heroId)] = hero
+				self.heros[hero:getSimpleHeroId()] = hero
+			end
+		end
+	end
+
+	function Role:loadFriends()
+		local roleId = self:getProperty("id")
+		local res = mysqlproxy:query(string.format("SELECT * FROM `Friend` WHERE `roleid` = %s", roleId))
+		for _, data in ipairs(res) do
+			local friend = require("models.Friend").new({key = string.format("%d",data.id), id = data.id})
+			if friend:load(data) then
+				self.friends[friend:getProperty("fid")] = friend
 			end
 		end
 	end
 	function Role:loadDaily()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_DAILY, roleId)
-		self.dailyData = require("models.Daily").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.dailyData = require("models.Daily").new({key = dataKey, id = roleId})
 		self.dailyData.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.dailyData:checkKeyExists(dataKey) then
 			self.dailyData:create()
 		else
 			self.dailyData:load()
@@ -656,10 +674,10 @@ function RolePlugin.bind(Role)
 	function Role:loadActivity()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_ACTIVITY, roleId)
-		self.activity = require("models.Activity").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.activity = require("models.Activity").new({key = dataKey, id = roleId})
 		self.activity.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.activity:checkKeyExists(dataKey) then
 			self.activity:create()
 		else
 			self.activity:load()
@@ -668,10 +686,10 @@ function RolePlugin.bind(Role)
 	function Role:loadDiner()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_DINER, roleId)
-		self.dinerData = require("models.Diner").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.dinerData = require("models.Diner").new({key = dataKey, id = roleId})
 		self.dinerData.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.dinerData:checkKeyExists(dataKey) then
 			self.dinerData:create()
 		else
 			self.dinerData:load()
@@ -685,16 +703,28 @@ function RolePlugin.bind(Role)
 	function Role:loadStoreInfo()
 		local roleId = self:getProperty("id")
-		local dataKey = string.format(R_STORE, roleId)
-		self.storeData = require("models.Store").new({key = dataKey})
+		local dataKey = string.format("%d", roleId)
+		self.storeData = require("models.Store").new({key = dataKey, id = roleId})
 		self.storeData.owner = self
-		if not redisproxy:exists(dataKey) then
+		if not self.storeData:checkKeyExists(dataKey) then
 			self.storeData:create()
 		else
 			self.storeData:load()
 		end
 	end
+	--function Role:loadRoleIncre()
+	--	local roleId = self:getProperty("id")
+	--	local dataKey = string.format("%d", roleId)
+	--	self.roleIncre = require("models.RoleIncre").new({key = dataKey, id = roleId})
+	--	self.roleIncre.owner = self
+	--	if not self.roleIncre:checkKeyExists(dataKey) then
+	--		self.roleIncre:create()
+	--	else
+	--		self.roleIncre:load()
+	--	end
+	--end
+
 	function Role:addEquip(equipType, equipLv, count, pms)
 		pms = pms or {}
 		if count ~= count then return end
@@ -750,34 +780,24 @@ function RolePlugin.bind(Role)
 	function Role:loadRunes()
 		local roleId = self:getProperty("id")
-		local runeIds = redisproxy:smembers(string.format(R_RUNEIDS, roleId))
-		local redret = redisproxy:pipelining(function (red)
-			for _, runeId in ipairs(runeIds) do
-				red:hgetall(string.format(R_RUNE, roleId, runeId))
-			end
-		end)
-		for index, runeId in ipairs(runeIds) do
-			local rune = require("models.Rune").new({key = string.format(R_RUNE, roleId, runeId)})
-			if rune:load(table.array2Table(redret[index])) then
+		local res = mysqlproxy:query(string.format("SELECT * FROM `Rune` WHERE `roleid` = %s", roleId))
+		for _, data in ipairs(res) do
+			local rune = require("models.Rune").new({key = string.format("%d",data.uid), uid=data.uid})
+			if rune:load(data) then
 				rune.owner = self
-				self.runeBag[tonumber(runeId)] = rune
+				self.runeBag[data.uid] = rune
 			end
 		end
 	end
 	function Role:loadSparks()
 		local roleId = self:getProperty("id")
-		local sparkIds = redisproxy:smembers(string.format(R_SPARKIDS, roleId))
-		local redret = redisproxy:pipelining(function (red)
-			for _, sparkId in ipairs(sparkIds) do
-				red:hgetall(string.format(R_SPARK, roleId, sparkId))
-			end
-		end)
-		for index, sparkId in ipairs(sparkIds) do
-			local spark = require("models.Spark").new({key = string.format(R_SPARK, roleId, sparkId)})
-			if spark:load(table.array2Table(redret[index])) then
+		local res = mysqlproxy:query(string.format("SELECT * FROM `Spark` WHERE `roleid` = %s", roleId))
+		for _, data in ipairs(res) do
+			local spark = require("models.Spark").new({key = string.format("%d",data.id), id=data.id})
+			if spark:load(data) then
 				spark.owner = self
-				self.sparkBag[tonumber(sparkId)] = spark
+				self.sparkBag[data.id] = spark
 			end
 		end
 	end
@@ -791,18 +811,17 @@ function RolePlugin.bind(Role)
 			if not data then return 3 end
 			local roleId = self:getProperty("id")
-			local runeUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "rune", 1))
+			local runeUid = self:increBy("runeId" , 1)
-			redisproxy:sadd(string.format(R_RUNEIDS, roleId), runeUid)
-
-			local heroInfo = {
-				key = string.format(R_RUNE, roleId, runeUid),
-				uid = runeUid,
+			local runeInfo = {
+				key = string.format("%d",roleId * MAX_RUNE_NUM + runeUid),
+				uid = roleId * MAX_RUNE_NUM + runeUid,
+				roleid = roleId,
 				type = params.type,
 				id = params.id,
 			}
-			local newRune = require("models.Rune").new(heroInfo)
+			local newRune = require("models.Rune").new(runeInfo)
 			newRune:create()
 			newRune:generateAttrs()
 			newRune.owner = self
@@ -845,16 +864,14 @@ function RolePlugin.bind(Role)
 			if not data then return 3 end
 			local roleId = self:getProperty("id")
-			local sparkUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "spark", 1))
-
-			redisproxy:sadd(string.format(R_SPARKIDS, roleId), sparkUid)
+			local sparkUid = self:increBy("sparkId" , 1)
 			local sparkInfo = {
-				key = string.format(R_SPARK, roleId, sparkUid),
-				id = sparkUid,
+				key = string.format("%d",roleId * MAX_SPARK_NUM + sparkUid),
+				id = roleId * MAX_SPARK_NUM + sparkUid,
+				roleid = roleId,
 				cfg_id = params.id,
 			}
-
 			local newSpark = require("models.Spark").new(sparkInfo)
 			newSpark:create()
 			newSpark:addAttr(data.attr:toNumMap())
@@ -865,13 +882,14 @@ function RolePlugin.bind(Role)
 				table.insert(response, newSpark:data())
 				SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
 			end
-			--self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
+
+			--self:checkTaskEnter("AddSpark", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
 			self:logItems(params.id, 0, 1, params.log)
 			if params.log then
 				local log = clone(params.log)
 				if log["cint1"] or log["cint2"] or log["cint3"] then
-					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
+					print("addSpark error log have cint1 or cint2 or cint3 ", debug.traceback())
 				end
 				log["cint1"] = sparkUid
@@ -916,12 +934,9 @@ function RolePlugin.bind(Role)
 			end
 		end
-		redisproxy:pipelining(function (red)
-			for _, sparkId in pairs(bDel) do
-				red:del(string.format(R_SPARK, roleId, sparkId))
-				red:srem(string.format(R_SPARKIDS, roleId), sparkId)
-			end
-		end)
+		-- delete spark
+		mysqlproxy:query(string.format("DELETE FROM `Spark` WHERE `id` in (%s)", table.concat(bDel, ",")))
+
 		local response = {}
 		for _, sparkId in pairs(bDel) do
 			table.insert(response, {id = sparkId, bDel = true})
@@ -959,12 +974,9 @@ function RolePlugin.bind(Role)
 			end
 		end
-		redisproxy:pipelining(function (red)
-			for _, runeId in pairs(bDel) do
-				red:del(string.format(R_RUNE, roleId, runeId))
-				red:srem(string.format(R_RUNEIDS, roleId), runeId)
-			end
-		end)
+		-- delete rune
+		mysqlproxy:query(string.format("DELETE FROM `Rune` WHERE `uid` in (%s)", table.concat(bDel, ",")))
+
 		local response = {}
 		for _, runeId in pairs(bDel) do
 			table.insert(response, {uid = runeId, bDel = true})
@@ -1399,7 +1411,7 @@ function RolePlugin.bind(Role)
 				end
 				local carbonCsv = csvdb["idle_battleCsv"]
-				local expCarbonId = self:getProperty("hangInfo").expCarbonId
+				local expData = self:getProperty("hangInfo").expData or {}
 				local taskCsv = csvdb["seaport_taskCsv"]
 				local endTime = openTime0 + 86400 * 2
 				local reward = {}
@@ -1412,7 +1424,7 @@ function RolePlugin.bind(Role)
 						local teams = collect[slot].team
 						local time = collect[slot].time
 						if time + data.time <= endTime then
-							if not carbonCsv[expCarbonId] then break end
+							--if not carbonCsv[expCarbonId] then break end
 							local totalCoef = 0
 						    for _, heroId in ipairs(teams:toArray(true,"=")) do
@@ -1429,8 +1441,8 @@ function RolePlugin.bind(Role)
 						        bigSuccess = true
 						    end
-							local money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
-							local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.exp_clear)
+							local money = math.ceil((expData.money or 0) / 5 * data.time * data.money_clear)
+							local exp = math.ceil((expData.exp or 0) / 5 * data.time * data.exp_clear)
 							local itemReward = data.item_clear_special:toNumMap()
 							itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
 					    	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
@@ -1891,6 +1903,21 @@ function RolePlugin.bind(Role)
 	function Role:onRecoverTimer(now)
 		self:updateTimeReset(now, true)
 		self:checkNewEvent(now)
+		self:saveRoleData()
+	end
+
+	function Role:saveRoleData()
+		self:update()
+		local objs = {self.activity, self.dailyData, self.dinerData, self.storeData, self.roleIncre}
+		for _, info in ipairs(objs) do
+			info:update()
+		end
+		local tbObjs = {self.friends, self.heros, self.runeBag, self.sparkBag}
+		for _, tbObj in ipairs(tbObjs) do
+			for _, info in pairs(tbObj) do
+				info:update()
+			end
+		end
 	end
 	local function breath(sec, name)
@@ -1950,21 +1977,10 @@ function RolePlugin.bind(Role)
 			end
 			local roleId = self:getProperty("id")
-			local email_rds = string.format(R_EMAIL, roleId)
-
-			local emailIds = redisproxy:lrange(email_rds, 0, EMAIL_LIMIT - 1) or {}
-			local redret = redisproxy:pipelining(function (red)
-				for _, id in ipairs(emailIds) do
-					red:hget(string.format(R_EMAIL_ITEM, roleId, id), "status")
-				end
-			end)
+			local res = mysqlproxy:query(string.format("SELECT `id` FROM `Email` WHERE `roleId` = %d AND `status` = 0;", roleId))
 			self.SendMailFlag = false
-			for index, id in ipairs(emailIds) do
-				if tonumber(redret[index]) == 0 then
-					return true
-				end
-			end
+			return next(res)
 		end
 		checks["pvphg"] = function()
@@ -2095,24 +2111,27 @@ function RolePlugin.bind(Role)
 			if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
 		end
-	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
-	    if orderId then
-	    	local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+		local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
+		if orderId then
+			local uid = orderId * MAX_SVR_ID + serverId
+			local orderObject = require("models.Order").new({ key = string.format("%d", uid), id = uid })
 			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
-				return string.format("%d_%d_%d", serverId, roleId, orderId)
+				return string.format("%d", uid)
 			end
-	    end
+		end
 		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
-		local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
+		local uid = orderId * MAX_SVR_ID + serverId
+		local partnerOrderId = string.format("%d", orderId * MAX_SVR_ID + serverId)
 		local orderKey = string.format(R_ORDER, roleId, orderId)
 		redisproxy:del(orderKey) -- 删掉可能有了
 		local order = require("models.Order").new({ 
-			key = orderKey, 
-			order = partnerOrderId, 
+			key = partnerOrderId, 
+			id = tonum(partnerOrderId), 
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
 			transactionId = transactionId,
+			roleid = roleId,
 			sid = self:getProperty("sid"),
 			choose = choose or "",
 		})
@@ -2135,10 +2154,8 @@ function RolePlugin.bind(Role)
 	--]]
 	function Role:updatePurchaseOrder(partnerOrderStr, platformOrder, status)
 		if not partnerOrderStr then return false end
-		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
-
 		local roleId = self:getProperty("id")
-		local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
+		local orderObject = require("models.Order").new({ key = string.format("%d", partnerOrderStr), id = tonum(partnerOrderStr)})
 		if not orderObject:load() then
 			return false
 		end
@@ -2147,6 +2164,14 @@ function RolePlugin.bind(Role)
 		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
 		local sid = orderObject:getProperty("sid")
+		if roleId ~= orderObject:getProperty("roleid") then
+			skynet.error(string.format("[recharge] with a different role id,  current roleId:%d, order role Id:%d, order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
+				roleId, orderObject:getProperty("roleid"),
+				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
+			))
+			return false, "unknow"
+		end
+
 		if orderObject:getProperty("finishTime") > 0 then
 			skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
 				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
@@ -2168,6 +2193,8 @@ function RolePlugin.bind(Role)
 			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
 		end
+		orderObject:update()
+
 		if status ~= "unknow" then
 			self:log("setOrder", {
 				order_status = ({success = 100, finsh = 200, fail = 300})[status] or 1000, -- "订单状态：100 - 开始下单（玩家还未开始付费行为记录）200 - 支付完成并发货（SDK通知可以发货时记录），300 - 订单被取消，1000 - 其他"
@@ -2313,7 +2340,7 @@ function RolePlugin.bind(Role)
 		for k, v in pairs(tgift) do
 			gift = gift .. k.."="..v.." "
 		end
-		redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
+		mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
 		self.sendMailFlag = true
 	end
@@ -60,6 +60,7 @@ local TaskType = {
 	AdvUseItem = 419,			-- 使用道具				- itemId 	count
 	AdvBuild = 420,				-- 建筑交互				- buildId
 	AdvKill = 421,				-- 拾荒击败敌人
+	AdvHangTime = 422,			-- 代理拾荒时间 		- count
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -110,6 +111,7 @@ local TaskType = {
 	WeekTask = 910,				-- 完成每周活跃任务
 	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
 	Appoint = 912, 				-- 触发限时礼包，指定id
+	Rename = 913,				-- 重命名
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -235,6 +237,7 @@ local SudokuListener = {
 		[TaskType.PvpWin] = {{15, 1}},
 		[TaskType.DinerTalentUp] = {{16, f("level"), f("type")}},
 		[TaskType.RuneUp] = {{17, 1}},
+		[TaskType.Rename] = {{20, 1}},
 	}
 }
@@ -253,6 +256,8 @@ local ActivityListener = {
 		[TaskType.AdvCostPower] = {{Activity.ActivityType.Crisis, 3, f("count")}},
 		[TaskType.DailyTask] = {{Activity.ActivityType.CommonSignIn, f("pre"), f("cur")}},
 		[TaskType.AddItem] = {{Activity.ActivityType.BattleCommand, f("id"), f("count")}},
+		[TaskType.AdvHangTime] = {{Activity.ActivityType.Crisis, 4, f("count")}},
+		[TaskType.AdvKillBoss] = {{Activity.ActivityType.Crisis, 5}},
 	}
 }
@@ -321,6 +326,11 @@ local BattleCommandTaskListener = {
 	listen = CalendaTaskListener["listen"]
 }
+local NewUserTaskListener = {
+	func = "checkNewUserTask",
+	listen = CalendaTaskListener["listen"]
+}
+
 local ReturnerTask = {
 	func = "checkReturnerTask",
 	listen = CalendaTaskListener["listen"]
@@ -336,6 +346,7 @@ local TaskListeners = {
 	CalendaTaskListener,
 	BattleCommandTaskListener,
 	ReturnerTask,
+	NewUserTaskListener,
 }
 local RoleTask = {}
@@ -833,6 +844,19 @@ function RoleTask.bind(Role)
 		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
 	end
+	function Role:checkNewUserTask(notNotify, mainType, subType, param1, param2)
+		--print("check new user task", mainType, subType, param1, param2)
+		local actEnum = "NewUserTask"
+		local keyName = "nbTask"
+		if not self.activity then return end
+		local open, actId = self.activity:isOpen(actEnum)
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if not actData then return end
+		if not open then return end
+
+		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
+	end
+
 	function Role:checkReturnerTask(notNotify, mainType, subType, param1, param2)
 		-- print("check returner task", mainType, subType, param1, param2)
 		local returner = self:getProperty("returner") or {}
-local Rune = class("Rune", require("shared.ModelBase"))
+local Rune = class("Rune", require("shared.ModelBaseMysql"))
 Rune.schema = {
-	uid 		= {"number"},      		-- 唯一自增id
+	uid 		= {"number", 0, "pri"},      		-- 唯一自增id
+	roleid 		= {"number", 0, "index"},
 	type 		= {"number"},      		-- 装备位置
 	id 			= {"number"},
 	level		= {"number", 0},		-- 等级
-local Spark = class("Spark", require("shared.ModelBase"))
+local Spark = class("Spark", require("shared.ModelBaseMysql"))
 Spark.schema = {
-	id 		    = {"number"},      		-- 唯一自增id
+	id 		    = {"number", 0, "pri"},      		-- 唯一自增id
+	roleid 		= {"number", 0, "index"},      		-- 唯一自增id
 	cfg_id 		= {"number"},
 	level		= {"number", 0},		-- 等级
 	attrs       = {"table", {}}         -- 基础属性值 id=value
 -- 商店数据
-local Store = class("Store", require("shared.ModelBase"))
+local Store = class("Store", require("shared.ModelBaseMysql"))
 function Store:ctor(properties)
     Store.super.ctor(self, properties)
@@ -33,6 +33,7 @@ ActGoodsType = {
 }
 Store.schema = {
+	id 		= {"number", 0, "pri"},		-- 角色id
 	buyR		= {"table", {}},		-- 购买商品记录 {id=count}
 	payR	= {"table", {}},		-- 充值记录 {id=count}
 	growFund		= {"number", 0},		-- 成长基金
@@ -10,6 +10,7 @@ local logproxy = require &quot;shared.logproxy&quot;
 local pcall = pcall
 local string_format = string.format
+require "utils.MysqlUtil"
 local poold
@@ -236,8 +237,9 @@ function _M:query_agent(fd, uid, isQueue)
 	local response = {}
-	local user = redisproxy:get(string_format("uid:%s", uid))
-	if user then
+	--local user = redisproxy:get(string_format("uid:%s", uid))
+	local res, user = roleUidExists(uid)
+	if res then
 		response.ret = "RET_HAS_EXISTED"
 		response.name = user
 	else
@@ -4,44 +4,250 @@ require &quot;GlobalVar&quot;
 require "RedisKeys"
 require "ProtocolCode"
 require "skynet.manager"
+require "utils.MysqlUtil"
 skynet = require "skynet"
 redisproxy = require("shared.redisproxy")
+mysqlproxy = require "shared.mysqlproxy"
 SendPacket = function ( ... ) end
+local function initSeaportTask()
+	local keys = {[SEAPORT_TRADE_TASK_1] = "seaport_task_1", [SEAPORT_TRADE_TASK_2] = "seaport_task_2"}
+
+	for key, tb_name in pairs(keys) do
+		local res = mysqlproxy:query(string.format("SELECT `id`,`value` FROM %s;", tb_name))
+		for _, v in pairs(res) do
+			redisproxy:hset(key, v.id, v.value)
+		end
+	end
+end
+
 local function initRedisDb( ... )
+	local function initAutoIncrementUid(tbName, keyName, fieldName)
+		if not fieldName then fieldName = "value" end
+		local mysqlVal = getDbCfgVal(tbName, keyName, fieldName)
+		if not mysqlVal then 
+			skynet.error(string.format("get db cfg fail, table %s, key %s, field %s", tbName, keyName, fieldName))
+			return
+		end
+		local redisVal = tonum(redisproxy:hget(tbName, keyName))
+		if redisVal < mysqlVal then
+			redisproxy:hset(tbName, keyName, mysqlVal)
+		end
+	end
+
+	initAutoIncrementUid("autoincrement_set", "role")
+	initAutoIncrementUid("autoincrement_set", "union")
+	initAutoIncrementUid("autoincrement_set", "order")
+	initAutoIncrementUid("autoincrement_set", "email")
+	initAutoIncrementUid("autoincrement_set", "emailTimestamp")
+	initAutoIncrementUid("autoincrement_set", "delay_email")
+	initAutoIncrementUid("autoincrement_set", "stopcreate")
+	initAutoIncrementUid("autoincrement_set", "maintain")
+	initAutoIncrementUid("autoincrement_set", "seaportTime0")
+	initAutoIncrementUid("autoincrement_set", "seaportTime1")
+	initAutoIncrementUid("autoincrement_set", "seaportTime2")
+
+	redisproxy:hsetnx("adv_season", "idx", 0)
+	redisproxy:hsetnx("adv_season", "chapter", globalCsv.adv_endless_default_chapter)
+	redisproxy:hsetnx("adv_season", "overTime", 0)
+end
+
+-- 初始化服务器数据库以及服务器信息表
+local function initServerDatabase()
+	local servId = skynet.getenv("servId")
+	mysqlproxy:query(string.format("CREATE DATABASE IF NOT EXISTS server_%s DEFAULT CHARSET = utf8mb4 COLLATE utf8mb4_general_ci;", servId))
+	mysqlproxy:query(string.format("use server_%s", servId))
+
+	-- 服务器信息表 开服时间
+	mysqlproxy:query [[
+		CREATE TABLE IF NOT EXISTS `server_info` (
+			`key` varchar(45) NOT NULL,
+			`int_value` int(11) DEFAULT NULL,
+			`str_value` varchar(128) DEFAULT NULL,
+			PRIMARY KEY (`key`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+	]]
+
+	local res = mysqlproxy:query("SELECT * FROM `server_info` where `key` = 'server_start';")
+	if not next(res) then
+		mysqlproxy:query(string.format("INSERT INTO `server_info`(`key`, `str_value`) VALUES('server_start', '%s');",
+			os.date("%Y%m%d", skynet.timex())))
+	end
+end
+
+local function initAutoIncreUidTable()
+	mysqlproxy:query [[
+		CREATE TABLE IF NOT EXISTS `autoincrement_set` (
+			`key` varchar(45) NOT NULL,
+			`value` int(11) DEFAULT NULL,
+			PRIMARY KEY (`key`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+	]]
 	local servId = tonumber(skynet.getenv("servId"))
 	if servId then
-		redisproxy:hsetnx("autoincrement_set", "role", servId * MAX_ROLE_NUM)
-		redisproxy:hsetnx("autoincrement_set", "union", servId * MAX_ROLE_NUM)
-		redisproxy:hsetnx("autoincrement_set", "trade", servId * MAX_ROLE_NUM * 100)
-		redisproxy:hsetnx("autoincrement_set", "email", 0)
-		redisproxy:hsetnx("autoincrement_set", "emailTimestamp", 0)
-		redisproxy:hsetnx("autoincrement_set", "delay_email", 0)
-		redisproxy:hsetnx("adv_season", "idx", 0)
-		redisproxy:hsetnx("adv_season", "chapter", globalCsv.adv_endless_default_chapter)
-		redisproxy:hsetnx("adv_season", "overTime", 0)
+		local tpl = "INSERT INTO `autoincrement_set`(`key`, `value`) values('%s', %d)"
+		mysqlproxy:query(string.format(tpl, "role", servId * MAX_ROLE_NUM))
+		mysqlproxy:query(string.format(tpl, "union", servId * MAX_ROLE_NUM))
+		mysqlproxy:query(string.format(tpl, "order", 0))
+		mysqlproxy:query(string.format(tpl, "email", 0))
+		mysqlproxy:query(string.format(tpl, "emailTimestamp", 0))
+		mysqlproxy:query(string.format(tpl, "delay_email", 0))
+		mysqlproxy:query(string.format(tpl, "stopcreate", 0))
+		mysqlproxy:query(string.format(tpl, "maintain", 0))
+		mysqlproxy:query(string.format(tpl, "seaportTime0", 0))
+		mysqlproxy:query(string.format(tpl, "seaportTime1", 0))
+		mysqlproxy:query(string.format(tpl, "seaportTime2", 0))
 	end
 end
+local function initSeaportTable()
+	-- 海港贸易任务
+	mysqlproxy:query [[
+		CREATE TABLE IF NOT EXISTS `seaport_task_1` (
+			`id` int NOT NULL,
+			`value` int(11) DEFAULT 0,
+			PRIMARY KEY (`id`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+	]]
+	mysqlproxy:query [[
+		CREATE TABLE IF NOT EXISTS `seaport_task_2` (
+			`id` int NOT NULL,
+			`value` int(11) DEFAULT 0,
+			PRIMARY KEY (`id`)
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+	]]
+end
+
+local function initAdvSeasonTable()
+	--mysqlproxy:query [[
+	--	CREATE TABLE IF NOT EXISTS `adv_season` (
+	--		`key` varchar(45) NOT NULL,
+	--		`value` int(11) DEFAULT NULL,
+	--		PRIMARY KEY (`key`)
+	--		) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+	--]]
+	--local servId = tonumber(skynet.getenv("servId"))
+	--if servId then
+	--	local tpl = "INSERT INTO `adv_season`(`key`, `value`) values('%s', %d)"
+
+	--	mysqlproxy:query(string.format(tpl, "idx", 0))
+	--	mysqlproxy:query(string.format(tpl, "chapter", globalCsv.adv_endless_default_chapter))
+	--	mysqlproxy:query(string.format(tpl, "overTime", 0))
+	--end
+end
+
+local function checkRoleTables()
+	local list = {"Role", "Daily", "Activity", "Diner", "Store", "Hero", "Rune", "Order", "Email", "Friend", "Spark"}
+	for _, name in ipairs(list) do
+		local obj = require("models."..name).new({key = "key"})
+		print("check table [" .. name .. "] begin.")
+		obj:checkTableSchema()
+		print("check table [" .. name .. "] end.")
+	end
+end
+
+local function createMysqlSp()
+	mysqlproxy:query "DROP PROCEDURE IF EXISTS `add_friends`"
+	mysqlproxy:query [[
+		CREATE PROCEDURE `add_friends`(IN role_id bigint, IN friend_id bigint, IN add_time int)
+		BEGIN
+			DECLARE t_error INTEGER DEFAULT 0;    
+			DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET t_error=1;    
+    
+			START TRANSACTION;    
+				INSERT INTO `Friend`(`roleid`,`fid`,`addTime`) VALUES(role_id, friend_id, add_time);       
+				INSERT INTO `Friend`(`roleid`,`fid`,`addTime`) VALUES(friend_id, role_id, add_time);       
+    
+			IF t_error = 1 THEN    
+				ROLLBACK;    
+			ELSE    
+				COMMIT;    
+			END IF;    
+			select t_error; 
+		END
+	]]
+
+	mysqlproxy:query "DROP PROCEDURE IF EXISTS `del_friends`"
+	mysqlproxy:query [[
+		CREATE PROCEDURE `del_friends`(IN role_id bigint, IN friend_id bigint)
+		BEGIN
+			DECLARE t_error INTEGER DEFAULT 0;    
+			DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET t_error=1;    
+    
+			START TRANSACTION;    
+				DELETE FROM `Friend` WHERE `roleid` = role_id AND `fid` = friend_id;       
+				DELETE FROM `Friend` WHERE `roleid` = friend_id AND `fid` = role_id;       
+    
+			IF t_error = 1 THEN    
+				ROLLBACK;    
+			ELSE    
+				COMMIT;    
+			END IF;    
+			select t_error; 
+		END
+	]]
+end
+
+
 local steps = {
 	[1] = {
-		handler = initRedisDb,
-		desc = "initialize redis database "
-	}
+		handler = initServerDatabase,
+		desc = "initialize server database "
+	},
+	[2] = {
+		handler = initAutoIncreUidTable,
+		desc = "initialize auto_increment_uid table "
+	},
+	[3] = {
+		handler = initAdvSeasonTable,
+		desc = "initialize adv_season table "
+	},
+	[4] = {
+		handler = checkRoleTables,
+		desc = "check role tables "
+	},
+	[5] = {
+		handler = createMysqlSp,
+		desc = "create mysql store procedure "
+	},
+	[6] = {
+		handler = initSeaportTable,
+		desc = "initialize seaport table "
+	},
 }
-skynet.start(function ()
-	redisproxy = require("shared.redisproxy")
-
-	local new = redisproxy:hsetnx("autoincrement_set", "server_start", os.date("%Y%m%d", skynet.timex())) == 1
-	if not new then
-		print("server has been initialized...")
-		skynet.exit()
-		return
+local function loadAllUserInfo()
+	local maxId = 0
+	local sql = "SELECT `id`, `uid`, `name` FROM `Role` WHERE `id` > %d ORDER BY `id` LIMIT 1000;"
+	while true do
+		local res = mysqlproxy:query(string.format(sql, maxId))
+		if not next(res) then
+			return
+		else
+			for _, info in ipairs(res) do
+				if info["id"] > maxId then
+					maxId = info["id"]
+				end
+				redisproxy:pipelining(function (red)
+					local dbName = string.upper(info["name"])
+					red:set(string.format("user:%s", dbName), info["id"])
+					red:set(string.format("uid:%s", info["uid"]), dbName)
+				end)
+			end
+		end
 	end
+end
+
+skynet.start(function ()
+	--local new = redisproxy:hsetnx("autoincrement_set", "server_start", os.date("%Y%m%d", skynet.timex())) == 1
+	--if not new then
+	--	print("server has been initialized...")
+	--	skynet.exit()
+	--	return
+	--end
 	csvdb = require "shared.csvdata"
 	globalCsv = csvdb["GlobalDefineCsv"]
@@ -50,5 +256,8 @@ skynet.start(function ()
 		action.handler()
 		print(action.desc .. "finished ...")
 	end
+	initRedisDb()
+	initSeaportTask()		-- 海港任务数据初始化
+	loadAllUserInfo()
 	skynet.exit()
 end)
 \ No newline at end of file
@@ -2,12 +2,14 @@ local skynet = require &quot;skynet&quot;
 local harbor = require "skynet.harbor"
 local json = require("shared.json")
 local redisproxy = require("shared.redisproxy")
+local mysqlproxy = require("shared.mysqlproxy")
 require "shared.init"
 require "utils.init"
 require "RedisKeys"
 require "skynet.manager"
 require "GlobalVar"
+require "utils.MysqlUtil"
 local ipairs = ipairs
@@ -18,6 +20,7 @@ local string_format = string.format
 local CHECK_MAIL_STATUS_INTERVAL 	= 100 * 60
 local CHECK_BATTLE_ACT_CLOSE_INTERVAL = 100 * 1
+local SAVE_AUTOINCREMENT_SET_INTERVAL = 100 * 2
 local function mailQuene()
 	local delayEmail = tonum(redisproxy:hget("autoincrement_set", "delay_email"))
 	if delayEmail == 0 then
@@ -133,7 +136,7 @@ local function check_battle_act_close()
 					rankIndex = rankIndex + 1
 					for _, cfg in pairs(actData) do
 						if rankIndex <= cfg.rank then
-							redisproxy:insertEmail({
+							mysqlproxy:insertEmail({
 								roleId = roleId,
 								emailId = cfg.email_1,
 								attachments = cfg.reward_1,
@@ -153,6 +156,48 @@ local function check_battle_act_close()
 	skynet.timeout(CHECK_BATTLE_ACT_CLOSE_INTERVAL, check_battle_act_close)
 end
+local function save_autoincrement_timer()
+	local function saveUidToMysql(tbName, keyName, fieldName, ignore)
+		if not fieldName then fieldName = "value" end
+		local mysqlVal = getDbCfgVal(tbName, keyName, fieldName) or 0
+		local redisVal = tonum(redisproxy:hget(tbName, keyName))
+		if (not ignore) and redisVal > mysqlVal then
+			setDbCfgVal(tbName, keyName, fieldName, redisVal)
+		end
+	end
+
+	saveUidToMysql("autoincrement_set", "role")
+	saveUidToMysql("autoincrement_set", "union")
+	saveUidToMysql("autoincrement_set", "order")
+	saveUidToMysql("autoincrement_set", "email")
+	saveUidToMysql("autoincrement_set", "emailTimestamp")
+	saveUidToMysql("autoincrement_set", "delay_email")
+	saveUidToMysql("autoincrement_set", "stopcreate", true)
+	saveUidToMysql("autoincrement_set", "maintain", true)
+	saveUidToMysql("autoincrement_set", "seaportTime0", true)
+	saveUidToMysql("autoincrement_set", "seaportTime1", true)
+	saveUidToMysql("autoincrement_set", "seaportTime2", true)
+
+	skynet.timeout(SAVE_AUTOINCREMENT_SET_INTERVAL, save_autoincrement_timer)
+end
+
+local function save_seaport_task()
+	local keys = {[SEAPORT_TRADE_TASK_1] = "seaport_task_1", [SEAPORT_TRADE_TASK_2] = "seaport_task_2"}
+	local sql = "INSERT INTO `%s` VALUES (%d, %d) ON DUPLICATE KEY UPDATE `value` = %d;"
+	for k, tb_name in pairs(keys) do
+		local data = redisproxy:hgetall(k)
+		if not next(data) then
+			mysqlproxy:query(string_format("DELETE FROM %s;", tb_name))
+		end
+		local infos = tarr2tab(data)
+		for id, value in pairs(infos) do
+			mysqlproxy:query(string_format(sql, tb_name, id, value, value))
+		end
+	end
+
+	skynet.timeout(SAVE_AUTOINCREMENT_SET_INTERVAL, save_seaport_task)
+end
+
 -- @desc: 检查海港贸易开启、关闭
 local function check_trade_seaport_status()
 	local nowTime = skynet.timex()
@@ -286,7 +331,9 @@ function CMD.start()
 	math.randomInit(skynet.timex())
 	check_mail_queue()
 	--check_battle_act_close()
+	save_autoincrement_timer()
 	check_trade_seaport_status()
+	save_seaport_task()
 	check_trade_seaport_donate()
 	check_work_battle()
 end
@@ -0,0 +1,45 @@
+local skynet = require "skynet"
+require "skynet.manager"
+local mysql = require "skynet.db.mysql"
+
+local db
+local idx = ...
+local command = {}
+
+function command.open(conf)
+	local function on_connect(db)
+		local servId = skynet.getenv("servId")
+        db:query("set charset utf8mb4");
+		db:query(string.format("use server_%s", servId))
+	end
+	local servId = skynet.getenv("servId")
+	db=mysql.connect({
+		host=conf.host,
+		port=conf.port,
+		database= "mysql",
+		user=conf.user,
+		password=conf.pwd,
+		max_packet_size = 5 * 1024 * 1024,
+		on_connect = on_connect
+	})
+	if not db then
+		print("failed to connect")
+	end
+end
+
+skynet.start(function()
+	skynet.dispatch("lua", function(session, address, cmd, ...)
+		if cmd == "open" then
+			local f = command[string.lower(cmd)]
+			skynet.ret(skynet.pack(f(...)))
+		elseif string.lower(cmd) == "quote_sql_str" then
+			skynet.ret(skynet.pack(db[string.lower(cmd)](...)))
+		else
+			skynet.ret(skynet.pack(db[string.lower(cmd)](db, ...)))
+		end
+	end)
+	skynet.info_func(function()
+		return skynet.stat("mqlen")
+	end)
+	skynet.register(".mysql" .. idx)
+end)
 \ No newline at end of file
@@ -0,0 +1,512 @@
+local ModelBaseMysql = class("ModelBaseMysql")
+ModelBaseMysql.key = "key"
+ModelBaseMysql.schema = {}
+
+local string_format = string.format
+local table_insert = table.insert
+local table_unpack = table.unpack
+local assert = assert
+local next = next
+local ipairs = ipairs
+local pairs = pairs
+local tostring = tostring
+local tonumber = tonumber
+local mysqlproxy = mysqlproxy
+
+local function filterProperties(properties, filter)
+    for i, field in ipairs(filter) do
+        properties[field] = nil
+    end
+end
+
+function ModelBaseMysql:ctor(properties)
+    self.cacheFields = {} --缓存字段 不更新数据库的字段
+
+    self[self.class.key .. "_"] = properties[self.class.key] --数据库key
+    properties[self.class.key] = nil
+
+    if not self:isValidKey() then
+        print(string_format("%s [%s:key] should be give in new(ctor)", tostring(self), self.class.__cname))
+        return
+    end
+
+    if type(properties) ~= "table" then properties = {} end
+    self:loadProperties(properties)  --缺少的域将设置默认值
+    self:getPriKey()
+end
+
+--[[--
+
+返回对象的 ID 值。
+
+**Returns:**
+
+-   ID 值
+
+]]
+function ModelBaseMysql:getKey()
+    local id = self[self.class.key .. "_"]
+    assert(id ~= nil, string_format("%s [%s:getKey()] Invalid key", tostring(self), self.class.__cname))
+    return id
+end
+
+function ModelBaseMysql:getPriKey()
+    for k, v in pairs(self.class.schema) do
+        local objType, def, keyType, length = table_unpack(v)
+        if keyType == "pri" or keyType == "pri_auto" then
+            self.pri_key = k
+            break
+        end
+    end
+end
+
+function ModelBaseMysql:load(properties)
+    if not self:isValidKey() then
+        print(string_format("%s [%s:id] should be set before load", tostring(self), self.class.__cname))
+        return false
+    end
+    local load = false
+    if not properties then
+        properties = mysqlproxy:query(string_format("SELECT * from `%s` where `%s` = %s;", self.class.__cname, self.pri_key, self:getKey()))
+        load = true
+    end
+    if not next(properties) then return false end
+
+    local data = load and properties[1] or properties
+
+    self:loadProperties(data)
+
+    self:onLoad()
+
+    return true
+end
+
+--创建model对应的redis数据, 必须已经设置了ID
+function ModelBaseMysql:create()
+    if not self:isValidKey() then
+        print(string_format("%s [%s:key] should be set before create", tostring(self), self.class.__cname))
+        return nil
+    end
+
+    self:save()
+    self:onCreate()
+
+    return self
+end
+
+-- save 忽略 缓存配置
+function ModelBaseMysql:save()
+    local redisProperties = self:getProperties()
+
+    local params = {}
+    for fieldName, value in pairs(redisProperties) do
+        local propname = fieldName .. "_"
+        if self.class.schema[fieldName][1] == "table" then
+            if not next(self[propname]) then 
+                params[fieldName] = "NULL"
+            else
+                local result = mysqlproxy:quote_sql_str(MsgPack.pack(self[propname]))
+                --params[fieldName] = "'" .. MsgPack.pack(self[propname]) .. "'"
+                params[fieldName] = result
+            end
+        elseif self.class.schema[fieldName][1] == "string" then
+            local result = mysqlproxy:quote_sql_str(self[propname])
+            --params[fieldName] = "'" .. self[propname] .. "'"
+            params[fieldName] = result
+        else
+            params[fieldName] = self[propname]
+        end
+    end
+    if next(params) then
+        -- insert update
+        local sql = "INSERT INTO `%s` (%s) VALUES (%s) ON DUPLICATE KEY UPDATE %s;"
+        local tbName = self.class.__cname
+        local key_list = ""
+        local value_list = ""
+        local update_list = ""
+        for k, v in pairs(params) do
+            if key_list ~= "" then
+               key_list = key_list .. ","
+            end
+            if value_list ~= "" then
+               value_list = value_list .. ","
+            end
+            if update_list ~= "" then
+               update_list = update_list .. ","
+            end
+
+            key_list = key_list .. "`" .. k .. "`"
+            value_list = value_list .. v
+            update_list = update_list .. "`" .. k .. "`=" .. v
+        end
+        sql = string_format(sql, tbName, key_list, value_list, update_list)
+        local res = mysqlproxy:query(sql)
+        if res["errno"] then
+            skynet.error(sql)
+            skynet.error(res["err"])
+        end
+    end
+end
+
+--[[--
+
+确定对象是否设置了有效的 key。
+
+]]
+function ModelBaseMysql:isValidKey()
+    local propname = self.class.key .. "_"
+    local key = self[propname]
+    return type(key) == "string" and key ~= ""
+end
+
+--[[--
+
+加载对象的属性进内存。
+NOTE: 如果properties缺少schema中的域, 将用默认值来填充
+
+**Parameters:**
+
+-   properties: 包含属性值的数组
+
+]]
+function ModelBaseMysql:loadProperties(properties)
+    assert(type(properties) == "table", "Invalid properties")
+    for field, schema in pairs(self.class.schema) do
+        local typ, def = table_unpack(schema)
+        local propname = field .. "_"
+
+        if typ == "table" and type(properties[field]) == "string" then
+            properties[field] = MsgPack.unpack(properties[field])
+        end
+
+        local val = properties[field] or def
+        if val ~= nil then
+            if typ == "number" then val = tonumber(val) end
+            assert(type(val) == typ,
+               string_format("%s [%s:loadProperties()] Type mismatch, %s expected %s, actual is %s",
+                                 tostring(self), self.class.__cname, field, typ, type(val)))
+            self[propname] = val
+        end
+    end
+end
+
+--[[--
+
+取得对象的属性值。
+
+**Parameters:**
+
+-   fields: 要取得哪些属性的值，如果未指定该参数，则返回 fields 中设定的属性
+-   filter: 要从结果中过滤掉哪些属性，如果未指定则不过滤
+
+**Returns:**
+
+-   包含属性值的数组
+
+]]
+function ModelBaseMysql:getProperties(fields, filter)
+    local schema = self.class.schema
+    if type(fields) ~= "table" then fields = table.keys(self.class.schema) end
+
+    local properties = {}
+    for i, field in ipairs(fields) do
+        local propname = field .. "_"
+        local typ = schema[field][1]
+        local val = self[propname]
+        assert(type(val) == typ,
+               string_format("%s [%s:getProperties()] Type mismatch, %s expected %s, actual is %s",
+                                 tostring(self), self.class.__cname, field, typ, type(val)))
+        properties[field] = val
+    end
+
+    if type(filter) == "table" then
+        filterProperties(properties, filter)
+    end
+
+    return properties
+end
+
+function ModelBaseMysql:getProperty(property)
+    if type(property) ~= "string" then return nil end
+    if not self.class.schema[property] then return nil end
+    return self:getProperties({property})[property]
+end
+
+function ModelBaseMysql:setProperty(property, value, forceSave)
+    if not self.class.schema[property] then
+        print(string_format("%s [%s:setProperty()] Invalid property : %s",
+            tostring(self), self.class.__cname, property))
+        return
+    end
+
+    local typ, def = table_unpack(self.class.schema[property])
+    local propname = property .. "_"
+
+    if typ == "number" then value = tonumber(value) end
+    if typ == "table" and not value then
+        value = self[propname] -- table 可以用自己的缓冲
+    end
+    assert(type(value) == typ,
+       string_format("%s [%s:setProperties()] Type mismatch, %s expected %s, actual is %s",
+         tostring(self), self.class.__cname, property, typ, type(value)))
+
+    if typ == "number" or typ == "string" then
+        if self[propname] == value then
+            return
+        end
+    end
+    self[propname] = value
+    --self:save()
+    self.cacheFields[property] = self[propname]
+    if forceSave then
+        self:update()
+    end
+end
+
+function ModelBaseMysql:setProperties(fields, forceSave)
+    for property, value in pairs(fields) do
+         if not self.class.schema[property] then
+            print(string_format("%s [%s:setProperty()] Invalid property : %s",
+                tostring(self), self.class.__cname, property))
+        else
+            local typ, def = table_unpack(self.class.schema[property])
+            local propname = property .. "_"
+            if typ == "number" then value = tonumber(value) end
+            if typ == "table" and not value then
+                value = self[propname] -- table 可以用自己的缓冲
+            end
+            assert(type(value) == typ,
+               string_format("%s [%s:setProperties()] Type mismatch, %s expected %s, actual is %s",
+                 tostring(self), self.class.__cname, property, typ, type(value)))
+
+            if typ == "number" or typ == "string" then
+                if self[propname] == value then
+                    return
+                end
+            end
+            self[propname] = value
+            self.cacheFields[property] = self[propname]
+        end
+    end
+    if forceSave then
+        self:update()
+    end
+    --self:save()
+end
+
+function ModelBaseMysql:incrProperty(property, value, forceSave)
+    if not self.class.schema[property] then
+        print(string_format("%s [%s:setProperty()] Invalid property : %s",
+            tostring(self), self.class.__cname, property))
+        return
+    end
+
+    local typ, def = table_unpack(self.class.schema[property])
+    local propname = property .. "_"
+
+    if typ == "table" or typ == "string" then return end
+    if typ == "number" then value = tonumber(value) end
+
+    self:setProperty(property, self[propname] + value, forceSave)
+end
+
+function ModelBaseMysql:onLoad()
+end
+
+function ModelBaseMysql:onCreate()
+end
+
+function ModelBaseMysql:checkKeyExists(key)
+    local res = mysqlproxy:query(string_format("SELECT * FROM `%s` WHERE `%s` = %s", self.class.__cname, self.pri_key, key))
+    return next(res)
+end
+
+function ModelBaseMysql:checkTableSchema()
+    -- 1.检测是否表存在
+    local typeMap = {
+        number = {"int", 0},
+        string = {"varchar", "", 128},
+        table = {"blob", "NULL"},
+        pri = {"bigint", 0},
+    }
+    local tbName = self.class.__cname
+    local create_sql = [[
+		CREATE TABLE IF NOT EXISTS `%s` (
+            %s
+            PRIMARY KEY (`%s`)%s
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+    ]]
+    local index_tpl_str = [[,INDEX `%s_Index` (`%s`)]]
+    
+    local alter_sql = [[
+		ALTER TABLE `%s` ADD COLUMN (
+            %s
+		) ;
+    ]]
+    local field_tpl_str = "`%s` %s%s DEFAULT %s"
+    local auto_increment_str = "`%s` %s NOT NULL AUTO_INCREMENT"
+    local field_str = ""
+
+    local res = mysqlproxy:query("desc `".. tbName .. "`;")
+    local keyList = {}
+    if res["err"] then -- 表不存在
+        local schema = {}
+        for k, v in pairs(self.class.schema) do
+            local keyType = v[3]
+            if keyType == "pri" or keyType == "pri_auto" then
+                self.pri_key = k
+                table_insert(schema, 1, {k, v})
+            else
+                if keyType == "index" then
+                    table_insert(keyList, k)
+                end
+                table_insert(schema, {k, v})
+            end
+        end
+        for _, tbl in ipairs(schema) do
+            local k, v = tbl[1], tbl[2]
+            local objType, def, keyType, length = table_unpack(v)
+            local isAutoPriKey = false
+            assert(typeMap[objType], string_format("schema invalid type, %s, %s", tbName, k))
+            -- 主键使用bigint存储
+            if keyType == "pri" then objType = "pri" end
+            if keyType == "pri" or keyType == "pri_auto" then
+                objType = "pri"
+                if keyType == "pri_auto" then
+                    isAutoPriKey = true
+                end
+            end
+
+            local info = typeMap[objType]
+            local suffix = ""
+            local fieldType = info[1]
+            if objType == "table" or not def or def == "" then def = info[2] end
+            if type(def) == "string" and def ~= "NULL" then def = "'" .. def .. "'" end
+            if info[3] and not length then length = info[3] end
+            -- 设置字段长度
+            if info[3] then suffix = string.format("(%d)", length) end
+            -- 很长的string使用blob
+            if  keyType == "blob" then 
+                fieldType = keyType
+                suffix = ""
+                def = "NULL"
+            end
+
+            if not isAutoPriKey then
+                field_str = field_str .. string.format(field_tpl_str..",", k, fieldType, suffix, def)
+            else
+                field_str = field_str .. string.format(auto_increment_str..",", k, fieldType)
+            end
+        end
+
+        assert(self.pri_key, string_format("table not include primary key, [%s]", tbName))
+        local index_key_str = ""
+        for _, k in ipairs(keyList) do
+            index_key_str = index_key_str .. string_format(index_tpl_str, k, k)
+        end
+        -- 创建表格
+        print(string_format(create_sql, tbName, field_str, self.pri_key, index_key_str))
+        mysqlproxy:query(string_format(create_sql, tbName, field_str, self.pri_key, index_key_str))
+    else    -- 检测是否有添加新字段
+        local addCol = {}
+        local curCols = {}
+        for _, col in ipairs(res) do
+            curCols[col["Field"]] = 1
+        end
+        for k, v in pairs(self.class.schema) do
+            local objType, def, keyType, length = table_unpack(v)
+            if not curCols[k] then
+                print(string_format("table [%s] add new column [%s]", tbName, k))
+                assert(typeMap[objType], string_format("schema invalid type, [%s], [%s]", tbName, k))
+
+                local info = typeMap[objType]
+                local suffix = ""
+                local fieldType = info[1]
+                if objType == "table" or not def or def == "" then def = info[2] end
+                if type(def) == "string" and def ~= "NULL" then def = "'" .. def .. "'" end
+                if info[3] and not length then length = info[3] end
+                -- 设置字段长度
+                if info[3] then suffix = string.format("(%d)", length) end
+                -- 很长的string使用blob
+                if  keyType == "blob" then 
+                    fieldType = keyType
+                    suffix = ""
+                    def = "NULL"
+                end
+                local sep = ","
+                if field_str == "" then
+                    sep = ""
+                end
+                field_str = field_str .. string.format(sep..field_tpl_str, k, fieldType, suffix, def)
+            end
+        end
+        -- 添加新列
+        if field_str ~= "" then
+            mysqlproxy:query(string_format(alter_sql, tbName, field_str))
+        end
+    end
+
+end
+
+function  ModelBaseMysql:loadFields(fields)
+    if not self:isValidKey() then
+        print(string_format("%s [%s:id] should be set before load", tostring(self), self.class.__cname))
+        return
+    end
+    if not next(fields) then
+        return
+    end
+    local final = {}
+    for _, v in ipairs(fields) do
+        table.insert(final, '`'..v..'`')
+    end
+    local field_list = table.concat(final, ",")
+    local res = mysqlproxy:query(string_format("SELECT %s from `%s` where `%s` = %s;", field_list, self.class.__cname, self.pri_key, self:getKey()))
+    if res["errno"] then
+        return
+    end
+
+    return res[1]
+end
+
+function ModelBaseMysql:update()
+    if next(self.cacheFields) then
+        self:updateFields(self.cacheFields)
+        self.cacheFields = {}
+    end
+end
+
+function ModelBaseMysql:updateFields(fields)
+    local params = {}
+    for field, value in pairs(fields) do
+        if self.class.schema[field][1] == "table" then
+            if next(value) then 
+                local result = mysqlproxy:quote_sql_str(MsgPack.pack(value))
+                params[field] = result
+            end
+        elseif self.class.schema[field][1] == "string" then
+            local result = mysqlproxy:quote_sql_str(value)
+            params[field] = result
+        else
+            params[field] = value 
+        end
+    end
+    if next(params) then
+        local sql = "UPDATE `%s` SET %s WHERE `%s` = %s;"
+        local tbName = self.class.__cname
+        local tmp = {}
+        for k, v in pairs(params) do
+            table.insert(tmp, '`' .. k .. '` = ' .. v)
+        end
+        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"])
+            return false
+        end
+    end
+    return true
+end
+
+return ModelBaseMysql
 \ No newline at end of file
@@ -0,0 +1,53 @@
+local skynet = require "skynet"
+require "utils.init"
+
+local mysqld_count = tonumber(skynet.getenv("thread"))
+local mysqld
+skynet.init(function()
+	local idx = math.randomInt(1, mysqld_count)
+    mysqld = skynet.localname(".mysql" .. idx)
+
+end)
+
+local table_insert = table.insert
+
+local mysqlproxy = {}
+
+
+setmetatable(mysqlproxy, { __index = function(t, k)
+	local cmd = string.upper(k)
+    local f = function (self, ...)
+        if k == "query" then
+			--print(...)
+        end
+		local ok, result = pcall(skynet.call, mysqld, "lua", cmd, ...)
+		if not ok then
+			skynet.error(cmd, ..., "\n", debug.traceback(coroutine.running(), nil))
+			return
+		end
+		return result
+	end
+	t[k] = f
+	return f
+end})
+
+function mysqlproxy:insertEmail(params)
+	local pms = {
+		key = string.format("%s", 0),
+		roleId = params.roleId,
+		emailId = params.emailId,
+		createtime = params.createtime or skynet.timex(),
+		contentPms = params.contentPms or {},
+		rewardPms = params.rewardPms or {},
+		title = params.title or "",
+		stitle = params.stitle or "",
+		content = params.content or "",
+		attachments = params.attachments or "",
+	}
+
+	local email = require("models.Email").new(pms)
+	email:create()
+	return true
+end
+
+return mysqlproxy
 \ No newline at end of file
@@ -0,0 +1,66 @@
+local skynet = require "skynet"
+local mysqlproxy = require "shared.mysqlproxy"
+
+
+function getDbCfgVal(tbName, keyName, fieldName)
+    local sql = string.format("SELECT * FROM `%s` WHERE `key` = '%s';", tbName, keyName)
+    local res = mysqlproxy:query(sql)
+    if not next(res) or res.errno then
+        return
+    end
+
+    return res[1][fieldName]
+end
+
+function setDbCfgVal(tbName, keyName, fieldName, fieldVal)
+    if type(fieldVal) == "string" then fieldVal = string.format("'%s'", fieldVal) end
+    local sql = string.format("UPDATE `%s` SET `%s` = %s WHERE `key` = '%s';", tbName, fieldName, fieldVal, keyName)
+    mysqlproxy:query(sql)
+end
+
+function getFriendCount(roleId)
+    local res = mysqlproxy:query(string.format("SELECT `id` FROM `Friend` WHERE `roleid` = %s", roleId))
+    if res["errno"] then
+        return globalCsv.friendListLimit
+    end
+
+    return #res
+end
+
+function addFriend(roleId, friendId)
+	local stmt_csp = mysqlproxy:prepare("call add_friends(?, ?, ?)")
+    local r = mysqlproxy:execute(stmt_csp, roleId, friendId, skynet.timex())
+    if r[1][1]["t_error"] == 0 then
+		rpcRole(roleId, "addFriend", friendId)
+		rpcRole(friendId, "addFriend", roleId)
+    end
+    dump(r)
+end
+
+function delFriend(roleId, friendId)
+	local stmt_csp = mysqlproxy:prepare("call del_friends(?, ?)")
+    local r = mysqlproxy:execute(stmt_csp, roleId, friendId)
+    if r[1][1]["t_error"] == 0 then
+		rpcRole(roleId, "delFriend", friendId)
+		rpcRole(friendId, "delFriend", roleId)
+    end
+    dump(r)
+end
+
+function roleExists(roleId)
+    local res = mysqlproxy:query(string.format("SELECT `id` FROM `Role` WHERE `id` = %s", roleId))
+    if res["errno"] or not next(res) then
+        return false
+    end
+
+    return true
+end
+
+function roleUidExists(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
+
+    return true, res[1]["name"]
+end
 \ No newline at end of file