wasteland / server | GitLab

05 Jun, 2021

2 commits

e799fee3 Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-06-05 17:23:15 +0800
6f2c24ed 友情池bug Browse Code »

liuzujun
2021-06-05 16:29:21 +0800

04 Jun, 2021

4 commits

89cc216f Merge branch 'cn/develop' into cn/publish/release ... Browse Code »
```
* cn/develop:
  关闭prepare stmt
```
liuzujun
2021-06-04 16:15:39 +0800
3a0c3140 关闭prepare stmt Browse Code »

liuzujun
2021-06-04 16:15:03 +0800
4a11ab64 Merge branch 'cn/develop' into cn/publish/release ... Browse Code »
```
* cn/develop:
  好友添加排错日志
```
liuzujun
2021-06-04 14:07:23 +0800
0d2111f2 好友添加排错日志 Browse Code »

liuzujun
2021-06-04 14:06:43 +0800

03 Jun, 2021

1 commit

47834ebf Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-06-03 10:36:34 +0800

02 Jun, 2021

2 commits

2c3a1b31 fix: 修复复仇扣除3门票的BUG Browse Code »

zhangqijia
2021-06-02 21:27:34 +0800
41d737c9 Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-06-02 15:03:08 +0800

01 Jun, 2021

1 commit

8284146d 修改rune表refer字段位bigint Browse Code »

liuzujun
2021-06-01 17:05:36 +0800

31 May, 2021

3 commits

5063c192 Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-31 19:47:18 +0800
92b6691c fix: 部分账号在加速探索后无法获得宝藏奖励的bug ... Browse Code »
```
备注：是资源值不足以扣除挖到宝藏所需的资源值导致加速探索后无法获得宝藏奖励。
```
zhangqijia
2021-05-31 14:23:25 +0800
c8db2ebc Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-31 14:07:24 +0800

28 May, 2021

2 commits

3df6d602 添加玩家签到天数字段 Browse Code »

liuzujun
2021-05-28 15:47:19 +0800
028f89ad Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-28 15:29:19 +0800

27 May, 2021

10 commits

da555218 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Code »

zhangqijia
2021-05-27 20:01:26 +0800
382b9702 fix: 分解铭文返还强化所需铭文碎片的60%的bug, ... Browse Code »
```
1. 返还的是强化当前铭文所消耗的所有铭文碎片总数的60%
```
zhangqijia
2021-05-27 20:01:15 +0800
2472e06c Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

liuzujun
2021-05-27 19:21:53 +0800
b3a55168 复仇胜利需要扣除门票或次数 Browse Code »

liuzujun
2021-05-27 19:21:48 +0800
9592348d Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-27 19:16:58 +0800
e951e307 fix: 分解铭文返还强化所需铭文碎片的60%的bug ... Browse Code »
```
1. 需加上强化从0-1的铭文所需的铭文碎片的60%
2. 需要向上取整铭文碎片
```
zhangqijia
2021-05-27 19:16:36 +0800
2e705c94 feat: 跨周获得的等级效果奖励通过邮件发送 emailId=380 Browse Code »

zhangqijia
2021-05-27 17:43:51 +0800
d5c7ac6d Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-27 15:14:00 +0800
56763ca7 fix: 拆解术士模块的bug，充能重置运行时间，领取已经获得的奖励，不进行加速。 Browse Code »

zhangqijia
2021-05-27 11:21:43 +0800
eab5a2d4 feat: 讨伐电台终止派遣改为消耗虹光玉加速 Browse Code »

zhangqijia
2021-05-27 10:14:28 +0800

26 May, 2021

1 commit

1e2c5316 fix: 修改昵称，餐厅/电波塔/拾荒排行榜对应用户昵称未修改的bug ... Browse Code »
```
【ID1232549】 【拂晓的拾荒团-国服】【餐厅】【当玩家修改名字后排行榜未能及时更新数据】
```
zhangqijia
2021-05-26 19:58:00 +0800

25 May, 2021

4 commits

a3e27e79 Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-25 20:27:40 +0800
7fe1158c Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

liuzujun
2021-05-25 16:38:05 +0800
81ca3a6f 清理电台，代理拾荒，海港贸易机gm Browse Code »

liuzujun
2021-05-25 16:38:00 +0800
4e68858c fix: 铭文当随机出2个相同属性词条时，应该分开记录成2个属性 Browse Code »

zhangqijia
2021-05-25 09:52:57 +0800

24 May, 2021

6 commits

666d0bfc fix: 扫荡关卡奖励叠加bug Browse Code »

zhangqijia
2021-05-24 21:02:55 +0800
3e6d391b fix: 等级效果的bug-修复无法获得奖励关卡每次扫荡额外获得道具 Browse Code »

zhangqijia
2021-05-24 20:19:53 +0800
61386225 feat: 一键领取任务奖励(包括活跃度奖励) Browse Code »

zhangqijia
2021-05-24 16:39:02 +0800
7ba807d6 fix: role:getRuneBatCount()改为role:getRuneBagCount() Browse Code »

zhangqijia
2021-05-24 15:23:01 +0800
15b33dc3 fix: 齿轮加速当前加速次数获取错误的bug Browse Code »

zhangqijia
2021-05-24 11:23:58 +0800
cea66efd fix: 等级效果的bug， ... Browse Code »
```
把等级效果字段levelBnous数据从增量获取改为全量获取
```
zhangqijia
2021-05-24 11:17:14 +0800

21 May, 2021

3 commits

2660491b fix: 铭文仓库爆满限制bug ... Browse Code »

1. 穿在英雄身上的铭文不计算在仓库。
2. 开箱判断物品所占用的仓库格数，item_random.ware字段
3.
领取邮件，如果邮件中没有铭文，则不判断铭文仓库是否爆满。

2021-05-21 17:30:10 +0800

f84286c1 Merge branch 'cn/develop' into cn/publish/release Browse Code »

熊润斐
2021-05-21 11:57:31 +0800
2485b746 角色名片bug Browse Code »

liuzujun
2021-05-21 11:15:29 +0800

20 May, 2021

1 commit

439fad96 merge cn/develop to cn/publish/release Browse Code »

liuzujun
2021-05-20 19:01:28 +0800