wasteland / server

Commit 56c83e9775161bc9392098baf99ab20e16258efe

Authored by zhouhaihai
1 parent f76d63e1

修改 robot

Showing 3 changed files with 6 additions and 4 deletions   Show diff stats
Inline Side-by-side
robot/robot.lua
  Show/Hide comments   View file @56c83e9
... ... @@ -6,7 +6,7 @@ local socketdriver = require "skynet.socketdriver"
6 6 local netpack = require "skynet.netpack"
7 7 local xxtea = require "xxtea"
8 8 local httpc = require("http.httpc")
9   -local config = require "robot_config"
  9 +local config
10 10  
11 11 local XXTEA_KEY = "699D448D6D24f7F941E9F6E99F823E18"
12 12  
... ... @@ -138,6 +138,8 @@ end
138 138  
139 139 -- 开始登录
140 140 function CMD.start(fd, id)
  141 + config = require "robot_config"
  142 +
141 143 client.fd = fd
142 144 client.clientId = id
143 145  
... ...
robot/robot_main.lua
  Show/Hide comments   View file @56c83e9
1 1 local skynet = require "skynet"
2   -local config = require "robot_config"
3 2  
4 3 local preOnlineCount = 10
5 4  
6 5  
7 6 skynet.start(function()
  7 + local config = require "robot_config"
8 8 local need = math.ceil(config.online / preOnlineCount)
9 9 local inpre = math.ceil(config.inpre / need)
10 10 local idRange = math.ceil(config.max / need)
... ...
robot/start.lua
  Show/Hide comments   View file @56c83e9
1 1 require("utils.StringUtil")
2 2 require("utils.TableUtil")
3 3 require "utils.MathUtil"
4   -local config = require "robot_config"
  4 +local config
5 5 local skynet = require "skynet"
6 6 local netpack = require "skynet.netpack"
7 7 local socketdriver = require "skynet.socketdriver"
... ... @@ -123,7 +123,7 @@ end
123 123  
124 124 local function start(pooldp, pooldObj, onlineCountp, startIdp, endIdp, inprep)
125 125 log("start testing ...")
126   -
  126 + config = require "robot_config"
127 127 factory = deque.clone(pooldObj)
128 128 poold, onlineCount, startId, endId, inpre = pooldp, onlineCountp, startIdp, endIdp, inprep
129 129 id_max = startId - 1
... ...