Commit Graph

2690 Commits

Author SHA1 Message Date
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