Commit Graph

2877 Commits

Author SHA1 Message Date
liwei1dao
f1b11de7f2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 18:42:42 +08:00
liwei1dao
72fc087832 上传心跳激活代码 2023-02-22 18:42:28 +08:00
de5429ca0e 熟练度等级降低炉温消耗 效果为千分比 2023-02-22 18:05:52 +08:00
3092c8614f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 17:51:53 +08:00
d2c10c8253 打造装备监听图鉴数据变化 2023-02-22 17:51:45 +08:00
91f8e1b039 更新切磋结束时间 2023-02-22 17:50:42 +08:00
8a507cda02 代码优化 2023-02-22 17:26:06 +08:00
8d8d2e3c3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 16:50:31 +08:00
8dc4d90270 图鉴积分更新 2023-02-22 16:50:08 +08:00
5bbc0dcb15 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 14:51:22 +08:00
25ea76c5bc 图鉴任务 2023-02-22 14:50:49 +08:00
dfcf822038 初始炉温 2023-02-22 14:44:06 +08:00
b617e2815a 图鉴更新 激活等操作 2023-02-22 14:15:28 +08:00
d90e938959 配置更新 2023-02-22 12:08:44 +08:00
a498860214 定制装备 提升史诗品质装备概率 2023-02-22 11:34:57 +08:00
2b4abbac81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 11:31:52 +08:00
06cad71be0 图鉴更新校验 2023-02-22 11:30:54 +08:00
liwei1dao
d2a3af4dac 上传装备初始化动态权重参数添加 2023-02-22 11:03:44 +08:00
liwei1dao
8e38fa0b62 上传队长技校验接口 2023-02-21 18:49:13 +08:00
9c2eb0b4e6 配置解析 2023-02-21 18:48:21 +08:00
e60eccfd51 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 17:48:52 +08:00
98cef3dd19 对接获取指定套装 指定等级的装备 2023-02-21 17:46:20 +08:00
2dd31398a3 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 17:43:58 +08:00
17af1fddc6 定制打造装备 2023-02-21 17:42:35 +08:00
f641e9753e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 17:13:30 +08:00
d70cd3a7c6 更新smithy_trade字段类型 2023-02-21 16:46:08 +08:00
liwei1dao
c127a7790d 上传装备随机套装 2023-02-21 16:45:43 +08:00
0be6315357 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 14:53:05 +08:00
liwei1dao
9c0ff3c9ad 上传队长技校验接口 2023-02-21 14:52:14 +08:00
1432d36049 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-21 14:51:05 +08:00
d6a8833394 获取指定装备接口 2023-02-21 14:50:06 +08:00
liwei1dao
7e6640f003 上传队长技校验代码 2023-02-21 14:39:20 +08:00
45e97a5927 图鉴奖励领取 2023-02-21 11:05:39 +08:00
cabae82815 图鉴激活检测 2023-02-20 19:10:21 +08:00
760de42723 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 18:36:05 +08:00
01b3499a3d 铁匠铺图鉴相关 2023-02-20 18:34:04 +08:00
91f883e47e 对接装备 2023-02-20 16:24:28 +08:00
b536a756ae 添加熔岩 2023-02-20 15:40:05 +08:00
bc19f93618 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 14:41:31 +08:00
31dc53c6d3 炉子升温 2023-02-20 14:40:40 +08:00
liwei1dao
87315a6dc9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 11:58:28 +08:00
liwei1dao
e7712e6e88 上传铁匠铺专用接口 2023-02-20 11:58:13 +08:00
e7bce2e742 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 10:39:55 +08:00
baae7169e4 激活套装ID 2023-02-20 10:35:51 +08:00
liwei1dao
7e4dd0575d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-20 10:32:59 +08:00
liwei1dao
11691051ff 上传装备获取可操作列表 2023-02-20 10:32:29 +08:00
53b2cca605 购买挑战卷配置 2023-02-17 19:33:10 +08:00
3de993de65 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 19:23:55 +08:00
e9d658a441 好友写错返回 2023-02-17 19:23:48 +08:00
7c9bb00198 update 2023-02-17 18:30:26 +08:00
524963ef0b update 2023-02-17 18:30:26 +08:00
15df32ec6d update 2023-02-17 18:30:26 +08:00
61daf826cc update 2023-02-17 16:53:51 +08:00
4de830806d 工具台技能数据加成 2023-02-17 16:35:45 +08:00
b22acf2f35 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 12:07:31 +08:00
5ae69ab050 解析报错 2023-02-17 12:07:13 +08:00
817ecef637 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 11:58:48 +08:00
d2c8d44823 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 11:58:40 +08:00
97f426ff35 工具台 获取打造两件装备的接口 2023-02-17 11:58:38 +08:00
liwei1dao
5ccab5bc12 上传装备回收接口业务逻辑代码 2023-02-17 10:46:09 +08:00
liwei1dao
f4dd29bf2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-17 10:32:11 +08:00
liwei1dao
42c5e77294 上传装备回收接口 2023-02-17 10:32:04 +08:00
8b2bfca06d 消耗配置调整 2023-02-17 10:04:14 +08:00
ada84d90e2 错误码 2023-02-16 19:23:47 +08:00
3f1aa5ab1a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-16 19:20:36 +08:00
6f982c0dd3 工具台升级 2023-02-16 19:19:15 +08:00
99587b984e 铁匠铺装备交易 2023-02-16 19:15:26 +08:00
045209ace3 炉子升级 2023-02-16 18:20:56 +08:00
dc5c2729cd 更新铁匠铺协议 2023-02-16 15:45:29 +08:00
92fd5e34cb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-16 15:39:27 +08:00
ef74f429ca 打造装备 2023-02-16 15:37:59 +08:00
f72724b090 配置+ 协议 2023-02-16 11:21:03 +08:00
liwei
2a689eb1c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-16 11:01:10 +08:00
3102a7729f 铁匠图 2023-02-15 19:28:14 +08:00
liwei1dao
6655e8556f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 18:46:15 +08:00
liwei1dao
81552f2eff 上传pvp代码 2023-02-14 18:37:10 +08:00
992237568f api补充 2023-02-14 18:27:25 +08:00
311f45c351 update trade 2023-02-14 17:25:14 +08:00
liwei1dao
2d1838174e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 17:03:57 +08:00
liwei1dao
80688110a5 实时pvp断线重连 2023-02-14 17:03:40 +08:00
01476853e0 处理切磋pvp失败情况 2023-02-14 14:53:46 +08:00
4d69b0c3dc api 上传 2023-02-14 14:17:49 +08:00
b016f03ffb update 2023-02-14 11:46:26 +08:00
1a5c36ff72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 11:42:33 +08:00
5711441b48 update 2023-02-14 11:42:29 +08:00
4936f3be40 改包名 2023-02-14 11:36:22 +08:00
liwei1dao
f7f68c3120 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 11:29:11 +08:00
liwei1dao
7e0f6ea21a 上传pvp重连机制 2023-02-14 11:29:01 +08:00
733e432f3c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-14 10:44:33 +08:00
3c343fb999 铁匠铺 2023-02-14 10:43:43 +08:00
1783ca780b 新增铁匠铺模块 2023-02-14 10:22:18 +08:00
liwei1dao
3a13fb79be 上传pvp 倒计时实现 2023-02-13 16:06:43 +08:00
liwei1dao
6a968e9c4d 上传api 修复 2023-02-13 15:18:18 +08:00
liwei1dao
6e42fb6a7f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-13 14:18:45 +08:00
b232502399 update 2023-02-13 14:16:39 +08:00
liwei1dao
b0f39590d1 上传pvp代码 2023-02-13 14:16:25 +08:00
liwei1dao
a787e1f29d 上传战斗匹配代码 2023-02-11 00:09:10 +08:00
liwei1dao
602e1a7a82 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-10 19:30:49 +08:00
liwei1dao
423e11387c 上传pvp代码 2023-02-10 19:30:29 +08:00
4c19b26964 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-10 19:26:02 +08:00
ffcfdea877 英雄优化 2023-02-10 19:25:55 +08:00
f63b9404d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-10 19:24:02 +08:00
c0b181b1dc add log 2023-02-10 19:23:53 +08:00
liwei1dao
a433192d2f 上传pvp战斗代码 2023-02-10 19:05:43 +08:00
618a3fae6b update log 2023-02-10 17:40:37 +08:00
20c964dd5f 切磋完成通知接口 2023-02-10 15:47:56 +08:00
802490657d 删除日志 2023-02-10 14:56:33 +08:00
d54401a3fe update 2023-02-10 14:44:09 +08:00
c9869d646c update 2023-02-10 12:13:23 +08:00
cd8ee73e90 update 2023-02-10 12:00:32 +08:00
08391e2032 update 2023-02-10 11:56:34 +08:00
19e8175395 update 2023-02-10 11:56:22 +08:00
6a3732a715 切磋判断 2023-02-10 11:48:13 +08:00
1eee1499c3 修改切磋状态 2023-02-10 11:27:21 +08:00
fa0498c7a6 修改协议名 2023-02-10 10:08:38 +08:00
bd517119b9 好友切磋校验 2023-02-10 10:08:27 +08:00
eb70ef9758 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 17:17:57 +08:00
e3997013fa 合并rtask 2023-02-09 17:17:46 +08:00
c877b55ced Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 14:49:56 +08:00
cb94f203a6 抽卡权重 2023-02-09 14:49:52 +08:00
05cfdd58b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 11:03:53 +08:00
e588b316a5 add log 2023-02-09 11:03:43 +08:00
9410119d94 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-09 10:23:28 +08:00
37b691f81f 共鸣通用天赋点配置调整 2023-02-09 10:23:18 +08:00
885993f549 好友切磋pvp 2023-02-08 18:52:07 +08:00
liwei1dao
49915ec269 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-08 18:45:50 +08:00
liwei1dao
7487a66eb6 上传战斗模块代码 2023-02-08 18:45:36 +08:00
6261d32f8a update 2023-02-08 18:33:04 +08:00
9e9ac61de5 英雄堆叠代码注释 2023-02-08 18:32:56 +08:00
6470e3434f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-08 18:24:18 +08:00
68cbc5c5e3 抽卡规则优化+ 获得英雄转碎片不广播+概率调整 2023-02-08 18:22:11 +08:00
836909706c 好友切磋 2023-02-08 18:22:04 +08:00
a9743c6169 通知前端重复获得英雄分解 2023-02-08 15:32:03 +08:00
de4013d7e9 通知客户端 这个英雄是重复获得的 2023-02-08 15:31:35 +08:00
e25936c6af add log 2023-02-08 14:35:56 +08:00
b0b9f0865c add log 2023-02-08 14:13:35 +08:00
e519ad0bd2 gm 发装备 2023-02-08 14:03:29 +08:00
8b24855232 GM扩展 2023-02-08 12:01:52 +08:00
ebbc32e297 星阵图属性加成 2023-02-08 10:40:47 +08:00
b2d5036086 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-07 18:51:07 +08:00
liwei1dao
30239136b6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-07 18:47:50 +08:00
liwei1dao
dab4732a11 上传pvp业务开发代码 2023-02-07 18:47:10 +08:00
66c5f1788d 天赋学习 道具不够的情况可使用其他道具替代 2023-02-07 18:25:01 +08:00
de3315de63 该英雄重复获取后所获得的升星道具 上限转换处理 2023-02-07 17:56:47 +08:00
14d69fdd11 扩展玩家属性 2023-02-07 16:32:35 +08:00
d9a853ba33 DB 数据优化 2023-02-07 15:02:56 +08:00
353c4d0585 抽卡返回 碎片等资源 2023-02-07 14:59:46 +08:00
64c928112b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-06 16:36:09 +08:00
1086ab6eec map 初始化 2023-02-06 16:35:34 +08:00
3f9eace9d8 配置锁 2023-02-06 16:30:20 +08:00
904e59475d 英雄相关 2023-02-06 15:49:47 +08:00
e31e0d1ae8 修改功能开启条件判断 2023-02-06 15:11:20 +08:00
79e4230dcd 协议修改配置同步 2023-02-06 14:38:36 +08:00
f87402adc5 gm 创建特殊英雄 获取英雄最大星级 2023-02-06 14:07:14 +08:00
59f978937a 资源校验整合 2023-02-06 13:39:13 +08:00
d01d24912a 英雄升级 2023-02-06 11:54:05 +08:00
b79700e960 merge 2023-02-06 11:12:34 +08:00
aa91ee0b32 抽卡新规则 2023-02-03 15:36:39 +08:00
4701ab2fb7 主线任务埋点 2023-02-02 18:15:02 +08:00
cd17d09bef Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-02 16:57:57 +08:00
5581657283 扩展字段优化 2023-02-02 16:57:09 +08:00
ced2437ae4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-02 10:42:57 +08:00
cdd3db85b2 开放任务触发协议 2023-02-02 10:42:49 +08:00
eb7c3b7c60 创建特殊英雄时校验是否有重复英雄 2023-02-02 09:55:37 +08:00
949037c4b9 不再写图鉴数据,可通过英雄列表数据获取 2023-02-01 18:26:47 +08:00
4f6aafdcde 英雄转换碎片 2023-02-01 17:04:27 +08:00
16388621e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-01 16:23:09 +08:00
4a3296a4db 多余英雄转碎片处理 2023-02-01 16:23:06 +08:00
liwei1dao
44efa1f5d9 上传战斗角色数据结构调整 2023-02-01 16:10:13 +08:00
liwei1dao
e9238d52b0 上传战斗角色boosid 2023-02-01 15:59:13 +08:00
liwei1dao
cb5b4458f7 上传实时pvp消息头改动 2023-02-01 15:45:04 +08:00
2e73a05c68 trace 性能分析 2023-02-01 10:30:02 +08:00
d29c62f0ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-31 18:33:51 +08:00
336f252f62 英雄属性测试优化 2023-01-31 18:33:48 +08:00
f13707e51b 加索引 2023-01-31 18:19:45 +08:00
liwei1dao
69957984af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-31 17:07:03 +08:00
liwei1dao
3c8acf0392 上传月子秘境异常修复 2023-01-31 17:06:45 +08:00
a483ba3cd7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-31 15:27:16 +08:00
1a55e9119b update 2023-01-31 15:27:09 +08:00
0ba8c286ed GM 修改主线扩展数据 2023-01-31 15:22:24 +08:00
db6fb51a8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-31 15:05:04 +08:00
7d990f06c5 功能开发条件支持多条件 2023-01-31 15:04:58 +08:00
b0b3e3444b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-31 14:32:03 +08:00
dd7b8379f5 扩展数据初始化 2023-01-31 14:32:00 +08:00
liwei1dao
f532b7d254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-31 14:25:16 +08:00
liwei1dao
94a9cf9315 补充日志代码 2023-01-31 14:25:01 +08:00
05d2d6de84 统计主线进度 2023-01-31 12:01:09 +08:00
8bef7ca2dd 遗漏的索引 2023-01-31 10:44:48 +08:00
9077626a90 创建索引 2023-01-30 18:11:30 +08:00
baa0517b64 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-30 18:01:45 +08:00
e1a312beeb 心跳设置断线时间戳为服务器偏移时间 2023-01-30 18:01:41 +08:00
liwei1dao
cc0d94ea6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-30 17:59:23 +08:00
liwei1dao
5f77fc4a81 上传跨服平台对接 2023-01-30 17:59:03 +08:00
6b4aa7e8b5 临时屏蔽 2023-01-30 17:45:38 +08:00
d27ece2da0 更改设置心跳断线时机 2023-01-30 17:31:52 +08:00
0978999824 错误日志 2023-01-30 17:27:14 +08:00
193d29d45d serverdata 2023-01-30 16:28:57 +08:00
aa9ed96811 数据校验BUG 2023-01-30 15:04:20 +08:00
a58102ab4c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-30 11:53:00 +08:00
1f20a523a5 加日志 2023-01-30 11:52:53 +08:00