wasteland / server | GitLab

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

3 commits

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

jiyue
2021-11-03 17:11:12 +0800
e9c1df55 活动商品结束清购买记录修改Email表content字段 Browse Dir »

liuzujun
2021-11-03 15:58:48 +0800
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

7 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
963598f6 Merge remote-tracking branch 'origin/cn/develop' into cn/develop Browse Dir »

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

zhangqijia
2021-10-27 10:31:55 +0800
5204a839 活动电台任务结束时候清理任务 Browse Dir »

liuzujun
2021-10-27 10:02:06 +0800

20 Oct, 2021

2 commits

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

jiyue
2021-10-20 18:06:12 +0800
d1944a2b fix: 修复赞誉加上固有提升数 Browse Dir »

zhangqijia
2021-10-20 09:53:40 +0800

19 Oct, 2021

1 commit

5b0a99f7 fix: 修复 getDeltaValue函数的bug Browse Dir »

zhangqijia
2021-10-19 18:16:50 +0800

14 Oct, 2021

12 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
3127068f fix: delete log Browse Dir »

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

liuzujun
2021-10-14 14:54:18 +0800
c00d76f7 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

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

liuzujun
2021-10-14 14:52:41 +0800
eb97418a fix: delete log Browse Dir »

zhangqijia
2021-10-14 14:34:49 +0800
25e5cbb7 Merge branch 'cn/develop' into cn/publish/preview Browse Dir »

jiyue
2021-10-14 13:09:31 +0800
c3f5ce22 fix: 赞誉度增幅中的餐厅齿轮增幅修改 Browse Dir »

zhangqijia
2021-10-14 13:07:30 +0800
d66e5487 Merge branch 'cn/develop' into cn/publish/preview ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
jiyue
2021-10-14 11:06:48 +0800
52837c5a Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

liuzujun
2021-10-14 10:52:13 +0800
f424762f 奇迹魔法一键领取超上限bug Browse Dir »

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

13 Oct, 2021

1 commit

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

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 Dir »

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

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

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

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 Dir »
```
# Conflicts:
#	config/nodenames.lua
```
jiyue
2021-10-12 09:54:11 +0800