Commit Graph

3662 Commits

Author SHA1 Message Date
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