wasteland / server

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

26 Aug, 2021

7 commits

21395b80 feat: 等级效果增加 type=18，每次探索加速额外获得道具 Browse Dir »

zhangqijia
2021-08-26 18:25:14 +0800
8a9139fa Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

zhangqijia
2021-08-26 16:54:28 +0800
993bb525 refactor: 世界线积分，倍率由两位数改为十以内的小数 Browse Dir »

zhangqijia
2021-08-26 16:54:15 +0800
386cd4c1 feat: 狩猎祭，增加重置扭蛋机协议 ... Browse Dir »
```
Activity_resetGachakonRpc = 676, --狩猎祭，重制扭蛋机
```
zhangqijia
2021-08-26 16:41:55 +0800
f8a0d369 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-08-26 16:06:28 +0800
a8a9adb2 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

saicom
2021-08-26 16:04:49 +0800
e0d725cc 东银河安卓sdk Browse Dir »

saicom
2021-08-26 16:04:46 +0800

25 Aug, 2021

2 commits

200652e6 fix: 修正两个协议的返回值 return true Browse Dir »

zhangqijia
2021-08-25 18:20:40 +0800

95c9089b feat: 新增世界线积分功能。 ... Browse Dir »

1. 新增字段worldChangePoints   = {"table", {}}, 	-- 世界变动积分
2. 新增字段
worldLineReward 	= {"table", {}},    -- 世界积分 领取记录 {[id] = 1}
3. 新增协议： 1)
抽轮盘协议 2) 一键领取世界积分奖励。

2021-08-25 16:20:15 +0800

23 Aug, 2021

1 commit

68f7a264 fix: 兑换月卡/战令道具的协议参数修改 change_id => exchange_id Browse Dir »

zhangqijia
2021-08-23 14:42:57 +0800

19 Aug, 2021

6 commits

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

zhangqijia
2021-08-19 16:24:54 +0800
8f49e40e refactor: 战令等级由虹光玉调整为魔导石购买 Browse Dir »

zhangqijia
2021-08-19 16:23:50 +0800
bdd6c00d Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
* cn/develop:
  东银河订单加签
```
saicom
2021-08-19 15:45:34 +0800
c0290d89 东银河订单加签 Browse Dir »

saicom
2021-08-19 15:45:17 +0800
26f9685e Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-08-19 13:30:56 +0800
d742048c ios充值前面改为东银河 Browse Dir »

saicom
2021-08-19 09:13:57 +0800

18 Aug, 2021

1 commit

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

jiyue
2021-08-18 16:50:02 +0800

16 Aug, 2021

1 commit

cd90db08 神稀购买门票协议顺序修改 Browse Dir »

liuzujun
2021-08-16 18:38:53 +0800

14 Aug, 2021

2 commits

5c8c3b70 离线角色强制保存 Browse Dir »

liuzujun
2021-08-14 22:04:47 +0800
a8bab292 离线对象保存bug Browse Dir »

liuzujun
2021-08-14 17:57:39 +0800

13 Aug, 2021

2 commits

8d6f978d Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-08-13 20:33:26 +0800
b92a81c9 CB2限时礼包 Browse Dir »

liuzujun
2021-08-13 15:35:27 +0800

12 Aug, 2021

2 commits

89894b71 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
* cn/develop:
  神稀扣门票逻辑修改
```
liuzujun
2021-08-12 18:18:47 +0800
74bb1229 神稀扣门票逻辑修改 Browse Dir »

liuzujun
2021-08-12 17:12:31 +0800

10 Aug, 2021

2 commits

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

jiyue
2021-08-10 18:45:58 +0800
d85ecb3f 神稀祭消耗门票bug Browse Dir »

liuzujun
2021-08-10 16:16:14 +0800

09 Aug, 2021

3 commits

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

jiyue
2021-08-09 20:33:21 +0800
9fa9ebd9 fix: 海港贸易商店物品的 shop 值 5 改为 4 Browse Dir »

zhangqijia
2021-08-09 14:55:58 +0800
0fc7fc5e fix: 修复代理拾荒区域特产未获得的bug Browse Dir »

zhangqijia
2021-08-09 12:28:48 +0800

07 Aug, 2021

1 commit

639bbdff fix: 一番赏获取扭蛋机列表，请求参数 coin 改为id Browse Dir »

zhangqijia
2021-08-07 14:42:51 +0800

06 Aug, 2021

4 commits

fc88324a Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

zhangqijia
2021-08-06 16:59:00 +0800
a5a46483 fix: 一番赏修复消耗票兑换不增加消耗票的bug Browse Dir »

zhangqijia
2021-08-06 16:56:30 +0800
06c7246e 按500人分线 Browse Dir »

liuzujun
2021-08-06 15:57:14 +0800
f66891be fix: 一番赏打开激励奖导致抽奖逻辑性阻塞的bug Browse Dir »

zhangqijia
2021-08-06 10:27:19 +0800

05 Aug, 2021

1 commit

da20e384 feat: 一番赏特殊赏通知 ... Browse Dir »

1. 服务器主动通知 Capsule_notifyChange = 856
2. 客户端主动获获取 Capsule_specialRewardRpc = 857
3. 客户端消除特殊赏通知指令 Capsule_clearSpecialNtyRpc = 862

备注：客户端收到特殊赏的奖励后，都需要消除特殊赏通知。不然特殊赏通知会一直存在。

2021-08-05 15:24:59 +0800

04 Aug, 2021

1 commit

01ff9b4b fix: 一番赏优化; 抽奖记录分页；抽扭蛋机，返回值更新 ... Browse Dir »
```
1. 每次获取最新的20条record，然后再通过指令增量获取抽奖记录
2.
抽扭蛋机，返回值更新，{usual={},special={},incentive={},capsule={}}
```
zhangqijia
2021-08-04 18:44:58 +0800