Commit Graph

3199 Commits

Author SHA1 Message Date
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
24e4277d05 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 18:38:36 +08:00
da2b2d4ced 邮件上限检测 2023-01-29 18:37:40 +08:00
liwei1dao
689f6368cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 18:12:09 +08:00
liwei1dao
5b74551605 上传wocket 清理代码 2023-01-29 18:11:50 +08:00
8ef9e83b19 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 15:03:50 +08:00
2b425befab 功能列表校验 2023-01-29 15:03:17 +08:00
liwei1dao
b0d5a9b892 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 15:03:05 +08:00
liwei1dao
c7d421e421 优化心跳代码 2023-01-29 15:02:51 +08:00
04e7d02e10 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 14:37:00 +08:00
79466ec743 更新优化 2023-01-29 14:36:38 +08:00
e06c862ccd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 11:03:09 +08:00
liwei1dao
40648050c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 11:00:39 +08:00
liwei1dao
4546f5e34a 上传网关心跳协议 2023-01-29 11:00:20 +08:00
68687d5338 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 10:51:29 +08:00
815d6513a8 update 2023-01-29 10:51:23 +08:00
9d49e58a2e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-29 10:05:23 +08:00
acc098c441 GM 修改主线进度 2023-01-17 16:24:33 +08:00
1d2e7edd32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-17 12:39:50 +08:00
c8fcee8c35 配置解析 2023-01-17 12:39:45 +08:00
a6cd1233f6 更新好友推荐 2023-01-17 11:28:43 +08:00
b441c4b272 更新配置 2023-01-16 19:04:34 +08:00
afc3f2ccf0 updata guildtask 2023-01-16 19:04:34 +08:00
d87f822e2f 一些接口不提供对外使用方法 2023-01-16 10:27:15 +08:00
ee9c7c276d 优化积分任务领取 2023-01-15 17:01:20 +08:00
0ef628538b 去掉注释 2023-01-15 17:01:20 +08:00
1945c4db95 更新世界任务战斗奖励 2023-01-15 14:24:50 +08:00
a839bbcd3c 排行优化 2023-01-15 12:07:29 +08:00
15abc4208e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-14 22:34:19 +08:00
00e46fe1e9 panic 捕捉 2023-01-14 22:34:10 +08:00
liwei1dao
eafa106729 上传代码 2023-01-14 22:29:32 +08:00
liwei1dao
b882a2fbc5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-14 21:45:52 +08:00
liwei1dao
65723af072 上传测试代码 2023-01-14 21:45:27 +08:00
4ef1877a2e 加友情点case 2023-01-14 20:02:27 +08:00
64980cb107 update 2023-01-14 19:36:41 +08:00
6e744178c1 领奖初始化 2023-01-14 19:23:53 +08:00
a12aa4e77a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-14 19:00:42 +08:00
5e63f509b1 领奖配置读取 2023-01-14 19:00:30 +08:00
7113d791f6 改计时器配置 2023-01-14 18:47:14 +08:00
6373c1cf0c 公会boss优化 2023-01-14 18:47:14 +08:00
194aa30ccd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-14 14:34:32 +08:00
a25e943818 bingo 满英雄 属性没入库问题 2023-01-14 14:34:22 +08:00
d51d015f42 公会boss优化 2023-01-13 20:33:21 +08:00
6efdfa4fb1 战斗结束高星覆盖低星 2023-01-13 19:16:18 +08:00
624a53324d 星级判断 2023-01-13 18:55:04 +08:00
liwei1dao
662dec9882 处理装备挂在异常问题 2023-01-13 10:27:49 +08:00
liwei1dao
9a59cbb680 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-13 10:20:59 +08:00
liwei1dao
be53d80523 上传商店列表刷新问题 2023-01-13 10:20:45 +08:00
82e2e60043 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-12 19:48:04 +08:00
c495b5d5ed 怪物属性处理 不享受天赋属性加成 2023-01-12 18:25:26 +08:00
f1fad4f96e 更新atn命名 2023-01-12 18:10:24 +08:00
57cbdf884c 挑战券购买 2023-01-12 15:56:45 +08:00
4a935d8de0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-12 15:41:28 +08:00
cbaccff12a 门票消耗 从com移除,对应修改红点计算规则 2023-01-12 15:40:49 +08:00
liwei1dao
60ccd20504 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-12 15:28:46 +08:00
liwei1dao
84b5763e3a 上传配置文件改动 2023-01-12 15:28:25 +08:00
fc3ac03b99 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-12 15:08:29 +08:00
d7b0d07b06 消息分发读取 2023-01-12 15:08:07 +08:00
94e7197673 增加惊喜货物接口 2023-01-12 10:55:16 +08:00
418f434594 公会BOSS更新 2023-01-11 19:24:40 +08:00
12b9240d7a 公会BOSS战斗 2023-01-11 19:24:40 +08:00
70ab245740 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-11 19:15:18 +08:00
4078349cc9 订单优化+ 道具使用类型 2023-01-11 18:01:33 +08:00
liwei1dao
e92a8174b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-11 16:56:01 +08:00
liwei1dao
2575c7d53b 上传pvb代码 2023-01-11 16:55:41 +08:00
b9b4cb0909 美食城优化 2023-01-11 16:39:08 +08:00
ceef317391 配置读取修改 数据校验 2023-01-11 15:19:12 +08:00
9d1596b0ac 更新配置 2023-01-11 11:50:48 +08:00
3097b842d6 公会boss挑战 2023-01-11 11:50:47 +08:00
e1d2237b30 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-10 16:34:07 +08:00
c8d056c11e 日志修改 2023-01-10 16:33:44 +08:00
e388f4df99 我方队伍队列数据初始化时指定长度 2023-01-10 14:25:23 +08:00
5bcccf25d2 key 优化减少查询次数 2023-01-10 14:11:27 +08:00
824117c42f 公会boss协议 2023-01-10 11:21:50 +08:00
ebb47ea8d9 恢复时间返回 2023-01-09 19:59:03 +08:00
f8e1f5fa84 刷新挑战卷 2023-01-09 19:39:17 +08:00
66ece406ae Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-09 18:25:17 +08:00
5830ee5500 战斗门票消耗统一管理 2023-01-09 18:24:47 +08:00
liwei1dao
0e25bdec75 上传世界任务埋点 2023-01-09 18:13:03 +08:00
658eaa60d4 数据优化 2023-01-09 18:00:24 +08:00
liwei1dao
afe6de1540 战斗统一埋点处理 2023-01-09 17:44:39 +08:00
fcf7922c42 redis 批量清除排行数据 性能测试 2023-01-09 15:15:46 +08:00
8c340f6955 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-07 19:45:51 +08:00
516064236d Gm指令调整新主线 2023-01-07 17:39:00 +08:00
98a56d9a4d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-07 17:14:47 +08:00
c639d6359e 更新工具跨服配置 2023-01-07 17:14:36 +08:00
6f820d168b 战斗返回 2023-01-07 15:02:39 +08:00
2ecebd23fd 通关星级对应到指定的描述位置 2023-01-07 14:46:47 +08:00
367a553c15 配置读取调整 2023-01-07 11:55:02 +08:00
338a2daa28 入口 2023-01-07 09:27:25 +08:00
6089131bf0 章节数据校验 2023-01-06 19:51:00 +08:00
e4575d22c5 关卡扫荡 2023-01-06 17:37:14 +08:00
ca2e14fb01 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-06 16:51:44 +08:00
f4b274ef93 主线评星 2023-01-06 16:51:12 +08:00
32fe177428 章节宝箱领取 2023-01-06 16:04:12 +08:00
31a2973f36 新主线挑战 2023-01-06 15:42:42 +08:00
874dcbdf9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-06 15:37:48 +08:00
3a3667649c 新增任务类型 2023-01-06 15:37:38 +08:00
liwei1dao
10d25d5634 上传管卡编辑器代码 2023-01-06 14:49:46 +08:00
liwei1dao
ea8b278d1c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-06 14:27:58 +08:00
liwei1dao
86f4683e31 上传管卡编辑器代码 2023-01-06 14:27:50 +08:00
5c0d1e3827 新主线 2023-01-06 12:02:46 +08:00
468f33b86c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-05 19:47:07 +08:00
7729449f36 openCond更新 2023-01-05 19:46:57 +08:00
6d700c0d3a 随机任务ID调整 2023-01-05 18:28:20 +08:00
4cdf2d49d5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-05 18:24:44 +08:00
6c4726246e 狩猎副本掉落觉醒材料 2023-01-05 18:24:09 +08:00
liwei1dao
b56cc67d63 新世界任务埋点 2023-01-05 18:22:21 +08:00
465a126d21 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-01-05 18:02:03 +08:00
da399799ff 任务埋点 2023-01-05 17:56:48 +08:00
841bcec958 任务埋点 2023-01-05 17:56:33 +08:00
645113c08f 修改公会任务领取状态 2023-01-05 15:50:30 +08:00
755c571cbc 修改公会排行榜排序 2023-01-05 15:49:41 +08:00
784669b4c3 新主线 2023-01-05 15:02:25 +08:00
0eb842110e 公会任务优化 2023-01-05 14:39:27 +08:00
1bd3981702 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-05 13:46:54 +08:00
a686976b28 公会任务优化 2023-01-05 13:46:44 +08:00
4d0a507cec Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-04 19:49:29 +08:00
7ee714a4db 优化 2023-01-04 19:08:59 +08:00
liwei1dao
d4b2c7a678 还原秘境门票代码 2023-01-04 18:22:21 +08:00
liwei1dao
2e93abd69d 上传门票接口 2023-01-04 17:51:46 +08:00
liwei1dao
ef814bb391 上传 统一门票机制以及商店特权开发 2023-01-04 17:20:57 +08:00
e4be401bdb 更新配置 2023-01-04 16:07:48 +08:00
liwei1dao
6580f92a4e 上传梦境购买次数特权 2023-01-04 10:43:01 +08:00
39fa612612 代码精简 2023-01-04 10:36:50 +08:00
liwei1dao
d78785fdfd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-04 10:25:48 +08:00
liwei1dao
37c52e4f09 竞技场特权添加 2023-01-04 10:25:39 +08:00
ab88daadd0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-04 10:14:09 +08:00
41e61dd3a5 跨服调用获取特权接口处理 2023-01-04 10:12:43 +08:00
09fb6e67ed 战斗失败战报数据为空 由下层判断输赢 2023-01-04 09:58:12 +08:00
liwei1dao
74b6289258 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-04 09:57:31 +08:00
liwei1dao
ce91c0a426 上传 战报校验优化 2023-01-04 09:57:24 +08:00
dd5879ff88 指针判空 2023-01-03 18:24:18 +08:00
d89de8a808 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 18:15:39 +08:00
b6526455e9 维京排行优化 2023-01-03 18:15:10 +08:00
7cb0c5afbb 修改协议名 2023-01-03 18:06:12 +08:00
f080a2fa2b 战斗失败处理 2023-01-03 16:44:04 +08:00
0eb8fa425d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-01-03 16:27:35 +08:00
liwei1dao
7e8ad9a4b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 16:15:19 +08:00
liwei1dao
8d4d789f8c 上传批量出售接口 2023-01-03 16:15:07 +08:00
6d7545c8c7 更新初始值 2023-01-03 16:03:10 +08:00
cb9eee35b3 保底逻辑优化 2023-01-03 15:30:41 +08:00
01166edda0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 14:56:05 +08:00
c36437dad9 抽卡优化+维京返还战斗场景信息 2023-01-03 14:55:38 +08:00
liwei1dao
85f6fc5c61 上传体力协议优化 2023-01-03 14:44:55 +08:00
liwei1dao
d1bd0b4669 上传boos 战 2023-01-03 14:39:32 +08:00
3550d7e382 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 14:05:59 +08:00
7f2db5b932 支线任务优化 2023-01-03 14:05:53 +08:00
501f7e3d0c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-01-03 10:46:12 +08:00
0077b2fdd5 新增抽卡规则 + 抽卡优化 2022-12-31 19:19:17 +08:00
36c72fafb2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-31 14:56:59 +08:00
ea8007afa0 优化体力自然恢复 2022-12-31 14:56:50 +08:00
53af65a711 战斗开始体力预扣 2022-12-31 14:08:45 +08:00
e97b35ed32 预扣体力 2022-12-31 11:48:36 +08:00
a9964388cf 体力扣除 2022-12-30 18:24:23 +08:00
f011e8b7e9 任务数据埋点 2022-12-30 16:47:07 +08:00
6e1b5bac73 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 16:41:30 +08:00
591b39ea39 英雄模块优化 2022-12-30 16:40:16 +08:00
66f2225b84 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 16:36:34 +08:00
5148608d78 支线任务去除锁定约束 2022-12-30 16:36:27 +08:00
liwei1dao
b7ec9ffd24 上传装备模块错误日志补全 2022-12-30 16:34:07 +08:00
829bd9c6fb 自动购买门票 2022-12-30 15:59:19 +08:00
da9fbe2622 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-30 15:23:46 +08:00
liwei1dao
4649797bad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 15:22:29 +08:00
liwei1dao
0438dd9bfb 上传体力购买上限报错处理 2022-12-30 15:22:19 +08:00
aec58a4c2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 15:19:53 +08:00
868edf1e8b session清理优化 2022-12-30 15:13:45 +08:00
d695df321b 星阵图属性计算 2022-12-30 15:10:32 +08:00
liwei1dao
d400023dab 上传套装属性调整 2022-12-30 14:42:50 +08:00
liwei1dao
33b347c305 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-30 14:03:57 +08:00
liwei1dao
bda90f33cc 上传道具分解接口处理 2022-12-30 14:03:36 +08:00
9a54411eb1 战斗校验 2022-12-30 10:16:13 +08:00
ddb9064f14 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 18:45:56 +08:00
fd6936fbf4 战斗结束 统计英雄实际获得的经验 2022-12-29 18:44:51 +08:00
liwei1dao
8c7d4d0738 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 18:36:25 +08:00
be605efc8f 修改命名 2022-12-29 18:29:18 +08:00
liwei1dao
78993b940e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 18:28:19 +08:00
liwei1dao
7cebfcf2ec 上传背包体力药剂购买接口 2022-12-29 18:27:54 +08:00
a53e7785d1 修改体力常量 2022-12-29 18:25:06 +08:00
b2a6df889a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	comm/imodule.go
#	modules/user/module.go
2022-12-29 17:38:49 +08:00
5b0d6168bb 增加体力接口 2022-12-29 17:36:52 +08:00
liwei1dao
2e12e7e149 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 15:46:38 +08:00
liwei1dao
09efad7ccf 上传装备主属性计算修改 2022-12-29 15:46:26 +08:00
2bd06d6c53 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 15:24:33 +08:00
ef12d49cf8 自动出售满足条件的装备 2022-12-29 15:24:09 +08:00
liwei1dao
4801227b2a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 14:36:05 +08:00
liwei1dao
ebca3dd65d 药剂使用 2022-12-29 14:35:54 +08:00
907c65a656 羁绊剧情pb修改 2022-12-29 14:29:48 +08:00
8812fc78c2 修改vip 等级 2022-12-29 12:01:07 +08:00
3303dac51d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 11:55:53 +08:00
b6e490ee17 获取某种类型所有道具(道具类型,数量) 2022-12-29 11:54:48 +08:00
liwei1dao
2f8095616c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 11:43:39 +08:00
liwei1dao
5306b1eb97 上传装备出售接口 2022-12-29 11:43:28 +08:00
22da54b265 update 2022-12-29 10:17:58 +08:00
liwei1dao
9eda74ffbf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 10:06:28 +08:00
622f5eb2d2 玩家体力自然恢复 2022-12-29 10:05:17 +08:00
liwei1dao
040fb3cace Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-29 09:54:33 +08:00
liwei1dao
a03004b0f2 上传基础属性扩展 2022-12-29 09:54:19 +08:00
2f52223456 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 19:27:11 +08:00
liwei1dao
e06ca2df71 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 19:05:04 +08:00
liwei1dao
80cf3aa8bc 修复竞技场排名列表bug 2022-12-28 19:04:51 +08:00
003aeb8814 发公告 2022-12-28 19:01:21 +08:00
0c60f0d2ac 获取所有装备 2022-12-28 18:50:49 +08:00
d21a7ab716 bingo 命令扩展 清理背包
模拟充值
2022-12-28 18:36:59 +08:00
c81ca67c5f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 18:04:32 +08:00
f9eb2a3fad 参数优化 2022-12-28 18:04:13 +08:00
liwei1dao
1804e830fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 18:01:31 +08:00
liwei1dao
2d34083ae4 上传gm接口 2022-12-28 18:01:15 +08:00
eea7b83101 战斗协议优化 2022-12-28 17:04:54 +08:00
c9b0cbd0af Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 15:55:12 +08:00
58797027fc 主动结束战斗 2022-12-28 15:54:53 +08:00
0122bd44d5 添加访问控制 2022-12-28 15:53:06 +08:00
1717bd5386 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 11:13:14 +08:00
dac702a58a bingo支持改玩家等级 2022-12-28 11:13:06 +08:00
liwei1dao
91a6ed427c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 10:43:39 +08:00
liwei1dao
9131789b3d 上传竞技场代码 2022-12-28 10:43:25 +08:00
51e84ab1bf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 10:39:17 +08:00
07774d0c59 首次获得英雄 推送 2022-12-28 10:38:42 +08:00
liwei1dao
3d87c00b77 修复英雄招募秀代码 2022-12-28 10:16:32 +08:00
2bfc1edce5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-28 10:09:13 +08:00
263747a760 bingo玩家lv 2022-12-28 10:09:05 +08:00
d3522c6867 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 18:53:23 +08:00
d5a9944172 自动战斗数据清理
获取vip经验bug
2022-12-27 18:52:39 +08:00
a315cf699c 删除丢弃的方法 2022-12-27 17:57:22 +08:00
dc7a055245 删除丢弃的方法 2022-12-27 17:56:49 +08:00
767b546928 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 17:48:44 +08:00
fa90b01d8a 补充玩家ID 2022-12-27 17:48:20 +08:00
liwei1dao
4ca0a60c4e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 17:42:48 +08:00
liwei1dao
d8b6e8b010 上传功能开启事件触发 2022-12-27 17:42:33 +08:00
d0c65d3334 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-27 17:23:32 +08:00
10c021ffb9 自动战斗 2022-12-27 17:23:14 +08:00
55d0ad643b 功能开发事件 2022-12-27 14:39:03 +08:00
aa66fed5dd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-26 18:37:38 +08:00
7f57b8521a 自动战斗 2022-12-26 18:37:17 +08:00
316487582e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-26 18:31:05 +08:00
575e3736d5 更新校验 2022-12-26 18:30:59 +08:00
ad027b9c9e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-26 15:28:48 +08:00
1005882ef5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-26 15:28:33 +08:00
203e75da21 战斗奖励优化 2022-12-26 15:28:31 +08:00
liwei1dao
99edf41362 上传道具资源接口优化 2022-12-26 15:27:57 +08:00
589f438106 更新配置 2022-12-26 14:23:30 +08:00
a1de2bab58 update sign 2022-12-26 09:53:31 +08:00
8cc6973ac2 去掉waring 2022-12-23 19:56:47 +08:00
f0dcc396d8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 18:19:17 +08:00
695fe2f607 远征优化 2022-12-23 18:19:00 +08:00
liwei1dao
c3913c609f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 18:17:52 +08:00
liwei1dao
fbaf35260e 上传战斗怪物 数据属性补充 2022-12-23 18:17:36 +08:00
b2484bb1a1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 16:23:02 +08:00
8195cb6a76 狩猎优化 2022-12-23 16:21:15 +08:00
3ae8b17509 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 14:38:21 +08:00
7a0858de04 维京 初始门票数据 2022-12-23 14:36:04 +08:00
liwei1dao
2e101901dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 12:00:11 +08:00
liwei1dao
b1b582023b 上传装备洗练修复 2022-12-23 11:59:55 +08:00
bf0bc7918a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 10:24:00 +08:00
b3e5c7c2c7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-23 10:23:38 +08:00
0ad475d152 update 2022-12-23 10:23:32 +08:00
liwei1dao
c039753296 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 10:15:32 +08:00
liwei1dao
fa4d4a1de2 上传代码 2022-12-23 10:15:13 +08:00
eadc099884 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-23 10:01:15 +08:00
a00b8b0aaa Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-23 10:00:54 +08:00
59b0671c26 update 2022-12-23 10:00:51 +08:00
6a553f11e8 修复删除元素的问题 2022-12-22 23:56:40 +08:00
9a17f539bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-22 20:35:41 +08:00
e332986e66 特权额外获得的属性 2022-12-22 20:35:01 +08:00
liwei1dao
c0e41abefc 优化秘境系统 2022-12-22 20:26:30 +08:00
liwei1dao
741ee32061 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-22 20:19:21 +08:00
liwei1dao
12299736e0 上传支付补充和优化 2022-12-22 20:19:06 +08:00
28c6133a99 接口调整 2022-12-22 18:57:58 +08:00
0b83a213b3 羁绊剧情任务 2022-12-22 17:57:16 +08:00
bb45eff4d5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-22 11:41:38 +08:00
f8b0f03b75 update 2022-12-22 11:41:31 +08:00
784b8a6be0 积分获取bug 2022-12-22 10:34:50 +08:00
89e636f2a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-22 10:31:50 +08:00
27745d5d83 副本小怪获取 2022-12-22 10:31:44 +08:00
liwei1dao
499fff37b6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-21 21:10:06 +08:00
liwei1dao
1a5f02ed31 上传优化代码 2022-12-21 21:09:55 +08:00
dcbc9b5490 vip 特权 额外增加购买次数 2022-12-21 20:08:56 +08:00
796b23899e 同步代码 2022-12-21 19:42:35 +08:00
liwei1dao
4563606628 武馆需求开发 2022-12-21 10:49:46 +08:00
liwei
338f481ad6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:34:55 +08:00
441c7353c4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 20:02:24 +08:00
4bcd7562fa 附魔入口 2022-12-20 20:01:47 +08:00
liwei1dao
8b6e0660b6 上传配置代码 2022-12-20 18:13:11 +08:00
liwei1dao
fe15e3e2df 上传支付接口返回调整 2022-12-20 18:01:41 +08:00
liwei1dao
fb3b881945 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:55:37 +08:00
liwei1dao
cc4640574b 上传支付接口完成 2022-12-20 17:55:23 +08:00
9c077aa803 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:16:47 +08:00
f63fdc7484 优化 2022-12-20 17:16:24 +08:00
liwei1dao
80f0744ac5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-20 17:13:12 +08:00
liwei1dao
a61b865d6d 上传支付接口调增 2022-12-20 17:12:54 +08:00
b82bcbaf5e 图鉴 2022-12-20 17:08:49 +08:00
f325fa1f58 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-12-20 16:13:07 +08:00
3ee4ca9f77 优化 2022-12-20 16:12:57 +08:00
a05f57c626 优化 2022-12-20 16:12:35 +08:00
e3f1336111 update 2022-12-20 15:46:00 +08:00
liwei1dao
2616200338 上传支付代码回应 2022-12-20 15:05:15 +08:00
liwei1dao
7cea922e44 上传服务代码 2022-12-20 15:00:03 +08:00
liwei1dao
b22ff23c4d 上传支付接口调整 2022-12-20 14:30:29 +08:00
2589c198a9 修复任务记录 2022-12-20 12:52:55 +08:00
d1fb30e587 去掉debug 数据 2022-12-20 11:50:34 +08:00
8de4cc38c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 21:28:40 +08:00
74c804246c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	modules/rtask/updateHandle.go
#	modules/task/model_task.go
2022-12-19 21:10:44 +08:00
178a325df9 update 2022-12-19 21:00:26 +08:00
7924d07a30 排行数据 2022-12-19 20:30:50 +08:00
5917f78e37 排行数据 2022-12-19 20:30:41 +08:00
f94b9d6117 加新的战斗类型 2022-12-19 18:14:34 +08:00
liwei1dao
e0c9a544d3 上传世界任务奖励推送 2022-12-19 17:43:32 +08:00
liwei1dao
6ec77156c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 16:42:12 +08:00
liwei1dao
121dc36216 上传新作图升级代码优化 2022-12-19 16:41:53 +08:00
1532308e51 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 16:36:56 +08:00
liwei1dao
f89177185e 补充提交代码 2022-12-19 16:29:36 +08:00
liwei1dao
e16a8a971c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 16:25:38 +08:00
liwei1dao
a499d81135 同步优化日志代码 2022-12-19 16:25:22 +08:00
0e6057ff33 boss 类型修改 2022-12-19 16:20:43 +08:00
20e0f6e0ee 协议字段修改 2022-12-19 16:20:28 +08:00
zhaocy
7b97e81b28 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 15:23:32 +08:00
zhaocy
c9e30f24a0 任务数据状态更新 2022-12-19 15:23:28 +08:00
b45152c2f8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 14:54:06 +08:00
c917a96ced 附魔同步 2022-12-19 14:47:38 +08:00
08dfb99e03 附魔boss 字段修改 2022-12-19 11:12:52 +08:00
liwei1dao
44002c8052 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 10:30:41 +08:00
liwei1dao
c89ad0d2e4 优化广播消息接口 2022-12-19 10:30:30 +08:00
zhaocy
58721927ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-19 10:25:26 +08:00
zhaocy
ec3b98d6f9 Merge branch '优化任务' into dev 2022-12-19 10:24:12 +08:00
4893f8496b 阵营boss 2022-12-19 10:20:08 +08:00
zhaocy
9acb59b119 任务优化提交 2022-12-19 10:13:12 +08:00
liwei
73b894f1b0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-16 21:43:31 +08:00
840aae0caf update 2022-12-16 18:40:12 +08:00
7c08f2e1bc 优化 2022-12-16 16:39:15 +08:00
f1b4b58460 每日奖励优化 2022-12-16 14:32:29 +08:00
35b11e7247 提交修改 2022-12-16 11:54:09 +08:00
7cfe55f66b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-16 11:31:28 +08:00
liwei1dao
b1be9966dc 上传错误日志优化 2022-12-16 09:51:58 +08:00
f1daed8f9a 月之秘籍返回 2022-12-15 19:16:46 +08:00
liwei1dao
5abc58590e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-15 18:34:07 +08:00
liwei1dao
b25d0223a9 gm 返回错误码处理 2022-12-15 18:34:03 +08:00
6ea3027c03 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-15 18:16:43 +08:00
dd5ca57457 特权 vip奖励补发 2022-12-15 18:16:01 +08:00
liwei1dao
9214c2e63e 上传主线和世界任务 触发升级和英雄招募代码 2022-12-15 16:37:52 +08:00
4ecb3bff6c vip每日邮件奖励 2022-12-15 16:23:59 +08:00
liwei1dao
cd13fbc6bf 优化错误日志 2022-12-15 15:33:05 +08:00
liwei1dao
31282c5e18 优化服务错误日志输出 2022-12-15 15:16:34 +08:00
liwei1dao
f63d5d4b72 上传 装备穿戴属性计算错误问题 2022-12-15 15:07:41 +08:00
26262164cd 邮件红点默认值 2022-12-15 14:34:24 +08:00
liwei1dao
0bf03f4d44 上传索引代码 2022-12-15 14:08:01 +08:00
liwei1dao
39d46f3a01 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-15 14:03:21 +08:00
liwei1dao
cd0c174fff 上传索引错误返回 2022-12-15 14:03:06 +08:00
d1a176cfcf 记录所有首次获的英雄的数据 2022-12-15 14:00:40 +08:00
266520c5a0 记录所有获得的英雄 2022-12-15 14:00:14 +08:00
bf35dce1b2 检查是否是新获得的英雄 2022-12-15 11:36:21 +08:00
b94962d80c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-14 19:51:39 +08:00
6680f9041a 玩家属性优化+bug 2022-12-14 19:51:23 +08:00
aabd7bacd8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-14 19:24:06 +08:00
5270f706d3 好友审核修复 2022-12-14 19:24:00 +08:00
16624faeb1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-14 17:14:36 +08:00
f9f521c6f9 优化特权存储时机+ 过滤 2022-12-14 17:13:21 +08:00
b5954efc8f 修改新用户 2022-12-14 16:17:22 +08:00
11fd4ceb56 特权类型定义 登录补发奖励 2022-12-14 15:14:58 +08:00
67385797e5 vip 特权 2022-12-14 14:27:39 +08:00
36b208f82c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 19:53:37 +08:00
cca6e26626 添加vip信息 2022-12-13 19:50:14 +08:00
liwei1dao
bb449d6cb9 上传战斗对接 2022-12-13 19:26:34 +08:00
d318cdf003 vip 宝箱 2022-12-13 18:26:54 +08:00
36019083b4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 17:16:54 +08:00
b79f3ceeb1 vip等级change 2022-12-13 17:16:33 +08:00
liwei1dao
07b493bfb5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 15:06:06 +08:00
liwei1dao
84a846e553 上传战斗测试程序 2022-12-13 15:05:56 +08:00
18b4b318ed 相同资源整合一起 2022-12-13 14:32:23 +08:00
37d7998748 通行证协议修改 2022-12-13 11:59:54 +08:00
dc6a8900cf 优化 2022-12-13 11:45:43 +08:00
29ba901ecb 赛季塔类型修改 2022-12-13 11:17:21 +08:00
02d45f08ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-13 11:04:52 +08:00
1fd0326701 bingo 直接创建赛季塔数据 2022-12-13 11:04:49 +08:00
liwei1dao
0490d643aa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-12 19:49:03 +08:00
liwei1dao
b7667d74ac 上传战斗服务连接消息读取 2022-12-12 19:48:54 +08:00
f829d113d8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-12-12 19:48:21 +08:00
9cb105d75a 错误监听 2022-12-12 19:47:39 +08:00
liwei1dao
6eb1de7b26 上传战斗远程校验 2022-12-12 17:40:55 +08:00
b50c0bfee2 邮件签名 2022-12-12 11:27:53 +08:00