From 9991263083fc8b9f68ffe6c40bf246853299e94e Mon Sep 17 00:00:00 2001
From: gaofengduan <782277855@qq.com>
Date: Fri, 5 Jul 2019 15:38:59 +0800
Subject: [PATCH] fix rune

---
 src/actions/HeroAction.lua |  6 ++++--
 src/actions/RoleAction.lua | 11 +++++------
 src/csvdata                |  2 +-
 src/models/Hero.lua        |  1 -
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua
index f35fe3b..231715c 100644
--- a/src/actions/HeroAction.lua
+++ b/src/actions/HeroAction.lua
@@ -515,7 +515,8 @@ function _M.referEquipsRpc(agent, data)
 				role:addEquip({type=typ,level=ownLv,count=1,isRefer=true})
 			end
 		end
-		hero:updateProperty({field = "equip", value = hero:getProperty("equip"):setv(typ, level)})
+		local x = hero:getProperty("equip"):setv(typ, level)
+		hero:updateProperty({field = "equip", value = x})
 	end
 	SendPacket(actionCodes.Hero_referEquipsRpc, "")
 	return true
@@ -559,7 +560,8 @@ function _M.referRunesRpc(agent, data)
 			local ownRune = role.runeBag[uid]
 			ownRune:updateProperty({field = "refer",value = hero:getProperty("id")})
 		end
-		hero:updateProperty({field = "rune", value = hero:getProperty("rune"):setv(typ,uid)})
+		local x = hero:getProperty("rune"):setv(typ,uid)
+		hero:updateProperty({field = "rune", value = x})
 	end
 	SendPacket(actionCodes.Hero_referRunesRpc, "")
 	return true
diff --git a/src/actions/RoleAction.lua b/src/actions/RoleAction.lua
index 90ba490..87ffa3a 100644
--- a/src/actions/RoleAction.lua
+++ b/src/actions/RoleAction.lua
@@ -154,18 +154,17 @@ function _M.loginRpc( agent, data )
 	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(response))
 
 	local equipResp = {equipBag = {}}
-	for _,set in pairs(role.equipBag) do
-		for _,equip in pairs(set) do
-			local data = equip:data()
-			if not equipResp.equipBag[data.type] then equipResp.equipBag[data.type] = {} end
-			equipResp.equipBag[data.type][data.level] = data
+	for typ,set in pairs(role.equipBag) do
+		for level,equip in pairs(set) do
+			if not equipResp.equipBag[typ] then equipResp.equipBag[typ] = {} end
+			equipResp.equipBag[typ][level] = equip:data()
 		end
 	end
 	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(equipResp))
 
 	local runeResp = {runeBag = {}}
 	for _,rune in pairs(role.runeBag) do
-		table_insert(runeResp.runeBag, rune:data())
+		runeResp.runeBag[rune:getProperty("uid")]=rune:data()
 	end
 	SendPacket(actionCodes.Role_loginRpc, MsgPack.pack(runeResp))
 
diff --git a/src/csvdata b/src/csvdata
index 67615e0..779ba6c 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 67615e0a0a3ec5653f4b6e457d45c32dd3afed79
+Subproject commit 779ba6c66cf7c9f29882da760f161b39428343bd
diff --git a/src/models/Hero.lua b/src/models/Hero.lua
index 69dae3c..283befd 100644
--- a/src/models/Hero.lua
+++ b/src/models/Hero.lua
@@ -21,7 +21,6 @@ Hero.schema = {
 
 function Hero:ctor( properties )
 	Hero.super.ctor(self, properties)
-	self.runes = {} --符文-零件自增 id
 end
 
 function Hero:notifyUpdateProperty(field, newValue, oldValue)
--
libgit2 0.21.2