wasteland / server | GitLab

17 Dec, 2020

1 commit

803170fd 玩家操作记录 Browse Code »

zhouhaihai
2020-12-17 16:04:04 +0800

15 Dec, 2020

2 commits

7cba6588 Merge branch 'develop' into player Browse Code »

熊润斐
2020-12-15 12:05:10 +0800
576c791c 玛尼英雄帖活动通过任务bug 元旦挂机活动 Browse Code »

liuzujun
2020-12-15 11:51:47 +0800

14 Dec, 2020

7 commits

46b128fd 多队挂机70005报错 Bug Browse Code »

liuzujun
2020-12-14 21:04:24 +0800
b1b3c0d6 合成道具数量不对bug ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
liuzujun
2020-12-14 21:04:19 +0800
cf1d48e8 多队挂机70005报错 Bug Browse Code »

liuzujun
2020-12-14 19:56:36 +0800
cd949029 合成道具数量不对bug Browse Code »

liuzujun
2020-12-14 17:35:33 +0800
ef3450bd Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-14 17:25:47 +0800
66fe093a 元旦关卡活动 Browse Code »

liuzujun
2020-12-14 17:25:45 +0800
d3e7f275 不要穿装备的引导了 Browse Code »

chenyueqi
2020-12-14 16:11:21 +0800

10 Dec, 2020

3 commits

e6dc06cc 拾荒bug 增加bug log Browse Code »

zhouhaihai
2020-12-10 19:49:05 +0800
8e1a3c42 Merge branch 'develop' into player ... Browse Code »
```
# Conflicts:
#	config/develop.lua
#	config/nodenames.lua
```
熊润斐
2020-12-10 19:20:45 +0800
e910c2dd 考场没有宝藏怪 Browse Code »

zhouhaihai
2020-12-10 17:46:35 +0800

09 Dec, 2020

3 commits

fea3baab 宝藏怪bug Browse Code »

zhouhaihai
2020-12-09 19:53:35 +0800
68a6dc62 匹配规则调整 Browse Code »

zhouhaihai
2020-12-09 15:37:34 +0800
cf584618 效果发给客户端 Browse Code »

zhouhaihai
2020-12-09 11:35:51 +0800

08 Dec, 2020

3 commits

1be743f3 扭蛋机调试 Browse Code »

liuzujun
2020-12-08 21:05:20 +0800
8ca1144f Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-08 16:55:19 +0800
2bc706ab 兑换活动重置，累充功能 Browse Code »

liuzujun
2020-12-08 16:55:14 +0800

07 Dec, 2020

12 commits

e59430d5 宝藏怪刷新，计数 Browse Code »

zhouhaihai
2020-12-07 20:52:17 +0800
111937b9 自己不清楚格子 Browse Code »

zhouhaihai
2020-12-07 20:30:54 +0800
e587a3aa passive 距离生效bug Browse Code »

zhouhaihai
2020-12-07 20:16:16 +0800
da743fbe 被动效果 Browse Code »

zhouhaihai
2020-12-07 18:02:16 +0800
b8b1c164 扭蛋活动，万能碎片bug Browse Code »

liuzujun
2020-12-07 16:54:18 +0800
9b59590a 全部有的怪都处理 Browse Code »

zhouhaihai
2020-12-07 16:43:00 +0800
72d4fe84 翻开格子加1sp Browse Code »

zhouhaihai
2020-12-07 16:16:19 +0800
1556be8b 判断错误 Browse Code »

zhouhaihai
2020-12-07 15:58:43 +0800
819f6c60 战斗不判断防守阵容 Browse Code »

zhouhaihai
2020-12-07 14:58:36 +0800
53227d9c pvp 编队胜利推送 Browse Code »

zhouhaihai
2020-12-07 14:51:40 +0800
e8ca14c4 羁绊加成去掉 Browse Code »

zhouhaihai
2020-12-07 14:17:34 +0800
993def2f 碎片直接转换为其他碎片 Browse Code »

zhouhaihai
2020-12-07 10:01:03 +0800

05 Dec, 2020

5 commits

eb87ab7d Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-05 16:58:25 +0800
4f7cffe5 多队挂机任务取消功能，累充奖励 Browse Code »

liuzujun
2020-12-05 16:58:20 +0800
c3b1fa38 缺个tou Browse Code »

zhouhaihai
2020-12-05 15:32:07 +0800
b4b28ccd 数据保护 Browse Code »

zhouhaihai
2020-12-05 14:59:16 +0800
782c178b 举报功能 Browse Code »

liuzujun
2020-12-05 10:28:56 +0800

04 Dec, 2020

4 commits

e9e384bf Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-04 18:21:01 +0800
86584add 新手卡池，心愿单卡池 Browse Code »

liuzujun
2020-12-04 18:20:57 +0800
fed94c7c 错误的函数 Browse Code »

zhouhaihai
2020-12-04 18:07:16 +0800
8cfb25d7 传递敌人信息 Browse Code »

zhouhaihai
2020-12-04 11:23:17 +0800