Commit Graph

3920 Commits

Author SHA1 Message Date
liwei1dao
6983411410 上传分解合成代码补充 2023-06-08 09:51:26 +08:00
4c82ab7028 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 19:58:35 +08:00
ede298e3ed 更新旧时光关卡 2023-06-07 19:58:28 +08:00
liwei1dao
7779fa6bb2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 19:20:54 +08:00
liwei1dao
8f4526f7e4 上传代码 2023-06-07 19:20:38 +08:00
2f34d17669 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 18:20:37 +08:00
2459c429c5 配置校验 2023-06-07 18:20:31 +08:00
liwei1dao
f085ffb5a1 上传装备修改 2023-06-07 17:55:58 +08:00
liwei1dao
48255abe2b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 16:56:50 +08:00
liwei1dao
c6b647e51c 上传装备品质字段 2023-06-07 16:56:44 +08:00
acaed92bc5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 14:38:59 +08:00
7b48e25978 gm 一键增加教习资源 2023-06-07 14:38:55 +08:00
a60b77f2a9 启动校验配置文件 2023-06-07 11:25:29 +08:00
1b2e96a0c1 加错误码 2023-06-07 10:17:30 +08:00
e8744d1b76 优化 2023-06-06 21:28:09 +08:00
695e862bff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:47:51 +08:00
9c056126f2 获取英雄数据 2023-06-06 17:47:42 +08:00
851568b29b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:43:33 +08:00
9dd133e6ce errorcode 2023-06-06 17:43:22 +08:00
09c9538fc7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:39:14 +08:00
a54b5f25e8 189 任务埋点 进行一次定制打造 2023-06-06 17:39:05 +08:00
a5c6d42af7 更新公会任务进度 2023-06-06 17:25:11 +08:00
438f6cb55b 公会任务进度、公告字数限制 2023-06-06 17:25:10 +08:00
67f0f496d1 23167 申请校验问题 2023-06-06 17:25:10 +08:00
52451919ec update 2023-06-06 17:22:09 +08:00
4629b13af1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:16:18 +08:00
f578c50043 代码整理 2023-06-06 17:16:14 +08:00
liwei1dao
12315a53c7 上传埋点校验查询接口跨服使用优化 2023-06-06 17:08:59 +08:00
liwei1dao
559b96b287 修复战斗创建代码 2023-06-06 16:52:26 +08:00
e6a56d5563 update 2023-06-06 15:48:53 +08:00
9260eef2dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 15:19:30 +08:00
fa55fab6b0 opnecond 2023-06-06 15:19:13 +08:00
b6ab5221ed rdtask errdata 2023-06-06 15:16:50 +08:00
90e6c7a6b5 sys errdata 2023-06-06 15:15:31 +08:00
125f4b30f7 reputation errdata 2023-06-06 15:14:03 +08:00
06b5855745 linestory errdata 2023-06-06 15:12:20 +08:00
015c649c04 growtask errdata 2023-06-06 15:10:55 +08:00
905a40f1cb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 15:08:16 +08:00
506371da7e 结局冲突 2023-06-06 15:08:01 +08:00
ee8c3927cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 15:05:41 +08:00
a275e970cf friend errdata 2023-06-06 15:05:31 +08:00
a7699d8a87 update 2023-06-06 15:00:05 +08:00
c3b4c4c12a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 14:58:24 +08:00
be74d2b98b update 2023-06-06 14:58:07 +08:00
3d00711bd5 dispatch errordata 2023-06-06 14:44:52 +08:00
8d51010159 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 14:37:02 +08:00
355c63a42e 公会errordata 2023-06-06 14:36:57 +08:00
liwei1dao
a690762889 上传代码规范调整 2023-06-06 14:13:54 +08:00
liwei1dao
0310fe0676 上传代码规范化调整 2023-06-06 13:55:33 +08:00
8483f6b17d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 13:46:38 +08:00
04a478e3a9 errdata 对象返回 2023-06-06 13:46:30 +08:00
6eb2a1b45e user errdata修改 2023-06-06 11:37:05 +08:00
liwei1dao
42becbca4e 批量调整代码规范 2023-06-06 11:08:14 +08:00
210813d7f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 11:02:58 +08:00
f246a19a3c update 2023-06-06 11:02:47 +08:00
290484c3af errorcode 2023-06-06 11:01:50 +08:00
a649050155 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:33:55 +08:00
d446065b0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:33:46 +08:00
34698ddc60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:27:07 +08:00
e5eb0d5b19 updata 2023-06-06 10:26:56 +08:00
liwei1dao
d7efa47ab4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:26:23 +08:00
liwei1dao
82bf9f6d26 上传接口调整 2023-06-06 10:26:18 +08:00
1fe4cd65a8 修改ErrorData 2023-06-06 10:16:59 +08:00
047ab5fb9d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:13:09 +08:00
9d81c8b703 update 2023-06-06 10:11:54 +08:00
liwei1dao
9c0eb14e76 上传代码同步 2023-06-06 10:11:23 +08:00
885b4bbb50 代码整理 2023-06-06 09:56:12 +08:00
liwei1dao
1a2c3bed0b 上传代码规范调整 2023-06-06 09:52:44 +08:00
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