wasteland / server | GitLab

30 Dec, 2021

19 commits

10d7ee14 Merge branch 'cn/develop' into cn/publish/zhaolu_test ... Browse Code »
```
# Conflicts:
#	src/csvdata
```
zhangqijia
2021-12-30 19:10:34 +0800
9a6d3ed3 fix: unLockStoryBookRpc 客户端重复领取，临时解决。 Browse Code »

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

zhangqijia
2021-12-30 19:03:21 +0800
f0ec5842 Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

zhangqijia
2021-12-30 18:53:04 +0800
ccac1eaa fix: costDiamond 价格为零的商品可以购买, 价格是读配表的。 Browse Code »

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

zhangqijia
2021-12-30 17:35:34 +0800
7d99c172 Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

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

zhangqijia
2021-12-30 17:26:04 +0800
e44cec7e Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

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

zhangqijia
2021-12-30 17:22:35 +0800
6bfaf23e Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

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

zhangqijia
2021-12-30 16:26:00 +0800
e626dbf0 Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

liuzujun
2021-12-30 12:40:14 +0800
1a26a647 #fxcn_11862 恢复代码，unit_talent表问题 Browse Code »

liuzujun
2021-12-30 12:39:47 +0800
131a1ae1 Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

liuzujun
2021-12-30 12:02:21 +0800
50f22d1e #fxcn_11862 增加学习技能步骤 Browse Code »

liuzujun
2021-12-30 12:01:59 +0800
9d828fa3 Merge branch 'cn/develop' into cn/publish/zhaolu_test Browse Code »

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

liuzujun
2021-12-30 11:46:02 +0800
d3706f9a 测试gm工具开启 Browse Code »

liuzujun
2021-12-30 11:39:50 +0800

28 Dec, 2021

1 commit

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

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

27 Dec, 2021

2 commits

d82e0b8e Merge branch 'cn/develop' into cn/publish/zhaolu Browse Code »

zhangqijia
2021-12-27 12:12:09 +0800
7cbae6f3 fix: Role:costItem增加返回值, 调用该函数的地方加上逻辑判断。 Browse Code »

zhangqijia
2021-12-27 11:43:28 +0800

21 Dec, 2021

1 commit

d2d7ea5c 取消gm指令和充值接口 Browse Code »

liuzujun
2021-12-21 16:12:00 +0800

20 Dec, 2021

2 commits

3216ec40 preload.lua 权限修改 Browse Code »

member1
2021-12-20 18:19:07 +0800
df690706 修改日志日期时间 Browse Code »

zhaolu
2021-12-20 09:53:39 +0800

17 Dec, 2021

1 commit

c0bf89db 修改日志端口 Browse Code »

zhaolu
2021-12-17 16:58:13 +0800

10 Dec, 2021

1 commit

12c9daeb 新增配置 Browse Code »

member1
2021-12-10 11:26:20 +0800

09 Dec, 2021

1 commit

71485a88 新增1-4服配置 Browse Code »

member1
2021-12-09 11:40:47 +0800

06 Dec, 2021

7 commits

9ad83c89 fix: role_by_uid 处理错误 Browse Code »

zhangqijia
2021-12-06 09:32:02 +0800
1281f467 fix: roleByUid 多了`,` Browse Code »

zhangqijia
2021-12-06 09:32:02 +0800
822c6426 fix: roleByUid 字符串问题 Browse Code »

zhangqijia
2021-12-06 09:32:00 +0800
0db77207 fix: searchAllRoleRpc协议无值返回空 Browse Code »

zhangqijia
2021-12-06 09:31:59 +0800
46248521 fix: searchAllRoleRpc协议 serverid和uid参数错误 Browse Code »

zhangqijia
2021-12-06 09:31:59 +0800
01d10772 fix: searchAllRoleRpc协议 rsp判空 Browse Code »

zhangqijia
2021-12-06 09:31:59 +0800
d2d5ea42 fix: searchAllRoleRpc协议 code改为errcode Browse Code »

zhangqijia
2021-12-06 09:31:59 +0800

03 Dec, 2021

5 commits

1426c613 fix: role_by_uid 处理错误 Browse Code »

zhangqijia
2021-12-03 19:30:55 +0800
60793192 fix: roleByUid 多了`,` Browse Code »

zhangqijia
2021-12-03 19:26:17 +0800
cf73248c fix: roleByUid 字符串问题 Browse Code »

zhangqijia
2021-12-03 19:22:19 +0800
fa2313a8 fix: searchAllRoleRpc协议无值返回空 Browse Code »

zhangqijia
2021-12-03 19:08:13 +0800
04686823 fix: searchAllRoleRpc协议 serverid和uid参数错误 Browse Code »

zhangqijia
2021-12-03 18:59:01 +0800