Commit Graph

3902 Commits

Author SHA1 Message Date
liwei1dao
91b99e07ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-05 20:04:51 +08:00
liwei1dao
3199ee3b92 修改进机场积分 2023-06-05 20:04:45 +08:00
b61085b0e1 优化调整 2023-06-05 16:14:34 +08:00
20d3a6e4b6 周任务结构更新 2023-06-05 10:04:21 +08:00
11f54ef56b update task 2023-06-05 10:04:21 +08:00
8487a59623 update 周任务 2023-06-05 10:04:21 +08:00
6394be1065 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 22:08:31 +08:00
eaf2c07678 配置同步 2023-06-02 22:08:29 +08:00
liwei1dao
5934f9f5a3 上传用户皮肤修改头像替换同步问题 2023-06-02 21:29:37 +08:00
23cdd31fcf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 20:00:58 +08:00
db4fb9bcae 更改消息顺序 2023-06-02 20:00:50 +08:00
43769fc6fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 17:33:21 +08:00
73b734a6ee 移出捏脸 2023-06-02 17:33:15 +08:00
liwei1dao
cc8e3036ff 合成优化 2023-06-02 17:32:39 +08:00
liwei1dao
840861f5dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 11:50:12 +08:00
liwei1dao
df999ebbd3 上传道具代码 2023-06-02 11:49:44 +08:00
0a3033e8ed 修改接取时条件已完成但无需交付 2023-06-02 11:30:56 +08:00
liwei1dao
22f19839b6 上传代码 2023-06-01 20:51:40 +08:00
liwei1dao
544db8a3cf 上传代码 2023-06-01 18:53:08 +08:00
70aa49e386 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 18:07:02 +08:00
356a22a4c8 商队结算 2023-06-01 18:06:54 +08:00
liwei1dao
f51e3d366d 完善周日常任务 2023-06-01 18:06:39 +08:00
liwei1dao
a3b4fd5288 上传旧时光代码优化 2023-06-01 18:03:01 +08:00
liwei1dao
a70c3b8652 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 16:27:29 +08:00
liwei1dao
4c765eab8e 上传埋点中心代码 2023-06-01 16:27:23 +08:00
8d3acd80bd 消耗整合 2023-06-01 15:41:18 +08:00
01720f3128 update 2023-06-01 15:33:38 +08:00
c389cf463e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 15:32:49 +08:00
e17387c10f update 2023-06-01 15:32:43 +08:00
liwei1dao
22544c5df8 上传 2023-06-01 15:09:19 +08:00
8603bd6e76 更新任务接口调用 2023-06-01 14:59:06 +08:00
e1776f0966 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 14:56:40 +08:00
ab3528cd59 更新任务接口调用 2023-06-01 14:56:34 +08:00
liwei1dao
f6f77f32ff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 14:40:40 +08:00
liwei1dao
bd00553832 上传任务道具使用代码 2023-06-01 14:40:34 +08:00
d6bb445392 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 14:31:00 +08:00
3f606407d9 技能升级调整 2023-06-01 14:30:55 +08:00
4ce03856e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 13:57:14 +08:00
liwei1dao
7d3929305a 上传任务中心和旧时光优化 2023-06-01 13:56:41 +08:00
bf7aa00f74 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 10:31:26 +08:00
liwei1dao
6b88775848 优化埋点日志 2023-05-31 19:06:36 +08:00
liwei1dao
db0a7225fa 优化日志代码 2023-05-31 19:04:37 +08:00
30c82b64ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-31 18:37:00 +08:00
2258793716 天赋学习等级校验 2023-05-31 18:36:51 +08:00
4c1033ac04 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-31 18:35:29 +08:00
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