Commit Graph

2296 Commits

Author SHA1 Message Date
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
93057ea171 优化全局配置 2022-11-14 15:55:50 +08:00
liwei
8574cd8398 同步配置文件 2022-11-14 15:21:13 +08:00
liwei1dao
d969e88bd0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-14 14:41:45 +08:00
liwei1dao
25f3fb95af 上传关卡编辑 2022-11-14 14:40:35 +08:00
3533baf805 模块注释 2022-11-14 14:35:55 +08:00
liwei1dao
b6f28ecacf 上传关卡编辑测试 2022-11-14 14:33:26 +08:00
liwei1dao
8bacce8c34 上传关卡编辑系统代码 2022-11-14 13:53:47 +08:00
62f4b85ba6 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-14 11:14:59 +08:00
05c1cbf323 update 2022-11-14 11:14:42 +08:00
981d1bc1da update 2022-11-14 11:14:32 +08:00
1b986fd46c 任务校验修复 2022-11-14 11:11:41 +08:00
c118b8e762 加日志 2022-11-11 21:01:24 +08:00
c41b83a2be 更新配置 2022-11-11 18:10:47 +08:00
a9502c390b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 17:56:28 +08:00
a4458a65df 战斗任务 2022-11-11 17:56:21 +08:00
10590146f8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 17:36:10 +08:00
ebf65a0c2a 整理 优化 2022-11-11 17:35:52 +08:00
liwei1dao
1b3b15d469 上传红点补充 2022-11-11 16:50:34 +08:00
liwei1dao
1d4f51c8f9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 16:43:45 +08:00
liwei1dao
be4bf64b73 上传教学任务错误码返回 2022-11-11 16:43:34 +08:00
7fb01fa819 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 16:34:35 +08:00
764ca2a466 公会红点 2022-11-11 16:34:30 +08:00
f512a18dac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 16:09:29 +08:00
311b6b0270 天赋点数取值 2022-11-11 16:09:26 +08:00
4cece97e61 初始化service 2022-11-11 16:04:29 +08:00
8cfb36d4ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 15:59:53 +08:00
662f332bc0 公会红点 2022-11-11 15:59:13 +08:00
0ee1bedf21 报错 2022-11-11 15:59:06 +08:00
9870184e47 战斗任务 2022-11-11 15:58:38 +08:00
01cf37bd2b 任务红点 2022-11-11 15:58:38 +08:00
1cec020d6c 世界任务bingo 2022-11-11 15:58:37 +08:00
a2cdabece8 重置返还已学习的天赋点数 2022-11-11 15:50:36 +08:00
9eeab31149 重置返还已学习的天赋点数 2022-11-11 15:49:07 +08:00
88d9094e1f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 14:32:02 +08:00
24ad02d82b 客户端主动请求签到 2022-11-11 14:31:45 +08:00
liwei1dao
a67aa5347e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 14:27:26 +08:00
liwei1dao
4735e4f3ed 上传屏蔽字 2022-11-11 14:27:20 +08:00
74539c8037 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-11 11:39:00 +08:00
0b3971dfd4 签到指定天数发放额外奖励 2022-11-11 11:38:44 +08:00
liwei
5a9a94cc96 同步配置我呢见 2022-11-11 11:22:12 +08:00
de8ca6e90a 世界任务 2022-11-10 21:16:35 +08:00
c7617c4a96 性别头像 2022-11-10 21:16:34 +08:00
efecdb298e 世界任务 2022-11-10 21:16:30 +08:00
2d46852079 账号多终端登录提示 2022-11-10 21:15:46 +08:00
liwei1dao
35c83f3feb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 20:05:39 +08:00
liwei1dao
5eb2783750 优化聊天消息广播异常问题 2022-11-10 20:05:35 +08:00
a8347ef0af 赛季塔 主线红点检测 2022-11-10 19:34:56 +08:00
f059dd5ca5 月卡每日奖励支持多语言 2022-11-10 18:04:05 +08:00
05b5b2ede9 续费时间校验 2022-11-10 17:40:09 +08:00
16f8f1de38 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 17:02:39 +08:00
593c4fcbb5 爬塔战令领奖 2022-11-10 17:02:23 +08:00
liwei1dao
73b935db20 优化错误码 2022-11-10 16:38:24 +08:00
liwei1dao
044486720e 上传红点模块 2022-11-10 16:33:54 +08:00
liwei1dao
18034c71dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 15:40:28 +08:00
liwei1dao
2cc4282fb9 上传支付系统代码 2022-11-10 15:40:08 +08:00
a9a117b56c 惊喜货物只针对与对应出售货物的商人出现 2022-11-10 15:21:47 +08:00
8f035baaad Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 14:32:08 +08:00
261988250a 捏脸埋点 2022-11-10 14:31:51 +08:00
liwei1dao
bb365b268a 推送充值数据 2022-11-10 14:25:14 +08:00
78cc3c723b 战令协议 2022-11-10 14:16:55 +08:00
liwei1dao
0830aa6488 上传充值界面 2022-11-10 14:11:09 +08:00
49738accdb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 13:50:36 +08:00
3400b420bd update 2022-11-10 13:49:42 +08:00
liwei1dao
f63a5c7aea 上传红点服务 2022-11-10 11:47:29 +08:00
1b4e0ccaa4 关闭任务条件达成的推送 2022-11-10 10:40:46 +08:00
1f17b9ffe0 添加世界任务group参数 2022-11-10 10:09:05 +08:00
99c043fff7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 10:08:57 +08:00
31e9dc156e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 10:08:46 +08:00
817aa065e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 10:07:00 +08:00
liwei1dao
9a2cb429e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-10 10:03:30 +08:00
liwei1dao
977772f5ea 上传商店购买不推送购买回应的bug 2022-11-10 10:03:25 +08:00
d4ee446cd0 初始化 2022-11-10 09:49:11 +08:00
a7fa2e31f5 世界任务 2022-11-09 19:55:06 +08:00
0c06225cf9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 18:57:51 +08:00
cccc4821f0 特权每日邮件 2022-11-09 18:57:35 +08:00
liwei1dao
c1152ebb2d 上传时间戳代码 2022-11-09 17:34:18 +08:00
liwei1dao
cef4865080 附魔属性规则调整 2022-11-09 17:13:39 +08:00
liwei1dao
61a17f909b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 16:58:47 +08:00
liwei1dao
4ec41044e6 上传红点消息 2022-11-09 16:58:38 +08:00
758d91b356 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 16:32:14 +08:00
04e260f895 发放月卡资源 2022-11-09 16:32:10 +08:00
liwei1dao
15a53a403c 上传战斗任务协议 2022-11-09 16:30:36 +08:00
liwei
1883467116 上传教学奖励 2022-11-09 15:55:39 +08:00
liwei1dao
985b30f3a2 上传奖励领取接口 2022-11-09 15:41:54 +08:00
liwei1dao
4845be43dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 15:24:39 +08:00
liwei1dao
d66836edb7 上传服务代码 2022-11-09 15:24:23 +08:00
d556686fe7 异常校验 2022-11-09 15:20:27 +08:00
070143be73 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-11-09 15:06:58 +08:00
6aea1d7659 优化 + 命名调整+注释 2022-11-09 15:04:20 +08:00
liwei1dao
8927fe16f5 上传红点和信息 2022-11-09 14:26:43 +08:00
liwei1dao
a51c966aaf 调整服务器时间戳接口 2022-11-09 14:18:03 +08:00
liwei1dao
8ae9c6842f 上传联盟学院代码注册 2022-11-09 12:02:55 +08:00
liwei1dao
e6ed62a330 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 11:18:15 +08:00
liwei1dao
0475ae385a 上传重置支付 2022-11-09 11:18:04 +08:00
7de76796fb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 10:53:46 +08:00
0e84e18afc 时间计算错误 2022-11-09 10:53:26 +08:00
liwei1dao
85a4867083 上传支付 2022-11-09 10:43:59 +08:00
liwei1dao
28f9427303 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-09 10:37:22 +08:00
liwei1dao
60b57998dd 上传用户资源消耗 0 的情况 成功返回 2022-11-09 10:37:17 +08:00
95735d3381 公会币改名 2022-11-09 10:06:40 +08:00
b27f1ca8f9 指针问题 2022-11-09 09:59:46 +08:00
liwei
5d0185c458 上传全局表优化 2022-11-09 09:35:05 +08:00
281e8c3f17 世界任务 2022-11-09 09:32:28 +08:00
8640273534 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 18:10:21 +08:00
520d613b7f 跨服发英雄,通知区服修改羁绊信息 2022-11-08 18:09:31 +08:00
liwei1dao
315fd20011 上传支付消耗系统代码 2022-11-08 16:29:44 +08:00
liwei1dao
f41030f137 上传字符系统代码优化 2022-11-08 16:03:31 +08:00
liwei1dao
8ffe184dd0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 15:06:28 +08:00
liwei1dao
88480dbe18 上传全局配置优化同步 2022-11-08 15:06:22 +08:00
3368628f67 还原配置 2022-11-08 14:56:54 +08:00
8b1fdecbc0 发送邮件 2022-11-08 14:49:00 +08:00
43a2893d29 修改数据更新 2022-11-08 14:19:28 +08:00
liwei1dao
349aef1c94 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 14:01:44 +08:00
liwei1dao
a7e9442d97 上传角色攻略 2022-11-08 14:01:40 +08:00
2146eae87c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 13:37:09 +08:00
d745a797d1 激活赛季塔返回 2022-11-08 13:36:52 +08:00
70e4d847fe 激活赛季塔返回 2022-11-08 13:36:40 +08:00
a9f8dc8bce 更改配置 2022-11-08 12:08:56 +08:00
7924cc979a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 12:06:24 +08:00
5d5733d04d 大于配置签到天数时读取通用奖励配置 2022-11-08 12:06:08 +08:00
b991c0bfaf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 10:59:44 +08:00
5129f9de68 世界任务配置 2022-11-08 10:59:36 +08:00
03fc105ef6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-08 10:31:10 +08:00
faea3b1549 赛季塔需手动激活 2022-11-08 10:27:40 +08:00
802a322f2a 赛季塔需要手动激活 2022-11-08 10:26:59 +08:00
64e18214e4 更新协议名 2022-11-08 10:02:08 +08:00
95cf865134 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 23:19:38 +08:00
0223ae49c6 惊喜货物取值问题 2022-11-07 23:19:20 +08:00
0a0ac51c28 会长退会条件 2022-11-07 23:18:44 +08:00
cc64c14062 随机任务 2022-11-07 23:11:20 +08:00
695ca53690 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 22:52:06 +08:00
034c6c8aca update 2022-11-07 22:52:03 +08:00
46c7dd0e32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 22:24:14 +08:00
f82c6627ac 更新任务配置 2022-11-07 22:24:06 +08:00
13ff38d514 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 21:55:11 +08:00
1ce78945f4 每日签到检测 2022-11-07 21:55:08 +08:00
aeb93e6b50 公会bug 2022-11-07 21:24:20 +08:00
68ffda04ee 随机任务数读配置 2022-11-07 21:24:20 +08:00
300d33c777 弹劾倒计时读配置 2022-11-07 21:24:20 +08:00
06021546df 成长任务列表修改 2022-11-07 21:24:19 +08:00
0354363b1e 成长任务 2022-11-07 21:24:19 +08:00
0a384e53c8 成长任务 2022-11-07 21:24:14 +08:00
liwei1dao
1fed642354 上传商城优化调整 2022-11-07 20:56:33 +08:00
liwei1dao
d9e874b61d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 19:56:41 +08:00
liwei1dao
f7a16aac3e 装备属性重复优化 2022-11-07 19:56:34 +08:00
f9ea35b881 每日签到 2022-11-07 19:51:35 +08:00
f1e3fdf819 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 18:38:54 +08:00
23597a0904 每日签到 2022-11-07 18:38:33 +08:00
liwei1dao
e61221fd4b 上传代码 2022-11-07 17:23:06 +08:00
liwei1dao
2117ce7697 随机任务参数传递 2022-11-07 17:01:34 +08:00
liwei1dao
48247e9095 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 16:51:40 +08:00
liwei1dao
260842c0d5 上传商城代码 2022-11-07 16:51:36 +08:00
8f196624b6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 16:46:43 +08:00
a0ddd89b5a 跑商收益bug 2022-11-07 16:46:40 +08:00
liwei1dao
9c3c1ab798 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 16:41:57 +08:00
liwei1dao
fc1b0b800a 上传商城装备预览 2022-11-07 16:41:52 +08:00
liwei1dao
e394133335 上传rtask转发 2022-11-07 16:41:14 +08:00
7d5bfaad21 跑商交易次数校验错误bug 2022-11-07 15:50:11 +08:00
be2f72fa63 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 15:28:10 +08:00
2c1311fb22 属性计算 2022-11-07 15:28:06 +08:00
liwei1dao
a1bf86b3aa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 15:14:02 +08:00
liwei1dao
1dedcdf7b3 装备洗练属性刷新机制调整 2022-11-07 15:13:51 +08:00
46bf3996c1 记录加商人位置信息 2022-11-07 14:24:40 +08:00
d032998a8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 14:11:55 +08:00
88ad0391de 写记录 2022-11-07 14:11:52 +08:00
liwei1dao
0151435147 上传装备跑马灯效果 2022-11-07 13:57:52 +08:00
liwei1dao
2832177bbe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 12:05:46 +08:00
liwei1dao
2281db681e 联盟学院 2022-11-07 12:05:18 +08:00
4f5e027f64 公会名不重复校验 2022-11-07 11:52:00 +08:00
ed6dbbe7f8 公会币 2022-11-07 11:51:56 +08:00
f629388714 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 11:18:53 +08:00
6c80440450 跑商ai自动交易卖出货物后清除单价 2022-11-07 11:18:50 +08:00
liwei1dao
62b2f74a84 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-07 10:16:49 +08:00
liwei1dao
9b4f732af5 上传装备锻造资源推送 2022-11-07 10:15:55 +08:00
08b57b880b 登录发一封邮件 2022-11-04 21:46:28 +08:00
liwei1dao
7272214706 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 19:56:49 +08:00
liwei1dao
19ca86b154 上传每日礼包商城和支付系统 2022-11-04 19:56:11 +08:00
1c47d16a6f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 18:49:45 +08:00
8cb42f8926 月卡系统 2022-11-04 18:48:47 +08:00
liwei1dao
aaa219a7ce 提交支付系统 2022-11-04 18:46:27 +08:00
liwei1dao
556bf52ca4 上传装备升级配置表 2022-11-04 18:38:59 +08:00
liwei1dao
6c70287868 上传装备属性 2022-11-04 17:37:46 +08:00
liwei1dao
c880b97038 上传战斗配置文件 2022-11-04 17:20:15 +08:00
5cb78141a1 成长属性星级取当前星级 2022-11-04 17:04:51 +08:00
d42d6d217f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 16:50:43 +08:00
39387fd874 属性公式调整 2022-11-04 16:50:25 +08:00
liwei1dao
3a4d252804 上传怪物数据优化技能 2022-11-04 16:45:29 +08:00
liwei1dao
22538f24d3 星座图推送属性变换 2022-11-04 16:20:14 +08:00
liwei1dao
0766ddc7c5 同步reset 接口 2022-11-04 16:11:35 +08:00
liwei1dao
37d782032c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 16:09:34 +08:00
liwei1dao
1b0c92ae7e 上传战斗模块表调整 2022-11-04 16:09:28 +08:00
e17afe00ec 月卡 2022-11-04 15:22:13 +08:00
1299dd30d3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 15:12:43 +08:00
8a234acafe PushHeroProperty 2022-11-04 15:12:38 +08:00
94ea61f862 更新公会推送 2022-11-04 14:43:03 +08:00
liwei1dao
ada9d59d29 上传 2022-11-04 14:15:23 +08:00
liwei1dao
5c61df0d54 上传星座图数据切换 2022-11-04 12:44:02 +08:00
liwei1dao
fe8a053283 上传新增货币bug修复 2022-11-04 12:24:42 +08:00
liwei1dao
94d225ff16 上传代码 2022-11-04 12:08:06 +08:00
liwei1dao
da5d24dcb0 上传资源货币补充 2022-11-04 12:00:48 +08:00
liwei1dao
6454d2702d 上传用户属性更新 2022-11-04 11:47:42 +08:00
liwei1dao
55041a6d02 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 11:35:26 +08:00
liwei1dao
8e11e250b8 上传支付系统 2022-11-04 11:35:21 +08:00
e4a1df0700 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 11:13:36 +08:00
3f83b276cc 删除测试代码 2022-11-04 11:13:08 +08:00
liwei1dao
cd2398e67f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-04 09:49:01 +08:00
liwei1dao
c897d316e1 上传星座图重置接口 2022-11-04 09:46:36 +08:00
c8574ac17c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 19:46:59 +08:00
b75f6fd38b 挂机收益列表 2022-11-03 19:46:27 +08:00
5415480631 公会解散修复 2022-11-03 19:30:56 +08:00
liwei1dao
4021c0dff1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 18:45:41 +08:00
liwei1dao
b971e714ae 上传支付系统 2022-11-03 18:45:28 +08:00
325b52b0e9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 17:51:37 +08:00
9cb562262a 收益排行 2022-11-03 17:51:18 +08:00
liwei1dao
7f9bda681d 上传星座图代码 2022-11-03 16:33:40 +08:00
liwei1dao
e6f22d2c46 修复代码bug 2022-11-03 16:20:18 +08:00
liwei1dao
aa710d72d7 上传星座图信息初始化bug 2022-11-03 16:16:59 +08:00
249eb04ad6 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 15:49:53 +08:00
8de5838d3f 惊喜价 加每日重置ai 次数 2022-11-03 15:49:28 +08:00
liwei1dao
a0a92ffa0a 上传星座图pb优化 2022-11-03 15:47:21 +08:00
ed8da5f80b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 15:06:48 +08:00
e5f3ee1c8b bug 2022-11-03 15:06:25 +08:00
090422083a 公会弹劾修复 2022-11-03 15:02:08 +08:00
6d6e99606d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 14:45:11 +08:00
18e2c27570 副本新增挑战次数+自动恢复功能 2022-11-03 14:44:49 +08:00
0e7e84706e 公会#邮件 2022-11-03 11:27:43 +08:00
3d25cbe2ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 11:03:12 +08:00
ae68f31d13 优化 2022-11-03 11:03:09 +08:00
liwei1dao
ea38902865 修复装备技能属性强化 2022-11-03 10:57:27 +08:00
liwei1dao
4fa1917d52 上传武器配置接口错误 2022-11-03 10:18:05 +08:00
liwei1dao
7f9b134067 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-03 10:13:32 +08:00
liwei1dao
3675b5ac52 优化db数据成 过期系统 跨服兼容机制 2022-11-03 10:06:58 +08:00
f641886c6e 当日最大交易次数走配置 2022-11-02 21:42:36 +08:00
fb17cad095 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 21:31:26 +08:00
195e8c8c1d ai玩法 2022-11-02 21:31:07 +08:00
3c3310dd9d 会长选举修复 2022-11-02 19:54:53 +08:00
25bfde3533 公会任务 2022-11-02 19:54:49 +08:00
liwei1dao
566f6855ce 上传英雄装备列表初始栏位 2022-11-02 19:14:09 +08:00
liwei1dao
505b1f3e34 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 18:37:50 +08:00
liwei1dao
36e0fd52ec 装备升级配置表优化 2022-11-02 18:37:40 +08:00
04adff4156 设置惊喜货物 2022-11-02 18:28:39 +08:00
liwei1dao
7a1878e8e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 18:24:11 +08:00
liwei1dao
bd24c332bd 上传英雄初始装备栏位 2022-11-02 18:24:07 +08:00
774fb22654 领取奖励 2022-11-02 17:52:21 +08:00
7495c3d67b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 17:22:08 +08:00
8dbfc3ac6f 优化 2022-11-02 17:21:52 +08:00
liwei1dao
3ed500cf48 优化装备武器和饰品接口兼容 2022-11-02 17:19:54 +08:00
liwei1dao
aab05cb576 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 17:06:03 +08:00
liwei1dao
2a2f210466 上传装备附魔系统 2022-11-02 17:05:58 +08:00
5e508e2af0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 15:55:11 +08:00
b149c733ab 增加商队商品限购 2022-11-02 15:54:49 +08:00
liwei1dao
831f7c0619 推送工会聊天接口 2022-11-02 15:44:31 +08:00
liwei1dao
93f22821de 上传竞技场预先扣除 2022-11-02 14:05:02 +08:00
liwei1dao
f2ba62ab0d 优化装备等级 2022-11-02 10:17:45 +08:00
8eca424eb5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-02 09:42:53 +08:00
044afba54b viking boss类型修改 2022-11-02 09:42:17 +08:00
liwei1dao
b42316d6ba 上传星座图系统属性计算 2022-11-02 09:42:07 +08:00
fd4391b596 Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-01 19:44:37 +08:00
bea96ac65f 巨兽商队AI 玩法 2022-11-01 19:44:15 +08:00
liwei1dao
e783f1adee 上传星座图代码 2022-11-01 19:09:06 +08:00
liwei1dao
f4b5178996 上传战斗武器和饰品技能汇总 2022-11-01 17:38:23 +08:00
liwei1dao
11ddfb26dd 上传武器饰品代码 2022-11-01 17:28:40 +08:00
liwei1dao
47728fbcf5 英雄维护装备技能数据 2022-11-01 17:27:37 +08:00
liwei1dao
b3f93e1360 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-01 17:22:48 +08:00
liwei1dao
f1ea5f08d3 上传武器饰品 2022-11-01 17:22:44 +08:00
8ce713c7a9 公会 2022-11-01 16:56:06 +08:00
liwei1dao
a8550ef827 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-11-01 16:46:07 +08:00
liwei1dao
67759e6bbe 上传星座图代码 2022-11-01 16:45:51 +08:00
00496c1790 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-31 19:32:20 +08:00
b0fc8396fb 优化 2022-10-31 19:31:58 +08:00
liwei1dao
bb5a8ca643 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-31 18:56:25 +08:00
liwei1dao
1f53c183c0 上传星座图代码 2022-10-31 18:56:13 +08:00
df45562de4 公会 2022-10-31 18:27:07 +08:00
liwei1dao
c94df125a8 上传新作图代码 2022-10-31 17:50:06 +08:00
liwei1dao
9adc0e1140 上传工会聊天补充 2022-10-31 16:29:14 +08:00
71ab8cd478 公会 2022-10-31 15:12:35 +08:00
c6c65dc22b 公会 2022-10-31 15:12:01 +08:00
005dc658a2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-31 14:51:15 +08:00
26a2baf9ef 巨兽列车 买卖货物 设置挂机信息 2022-10-31 14:50:47 +08:00
liwei1dao
4ae40bfd33 补充附魔接口 2022-10-31 14:49:10 +08:00
liwei1dao
e35a63e797 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-31 14:41:16 +08:00
liwei1dao
0bc741075d 上传星座图以及装备系统升级代码 2022-10-31 14:41:10 +08:00
liwei
8c017bff27 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-31 12:05:07 +08:00
liwei
825889c867 上传pve消耗挑战券 2022-10-31 12:04:44 +08:00
54db639bc0 类型调整 2022-10-31 10:09:33 +08:00
30c78af0bc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-31 10:08:00 +08:00
liwei1dao
e10371942e 上传星座图代码 2022-10-31 09:32:16 +08:00
6f8a8e3831 巨兽商队 2022-10-28 20:01:44 +08:00
liwei1dao
9b3edaaec2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-28 15:54:22 +08:00
liwei1dao
1f1ef635cc 上传npc接口代码 2022-10-28 15:54:07 +08:00
90b733390f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-28 11:55:46 +08:00
f0f849c1f3 巨怪商队 2022-10-28 11:55:16 +08:00
liwei1dao
27af2b87bd 上传进机场pve代码 2022-10-28 11:08:03 +08:00