Commit Graph

4207 Commits

Author SHA1 Message Date
a766977fbd 主线关卡领取奖励红点推送 2023-06-15 20:54:13 +08:00
402f931b51 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 20:26:10 +08:00
221c9844db 好友红点 2023-06-15 20:25:46 +08:00
acfb281523 羁绊红点注册 2023-06-15 20:24:34 +08:00
c5d64aebf1 err对象返回 2023-06-15 19:57:44 +08:00
3b9f8f85a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 18:47:10 +08:00
fdcd38e622 红点 2023-06-15 18:47:04 +08:00
f57ec9d2fd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 17:42:32 +08:00
0d621cd9ae 任务中多条件校验 2023-06-15 17:42:25 +08:00
liwei1dao
ea2bafc2b2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 17:33:30 +08:00
liwei1dao
a0fb371cda 上传装备强化统计修复 2023-06-15 17:33:21 +08:00
edc845ca0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 16:24:40 +08:00
2e31065499 羁绊红点 2023-06-15 16:24:30 +08:00
liwei1dao
e42fa2b91f 上传任务41和42 的数据插入机制 2023-06-15 15:41:24 +08:00
liwei1dao
56c0671fd2 上传竞技场红点 2023-06-15 15:15:40 +08:00
5091d2c9b9 Rtype51 2023-06-15 13:47:44 +08:00
309690ca97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 13:44:42 +08:00
cd3d246b48 铁匠铺下单n个装备 买点 2023-06-15 13:44:33 +08:00
liwei1dao
9449cdcb04 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:59:19 +08:00
liwei1dao
e44cde1b9b 上传红点推送接口 2023-06-15 11:59:10 +08:00
cd3e4eb14e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:40:28 +08:00
ebcc7ec57f 修复铁匠铺任务进度 2023-06-15 11:40:21 +08:00
liwei1dao
bfbb7b69a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:34:41 +08:00
liwei1dao
794fe30c21 上传星作图数据库修复 2023-06-15 11:34:35 +08:00
cb1c32f356 db创建索引 2023-06-15 11:30:51 +08:00
dca0850ff3 英雄 天赋增加英雄等级校验 2023-06-15 11:10:16 +08:00
72e9f12905 铁匠铺手册台收藏家红点 2023-06-15 09:45:49 +08:00
liwei1dao
d7c80fcde9 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 20:53:48 +08:00
liwei1dao
6cd42dc9f1 上传代码 2023-06-14 20:53:05 +08:00
fb970cc355 battle errordata 2023-06-14 18:45:29 +08:00
2892a2d38f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 18:12:38 +08:00
76e670c350 删除测试数据 2023-06-14 18:12:32 +08:00
f44e853bbc gm 主线调整 2023-06-14 18:11:10 +08:00
f41a8d0ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 18:06:41 +08:00
1ba179f675 条件状态判断 2023-06-14 18:06:37 +08:00
liwei1dao
f0dbc0c991 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 17:55:58 +08:00
liwei1dao
a7a056d6b7 上传支付配置同步 2023-06-14 17:55:19 +08:00
4f2660fabb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 16:36:19 +08:00
ba4dfa300f 更改协议名 2023-06-14 16:36:10 +08:00
liwei1dao
609c5db7dd 上传配置代码 2023-06-14 16:07:54 +08:00
liwei1dao
e39d88ad01 上传定制装备未入库bug 2023-06-14 15:46:19 +08:00
c03a1c3873 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:24:08 +08:00
1bb52c4df9 update 2023-06-14 15:24:02 +08:00
liwei1dao
d89d09a182 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:16:51 +08:00
liwei1dao
589dc28e25 上传代码 2023-06-14 15:16:43 +08:00
cca1a56cdb Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:11:51 +08:00
a5c6d0d045 铁匠铺红点信息 2023-06-14 15:10:49 +08:00
liwei1dao
953cb783db 上传后台消息推送 2023-06-14 11:20:23 +08:00
b50497a9e8 修改推送顺序 2023-06-14 10:35:35 +08:00
5cdac676ad update config 2023-06-14 10:08:34 +08:00
liwei1dao
3814c6fd32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 09:13:53 +08:00
liwei1dao
24067fdc01 上传错误码修复异常 2023-06-14 09:13:47 +08:00
108b59823c 收到战报数据清空预扣体力值 2023-06-13 15:37:28 +08:00
81b2bf3b6c 主线体力消耗 2023-06-13 15:19:32 +08:00
1c68fe0051 gm 主线跳过修复 2023-06-13 14:27:11 +08:00
34df1dbb35 优化 抽卡获得顺序问题 2023-06-13 12:27:42 +08:00
0f8384554b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 18:38:42 +08:00
bf6517b740 update测试api 2023-06-12 18:38:15 +08:00
9aa7f785f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 17:21:45 +08:00
2853b38c97 英雄数据结构优化 2023-06-12 17:21:40 +08:00
liwei1dao
460a614dfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 17:05:18 +08:00
liwei1dao
5bbf812032 上传代码 2023-06-12 17:05:13 +08:00
liwei1dao
4d4ab2f40c 上传装备强化奔溃修复 2023-06-12 16:58:30 +08:00
1b205d6486 公告字符长度校验 2023-06-12 16:50:13 +08:00
liwei1dao
ee0bc82fbd 修复升级漏洞 2023-06-09 22:14:29 +08:00
liwei1dao
4bb2cd7219 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 22:11:29 +08:00
liwei1dao
12d66a7ac7 上传代码 2023-06-09 22:11:15 +08:00
44d2364bf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 21:55:13 +08:00
73b1ac3cb6 update 2023-06-09 21:55:06 +08:00
b105a3ff13 code 1030 2023-06-09 21:53:44 +08:00
f44d0af84c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 20:46:06 +08:00
408a1bceb7 图鉴批处理优化 2023-06-09 20:45:50 +08:00
liwei1dao
18a9c8ab66 上传武馆npc踢馆条件管理 2023-06-09 18:21:36 +08:00
03fd5d2018 功能开启条件校验接口 2023-06-09 18:15:12 +08:00
65b97a090e 接口调整 2023-06-09 18:14:06 +08:00
08a8764fe6 移出测试代码 2023-06-09 18:01:00 +08:00
9272f7d210 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 17:59:46 +08:00
0597d946a2 查询opencond 配置 2023-06-09 17:59:37 +08:00
2dc37245e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 17:43:56 +08:00
11caf9c623 铁匠铺任务进度 2023-06-09 17:43:41 +08:00
a4c58224e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 16:48:42 +08:00
e8c3d27a84 商队等级 2023-06-09 16:48:33 +08:00
liwei1dao
db9a6687a1 修复装备强化 2023-06-09 16:09:22 +08:00
liwei1dao
f1908b1ef0 上传竞技场连胜判断 2023-06-09 14:10:38 +08:00
d439182012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 13:53:53 +08:00
dcef2d09e3 修改参数长度判断 2023-06-09 13:53:38 +08:00
liwei1dao
4c633216c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 13:50:39 +08:00
liwei1dao
d593bd13c8 伤处装备套装机制改动 2023-06-09 13:50:26 +08:00
752ef2d4b1 gm 跳转功夫大师塔 2023-06-09 12:01:19 +08:00
1267ff1129 gm 调整vip 等级做校验 2023-06-09 11:20:31 +08:00
acfcdbd4b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 11:08:05 +08:00
4f0192d25f GM 解锁所有难度 2023-06-09 11:08:02 +08:00
9bb0d46e95 推送清理已完成的任务 2023-06-09 10:53:21 +08:00
liwei1dao
73ced03a17 上传装备产出随机 2023-06-08 22:02:56 +08:00
liwei1dao
50a630dc7a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 21:16:12 +08:00
liwei1dao
ecc590160c 上传装备埋点修复 2023-06-08 21:15:54 +08:00
ad279e82b6 图鉴检测 2023-06-08 21:10:06 +08:00
b023c7dd3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 20:54:26 +08:00
768dd1e304 err 2023-06-08 20:54:20 +08:00
liwei1dao
a1f3bf1ae2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 20:51:29 +08:00
liwei1dao
66dc7afd47 上传随机种子 2023-06-08 20:51:22 +08:00
3aea6bb3c8 修改worldtask gm 2023-06-08 20:38:54 +08:00
liwei1dao
0cbad2f4cb 优化任务激活接口 2023-06-08 18:47:08 +08:00
e88f98ca88 移出不要日志 2023-06-08 18:33:45 +08:00
6d50edeb45 图鉴id 查找 2023-06-08 17:44:00 +08:00
50f5108d23 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 16:30:44 +08:00
bd577e4219 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 16:29:27 +08:00
liwei1dao
3506ab4203 上传埋点代码 2023-06-08 16:29:25 +08:00
d487eee34e 铁匠铺获取图鉴信息 2023-06-08 16:29:20 +08:00
liwei1dao
44d965b9e6 上传埋点逻辑代码 2023-06-08 16:27:59 +08:00
057fa83752 注释随机周任务 2023-06-08 15:48:01 +08:00
00c07d4374 update接口参数 2023-06-08 15:48:01 +08:00
c9ae57c5bf update校验接口 2023-06-08 15:48:01 +08:00
e9a8793446 修改协议 2023-06-08 15:48:00 +08:00
e1f4ac61f2 修改accept协议 2023-06-08 15:48:00 +08:00
b64efd67e7 当前进行支持多任务 2023-06-08 15:48:00 +08:00
06e57e6650 支持当前有多任务并行 2023-06-08 15:47:59 +08:00
c5f69fd093 更新当前任务包含进度值 2023-06-08 15:47:59 +08:00
805ea699ed 世界任务进度 2023-06-08 15:47:57 +08:00
7644cb48ec errdata 2023-06-08 15:47:35 +08:00
bc2a0b8a43 更新当前任务包含进度值 2023-06-08 15:47:32 +08:00
liwei1dao
c5cf79f4b8 上传代码调整 2023-06-08 15:28:10 +08:00
47b59bd48d remove rdtask check 2023-06-08 15:21:00 +08:00
00c83158b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 15:11:57 +08:00
2f587ef3c3 精炼打造 2023-06-08 15:11:53 +08:00
liwei1dao
c11bfa0793 移除rtask 模块 2023-06-08 15:10:55 +08:00
liwei1dao
da9798df78 上传装备代码 2023-06-08 15:05:47 +08:00
liwei1dao
1d00476d2f 上传装备打造代码 2023-06-08 14:57:57 +08:00
liwei1dao
da9192d356 添加安全锁 2023-06-08 14:36:48 +08:00
liwei1dao
5de6a9f237 上传埋点代码 2023-06-08 14:34:33 +08:00
liwei1dao
8f12a6b70f 修复埋点异常bug 2023-06-08 14:28:39 +08:00
liwei1dao
5eade44a74 上传物品使用接口 2023-06-08 14:13:36 +08:00
liwei1dao
103ae988f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 13:53:50 +08:00
liwei1dao
dee39299e2 上传接口 2023-06-08 13:51:41 +08:00
e90822a523 获取资源失败 及时通知 2023-06-08 13:50:30 +08:00
9bb4a1e7ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 11:39:48 +08:00
3fe6c89068 连续自动战斗 自动使用体力药剂 2023-06-08 11:39:39 +08:00
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
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