wasteland / server | GitLab

13 Oct, 2021

1 commit

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

jiyue
2021-10-13 18:04:02 +0800

12 Oct, 2021

5 commits

3b410558 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

zhangqijia
2021-10-12 17:55:06 +0800
46c63bba Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop ... Browse Code »
```
# Conflicts:
#	src/models/Activity.lua
```
liuzujun
2021-10-12 17:05:14 +0800
21581e1f 新增电台类活动 Browse Code »

liuzujun
2021-10-12 17:03:37 +0800

e7ba6e04 fix: 赞誉度增幅餐厅收益计算问题 ... Browse Code »

level_addition中的效果值6=0计算顺序有误，应该为单份料理的价格提升，实际为单种料理的价格提升
当卖50份的时候，单价为200，提升价格到250
应该获得50乘以250的收益
现在为（200乘以50）+50的收益

2021-10-12 11:24:32 +0800

7a749326 Merge branch 'cn/develop' into cn/publish/preview ... Browse Code »
```
# Conflicts:
#	config/nodenames.lua
```
jiyue
2021-10-12 09:54:11 +0800

11 Oct, 2021

2 commits

dd328bd6 fix: 常规世界boss，防作弊 Browse Code »

zhangqijia
2021-10-11 11:45:56 +0800
ec26aa3d fix: 常规世界boss，日志类型修改 Browse Code »

zhangqijia
2021-10-11 10:41:05 +0800

09 Oct, 2021

2 commits

0769908c feat: 常规世界boss Browse Code »

zhangqijia
2021-10-09 19:15:13 +0800
3f9b3dbf fix: 战令活动，sum字段判空。 ... Browse Code »
```
BattleCommand
```
zhangqijia
2021-10-09 18:00:26 +0800

30 Sep, 2021

2 commits

3f14b267 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

liuzujun
2021-09-30 14:08:38 +0800
012f7893 添加拉满日活跃度 gm指令 Browse Code »

liuzujun
2021-09-30 14:08:28 +0800

28 Sep, 2021

7 commits

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

jiyue
2021-09-28 18:24:44 +0800
37c968fa fix: 礼包码奖励改为邮件 Browse Code »

zhangqijia
2021-09-28 16:52:21 +0800
58893852 Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-09-28 15:10:18 +0800
6e0a6d6b fix: 礼包兑换码奖励改回放入背包 Browse Code »

zhangqijia
2021-09-28 15:09:34 +0800
ced79bc3 Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-09-28 14:54:05 +0800
6ad7e803 fix: 礼包兑换码奖励通过邮件发送 Browse Code »

zhangqijia
2021-09-28 14:50:34 +0800
79b03260 Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-09-28 10:51:09 +0800

27 Sep, 2021

2 commits

c8981ed2 chatTimes数据下发 Browse Code »

liuzujun
2021-09-27 16:33:58 +0800
171abf99 每日世界聊天上限 Browse Code »

liuzujun
2021-09-27 15:47:19 +0800

26 Sep, 2021

5 commits

62920af9 fix: 奖励关卡挑战卡消耗逻辑调整 ... Browse Code »
```
bonusC 的数据结构修改为 {"c"=0, "b"=0}
```
zhangqijia
2021-09-26 18:22:33 +0800
2c6371cb Merge remote-tracking branch 'origin/cn/develop' into cn/develop ... Browse Code »
```
# Conflicts:
#	src/actions/GmAction.lua
```
zhangqijia
2021-09-26 16:54:19 +0800

7a515b60 feat: 增加一个礼包码的接口 ... Browse Code »

1. 把原来的礼包码协议和新增的礼包码接口的共同部分写成一个函数
2. 增加一个GM指令调用获取礼包。

2021-09-26 16:50:05 +0800

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

jiyue
2021-09-26 10:31:52 +0800
cfae632e 玩家商品购买次数减一 Browse Code »

liuzujun
2021-09-26 09:09:22 +0800

24 Sep, 2021

2 commits

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

jiyue
2021-09-24 17:33:35 +0800
7eda801e fix: 修复周商店刷新商品内容为空的bug Browse Code »

zhangqijia
2021-09-24 16:26:08 +0800

23 Sep, 2021

9 commits

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

jiyue
2021-09-23 21:02:15 +0800

3945affc fix: 如果CrossDay跟CrossWeek互换调用顺序，则会导致周任务不重置。 ... Browse Code »

1. 如果放到CrossDay中，新号创建会触发CrossWeek，会清空 bcTask字段
2. 如果CrossDay跟CrossWeek互换调用顺序，则会导致周任务不重置。
3. self:checkTaskEnter("Login")任务放到这里虽然不好看，但是没办法。只能放这了。

2021-09-23 19:50:15 +0800

16790b38 fix: 战令错误日志加上 roleId Browse Code »

zhangqijia
2021-09-23 19:25:55 +0800
c0f423a0 fix: 判空防止崩溃 Browse Code »

zhangqijia
2021-09-23 19:21:04 +0800
590d9c55 fix: 解决新号触发跨周，会重置周任务 Browse Code »

zhangqijia
2021-09-23 19:16:23 +0800
46b435af fix: 当活动未开启，找不到活动配置时候，记录日志。 ... Browse Code »
```
充值超级战令，shop_recharge, id = 503; activity_ctrl, id=46
showType=25。充值成功，战令未显示。
```
zhangqijia
2021-09-23 17:48:20 +0800
c0308568 fix: 跨天登录才计登录天数 Browse Code »

zhangqijia
2021-09-23 14:51:14 +0800
6305757d Merge branch 'cn/develop' into cn/publish/preview Browse Code »

jiyue
2021-09-23 11:08:05 +0800
c875de66 fix: 探索指令道具兑换，修复14506错误 Browse Code »

zhangqijia
2021-09-23 11:05:10 +0800

22 Sep, 2021

3 commits

bad49c2a 去除重复领取剧情奖励报错 11402 Browse Code »

liuzujun
2021-09-22 20:03:52 +0800
2e4b7c03 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Code »

liuzujun
2021-09-22 15:57:41 +0800
f82a5775 去除重复领取剧情奖励报错 11402 Browse Code »

liuzujun
2021-09-22 15:57:34 +0800