Merge remote-tracking branch 'origin/cn/develop' into cn/develop

zhangqijia
2 parents 2ce63aa5 7f29530e
Showing 5 changed files with 18 additions and 2 deletions Show diff stats
robot/robot.lua
src/GlobalVar.lua
src/actions/GmAction.lua
src/agent.lua
src/csvdata
@@ -136,6 +136,18 @@ function CMD.task()
 	startUnit()
 end
+function randomName()
+    local str = "1234567890abcdefghijklmnopqrstuvwxyz"
+    local len = #str
+    local result = ""
+    for i=1,10 do
+        local idx = math.random(1, len)
+        result = result .. string.sub(str, idx, idx)
+    end
+
+    return result
+end
+
 -- 开始登录
 function CMD.start(fd, id)
 	client.fd = fd
@@ -371,6 +371,8 @@ MailId = {
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
 	MyCardBuy = 300,
+
+    RechargeBack = 3001,
 }
 TriggerEventType = {
@@ -729,6 +729,8 @@ function _M.cz(role, pms)
 		pay_time = skynet.timex(),
 		sid = sid == 1 and IOS_SID or 0,
 	})
+    -- 补发邮件
+    role:sendMail(MailId.RechargeBack)
 	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
 	return "指令成功"
 end
@@ -36,7 +36,7 @@ local function handle_timeout()
 end
 local function handle_gc()
-	if agentInfo.open_timer then return end
+	if not agentInfo.open_timer then return end
     collectgarbage("collect")
 	skynet.timeout(6000, handle_gc)
 end
-Subproject commit e2c89ce97a826a716af84cb15d2976d3f19dcd1c
+Subproject commit 45264603ff07db4cd2eaf8822c17f453bf5f00de