wasteland / server

12 Oct, 2020

2 commits

ba6d85ed Squashed commit of the following: ... Browse Code »

commit bb5d94bd92685465a465cdcf89279b49a1ba1a28
Merge: 460afa6 072db12
Author: liuzujun <307836273@qq.com>
Date:   Mon Oct 12 16:26:07 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 460afa6ed62568461352cf56a3926b73669aed66
Author: liuzujun <307836273@qq.com>
Date:   Mon Oct 12 16:26:00 2020 +0800

    付费签到改为主动领取，战斗关卡不一定是当前挂机关卡

commit 072db1272534d7f7e03be650de0266c2f383f4f1
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sat Oct 10 13:51:43 2020 +0800

    推送

commit 84cf48b4b3bbabaf4dee84b648097eaae63341e5
Merge: 8cd3770 b7e842a
Author: liuzujun <307836273@qq.com>
Date:   Fri Oct 9 20:28:13 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 8cd3770f752dbb5189b45200d871e06749ccb813
Author: liuzujun <307836273@qq.com>
Date:   Fri Oct 9 20:28:09 2020 +0800

    挂机关卡可以选择，经验金币根据最高关卡计算

commit b7e842ac0e4675625aa2f9b7718bc3c20d70824d
Merge: 07c6a92 38c7e6a
Author: zhouhaihai <zhhyf521@163.com>
Date:   Fri Oct 9 19:47:30 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      bug

commit 07c6a92ba2cec99bbf73bde0e7f67123b914962b
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sun Sep 27 17:51:07 2020 +0800

    bug

commit bf857ca13989808894988bcad9900db0fa137bd0
Merge: 28f0c0c 337a016
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sun Sep 27 17:46:13 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      bug

commit 28f0c0ca8bf1a1ce232b15aa744fc1366fe4c543
Merge: 6288ab7 dea8913
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sun Sep 27 16:48:37 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      修复bug
      记录聊天信息
      缺了 newdevice
      安全判定

commit 6288ab7fb49bed3a286c19493e77506f4723d418
Merge: 1988e15 3ed9569
Author: zhouhaihai <zhhyf521@163.com>
Date:   Wed Sep 23 14:56:57 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      成就 参数错误

commit 1988e15ade745ec730e33bc67b2419f5445b27bf
Merge: 550989a bcbb0c7
Author: zhouhaihai <zhhyf521@163.com>
Date:   Wed Sep 23 11:47:44 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      3星解锁 cg

commit 550989a71f4bf5cc423cd66a083fe55b8ed83d32
Merge: e621c84 f927f22
Author: zhouhaihai <zhhyf521@163.com>
Date:   Wed Sep 23 11:27:39 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      增加神器标签

commit e621c84d9304b17d5d209a0b35af2ced6aabab3f
Merge: 4a02453 c670faa
Author: liuzujun <307836273@qq.com>
Date:   Tue Sep 22 17:55:50 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 4a02453a9bbb5c78ea836f719aa6ea156050800f
Author: liuzujun <307836273@qq.com>
Date:   Tue Sep 22 17:55:11 2020 +0800

    挂机排除噩梦难度

commit c670faa00523d351636fd22cd1e16d6b620acd98
Merge: a5c44c4 8a57b60
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 19:23:26 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      初始化冒险重置时间
      被动新

commit a5c44c41a4a373aa17ce78a175bfe8d7830ee163
Merge: 4bd3095 95065b5
Author: liuzujun <307836273@qq.com>
Date:   Mon Sep 21 17:34:54 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 4bd3095fd64333da15a48b603a76764a4b50848c
Author: liuzujun <307836273@qq.com>
Date:   Mon Sep 21 17:34:49 2020 +0800

    英雄帖任务bug

commit 95065b5b5ff2829ef7765f540eff71594f8f2070
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 16:14:53 2020 +0800

    被动技新

commit 5345bac781be3332711eb1cf40226fb676937b15
Merge: b8d4bc7 bdd3a19
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 13:51:06 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      扣层数

commit b8d4bc787aa3dc676d14597025320ee36f392470
Merge: ce42bb0 871b3da
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 11:12:32 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      被动 取消

commit ce42bb0339857363f0b61faf5b21b9f55a610e7f
Merge: 190e141 c23734e
Author: liuzujun <307836273@qq.com>
Date:   Fri Sep 18 18:01:16 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 190e14152f99bb754b251f25e9dc7eace017de5f
Author: liuzujun <307836273@qq.com>
Date:   Fri Sep 18 18:01:11 2020 +0800

    英雄帖活动初始化

commit ffa0e25910e80906eb7049ee1a105e3cf992e1be
Author: liuzujun <307836273@qq.com>
Date:   Thu Sep 17 17:51:14 2020 +0800

    日历活动 穿戴x个y品质铭文

commit 06d56de79951c6c3dccd665171611b9d090a3ac2
Merge: b3f13e5 2f7891b
Author: liuzujun <307836273@qq.com>
Date:   Thu Sep 17 16:11:22 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit b3f13e563b19f87c021bf084ef1aa411d869759f
Author: liuzujun <307836273@qq.com>
Date:   Thu Sep 17 16:11:19 2020 +0800

    英雄令英雄收集相关任务

commit b07d54c24068e6e0dc22c3919296efe936d3c1fd
Merge: e0ad10e 9c8e948
Author: liuzujun <307836273@qq.com>
Date:   Wed Sep 16 20:49:00 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit e0ad10e9c845b3f58866e184dcdcbc66b080de3e
Author: liuzujun <307836273@qq.com>
Date:   Wed Sep 16 20:48:56 2020 +0800

    英雄帖任务简单类型测试

2020-10-12 20:47:03 +0800

fa38c9d4 Revert "Squashed commit of the following:" ... Browse Code »
```
This reverts commit 52f8c5f05d0a531232a7dd7887becd2a77986aa1.
```
熊润斐
2020-10-12 20:44:38 +0800

10 Oct, 2020

1 commit

52f8c5f0 Squashed commit of the following: ... Browse Code »

commit 072db1272534d7f7e03be650de0266c2f383f4f1
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sat Oct 10 13:51:43 2020 +0800

    推送

commit 84cf48b4b3bbabaf4dee84b648097eaae63341e5
Merge: 8cd3770 b7e842a
Author: liuzujun <307836273@qq.com>
Date:   Fri Oct 9 20:28:13 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 8cd3770f752dbb5189b45200d871e06749ccb813
Author: liuzujun <307836273@qq.com>
Date:   Fri Oct 9 20:28:09 2020 +0800

    挂机关卡可以选择，经验金币根据最高关卡计算

commit b7e842ac0e4675625aa2f9b7718bc3c20d70824d
Merge: 07c6a92 38c7e6a
Author: zhouhaihai <zhhyf521@163.com>
Date:   Fri Oct 9 19:47:30 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      bug

commit 07c6a92ba2cec99bbf73bde0e7f67123b914962b
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sun Sep 27 17:51:07 2020 +0800

    bug

commit bf857ca13989808894988bcad9900db0fa137bd0
Merge: 28f0c0c 337a016
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sun Sep 27 17:46:13 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      bug

commit 28f0c0ca8bf1a1ce232b15aa744fc1366fe4c543
Merge: 6288ab7 dea8913
Author: zhouhaihai <zhhyf521@163.com>
Date:   Sun Sep 27 16:48:37 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      修复bug
      记录聊天信息
      缺了 newdevice
      安全判定

commit 6288ab7fb49bed3a286c19493e77506f4723d418
Merge: 1988e15 3ed9569
Author: zhouhaihai <zhhyf521@163.com>
Date:   Wed Sep 23 14:56:57 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      成就 参数错误

commit 1988e15ade745ec730e33bc67b2419f5445b27bf
Merge: 550989a bcbb0c7
Author: zhouhaihai <zhhyf521@163.com>
Date:   Wed Sep 23 11:47:44 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      3星解锁 cg

commit 550989a71f4bf5cc423cd66a083fe55b8ed83d32
Merge: e621c84 f927f22
Author: zhouhaihai <zhhyf521@163.com>
Date:   Wed Sep 23 11:27:39 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      增加神器标签

commit e621c84d9304b17d5d209a0b35af2ced6aabab3f
Merge: 4a02453 c670faa
Author: liuzujun <307836273@qq.com>
Date:   Tue Sep 22 17:55:50 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 4a02453a9bbb5c78ea836f719aa6ea156050800f
Author: liuzujun <307836273@qq.com>
Date:   Tue Sep 22 17:55:11 2020 +0800

    挂机排除噩梦难度

commit c670faa00523d351636fd22cd1e16d6b620acd98
Merge: a5c44c4 8a57b60
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 19:23:26 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      初始化冒险重置时间
      被动新

commit a5c44c41a4a373aa17ce78a175bfe8d7830ee163
Merge: 4bd3095 95065b5
Author: liuzujun <307836273@qq.com>
Date:   Mon Sep 21 17:34:54 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 4bd3095fd64333da15a48b603a76764a4b50848c
Author: liuzujun <307836273@qq.com>
Date:   Mon Sep 21 17:34:49 2020 +0800

    英雄帖任务bug

commit 95065b5b5ff2829ef7765f540eff71594f8f2070
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 16:14:53 2020 +0800

    被动技新

commit 5345bac781be3332711eb1cf40226fb676937b15
Merge: b8d4bc7 bdd3a19
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 13:51:06 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      扣层数

commit b8d4bc787aa3dc676d14597025320ee36f392470
Merge: ce42bb0 871b3da
Author: zhouhaihai <zhhyf521@163.com>
Date:   Mon Sep 21 11:12:32 2020 +0800

    Merge branch 'bugfix' into develop

    * bugfix:
      被动 取消

commit ce42bb0339857363f0b61faf5b21b9f55a610e7f
Merge: 190e141 c23734e
Author: liuzujun <307836273@qq.com>
Date:   Fri Sep 18 18:01:16 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit 190e14152f99bb754b251f25e9dc7eace017de5f
Author: liuzujun <307836273@qq.com>
Date:   Fri Sep 18 18:01:11 2020 +0800

    英雄帖活动初始化

commit ffa0e25910e80906eb7049ee1a105e3cf992e1be
Author: liuzujun <307836273@qq.com>
Date:   Thu Sep 17 17:51:14 2020 +0800

    日历活动 穿戴x个y品质铭文

commit 06d56de79951c6c3dccd665171611b9d090a3ac2
Merge: b3f13e5 2f7891b
Author: liuzujun <307836273@qq.com>
Date:   Thu Sep 17 16:11:22 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit b3f13e563b19f87c021bf084ef1aa411d869759f
Author: liuzujun <307836273@qq.com>
Date:   Thu Sep 17 16:11:19 2020 +0800

    英雄令英雄收集相关任务

commit b07d54c24068e6e0dc22c3919296efe936d3c1fd
Merge: e0ad10e 9c8e948
Author: liuzujun <307836273@qq.com>
Date:   Wed Sep 16 20:49:00 2020 +0800

    Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

commit e0ad10e9c845b3f58866e184dcdcbc66b080de3e
Author: liuzujun <307836273@qq.com>
Date:   Wed Sep 16 20:48:56 2020 +0800

    英雄帖任务简单类型测试

2020-10-10 16:44:59 +0800

27 Sep, 2020

7 commits

313069e3 Merge branch 'bugfix' into qa ... Browse Code »
```
* bugfix:
  bug
```
zhouhaihai
2020-09-27 17:51:32 +0800
38c7e6a0 bug ... Browse Code »
```
(cherry picked from commit 07c6a92ba2cec99bbf73bde0e7f67123b914962b)
```
zhouhaihai
2020-09-27 17:51:18 +0800
1c4c3480 Merge branch 'bugfix' into qa ... Browse Code »
```
* bugfix:
  bug
```
zhouhaihai
2020-09-27 17:45:58 +0800
337a0165 bug Browse Code »

zhouhaihai
2020-09-27 17:45:46 +0800
bf4e979a Merge branch 'bugfix' into qa ... Browse Code »
```
* bugfix:
  修复bug
  记录聊天信息
  缺了 newdevice
  安全判定
```
zhouhaihai
2020-09-27 16:41:30 +0800
dea89131 修复bug Browse Code »

zhouhaihai
2020-09-27 16:39:23 +0800
25d8cbc6 记录聊天信息 Browse Code »

zhouhaihai
2020-09-27 14:58:05 +0800

24 Sep, 2020

2 commits

bb7998ff 缺了 newdevice Browse Code »

zhouhaihai
2020-09-24 15:56:31 +0800
5aecad36 安全判定 Browse Code »

zhouhaihai
2020-09-24 14:13:30 +0800

23 Sep, 2020

4 commits

ef9b0e07 Merge branch 'bugfix' into qa ... Browse Code »
```
* bugfix:
  成就 参数错误
  3星解锁 cg
  增加神器标签
  初始化冒险重置时间
  被动新
```
熊润斐
2020-09-23 16:16:05 +0800
3ed95697 成就参数错误 Browse Code »

zhouhaihai
2020-09-23 14:56:25 +0800
bcbb0c7b 3星解锁 cg Browse Code »

zhouhaihai
2020-09-23 11:47:32 +0800
f927f229 增加神器标签 Browse Code »

zhouhaihai
2020-09-23 11:27:21 +0800

21 Sep, 2020

5 commits

8a57b603 初始化冒险重置时间 Browse Code »

zhouhaihai
2020-09-21 18:01:00 +0800
ead2c938 被动新 Browse Code »

zhouhaihai
2020-09-21 16:15:14 +0800

48a890d6 Merge branch 'bugfix' into qa ... Browse Code »

* bugfix:
  扣层数
  被动 取消
  引导用到的剧情的奖励可以直接领
  调整顺序
  签到成就
  充值返利邮件内容优化

2020-09-21 16:07:27 +0800

bdd3a194 扣层数 Browse Code »

zhouhaihai
2020-09-21 13:50:58 +0800
871b3da3 被动取消 Browse Code »

zhouhaihai
2020-09-21 11:12:20 +0800

18 Sep, 2020

1 commit

c23734ee 引导用到的剧情的奖励可以直接领 Browse Code »

chenyueqi
2020-09-18 14:24:26 +0800

17 Sep, 2020

16 commits

f0aff632 调整顺序 Browse Code »

zhouhaihai
2020-09-17 20:46:23 +0800
e7806e6f 签到成就 Browse Code »

zhouhaihai
2020-09-17 20:41:32 +0800
1cfe4c75 充值返利邮件内容优化 Browse Code »

liuzujun
2020-09-17 19:27:47 +0800
cd8907bb Merge branch 'bugfix' into qa ... Browse Code »
```
* bugfix:
  奖励关卡活动未开启导致Bug
  每周循环任务bug
  运营需要
  屏蔽字 优化
```
熊润斐
2020-09-17 17:58:05 +0800
a526f9ef 奖励关卡活动未开启导致Bug Browse Code »

liuzujun
2020-09-17 17:16:49 +0800
ee021c58 每周循环任务bug Browse Code »

liuzujun
2020-09-17 16:55:49 +0800
2f7891b4 运营需要 Browse Code »

zhouhaihai
2020-09-17 14:23:50 +0800
10ea6c0f 屏蔽字优化 Browse Code »

zhouhaihai
2020-09-17 12:10:47 +0800
97300a91 Merge branch 'bugfix' into qa ... Browse Code »
```
* bugfix:
  优化
  充值返利邮件档位排序
  伤害错误
```
zhouhaihai
2020-09-17 11:00:03 +0800
8e524d41 优化 Browse Code »

zhouhaihai
2020-09-17 10:59:15 +0800
d92cda58 Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-09-17 10:26:03 +0800
56d191ec 充值返利邮件档位排序 Browse Code »

liuzujun
2020-09-17 10:26:01 +0800
294408d9 伤害错误 Browse Code »

zhouhaihai
2020-09-17 10:07:54 +0800
656f5298 Merge branch 'qa' of 120.26.43.151:wasteland/server into qa ... Browse Code »
```
* 'qa' of 120.26.43.151:wasteland/server:
```
zhouhaihai
2020-09-17 10:07:21 +0800
a84ce8f9 Merge branch 'develop' into qa ... Browse Code »
```
* develop:
  反的判断
  返利邮件拼接充值档位
  bug
  buff  被动 限定地图
```
zhouhaihai
2020-09-17 09:57:20 +0800
e0c0365a 反的判断 Browse Code »

zhouhaihai
2020-09-17 09:56:43 +0800

16 Sep, 2020

2 commits

8dc7d93a Merge branch 'bugfix' of 120.26.43.151:wasteland/server into bugfix Browse Code »

liuzujun
2020-09-16 21:22:28 +0800
4709685d 返利邮件拼接充值档位 Browse Code »

liuzujun
2020-09-16 21:22:24 +0800