Commit Graph

1104 Commits

Author SHA1 Message Date
liwei1dao
42d1a3f6c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-06 18:02:51 +08:00
liwei1dao
cf65a54b8f 上传跨服消息分发优化 2022-09-06 18:02:46 +08:00
5e571fcdbc 支线剧情任务 2022-09-06 17:25:26 +08:00
liwei1dao
526e32e708 上传战斗业务对接接口 2022-09-06 17:00:25 +08:00
liwei1dao
b838460200 上传战报数据独享 2022-09-06 16:44:19 +08:00
liwei1dao
c77443c862 上传月之秘境代码 2022-09-06 15:57:26 +08:00
liwei1dao
0a229ceb56 上传战斗系统相关接口 2022-09-06 12:42:06 +08:00
liwei1dao
583a482a3f 上传战斗接口 2022-09-06 11:37:29 +08:00
liwei1dao
8ab7ba0ed0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-06 11:05:07 +08:00
liwei1dao
a387383e4a 上传战斗记录数据 2022-09-06 11:05:01 +08:00
4cf9594a75 命名修改 2022-09-06 10:51:25 +08:00
4f78b63c06 创建怪物英雄 2022-09-06 10:40:41 +08:00
8422b3b3a3 bug 2022-09-06 09:45:30 +08:00
5358359316 转string 2022-09-02 19:03:21 +08:00
15b8284462 viking boss 通关时间字段修改 + 随机任务 2022-09-02 18:42:16 +08:00
455952d877 viking boss类型校验 2022-09-02 17:24:07 +08:00
66997a30ca 一些优化 2022-09-02 17:19:06 +08:00
31258667c8 铁匠铺台子保底字段修改+ 单元测试 2022-09-02 14:12:21 +08:00
5377fa936b 没有订单的时候计算正在制作的食材 2022-09-01 20:22:48 +08:00
6339f7c0ad 随机任务+订单跨天bug 2022-09-01 19:45:37 +08:00
812155fc7d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 18:55:27 +08:00
c38efd8c42 美食家订单bug 2022-09-01 18:55:02 +08:00
liwei1dao
33af640bd4 上传月子秘境测试修复 2022-09-01 15:19:39 +08:00
8c11261751 更新测试 2022-09-01 14:58:40 +08:00
liwei1dao
6b4dae65e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 14:42:57 +08:00
liwei1dao
ce838025f3 上传月之秘境代码 2022-09-01 14:41:59 +08:00
ee1bc3fcc2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 14:39:36 +08:00
8ea4b38ad2 mainline 配置表调整 2022-09-01 14:39:11 +08:00
d045ecad3f 更新配置 2022-09-01 10:23:22 +08:00
a1b86a0579 更新新任务 2022-09-01 10:09:55 +08:00
3a1bdcc4ba Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 10:08:58 +08:00
ecefefe768 json 同步 2022-09-01 10:08:29 +08:00
liwei1dao
1c08ebf8d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-09-01 09:56:10 +08:00
645514ed3d 美食家 加一个订单开始时间 2022-08-31 19:49:33 +08:00
liwei1dao
c4890b796b 上传月子秘境 对接聊天系统推送好友消息 2022-08-31 19:45:56 +08:00
a47f734c16 狩猎 2022-08-31 19:25:21 +08:00
057dd305aa 美食家配置表合并 2022-08-31 17:26:44 +08:00
431c95ebb0 随机任务埋点 2022-08-31 17:14:47 +08:00
91026c85c3 随机任务埋点 2022-08-31 17:14:33 +08:00
liwei1dao
d975c28b68 装备套装星级和等级属性添加 2022-08-31 16:11:23 +08:00
liwei1dao
8e71ed1091 上传月之秘境代码优化 2022-08-31 14:29:17 +08:00
b37cbfbc48 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-31 13:34:24 +08:00
c934218f47 bugs 2022-08-31 13:34:06 +08:00
liwei1dao
3222c9fc4e 上传配置文件加载修复 2022-08-31 11:09:58 +08:00
liwei1dao
058712919b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-31 11:06:39 +08:00
liwei1dao
efa4bc698b 上传随机任务埋点 2022-08-31 11:03:32 +08:00
562498ac25 全局drop配置文件调用 2022-08-31 11:02:11 +08:00
8f08ad88b9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-31 09:47:49 +08:00
82b83161ef 铁匠铺去掉数量为0 的订单 2022-08-31 09:46:11 +08:00
liwei1dao
54e737fafe 随机任务埋点 2022-08-30 18:56:14 +08:00
liwei1dao
df08889bb8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 18:03:35 +08:00
liwei1dao
9611f22a2c 修复随机任务接口代码 2022-08-30 18:03:32 +08:00
e7f1af0c2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-30 17:58:47 +08:00
bf07eaaa89 狩猎相关 2022-08-30 17:58:24 +08:00
liwei1dao
0f02d1b280 上传随机任务接口以及底层对象支持 2022-08-30 17:57:32 +08:00
1315707ce4 铁匠铺bug 2022-08-30 17:14:35 +08:00
liwei1dao
8645ecfa17 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-30 15:15:00 +08:00
liwei1dao
9bd7cdf62a 上传月之秘境相关代码 2022-08-30 15:14:10 +08:00
d8477d7ce7 记录铁匠铺正在做订单开始时间 2022-08-30 14:39:29 +08:00
liwei1dao
8fd90c6c37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 13:46:28 +08:00
liwei1dao
e94540662b 上传月之秘境模块 2022-08-30 13:46:25 +08:00
2188bb269a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 12:02:14 +08:00
93357d6eeb 更新随机任务枚举 2022-08-30 12:02:06 +08:00
8490699f6d drop接口修改 支持多参数 2022-08-30 11:34:15 +08:00
a875f850ba 模块注册 2022-08-29 19:09:35 +08:00
1d7d54f745 update 2022-08-29 18:48:31 +08:00
f99145deac update 2022-08-29 18:47:00 +08:00
38de051978 维京 购买 排行 功能自测 2022-08-29 18:26:17 +08:00
fe868ea764 Merge branches 'meixiongfeng' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-29 11:47:00 +08:00
liwei1dao
d94e4a4460 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-29 09:29:27 +08:00
liwei1dao
9831c451c4 上传装备补充需求 装备锁定以及装备出售接口 2022-08-29 09:29:21 +08:00
2feb69cb6f viking 2022-08-26 19:03:14 +08:00
liwei
689ba47749 上传武馆需求优化 2022-08-26 17:53:34 +08:00
6200efd55b update 2022-08-26 17:38:29 +08:00
d3bd8b5de0 update 2022-08-26 17:33:41 +08:00
e20dd5d33c 更新配置 2022-08-26 17:11:24 +08:00
2a1f9ce395 viking 2022-08-26 17:04:27 +08:00
ae6ffabe3b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-26 15:46:36 +08:00
b16cc0ce5c bug 2022-08-26 15:46:18 +08:00
liwei1dao
2b7f9e4a9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-26 15:43:09 +08:00
liwei1dao
6c04e4ad8c 上传页面调试工具集成到web服务下 2022-08-26 15:42:59 +08:00
3b50014bc4 update gui 2022-08-25 19:22:51 +08:00
7f2f36c544 铁匠铺bug + viking 2022-08-25 19:04:42 +08:00
749faa1b65 update json 2022-08-25 16:30:07 +08:00
liwei1dao
24885902af 修复配置中心 启动接口被多次执行的bug 2022-08-25 11:15:43 +08:00
liwei1dao
b5c5636fb6 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-25 10:57:21 +08:00
liwei1dao
e9cbc55192 上传 2022-08-25 10:56:09 +08:00
liwei
ee365ff313 上传武馆接口参数校验 2022-08-25 09:51:50 +08:00
liwei1dao
4c203aa3b2 上传武馆升级概率机制 2022-08-25 09:48:32 +08:00
9ef0b28252 配置表更新 2022-08-24 20:01:21 +08:00
4e75419f38 通过uid创建索引 2022-08-24 19:09:05 +08:00
43ff5abd83 美食馆获取一些其他玩家信息 2022-08-24 18:13:43 +08:00
959a155424 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 17:58:13 +08:00
8aed7bc49b 删除排行榜数据接口 2022-08-24 17:57:53 +08:00
liwei1dao
3cf5f9bb3c 添加武馆练功状态添加 2022-08-24 17:44:43 +08:00
liwei1dao
5ec1af1f54 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 17:42:31 +08:00
liwei1dao
b809e50bb6 上传武馆领取奖励后 状态修改 2022-08-24 17:42:25 +08:00
823b585ede get rank 2022-08-24 17:10:38 +08:00
3edbb71e97 update config 2022-08-24 16:52:42 +08:00
8d6a271d6c 排行榜 2022-08-24 16:48:49 +08:00
liwei1dao
9f4740d418 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 09:53:50 +08:00
liwei1dao
23176056ac 上传定时模块 2022-08-24 09:53:43 +08:00
cf19393862 更新随机任务 2022-08-24 09:43:49 +08:00
liwei
0aa9bc9f66 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 09:36:41 +08:00
9c8a484094 日志输出毫秒 2022-08-24 09:36:04 +08:00
liwei
780e254c4e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 09:35:54 +08:00
liwei
3021ae4d93 上传武馆的英雄校验 2022-08-24 09:35:11 +08:00
liwei1dao
2949f8880f 添加db系统过期机制 2022-08-23 18:42:59 +08:00
6bbdda1924 更新错误码 2022-08-23 16:45:51 +08:00
b7bb3ab4dc 更新任务 2022-08-23 16:45:13 +08:00
liwei
a0b542b20d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-23 14:57:13 +08:00
liwei
58d4143827 修复武馆协议学历恶化异常错误 2022-08-23 14:57:05 +08:00
b1932382bf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-23 14:55:48 +08:00
6b0077e883 铁匠铺bug 2022-08-23 14:55:32 +08:00
liwei1dao
7da333d4a4 上传武馆柱子解锁限制 2022-08-23 14:01:38 +08:00
liwei1dao
e88401e98d 修复武馆配置文件表名变动 2022-08-23 11:24:07 +08:00
be67f409c4 桌台技能升级 重计算订单消耗时间 2022-08-23 10:55:21 +08:00
870b59d260 添加限定条件-剧情ID 2022-08-22 18:44:38 +08:00
288e899d39 更新随机任务限定条件 2022-08-22 18:41:40 +08:00
6ff804b692 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-22 17:33:39 +08:00
141113f7cf 查询章节ID接口 2022-08-22 17:33:35 +08:00
liwei1dao
b63eabb605 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-22 16:30:54 +08:00
liwei1dao
8d0652643f 上传评论与武馆的协议标题问题 2022-08-22 16:30:46 +08:00
6840a0c890 更新随机任务协议 2022-08-22 15:27:31 +08:00
fba3d2184c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-22 09:44:32 +08:00
2dcb9eab44 报错修改 2022-08-19 20:04:21 +08:00
3e479c2321 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-19 19:16:40 +08:00
21dabd2f98 修改任务类型 2022-08-19 18:33:21 +08:00
52cebd0430 铁匠铺 2022-08-19 18:19:43 +08:00
42673f6bbe 更新配置 2022-08-19 18:13:13 +08:00
781466ba57 更新助战协议 2022-08-19 15:31:13 +08:00
7bb58fa2ff 更新好友助战 2022-08-19 15:23:07 +08:00
509043d8d4 update 2022-08-19 15:23:07 +08:00
f05347cc2f 优化全局配置 2022-08-19 12:06:48 +08:00
0f35317220 推送取消练功状态 2022-08-19 10:21:54 +08:00
e047f4a883 英雄练功接口 2022-08-19 10:17:50 +08:00
5dabbeca17 更新gui存储 2022-08-18 21:04:57 +08:00
1dfd64da0c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 20:45:19 +08:00
7880b80fdd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 20:09:29 +08:00
d45f5fdc8a 更新点赞 2022-08-18 20:09:22 +08:00
liwei1dao
052822208e 上传武馆代码 2022-08-18 19:57:14 +08:00
liwei1dao
f73ca86f97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 19:55:57 +08:00
liwei1dao
3ea3ca84e4 上传武馆代码 2022-08-18 19:55:52 +08:00
0c2b4fcd1c 一些bug 2022-08-18 19:34:22 +08:00
4de5172db3 更新配置 2022-08-18 18:52:22 +08:00
fd96c61556 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 18:25:11 +08:00
3c3b0743bb 爬塔测试 2022-08-18 18:23:40 +08:00
liwei
0f5b8d6986 上传评论点赞接口优化 2022-08-18 17:55:10 +08:00
121e7c94d2 更新协议 2022-08-18 17:10:02 +08:00
liwei1dao
e17d949942 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 17:07:10 +08:00