wasteland / server | GitLab

03 Aug, 2021

2 commits

e08b052f Merge branch 'cn/develop' into cn/player Browse Code »

jiyue
2021-08-03 12:01:12 +0800
49df162b fix: 一番赏增加drawEndTime,优化获取奖励剩余数量。 Browse Code »

zhangqijia
2021-08-03 10:06:24 +0800

02 Aug, 2021

1 commit

87ce675f fix: 一番赏屏蔽初始化日志 Browse Code »

zhangqijia
2021-08-02 16:59:28 +0800

30 Jul, 2021

3 commits

49810b00 fix: 一番赏抽奖记录去掉amount字段，改为一个奖品对应一条记录 Browse Code »

zhangqijia
2021-07-30 17:42:00 +0800
fb29343f fix: 一番赏断线离开扭蛋机房间 Browse Code »

zhangqijia
2021-07-30 16:27:31 +0800
096de6f7 fix: 一番赏抽扭蛋机通知特殊赏，只通知个人所获得的奖励 Browse Code »

zhangqijia
2021-07-30 16:26:49 +0800

29 Jul, 2021

5 commits

6304b5ad feat: 一番赏增加重置扭蛋机指令 ... Browse Code »
```
reset_capsule typ
typ类型：
0=独享
1=公开
```
zhangqijia
2021-07-29 18:30:56 +0800
50a0dd50 fix: 一番赏重新组合商品id Browse Code »

zhangqijia
2021-07-29 18:09:38 +0800
d4f83f16 feat: 一番赏增加抽扭蛋机消耗票指令 ... Browse Code »
```
Capsule_convertCapsuleRpc = 890, --兑换消耗票
```
zhangqijia
2021-07-29 15:10:41 +0800
a997a3b0 fix: 一番赏打开消耗票的功能 Browse Code »

zhangqijia
2021-07-29 14:33:44 +0800
0a421d34 fix: 一番赏奖励刷新协议缺少roleId参数的bug ... Browse Code »
```
1. 修复刷新协议
2. goods id直接使用 配置表id
```
zhangqijia
2021-07-29 12:29:43 +0800

28 Jul, 2021

1 commit

0eb317fb fix: 一番赏奖励抽奖的bug与功能完善 ... Browse Code »
```
1. 增加获取扭蛋机信息的协议
2. 特殊赏奖励发放
3. 增加抽扭蛋机消耗 --暂时屏蔽
4. 激励奖暂时屏蔽
```
zhangqijia
2021-07-28 18:22:42 +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

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

3 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
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

6 commits

40745a5b Merge branch 'cn/develop' into cn/player Browse Code »

jiyue
2021-07-15 18:31:41 +0800
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
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
811cddfc payAction Order不缓存 Browse Code »

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

12 Jul, 2021

3 commits

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