wasteland / server

07 Sep, 2021

1 commit

c4d8e9d2 Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-09-07 10:08:45 +0800

03 Sep, 2021

1 commit

e66080dd test: 去除关卡卡角色等级；改为账号等级解锁角色等级上限 Browse Code »

zhangqijia
2021-09-03 16:12:25 +0800

02 Sep, 2021

9 commits

37502372 feat: 付费战令每日任务获得额外50%经验 Browse Code »

zhangqijia
2021-09-02 19:25:22 +0800
bc50c971 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Code »

zhangqijia
2021-09-02 18:06:07 +0800
2ce63aa5 fix: 扭蛋机，跨天自动重置改为手动重置 Browse Code »

zhangqijia
2021-09-02 18:05:00 +0800
7f29530e Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

saicom
2021-09-02 17:11:28 +0800
f2c7c6fa 添加补发充值邮件 Browse Code »

saicom
2021-09-02 17:11:25 +0800
71d319eb fix: 使用特殊道具也要增加对应的 "购买记录" Browse Code »

zhangqijia
2021-09-02 15:44:52 +0800
b88939d5 fix: 玛尼的英雄帖增加任务类型 bug修复 ... Browse Code »
```
1. 招募英雄需要重新计算所有英雄的星级总数
2. 英雄达到3级需要增加英雄CG解锁总数
```
zhangqijia
2021-09-02 15:10:32 +0800
b454725a feat: 英雄精进触发礼包，修复月卡购买的一些bug Browse Code »

zhangqijia
2021-09-02 11:41:27 +0800
81941afd fix: 特刊增加初回特典，优化了一下月卡购买的函数 Browse Code »

zhangqijia
2021-09-02 10:49:40 +0800

01 Sep, 2021

1 commit

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

jiyue
2021-09-01 09:35:37 +0800

31 Aug, 2021

1 commit

a93ce9c0 fix: 特殊道具兑换，增加活动判断，活动过期则返回错误码 Browse Code »

zhangqijia
2021-08-31 09:19:20 +0800

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