Commit Graph

1104 Commits

Author SHA1 Message Date
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
liwei1dao
397f959184 上传武馆优化 2022-08-18 17:07:04 +08:00
87fb35d43c 赛季塔 2022-08-18 16:56:21 +08:00
8c8e785517 更改协议名称 2022-08-18 16:04:22 +08:00
7a06050a7c 更新下线时间 2022-08-18 15:46:05 +08:00
f1f8b2cfd0 美食馆领取奖励 2022-08-18 15:29:55 +08:00
faa70b6921 爆红 2022-08-18 15:17:00 +08:00
1ea4663391 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-18 15:11:33 +08:00
aaeb434528 订单跨天情况 2022-08-18 15:11:20 +08:00
liwei1dao
126ddb9681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 15:10:06 +08:00
liwei1dao
cb7fff3445 同步配置文件命令修改 2022-08-18 15:09:34 +08:00
fad4d1744b 更新好友列表数据状态 2022-08-18 14:43:00 +08:00
b3a2f3719e 更新字段 2022-08-18 12:06:42 +08:00
aa8914c14e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:36:22 +08:00
0e2db951be Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:36:10 +08:00
117019a57d 随机掉落逻辑 2022-08-18 11:35:47 +08:00
liwei
e3d177e476 修复空对象异常错误 2022-08-18 11:34:56 +08:00
liwei
34bc631c9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:33:21 +08:00
51d0f01383 更新在线好友搜索 2022-08-18 11:32:33 +08:00
85c0fc0b72 更新本服在线用户 2022-08-18 11:32:33 +08:00
liwei
0af3ef8c60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:05:41 +08:00
liwei1dao
6d844a192f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:05:32 +08:00
liwei1dao
d56453ebb2 移除socket 过期代码,后面加心跳机制后再补上去 2022-08-18 11:05:25 +08:00
5da57b76ec update 2022-08-18 10:46:13 +08:00
eda8d58118 update 2022-08-18 10:46:13 +08:00
liwei
714b2369e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 10:33:55 +08:00
liwei1dao
58e8c9002d 上传socket 读取超时设置 2022-08-18 10:32:47 +08:00
liwei1dao
ad390040d7 广播消息不发送未登录用户修复 2022-08-18 10:28:31 +08:00
liwei
1e8873c096 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 10:03:17 +08:00
bad7c44903 更新配置 2022-08-18 10:01:04 +08:00
liwei1dao
98f149b3ee 上传聊天成功返回 2022-08-18 09:52:18 +08:00
e3a3f3396b 更新配置 2022-08-18 09:46:37 +08:00
6c258e903b 好友搜索 2022-08-18 09:31:24 +08:00
d735a6bb15 随机任务 2022-08-18 09:31:21 +08:00
48270ee931 刪除不用的文件 2022-08-17 19:09:53 +08:00
b0db5645ea 丛林美食馆 2022-08-17 18:57:15 +08:00
liwei
5dc57b66c8 上传装备配置表穿戴错误问题 2022-08-17 17:20:59 +08:00
liwei
fe69c0bfbe 装备升级配置表异常保护处理 2022-08-17 17:15:57 +08:00
4402d62a42 升到满级还想继续升级的bug 2022-08-17 15:18:59 +08:00
1b55e1fadb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-17 14:56:35 +08:00
d853b31603 美食家 2022-08-17 14:55:22 +08:00
liwei1dao
94db272d64 上传武馆解锁接口 2022-08-17 10:38:23 +08:00
liwei1dao
5452d8a93c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-17 09:55:00 +08:00
liwei1dao
ba0169ab47 上传转呗强化扣款逻辑修复 2022-08-17 09:54:41 +08:00
2dcebd44c4 发奖励 2022-08-17 09:53:03 +08:00
liwei1dao
a317fca98c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-17 09:37:58 +08:00
fc788396dc 美食家 2022-08-16 18:53:15 +08:00
8b7822b836 抽卡推送获取英雄数据
美食家代码
2022-08-16 16:24:04 +08:00
61c9f00eaa 抽卡推送获取卡信息
美食家
2022-08-16 16:22:35 +08:00
4434f27e4c 模块名修改 2022-08-16 15:05:12 +08:00
6dc481f07d 给英雄加经验接口 2022-08-16 15:02:44 +08:00
96c421265d 领取奖励 2022-08-16 14:44:05 +08:00
liwei1dao
030eb04f44 上传武馆代码 2022-08-16 14:24:57 +08:00
302e85dc59 爬塔数据保存bug 2022-08-16 14:15:43 +08:00
3fdd7fe115 配置文件修改 2022-08-16 13:37:56 +08:00
3eb6773160 美食馆 2022-08-16 11:05:46 +08:00
6368eee720 获取数据断线问题 2022-08-16 10:48:58 +08:00
123132b175 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-16 10:31:41 +08:00
42ee59ff2f 爬塔db 错误 2022-08-16 10:30:03 +08:00
liwei1dao
32086143e7 上传熊猫武馆代码 2022-08-16 10:10:20 +08:00
eefc249ba3 update list 2022-08-15 18:35:28 +08:00
9a040f7b94 json 上传 2022-08-15 18:25:47 +08:00
afc2468ef6 配置修改 2022-08-15 17:37:56 +08:00
bc9fdabfc3 抽卡协议修改 2022-08-15 17:11:45 +08:00
liwei1dao
e845ed0adc 上传武馆模块代码 2022-08-15 16:35:18 +08:00
liwei
8f80f08d5f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-15 14:40:41 +08:00
liwei
7e9ca63928 上传道具使用的bug 2022-08-15 14:39:24 +08:00
1484b92816 抽卡 2022-08-15 13:00:58 +08:00
liwei1dao
d8284654d7 上传道具使用 2022-08-12 18:59:38 +08:00
liwei1dao
c9f67d7414 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-12 18:55:18 +08:00
liwei1dao
bcd9916491 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-12 18:53:51 +08:00
d7fbfe3dd6 配置表更新 2022-08-12 18:53:51 +08:00
liwei1dao
cecd70bfa9 修复道具使用的问题 2022-08-12 18:30:22 +08:00
24fb25692f 共鸣属性分配BUG 2022-08-12 10:43:49 +08:00
d61274b14f 共鸣协议 修改 支持多参数 2022-08-11 20:58:40 +08:00
02148af676 共鸣bug 2022-08-11 20:20:08 +08:00
0e0c88c29a 创建单个英雄接口调整 2022-08-11 19:45:16 +08:00
80a8fb20c5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 18:09:39 +08:00
601019c9b1 共鸣能量分配属性类型修改 2022-08-11 18:09:20 +08:00
206fa0f9bb 添加测试接口 2022-08-11 18:07:12 +08:00
liwei1dao
8c158797c6 修复db层代码接口错误 2022-08-11 18:05:21 +08:00
liwei1dao
c834ab0d9a 上传道具合成处理以及掉落组表二次处理 2022-08-11 18:00:42 +08:00
a8a42d97c1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 17:10:57 +08:00
6ee83fa224 配置表重定义key 并支持热更 2022-08-11 17:10:33 +08:00
liwei1dao
d8e5f48caa 优化聊天私聊不推送自己的问题 2022-08-11 16:20:28 +08:00
liwei1dao
63c2aa8b7f 上传评论问题 2022-08-11 15:53:11 +08:00
liwei1dao
a515c59e21 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 12:02:18 +08:00
liwei1dao
9ade1bb5a5 修复聊天系统消息群发机制 2022-08-11 12:02:13 +08:00
e289290571 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 11:37:22 +08:00
161f8a4c20 技能升级配置表结构变化 对应读取程序修改 2022-08-11 11:37:03 +08:00
liwei1dao
377026b7ab 聊天业务bug修复 2022-08-11 10:41:43 +08:00
liwei1dao
36d3f893c8 上传聊天业务代码优化 2022-08-11 10:40:54 +08:00
liwei1dao
fe159fb96e 上传日志输出规范调整 2022-08-11 09:59:25 +08:00
55127dc69b 更新推送监听 2022-08-10 19:31:21 +08:00
646cabda56 更新点赞 2022-08-10 19:31:21 +08:00
liwei1dao
fcc53d71c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 19:28:57 +08:00
liwei1dao
18edbbad87 上传武器添加数据库报错问题,以及日志堆栈信息调整 2022-08-10 19:28:53 +08:00
2f96ac75b7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 18:48:51 +08:00
88afd36d50 爬塔发奖 2022-08-10 18:48:30 +08:00
liwei1dao
ccbac50506 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-10 18:43:03 +08:00
liwei1dao
0712c670fe 优化rpcx系统握手连接机制,避免重复连接情况,优化日志系统,错误日志自动输出错误文件以及行号 2022-08-10 18:42:06 +08:00