wasteland / server

28 Jul, 2021

1 commit

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

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

27 Jul, 2021

2 commits

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

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

26 Jul, 2021

2 commits

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

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

23 Jul, 2021

1 commit

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

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

22 Jul, 2021

3 commits

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

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

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

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

21 Jul, 2021

1 commit

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

zhangqijia
2021-07-21 16:40:56 +0800

20 Jul, 2021

3 commits

eae157a4 feat: 月卡 + 特刊的道具兑换 Browse Dir »

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

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

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

15 Jul, 2021

4 commits

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

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

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

liuzujun
2021-07-15 11:51:54 +0800

12 Jul, 2021

2 commits

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

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

02 Jul, 2021

1 commit

69525ba2 feat: 每次抽卡获得对应货币 ... Browse Dir »
```
活动 烟火女王/肃正之刃 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 Dir »

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

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

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

18 Jun, 2021

1 commit

dac9fbcc cb1活跃回馈 Browse Dir »

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

11 Jun, 2021

1 commit

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

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

07 Jun, 2021

2 commits

c759f4a4 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-06-07 14:14:27 +0800

041ee0b2 fix: 挂机图鉴的bug ... Browse Dir »

1. 若两个宝藏出现在同一个探索点，显示的时间异常
2. 线上，每日宝藏刷新的地点应该刷新在非我挂机的地点，而且每个宝藏需要不同地点

2021-06-07 14:06:29 +0800

05 Jun, 2021

2 commits

2b9d907e Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

熊润斐
2021-06-05 17:22:58 +0800
6f2c24ed 友情池bug Browse Dir »

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

02 Jun, 2021

2 commits

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

jiyue
2021-06-02 22:23:40 +0800
2c3a1b31 fix: 修复复仇扣除3门票的BUG Browse Dir »

zhangqijia
2021-06-02 21:27:34 +0800

31 May, 2021

1 commit

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

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

28 May, 2021

2 commits

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

liuzujun
2021-05-28 15:47:19 +0800
b9536b02 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

熊润斐
2021-05-28 15:28:53 +0800

27 May, 2021

6 commits

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

zhangqijia
2021-05-27 20:01:26 +0800
382b9702 fix: 分解铭文返还强化所需铭文碎片的60%的bug, ... Browse Dir »
```
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 Dir »

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

liuzujun
2021-05-27 19:21:48 +0800
9e2e5c31 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

熊润斐
2021-05-27 19:16:50 +0800
e951e307 fix: 分解铭文返还强化所需铭文碎片的60%的bug ... Browse Dir »
```
1. 需加上强化从0-1的铭文所需的铭文碎片的60%
2. 需要向上取整铭文碎片
```
zhangqijia
2021-05-27 19:16:36 +0800