Commit Graph

2089 Commits

Author SHA1 Message Date
fc3f67c1f0 bingo 优化去掉忽略空格 2022-11-23 09:56:14 +08:00
liwei1dao
ed3b761172 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 21:12:26 +08:00
liwei1dao
ee0310f457 上传装备埋点 2022-11-22 21:12:22 +08:00
a7f82085d3 融合 美食馆 铁匠铺埋点 2022-11-22 20:31:00 +08:00
a01024a991 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 19:12:00 +08:00
b616265815 添加新增的任务类型 2022-11-22 19:11:53 +08:00
80919efbd9 羁绊埋点 2022-11-22 18:50:59 +08:00
e4f7eeb330 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 17:53:25 +08:00
4a7ef70fea 英雄数据埋点 2022-11-22 17:53:04 +08:00
liwei1dao
e12b37b00d 助战英雄埋点 2022-11-22 17:48:10 +08:00
liwei1dao
49f6ef637a 上传武馆训练累计时间加成 2022-11-22 16:53:25 +08:00
liwei1dao
af571fb456 商店和关卡编辑埋点 2022-11-22 16:16:04 +08:00
liwei1dao
fc4b7a46d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 15:53:42 +08:00
liwei1dao
97effebcd5 上传宝箱通关校验问题 2022-11-22 15:53:39 +08:00
a346d91aaf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 15:48:14 +08:00
ce8798b027 登陆时发送未登陆天数 2022-11-22 15:48:06 +08:00
liwei1dao
06690116a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 15:46:40 +08:00
liwei1dao
7597569913 上传关卡结算问题 2022-11-22 15:46:37 +08:00
d1e35c0bd4 爬塔数据查询接口。狩猎埋点 2022-11-22 15:46:11 +08:00
d1569a77d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 14:39:41 +08:00
aac7850519 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 14:38:59 +08:00
8def819e11 维京埋点 2022-11-22 14:37:41 +08:00
liwei1dao
f2f5dad8dd 上传装备埋点 2022-11-22 14:32:43 +08:00
liwei1dao
d95ece7464 道具分解api补充 2022-11-22 14:06:08 +08:00
liwei1dao
3e040afef9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 13:49:36 +08:00
714a6da6b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 11:40:56 +08:00
liwei1dao
5cc78bed91 月子秘境 任务埋点 2022-11-22 11:25:08 +08:00
298a8f80ff 觉醒防御百分比属性计算错误问题 2022-11-22 11:18:15 +08:00
e94c8058bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 11:03:00 +08:00
81b413fba4 日/周活跃度红点 2022-11-22 11:02:51 +08:00
829900682c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-22 11:02:47 +08:00
c6329afb7e 公会申请红点 2022-11-22 11:02:28 +08:00
16e34273bb 觉醒属性校验 2022-11-22 11:02:23 +08:00
liwei1dao
bd702168b2 上传觉醒材料合成消耗金币错误 2022-11-22 11:00:43 +08:00
657701c82f 任务类型枚举更新 2022-11-22 09:38:52 +08:00
1d7c5cd9b9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 20:04:36 +08:00
52b75ba114 修改为批量领 2022-11-21 20:04:28 +08:00
a86ba0b55c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 19:49:29 +08:00
9219d02669 加个日志打印返还天赋 2022-11-21 19:49:24 +08:00
d474f153a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 18:52:40 +08:00
29162f36b3 误删 2022-11-21 18:52:30 +08:00
aa4ae0f05b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 18:51:15 +08:00
fdd878da08 加经验bug 2022-11-21 18:50:54 +08:00
e75f63b070 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 18:49:18 +08:00
8a70bf67f5 修复好友获赞 2022-11-21 18:49:09 +08:00
1bbc76d9aa 邮件红点检测 2022-11-21 18:06:15 +08:00
liwei1dao
194912c71f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 16:48:17 +08:00
liwei1dao
9d5cbf0dd9 上传邮件红点修复 2022-11-21 16:48:10 +08:00
98d648e794 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 16:39:47 +08:00
b01e92ca66 协议获取与好友的关系 2022-11-21 16:39:38 +08:00
0743fc3f1f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 16:32:24 +08:00
fc006b4441 抽出5星英雄后A次抽奖内不会再抽到5星英雄(普通卡池+阵营卡池) 2022-11-21 16:29:13 +08:00
024609c29b 抽出5星英雄后A次抽奖内不会再抽到5星英雄(普通卡池+阵营卡池) 2022-11-21 16:29:00 +08:00
liwei1dao
2527e10578 上传红点系统对接 2022-11-21 16:20:57 +08:00
zhaocy
c994874a18 修复好友获赞状态 2022-11-21 15:39:35 +08:00
liwei1dao
c7e04d36b3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 15:00:13 +08:00
liwei1dao
14f4068e3e 上传官网错误日志补充 2022-11-21 15:00:00 +08:00
edf63e2f0f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 14:45:50 +08:00
da1a521c4c 美食城 爬塔红点 2022-11-21 14:44:57 +08:00
liwei1dao
5266b0b6fa 招募充值系统对接 2022-11-21 13:56:30 +08:00
liwei1dao
e119f1a6aa 上传竞技场红点需求 2022-11-21 13:47:06 +08:00
liwei1dao
c0c7bd3559 上传红点接口 2022-11-21 12:39:53 +08:00
aa24b4d317 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 11:45:01 +08:00
7b3c4bac66 英雄礼物配置合并 2022-11-21 11:44:27 +08:00
liwei1dao
6f9a040dcf 上传武馆红点 2022-11-21 11:42:50 +08:00
liwei1dao
67f57d95ea 星座图红点需求开发 2022-11-21 11:20:43 +08:00
040b9f668d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 10:38:07 +08:00
liwei1dao
59449e24cc 上传红点接口优化 2022-11-21 10:34:25 +08:00
8f0349181a 类型修改 2022-11-21 10:16:32 +08:00
7fd2e458f4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-21 10:08:17 +08:00
43d7003d7e 处理战斗无完成任务ID情况 2022-11-18 23:24:35 +08:00
ba29beb85f 更新任务数据 2022-11-18 23:09:56 +08:00
ddc356cad0 任务条件 2022-11-18 22:40:17 +08:00
62d65257f1 充值后、N天没登录情况下抽卡概率调整 2022-11-18 22:04:20 +08:00
3fe6f8d115 更新配置 2022-11-18 21:56:17 +08:00
8b20ec9f53 世界任务bingo 2022-11-18 20:37:40 +08:00
liwei1dao
6eaa05b3cf 上传宝箱优化 2022-11-18 19:47:30 +08:00
6d1cf50250 update 2022-11-18 19:39:19 +08:00
30e38a17d1 报错 2022-11-18 19:38:05 +08:00
liwei
4b77c94fc6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-18 19:27:46 +08:00
liwei
5c4f21a3a9 随机宝箱代码修复 2022-11-18 19:27:02 +08:00
42a1423825 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-18 18:53:49 +08:00
d4e24838f9 抽卡 + 狩猎挑战次数恢复 2022-11-18 18:53:25 +08:00
bb431cefe9 修改协议名 2022-11-18 18:21:02 +08:00
865d82ae9d 世界任务区分任务类型 2022-11-18 17:05:17 +08:00
77258d5004 优化错误日志 2022-11-18 17:05:17 +08:00
liwei1dao
1016daf1be 上传竞技场代码 2022-11-18 13:59:53 +08:00
liwei1dao
080f674ad5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-18 11:00:38 +08:00
9bd2b5b867 特权每日奖励邮件多语言 2022-11-18 10:57:24 +08:00
liwei1dao
6665072e8d 上传月子秘境挑战卷回复机制 2022-11-18 10:53:52 +08:00
f40c6b9b34 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-18 10:48:09 +08:00
53ad2c1e07 bingo命令中的Iamyoudad优化 可以直接binggo所有hero表中图鉴字段为1的英雄 2022-11-18 10:46:11 +08:00
liwei1dao
f5e124b7d0 上传月之秘境挑战卷代码 2022-11-18 10:42:19 +08:00
1f4cc5aa8c 根据配置表中数据来判断是否需要记录图鉴数据 2022-11-18 10:32:29 +08:00
liwei1dao
99372b33b8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-18 10:04:16 +08:00
liwei1dao
4ab28c21c0 进机场结算邮件多语言支持修改 2022-11-18 10:04:02 +08:00
48935873b0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-18 09:32:36 +08:00
29e40b3e80 爬塔奖励 2022-11-18 09:32:20 +08:00
4333089c6a 奖励类型转换 2022-11-17 20:33:45 +08:00
4953b4e545 支线剧情任务 2022-11-17 20:33:45 +08:00
77e57cbd47 支线剧情日志 2022-11-17 20:33:45 +08:00
af3ce8f4e8 优化好友日志 2022-11-17 20:33:44 +08:00
9757796ba3 更改世界任务参数校验 2022-11-17 20:33:44 +08:00
e1703ebe2f 优化日志 2022-11-17 20:33:44 +08:00
2e8241ced0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-17 19:58:50 +08:00
0ad64739dd 查看装备空值校验 2022-11-17 19:58:35 +08:00
liwei1dao
e140ce3bff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-17 19:06:32 +08:00
liwei1dao
29f24e8958 上传工具类开发 2022-11-17 19:06:23 +08:00
4695503e2e 狩猎优化,查询英雄信息 2022-11-17 18:14:56 +08:00
e11f392e9f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-17 16:12:28 +08:00
4c0ead5675 助战英雄不给经验 2022-11-17 16:12:13 +08:00
liwei1dao
ed378f4038 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-17 16:11:27 +08:00
liwei1dao
32af41680d 上传开服时间修改后台接口以及关卡协议调整 2022-11-17 16:11:17 +08:00
cf09603ab2 铁匠铺更新 2022-11-17 11:24:05 +08:00
62ad13e0cf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-16 19:21:59 +08:00
0a5e2e6f75 铁匠铺优化 2022-11-16 19:21:41 +08:00
liwei1dao
0a6c30bd5e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-16 18:43:34 +08:00
liwei1dao
bbd1d6c696 上传配置文件上传代码 2022-11-16 18:43:27 +08:00
196463f14d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-16 18:14:35 +08:00
30ef92bd95 美食馆订单优化 2022-11-16 18:14:32 +08:00
liwei1dao
bf9fbd150e 同步到测试服 2022-11-16 18:11:43 +08:00
liwei1dao
3bbb9ac9a6 上传关卡奖励领取 2022-11-16 17:48:00 +08:00
liwei1dao
ad4c0a520f 上传战斗和关卡代码优化 2022-11-16 17:42:09 +08:00
liwei1dao
020f355c71 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-16 17:08:36 +08:00
liwei1dao
da20143ec2 上传关卡通关判断 2022-11-16 17:07:57 +08:00
829edf4465 订单消耗 2022-11-16 15:27:11 +08:00
702432b17a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-15 20:06:58 +08:00
d5f642d0dc 维京优化 2022-11-15 20:06:32 +08:00
af438aaba0 日志logFields 2022-11-15 19:41:32 +08:00
bdf05951c8 更新配置 2022-11-15 19:41:29 +08:00
0fdcf421dd 支线剧情任务 2022-11-15 19:39:38 +08:00
liwei1dao
2ab6d09c06 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-15 19:13:05 +08:00
liwei1dao
14e2f21ad7 上传用户信息读取接口优化 2022-11-15 19:12:50 +08:00
f9d974a6c3 获取好友战斗数据 2022-11-15 18:44:32 +08:00
ccee20582a 获取好友战斗数据 2022-11-15 18:44:21 +08:00
96c91542d6 维京数据校验 时间写入 2022-11-15 17:44:41 +08:00
4310615605 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-15 16:48:17 +08:00
22fc8e6949 维京优化 2022-11-15 16:47:55 +08:00
liwei1dao
c0cd23f6ab 上传月子秘境触发修复 2022-11-15 15:24:17 +08:00
liwei
38eceed9d4 上传战斗配置 2022-11-15 14:18:45 +08:00
liwei1dao
00ae61147f 同步配置 2022-11-15 09:54:40 +08:00
94a685b38a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-14 18:52:01 +08:00
0a2e582149 优化 2022-11-14 18:51:44 +08:00
liwei1dao
077def6d95 上传聊天敏感词调整 2022-11-14 18:11:26 +08:00
liwei
4809dbb4bb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-14 16:17:02 +08:00
f82881d727 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-14 16:12:56 +08:00
bd9a503386 赛季结束清除赛季塔数据,根据排名奖励发送对应的奖励邮件 2022-11-14 16:12:35 +08:00
liwei
c4e29c067a 上传附魔数据写入失败 2022-11-14 16:08:44 +08:00
liwei
f32bf350ab 上传装备附魔代码修复 2022-11-14 16:01:05 +08:00
dd7079bc52 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-14 15:55:56 +08:00