wasteland / server

26 Mar, 2021

1 commit

0488b666 Merge branch 'tr/publish/release' into cn/develop ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
熊润斐
2021-03-26 11:41:50 +0800

25 Mar, 2021

2 commits

6d55620c Merge branch 'tr/bugfix' into tr/publish/release Browse Dir »

chenyueqi
2021-03-25 13:34:23 +0800
39aebe0b 回归者活动，计算所有任务完成存在bug Browse Dir »

chenyueqi
2021-03-25 09:41:05 +0800

24 Mar, 2021

2 commits

adc9e449 Merge branch 'tr/develop' into tr/bugfix-qa Browse Dir »

熊润斐
2021-03-24 11:46:15 +0800
3dbe0d5d #fxtr_10186 修复两个bug Browse Dir »

zhouhaihai
2021-03-24 11:28:59 +0800

23 Mar, 2021

2 commits

7a0dc1cf 初始号不触发回归活动 Browse Dir »

chenyueqi
2021-03-23 19:42:09 +0800
7bc5b662 检查回归者活动，走正常的时间判断 Browse Dir »

chenyueqi
2021-03-23 12:00:50 +0800

22 Mar, 2021

2 commits

c2c9dc14 回归者领取任务协议号，触发限时礼包 Browse Dir »

chenyueqi
2021-03-22 16:14:35 +0800
a5dc3b0e 回归活动初版 Browse Dir »

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

20 Mar, 2021

1 commit

61b6c21d Merge branch 'tr/bugfix' into tr/publish/release Browse Dir »

chenyueqi
2021-03-20 15:06:50 +0800

19 Mar, 2021

2 commits

c7381e80 去除调试日志 Browse Dir »

liuzujun
2021-03-19 17:23:09 +0800
020d02ee Merge branch 'tr/bugfix' into cn/develop Browse Dir »

熊润斐
2021-03-19 16:35:17 +0800

18 Mar, 2021

2 commits

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

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

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

17 Mar, 2021

9 commits

18478207 贸易季委托要返回英雄的信赖值 Browse Dir »

chenyueqi
2021-03-17 17:54:36 +0800
c4814196 从数据库读取捐赠物品顺序错误 Browse Dir »

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

chenyueqi
2021-03-17 17:10:49 +0800
4c0df8d0 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Dir »

chenyueqi
2021-03-17 17:01:16 +0800
15127116 海港贸易季委托任务奖励错误 Browse Dir »

chenyueqi
2021-03-17 17:01:03 +0800
670e4d84 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Dir »

chenyueqi
2021-03-17 16:36:16 +0800
8864df66 电波塔检查任务参数错误 Browse Dir »

chenyueqi
2021-03-17 16:34:52 +0800
e084cd2b 电波塔的任务只算主塔的进度 Browse Dir »

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

chenyueqi
2021-03-17 10:52:19 +0800

16 Mar, 2021

9 commits

adfde2d7 Merge branch 'tr/bugfix-qa' into tr/develop Browse Dir »

熊润斐
2021-03-16 17:36:51 +0800
cee86c7b bug修复：海港贸易委托无法领取奖励 Browse Dir »

liguanghui
2021-03-16 17:11:39 +0800
09582aac 海港贸易相关bug修复 Browse Dir »

liguanghui
2021-03-16 16:07:12 +0800
e820b3f3 海港贸易季bug修正 Browse Dir »

chenyueqi
2021-03-16 12:35:45 +0800
5fb0ac5f 海港贸易相关bug修复 Browse Dir »

liguanghui
2021-03-16 11:38:47 +0800
ac57fc89 贸易季兑换商店记录次数 Browse Dir »

chenyueqi
2021-03-16 10:22:30 +0800
1dc5abc2 字符串分割错误遗漏 Browse Dir »

chenyueqi
2021-03-16 10:18:41 +0800
edbc96d2 Merge branch 'tr/bugfix' into cn/develop Browse Dir »

chenyueqi
2021-03-16 10:14:03 +0800
9fc8b7f0 分割字符串错误 Browse Dir »

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

15 Mar, 2021

2 commits

b8788f58 海港贸易季委托增加魔导石加速完成 Browse Dir »

chenyueqi
2021-03-15 19:22:40 +0800
65b551a7 海港贸易季初版 Browse Dir »

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

11 Mar, 2021

1 commit

9f8192cc Merge branch 'tr/bugfix' into tr/publish/release ... Browse Dir »

* tr/bugfix:
  电波塔对贩卖食材的金币加成计算错误
  电波塔对贩卖食材金币的加成作用于金币总收益，不是对金币价格
  电波塔加成错误
  bug修复：电波塔排行榜协议报错
  电波塔对食材的加成计算错误
  物资危机 增加消耗体力 类型
  电波塔战斗激活消息bug
  diner 加速错误
  电波塔加成算法解析字段方法修正
  电波塔bug
  电波塔分塔开放条件读表
  再改一波电波塔整容相关信息
  电波塔激活加成效果后对各个系统的加成
  tower GM参数值修正
  计算电波塔层数的加成效果
  电波塔属性塔功能部分功能草稿

# Conflicts:
#	src/csvdata

2021-03-11 13:52:48 +0800

10 Mar, 2021

3 commits

f854f3a3 电波塔对贩卖食材的金币加成计算错误 Browse Dir »

chenyueqi
2021-03-10 21:01:08 +0800
ff805127 电波塔对贩卖食材金币的加成作用于金币总收益，不是对金币价格 Browse Dir »

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

09 Mar, 2021

1 commit

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

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

08 Mar, 2021

1 commit

664e0e07 电波塔对食材的加成计算错误 Browse Dir »

chenyueqi
2021-03-08 21:03:11 +0800