Commit Graph

2877 Commits

Author SHA1 Message Date
338c1d9a4e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 15:48:59 +08:00
liwei1dao
28eb5a4022 上传练功房代码 2023-02-28 15:02:30 +08:00
296da0a188 错误码 2023-02-28 11:30:07 +08:00
c66346493c Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 11:29:55 +08:00
63d25e17ba 英雄注册接口参数调整增加判断逻辑 2023-02-28 11:26:58 +08:00
liwei1dao
c2734cac73 上传练功代码 2023-02-28 11:22:38 +08:00
liwei1dao
a8e694bd9b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-28 11:10:44 +08:00
liwei1dao
ae381980a3 上传教习登记 2023-02-28 11:06:54 +08:00
db211dfab2 英雄武馆注册接口 2023-02-28 10:51:55 +08:00
liwei1dao
f1dfd0ba3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-27 10:21:26 +08:00
liwei1dao
21677da329 上传接口代码优化 2023-02-27 10:21:11 +08:00
5e354c6bd6 报错处理 2023-02-24 20:31:30 +08:00
593af9dbfe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 20:24:08 +08:00
783063f8e2 图纸熟练度初始1级 2023-02-24 20:24:02 +08:00
liwei1dao
dea631420b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 18:55:17 +08:00
liwei1dao
ffd74c23f6 上传熊猫 2023-02-24 18:55:03 +08:00
f4ec14b472 派遣 2023-02-24 18:29:46 +08:00
39f463ff2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 17:43:23 +08:00
4d810402d9 领奖数据返回 2023-02-24 17:43:18 +08:00
liwei1dao
dc497a413a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 17:22:25 +08:00
liwei1dao
4209e202c1 练功计算收益 2023-02-24 17:22:12 +08:00
a9f41b7f6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 16:27:01 +08:00
d9fa0573a1 武馆图鉴 2023-02-24 16:26:56 +08:00
liwei1dao
30d28278e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 13:58:49 +08:00
liwei1dao
520cc3b4e9 战斗 全局buff 添加 2023-02-24 13:58:34 +08:00
45d199b682 参数错误 2023-02-24 13:44:16 +08:00
d210e54fc0 工具台升级 条件补充 2023-02-24 11:48:24 +08:00
d63c04cfe0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 10:49:18 +08:00
dd9e3345ee 武馆图鉴激活 2023-02-24 10:48:49 +08:00
liwei1dao
ad0ea31344 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 10:25:52 +08:00
liwei1dao
5064cc1b7f 上传每日一健和练功房代码 2023-02-24 10:25:36 +08:00
3387fce2f7 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-24 09:46:13 +08:00
3f464ddd94 武馆图鉴 2023-02-23 19:07:10 +08:00
liwei1dao
7ceb1fa508 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 18:32:59 +08:00
liwei1dao
b4b4859458 上传新物管和每日一练 2023-02-23 18:32:45 +08:00
beceeea318 副本支持动态配置 2023-02-23 16:35:37 +08:00
a99dfb6bc9 武馆图鉴 2023-02-23 15:38:32 +08:00
abfeeef0ad 字段优化 2023-02-23 15:03:27 +08:00
e1146656a5 初始技能配置 2023-02-23 14:44:23 +08:00
18538be012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 14:16:41 +08:00
ed97958604 装备品质获取 2023-02-23 14:16:36 +08:00
a1e06f4687 添加派遣模块 2023-02-23 11:40:02 +08:00
liwei1dao
645a4158ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-23 10:21:13 +08:00
liwei1dao
eec1b9cd4b 上传pb协议整理 2023-02-23 10:20:51 +08:00
46d5d3b3fd 异常处理 防止不消耗该道具 但是技能做了该道具的减免 2023-02-23 09:35:54 +08:00
bdd057692f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-02-22 19:14:38 +08:00
e556db1c40 图鉴资源类型发放 2023-02-22 19:14:31 +08:00
liwei1dao
8090e7bc84 上传练功房系统 2023-02-22 19:02:42 +08:00
liwei1dao
7f35654f72 上传每日一健身模块初始化 2023-02-22 18:56:00 +08:00
liwei1dao
25d8e8bb72 修改心跳逻辑 2023-02-22 18:45:22 +08:00
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