wasteland / server

30 Aug, 2021

1 commit

766ddd19 Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-08-30 14:08:25 +0800

27 Aug, 2021

2 commits

8c154e11 定时gc Browse Code »

saicom
2021-08-27 12:28:46 +0800
e3f6fe34 feat: 月卡特权，购买魔导石会有 cardReward 的奖励 ... Browse Code »
```
1. 月卡特权
2. 删除破冰礼包多余的购买记录。
3. 修改兑换特殊道具的协议名字，日志名字。
```
zhangqijia
2021-08-27 10:45:30 +0800

26 Aug, 2021

8 commits

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

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

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

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

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

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

saicom
2021-08-26 16:04:46 +0800
5db4c63a fix: 世界线积分, 修复计算错误bug Browse Code »

zhangqijia
2021-08-26 10:16:11 +0800

25 Aug, 2021

3 commits

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

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

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

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

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

9f21cb8e fix: 修改触发礼包逻辑 ... Browse Code »
```
触发礼包不走shop_normal了，直接从shop_pack读到shop_recharge
```
zhangqijia
2021-08-25 10:33:11 +0800

23 Aug, 2021

1 commit

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

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

19 Aug, 2021

7 commits

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

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

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

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

jiyue
2021-08-19 13:30:56 +0800
ebe413bc Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

saicom
2021-08-19 09:14:00 +0800
d742048c ios充值前面改为东银河 Browse Code »

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

18 Aug, 2021

1 commit

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

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

17 Aug, 2021

1 commit

9e5f9701 feat: 玛尼的英雄帖增加任务类型 ... Browse Code »
```
增加任务类型：
44：玩家拥有拾荒者总星级达到xxx
45：玩家累计解锁xx张CG
```
zhangqijia
2021-08-17 15:43:45 +0800

16 Aug, 2021

1 commit

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

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

14 Aug, 2021

2 commits

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

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

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

13 Aug, 2021

7 commits

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

jiyue
2021-08-13 22:07:15 +0800
29c70fba 添加更新sql affect row = 0 log Browse Code »

liuzujun
2021-08-13 22:04:31 +0800
304fbbeb Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-08-13 21:10:24 +0800
209c42ff 添加道具及时保存 Browse Code »

liuzujun
2021-08-13 21:04:54 +0800
8d6f978d Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-08-13 20:33:26 +0800
2f86b7e2 限时礼包清理payR Browse Code »

liuzujun
2021-08-13 17:17:27 +0800
b92a81c9 CB2限时礼包 Browse Code »

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

12 Aug, 2021

3 commits

89894b71 Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
* cn/develop:
  神稀扣门票逻辑修改
```
liuzujun
2021-08-12 18:18:47 +0800
a29d8377 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

liuzujun
2021-08-12 17:12:34 +0800
74bb1229 神稀扣门票逻辑修改 Browse Code »

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

11 Aug, 2021

2 commits

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

jiyue
2021-08-11 16:29:08 +0800
923a626e feat: 远征，增加消耗虹光玉的任务，任务类型是43 Browse Code »

zhangqijia
2021-08-11 15:14:10 +0800

10 Aug, 2021

1 commit

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

jiyue
2021-08-10 18:45:58 +0800