wasteland / server

20 Mar, 2021

1 commit

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

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

18 Mar, 2021

2 commits

15f141fc Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-18 13:49:30 +0800
dae24d5a Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-18 13:48:31 +0800

17 Mar, 2021

18 commits

81fb8079 Merge branch 'tr/develop' into tr/bugfix Browse Code »

chenyueqi
2021-03-17 17:54:48 +0800
18478207 贸易季委托要返回英雄的信赖值 Browse Code »

chenyueqi
2021-03-17 17:54:36 +0800
f92a4472 Merge branch 'tr/develop' into tr/bugfix Browse Code »

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

chenyueqi
2021-03-17 17:39:26 +0800
5918ff4c Merge branch 'tr/develop' into tr/bugfix Browse Code »

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

chenyueqi
2021-03-17 17:10:49 +0800
88ae7b49 Merge branch 'tr/develop' into tr/bugfix Browse Code »

熊润斐
2021-03-17 17:03:22 +0800
0f2ede8d 海港贸易季委托任务奖励计算错误 Browse Code »

chenyueqi
2021-03-17 17:02:37 +0800
4c0df8d0 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

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

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

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

chenyueqi
2021-03-17 16:34:52 +0800
ef7978b2 电波塔检查任务参数错误 Browse Code »

chenyueqi
2021-03-17 16:33:32 +0800
e04abcb4 电波塔的任务只算主塔的进度 Browse Code »

chenyueqi
2021-03-17 14:53:49 +0800
e084cd2b 电波塔的任务只算主塔的进度 Browse Code »

chenyueqi
2021-03-17 14:52:51 +0800
1854b04d Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-17 13:34:12 +0800
91ef5b2f 自动结算海岛贸易季，领取捐赠奖励报错 Browse Code »

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

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

16 Mar, 2021

11 commits

159d3731 Merge branch 'tr/bugfix-qa' into tr/bugfix Browse Code »

熊润斐
2021-03-16 20:51:11 +0800
daab809c Merge branch 'tr/develop' into tr/bugfix-qa Browse Code »

熊润斐
2021-03-16 17:55:06 +0800
adfde2d7 Merge branch 'tr/bugfix-qa' into tr/develop Browse Code »

熊润斐
2021-03-16 17:36:51 +0800
edb76e27 Merge branch 'tr/bugfix' into tr/bugfix-qa Browse Code »

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

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

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

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

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

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

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

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

15 Mar, 2021

2 commits

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

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

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

11 Mar, 2021

3 commits

0d007e5e 修改同时在线量 Browse Code »

zhouhaihai
2021-03-11 13:58:04 +0800

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

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

# Conflicts:
#	src/csvdata

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

76c1102d Merge branch 'tr/develop' of 120.26.43.151:wasteland/server into tr/develop ... Browse Code »
```
* 'tr/develop' of 120.26.43.151:wasteland/server:
  电波塔加成错误
```
zhouhaihai
2021-03-11 13:52:07 +0800

10 Mar, 2021

3 commits

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

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

chenyueqi
2021-03-10 20:17:10 +0800
bab9a167 电波塔加成错误 Browse Code »

chenyueqi
2021-03-10 18:09:20 +0800