wasteland / server | GitLab

21 Apr, 2022

1 commit

ec3ba882 Merge branch 'cn/develop' into cn/publish/zhaolu Browse Dir »

liuzujun
2022-04-21 14:06:48 +0800

14 Apr, 2022

1 commit

5cf05cda fix: 解决小概率事件，当购买数量>10000的判断在消耗物品的前面。 ... Browse Dir »
```
避免把物品消耗掉，但是无法得到奖励的情况。
```
zhangqijia
2022-04-14 17:36:01 +0800

09 Feb, 2022

2 commits

f6322b6d fix: 挂机图鉴，宝藏值使用不完全的问题 Browse Dir »

zhangqijia
2022-02-09 16:35:17 +0800
b62c0a4c fix: 挂机图鉴，宝藏值使用不完全的问题 Browse Dir »

zhangqijia
2022-02-09 16:34:37 +0800

27 Jan, 2022

1 commit

60ef966e Merge branch 'cn/develop' into cn/publish/zhaolu ... Browse Dir »
```
# Conflicts:
#	src/actions/GmAction.lua
#	src/actions/HangAction.lua
#	src/models/Daily.lua
```
zhangqijia
2022-01-27 15:15:06 +0800

24 Jan, 2022

6 commits

e28973d5 fix: 额外宝藏删除藏宝图字段treasureMapCount，用道具itemId=861作为藏宝图 Browse Dir »

zhangqijia
2022-01-24 18:06:50 +0800
aca85b6f fix: 额外宝藏资源值字段修改treasureExtraBase->treasureBaseExtra Browse Dir »

zhangqijia
2022-01-24 16:22:28 +0800
5c6f50cb fix: 额外宝藏，在宝藏列表并且未过期的宝藏，不会再随机(与每日宝藏逻辑不同) Browse Dir »

zhangqijia
2022-01-24 16:14:46 +0800
78065fee fix: 额外宝藏不可以绑定的关卡(逻辑与每日宝藏不一样) ... Browse Dir »
```
1. 未过期(未挖，在挖，未领)
2. 正在挂机
```
zhangqijia
2022-01-24 15:28:48 +0800
7597d623 fix: 额外宝藏 Hang_takeTreasureRpc协议，字段更新错误 treasureBaseExtra -> treasureMapCount Browse Dir »

zhangqijia
2022-01-24 10:54:49 +0800
25ec4b29 fix: 额外宝藏 Hang_takeTreasureRpc协议，字段更新错误 treasureBaseExtra -> treasureMapCount Browse Dir »

zhangqijia
2022-01-24 10:54:32 +0800

20 Jan, 2022

4 commits

fd253994 Merge branch 'cn/develop' into cn/publish/zhaolu Browse Dir »

zhangqijia
2022-01-20 14:58:10 +0800
d4749c28 fix: 额外宝藏修改协议号 Browse Dir »

zhangqijia
2022-01-20 14:55:56 +0800
1bbe3bb8 fix: 额外宝藏bug修复 Browse Dir »

zhangqijia
2022-01-20 14:50:49 +0800
49f617d9 Merge branch 'cn/develop' into cn/publish/zhaolu Browse Dir »

liuzujun
2022-01-20 14:04:09 +0800

17 Jan, 2022

3 commits

a5b00e35 魔鬼训练营改成两个前置任务都完成才能领取奖励 Browse Dir »

zhanghualin
2022-01-17 16:19:44 +0800
f5dac185 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop Browse Dir »

liuzujun
2022-01-17 15:23:27 +0800
ddcf1a3a 登录检测通关关卡任务 Browse Dir »

liuzujun
2022-01-17 15:23:22 +0800

14 Jan, 2022

4 commits

e524bcc3 feat: 增加消息类型46=累计登录次数，跨天不重置 Browse Dir »

zhangqijia
2022-01-14 17:38:31 +0800
40be602d trainTaskRewardRpc 名字修改 Browse Dir »

liuzujun
2022-01-14 17:12:34 +0800
c67af9c7 Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop ... Browse Dir »
```
# Conflicts:
#	src/ProtocolCode.lua
#	src/actions/HeroAction.lua
#	src/models/RoleLog.lua
```
liuzujun
2022-01-14 16:52:08 +0800
df622b85 魔鬼训练营相关 Browse Dir »

liuzujun
2022-01-14 16:49:09 +0800

12 Jan, 2022

1 commit

ecf87563 feat: 挂机图鉴的扩展功能——额外宝藏奖励 Browse Dir »

zhangqijia
2022-01-12 11:01:02 +0800

10 Jan, 2022

1 commit

2c04a149 fix: 特刊购买，在生成订单的时候进行判断是否能购买，不能购买则订单生成失败 Browse Dir »

zhangqijia
2022-01-10 16:57:00 +0800

04 Jan, 2022

1 commit

2c585b73 del: 删除Hero_stickersConvertRpc协议，客户端使用的使用多选一礼包协议 Role_useSelectItemRpc = 134 Browse Dir »

zhangqijia
2022-01-04 18:22:27 +0800

30 Dec, 2021

14 commits

7d0fd1f3 Merge branch 'cn/develop' into cn/publish/zhaolu ... Browse Dir »
```
# Conflicts:
#	src/csvdata
```
zhangqijia
2021-12-30 19:27:01 +0800
9a6d3ed3 fix: unLockStoryBookRpc 客户端重复领取，临时解决。 Browse Dir »

zhangqijia
2021-12-30 19:07:08 +0800
cec4aa73 fix: unLockStoryBookRpc 错误返回值 return 1 2 3 Browse Dir »

zhangqijia
2021-12-30 19:03:21 +0800
9b20dbfc Merge branch 'cn/develop' into cn/publish/zhaolu Browse Dir »

zhangqijia
2021-12-30 17:36:27 +0800
ccac1eaa fix: costDiamond 价格为零的商品可以购买, 价格是读配表的。 Browse Dir »

zhangqijia
2021-12-30 17:36:10 +0800
167d24dc fix: shopnormal 商品购买，消耗物品以后再添加购买记录 Browse Dir »

zhangqijia
2021-12-30 17:26:04 +0800
7c25211e Merge branch 'cn/develop' into cn/publish/zhaolu Browse Dir »

zhangqijia
2021-12-30 17:22:50 +0800
a4d3a28a fix: shopnormal 0元商品已购买的 return 6 Browse Dir »

zhangqijia
2021-12-30 17:22:35 +0800
fcb9a070 fix: costItem 消耗等于0的商品允许购买 Browse Dir »

zhangqijia
2021-12-30 16:26:00 +0800
29f01196 fix: costItem 消耗等于0的商品允许购买 Browse Dir »

zhangqijia
2021-12-30 16:25:35 +0800
292846cb Merge branch 'cn/develop' into cn/publish/zhaolu Browse Dir »

liuzujun
2021-12-30 13:17:03 +0800
1a26a647 #fxcn_11862 恢复代码，unit_talent表问题 Browse Dir »

liuzujun
2021-12-30 12:39:47 +0800
50f22d1e #fxcn_11862 增加学习技能步骤 Browse Dir »

liuzujun
2021-12-30 12:01:59 +0800
235d8a37 #fxcn_11862 角色精进点了学习技能的不会消耗材料 Browse Dir »

liuzujun
2021-12-30 11:46:02 +0800

28 Dec, 2021

1 commit

6a9c06e5 fix: 加入del字段后，loginRpc协议，内存中还是del=1的角色，应该重新加载角色数据 Browse Dir »

zhangqijia
2021-12-28 12:13:14 +0800