liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
892 Commits 20 Branches 0 Tags 1.1 GiB
052f3479a6
Commit Graph

681 Commits

Author SHA1 Message Date
liwei1dao
991c40f416 上传道具使用配置 2022-07-22 19:35:59 +08:00
liwei1dao
46cdc69c14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 19:34:32 +08:00
liwei1dao
2bf8b2bf12 上传道具使用配置 2022-07-22 19:34:05 +08:00
zhaocy
374d9ce3c9 删除不用的接口 2022-07-22 19:21:06 +08:00
liwei
79024873d5 上传商店消耗代码 2022-07-22 19:10:37 +08:00
liwei
34307b6b72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 19:09:27 +08:00
liwei1dao
efc585f8e3 上传商店购买金币消耗异常问题 2022-07-22 19:09:16 +08:00
meixiongfeng
02fc1a4e2b 抽卡消耗 增加一些错误码 2022-07-22 19:08:52 +08:00
liwei
aee37daac5 上传道具使用和出售 2022-07-22 18:31:24 +08:00
zhaocy
544dd3b374 删除错误引用 2022-07-22 18:25:19 +08:00
zhaocy
4f32f23c0f 接口测试 2022-07-22 18:25:17 +08:00
zhaocy
a087b3f668 增加任务类型 2022-07-22 18:24:14 +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
meixiongfeng
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
meixiongfeng
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
meixiongfeng
90675a76d7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:53:46 +08:00
meixiongfeng
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
meixiongfeng
257e044e08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 14:29:36 +08:00
meixiongfeng
7326b8209d 获取图鉴信息 2022-07-22 14:29:15 +08:00
liwei1dao
3c5c9d4c55 上传商店最后售价 2022-07-22 13:58:50 +08:00
meixiongfeng
8050f7a77d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:56:42 +08:00
meixiongfeng
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
meixiongfeng
52b0aeaf35 邮件优化 增加一些错误码 2022-07-22 11:31:15 +08:00
meixiongfeng
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
meixiongfeng
2250c07da4 创角获得道具按配置表数据填充 2022-07-21 20:23:04 +08:00
meixiongfeng
62000a8ef9 解决冲突 2022-07-21 19:56:40 +08:00
meixiongfeng
690f23f480 主线任务默认第一章节 2022-07-21 19:54:24 +08:00
meixiongfeng
b4281c9c84 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 19:47:14 +08:00
meixiongfeng
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
meixiongfeng
21e6225520 属性推送合并,增加一些错误码 2022-07-21 19:13:52 +08:00
liwei
3fcf0b4e09 修复codec编码工具错误代码 2022-07-21 18:23:19 +08:00
meixiongfeng
fe5fae9ca8 主线章节挑战完成后推送新的章节 2022-07-21 17:43:31 +08:00
liwei
00eec6c3c6 上传武器消息推送错误 2022-07-21 17:03:14 +08:00
meixiongfeng
448875978a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 16:05:06 +08:00
meixiongfeng
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
meixiongfeng
3809abc381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 11:58:59 +08:00
meixiongfeng
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
meixiongfeng
d5de595b59 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-20 21:22:53 +08:00
meixiongfeng
595d83581f 报错处理，英雄变更消息推送 2022-07-20 21:22:35 +08:00
zhaocy
1204eb0212 用户数据初始化 2022-07-20 21:14:19 +08:00
liwei1dao
27a6f9d7f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 21:05:00 +08:00
liwei1dao
4bb0dc308a 上传聊天调试优化代码 2022-07-20 21:04:34 +08:00
meixiongfeng
fc38b7f4ca 抽卡保底逻辑 2022-07-20 20:59:06 +08:00
meixiongfeng
98575d23df Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-20 18:11:50 +08:00
meixiongfeng
1c2ea3d15f 抽卡保底相关逻辑 2022-07-20 18:10:27 +08:00
liwei1dao
9b4eb509f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 17:57:10 +08:00
liwei1dao
335aa7284b 上传聊天服务代码 2022-07-20 17:56:09 +08:00
zhaocy
3946216c04 用户设置 2022-07-20 17:44:15 +08:00
zhaocy
2333b055bb 装备叠卡修改 2022-07-20 17:42:45 +08:00
liwei1dao
5f83525eeb 上传代码修复 2022-07-20 14:19:30 +08:00
liwei1dao
560eda6b87 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 14:04:37 +08:00
liwei1dao
cdedf4414d 上传聊天系统业务开发 2022-07-20 14:01:59 +08:00
meixiongfeng
0099f3d01c 抽卡 2022-07-19 19:38:32 +08:00
liwei1dao
0031d7bfe8 上传聊天模块跨服成员聊天维护 2022-07-19 19:35:58 +08:00
meixiongfeng
13800c4273 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-19 18:38:47 +08:00
meixiongfeng
f8c111a669 加一些错误码，再加一些数据校验 2022-07-19 18:37:38 +08:00
liwei1dao
3eef4844c6 上传聊天系统以及底层通信扩展 2022-07-19 18:09:45 +08:00
zhaocy
19c7bfdb84 卡牌攻略 2022-07-19 16:23:18 +08:00
zhaocy
094c47885f 更新消卡逻辑 2022-07-19 14:36:00 +08:00
meixiongfeng
989cc98065 抽卡配置表解析, 推送协议大写改小写 2022-07-19 14:32:38 +08:00
meixiongfeng
23ea4597bc 消耗英雄推送消息 2022-07-19 13:48:48 +08:00
meixiongfeng
6e0a8c9a7d 接口参数uid 改session对象 2022-07-19 12:05:31 +08:00
meixiongfeng
c72a7edde2 属性推送subType 2022-07-19 11:03:06 +08:00
zhaocy
1251ec38a0 添加攻略类型 2022-07-19 10:49:03 +08:00
zhaocy
d49aae3ab7 修改英雄叠加逻辑 2022-07-19 10:49:03 +08:00
meixiongfeng
d8d9079065 协议修改 2022-07-19 10:37:45 +08:00
liwei1dao
9320b53f45 上传聊天模块以及底层消息广播接口 2022-07-18 18:37:06 +08:00
zhaocy
03e2337b36 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 17:10:34 +08:00
zhaocy
62703c4cde 叠加英雄处理 2022-07-18 17:10:29 +08:00
meixiongfeng
73b72596fb 所有添加资源的地方打印日志，方便定位问题 2022-07-18 17:09:12 +08:00
meixiongfeng
ac8e54f599 主线章节 字段变更 2022-07-18 16:51:26 +08:00
meixiongfeng
93df38efd2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 16:13:49 +08:00
meixiongfeng
c22b917747 配置表更新 2022-07-18 16:13:28 +08:00
zhaocy
76dfb1651f update 2022-07-18 15:30:28 +08:00
zhaocy
aa253f24ec 修改是否叠加的判断 2022-07-18 15:03:11 +08:00
meixiongfeng
62c05813e3 配置文件变更 2022-07-18 15:02:30 +08:00
meixiongfeng
0c338b2465 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 14:11:12 +08:00
meixiongfeng
dba9df09f2 添加测试协议 2022-07-18 14:10:48 +08:00
zhaocy
e82097fa14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 13:39:04 +08:00
zhaocy
a6d674cf1e 接口测试 2022-07-18 13:39:00 +08:00
liwei1dao
c9d1d5b655 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-18 11:14:33 +08:00
liwei1dao
938d4b47fc 上传商店折扣结算 2022-07-18 10:58:37 +08:00
meixiongfeng
8d7e6fca4e 道具不足详细日志 2022-07-18 10:40:40 +08:00
liwei1dao
fe776970a9 上传道具出售接口 2022-07-18 10:10:56 +08:00
liwei1dao
3db2d0dc46 上传hero_test 测试脚本 2022-07-18 09:28:59 +08:00
liwei1dao
928f2ccc11 修复codec 编码库json解析错误 2022-07-15 21:10:56 +08:00
liwei1dao
f8653cdd3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-15 20:08:19 +08:00
liwei1dao
9e699cc116 提交道具背包优化 2022-07-15 20:08:03 +08:00
meixiongfeng
59ed0e621a 英雄升级协议调整 2022-07-15 18:40:07 +08:00
meixiongfeng
3c1aad6c92 配置表数据同步 2022-07-15 17:44:57 +08:00
meixiongfeng
3ff97fd76d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-15 16:41:48 +08:00
meixiongfeng
fe034ea284 增加一些错误码 2022-07-15 16:41:20 +08:00
liwei1dao
840bc4c986 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-15 16:15:04 +08:00
liwei1dao
12b8a79432 上传redis 批量读写优化 2022-07-15 16:14:54 +08:00
liwei1dao
a2273fa1d1 优化redis 批量读写 2022-07-15 16:03:03 +08:00
meixiongfeng
1f036cc7a4 新增一些错误码 2022-07-15 15:20:46 +08:00
meixiongfeng
2d7405baea update 2022-07-15 13:42:08 +08:00
meixiongfeng
0d9b59a4c3 报错 2022-07-15 10:57:47 +08:00
zhaocy
c87bca9004 接口测试 2022-07-15 10:37:11 +08:00
zhaocy
3fccabd82b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-14 17:46:04 +08:00
zhaocy
8697a9fe10 优化测试报告 2022-07-14 17:45:55 +08:00
liwei1dao
025f80cd7c 上传修复 item 数据没有uid 字段错误 2022-07-14 16:08:12 +08:00
meixiongfeng
0a37601f1a 资源整合，所有变更资源主动推送给客户端 2022-07-14 15:53:08 +08:00
meixiongfeng
dd1ba19d30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-14 14:20:07 +08:00
meixiongfeng
76de1d7245 优化 2022-07-14 14:19:54 +08:00
liwei1dao
c413f3a99c 上传跨服调用远程消息处理 2022-07-14 11:43:37 +08:00
liwei1dao
5df960b247 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-14 09:35:32 +08:00
liwei1dao
6baa4d5197 上传武器资源更改消息推送 2022-07-13 19:30:50 +08:00
liwei1dao
2071a13416 上传资源更改消息推送 2022-07-13 19:30:09 +08:00
liwei1dao
522aa5e01f 上传公告系统后台接口 2022-07-13 18:59:04 +08:00
liwei1dao
f47005cc18 上传编解码优化 2022-07-13 18:20:27 +08:00
liwei1dao
51f729dcd6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:50:39 +08:00
liwei1dao
5036f6b2b0 上传API接口校验扫描 2022-07-13 16:50:35 +08:00
meixiongfeng
71bac26e10 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:31:14 +08:00
meixiongfeng
7c0ea7a0c9 统一接口处理日志 2022-07-13 16:30:39 +08:00
zhaocy
0b7f26bab3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:17:38 +08:00
zhaocy
fb3a2ce08a 支持测试接口连续调用 2022-07-13 16:17:33 +08:00
liwei1dao
1a96cde1c8 回复mgolog 目录 2022-07-13 16:15:10 +08:00
liwei1dao
710f28831e 上传日志优化 2022-07-13 16:12:56 +08:00
liwei1dao
c251a63adc 上传网关日志开关 2022-07-13 15:50:19 +08:00
liwei1dao
acbeae031c 伤处模块日志优化 2022-07-13 15:46:27 +08:00
liwei1dao
2bb353817e 上传日志优化代码 2022-07-13 15:06:48 +08:00
liwei1dao
0e7e6169a2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-13 15:06:19 +08:00
meixiongfeng
8b8595a7de 部分函数subType 修改 2022-07-13 14:32:01 +08:00
liwei1dao
3af54fdb14 上传gm模块补充 2022-07-13 14:14:26 +08:00
meixiongfeng
e40621b335 数据校验 2022-07-13 11:32:06 +08:00