Commit Graph

4608 Commits

Author SHA1 Message Date
liwei1dao
1089324677 上传代码 2023-05-26 18:30:18 +08:00
d68ff5437c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 17:02:57 +08:00
a78f2da607 更改任务类型 2023-05-26 17:02:51 +08:00
fa1bb31c2f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 17:02:43 +08:00
ff32e73ae6 Rtype119 Rtype120 2023-05-26 17:02:36 +08:00
c00990de8c 修改Rtype123 2023-05-26 16:53:44 +08:00
61250eaaf2 Rtype123 2023-05-26 16:42:57 +08:00
aa477d139c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 16:24:50 +08:00
f6ac63de88 上传错误码 2023-05-26 16:24:47 +08:00
06cf76081d 共鸣查询接口补充 2023-05-26 16:10:25 +08:00
liwei1dao
01b746ee7f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 16:08:04 +08:00
liwei1dao
862341dd9d 上传67号锚点 2023-05-26 16:07:59 +08:00
83a24c9c8c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 15:31:39 +08:00
42080ee2c6 注册Rtype111 2023-05-26 15:31:28 +08:00
liwei1dao
d7da1b1e18 上传任务埋点错误 2023-05-26 15:23:03 +08:00
8358b89945 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 15:13:24 +08:00
4870ad0bbf 任务类型注册修改 2023-05-26 15:13:13 +08:00
f80668f79b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 15:04:09 +08:00
57d4a3ee95 Rtype167 Rtype165 2023-05-26 15:04:02 +08:00
liwei1dao
079a86c298 上传任务配置 2023-05-26 14:50:38 +08:00
bfc3bb8bc1 上传配置 2023-05-26 14:20:22 +08:00
63e9cb068a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 14:14:50 +08:00
c453d04bf6 返回错误信息 2023-05-26 14:14:22 +08:00
0c3b382923 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 13:39:00 +08:00
48bcda8afc Rtype61 2023-05-26 13:38:44 +08:00
liwei1dao
978fe81b35 上传星像埋点 2023-05-26 12:31:57 +08:00
liwei1dao
fc2f667599 上传配置未找到错误 2023-05-26 12:10:36 +08:00
liwei1dao
be6df0efd0 上传配置 2023-05-26 11:37:34 +08:00
b5d3384fca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 11:04:08 +08:00
25f4dd7bfb 优化任务通知接口 2023-05-26 10:59:32 +08:00
liwei1dao
6082476693 上传代码 2023-05-26 10:50:56 +08:00
74f5d0328f 调整任务类型分类 2023-05-26 09:31:42 +08:00
aee07aa8f7 埋点接口优化 2023-05-25 22:31:51 +08:00
liwei1dao
41eba13ab5 上传代码 2023-05-25 22:26:23 +08:00
liwei1dao
1bb1752209 上传任务修复 2023-05-25 20:22:36 +08:00
5c3ed137ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 20:06:48 +08:00
0fd9bac9f9 优化userErrCode 2023-05-25 20:06:39 +08:00
liwei1dao
511f052a90 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 20:00:20 +08:00
liwei1dao
61dd85b752 优化易步硕 2023-05-25 20:00:14 +08:00
1c8e81fad9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 19:10:47 +08:00
2336a63e23 商队刷新返回刷新时间 2023-05-25 19:10:42 +08:00
liwei1dao
824b866183 上传代码 2023-05-25 18:49:16 +08:00
563ae94a22 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 18:48:11 +08:00
576e63bb69 去掉74任务 2023-05-25 18:48:08 +08:00
64e9ff0fe7 删除枚举 2023-05-25 18:45:17 +08:00
56a6f6c6ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 18:43:28 +08:00
30ccfc256c 修改任务枚举 2023-05-25 18:43:20 +08:00
e941bb199d 通关状态推送 2023-05-25 18:38:27 +08:00
90cd46979f update 2023-05-25 18:32:37 +08:00
a5217a3839 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 17:51:36 +08:00
b4218fcc0d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 17:51:13 +08:00
9054a1dbb9 进度查询 2023-05-25 17:51:12 +08:00
0892a6c8e9 公会埋点 2023-05-25 17:51:04 +08:00
a6462bd0a1 上次代码 2023-05-25 17:39:13 +08:00
liwei1dao
d3f537f229 上传星阵图 2023-05-25 17:16:12 +08:00
liwei1dao
ff3cc52b3a 上传任务修复 2023-05-25 17:11:36 +08:00
5ded8e1488 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 16:06:53 +08:00
40012007d7 整理任务类型 2023-05-25 16:06:47 +08:00
726b325c56 Rtype40埋点 2023-05-25 16:06:25 +08:00
72708679b2 任务埋点数据调整 2023-05-25 15:58:24 +08:00
8c22d48913 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 15:00:38 +08:00
05b935a22a 134 埋点参数 2023-05-25 15:00:33 +08:00
liwei1dao
eeffd69920 上传任务修复 2023-05-25 14:35:27 +08:00
875fa1c36b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 13:42:52 +08:00
f375b528eb update 2023-05-25 13:42:42 +08:00
liwei1dao
f359272ce8 上传埋点中心 2023-05-25 13:42:09 +08:00
bbf8a2d57c 修改任务接口 2023-05-24 23:59:02 +08:00
liwei1dao
46ec141a48 上传装备查询接口 2023-05-24 22:46:25 +08:00
liwei1dao
53ae82a235 上传埋点代码 2023-05-24 22:37:28 +08:00
liwei1dao
c759dfae0b 上传任务埋点代码处理 2023-05-24 22:29:48 +08:00
liwei1dao
9f0ad2ed8c 上传42号埋点问题 2023-05-24 22:04:33 +08:00
4fe3f22982 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 20:58:31 +08:00
2757932e48 修复筛选条件问题 2023-05-24 20:58:24 +08:00
liwei1dao
bb95120cfe 上传任务埋点错误 2023-05-24 20:55:19 +08:00
2125e8fb0c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:36:05 +08:00
6afcd78e36 任务埋点整理3 2023-05-24 19:36:01 +08:00
8d35b9be80 报错处理 2023-05-24 19:31:18 +08:00
6c1af1394f 报错修改 2023-05-24 19:18:12 +08:00
f78006a681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:13:38 +08:00
18a438b117 83埋点 2023-05-24 19:13:35 +08:00
liwei1dao
d9ef723c42 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:06:58 +08:00
liwei1dao
0220678a3d 上传好友助战埋点 2023-05-24 19:06:52 +08:00
3f3d5e3ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:01:43 +08:00
0c86e1bec5 参数调整 2023-05-24 19:01:40 +08:00
liwei1dao
51ffe78927 上传强化装备埋点 2023-05-24 18:58:45 +08:00
liwei1dao
3d48f7cc12 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 18:52:42 +08:00
liwei1dao
c361042acf 上传旧时光代码 2023-05-24 18:52:32 +08:00
a857bb8a5a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 18:46:33 +08:00
1202958027 埋点数据调整 2023-05-24 18:46:02 +08:00
48c68c04fd 世界任务GM修复 2023-05-24 18:39:24 +08:00
6f691d06ae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 17:48:55 +08:00
4a86e8523f 非埋点的任务校验 2023-05-24 17:48:45 +08:00
liwei1dao
8bc2b5ed00 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 17:45:27 +08:00
liwei1dao
54566ec0cd 上传数据模块调整 2023-05-24 17:45:19 +08:00
d48e2a9454 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 17:20:39 +08:00
ef0363f78b 任务类型整理2 2023-05-24 17:20:31 +08:00
458c2347a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 16:27:37 +08:00
a371d1952b 任务参数调整 2023-05-24 16:27:32 +08:00
e73b025e95 删除丢弃的函数 2023-05-24 15:40:39 +08:00
1fa4dfe510 任务类型整理1 2023-05-24 15:36:12 +08:00
bdb0932bd4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 14:59:57 +08:00
ee517f963e 修改完成条件校验 2023-05-24 14:57:29 +08:00
a46e6cd3f2 活动开启时间取开服时间做相应计算 2023-05-24 11:02:00 +08:00
c5e09f3281 商队结算 2023-05-23 19:11:50 +08:00
92f2aaeea2 邮件参数补充 2023-05-23 17:24:45 +08:00
e24b610db9 update 2023-05-23 17:21:26 +08:00
b7f5b20b1a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 17:08:10 +08:00
7dcbbd3802 时间轮清理 2023-05-23 17:08:03 +08:00
liwei1dao
183d54ba98 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 17:06:46 +08:00
liwei1dao
bcb60fc93e 上传任务代码 2023-05-23 17:06:37 +08:00
liwei1dao
3d591a2a9f 同步段位代码 2023-05-23 17:05:31 +08:00
d573f458da Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 17:02:16 +08:00
140550b781 商队功能补充 2023-05-23 17:02:08 +08:00
liwei1dao
44a529cb21 上传代码 2023-05-23 16:07:50 +08:00
liwei1dao
e7a604d694 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 16:03:44 +08:00
liwei1dao
a4a40f0e7d 优化日志堆栈输出和任务系统代码 2023-05-23 16:03:34 +08:00
liwei
ed50769ca0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 15:50:22 +08:00
310f06821f GM-worldtask 2023-05-23 12:03:06 +08:00
6e2f8e997c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:19:40 +08:00
018a382080 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:18:53 +08:00
liwei1dao
2c7d5c6919 修复竞技场 初始化没有匹配定位数据 2023-05-23 11:18:50 +08:00
liwei1dao
2e66805b3a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:15:46 +08:00
liwei1dao
c6e51e9dcd 上传服务器代码 2023-05-23 11:15:40 +08:00
fe77509053 浇水任务类型 2023-05-23 11:15:34 +08:00
d997a995c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:11:19 +08:00
1f4488e6e7 奖励邮件 2023-05-23 11:11:17 +08:00
liwei1dao
da320698af 修复竞技场玩家信息同步 2023-05-23 10:54:39 +08:00
liwei1dao
82b29a3657 优化竞技场机器人头像等级信息 2023-05-23 10:51:01 +08:00
liwei1dao
27ca07a422 上传代码修复 2023-05-23 10:26:54 +08:00
1a4d0801a8 武馆派遣悬赏新增 2023-05-23 10:08:06 +08:00
cd798d8c34 任务触发区分接取和创号 2023-05-23 09:45:02 +08:00
0cf6580c37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 19:08:39 +08:00
dfb6f29b5c 测试数据 2023-05-22 19:08:34 +08:00
liwei1dao
ddf7f77315 上传任务埋点代码 2023-05-22 19:02:01 +08:00
liwei1dao
95dc4efb22 同步代码 2023-05-22 18:31:49 +08:00
58b0b993a8 名称修改 2023-05-22 18:25:29 +08:00
519880d6bc update 2023-05-22 18:24:21 +08:00
ae069e2504 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 18:08:33 +08:00
90de92da72 任务记录类型判断 2023-05-22 18:08:26 +08:00
bcd4c9a1a0 新增刷新商队城市货物信息接口 2023-05-22 17:32:01 +08:00
edef2d3606 任务埋点数据 2023-05-22 17:02:08 +08:00
d417eec3ce 新增任务埋点 2023-05-22 15:02:18 +08:00
c7752a6abe 玩家头像写入 2023-05-22 14:40:25 +08:00
5f28fb8d86 排行数据 2023-05-22 13:48:21 +08:00
da98862db6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 10:57:57 +08:00
c43567a707 记录上一次货物变动的价格 2023-05-22 10:57:54 +08:00
liwei1dao
574adb566d 上传代码 2023-05-22 10:50:21 +08:00
liwei1dao
04032ba2c9 上传登录调整 2023-05-22 10:34:46 +08:00
cbb2e96764 update 2023-05-19 20:26:00 +08:00
a1f28a0ba6 出售加价计算错误 2023-05-19 20:15:43 +08:00
28dc696beb 城市购买饱和系数 2023-05-19 19:49:16 +08:00
97b2284820 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-19 18:37:34 +08:00
1e32c6c476 商队优化 2023-05-19 18:37:31 +08:00
590701affe 签名响应字段未设置 2023-05-19 15:56:04 +08:00
f2735668f7 修改注释 2023-05-19 15:38:14 +08:00
96ab51a518 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-19 15:23:19 +08:00
97f7b7058a update 2023-05-19 15:23:03 +08:00
2d49493354 城市和货物刷新时间一致 2023-05-19 15:16:09 +08:00
2cf51eec34 商队优化 2023-05-19 13:53:06 +08:00
1a70d06daf pb 更新 去掉打印 2023-05-18 21:58:24 +08:00
09660487b6 默认皮肤 2023-05-18 21:52:35 +08:00
263269ee60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-18 19:42:30 +08:00
e586f872f1 跑商修改 2023-05-18 19:42:24 +08:00
2c41d30c7b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-18 17:54:20 +08:00
275ee9e1b1 新任务埋点数据 2023-05-18 17:39:27 +08:00
90b916f282 修改世界任务响应Code 2023-05-18 16:01:27 +08:00
c2c20474f0 需求单 21936 狩猎掉落组升级 2023-05-18 15:00:32 +08:00
65e87aaf09 狩猎自动出售 自动购买门票 2023-05-18 14:44:07 +08:00
d1760688c5 worldtask pb 2023-05-18 11:58:54 +08:00
aaaa9f56db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 19:50:16 +08:00
e619683813 配置同步 2023-05-17 19:50:02 +08:00
liwei1dao
ba20d5fd20 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 18:59:09 +08:00
liwei1dao
eadbb9bcfe 上传捕羊大赛复活 2023-05-17 18:59:03 +08:00
8d4e4fa1ce Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 18:57:00 +08:00
1267123e1a 商队等级提示发奖 2023-05-17 18:56:57 +08:00
liwei1dao
6f128e9379 竞技场修复 2023-05-17 18:50:46 +08:00
liwei1dao
ece1e4e401 竞技场修复 2023-05-17 18:49:44 +08:00
liwei1dao
21192e3884 上传代码修复 2023-05-17 17:08:35 +08:00
liwei1dao
52351439e8 上传日志添加 2023-05-17 17:00:35 +08:00
liwei1dao
a70204f3b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 16:48:02 +08:00
liwei1dao
f75130e947 优化捕羊大赛匹配程序 2023-05-17 16:47:53 +08:00
3dd57b242e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 15:42:16 +08:00
9485d650f1 配置整理 2023-05-17 15:35:55 +08:00
dbad4c408a 优化 2023-05-17 15:24:01 +08:00
liwei1dao
75c234a274 上传新用户账号信息 2023-05-17 14:48:09 +08:00
liwei1dao
c2399706fc 移除不必要配置 2023-05-17 14:46:19 +08:00
93e6c996ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 14:25:57 +08:00
05215495db 更新分组任务接口 2023-05-17 14:25:49 +08:00
1da5837986 移出不需要的配置 2023-05-17 14:13:41 +08:00
aa62f3961f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 14:10:25 +08:00
6ccc98d308 天赋配置调整 新增解锁技能需求 2023-05-17 14:10:22 +08:00
liwei1dao
7e6a86024f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 11:57:43 +08:00
liwei1dao
c1b65c4314 上传皮肤需求代码 2023-05-17 11:57:38 +08:00
d542633257 背包整理 2023-05-17 11:43:23 +08:00
5b5d24041d uopdate 2023-05-17 10:27:05 +08:00
bb6ba7f9db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 17:18:49 +08:00
454d12f7ce 商队任务接口 2023-05-16 17:18:27 +08:00
049f5ed8f5 跑商任务接取处理 2023-05-16 17:13:21 +08:00
d959191c8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 15:56:10 +08:00
ce736c1a19 随机触发事件 2023-05-16 15:56:07 +08:00
d45353e82b 随机触发事件处理 2023-05-16 15:55:58 +08:00
liwei1dao
1cf88da6ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 13:52:26 +08:00
liwei1dao
601ba317cc 上传竞技场战斗记录属性补充 2023-05-16 13:52:21 +08:00
344b9351ff 跳转城市获取随机事件任务 2023-05-16 11:47:57 +08:00
26d84899d9 出售或购买获取虚拟币 2023-05-15 19:24:16 +08:00
fdbd9728f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 18:41:59 +08:00
a01629af75 物品刷新 2023-05-15 18:41:55 +08:00
liwei1dao
f3dce490f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 18:04:47 +08:00
liwei1dao
8204440960 上传竞技场优化 2023-05-15 18:04:40 +08:00
e08cec7a65 刷新城市信息和货物信息接口 2023-05-15 16:22:33 +08:00
b55b98e1ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 15:09:31 +08:00
5e7b0441fc 商队商品购买 2023-05-15 15:09:27 +08:00
liwei1dao
4308373500 上传捕羊大赛代码 2023-05-15 11:55:12 +08:00
liwei1dao
f194a837df Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 11:33:00 +08:00
liwei1dao
dfdadc8b09 上传配置代码 2023-05-15 11:32:54 +08:00
de36b0da8f 添加虚拟币资源 2023-05-15 11:03:22 +08:00
45952b8f11 跑商买卖 2023-05-12 21:55:52 +08:00
liwei1dao
4a87420318 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 20:50:46 +08:00
liwei1dao
7a331ccefb 上传战斗优化 2023-05-12 20:50:41 +08:00
dbdc0f17ae 跑商数据初始化+协议优化 2023-05-12 20:49:40 +08:00
ef4f779ef2 跑商协议调整 2023-05-12 19:59:48 +08:00
763dcd6c0b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 19:15:27 +08:00
1949c0e4ea 商队 2023-05-12 19:15:23 +08:00
liwei1dao
1cd38733aa 上传任务锁代码 2023-05-12 18:24:03 +08:00
fc391d0a91 update 2023-05-12 16:42:37 +08:00
76c2db3a85 修改公会解散CD 2023-05-12 16:35:36 +08:00
c4d2ab391c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 15:29:39 +08:00
b633b02b08 修复跨服任务 2023-05-12 15:24:22 +08:00
liwei1dao
75247e1390 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 10:44:21 +08:00
liwei1dao
605507501b 上传装备升级副属性找不到错误返回 2023-05-12 10:44:15 +08:00
f814ed19ce 维京新增奖励 2023-05-12 10:13:24 +08:00
9b7f8f3ffe update 2023-05-11 22:28:40 +08:00
65f841e958 公会申请等级限制 2023-05-11 20:17:58 +08:00
bfd49fb493 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-11 19:36:59 +08:00
72565977fe 英雄新增属性 2023-05-11 19:36:53 +08:00
6b4beb5765 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-11 19:05:04 +08:00
ac232ccfcd update 2023-05-11 19:04:51 +08:00
liwei1dao
cfb1580054 添加日志 2023-05-11 17:49:22 +08:00
f035a8290f 功夫大师塔调整 2023-05-11 16:46:52 +08:00
bc51e58381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 16:28:25 +08:00
2c80d0b6c2 数据校验 2023-05-10 16:28:22 +08:00
liwei1dao
b1bfc4e385 上传修改时间服务器时间接口 2023-05-10 16:01:42 +08:00
liwei1dao
b2bd909b91 上传用户时间校验 2023-05-10 15:33:54 +08:00
11cf7a9fac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:31:34 +08:00
666749a699 修改图鉴领取的问题 2023-05-10 10:31:16 +08:00
b6e489501f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:30:55 +08:00
72867cea6e 打造一次升多级情况 2023-05-10 10:30:53 +08:00
liwei1dao
f7b7eb85d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:29:58 +08:00
liwei1dao
d3d0c627ff 上传每日一练刷新机制 2023-05-10 10:29:52 +08:00
d0fed35a83 记录英雄赠送食物的开始时间 2023-05-09 16:23:31 +08:00
72b1d99a19 熔岩打造提示缺少熔岩问题 2023-05-09 16:01:20 +08:00
8c72293119 入榜条件 2023-05-09 15:22:54 +08:00
84720ed7f1 update 2023-05-08 20:23:49 +08:00
4b5ebf9268 接口补充 2023-05-08 20:06:06 +08:00
liwei1dao
4a2971f08e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 20:04:16 +08:00
liwei1dao
f1c0979c1a 上传接口 2023-05-08 20:04:09 +08:00
90dc48d146 自动出售接口补充 2023-05-08 19:48:20 +08:00
4efb6a2ce1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 19:43:01 +08:00
77d0636bd1 工具台技能加成 2023-05-08 19:42:58 +08:00
liwei1dao
953f158445 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 19:38:58 +08:00
liwei1dao
4d697b4e70 上传代码 2023-05-08 19:38:52 +08:00
7b9035f254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 18:54:10 +08:00
97d388fe38 一键出售装备道具等资源 2023-05-08 18:54:06 +08:00
bb3398e78e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 18:20:53 +08:00
49917a6443 任务随机修改 2023-05-08 18:20:30 +08:00
00eab14456 工具测试协议优化 2023-05-08 18:19:57 +08:00
59d8a04f93 炉温消耗打折问题 2023-05-08 17:53:36 +08:00
bd859c2653 装备自动出售不入背包 2023-05-08 16:42:20 +08:00
81419dc31b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 15:21:53 +08:00
cc32aaa029 羁绊等级需要手动激活 2023-05-08 15:21:48 +08:00
liwei1dao
281081ea80 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 10:56:31 +08:00
liwei1dao
fed2b37db2 上传捕羊代码 2023-05-08 10:56:25 +08:00
33784184b7 羁绊剧情奖励 2023-05-08 10:18:01 +08:00
95ba9c3983 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 19:28:11 +08:00
852880bdc3 条件开启功能自动解锁 2023-05-05 19:28:06 +08:00
liwei1dao
997531550a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 19:24:41 +08:00
liwei1dao
28d745e3ca 上传捕羊大赛调试优化 2023-05-05 19:24:29 +08:00
dbe12ea192 更新任务触发 2023-05-05 16:57:38 +08:00
cc356997a3 update 2023-05-05 16:57:38 +08:00
af5808a748 功能条件开启 2023-05-05 16:09:46 +08:00
e4fda1c747 删除剧情奖励 2023-05-05 12:04:27 +08:00
cc60845b92 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 10:58:14 +08:00
1bc334123a 配置整理 以table表导出的数据为准 2023-05-05 10:58:10 +08:00
6c411a7f70 羁绊 调整 2023-05-05 10:33:56 +08:00
liwei1dao
29f24d7e0a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-04 19:13:42 +08:00
liwei1dao
87d5b92097 上传代码 2023-05-04 19:13:21 +08:00
8dca163a32 羁绊等级更新 2023-05-04 18:42:42 +08:00
f6d0dbb7dd 赠送礼物优化 2023-05-04 16:30:56 +08:00
a11dfcbaba 好感度调整 2023-05-04 14:37:35 +08:00
495d7172b4 上传好感度 2023-05-04 12:02:11 +08:00
62d1dfccc6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-04 11:56:58 +08:00
41285d522c 给英雄赠送食物 2023-05-04 11:56:55 +08:00
liwei1dao
8d727166c9 上传武馆npc 战斗失败消失bug 2023-05-04 10:43:58 +08:00
e56b025019 英雄升星 属性刷新问题 2023-04-28 23:08:11 +08:00
fc4493f591 update 2023-04-28 21:42:52 +08:00
d401f2135f update 2023-04-28 21:20:04 +08:00
ec82443fec update log 2023-04-28 21:05:57 +08:00
71cad1c28f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 20:49:27 +08:00
511697792e update 2023-04-28 20:49:17 +08:00
f125c6d835 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 18:37:46 +08:00
e31941c379 竞技场保存玩家等级 2023-04-28 18:37:39 +08:00
d08eaf01af 金币消耗 2023-04-28 18:30:26 +08:00
ad76eb3828 掉落组奖励 2023-04-28 17:59:57 +08:00
f58a37f1f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 16:52:03 +08:00
94cca4d515 旧时光自动解锁 2023-04-28 16:51:45 +08:00
37a8884ec7 竞技场 记录玩家等级 2023-04-28 15:22:03 +08:00
5ad4705391 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 14:39:54 +08:00
0387e04255 金币消耗埋点 2023-04-28 14:39:43 +08:00
968a9d3ae6 更新任务状态 2023-04-28 14:39:27 +08:00
ce2fa0c91a 竞技场购买报错修复 2023-04-28 13:47:12 +08:00
166f969d19 add log 2023-04-28 12:08:54 +08:00
ec82c61917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-27 20:07:50 +08:00
9d68493fe1 关卡编辑器状态更新 2023-04-27 20:07:28 +08:00
b81109db68 gm 满觉醒 获取觉醒等级问题 2023-04-27 17:33:02 +08:00
041bcb7d37 商队修改 2023-04-27 17:03:02 +08:00
83e26c8986 周任务 领取奖励后 自动发放宝箱奖励 2023-04-26 20:00:02 +08:00
fae0e4b489 打造N次装备 2023-04-26 15:12:53 +08:00
059c9f40da Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-26 13:42:50 +08:00
7cf7635882 教习资源初始值 2023-04-26 13:42:46 +08:00
57b9b40982 update global 2023-04-26 11:03:28 +08:00
1748262048 新需求 一次可以同时打造多件装备 2023-04-26 10:15:33 +08:00
edba38487b 发放木桩类型资源跨服处理异常问题修复 2023-04-25 19:42:36 +08:00
99d3c97f8c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-25 18:48:14 +08:00
b7700786c8 update 2023-04-25 18:48:10 +08:00
48ac8dc350 更新旧时光 2023-04-25 18:27:51 +08:00
bf8a33eba4 旧时光 2023-04-25 18:26:46 +08:00
5152b9a469 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-25 17:49:21 +08:00
19f286b1e2 商队相关 2023-04-25 17:49:06 +08:00
d511fb2756 商队系统改造 2023-04-24 20:35:03 +08:00
cc550d9da5 小游戏奖励调整 2023-04-24 14:06:01 +08:00
08c6070abc 初始默认给坐骑 2023-04-24 11:16:52 +08:00
64cd3da633 校验在线用户状态 2023-04-23 19:45:35 +08:00
63a4212c93 捕羊大赛新增加入退伍规则 2023-04-23 18:57:13 +08:00
9fe5a687a1 签到功能调整,不发送签到奖励 2023-04-23 15:42:02 +08:00
1fc9ebb98d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-23 15:24:55 +08:00
dccbdde57f 签到小游戏 玩法调整 2023-04-23 15:24:51 +08:00
f1fa24a36e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-23 14:54:13 +08:00
8804225486 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-23 14:51:12 +08:00
d5bd4f925f 接口补充 查询最近一起游戏的玩家信息 2023-04-23 14:49:37 +08:00
a9bc2516c4 补羊大赛 领取奖励 2023-04-23 11:57:10 +08:00
58ecd65e7d update 2023-04-23 10:17:56 +08:00
9448a51507 配置同步 2023-04-21 21:08:54 +08:00
88881e2527 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-21 19:11:05 +08:00
liwei1dao
2ff92487cf 上传捕羊大赛代码 2023-04-21 19:03:50 +08:00
6c3cf0b013 好感度测试 2023-04-21 18:46:43 +08:00
liwei1dao
8bb7c27a7b 同步配置文件和捕羊大赛代码 2023-04-21 18:11:49 +08:00
liwei1dao
ec088d4b13 上传捕羊大赛代码 2023-04-21 16:54:26 +08:00
liwei1dao
27dbb36ee6 优化item代码 2023-04-20 21:18:34 +08:00
liwei1dao
e40f849605 上传捕羊大赛邀请逻辑优化 2023-04-20 21:16:34 +08:00
liwei1dao
eb5ae6d13b 上传邀请代码 2023-04-20 21:08:56 +08:00
liwei1dao
53721a47c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 20:58:29 +08:00
liwei1dao
6cfb67a14a 上传捕羊大赛代码 2023-04-20 20:58:24 +08:00
4ec983d257 update 2023-04-20 19:06:48 +08:00
52e08a5c7a 天赋树重置 2023-04-20 18:42:24 +08:00
5969eb80cd 功能测试 2023-04-20 18:32:04 +08:00
631c924514 世界任务GM 2023-04-20 18:24:10 +08:00
b1e7078985 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:12:50 +08:00
49c99c2843 update 2023-04-20 17:12:35 +08:00
liwei1dao
44319e8d2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:05:28 +08:00
liwei1dao
10f8849fbe 同步代码 2023-04-20 17:05:14 +08:00
d8cb4f78af 统计阵营总好感度 2023-04-20 16:27:59 +08:00
8811db5c1b 羁绊属性计算 2023-04-20 16:22:14 +08:00
302e292041 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 14:53:33 +08:00
93996e3c80 声望 2023-04-20 14:40:55 +08:00
liwei1dao
50d5b3409a 上传武馆踢馆延迟 2023-04-20 13:53:48 +08:00
702375e8b3 赠送美食 2023-04-20 11:58:52 +08:00
liwei1dao
4fceb5f841 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-19 20:20:19 +08:00
liwei1dao
3cce3dfb04 同步配置 2023-04-19 20:20:05 +08:00
2dd073d135 剧情奖励 传记等数据处理 2023-04-19 19:43:24 +08:00
14e7091594 声望 2023-04-19 19:29:25 +08:00
liwei1dao
c707bcb94b 上传捕羊大赛代码 2023-04-19 18:30:24 +08:00
0e6aba2b9e 好感度 2023-04-19 18:01:53 +08:00
a73e753c19 踢馆去掉对话框奖励 2023-04-19 13:45:15 +08:00
14a658f62e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-19 11:47:46 +08:00
8d8e67c32a 一键踢馆修改 2023-04-19 11:45:47 +08:00
liwei1dao
a05275d234 上传战斗计时结束 2023-04-18 21:09:06 +08:00
liwei1dao
ee83d78681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-18 20:31:13 +08:00
liwei1dao
0bdcd919ce 上传服务配置 2023-04-18 20:28:43 +08:00
99affaf831 npc踢馆 领奖 2023-04-18 20:10:57 +08:00
7da8284b73 状态还原 2023-04-18 20:07:13 +08:00
c501d3c205 踢馆成功不通关剧情获得奖励 2023-04-18 18:37:58 +08:00
a77e855a2e 优化 + 新增 一键踢馆GM 2023-04-18 18:34:29 +08:00
b05316b3c3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-18 15:56:59 +08:00
b543f6a6f7 好感度接口 2023-04-18 15:56:14 +08:00
liwei1dao
c518cd0a61 上传代码 2023-04-18 15:52:46 +08:00
liwei1dao
c0e0ec5119 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-17 18:55:16 +08:00
liwei1dao
f27130c3b4 上传配置文件 2023-04-17 18:55:11 +08:00
08c863333c 获取主城进度 2023-04-17 17:43:06 +08:00
liwei1dao
3345908fe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-14 22:08:41 +08:00
liwei1dao
8368c6d038 上传npc踢馆调整 2023-04-14 22:08:27 +08:00
25c8e898be 参数校验 2023-04-14 21:42:45 +08:00
e9a9f99b65 配置同步 2023-04-14 18:19:17 +08:00
260d936e20 购买价格组整合 2023-04-14 18:11:42 +08:00
2f99a821e9 更新状态 2023-04-14 14:18:05 +08:00
liwei1dao
4b49f25c16 上传错误返回信息优化 2023-04-14 12:21:58 +08:00
liwei1dao
a0d29a277e 上传错误信息数据返回前端 2023-04-14 10:42:58 +08:00
02a20470d5 错误信息监听 2023-04-14 10:26:46 +08:00
65c263ba8f 表名调整 2023-04-14 10:18:48 +08:00
832e9bd161 表名调整 2023-04-14 10:18:29 +08:00
a90a750abc 好友阵容数据查询 2023-04-13 20:21:02 +08:00
e305cd1264 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-13 19:22:50 +08:00
9f4b865c7c 记录costTime 2023-04-13 19:22:39 +08:00
liwei1dao
35f969d64f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-13 18:42:50 +08:00
f6e8cc96be Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-13 18:41:44 +08:00
liwei1dao
62818877c7 上传代码 2023-04-13 18:41:35 +08:00
946c3dc2b2 update 2023-04-13 18:41:34 +08:00
5cac675495 队长位置记录 2023-04-13 18:41:27 +08:00
4a8c9566d6 工具类模块 2023-04-13 17:46:36 +08:00
07cd30e7a0 加输出日志 2023-04-13 11:31:52 +08:00
7bde16235f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 18:40:31 +08:00
9703368034 rand 调整 2023-04-12 18:40:22 +08:00
955bf81c56 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 18:30:29 +08:00
3a96386715 update Rtask ctime 2023-04-12 18:30:13 +08:00
liwei1dao
c25ee07d24 上传代码 2023-04-12 18:18:36 +08:00
liwei1dao
e4caebee25 上传代码 2023-04-12 17:40:31 +08:00
liwei1dao
dcc30e776d 好友切磋 优化 2023-04-12 17:37:35 +08:00
liwei1dao
5d3a0e40c3 上传武馆切磋 优化 2023-04-12 17:14:46 +08:00
liwei1dao
e2f3ff5626 上传pvp加载同步代码 2023-04-12 17:12:01 +08:00
1e32d18a54 update 2023-04-12 17:02:52 +08:00
13aaa5d90a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 15:38:42 +08:00
f8beab3a84 优化 2023-04-12 15:38:35 +08:00
liwei1dao
2339f26196 上传pvp战斗结束推送 2023-04-12 15:34:14 +08:00
liwei1dao
451c53aaf7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 14:59:46 +08:00
liwei1dao
65421ac539 上传武馆切磋代码 2023-04-12 14:59:34 +08:00
a14e71e0f6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 11:44:36 +08:00
92b7b5747d 炉子升级后提升炉温上限时需要开启自动恢复 2023-04-12 11:44:32 +08:00
liwei1dao
2020be4db0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 10:32:35 +08:00
liwei1dao
305ab73d64 战斗指令不走通用 错误返回 2023-04-12 10:32:29 +08:00
0d37725262 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 10:09:08 +08:00
8dc7c56dfd 配置参数校验 2023-04-12 10:09:02 +08:00
liwei1dao
53ae11c8a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 19:25:13 +08:00
liwei1dao
6955acb918 上传配置 2023-04-11 19:24:59 +08:00
e872169e3b 掉落优化 2023-04-11 19:02:53 +08:00
958d1a8939 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 17:37:22 +08:00
fcf0b3a048 掉落相关处理 2023-04-11 17:37:18 +08:00
5f30a98235 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 15:23:48 +08:00
b3f3147475 更新任务参数校验策略 2023-04-11 15:23:42 +08:00
liwei1dao
d4a06fe214 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 15:23:21 +08:00
liwei1dao
f67ff3de1e 修复魔药消耗 2023-04-11 15:23:09 +08:00
641a8e00ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 14:22:57 +08:00
3175f6a184 调整参数顺序 2023-04-11 14:22:46 +08:00
liwei1dao
d285bad3a9 上传武馆状态同步 2023-04-11 13:54:50 +08:00
liwei1dao
feb0564e27 上传武馆提出好友推送 2023-04-11 10:56:25 +08:00
liwei1dao
5a44eaffdb 战斗中主动退出处理 2023-04-11 10:50:19 +08:00
liwei1dao
be9aead903 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 10:19:56 +08:00
liwei1dao
dd41812f61 上传pvp主动取消代码 2023-04-11 10:19:48 +08:00
c4f0e8fc26 update 2023-04-10 20:47:34 +08:00
bf56296aa6 update 2023-04-10 20:47:34 +08:00
24c248323f 日周常任务 2023-04-10 20:47:33 +08:00
4831fe3c5e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 18:54:29 +08:00
da1250a68a 交易奖励 2023-04-10 18:54:01 +08:00
liwei1dao
4cfcf51643 同步武馆踢人状态 2023-04-10 18:39:42 +08:00
c948f032c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 17:39:13 +08:00
69fbe8d12c 优化 2023-04-10 17:39:08 +08:00
liwei1dao
5598af6fb5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 17:10:46 +08:00
liwei1dao
313a705b94 修复武馆驱逐 消息推送 2023-04-10 17:10:34 +08:00
3ec456db01 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 16:49:12 +08:00
edeffa6e88 条件开启 2023-04-10 16:48:44 +08:00
liwei1dao
38a6311b11 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 16:30:57 +08:00
liwei1dao
50b7f88226 上传优化代码 2023-04-10 16:30:45 +08:00
afd86b95b0 条件解锁 2023-04-10 15:49:05 +08:00
2041c4af76 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 14:44:37 +08:00
1c53866593 接口调整 2023-04-10 14:44:10 +08:00
liwei1dao
6da2eeb0a6 上传聊天聊天代码 2023-04-10 12:01:24 +08:00
e8e9ef3475 update 2023-04-04 18:11:39 +08:00
83093f2dc0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-04 17:53:36 +08:00
b77c28dd0d update condi配置 2023-04-04 17:53:14 +08:00
990ac20953 手动激活 通知模块 2023-04-04 14:21:42 +08:00
liwei1dao
91f3b31030 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-04 14:12:50 +08:00
liwei1dao
fe8aaf9170 上传代码 2023-04-04 14:12:39 +08:00
4a18a075f5 update 2023-04-04 12:13:50 +08:00
d1dcc03e3a 新版日周常 2023-04-03 19:20:41 +08:00
6550da4cc0 update日常 2023-04-03 19:20:41 +08:00
f1e7ea36ef 维京重复挑战解锁问题修复 2023-04-03 18:07:31 +08:00
e98e8c7da7 update 2023-04-03 16:34:07 +08:00
142ff089aa 自动激活 和手动激活数据校验 2023-04-03 16:05:19 +08:00
4456644096 update 2023-04-03 15:33:45 +08:00
0a011f4dd9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 14:43:38 +08:00
27266cad54 记录手动激活功能开启数据 2023-04-03 14:43:01 +08:00
liwei1dao
6272919a6a 同步配置,优化战斗规则配置 2023-04-03 14:31:46 +08:00
liwei1dao
171e4798ca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 14:13:49 +08:00
liwei1dao
ecdc3a374f 上传战斗规则id 同步 2023-04-03 14:12:33 +08:00
0a416f53dc update 2023-04-03 12:01:26 +08:00
c5dfd7fad6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 11:20:25 +08:00
061f4011d2 GM 指令 2023-04-03 11:20:19 +08:00
22731a9e77 update 2023-04-03 11:08:48 +08:00
liwei1dao
79c1134386 上传图鉴修复 2023-04-01 20:25:45 +08:00
liwei1dao
ddaa7f2271 上传任务奖励分发 2023-04-01 20:03:30 +08:00
liwei
ac67d4f55c 上传代码优化 2023-04-01 18:28:52 +08:00
liwei1dao
b326ec8c32 上传代码优化 2023-04-01 18:05:44 +08:00
liwei1dao
72cc4fb9e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-01 17:24:58 +08:00
liwei1dao
f38c9f106c 上传 代码 2023-04-01 17:24:33 +08:00
e8d18907ed update 2023-04-01 15:20:38 +08:00
c220db525c update 2023-04-01 15:20:38 +08:00
liwei1dao
4cda2451d6 上传代码 2023-04-01 14:38:30 +08:00
liwei1dao
43342582a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 21:48:12 +08:00
liwei1dao
05ff2856a2 上传武馆代码优化 2023-03-31 21:47:56 +08:00
9b0ae604f7 条件判断 2023-03-31 21:42:54 +08:00
a8a900523b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 21:11:40 +08:00
ab5361f606 熟练度升级后不清零 2023-03-31 21:11:36 +08:00
3d728805d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 20:25:29 +08:00
719c2cde42 update reward 2023-03-31 20:25:17 +08:00
liwei1dao
28f532599d 上传武馆驱逐代码调整 2023-03-31 20:16:54 +08:00
liwei1dao
f54b48bb14 上传好友驱逐代码 2023-03-31 20:13:29 +08:00
liwei1dao
9ecd9cfa13 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 18:44:51 +08:00
liwei1dao
ddd8460353 上传武馆雕像数据同步 2023-03-31 18:44:37 +08:00
7d9e4030ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 18:39:49 +08:00
08dcfb5e59 opencond 2023-03-31 18:39:38 +08:00
liwei1dao
04154f8e8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 17:43:11 +08:00
929a5fada2 update 2023-03-31 17:42:12 +08:00
liwei1dao
b0e7818a45 上传魔药代码 2023-03-31 17:42:06 +08:00
57472172ed 返回小游戏提示信息 2023-03-31 17:16:57 +08:00
81fae264e2 update 2023-03-31 17:01:44 +08:00
4f8f939e73 接口调用 2023-03-31 16:52:54 +08:00
718d76a21b 配置解析报错 2023-03-31 15:57:58 +08:00
c57970e6aa 优化 2023-03-31 15:51:09 +08:00
dd2182fa84 小游戏奖励额外配置 2023-03-31 15:27:02 +08:00
51d8ba2ba5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 15:18:20 +08:00
2b7aa34427 被动签到入口 2023-03-31 15:18:14 +08:00
0839dfa477 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 15:01:27 +08:00
9cc6a708e3 查询公会信息接口 2023-03-31 15:01:17 +08:00
b1075b08f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 14:57:37 +08:00
6d1a0ae43d 自动签到 2023-03-31 14:57:28 +08:00
829953b4ff update 2023-03-31 14:54:17 +08:00
233c0f5f70 签到额外奖励,存储提示次数 2023-03-31 14:30:47 +08:00
5855952376 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 13:40:57 +08:00
e1cbced24b 签到功能调整 2023-03-31 12:02:03 +08:00
liwei1dao
7677810ff2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 11:27:28 +08:00
liwei1dao
0d141e7f0b 上传武馆需求调整 2023-03-31 11:26:55 +08:00
82974abfb1 章节领奖 2023-03-31 10:58:06 +08:00
e211f75c32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 09:45:50 +08:00
9d1a02c9c8 移出废旧协议接口等 2023-03-31 09:45:46 +08:00
e60d7fb163 update 2023-03-31 09:43:04 +08:00
62834cc22c update 2023-03-30 21:26:19 +08:00
fc3d8c552d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:58:41 +08:00
467067643f update 2023-03-30 20:58:27 +08:00
liwei1dao
7e1ca9f7b5 上传回收代码 2023-03-30 20:50:49 +08:00
liwei1dao
c832d16998 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:45:43 +08:00
liwei1dao
8fbbd1e3f8 上传装备回收系数 2023-03-30 20:45:04 +08:00
adcc94a551 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:39:26 +08:00
707934fbef update 2023-03-30 20:37:59 +08:00
liwei1dao
b3badfd074 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:06:00 +08:00
liwei1dao
9823de2ac5 上传pvp逻辑代码 2023-03-30 20:05:45 +08:00
01a259c151 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 18:49:47 +08:00
2d871aed9a 图鉴奖励一键领取 2023-03-30 18:49:43 +08:00
liwei1dao
600d011f15 上传pvp主动取消战斗请求 2023-03-30 18:45:40 +08:00
21f46364ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 18:21:11 +08:00
193a4e86ed 图鉴积分修改 2023-03-30 18:21:06 +08:00
liwei1dao
490c750095 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:51:19 +08:00
liwei1dao
1391d464e6 上传练功状态设置代码优化 2023-03-30 17:50:41 +08:00
5e96e588f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:45:22 +08:00
ad7aa97c4b update 2023-03-30 17:45:09 +08:00
liwei1dao
58771acfec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:29:06 +08:00
liwei1dao
8bee568529 上传武馆升级代码 2023-03-30 17:28:49 +08:00
f0d2bb5c09 update 2023-03-30 17:19:12 +08:00
d4c92efa5b 商户NPC读配置 2023-03-30 16:49:16 +08:00
2c35ca7388 铁匠铺NPC数量读配置 2023-03-30 16:26:05 +08:00
2ab7af6f76 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 16:20:13 +08:00
189a1c9526 修复多次推送的问题 2023-03-30 16:16:29 +08:00
liwei1dao
6c0cd1758a 上传图鉴id调整 2023-03-30 15:32:11 +08:00
liwei1dao
06cd0981aa 上传资源代码 2023-03-30 15:28:12 +08:00
liwei1dao
b2a83f515c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:26:08 +08:00
liwei1dao
cc6f8c05d5 日志优化 2023-03-30 15:25:48 +08:00
88fb474863 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:25:25 +08:00
4c2b128a36 打印错误信息 2023-03-30 15:25:18 +08:00
55e58931ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:15:20 +08:00
f5385563c6 添加任务埋点类型 2023-03-30 15:14:55 +08:00
liwei1dao
1d8fe7be12 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 14:16:25 +08:00
liwei1dao
67d28e43f2 暂时移除事件代码 2023-03-30 14:16:14 +08:00
liwei1dao
f0877961f9 上传代码优化 2023-03-30 14:14:02 +08:00
f7e1d4c923 任务埋点参数调整 2023-03-30 13:59:04 +08:00
440f4fe1f9 优化 2023-03-30 11:47:54 +08:00
4a199ed7d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 11:16:03 +08:00
ab9542bdaf 图鉴跨服接口 2023-03-30 11:15:58 +08:00
cfe15751c0 更新配置 2023-03-30 10:42:11 +08:00
c09c2152a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 22:23:23 +08:00
7c709ccca7 更新派遣概率 2023-03-29 22:22:49 +08:00
7b53f63d5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 21:10:46 +08:00
ed4c5c6788 update 2023-03-29 21:10:37 +08:00
liwei1dao
a38a228de4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 20:58:44 +08:00
liwei1dao
977d69832f 上传代码 2023-03-29 20:58:34 +08:00
7253886ac5 update 2023-03-29 19:24:17 +08:00
cf33b5b139 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 19:06:34 +08:00
27bef42a95 更新世界任务 2023-03-29 19:06:24 +08:00
40a0a1f651 写数据BUG 2023-03-29 18:36:55 +08:00
52def5abd2 激活条件 2023-03-29 18:32:47 +08:00
58978bb084 配置同步 2023-03-29 17:52:06 +08:00
26e5f07690 初始化数据 2023-03-29 17:49:31 +08:00
7016e5560f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 17:17:05 +08:00
085f47a0ca 新增任务埋点14 15 2023-03-29 17:17:01 +08:00
liwei1dao
e4c79509d1 上传武馆修复 2023-03-29 15:26:26 +08:00
liwei1dao
3cb44f1ce5 上传武馆雕像留存时间 2023-03-29 15:13:50 +08:00
a1e5d1f3d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 11:31:38 +08:00
51a47bc312 武馆积分奖励发送 2023-03-29 11:31:28 +08:00
liwei1dao
12cc0f6fc2 上传服务配置 2023-03-29 11:26:09 +08:00
liwei1dao
39e7125c0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:58:52 +08:00
liwei1dao
dd910fd977 上传武馆雕像刷新优化 2023-03-29 10:58:41 +08:00
a5405b51d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:50:32 +08:00
54a4682a69 激活修改 2023-03-29 10:50:25 +08:00
liwei1dao
eab92a1205 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:49:04 +08:00
liwei1dao
d61c897187 上传武馆雕像刷新时间 2023-03-29 10:48:52 +08:00
72c62c5aed 武馆积分奖励领取 2023-03-29 10:42:19 +08:00
6023cd673d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:21:34 +08:00
01b88e6ba8 单次领取改一次领所有奖励 2023-03-29 10:21:24 +08:00
liwei1dao
97b0dad942 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:16:13 +08:00
liwei1dao
e7f5b858d6 上传魔药接口 2023-03-29 10:16:02 +08:00
0c1d675c8e 铁匠铺非定制打造才玩小游戏 2023-03-28 19:04:12 +08:00
d41600bbdc update 2023-03-28 14:19:19 +08:00
387b23f97d update 2023-03-27 20:29:56 +08:00
d28ba58920 派遣任务随机刷新 2023-03-27 20:29:14 +08:00
0421c9f00e update req 2023-03-27 20:15:25 +08:00
449c921133 update 2023-03-27 20:01:36 +08:00
cbb23917c0 世界任务多任务 2023-03-27 19:57:52 +08:00
b53972e79f 世界任务多组支持 2023-03-27 19:57:48 +08:00
397ab14b79 多路任务支持 2023-03-27 19:56:13 +08:00
7068b0c635 美食馆菜品图鉴激活+功夫塔配置迁移 2023-03-27 19:01:06 +08:00
5d08d1610c 配置更新 2023-03-27 16:06:08 +08:00
47dd998643 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:55:19 +08:00
78fe971932 输出日志 2023-03-27 15:55:12 +08:00
liwei1dao
c559bcf069 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:47:34 +08:00
liwei1dao
b0d0ec205f 上传任务消息推送 2023-03-27 15:47:17 +08:00
f1cc783b7c 记录小游戏最高记录 2023-03-27 15:41:17 +08:00
78a39423a8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:00:10 +08:00
50d02359c7 铁匠铺小游戏 概率双倍打造双倍 2023-03-27 15:00:03 +08:00
liwei1dao
c001258929 上传武馆数据初始化修复 2023-03-27 14:26:01 +08:00
liwei1dao
28ccde1f34 上传拼图游戏接口 2023-03-27 09:53:15 +08:00
liwei1dao
9f55ca0628 上传资源默认 2023-03-24 22:45:09 +08:00
liwei1dao
61787d5cd2 上传木桩解锁调整 2023-03-24 21:56:53 +08:00
liwei1dao
6f1c7c7ea3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 20:44:15 +08:00
liwei1dao
4d402e8a2d 上传铁匠铺代码 2023-03-24 20:44:03 +08:00
cf59f160d4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 18:28:45 +08:00
93442b6877 美食馆 2023-03-24 18:28:17 +08:00
liwei1dao
41c8b08bbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 17:52:07 +08:00
liwei1dao
377a551bab 上传武馆经验加成 2023-03-24 17:51:00 +08:00
9a24d60780 修改派遣随机策略 2023-03-24 17:50:46 +08:00
liwei1dao
977ce1e40a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 17:21:34 +08:00
liwei1dao
7c33752262 添加测试代码 2023-03-24 17:21:17 +08:00
a65ed662b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 15:20:31 +08:00
448b5e5b8c 炉温校验 2023-03-24 15:20:24 +08:00
liwei1dao
e190aaf3ab 上传武馆经验计算修复 2023-03-24 15:06:52 +08:00
4556ed552b 报错处理 2023-03-24 09:45:57 +08:00
b19b66a200 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 09:41:04 +08:00
cb4e23d12b GM 获取指定类型的道具 2023-03-24 09:40:53 +08:00
fd0580d4da update worldtask 2023-03-24 09:29:49 +08:00
64a50c4f57 worldtask 2023-03-24 09:29:49 +08:00
bf98281c0a update 2023-03-24 09:29:49 +08:00
14e1a5bb30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-23 17:49:54 +08:00
4b9ad93b84 移出旧主线 2023-03-23 17:49:39 +08:00
88bbfece23 更新Pb 2023-03-23 12:07:26 +08:00
21800d3fd9 update 2023-03-23 12:02:11 +08:00
755693518a update 2023-03-23 11:05:32 +08:00
50781b87a3 前置条件解锁 2023-03-21 13:43:47 +08:00
53999edfbe 需求调整,能同时打不同页签的塔 2023-03-20 18:19:31 +08:00
bd21f7ee76 武馆塔添加前置解锁条件 2023-03-20 16:11:21 +08:00
0da13ca917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-17 20:45:31 +08:00
9622604dc5 修改炉温校验 2023-03-17 20:45:18 +08:00
a2f6075eba 解锁木桩,任务统计 配置更新 2023-03-17 18:57:22 +08:00
e2890b1a59 更新记数规则 2023-03-17 17:51:07 +08:00
f677a55ecc update 2023-03-17 15:45:07 +08:00
0c51fd3521 update 2023-03-17 15:42:58 +08:00
e3ef151ac2 update 2023-03-17 15:42:47 +08:00
5080121075 update 2023-03-17 15:31:50 +08:00
adbe3b7415 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-17 14:28:21 +08:00
cf5d2991d7 update Session 2023-03-17 14:28:09 +08:00
283b7382c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 19:16:50 +08:00
fd8055110b update 2023-03-16 19:16:46 +08:00
97ea52b9e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 18:13:33 +08:00
d3f0f0aada 修复在线玩家 2023-03-16 18:13:20 +08:00
liwei1dao
078b1af6fc 调整武馆经验收益计算 2023-03-16 17:48:08 +08:00
liwei1dao
457ed31fff 移除旧武馆 2023-03-16 16:49:28 +08:00
683fb2d72d add log 2023-03-16 16:25:28 +08:00
8ee109e673 重置任务数 2023-03-16 16:03:43 +08:00
5b25ca43e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 15:14:03 +08:00
56fe04cbf7 英雄查询接口优化 减少查询次数调用 2023-03-16 15:13:50 +08:00
liwei1dao
cb29154698 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 14:44:54 +08:00
liwei1dao
260ff1c177 上传服务端代码 2023-03-16 14:44:36 +08:00
fd1e706014 update 2023-03-16 14:15:27 +08:00
ebff117d3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 14:15:04 +08:00
d3dbc468af 报错 2023-03-16 14:14:57 +08:00
liwei1dao
eda81986af 上传批量处理代码 2023-03-16 13:55:19 +08:00
79fb4b27eb 批量查询英雄接口 2023-03-16 13:52:50 +08:00
16c820858f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 13:42:59 +08:00
68fc794ee8 接口修改 2023-03-16 13:42:12 +08:00
liwei1dao
25eda8a254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 13:39:04 +08:00
liwei1dao
5a36995060 修改接口 2023-03-16 13:37:35 +08:00
94a883422a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 12:36:35 +08:00
d21716fa20 英雄登记支持批量操作 2023-03-16 12:36:30 +08:00
29b37be18e 去除公会自动创建 2023-03-16 11:31:14 +08:00
790fea5ca1 任务通知模块 2023-03-16 10:02:07 +08:00
1b613b0dd3 update 2023-03-15 17:35:36 +08:00
9d845d3f2d 英雄经验加满了不返回code 2023-03-15 17:16:26 +08:00
b305e25ff2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-15 17:06:36 +08:00
deb6355d36 触发任务 2023-03-15 17:06:30 +08:00
liwei1dao
1063650e63 上传代码 2023-03-15 16:57:16 +08:00
ea02710279 推送注册消息 2023-03-15 15:33:43 +08:00
72bb00422e 英雄可以取消注册 2023-03-15 15:15:16 +08:00
e7d3d0ca7a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-15 15:08:23 +08:00
ec892aa56f 英雄等级接口跨服处理 2023-03-15 15:08:01 +08:00
a5ee8db5ed 派遣额外要求 2023-03-15 14:23:37 +08:00
liwei1dao
1ede1a934e 上传配置 2023-03-15 10:00:59 +08:00
liwei1dao
02830457ed Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:54:14 +08:00
liwei1dao
c3cc2740a6 上传服务端配置 2023-03-14 18:53:52 +08:00
acc409c6b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:23:09 +08:00
37fea2cb80 优化 耗时测试 2023-03-14 18:22:50 +08:00
813083f63a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:19:43 +08:00
413362e21a 任务条件优化 2023-03-14 18:19:31 +08:00
liwei1dao
ad65e4b331 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 16:21:05 +08:00
liwei1dao
81d2f5f23c 上传api代码 2023-03-14 16:20:50 +08:00
4a3ca9166e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 14:42:14 +08:00
a97c348986 任务附件参数 2023-03-14 14:42:06 +08:00
liwei1dao
af0d0517b6 上传代码 2023-03-14 14:19:39 +08:00
liwei1dao
56851feaee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 10:08:45 +08:00
liwei1dao
ff5334445b 上传战斗代码 2023-03-14 10:08:35 +08:00
672be883dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 09:48:52 +08:00
8f8756cc07 移除旧模块 2023-03-14 09:48:45 +08:00
ae261afdad update 2023-03-13 19:26:40 +08:00
c63fb776d5 派遣优化 2023-03-13 19:26:40 +08:00
7360720f7e 派遣优化2 2023-03-13 19:26:40 +08:00
f01af25de3 派遣优化 2023-03-13 19:26:40 +08:00
db587b9198 update 2023-03-13 19:26:39 +08:00
liwei1dao
2ebaa538ae 上传测试服代码 2023-03-13 19:18:06 +08:00
a0a22dbd49 删除旧铁匠铺解析数据等信息 2023-03-13 14:19:34 +08:00
82c5d1023c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-13 10:31:16 +08:00
f1409ff23a 图鉴数据参数优化 2023-03-13 10:31:08 +08:00
liwei1dao
281036effb 回收session 2023-03-13 10:02:27 +08:00
liwei
090dbe1521 同步代码 2023-03-11 18:12:49 +08:00
liwei1dao
1f371a9b44 上传任务代码 2023-03-11 17:52:12 +08:00
liwei1dao
bdaad954b8 上传消息代码 2023-03-11 17:47:20 +08:00
d7e8851f7e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 16:50:23 +08:00
8c29001e84 update 2023-03-10 16:50:09 +08:00
015c407fbe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 16:44:54 +08:00
a54a70ce83 消息异步处理 2023-03-10 16:44:40 +08:00
liwei1dao
346b858bc9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 16:24:04 +08:00
liwei1dao
8646d2bcdf 上传世界任务代码 2023-03-10 16:23:49 +08:00
99bff176d7 对象池接入 2023-03-10 15:58:42 +08:00
liwei1dao
4fa9beb9b0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 15:50:21 +08:00
liwei1dao
05e35cac0a 上传任务对象池 2023-03-10 15:50:10 +08:00
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
liwei1dao
ea11b690da 上传心跳优化 2023-03-10 14:39:59 +08:00
liwei1dao
086f87468e 上传商品购买 2023-03-10 11:40:49 +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
9c3689c51c add log 2023-03-08 19:01:16 +08:00
liwei1dao
8118e59c44 上传代码 2023-03-08 18:37:16 +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
81c1cf3b08 优化 + 自定义key 取值错误问题修复 2023-03-07 17:11:58 +08:00
liwei1dao
195bb1385b 上传武馆npc代码 2023-03-07 16:10:20 +08:00
5a1966c4df 任务条件未通过不发送完成消息 2023-03-06 19:39:45 +08:00
62904759e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-06 18:34:47 +08:00
ab74f3599c 性能优化 部分逻辑携程处理
优化熟练度技能接口
2023-03-06 18:34:39 +08:00
liwei1dao
3fd878e271 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-06 18:17:19 +08:00
liwei1dao
4c8d8e2bb4 上传配置代码 2023-03-06 18:16:57 +08:00
9ec31dee0f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-06 18:05:39 +08:00
05344dfa81 优化日志 2023-03-06 18:05:28 +08:00
83a5083a93 移除废除的特权 2023-03-06 16:41:10 +08:00
91fd8382f7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-06 15:08:06 +08:00
14a8a7d93d 配置优化 2023-03-06 15:07:40 +08:00
liwei1dao
686ca844aa 上传代码 2023-03-06 14:43:14 +08:00
liwei1dao
4e528ac669 上传战斗服 2023-03-04 20:59:44 +08:00
liwei1dao
d1679d71a2 上传网关日志代码 2023-03-04 16:55:58 +08:00
liwei1dao
fa30a004a9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-04 10:21:24 +08:00
liwei1dao
8fc82bc128 修复铁匠铺代码 2023-03-04 10:21:17 +08:00
10415e821f 抽卡最多连续出A个相同阵营的英雄(普通卡池) 2023-03-03 22:30:33 +08:00
944de878c0 update 2023-03-03 16:06:59 +08:00
00dee7ed6d 初始化 2023-03-03 16:05:39 +08:00
f80a3f08ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-03 15:50:23 +08:00
a7a8dce83d 跨服加英雄经验 2023-03-03 15:50:18 +08:00
liwei1dao
92799f1f66 上传好友木桩代码 2023-03-03 15:48:52 +08:00
liwei1dao
8f8b4f612e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-03 15:47:13 +08:00
liwei1dao
05a5135479 上传武馆代码 2023-03-03 15:46:58 +08:00
139f47f7f2 记录英雄在谁家练功 2023-03-03 14:41:15 +08:00
8b6110246b update 2023-03-03 10:50:59 +08:00
910568d2f4 练功接口优化 2023-03-03 10:47:57 +08:00
9c11102b5a 练功改跨服 2023-03-03 10:26:59 +08:00
liwei1dao
fd097b5784 上传代码修复 2023-03-02 19:26:09 +08:00
liwei1dao
e8a5037e04 上传pvp代码修复 2023-03-02 19:20:07 +08:00
dd8c9523a7 派遣 2023-03-02 18:54:56 +08:00
ee061fa6e0 图鉴任务 2023-03-02 18:54:56 +08:00
9fa2855435 派遣 2023-03-02 18:54:53 +08:00
e1722eca92 跨服创建英雄对象+ 配置更新 2023-03-02 18:46:04 +08:00
liwei1dao
7926c46ce0 上传代码 2023-03-02 18:20:47 +08:00
liwei1dao
a30d54f0db 上传配置 2023-03-02 18:17:30 +08:00
liwei1dao
5424356519 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:13:09 +08:00
liwei1dao
e37efad183 上传配置文件 2023-03-02 18:12:55 +08:00
6c5c23faae Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 18:06:17 +08:00
fcb15060c4 重复英雄校验 2023-03-02 18:05:03 +08:00
liwei1dao
cc5a5929f0 上传雕像维护 2023-03-02 17:06:16 +08:00
liwei1dao
3573a05da9 上传每日一练代码 2023-03-02 16:16:17 +08:00
ffe178cd36 数据解析优化 2023-03-02 15:44:31 +08:00
liwei1dao
0466be0042 移除每日一练系统 2023-03-02 15:41:23 +08:00
liwei1dao
001d6d6bf6 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 15:03:57 +08:00
liwei1dao
98decb8666 上传木桩图鉴添加 2023-03-02 15:03:40 +08:00
31abefaa86 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 14:20:45 +08:00
41a22b3cf0 特殊图鉴手动激活 2023-03-02 14:20:38 +08:00
liwei1dao
3389e0f3b8 上传用户全局buff 清理 2023-03-02 14:16:32 +08:00
liwei1dao
2043367dd1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-02 14:12:26 +08:00
liwei1dao
fbe1d21ed1 上传柱子解锁接口 2023-03-02 14:12:11 +08:00
378099f72c 移除测试代码 2023-03-02 10:53:29 +08:00
9a241060e1 掉落规则修改 + 功夫大师挑战塔 2023-03-01 17:35:23 +08:00
2fc9a1cf26 英雄配置错误信息收集 2023-03-01 09:49:06 +08:00
39221f5fb2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 18:36:29 +08:00
1d88baa04c 配置优化 2023-02-28 18:36:13 +08:00
liwei1dao
1d8009f0e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 17:18:55 +08:00
liwei1dao
a37d47703d 熊猫资源分类处理 2023-02-28 17:17:36 +08:00
fe2bec7979 英雄等级获取修改 2023-02-28 16:40:51 +08:00
338c1d9a4e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 15:48:59 +08:00
liwei1dao
28eb5a4022 上传练功房代码 2023-02-28 15:02:30 +08:00
296da0a188 错误码 2023-02-28 11:30:07 +08:00
c66346493c Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 11:29:55 +08:00
63d25e17ba 英雄注册接口参数调整增加判断逻辑 2023-02-28 11:26:58 +08:00
liwei1dao
c2734cac73 上传练功代码 2023-02-28 11:22:38 +08:00
liwei1dao
a8e694bd9b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 11:10:44 +08:00
liwei1dao
ae381980a3 上传教习登记 2023-02-28 11:06:54 +08:00
db211dfab2 英雄武馆注册接口 2023-02-28 10:51:55 +08:00
liwei1dao
f1dfd0ba3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-27 10:21:26 +08:00
liwei1dao
21677da329 上传接口代码优化 2023-02-27 10:21:11 +08:00
5e354c6bd6 报错处理 2023-02-24 20:31:30 +08:00
593af9dbfe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 20:24:08 +08:00
783063f8e2 图纸熟练度初始1级 2023-02-24 20:24:02 +08:00
liwei1dao
dea631420b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 18:55:17 +08:00
liwei1dao
ffd74c23f6 上传熊猫 2023-02-24 18:55:03 +08:00
f4ec14b472 派遣 2023-02-24 18:29:46 +08:00
39f463ff2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 17:43:23 +08:00
4d810402d9 领奖数据返回 2023-02-24 17:43:18 +08:00
liwei1dao
dc497a413a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 17:22:25 +08:00
liwei1dao
4209e202c1 练功计算收益 2023-02-24 17:22:12 +08:00
a9f41b7f6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 16:27:01 +08:00
d9fa0573a1 武馆图鉴 2023-02-24 16:26:56 +08:00
liwei1dao
30d28278e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 13:58:49 +08:00
liwei1dao
520cc3b4e9 战斗 全局buff 添加 2023-02-24 13:58:34 +08:00
45d199b682 参数错误 2023-02-24 13:44:16 +08:00
d210e54fc0 工具台升级 条件补充 2023-02-24 11:48:24 +08:00
d63c04cfe0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 10:49:18 +08:00
dd9e3345ee 武馆图鉴激活 2023-02-24 10:48:49 +08:00
liwei1dao
ad0ea31344 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 10:25:52 +08:00
liwei1dao
5064cc1b7f 上传每日一健和练功房代码 2023-02-24 10:25:36 +08:00
3387fce2f7 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 09:46:13 +08:00
3f464ddd94 武馆图鉴 2023-02-23 19:07:10 +08:00
liwei1dao
7ceb1fa508 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 18:32:59 +08:00
liwei1dao
b4b4859458 上传新物管和每日一练 2023-02-23 18:32:45 +08:00
beceeea318 副本支持动态配置 2023-02-23 16:35:37 +08:00
a99dfb6bc9 武馆图鉴 2023-02-23 15:38:32 +08:00
abfeeef0ad 字段优化 2023-02-23 15:03:27 +08:00
e1146656a5 初始技能配置 2023-02-23 14:44:23 +08:00
18538be012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 14:16:41 +08:00
ed97958604 装备品质获取 2023-02-23 14:16:36 +08:00
a1e06f4687 添加派遣模块 2023-02-23 11:40:02 +08:00
liwei1dao
645a4158ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 10:21:13 +08:00
liwei1dao
eec1b9cd4b 上传pb协议整理 2023-02-23 10:20:51 +08:00
46d5d3b3fd 异常处理 防止不消耗该道具 但是技能做了该道具的减免 2023-02-23 09:35:54 +08:00
bdd057692f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 19:14:38 +08:00
e556db1c40 图鉴资源类型发放 2023-02-22 19:14:31 +08:00
liwei1dao
8090e7bc84 上传练功房系统 2023-02-22 19:02:42 +08:00
liwei1dao
7f35654f72 上传每日一健身模块初始化 2023-02-22 18:56:00 +08:00
liwei1dao
25d8e8bb72 修改心跳逻辑 2023-02-22 18:45:22 +08:00
liwei1dao
f1b11de7f2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 18:42:42 +08:00
liwei1dao
72fc087832 上传心跳激活代码 2023-02-22 18:42:28 +08:00
de5429ca0e 熟练度等级降低炉温消耗 效果为千分比 2023-02-22 18:05:52 +08:00
3092c8614f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 17:51:53 +08:00
d2c10c8253 打造装备监听图鉴数据变化 2023-02-22 17:51:45 +08:00
91f8e1b039 更新切磋结束时间 2023-02-22 17:50:42 +08:00
8a507cda02 代码优化 2023-02-22 17:26:06 +08:00
8d8d2e3c3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 16:50:31 +08:00
8dc4d90270 图鉴积分更新 2023-02-22 16:50:08 +08:00
5bbc0dcb15 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 14:51:22 +08:00
25ea76c5bc 图鉴任务 2023-02-22 14:50:49 +08:00
dfcf822038 初始炉温 2023-02-22 14:44:06 +08:00
b617e2815a 图鉴更新 激活等操作 2023-02-22 14:15:28 +08:00
d90e938959 配置更新 2023-02-22 12:08:44 +08:00
a498860214 定制装备 提升史诗品质装备概率 2023-02-22 11:34:57 +08:00
2b4abbac81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 11:31:52 +08:00
06cad71be0 图鉴更新校验 2023-02-22 11:30:54 +08:00
liwei1dao
d2a3af4dac 上传装备初始化动态权重参数添加 2023-02-22 11:03:44 +08:00
liwei1dao
8e38fa0b62 上传队长技校验接口 2023-02-21 18:49:13 +08:00
9c2eb0b4e6 配置解析 2023-02-21 18:48:21 +08:00
e60eccfd51 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 17:48:52 +08:00
98cef3dd19 对接获取指定套装 指定等级的装备 2023-02-21 17:46:20 +08:00
2dd31398a3 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 17:43:58 +08:00
17af1fddc6 定制打造装备 2023-02-21 17:42:35 +08:00
f641e9753e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 17:13:30 +08:00
d70cd3a7c6 更新smithy_trade字段类型 2023-02-21 16:46:08 +08:00
liwei1dao
c127a7790d 上传装备随机套装 2023-02-21 16:45:43 +08:00
0be6315357 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 14:53:05 +08:00
liwei1dao
9c0ff3c9ad 上传队长技校验接口 2023-02-21 14:52:14 +08:00
1432d36049 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 14:51:05 +08:00
d6a8833394 获取指定装备接口 2023-02-21 14:50:06 +08:00
liwei1dao
7e6640f003 上传队长技校验代码 2023-02-21 14:39:20 +08:00
45e97a5927 图鉴奖励领取 2023-02-21 11:05:39 +08:00
cabae82815 图鉴激活检测 2023-02-20 19:10:21 +08:00
760de42723 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 18:36:05 +08:00
01b3499a3d 铁匠铺图鉴相关 2023-02-20 18:34:04 +08:00
91f883e47e 对接装备 2023-02-20 16:24:28 +08:00
b536a756ae 添加熔岩 2023-02-20 15:40:05 +08:00
bc19f93618 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 14:41:31 +08:00
31dc53c6d3 炉子升温 2023-02-20 14:40:40 +08:00
liwei1dao
87315a6dc9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 11:58:28 +08:00
liwei1dao
e7712e6e88 上传铁匠铺专用接口 2023-02-20 11:58:13 +08:00
e7bce2e742 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 10:39:55 +08:00
baae7169e4 激活套装ID 2023-02-20 10:35:51 +08:00
liwei1dao
7e4dd0575d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 10:32:59 +08:00
liwei1dao
11691051ff 上传装备获取可操作列表 2023-02-20 10:32:29 +08:00
53b2cca605 购买挑战卷配置 2023-02-17 19:33:10 +08:00
3de993de65 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 19:23:55 +08:00
e9d658a441 好友写错返回 2023-02-17 19:23:48 +08:00
7c9bb00198 update 2023-02-17 18:30:26 +08:00
524963ef0b update 2023-02-17 18:30:26 +08:00
15df32ec6d update 2023-02-17 18:30:26 +08:00
61daf826cc update 2023-02-17 16:53:51 +08:00
4de830806d 工具台技能数据加成 2023-02-17 16:35:45 +08:00
b22acf2f35 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 12:07:31 +08:00
5ae69ab050 解析报错 2023-02-17 12:07:13 +08:00
817ecef637 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 11:58:48 +08:00
d2c8d44823 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 11:58:40 +08:00
97f426ff35 工具台 获取打造两件装备的接口 2023-02-17 11:58:38 +08:00
liwei1dao
5ccab5bc12 上传装备回收接口业务逻辑代码 2023-02-17 10:46:09 +08:00
liwei1dao
f4dd29bf2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 10:32:11 +08:00
liwei1dao
42c5e77294 上传装备回收接口 2023-02-17 10:32:04 +08:00
8b2bfca06d 消耗配置调整 2023-02-17 10:04:14 +08:00
ada84d90e2 错误码 2023-02-16 19:23:47 +08:00
3f1aa5ab1a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-16 19:20:36 +08:00
6f982c0dd3 工具台升级 2023-02-16 19:19:15 +08:00
99587b984e 铁匠铺装备交易 2023-02-16 19:15:26 +08:00
045209ace3 炉子升级 2023-02-16 18:20:56 +08:00
dc5c2729cd 更新铁匠铺协议 2023-02-16 15:45:29 +08:00
92fd5e34cb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-16 15:39:27 +08:00
ef74f429ca 打造装备 2023-02-16 15:37:59 +08:00
f72724b090 配置+ 协议 2023-02-16 11:21:03 +08:00
liwei
2a689eb1c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-16 11:01:10 +08:00
3102a7729f 铁匠图 2023-02-15 19:28:14 +08:00
liwei1dao
6655e8556f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 18:46:15 +08:00
liwei1dao
81552f2eff 上传pvp代码 2023-02-14 18:37:10 +08:00
992237568f api补充 2023-02-14 18:27:25 +08:00
311f45c351 update trade 2023-02-14 17:25:14 +08:00
liwei1dao
2d1838174e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 17:03:57 +08:00
liwei1dao
80688110a5 实时pvp断线重连 2023-02-14 17:03:40 +08:00
01476853e0 处理切磋pvp失败情况 2023-02-14 14:53:46 +08:00
4d69b0c3dc api 上传 2023-02-14 14:17:49 +08:00
b016f03ffb update 2023-02-14 11:46:26 +08:00
1a5c36ff72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 11:42:33 +08:00
5711441b48 update 2023-02-14 11:42:29 +08:00
4936f3be40 改包名 2023-02-14 11:36:22 +08:00
liwei1dao
f7f68c3120 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 11:29:11 +08:00
liwei1dao
7e0f6ea21a 上传pvp重连机制 2023-02-14 11:29:01 +08:00
733e432f3c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 10:44:33 +08:00
3c343fb999 铁匠铺 2023-02-14 10:43:43 +08:00
1783ca780b 新增铁匠铺模块 2023-02-14 10:22:18 +08:00
liwei1dao
3a13fb79be 上传pvp 倒计时实现 2023-02-13 16:06:43 +08:00
liwei1dao
6a968e9c4d 上传api 修复 2023-02-13 15:18:18 +08:00
liwei1dao
6e42fb6a7f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-13 14:18:45 +08:00
b232502399 update 2023-02-13 14:16:39 +08:00
liwei1dao
b0f39590d1 上传pvp代码 2023-02-13 14:16:25 +08:00
liwei1dao
a787e1f29d 上传战斗匹配代码 2023-02-11 00:09:10 +08:00
liwei1dao
602e1a7a82 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-10 19:30:49 +08:00
liwei1dao
423e11387c 上传pvp代码 2023-02-10 19:30:29 +08:00
4c19b26964 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-10 19:26:02 +08:00
ffcfdea877 英雄优化 2023-02-10 19:25:55 +08:00
f63b9404d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-10 19:24:02 +08:00
c0b181b1dc add log 2023-02-10 19:23:53 +08:00
liwei1dao
a433192d2f 上传pvp战斗代码 2023-02-10 19:05:43 +08:00
618a3fae6b update log 2023-02-10 17:40:37 +08:00
20c964dd5f 切磋完成通知接口 2023-02-10 15:47:56 +08:00
802490657d 删除日志 2023-02-10 14:56:33 +08:00
d54401a3fe update 2023-02-10 14:44:09 +08:00
c9869d646c update 2023-02-10 12:13:23 +08:00
cd8ee73e90 update 2023-02-10 12:00:32 +08:00
08391e2032 update 2023-02-10 11:56:34 +08:00
19e8175395 update 2023-02-10 11:56:22 +08:00
6a3732a715 切磋判断 2023-02-10 11:48:13 +08:00
1eee1499c3 修改切磋状态 2023-02-10 11:27:21 +08:00
fa0498c7a6 修改协议名 2023-02-10 10:08:38 +08:00
bd517119b9 好友切磋校验 2023-02-10 10:08:27 +08:00
eb70ef9758 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 17:17:57 +08:00
e3997013fa 合并rtask 2023-02-09 17:17:46 +08:00
c877b55ced Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 14:49:56 +08:00
cb94f203a6 抽卡权重 2023-02-09 14:49:52 +08:00
05cfdd58b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 11:03:53 +08:00
e588b316a5 add log 2023-02-09 11:03:43 +08:00
9410119d94 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 10:23:28 +08:00
37b691f81f 共鸣通用天赋点配置调整 2023-02-09 10:23:18 +08:00
885993f549 好友切磋pvp 2023-02-08 18:52:07 +08:00
liwei1dao
49915ec269 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-08 18:45:50 +08:00
liwei1dao
7487a66eb6 上传战斗模块代码 2023-02-08 18:45:36 +08:00
6261d32f8a update 2023-02-08 18:33:04 +08:00
9e9ac61de5 英雄堆叠代码注释 2023-02-08 18:32:56 +08:00
6470e3434f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-08 18:24:18 +08:00
68cbc5c5e3 抽卡规则优化+ 获得英雄转碎片不广播+概率调整 2023-02-08 18:22:11 +08:00
836909706c 好友切磋 2023-02-08 18:22:04 +08:00
a9743c6169 通知前端重复获得英雄分解 2023-02-08 15:32:03 +08:00
de4013d7e9 通知客户端 这个英雄是重复获得的 2023-02-08 15:31:35 +08:00
e25936c6af add log 2023-02-08 14:35:56 +08:00
b0b9f0865c add log 2023-02-08 14:13:35 +08:00
e519ad0bd2 gm 发装备 2023-02-08 14:03:29 +08:00
8b24855232 GM扩展 2023-02-08 12:01:52 +08:00
ebbc32e297 星阵图属性加成 2023-02-08 10:40:47 +08:00
b2d5036086 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-07 18:51:07 +08:00
liwei1dao
30239136b6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-07 18:47:50 +08:00
liwei1dao
dab4732a11 上传pvp业务开发代码 2023-02-07 18:47:10 +08:00
66c5f1788d 天赋学习 道具不够的情况可使用其他道具替代 2023-02-07 18:25:01 +08:00
de3315de63 该英雄重复获取后所获得的升星道具 上限转换处理 2023-02-07 17:56:47 +08:00
14d69fdd11 扩展玩家属性 2023-02-07 16:32:35 +08:00
d9a853ba33 DB 数据优化 2023-02-07 15:02:56 +08:00
353c4d0585 抽卡返回 碎片等资源 2023-02-07 14:59:46 +08:00
64c928112b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-06 16:36:09 +08:00
1086ab6eec map 初始化 2023-02-06 16:35:34 +08:00
3f9eace9d8 配置锁 2023-02-06 16:30:20 +08:00
904e59475d 英雄相关 2023-02-06 15:49:47 +08:00
e31e0d1ae8 修改功能开启条件判断 2023-02-06 15:11:20 +08:00
79e4230dcd 协议修改配置同步 2023-02-06 14:38:36 +08:00
f87402adc5 gm 创建特殊英雄 获取英雄最大星级 2023-02-06 14:07:14 +08:00
59f978937a 资源校验整合 2023-02-06 13:39:13 +08:00
d01d24912a 英雄升级 2023-02-06 11:54:05 +08:00
b79700e960 merge 2023-02-06 11:12:34 +08:00
aa91ee0b32 抽卡新规则 2023-02-03 15:36:39 +08:00
4701ab2fb7 主线任务埋点 2023-02-02 18:15:02 +08:00
cd17d09bef Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-02 16:57:57 +08:00
5581657283 扩展字段优化 2023-02-02 16:57:09 +08:00
ced2437ae4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-02 10:42:57 +08:00
cdd3db85b2 开放任务触发协议 2023-02-02 10:42:49 +08:00
eb7c3b7c60 创建特殊英雄时校验是否有重复英雄 2023-02-02 09:55:37 +08:00
949037c4b9 不再写图鉴数据,可通过英雄列表数据获取 2023-02-01 18:26:47 +08:00
4f6aafdcde 英雄转换碎片 2023-02-01 17:04:27 +08:00
16388621e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-01 16:23:09 +08:00
4a3296a4db 多余英雄转碎片处理 2023-02-01 16:23:06 +08:00
liwei1dao
44efa1f5d9 上传战斗角色数据结构调整 2023-02-01 16:10:13 +08:00