Commit Graph

4207 Commits

Author SHA1 Message Date
283410f2e6 补充ErrorData 2023-05-31 18:31:44 +08:00
732398c5ea 代码整理 2023-05-31 18:17:21 +08:00
liwei1dao
5d0d6a9253 上传代码规范优化 2023-05-31 18:01:53 +08:00
liwei1dao
1e7066a294 错误采集优化 2023-05-31 17:49:01 +08:00
liwei1dao
fa4b57748b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-31 15:45:49 +08:00
liwei1dao
c48cf68e26 上传埋点中中心协议 2023-05-31 15:40:46 +08:00
e5ba3481c4 删除废弃接口调用 2023-05-31 15:07:23 +08:00
4e70b9204a 更新任务校验接口调用 2023-05-31 13:41:46 +08:00
liwei1dao
6d560e4213 上传埋点中心校验接口优化 2023-05-31 11:30:05 +08:00
liwei1dao
da9038821e 上传竞技场代码优化 2023-05-31 11:04:52 +08:00
liwei1dao
85d861c4f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 21:25:38 +08:00
liwei1dao
c67b911d54 上传任务系统代码 2023-05-30 21:25:29 +08:00
94aff2223e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 19:02:39 +08:00
71a40f87ca 完善ErrorData 2023-05-30 19:02:32 +08:00
a99388c5f8 错误对象构建 2023-05-30 18:32:34 +08:00
bd4d8504b9 初始化 2023-05-30 17:59:45 +08:00
9d16c57768 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:47:29 +08:00
1a560f9ab7 map 初始化 2023-05-30 17:47:21 +08:00
3371088e78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:46:05 +08:00
ca6aa24fe9 errorData 2023-05-30 17:45:57 +08:00
4b89fd4362 update 2023-05-30 17:38:41 +08:00
aef30ba083 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:21:18 +08:00
961a2e8bcf 错误整合遗漏点 2023-05-30 17:21:12 +08:00
0e0caaca40 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:18:45 +08:00
52676533e4 add log 2023-05-30 17:18:32 +08:00
liwei1dao
9b4a845d29 上传代码 2023-05-30 17:17:04 +08:00
7667308a80 补充错误信息 2023-05-30 16:49:47 +08:00
81c5ec46d2 add log 2023-05-30 16:39:36 +08:00
85be4a2254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 16:35:40 +08:00
f17497338a 更新errorData 2023-05-30 16:35:35 +08:00
liwei1dao
0db1088c9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 16:34:39 +08:00
liwei1dao
0143e85b28 上传错误信息收集 2023-05-30 16:34:34 +08:00
cf41baf481 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 16:08:54 +08:00
ecfe9acdda 维京 狩猎 改体力消耗 2023-05-30 16:08:49 +08:00
a7faed061b 更新ErrorData 2023-05-30 15:53:01 +08:00
liwei1dao
c3c266557a 上传代码 2023-05-30 15:07:31 +08:00
liwei1dao
543a7083a4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 14:48:19 +08:00
liwei1dao
53969b4fe8 上传任务配置修复 2023-05-30 14:48:11 +08:00
15a4177778 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 14:39:02 +08:00
57115d4d74 任务 整合 2023-05-30 14:38:55 +08:00
liwei1dao
5915c6363d 埋点中心跨服触发处理 2023-05-30 14:33:14 +08:00
liwei1dao
c99a0dfd4a 上传任务接口调整 2023-05-30 14:23:13 +08:00
liwei1dao
935423bf0b 上传任务代码 2023-05-30 13:49:39 +08:00
7fb6fd8432 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 11:57:50 +08:00
24fafd65ec 交付校验修改 2023-05-30 11:57:20 +08:00
2a89f2800b Rtype160 2023-05-30 11:55:49 +08:00
e377d6f35a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 11:26:30 +08:00
8558bb682d Rtype57 Rtype54 重复 2023-05-30 11:26:27 +08:00
b8bc199f37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 11:03:55 +08:00
900ee8c362 任务通知条件校验 2023-05-30 11:03:45 +08:00
05140ef22c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 10:53:38 +08:00
778ca8879f 统计类型任务 2023-05-30 10:53:34 +08:00
liwei1dao
166a0c4ddc 上传事件同步通知 2023-05-29 22:03:13 +08:00
liwei1dao
9a96a796c8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 22:02:04 +08:00
liwei1dao
5ef5164624 上传任务错误代码 2023-05-29 22:01:47 +08:00
c8ef9eb4ec 装备打造 2023-05-29 21:58:01 +08:00
737d93f9c4 英雄送礼物问题修复 2023-05-29 21:51:10 +08:00
liwei1dao
c753d2fc90 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 21:21:22 +08:00
liwei1dao
9ee8823cb3 上传任务统计代码 2023-05-29 21:21:10 +08:00
85110dc808 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 20:10:49 +08:00
923cffe19d 世界任务战斗完成 2023-05-29 20:10:30 +08:00
liwei1dao
7a0a63377b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 19:45:50 +08:00
liwei1dao
8f0dba9fcd 上传任务修复代码 2023-05-29 19:45:39 +08:00
fd9173aa7b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 19:39:41 +08:00
fa1dec7514 错误码返回 2023-05-29 19:39:31 +08:00
7004aa13a4 处理err 2023-05-29 18:14:36 +08:00
53387bbd0b 更新任务接口 2023-05-29 18:12:08 +08:00
b3e16d641e 更改module命名 2023-05-29 18:12:08 +08:00
392c7d3ecf 世界任务通知事件 2023-05-29 18:12:08 +08:00
liwei1dao
82220d8ed1 同步代码 2023-05-29 18:02:10 +08:00
liwei1dao
363dcd530f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 17:51:01 +08:00
liwei1dao
1318e14db0 上传任务代码调整 2023-05-29 17:50:51 +08:00
fb5ab9f073 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 17:35:32 +08:00
a4d0f967df 错误码整合 2023-05-29 17:23:53 +08:00
liwei1dao
0bde395d6a 上传新埋点接口 2023-05-29 17:16:52 +08:00
liwei1dao
1a2d39eaec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 16:22:50 +08:00
liwei1dao
8ed57d862c 上传埋点中心 2023-05-29 16:22:06 +08:00
4dcfa9593d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 16:14:29 +08:00
afcbd2c766 update worldtask gm 2023-05-29 16:14:21 +08:00
liwei1dao
f4a376ad10 上传配置同步 2023-05-29 15:46:44 +08:00
982697ea1c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 15:23:52 +08:00
e1e364f9c2 bingo worldtask 2023-05-29 15:23:48 +08:00
liwei1dao
0ae9600577 同步配置表和协议机制 2023-05-29 14:49:52 +08:00
b156e9d4f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 14:38:44 +08:00
847fe86ea7 移出不用的模块 添加新接口 2023-05-29 14:38:41 +08:00
0c0615b756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 10:47:19 +08:00
edb52d8be2 优化任务完成后方法调用 2023-05-29 10:47:10 +08:00
liwei1dao
863227d5a6 上传代码 2023-05-26 21:40:22 +08:00
d0576acabf 接取返回已完成条件 2023-05-26 21:22:58 +08:00
liwei1dao
84580a242d 上传代码 2023-05-26 21:21:25 +08:00
liwei1dao
f5aad7f0bd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 20:29:15 +08:00
liwei1dao
c991176089 上传任务修改 2023-05-26 20:29:08 +08:00
ac66175afd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 20:22:55 +08:00
69d1b28953 类型为2 的图鉴 2023-05-26 20:22:46 +08:00
liwei1dao
4b23e35bea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 19:14:23 +08:00
liwei1dao
a2dfecd664 上传旧时光任务判断 2023-05-26 19:14:16 +08:00
e232fbb71d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 18:59:11 +08:00
0c04eb6694 Rtype187 2023-05-26 18:59:01 +08:00
a85aac429a 获得指定材料任务 2023-05-26 18:58:37 +08:00
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