Commit Graph

681 Commits

Author SHA1 Message Date
cd77830576 克隆数据清理装备数据 2022-07-25 18:44:10 +08:00
zhaocy
c8f8f19bd1 更新捏人 2022-07-25 18:40:01 +08:00
zhaocy
b1e30b250b 形象配置 2022-07-25 18:40:01 +08:00
zhaocy
4b2873db8e 等级推送 2022-07-25 18:40:01 +08:00
zhaocy
ef6f6efa69 玩家等级优化 2022-07-25 18:40:00 +08:00
liwei1dao
88ae9d1694 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 18:39:55 +08:00
e06b0d8d31 属性计算优化 2022-07-25 18:39:12 +08:00
liwei1dao
61ef1a3ce2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 18:14:28 +08:00
10fb331b52 克隆英雄对象 2022-07-25 18:13:27 +08:00
liwei1dao
53076796e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 17:36:34 +08:00
97beb8c48d 数据结构调整 2022-07-25 17:35:06 +08:00
liwei1dao
13ef34b170 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 16:41:04 +08:00
liwei1dao
65dc3ece12 上传gm 模块 2022-07-25 16:40:20 +08:00
liwei1dao
4e1db72bce 修改gm模块为web模块 2022-07-25 16:35:35 +08:00
7d3628f6dc 报错修改 2022-07-25 16:23:29 +08:00
1c577a821f 抽卡活动 2022-07-25 16:18:35 +08:00
liwei1dao
4573ab8a64 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 16:10:35 +08:00
liwei1dao
ffde5decbe 上传创角回应修改 2022-07-25 16:10:09 +08:00
09572897b6 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 15:55:56 +08:00
05cd8a2d5c 优化接口 返回指针对象 2022-07-25 15:55:33 +08:00
liwei1dao
3be9f754ba 修改商店模块购买次数共享bug 2022-07-25 15:41:58 +08:00
c7d8bc15dc 资源id 由原来的int 转string 2022-07-25 14:41:44 +08:00
720aca33dc 英雄堆叠数量优化 2022-07-25 12:00:06 +08:00
liwei1dao
e2a480b1c4 上传代码 2022-07-23 16:27:08 +08:00
6f61a5102a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 01:40:28 +08:00
4335663fbc 英雄优化 2022-07-23 01:40:20 +08:00
liwei1dao
6442e4aff2 修改物品使用的消息推送机制 2022-07-23 01:00:57 +08:00
liwei
1f97b9f5be Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 00:30:49 +08:00
liwei
45ac29b18a 上传装备bug修复 2022-07-23 00:30:34 +08:00
c81e76b1d6 英雄叠加 2022-07-23 00:29:32 +08:00
251526932d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 00:19:10 +08:00
1bd6d9dfaf 堆叠数量bug 2022-07-23 00:18:46 +08:00
liwei1dao
3d3b3b8553 上传道具修改 2022-07-22 23:29:25 +08:00
liwei1dao
33dbbbdebf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 23:18:15 +08:00
liwei1dao
83d63a274a 上传物品购买返回空对象问题 2022-07-22 23:18:10 +08:00
zhaocy
ce60c619a8 更新任务进度 2022-07-22 23:16:02 +08:00
zhaocy
7a6a06614f 任务优化 2022-07-22 23:16:02 +08:00
02b2294af3 推送 2022-07-22 22:47:15 +08:00
82e8d0e608 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 22:14:46 +08:00
45c304c3d6 英雄变更推送打包 2022-07-22 22:14:21 +08:00
liwei
d520420919 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 22:06:16 +08:00
liwei
5755b8101a 上传物品叠加-1 的bug 2022-07-22 22:05:39 +08:00
1f6222e2bd 资源统一发放 有数据才推送 2022-07-22 22:04:32 +08:00
dc2ba18195 创角获取英雄的数据推送 2022-07-22 21:59:05 +08:00
liwei
49cffb0594 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 20:35:34 +08:00
liwei
58c51c3708 上传购买接口错误代码 2022-07-22 20:35:32 +08:00
liwei1dao
a2c64d9c8f 上传道具出售和使用代码 2022-07-22 20:33:25 +08:00
6397161f92 cominit 表名修改 2022-07-22 20:03:59 +08:00
liwei
5d21812274 上传商品购买扣费bug 2022-07-22 20:02:00 +08:00
liwei1dao
2686593ab0 上传道具背包使用 2022-07-22 19:36:47 +08:00
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
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
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