Commit Graph

7857 Commits

Author SHA1 Message Date
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
d17b5fdf26 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 16:10:39 +08:00
liwei1dao
bf921ff420 上传武器装备异常日志 2022-07-22 16:10:24 +08:00
liwei1dao
ef9f36f3ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:57:48 +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
4c1fb5db0b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:53:33 +08:00
liwei1dao
9d3294f068 上传装备 一件多穿的bug 2022-07-22 15:53:18 +08:00
liwei1dao
529426c72d 上传linux执行异常问题 2022-07-22 15:33:26 +08:00
liwei1dao
7706f65864 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:30:16 +08:00
liwei1dao
fe39bf30c1 上传 2022-07-22 15:30:13 +08:00
liwei
f0680747d3 移除编译文件 2022-07-22 15:25:27 +08:00
liwei
14be58f686 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:24:33 +08:00
liwei
891834a3ef 上传编译文件带啊 2022-07-22 15:24:30 +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
liwei1dao
c8ed280049 修复rpc 客户端锁处理 2022-07-22 13:47:05 +08:00
liwei1dao
10881f1411 上传选择器锁处理 2022-07-22 13:41:44 +08:00
liwei1dao
680d6f5c0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-22 13:38:00 +08:00
liwei1dao
d7f7661e6a 修改忽略文件 2022-07-22 12:10:25 +08:00
liwei1dao
22bb5efa3b 移除临时文件 2022-07-22 12:09:20 +08:00
liwei1dao
ef18beaeae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 12:04:45 +08:00
liwei1dao
0fc04d948a 上传文档 2022-07-22 12:04:40 +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
liwei1dao
b882b96d21 上传编译脚本以及部署编译文档 2022-07-22 11:52:30 +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
85016b5d03 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:31:40 +08:00
52b0aeaf35 邮件优化 增加一些错误码 2022-07-22 11:31:15 +08:00
liwei1dao
aaa39e13ea 上传编译工具处理 2022-07-22 11:08:27 +08:00
fc3420bfb8 附件领取用户校验 2022-07-22 10:50:07 +08:00
477bfd265a 一键启动 一键关闭脚本 2022-07-21 21:08:25 +08:00
liwei
f47b8d96e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 21:01:30 +08:00
liwei
70af814d47 上传启动脚本 2022-07-21 20:59:58 +08:00
98679169f1 配置文件更新 2022-07-21 20:58:38 +08:00
liwei
dd81d65012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 20:50:43 +08:00
8545e7a017 创角发放道具ID修改 2022-07-21 20:50:07 +08:00