wasteland / server

06 Jan, 2021

2 commits

66e696ae Revert "修改 robot" ... Browse Code »
```
This reverts commit 56c83e9775161bc9392098baf99ab20e16258efe.
```
zhouhaihai
2021-01-06 11:30:34 +0800
56c83e97 修改 robot Browse Code »

zhouhaihai
2021-01-06 11:13:30 +0800

05 Jan, 2021

3 commits

f76d63e1 联动任务活动 Browse Code »

liuzujun
2021-01-05 20:36:08 +0800
fc6a75e0 appid Browse Code »

zhouhaihai
2021-01-05 16:50:04 +0800
0ce1cab5 好友赠送能量活动bug修复 Browse Code »

chenyueqi
2021-01-05 10:29:12 +0800

04 Jan, 2021

4 commits

cab7184b 活动能量bug Browse Code »

chenyueqi
2021-01-04 21:16:45 +0800
eba94a09 修改联动好友赠送活动的消息通知结构 Browse Code »

chenyueqi
2021-01-04 11:48:15 +0800
6a61fe2c 少个大括号 Browse Code »

chenyueqi
2021-01-04 10:33:05 +0800
0886d05a 修改联动好友赠送获得的红点记录和通知 Browse Code »

chenyueqi
2021-01-04 10:31:50 +0800

31 Dec, 2020

2 commits

091912ed 未测试版好友能量助力活动 Browse Code »

chenyueqi
2020-12-31 17:57:31 +0800
ac885527 联动签到活动 Browse Code »

liuzujun
2020-12-31 15:53:21 +0800

30 Dec, 2020

1 commit

0027e33b 调理剂生产和使用逻辑优化 Browse Code »

chenyueqi
2020-12-30 15:55:49 +0800

25 Dec, 2020

3 commits

fbd1b98c Merge branch 'bugfix' into develop ... Browse Code »

* bugfix:
  cb 返利
  重写拆解室功能
  去除globald中发放活动排行奖励
  支付bug

# Conflicts:
#	src/actions/RoleAction.lua

2020-12-25 11:44:43 +0800

320f5b54 cb 返利 Browse Code »

zhouhaihai
2020-12-25 11:16:33 +0800
0a093ba8 重写拆解室功能 Browse Code »

chenyueqi
2020-12-25 09:29:50 +0800

24 Dec, 2020

7 commits

89760dbe 拆解室功能重写 Browse Code »

chenyueqi
2020-12-24 20:52:17 +0800
14f57eed 去除globald中发放活动排行奖励 Browse Code »

liuzujun
2020-12-24 20:42:39 +0800

a952123e Merge branch 'develop' into bugfix ... Browse Code »

* develop: (79 commits)
  世界Boss 增加行动点
  物资危机bug
  物资危机
  冒险bug
  宝藏怪活动
  世界boss翻牌奖励 活动卡池保底单独记录
  充值
  天赋升级写日志报错
  活动剧情解锁
  充值重复
  bug
  下一关提前
  battle Bug
  奖励副本 新机制
  活动礼包购买记录活动过期清理
  挑战活动打完再扣门票
  heros 增加 supports
  挑战关卡活动打完再扣门票
  关卡挑战活动奖励错误bug
  修改活动boss关卡三星条件
  ...

2020-12-24 16:29:30 +0800

59a25ac7 fix conflict Browse Code »

liuzujun
2020-12-24 15:21:42 +0800
6857a37f 世界Boss 增加行动点 Browse Code »

liuzujun
2020-12-24 15:21:05 +0800
e8719dc4 物资危机bug Browse Code »

zhouhaihai
2020-12-24 14:29:53 +0800
558c9044 物资危机 Browse Code »

zhouhaihai
2020-12-24 13:48:22 +0800

23 Dec, 2020

5 commits

a5660239 冒险bug Browse Code »

zhouhaihai
2020-12-23 20:38:19 +0800
161c50cc 宝藏怪活动 Browse Code »

zhouhaihai
2020-12-23 20:37:48 +0800
51cac1d4 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-23 19:04:43 +0800
eb5ffd1c 世界boss翻牌奖励活动卡池保底单独记录 Browse Code »

liuzujun
2020-12-23 19:04:36 +0800
1ce3adac 充值 Browse Code »

zhouhaihai
2020-12-23 11:20:28 +0800

22 Dec, 2020

5 commits

8ec16c21 天赋升级写日志报错 Browse Code »

liuzujun
2020-12-22 16:30:51 +0800
f0c47e33 Merge branch 'develop' of 120.26.43.151:wasteland/server into develop Browse Code »

liuzujun
2020-12-22 15:38:58 +0800
be697585 活动剧情解锁 Browse Code »

liuzujun
2020-12-22 15:38:56 +0800
cd597363 充值重复 Browse Code »

zhouhaihai
2020-12-22 12:18:20 +0800
2b31c43f bug Browse Code »

zhouhaihai
2020-12-22 10:58:43 +0800

21 Dec, 2020

7 commits

76c48085 下一关提前 Browse Code »

zhouhaihai
2020-12-21 20:44:24 +0800
c8235ab8 battle Bug Browse Code »

zhouhaihai
2020-12-21 20:27:35 +0800
55c7c172 奖励副本新机制 Browse Code »

zhouhaihai
2020-12-21 16:33:41 +0800
54379452 fix conflict Browse Code »

liuzujun
2020-12-21 16:09:21 +0800
485c8c35 活动礼包购买记录活动过期清理 Browse Code »

liuzujun
2020-12-21 16:08:10 +0800
23847cc0 挑战活动打完再扣门票 Browse Code »

zhouhaihai
2020-12-21 14:40:14 +0800
821e2704 heros 增加 supports Browse Code »

zhouhaihai
2020-12-21 14:38:15 +0800

19 Dec, 2020

1 commit

8e892c71 挑战关卡活动打完再扣门票 Browse Code »

liuzujun
2020-12-19 16:54:11 +0800