wasteland / server | GitLab

13 Oct, 2020

2 commits

05b8e0a1 Merge branch 'develop' into tr/cb ... Browse Code »

* develop:
  排队功能
  付费签到改为主动领取，战斗关卡不一定是当前挂机关卡
  推送
  挂机关卡可以选择，经验金币根据最高关卡计算
  bug
  挂机排除噩梦难度
  英雄帖任务bug
  被动技新
  英雄帖活动初始化
  日历活动 穿戴x个y品质铭文
  英雄令英雄收集相关任务
  英雄帖任务简单类型测试

2020-10-13 15:01:34 +0800

5e6af9d6 排队功能 Browse Code »

zhouhaihai
2020-10-13 14:39:11 +0800

12 Oct, 2020

2 commits

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

liuzujun
2020-10-12 16:26:07 +0800
460afa6e 付费签到改为主动领取，战斗关卡不一定是当前挂机关卡 Browse Code »

liuzujun
2020-10-12 16:26:00 +0800

10 Oct, 2020

1 commit

072db127 推送 Browse Code »

zhouhaihai
2020-10-10 13:51:43 +0800

09 Oct, 2020

3 commits

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

liuzujun
2020-10-09 20:28:13 +0800
8cd3770f 挂机关卡可以选择，经验金币根据最高关卡计算 Browse Code »

liuzujun
2020-10-09 20:28:09 +0800
b7e842ac Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  bug
```
zhouhaihai
2020-10-09 19:47:30 +0800

27 Sep, 2020

8 commits

ca60c395 Merge branch 'bugfix' into tr/cb ... Browse Code »
```
* bugfix:
  bug
  bug
  修复bug
  记录聊天信息
  缺了 newdevice
  安全判定
```
zhouhaihai
2020-09-27 19:40:52 +0800
38c7e6a0 bug ... Browse Code »
```
(cherry picked from commit 07c6a92ba2cec99bbf73bde0e7f67123b914962b)
```
zhouhaihai
2020-09-27 17:51:18 +0800
07c6a92b bug Browse Code »

zhouhaihai
2020-09-27 17:51:07 +0800
bf857ca1 Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  bug
```
zhouhaihai
2020-09-27 17:46:13 +0800
337a0165 bug Browse Code »

zhouhaihai
2020-09-27 17:45:46 +0800
28f0c0ca Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  修复bug
  记录聊天信息
  缺了 newdevice
  安全判定
```
zhouhaihai
2020-09-27 16:48:37 +0800
dea89131 修复bug Browse Code »

zhouhaihai
2020-09-27 16:39:23 +0800
25d8cbc6 记录聊天信息 Browse Code »

zhouhaihai
2020-09-27 14:58:05 +0800

24 Sep, 2020

2 commits

bb7998ff 缺了 newdevice Browse Code »

zhouhaihai
2020-09-24 15:56:31 +0800
5aecad36 安全判定 Browse Code »

zhouhaihai
2020-09-24 14:13:30 +0800

23 Sep, 2020

9 commits

6288ab7f Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  成就 参数错误
```
zhouhaihai
2020-09-23 14:56:57 +0800
a790823a Merge branch 'bugfix' into tr/cb ... Browse Code »
```
* bugfix:
  成就 参数错误
```
zhouhaihai
2020-09-23 14:56:37 +0800
3ed95697 成就参数错误 Browse Code »

zhouhaihai
2020-09-23 14:56:25 +0800
eddff937 Merge branch 'bugfix' into tr/cb ... Browse Code »
```
* bugfix:
  3星解锁 cg
  增加神器标签
```
zhouhaihai
2020-09-23 11:47:56 +0800
1988e15a Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  3星解锁 cg
```
zhouhaihai
2020-09-23 11:47:44 +0800
bcbb0c7b 3星解锁 cg Browse Code »

zhouhaihai
2020-09-23 11:47:32 +0800
550989a7 Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  增加神器标签
```
zhouhaihai
2020-09-23 11:27:39 +0800
f927f229 增加神器标签 Browse Code »

zhouhaihai
2020-09-23 11:27:21 +0800
af9073e7 增加神器标签 Browse Code »

zhouhaihai
2020-09-23 11:26:51 +0800

22 Sep, 2020

2 commits

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

liuzujun
2020-09-22 17:55:50 +0800
4a02453a 挂机排除噩梦难度 Browse Code »

liuzujun
2020-09-22 17:55:11 +0800

21 Sep, 2020

11 commits

c670faa0 Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  初始化冒险重置时间
  被动新
```
zhouhaihai
2020-09-21 19:23:26 +0800
650e90d5 Merge branch 'bugfix' into tr/cb ... Browse Code »
```
* bugfix:
  初始化冒险重置时间
  被动新
  扣层数
  被动 取消
```
zhouhaihai
2020-09-21 18:01:29 +0800
8a57b603 初始化冒险重置时间 Browse Code »

zhouhaihai
2020-09-21 18:01:00 +0800
a5c44c41 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-09-21 17:34:54 +0800
4bd3095f 英雄帖任务bug Browse Code »

liuzujun
2020-09-21 17:34:49 +0800
ead2c938 被动新 Browse Code »

zhouhaihai
2020-09-21 16:15:14 +0800
95065b5b 被动技新 Browse Code »

zhouhaihai
2020-09-21 16:14:53 +0800
5345bac7 Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  扣层数
```
zhouhaihai
2020-09-21 13:51:06 +0800
bdd3a194 扣层数 Browse Code »

zhouhaihai
2020-09-21 13:50:58 +0800
b8d4bc78 Merge branch 'bugfix' into develop ... Browse Code »
```
* bugfix:
  被动 取消
```
zhouhaihai
2020-09-21 11:12:32 +0800
871b3da3 被动取消 Browse Code »

zhouhaihai
2020-09-21 11:12:20 +0800