wasteland / server | GitLab

28 Jul, 2021

1 commit

8546aa8f Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-07-28 18:00:25 +0800

27 Jul, 2021

2 commits

cd2a7a67 fix: 一番赏奖励中加入得奖者的名字字段 name=name Browse Code »

zhangqijia
2021-07-27 19:25:04 +0800
d10a9a36 fix: 一番赏增加通知信息的数据结构，掉线往capsule服务发送退出指令 ... Browse Code »
```
1. 确定通知信息的数据结构
2. 奖励还是k=v形式
3. 掉线发送exit协议
```
zhangqijia
2021-07-27 16:16:00 +0800

26 Jul, 2021

2 commits

f382b4f2 fix: 一番赏的抽奖bug ... Browse Code »
```
1. 抽奖，返回值4，返回奖品数量差异
2. 报名协议，返回扭蛋机详情。
```
zhangqijia
2021-07-26 19:01:38 +0800
555f745e feat: 一番赏 Browse Code »

zhangqijia
2021-07-26 17:59:02 +0800

23 Jul, 2021

1 commit

4ea2bdc4 Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-07-23 10:48:48 +0800

22 Jul, 2021

3 commits

34c8cf27 fix: 商店不打折商品，售价为0的bu Browse Code »

zhangqijia
2021-07-22 14:38:24 +0800
eda7b817 fix: 商店折扣为0 价格为零的bug Browse Code »

zhangqijia
2021-07-22 11:48:07 +0800
879b2204 fix: 商店折扣后价格向上取整 Browse Code »

zhangqijia
2021-07-22 10:34:43 +0800

21 Jul, 2021

2 commits

ff72d1eb fix: 商店商品购买折扣bug Browse Code »

zhangqijia
2021-07-21 16:40:56 +0800
41b05e8f fix: 月卡+特刊领取奖励后，还会一直弹出领取界面的bug Browse Code »

zhangqijia
2021-07-21 09:31:20 +0800

20 Jul, 2021

4 commits

fc8e212e fix: 月卡- 增刊异常 ... Browse Code »
```
领完当天月卡，在月卡界面购买增刊后，重新刷新主界面、重启游戏都无法领取增刊奖励
```
zhangqijia
2021-07-20 18:27:47 +0800
eae157a4 feat: 月卡 + 特刊的道具兑换 Browse Code »

zhangqijia
2021-07-20 15:08:23 +0800
2f0830e3 Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-07-20 14:51:04 +0800
c9c0150d fix: 月卡购买不成功的bug Browse Code »

zhangqijia
2021-07-20 10:23:29 +0800

19 Jul, 2021

5 commits

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

liuzujun
2021-07-19 12:16:23 +0800
cc30a8b3 玛尼英雄帖任务类型7与15 bug Browse Code »

liuzujun
2021-07-19 12:16:20 +0800
1d073c8b Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Code »

zhangqijia
2021-07-19 10:22:46 +0800
1917a4a4 fix: 拾荒商店未优惠商品bug Browse Code »

zhangqijia
2021-07-19 10:22:33 +0800
7af54527 fix: 月卡-特刊购买次数单独进行限制 Browse Code »

zhangqijia
2021-07-19 09:39:06 +0800

15 Jul, 2021

8 commits

d4876585 神稀活动普通关卡扫荡不给三星奖励，添加充值价格系数 Browse Code »

liuzujun
2021-07-15 17:21:59 +0800
94f99134 fix: shop_card字段修改 ... Browse Code »
```
1. buyLimit update
2. itemFirst  add
3. itemOnce add
4. countLimit
add
5. itemDaily add
```
zhangqijia
2021-07-15 16:09:14 +0800
18100f8b Merge branch 'cn/publish/preview' of 120.26.43.151:wasteland/server into cn/publish/preview Browse Code »

liuzujun
2021-07-15 12:08:32 +0800
6a380010 Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
* cn/develop:
  gm后台查询日志，公告相关协议
  payAction Order不缓存
```
liuzujun
2021-07-15 12:08:06 +0800
98f7d4a8 merge code Browse Code »

liuzujun
2021-07-15 11:52:45 +0800
e84a1beb gm后台查询日志，公告相关协议 Browse Code »

liuzujun
2021-07-15 11:51:54 +0800
7eaa622d payAction Order不缓存 Browse Code »

GEM0816
2021-07-15 09:46:13 +0800
811cddfc payAction Order不缓存 Browse Code »

GEM0816
2021-07-15 09:22:45 +0800

14 Jul, 2021

1 commit

b6a84789 Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-07-14 14:51:15 +0800

12 Jul, 2021

4 commits

95d3923e Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-07-12 16:28:29 +0800
99f84aa1 fix: 特刊解锁机制修改，删除openFlag字段 Browse Code »

zhangqijia
2021-07-12 14:31:37 +0800
cddfa602 feat: 月卡解锁的日/周商店随机刷新商品机制 Browse Code »

zhangqijia
2021-07-12 09:49:06 +0800
c40a6460 feat: 月卡+特刊 ... Browse Code »
```
1. 购买
2. 初回特典
3. 每日奖励
```
zhangqijia
2021-07-12 09:48:48 +0800

06 Jul, 2021

1 commit

116ecca6 fix: 拾荒商店优惠价格扣除的bug Browse Code »

zhangqijia
2021-07-06 16:58:46 +0800

02 Jul, 2021

1 commit

69525ba2 feat: 每次抽卡获得对应货币 ... Browse Code »
```
活动 烟火女王/肃正之刃 8.12号开启
```
zhangqijia
2021-07-02 10:58:40 +0800

23 Jun, 2021

3 commits

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

liuzujun
2021-06-23 20:57:29 +0800
50da0e37 挑战关卡活动普通关卡扫荡，购买挑战次数 Browse Code »

liuzujun
2021-06-23 20:57:26 +0800
e572e903 fix: 拾荒生存力和属性调整 Browse Code »

zhangqijia
2021-06-23 13:52:47 +0800

18 Jun, 2021

1 commit

dac9fbcc cb1活跃回馈 Browse Code »

liuzujun
2021-06-18 11:51:05 +0800

11 Jun, 2021

1 commit

2d07aef9 签到改成4点刷新 Browse Code »

liuzujun
2021-06-11 15:50:11 +0800