From 639bbdffb195d70f4720bc77fa551861d7e40d29 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Sat, 7 Aug 2021 14:42:51 +0800
Subject: [PATCH] fix: 一番赏 获取扭蛋机列表，请求参数 coin 改为id

---
 src/actions/CapsuleAction.lua | 6 +++---
 src/models/RolePlugin.lua     | 4 ++--
 src/services/capsuled.lua     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/actions/CapsuleAction.lua b/src/actions/CapsuleAction.lua
index 4ca9183..931b8a0 100644
--- a/src/actions/CapsuleAction.lua
+++ b/src/actions/CapsuleAction.lua
@@ -17,18 +17,18 @@ function _M.listRpc(agent, data)
     local role = agent.role
     local msg = MsgPack.unpack(data)
     local typ = msg.typ
-    local coin = msg.coin
+    local id = msg.id
 
     local capsules = {}
     if typ == 1 then
-        local ret = skynet.call(agent.capsule_serv, "lua", "list", coin)
+        local ret = skynet.call(agent.capsule_serv, "lua", "list", id)
         if next(ret) then
             for k, v in pairs(ret) do
                 capsules[k] = v
             end
         end
     elseif typ == 0 then
-        local ret = role:getCapsuleList(coin)
+        local ret = role:getCapsuleList(id)
         if next(ret) then
             for k, v in pairs(ret) do
                 capsules[k] = v
diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index a8aebf8..585da67 100644
--- a/src/models/RolePlugin.lua
+++ b/src/models/RolePlugin.lua
@@ -3153,10 +3153,10 @@ function RolePlugin.bind(Role)
 		return itemRandomOccupy
 	end
 
-    function Role:getCapsuleList(coin)
+    function Role:getCapsuleList(id)
 		local capsules = {}
 		for k, v in pairs(self.capsules) do
-			if v:getProperty("coin") == coin then
+			if v:getProperty("id") == id then
 				local onlineCount= v:getOnlineCount()
 				capsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
 			end
diff --git a/src/services/capsuled.lua b/src/services/capsuled.lua
index b5b8be8..df8dcbf 100644
--- a/src/services/capsuled.lua
+++ b/src/services/capsuled.lua
@@ -171,10 +171,10 @@ function CMD.start()
     check_capsules()
 end
 
-function CMD.list(coin)
+function CMD.list(id)
     local tmpCapsules = {}
     for k, v in pairs(capsules) do
-        if v:getProperty("coin") == coin then
+        if v:getProperty("id") == id then
             local onlineCount= v:getOnlineCount()
             tmpCapsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
         end
--
libgit2 0.21.2