wasteland / server | GitLab

15 Sep, 2021

2 commits

983ec527 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-09-15 16:27:48 +0800
9f4cad29 revert: 使用关卡卡角色等级；屏蔽账号等级解锁角色等级上限 Browse Dir »

zhangqijia
2021-09-15 16:27:06 +0800

14 Sep, 2021

5 commits

15e9dd20 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-09-14 17:28:59 +0800
f11742e4 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-09-14 15:10:48 +0800
77014b19 fix: 新设备全局唯一，deviceId存储在center_server 中的 center_device字段中 Browse Dir »

zhangqijia
2021-09-14 15:08:55 +0800
f4c12f1b Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

liuzujun
2021-09-14 11:25:42 +0800
9729f4f0 修改邮件默认长度，私聊禁言 Browse Dir »

liuzujun
2021-09-14 11:25:36 +0800

10 Sep, 2021

12 commits

1632e6ed fix: 优化 findMinKeyByIndex 函数，修改命名 Browse Dir »

zhangqijia
2021-09-10 19:02:12 +0800
1c77df08 fix: 角色贴纸兑换增加类型 23 Browse Dir »

zhangqijia
2021-09-10 17:53:09 +0800
2284b38e Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-09-10 17:41:44 +0800
d63519df fix: 贴纸兑换修复 itemCsv => "itemCsv" Browse Dir »

zhangqijia
2021-09-10 17:34:25 +0800
261a541f fix: 优化 findMinKeyByItem 函数 Browse Dir »

zhangqijia
2021-09-10 16:37:33 +0800
83987977 fix: 探索加速协议返回值加上错误码，通用方法优化， Browse Dir »

zhangqijia
2021-09-10 16:25:27 +0800
64dd7a6f fix: 每次探索加速额外获得道具 Browse Dir »

zhangqijia
2021-09-10 15:49:00 +0800
9489e761 feat: 探索加速、拾荒体力、奖励副本购买次数去除上限 Browse Dir »

zhangqijia
2021-09-10 14:05:52 +0800
84cbc53e fix: 探索指令，奖励领取解锁条件 level Browse Dir »

zhangqijia
2021-09-10 11:52:09 +0800
94e5e38b fix: del log Browse Dir »

zhangqijia
2021-09-10 11:38:23 +0800
f07252a2 fix: 修复魔导师兑换虹光玉兑换招募券的过程中，未消耗虹光玉。02 Browse Dir »

zhangqijia
2021-09-10 11:37:49 +0800
18a3955b fix: 修复魔导师兑换虹光玉兑换招募券的过程中，未消耗虹光玉。 Browse Dir »

zhangqijia
2021-09-10 11:16:59 +0800

09 Sep, 2021

3 commits

3a262daf fix: 世界积分未判空的bug Browse Dir »

zhangqijia
2021-09-09 19:37:29 +0800
95776b49 fix: 世界积分发奖励的协议的奖励表名子修改 Browse Dir »

zhangqijia
2021-09-09 18:08:08 +0800
5de23af5 fix: 世界积分名字修改成Rpc，抽世界轮盘返回基数和倍率 ... Browse Dir »
```
1. 改协议名字
2. 抽世界轮盘协议 返回基数和倍率
3. 消耗虹光玉和魔导石 通知给客户端字段worldLine
```
zhangqijia
2021-09-09 17:51:53 +0800

08 Sep, 2021

5 commits

dcf40771 fix: 战令奖励领取的bug Browse Dir »

zhangqijia
2021-09-08 18:54:54 +0800
eb1f9a32 fix: 探索指令，最终章的5个章节的解锁条件的通关拾荒关卡 Browse Dir »

zhangqijia
2021-09-08 17:59:17 +0800
3ad19fe4 feat: 贴纸兑换功能 Browse Dir »

zhangqijia
2021-09-08 17:57:58 +0800
7e2e5cff fix: 世界线积分字段修改 ... Browse Dir »
```
1. 挂机宝藏，判空优化
2. 世界线积分字段修改
```
zhangqijia
2021-09-08 17:57:38 +0800
e1b1f689 fix: 记录用户跟设备信息， openItem协议的错误返回加上返回码 Browse Dir »

zhangqijia
2021-09-08 12:02:26 +0800

07 Sep, 2021

1 commit

c4d8e9d2 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-09-07 10:08:45 +0800

03 Sep, 2021

1 commit

e66080dd test: 去除关卡卡角色等级；改为账号等级解锁角色等级上限 Browse Dir »

zhangqijia
2021-09-03 16:12:25 +0800

02 Sep, 2021

7 commits

37502372 feat: 付费战令每日任务获得额外50%经验 Browse Dir »

zhangqijia
2021-09-02 19:25:22 +0800
bc50c971 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-09-02 18:06:07 +0800
7f29530e Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

saicom
2021-09-02 17:11:28 +0800
f2c7c6fa 添加补发充值邮件 Browse Dir »

saicom
2021-09-02 17:11:25 +0800
71d319eb fix: 使用特殊道具也要增加对应的 "购买记录" Browse Dir »

zhangqijia
2021-09-02 15:44:52 +0800
b88939d5 fix: 玛尼的英雄帖增加任务类型 bug修复 ... Browse Dir »
```
1. 招募英雄需要重新计算所有英雄的星级总数
2. 英雄达到3级需要增加英雄CG解锁总数
```
zhangqijia
2021-09-02 15:10:32 +0800
b454725a feat: 英雄精进触发礼包，修复月卡购买的一些bug Browse Dir »

zhangqijia
2021-09-02 11:41:27 +0800

01 Sep, 2021

1 commit

4f3fbc5f Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-09-01 09:35:37 +0800

31 Aug, 2021

1 commit

a93ce9c0 fix: 特殊道具兑换，增加活动判断，活动过期则返回错误码 Browse Dir »

zhangqijia
2021-08-31 09:19:20 +0800

30 Aug, 2021

1 commit

766ddd19 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-08-30 14:08:25 +0800

27 Aug, 2021

1 commit

e3f6fe34 feat: 月卡特权，购买魔导石会有 cardReward 的奖励 ... Browse Dir »
```
1. 月卡特权
2. 删除破冰礼包多余的购买记录。
3. 修改兑换特殊道具的协议名字，日志名字。
```
zhangqijia
2021-08-27 10:45:30 +0800