Commit Graph

3825 Commits

Author SHA1 Message Date
01459af59e 传参修改 2023-03-10 15:48:41 +08:00
4f71fa8ce2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 15:47:26 +08:00
03b846b3f1 任务批量处理 2023-03-10 15:47:19 +08:00
5acf0521c4 update 2023-03-10 15:43:58 +08:00
158ac69b08 批量处理任务的接口 2023-03-10 15:27:46 +08:00
74699cca78 批量处理任务的接口 2023-03-10 15:25:17 +08:00
ad94d3e83b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 15:04:35 +08:00
3a6de14d83 工具心跳处理 2023-03-10 15:04:27 +08:00
liwei1dao
ea11b690da 上传心跳优化 2023-03-10 14:39:59 +08:00
liwei1dao
086f87468e 上传商品购买 2023-03-10 11:40:49 +08:00
e2c1e89ef4 配置更新 2023-03-10 11:00:49 +08:00
795e534105 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 10:19:48 +08:00
1dba115251 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 09:54:13 +08:00
7a927c4f4f 配置同步 2023-03-10 09:53:31 +08:00
liwei
00d84a8de6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/json/game_drawcard.json
	bin/json/game_mainchapter.json
	bin/json/game_mainstage.json
2023-03-09 16:25:35 +08:00
liwei
43069284cb 上传配置 2023-03-09 16:24:49 +08:00
30fd56cdfc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-09 14:04:06 +08:00
029678b4fd 自定义循环抽卡 2023-03-09 14:03:48 +08:00
f511e046a5 配置解析调整 2023-03-09 10:29:19 +08:00
d2f188911d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-09 10:22:20 +08:00
b990e1a43e 配置更新 2023-03-09 10:22:12 +08:00
liwei1dao
0a5a23ebe4 上传商店新增类型 2023-03-09 10:10:34 +08:00
liwei
1da5a70a17 上传配置 2023-03-08 19:02:27 +08:00
9c3689c51c add log 2023-03-08 19:01:16 +08:00
8dd45984bb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 18:55:40 +08:00
b3f3a1a85f update 2023-03-08 18:55:21 +08:00
liwei1dao
672fd4dde0 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 18:40:28 +08:00
liwei1dao
8118e59c44 上传代码 2023-03-08 18:37:16 +08:00
2d72bc5e5f 更新配置 2023-03-08 18:29:30 +08:00
b1cab16315 修改连击时间差 2023-03-08 18:27:42 +08:00
8b228a7cd0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 18:10:27 +08:00
904b83eacf 创角时创建公会 2023-03-08 18:10:13 +08:00
liwei1dao
2d02e5289a 关闭网关日志 2023-03-08 17:46:46 +08:00
5177d65bb7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 17:30:43 +08:00
cbeed70753 注册邮件校验 2023-03-08 17:30:38 +08:00
liwei1dao
dbaf1cc79e 上传消息频率处理 2023-03-08 17:04:59 +08:00
e56446667e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 16:56:59 +08:00
0eeb1799be 3.10公会预创建 2023-03-08 16:56:48 +08:00
6fe3d364b8 好友功能条件开启 2023-03-08 16:08:23 +08:00
6a39b36e47 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 15:12:52 +08:00
7b79fd7d78 扩展数据初始调整 2023-03-08 15:10:56 +08:00
eb9f2bb1ec 协议解锁 2023-03-08 14:55:05 +08:00
liwei1dao
71cff0b09d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 14:52:17 +08:00
liwei1dao
e8896712ac 上传登录代码 2023-03-08 14:51:46 +08:00
cb6410730c 碎片转换 2023-03-08 12:25:54 +08:00
c2e1a230fe 创角发欢迎邮件 2023-03-08 11:17:31 +08:00
27d02a32cc 附魔移除不需要的配置 2023-03-08 10:52:18 +08:00
liwei1dao
b11fb0b493 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-08 10:04:16 +08:00
liwei1dao
9eaf0350f6 关闭网关测试日志 2023-03-08 10:04:06 +08:00
6c44a4632e 协议加锁 2023-03-08 09:41:29 +08:00