Commit Graph

1644 Commits

Author SHA1 Message Date
7b225bd4fd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-25 19:28:08 +08:00
d07b80f454 天赋属性初始化
配置同步
2022-10-25 19:27:45 +08:00
liwei1dao
c21fd71eb1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-25 17:52:46 +08:00
liwei1dao
aa54bef632 上传竞技场代码 2022-10-25 17:52:32 +08:00
5dedb95ca4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-25 17:47:41 +08:00
bdc162616c 天赋重置 2022-10-25 17:46:51 +08:00
liwei1dao
10e2ae2fd9 上传装备洗练代码 2022-10-25 17:08:34 +08:00
liwei1dao
65b421cbd4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-25 16:54:57 +08:00
liwei1dao
82328ed7f3 同步洗练代码到测试环境 2022-10-25 16:51:41 +08:00
5e3cdcd6c4 返回刚学习的天赋id 2022-10-25 16:47:21 +08:00
liwei1dao
56cd53a09c 上传代码 2022-10-25 16:39:09 +08:00
d744cb9c45 天赋学习 重置功能 2022-10-25 16:35:06 +08:00
liwei1dao
fcb577bb66 上传洗练个竞技场代码 2022-10-25 16:22:29 +08:00
liwei1dao
7faf5be7f3 上传进机场代码 2022-10-25 14:35:35 +08:00
liwei1dao
a90b68886f 上传竞技场代码 2022-10-25 14:35:24 +08:00
62d7a63f53 配置解析优化 2022-10-25 10:30:48 +08:00
liwei1dao
0baabf3414 上传装备洗练 2022-10-25 10:00:48 +08:00
b3d7379f75 天赋系统 2022-10-24 18:51:07 +08:00
3f32c57814 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-24 18:12:48 +08:00
19aad246b4 天赋数据获取 2022-10-24 18:12:34 +08:00
liwei1dao
06601537cc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-24 18:00:01 +08:00
liwei1dao
5d04fd7fb3 上传竞技场和装备洗练代码 2022-10-24 17:59:41 +08:00
983750153e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-24 16:50:53 +08:00
0f247ee161 获取在线玩家数据 2022-10-24 16:50:38 +08:00
liwei
2e6def8232 修复月子秘境数据更新异常bug 2022-10-24 16:38:18 +08:00
a26f05416f 打印错误日志 2022-10-24 14:47:36 +08:00
69556d7806 错误校验 2022-10-24 14:31:51 +08:00
liwei1dao
2027cc3184 上传竞技场系统 2022-10-24 13:42:29 +08:00
05a0e37ab9 获取远程用户 2022-10-24 12:01:24 +08:00
liwei1dao
88d0b5519f 上传竞技场代码 2022-10-24 11:14:01 +08:00
liwei1dao
13dec018fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-24 10:55:41 +08:00
liwei1dao
3ba2458a49 上传竞技场代码 2022-10-24 10:55:18 +08:00
574178dfc6 创建开服数据 2022-10-24 10:26:30 +08:00
dbf0e35c37 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 17:43:17 +08:00
18e0f621cc 跨服时候处理 2022-10-21 17:42:52 +08:00
c9b1b99d64 助战排行榜 2022-10-21 17:34:41 +08:00
1c556e3e21 好友助战英雄列表 2022-10-21 17:34:40 +08:00
liwei1dao
b4882bfca7 上传竞技场api代码 2022-10-21 15:26:43 +08:00
liwei1dao
04b0c315ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-21 15:00:16 +08:00
liwei1dao
30a1b1c409 上传战斗类型判断处理 2022-10-21 14:56:56 +08:00
liwei1dao
e7edca436e 上传竞技场代码 2022-10-21 14:55:46 +08:00
d3ce4a2073 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 12:03:06 +08:00
46ec0b910f 爬塔赛季数据处理 2022-10-21 12:02:54 +08:00
liwei1dao
17714c9595 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 11:15:37 +08:00
liwei1dao
1d3658a4a0 修复推送接口 2022-10-21 11:15:14 +08:00
bf61a61845 战斗报错 2022-10-21 11:05:03 +08:00
liwei1dao
5fed8e4e3d 装备锻造接口补充 2022-10-21 10:35:56 +08:00
liwei1dao
929c00c967 上传装备道具接口优化 移除调用源对象 2022-10-21 10:32:40 +08:00
liwei1dao
b46952cebd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 10:12:54 +08:00
liwei1dao
7f161e9ee2 上传装备锻造 2022-10-21 10:12:39 +08:00
462811cbbb 加一些校验 2022-10-20 18:48:14 +08:00
8d08a26cc4 一键查询多名英雄信息 2022-10-20 18:22:09 +08:00
991a1e6bfd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 18:18:30 +08:00
77327b99c2 爬塔助战相关协议修改 2022-10-20 18:18:01 +08:00
48119603bf 助战RPC 2022-10-20 18:14:20 +08:00
liwei1dao
f7679c2ab5 战斗友好助战系统补充 2022-10-20 18:10:37 +08:00
liwei1dao
a07752a4e3 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 18:06:42 +08:00
liwei1dao
5e12c92998 上传战斗 2022-10-20 18:06:11 +08:00
74a6b6ea58 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 18:03:57 +08:00
02f8b18c1b 优化 2022-10-20 18:03:33 +08:00
56b809406c 助战推送 2022-10-20 18:01:22 +08:00
60a36c51b7 助战英雄 2022-10-20 17:33:58 +08:00
91e60bd283 助战英雄列表 2022-10-20 17:33:58 +08:00
liwei1dao
636f7e08b2 上传助战布阵代码 2022-10-20 17:08:27 +08:00
bc8cefa482 助战记录 2022-10-20 16:18:23 +08:00
9dd2ae45cf 获取随机在线玩家数据bug 2022-10-20 16:16:38 +08:00
a60a40d760 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 16:06:07 +08:00
727c7ecd82 赛季塔定时清理 修改数据等 2022-10-20 16:05:48 +08:00
ea9abe6b27 好友助战 2022-10-20 14:44:33 +08:00
e2d1707d1d 助战英雄校验 2022-10-20 14:44:33 +08:00
5bbaada9e2 修复跨服用户搜索 2022-10-20 14:44:33 +08:00
50b4710e89 加一些日志打印 2022-10-20 11:08:57 +08:00
800d0203d1 数据校验 2022-10-20 10:12:39 +08:00
28dcdb73e1 bug 2022-10-20 10:04:09 +08:00
18256d7dc6 合成返回 2022-10-20 09:56:12 +08:00
f34efe5f45 判断是不是跨服 2022-10-20 09:31:00 +08:00
c247137d7e 查询接口调整 2022-10-19 19:43:39 +08:00
232a0fc1e5 一个小bug 2022-10-19 19:39:13 +08:00
eee83cc6d1 升星精灵升级 需求变更 直接修改英雄id 2022-10-19 18:45:08 +08:00
0c74105f21 英雄合成类型修改 2022-10-19 18:31:06 +08:00
liwei1dao
cbf7198e4a 上传月子秘境代码优化 2022-10-19 18:29:08 +08:00
de42696f16 json 同步 2022-10-19 18:26:17 +08:00
2b4a117304 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 18:00:24 +08:00
9138866fad 跨服查询英雄数据 2022-10-19 18:00:09 +08:00
liwei1dao
d24e3cc238 上传代码 2022-10-19 17:34:03 +08:00
liwei1dao
d4487ee428 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 17:29:23 +08:00
liwei1dao
bb2daca70b 移除聊天系统废弃消息 2022-10-19 17:29:09 +08:00
2f6722bc5a 修复跨服好友申请 2022-10-19 17:25:50 +08:00
liwei1dao
e5f8fe912c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 17:19:20 +08:00
liwei1dao
01b5775dbd 上传聊天系统优化 2022-10-19 17:19:06 +08:00
ddf5d1816f 美食馆人数不够的情况 2022-10-19 16:45:54 +08:00
d72c9fb67d 获取跨服玩家信息 2022-10-19 16:09:36 +08:00
9e20298edd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-19 15:47:25 +08:00
liwei1dao
a48e4cca9f 上传聊天频道 2022-10-19 15:39:18 +08:00
3bcc8a7b54 好感度计算 2022-10-19 15:19:39 +08:00
liwei1dao
a48c616907 修复聊天获取消息校验处理 2022-10-19 15:18:26 +08:00
liwei1dao
79785852f6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 15:03:04 +08:00
liwei1dao
26703b7b56 上传gm和rtask 跨服接口 2022-10-19 15:02:51 +08:00
7da9c703ec Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:52:50 +08:00
fe17144107 一个在线也没有 那么 就去随机取指定数量的玩家 2022-10-19 14:52:18 +08:00
1baeb5cef0 好友跨服修改 2022-10-19 14:23:20 +08:00
liwei1dao
b0eec24368 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:19:41 +08:00
liwei1dao
eb93beb54a 上传 秘境与聊天系统跨服升级 2022-10-19 14:19:23 +08:00
313927637d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 11:55:04 +08:00
6ef841ed72 增加好感度剧情解锁条件 2022-10-19 11:54:53 +08:00
liwei1dao
1a3030da01 升级聊天私聊频道为跨服系统 2022-10-19 10:08:51 +08:00
fd572e6f92 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 18:02:11 +08:00
85409bd46a 需求变更 增加多个随机剧情奖励。新增好感度奖励 2022-10-18 18:01:55 +08:00
7fe93f2bb2 好友跨服处理 2022-10-18 17:56:31 +08:00
e3066d4b19 羁绊领奖协议调整 2022-10-18 16:42:06 +08:00
dbccb138d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-18 15:16:52 +08:00
690685f849 跨服获取其他玩家英雄数据 2022-10-18 15:10:26 +08:00
f33022e322 更好好友搜索Proto 2022-10-18 14:11:54 +08:00
8ea5357d82 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 12:05:59 +08:00
765d9ce833 铁匠铺获取在线玩家数据 2022-10-18 12:05:45 +08:00
daffea5833 跨服搜索好友 2022-10-18 12:01:33 +08:00
6ddec9b66c 修改清理的session key 2022-10-18 10:18:14 +08:00
f51f492164 跨服session 2022-10-18 10:15:27 +08:00
85bb6f5391 跨服查好友 2022-10-18 10:15:26 +08:00
f3c8c8f52c 清理赛季塔数据 2022-10-17 19:52:41 +08:00
liwei1dao
9a78cbbacf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-17 18:34:38 +08:00
liwei1dao
9431b19d2e 补充跨服id 获取接口 2022-10-17 18:34:29 +08:00
d1e1069ba7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-17 17:59:07 +08:00
732fe14319 支持查询其他玩家的英雄信息
查询接口支持跨服查询
2022-10-17 17:58:50 +08:00
e47071fab9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-17 14:28:18 +08:00
3b8d6601e9 查看其它玩家数据 2022-10-17 14:28:07 +08:00
9875ed8a2f 英雄合成功能配置类型修改 2022-10-17 14:16:02 +08:00
61b35955c8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 19:03:28 +08:00
7a85b1bd7d 卡牌合成 2022-10-14 19:03:12 +08:00
liwei1dao
20112cb548 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 18:32:59 +08:00
liwei1dao
6e65b33560 上传装备出售算法优化 2022-10-14 18:32:47 +08:00
43b5f9c798 修改背景ID类型 2022-10-14 18:30:33 +08:00
f109832c7a 加日志 2022-10-14 16:31:50 +08:00
c8db8bbfe6 优化 2022-10-14 15:06:33 +08:00
caf1b0cdc9 增加详细羁绊数据推送,加一些错误日志 2022-10-14 14:06:56 +08:00
6d4a95f461 携程推送羁绊信息 2022-10-14 11:19:52 +08:00
ae21093938 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 11:17:53 +08:00
a5fd3f0304 接口整合 2022-10-14 11:17:38 +08:00
liwei
f8a6b936e3 修复异常代码 2022-10-14 11:16:52 +08:00
liwei1dao
b83337f12a 上传模块封装消息推送代码 2022-10-14 10:53:29 +08:00
liwei1dao
9ef6b5d085 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 10:31:23 +08:00
liwei1dao
7f5f1b46cc 上传底层 2022-10-14 10:31:18 +08:00
fb2986e834 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 10:20:35 +08:00
8869bf49a0 羁绊信息变化推送 2022-10-14 10:20:03 +08:00
liwei1dao
483accd591 上传秘境战斗数据同步bug 2022-10-14 10:10:21 +08:00
9157de9471 发奖判断 2022-10-13 18:59:06 +08:00
153ffd253f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 18:53:22 +08:00
925131626d 激活信息返回 2022-10-13 18:53:01 +08:00
a325224d95 玩家阵容展示 2022-10-13 18:50:03 +08:00
liwei1dao
90cc4b1f5c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 18:02:05 +08:00
liwei1dao
4678cbd83e 上传月子秘境代码 2022-10-13 18:01:24 +08:00
18058e075f 羁绊数据bug 2022-10-13 17:09:04 +08:00
ff0b042738 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 15:30:14 +08:00
d591b8f964 查询最佳通关记录 2022-10-13 15:29:59 +08:00
c572e0bf92 update玩家战斗记录 2022-10-13 15:27:53 +08:00
b82329cd0f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 15:26:34 +08:00
2b26cdf465 羁绊好感度奖励 2022-10-13 15:26:15 +08:00
liwei1dao
9ad0ff2a48 上传月之秘境购买测试配置文件优化 2022-10-13 15:25:55 +08:00
liwei1dao
06e49d60df Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 15:19:52 +08:00
liwei1dao
6c3eae319f 上传月之秘境bug修复 2022-10-13 15:19:46 +08:00
42630f6c97 update 2022-10-13 14:46:43 +08:00
0117c511f2 user if nil 2022-10-13 14:34:01 +08:00
cd47c52680 指定字段更新 2022-10-13 14:34:01 +08:00
d3ad5ff7aa Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 14:14:31 +08:00
504b0b8db3 战斗校验 2022-10-13 14:14:15 +08:00
liwei1dao
aa6d1d2134 上传梦境配置 2022-10-13 14:06:25 +08:00
liwei1dao
50145884f3 优化月之秘境代码 2022-10-13 13:46:19 +08:00
liwei1dao
cf91bd07e2 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 12:06:37 +08:00
liwei1dao
0c5a38f403 上传db保护代码 2022-10-13 12:06:23 +08:00
d5aac3f900 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 12:03:05 +08:00
830997df43 查询狩猎记录接口 2022-10-13 12:02:02 +08:00
liwei1dao
df28036e54 优化数据库连接对象错误保护 2022-10-13 12:00:39 +08:00
liwei1dao
462c3d7dc0 上传代码 2022-10-13 11:41:10 +08:00
d60181b948 激活羁绊信息 2022-10-13 10:14:40 +08:00
liwei1dao
eba546d0a2 上传战斗系统修复 2022-10-13 09:43:57 +08:00
e72ec3d5c9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 18:49:58 +08:00
712531131d 查询其他玩家战斗记录 2022-10-12 18:49:35 +08:00
ebc74b528e 条件判断错误 2022-10-12 18:38:02 +08:00
2bb2f2710d 修改login go 2022-10-12 18:12:50 +08:00
105ba21a3a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 17:50:18 +08:00
745d861e4c 记录通关时间 2022-10-12 17:50:03 +08:00
ed40e62436 去除未使用的包 2022-10-12 17:40:59 +08:00
liwei1dao
a56dcf115d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 17:39:49 +08:00
liwei1dao
8ce067043c 上传月之秘境分布式锁 2022-10-12 17:39:29 +08:00
392d17e691 玩家战斗记录查询 2022-10-12 17:39:08 +08:00
b907145109 玩家战斗记录 2022-10-12 17:39:08 +08:00
liwei1dao
a2858fda57 上传月之秘境代码 2022-10-12 17:17:17 +08:00
c53a6c294e 心魔塔查询玩家信息接口 2022-10-12 16:41:06 +08:00
720b187333 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 15:38:44 +08:00
eca5c2e750 给英雄赠送礼物 2022-10-12 15:38:09 +08:00
a61c656723 优化登录 2022-10-12 15:23:52 +08:00
liwei1dao
ddab5ed2f2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-12 14:00:40 +08:00
liwei1dao
5da178166a 上传月之秘境优化 2022-10-12 12:34:23 +08:00
a3cfa77afe Merge branch 2022-10-12 11:37:29 +08:00
044ba74bd4 解析 2022-10-12 11:35:55 +08:00
liwei1dao
366bd86cb8 上传月之秘境代码 2022-10-12 11:32:56 +08:00
liwei1dao
248ee4ed5e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-12 11:31:08 +08:00
liwei1dao
8cf678dcf2 上传月之秘境代码 2022-10-12 11:30:36 +08:00
4061f0dd79 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 10:50:15 +08:00
2ee66ded5a 增加英雄羁绊经验 2022-10-12 10:49:20 +08:00