Commit Graph

3088 Commits

Author SHA1 Message Date
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
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
liwei1dao
2266d3872d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-21 17:02:32 +08:00
liwei1dao
39230faea3 上传选择器锁处理 2022-07-21 17:01:00 +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