Commit 74fb56e9cbcaaa6b728f42fbb0c3f9acde6fee47
Merge branch 'tr/develop' into tr/publish/release
Showing
2 changed files
with
25 additions
and
12 deletions
Show diff stats
README.md
| 1 | -## 快速开始 | ||
| 2 | -copy database | ||
| 3 | - | ||
| 4 | -cd redis-4.0.1 | 1 | +## ubuntu18.04环境下编译skynet |
| 2 | +编译步骤 | ||
| 3 | +1. 环境安装 | ||
| 4 | +2. 编译安装jemalloc(使用github镜像链接) | ||
| 5 | +3. 编译skynet | ||
| 5 | 6 | ||
| 6 | -make install | ||
| 7 | - | ||
| 8 | -redis-server database/redis.conf | 7 | +``` |
| 8 | +$ sudo apt-get install autoconf libreadline-dev gcc g++ make -y | ||
| 9 | +$ git clone --depth=1 https://github.com.cnpmjs.org/jemalloc/jemalloc.git skynet/3rd/jemalloc | ||
| 10 | +$ cd skynet/3rd/jemalloc | ||
| 11 | +$ ./autogen.sh --with-jemalloc-prefix=je_ && make && sudo make install && cd - | ||
| 12 | +$ make linux | ||
| 13 | +``` | ||
| 9 | 14 | ||
| 15 | +## 快速开始 | ||
| 16 | +``` | ||
| 17 | +$ copy database | ||
| 18 | +$ cd redis-4.0.1 | ||
| 19 | +$ make install | ||
| 20 | +$ redis-server database/redis.conf | ||
| 21 | +$ cd server | ||
| 22 | +$ sh restart.sh | ||
| 23 | +``` | ||
| 24 | +## 重启 | ||
| 25 | +``` | ||
| 10 | cd server | 26 | cd server |
| 11 | - | ||
| 12 | sh restart.sh | 27 | sh restart.sh |
| 28 | +``` | ||
| 13 | 29 | ||
| 14 | -## 重启 | ||
| 15 | -cd server | ||
| 16 | 30 | ||
| 17 | -sh restart.sh | ||
| 18 | \ No newline at end of file | 31 | \ No newline at end of file |
src/models/RoleTask.lua
| @@ -60,7 +60,7 @@ local TaskType = { | @@ -60,7 +60,7 @@ local TaskType = { | ||
| 60 | AdvUseItem = 419, -- 使用道具 - itemId count | 60 | AdvUseItem = 419, -- 使用道具 - itemId count |
| 61 | AdvBuild = 420, -- 建筑交互 - buildId | 61 | AdvBuild = 420, -- 建筑交互 - buildId |
| 62 | AdvKill = 421, -- 拾荒击败敌人 | 62 | AdvKill = 421, -- 拾荒击败敌人 |
| 63 | - AdvHangTime = 421, -- 拾荒委托累计时长 -- count | 63 | + AdvHangTime = 422, -- 拾荒委托累计时长 -- count |
| 64 | 64 | ||
| 65 | --爬塔相关 | 65 | --爬塔相关 |
| 66 | TowerPass = 501, -- 爬塔通关 - level | 66 | TowerPass = 501, -- 爬塔通关 - level |