wasteland / server

11 Nov, 2021

2 commits

aa8fb2ee Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-11-11 12:07:56 +0800
7d5e688f 临时清除活动电台任务 Browse Dir »

liuzujun
2021-11-11 12:06:57 +0800

09 Nov, 2021

2 commits

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

jiyue
2021-11-09 18:09:13 +0800
7e61a962 新增通用生成订单协议， ... Browse Dir »
```
上报登录等处消息到中宣
苹果支付回调修改
```
liuzujun
2021-11-09 17:47:46 +0800

03 Nov, 2021

1 commit

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

jiyue
2021-11-03 09:45:01 +0800

01 Nov, 2021

1 commit

54b7749c fix:英雄突破和英雄升级，日志增加英雄id Browse Dir »

zhangqijia
2021-11-01 19:27:59 +0800

29 Oct, 2021

1 commit

e4814423 fix: 修复 ltrim调用问题 Browse Dir »

zhangqijia
2021-10-29 14:20:14 +0800

28 Oct, 2021

3 commits

17c9ca5b fix: 讨伐电台判空 Browse Dir »

zhangqijia
2021-10-28 18:39:47 +0800
c42e3402 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-10-28 01:48:42 +0800
27acaa11 修复一个 nil 带来的报错 Browse Dir »

zhanghualin
2021-10-28 01:48:06 +0800

27 Oct, 2021

5 commits

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

jiyue
2021-10-27 18:18:51 +0800
af6197fd feat: 兑换魔鬼训练营门票 Browse Dir »

zhangqijia
2021-10-27 15:59:42 +0800
5ef0f2c7 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-10-27 15:46:08 +0800
21c09fa2 fix: 活动派遣同时只能有一个存在 Browse Dir »

zhangqijia
2021-10-27 11:21:26 +0800
c5fe43c2 fix: 活动派遣不占用正常讨伐电台派遣队伍数量 Browse Dir »

zhangqijia
2021-10-27 10:31:55 +0800

20 Oct, 2021

1 commit

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

jiyue
2021-10-20 18:06:12 +0800

14 Oct, 2021

6 commits

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

zhangqijia
2021-10-14 16:58:51 +0800
b7106842 fix: add 餐厅 log Browse Dir »

zhangqijia
2021-10-14 16:58:09 +0800
265ee99f 商店购买刷购买上限bug 导致虹光玉溢出 Browse Dir »

liuzujun
2021-10-14 14:54:18 +0800
cd4bc13c 商店购买刷购买上限bug 导致虹光玉溢出 Browse Dir »

liuzujun
2021-10-14 14:52:41 +0800
d66e5487 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-10-14 11:06:48 +0800
f424762f 奇迹魔法一键领取超上限bug Browse Dir »

liuzujun
2021-10-14 10:52:11 +0800

12 Oct, 2021

1 commit

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

11 Oct, 2021

1 commit

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

zhangqijia
2021-10-11 11:45:56 +0800

09 Oct, 2021

1 commit

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

zhangqijia
2021-10-09 19:15:13 +0800

30 Sep, 2021

2 commits

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

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

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

28 Sep, 2021

7 commits

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

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

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

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

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

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

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

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

27 Sep, 2021

1 commit

171abf99 每日世界聊天上限 Browse Dir »

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

26 Sep, 2021

5 commits

62920af9 fix: 奖励关卡挑战卡消耗逻辑调整 ... Browse Dir »
```
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 Dir »
```
# Conflicts:
#	src/actions/GmAction.lua
```
zhangqijia
2021-09-26 16:54:19 +0800

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

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

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

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

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

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