wasteland / server

15 Apr, 2021

1 commit

32b878ea Merge branch 'tr/bugfix' into tr/publish/preview Browse File »

熊润斐
2021-04-15 11:38:57 +0800

14 Apr, 2021

4 commits

9d88f923 删除调试日志 Browse File »

liuzujun
2021-04-14 21:24:08 +0800
9bc0f861 fix bug Browse File »

liuzujun
2021-04-14 20:40:03 +0800
f2348164 新增ios充值回调调试日志 Browse File »

liuzujun
2021-04-14 20:26:15 +0800
18722d1e 修改过期头像邮件发送方式 sendMail接口 Browse File »

liuzujun
2021-04-14 20:21:01 +0800

01 Apr, 2021

1 commit

c6a4c456 boss挑战门票购买可以超出上限 Browse File »

liuzujun
2021-04-01 13:31:16 +0800

31 Mar, 2021

1 commit

ab2928d9 海港贸易季结束后自动领取奖励，第二期邮件未发送 Browse File »

chenyueqi
2021-03-31 16:50:04 +0800

26 Mar, 2021

1 commit

d9d63fa0 海港贸易季自动填充，活动结束后的奖励通过邮件发送 Browse File »

chenyueqi
2021-03-26 11:20:44 +0800

25 Mar, 2021

2 commits

064138fe 定制礼包相关bug修复 Browse File »

liguanghui
2021-03-25 19:16:30 +0800
2dbe4fb9 充值礼包自选部分逻辑 Browse File »

chenyueqi
2021-03-25 16:42:34 +0800

22 Mar, 2021

1 commit

a5dc3b0e 回归活动初版 Browse File »

chenyueqi
2021-03-22 14:30:13 +0800

18 Mar, 2021

2 commits

1630cd4d Merge branch 'tr/develop' of 120.26.43.151:wasteland/server into tr/develop Browse File »

liuzujun
2021-03-18 17:47:51 +0800
3d8468b2 火花系统 Browse File »

liuzujun
2021-03-18 17:47:46 +0800

17 Mar, 2021

4 commits

c4814196 从数据库读取捐赠物品顺序错误 Browse File »

chenyueqi
2021-03-17 17:39:26 +0800
007a7927 奖励计算错误，遗漏一处 Browse File »

chenyueqi
2021-03-17 17:10:49 +0800
91ef5b2f 自动结算海岛贸易季，领取捐赠奖励报错 Browse File »

chenyueqi
2021-03-17 10:52:19 +0800
98699b0c 自动结算海岛贸易季捐赠奖励领取报错 Browse File »

chenyueqi
2021-03-17 10:50:03 +0800

16 Mar, 2021

3 commits

09582aac 海港贸易相关bug修复 Browse File »

liguanghui
2021-03-16 16:07:12 +0800
5fb0ac5f 海港贸易相关bug修复 Browse File »

liguanghui
2021-03-16 11:38:47 +0800
9fc8b7f0 分割字符串错误 Browse File »

chenyueqi
2021-03-16 10:04:24 +0800

15 Mar, 2021

1 commit

65b551a7 海港贸易季初版 Browse File »

chenyueqi
2021-03-15 15:09:16 +0800

10 Mar, 2021

1 commit

a42130ee 电波塔加成错误 ... Browse File »
```
(cherry picked from commit bf1aebbc6f7d25e3d537e52a90f065e465400771)
```
chenyueqi
2021-03-10 17:15:47 +0800

09 Mar, 2021

1 commit

6e76008a bug修复：电波塔排行榜协议报错 Browse File »

liguanghui
2021-03-09 11:27:37 +0800

08 Mar, 2021

1 commit

5ac65e38 Merge branch 'tr/tower' into tr/develop Browse File »

chenyueqi
2021-03-08 17:18:04 +0800

04 Mar, 2021

1 commit

4e9566f2 电波塔加成算法解析字段方法修正 Browse File »

chenyueqi
2021-03-04 17:55:26 +0800

03 Mar, 2021

3 commits

4ee2fe31 电波塔bug Browse File »

chenyueqi
2021-03-03 20:45:35 +0800
761b3ea8 再改一波电波塔整容相关信息 Browse File »

chenyueqi
2021-03-03 17:44:13 +0800
40b19300 电波塔激活加成效果后对各个系统的加成 Browse File »

chenyueqi
2021-03-03 15:18:38 +0800

02 Mar, 2021

1 commit

8eaed74e 战令活动开启时清除购买记录，新增Boss挑战门票类型道具 type=20 Browse File »

liuzujun
2021-03-02 15:59:52 +0800

24 Feb, 2021

2 commits

e50d0cae 计算电波塔层数的加成效果 Browse File »

chenyueqi
2021-02-24 16:18:58 +0800
03c619fb 电波塔属性塔功能部分功能草稿 Browse File »

chenyueqi
2021-02-24 11:08:24 +0800

03 Feb, 2021

2 commits

2d046fcb 通知邮件 Browse File »

zhouhaihai
2021-02-03 16:57:58 +0800
af2870d8 金额使用乘以 100 的方式 Browse File »

zhouhaihai
2021-02-03 12:12:37 +0800

02 Feb, 2021

2 commits

6df9d5e1 mycard twd Browse File »

zhouhaihai
2021-02-02 16:37:31 +0800
e9da8c21 反回的是twd Browse File »

zhouhaihai
2021-02-02 15:44:10 +0800

27 Jan, 2021

2 commits

fb891778 fix confict Browse File »

liuzujun
2021-01-27 20:36:28 +0800
dfa9ae5e 战令任务活动 Browse File »

liuzujun
2021-01-27 20:35:24 +0800

26 Jan, 2021

2 commits

279a5773 Merge branch 'tr/bugfix-qa' into tr/develop ... Browse File »

* tr/bugfix-qa:
  获得所有SSR 且满级 满觉醒 同时获得全部满级金色铭文 满精进
  充值mycard
  拾荒bug
  pvp 匹配 和 失败扣减积分
  无论什么方式翻开中继层格子都给奖励
  跨天礼包重置
  月重置
  跨月
  拾荒 失败也记录积分
  编队
  世界聊天等级15判断
  活动卡池结束回馈次数通关邮件折算碎片 功能注释
  第一次通关拾荒章节推送限时礼包，活动卡池结束回馈次数通关邮件折算碎片

# Conflicts:
#	src/adv/Adv.lua

2021-01-26 16:39:39 +0800

7cd7fd53 Merge branch 'tr/bugfix' into tr/bugfix-qa ... Browse File »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-01-26 12:10:48 +0800

25 Jan, 2021

1 commit

2bf99d62 充值mycard Browse File »

zhouhaihai
2021-01-25 17:38:22 +0800