Commit Graph

570 Commits

Author SHA1 Message Date
liwei
aee37daac5 上传道具使用和出售 2022-07-22 18:31:24 +08:00
liwei1dao
8a10729d97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 18:09:49 +08:00
744c0fa2b5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 18:09:17 +08:00
liwei1dao
5ab2a02575 上传道具使用集合出售 2022-07-22 18:09:07 +08:00
cc3452d881 离线通知dbservice 抽卡优化 2022-07-22 18:08:51 +08:00
liwei1dao
b9650a5ea6 上传gm接口代码 2022-07-22 17:05:28 +08:00
liwei1dao
77e141ec29 上传装备套装数据维护 2022-07-22 16:41:40 +08:00
liwei1dao
233f9f4367 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 16:37:08 +08:00
liwei1dao
6052a984b0 上传离线推送跨服集群 2022-07-22 16:36:50 +08:00
liwei1dao
999c7f3c41 上传用户离线通知日志服务器处理数据同步 2022-07-22 16:21:31 +08:00
liwei1dao
bf921ff420 上传武器装备异常日志 2022-07-22 16:10:24 +08:00
90675a76d7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:53:46 +08:00
36c74e2323 同步套装id信息 2022-07-22 15:53:40 +08:00
liwei1dao
9d3294f068 上传装备 一件多穿的bug 2022-07-22 15:53:18 +08:00
liwei1dao
ae13a7f85c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:18:03 +08:00
liwei1dao
9f6f4b5bc0 上传自动注册gm api 和武器接口优化 2022-07-22 15:17:49 +08:00
257e044e08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 14:29:36 +08:00
7326b8209d 获取图鉴信息 2022-07-22 14:29:15 +08:00
liwei1dao
3c5c9d4c55 上传商店最后售价 2022-07-22 13:58:50 +08:00
8050f7a77d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:56:42 +08:00
0ca4bc689a 升级后等级差值穿给任务模块 2022-07-22 11:56:16 +08:00
liwei
2df1a12c58 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/gateway
	bin/mainte
	bin/start.sh
	bin/stop.sh
	bin/worker
2022-07-22 11:54:46 +08:00
zhaocy
893c3eec6e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:45:16 +08:00
zhaocy
865df37ac3 更新测试 2022-07-22 11:45:09 +08:00
52b0aeaf35 邮件优化 增加一些错误码 2022-07-22 11:31:15 +08:00
fc3420bfb8 附件领取用户校验 2022-07-22 10:50:07 +08:00
liwei
e4653a0112 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 20:48:33 +08:00
zhaocy
9989b8376f 修改用户初始 2022-07-21 20:34:10 +08:00
2250c07da4 创角获得道具按配置表数据填充 2022-07-21 20:23:04 +08:00
62000a8ef9 解决冲突 2022-07-21 19:56:40 +08:00
690f23f480 主线任务默认第一章节 2022-07-21 19:54:24 +08:00
b4281c9c84 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 19:47:14 +08:00
6ca39af90a 英雄升级任务统计 打印错误日志 2022-07-21 19:46:45 +08:00
zhaocy
3579db4eae 更新配置 2022-07-21 19:45:00 +08:00
zhaocy
3c439e2aa2 修改属性计算 2022-07-21 19:44:02 +08:00
zhaocy
2b59b99946 更改任务key 2022-07-21 19:44:01 +08:00
zhaocy
49ae24219c 任务完成推送 2022-07-21 19:43:57 +08:00
21e6225520 属性推送合并,增加一些错误码 2022-07-21 19:13:52 +08:00
liwei
3fcf0b4e09 修复codec编码工具错误代码 2022-07-21 18:23:19 +08:00
fe5fae9ca8 主线章节挑战完成后推送新的章节 2022-07-21 17:43:31 +08:00
liwei
00eec6c3c6 上传武器消息推送错误 2022-07-21 17:03:14 +08:00
448875978a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 16:05:06 +08:00
56a013a5c4 推送消息合并 2022-07-21 16:04:35 +08:00
liwei
86fe4f9bed 修复武器列表同步问题 2022-07-21 14:44:29 +08:00
liwei1dao
0b347d7f2e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 14:42:15 +08:00
liwei1dao
9d39dc141e 上传武器装备数据更新异常bug 2022-07-21 14:42:11 +08:00
3809abc381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 11:58:59 +08:00
a943ca337a 添加邮件测试功能,修复堆叠英雄bug 2022-07-21 11:58:54 +08:00
liwei1dao
253386266f 修复上传消息推送bug以及服务发现bug 2022-07-21 11:56:22 +08:00
liwei1dao
28d91331f5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-21 09:34:50 +08:00