Commit Graph

2296 Commits

Author SHA1 Message Date
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
liwei1dao
16f81a664f 竞技场 2022-10-27 20:25:30 +08:00
liwei1dao
7f1197597f 上传竞技场代码 2022-10-27 20:11:04 +08:00
liwei1dao
b8e4581cc8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 19:56:51 +08:00
liwei1dao
745e047159 上传匹配代码 2022-10-27 19:56:37 +08:00
6a40c9b0fb bug 2022-10-27 19:48:21 +08:00
14be41a497 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 19:08:42 +08:00
82cc4a5a47 优化 2022-10-27 19:08:24 +08:00
0b879d6ecd 创角校验 2022-10-27 19:00:00 +08:00
liwei1dao
c472ead14b 上传竞技场匹配机制 2022-10-27 18:46:19 +08:00
liwei1dao
953bc69f10 修复英雄资源发放接口 2022-10-27 17:28:03 +08:00
liwei1dao
4536d51738 上传竞技场匹配 2022-10-27 17:21:09 +08:00
liwei1dao
da347d68fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 15:48:11 +08:00
liwei1dao
e43de8647a 上传竞技场记录和胜率相关需求补充 2022-10-27 15:48:07 +08:00
d9cea36aad Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 15:43:40 +08:00
60d502dbed 跨服发放英雄 2022-10-27 15:43:17 +08:00
liwei1dao
95b5078667 上传查询目标用户的竞技场信息 2022-10-27 14:42:33 +08:00
liwei1dao
fec69e818d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 14:19:41 +08:00
liwei1dao
7505c586fb 上传阵营记录 2022-10-27 14:19:34 +08:00
a325afb4a7 资源跨服 2022-10-27 11:53:39 +08:00
8891d07d71 资源跨服 2022-10-27 11:53:39 +08:00
liwei1dao
67b74f7249 随机任务跨服适配调整 2022-10-27 11:49:44 +08:00
liwei1dao
4b001cd62e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 11:33:04 +08:00
liwei1dao
bf3dfde9b6 上传资源消耗发放跨服适配 2022-10-27 11:32:59 +08:00
0a11b01ffb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 11:01:23 +08:00
b9a9b10aab 获取随机在线玩家信息 2022-10-27 11:01:07 +08:00
liwei1dao
4c67d2e077 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-27 10:38:15 +08:00
liwei1dao
5a91b06f3d 上传挑战卷恢复代码 2022-10-27 10:38:11 +08:00
liwei
8fbab95a8d 上传战斗优化 2022-10-26 19:03:51 +08:00
e73d1ac02d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 18:56:22 +08:00
4dabd43d8a 升星获得天赋点数 2022-10-26 18:56:02 +08:00
liwei1dao
14194c5fca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 18:47:18 +08:00
liwei1dao
b8817f7dcf 周比赛奖励推送接口 2022-10-26 18:47:11 +08:00
8ceff434d6 精灵升星 bug
天赋点数消耗
2022-10-26 18:39:47 +08:00
50a8f80f8e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 18:00:55 +08:00
10ae593e85 pb 同步 2022-10-26 18:00:39 +08:00
liwei1dao
a31a8eb6c3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 17:57:36 +08:00
liwei1dao
f0719d47f4 上传竞技场代码 2022-10-26 17:57:29 +08:00
77030e561d 批量发邮件 2022-10-26 17:45:31 +08:00
7204c77266 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 17:32:53 +08:00
2ca65b1312 跨服发邮件 2022-10-26 17:32:01 +08:00
liwei1dao
70039010d3 上传竞技场代码 2022-10-26 17:02:29 +08:00
liwei1dao
c5b07b01fe Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 16:33:59 +08:00
liwei1dao
690d159fd4 上传竞技场代码 2022-10-26 16:33:51 +08:00
e8d905014e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 15:38:01 +08:00
7aa2741bcd 天赋树属性计算
修改形象
2022-10-26 15:37:44 +08:00
liwei1dao
085a9038bd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 12:40:09 +08:00
liwei1dao
25d1aa5fe8 上传竞技场代码 2022-10-26 12:39:58 +08:00
d08679f3db Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 11:44:32 +08:00
c912ae1c17 额外消耗天赋点数 2022-10-26 11:44:18 +08:00
liwei1dao
97d331e14d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-26 10:00:24 +08:00
liwei1dao
6f70a0bb9d 上传初始段位生成 2022-10-26 10:00:14 +08:00
830df642ab 重置数据返回 2022-10-25 19:30:50 +08:00
7b225bd4fd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-25 19:28:08 +08:00
d07b80f454 天赋属性初始化
配置同步
2022-10-25 19:27:45 +08:00
liwei1dao
c21fd71eb1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-25 17:52:46 +08:00
liwei1dao
aa54bef632 上传竞技场代码 2022-10-25 17:52:32 +08:00
5dedb95ca4 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-25 17:47:41 +08:00
bdc162616c 天赋重置 2022-10-25 17:46:51 +08:00
liwei1dao
10e2ae2fd9 上传装备洗练代码 2022-10-25 17:08:34 +08:00
liwei1dao
65b421cbd4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-25 16:54:57 +08:00
liwei1dao
82328ed7f3 同步洗练代码到测试环境 2022-10-25 16:51:41 +08:00
5e3cdcd6c4 返回刚学习的天赋id 2022-10-25 16:47:21 +08:00
liwei1dao
56cd53a09c 上传代码 2022-10-25 16:39:09 +08:00
d744cb9c45 天赋学习 重置功能 2022-10-25 16:35:06 +08:00
liwei1dao
fcb577bb66 上传洗练个竞技场代码 2022-10-25 16:22:29 +08:00
liwei1dao
7faf5be7f3 上传进机场代码 2022-10-25 14:35:35 +08:00
liwei1dao
a90b68886f 上传竞技场代码 2022-10-25 14:35:24 +08:00
62d7a63f53 配置解析优化 2022-10-25 10:30:48 +08:00
liwei1dao
0baabf3414 上传装备洗练 2022-10-25 10:00:48 +08:00
b3d7379f75 天赋系统 2022-10-24 18:51:07 +08:00
3f32c57814 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-24 18:12:48 +08:00
19aad246b4 天赋数据获取 2022-10-24 18:12:34 +08:00
liwei1dao
06601537cc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-24 18:00:01 +08:00
liwei1dao
5d04fd7fb3 上传竞技场和装备洗练代码 2022-10-24 17:59:41 +08:00
983750153e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-24 16:50:53 +08:00
0f247ee161 获取在线玩家数据 2022-10-24 16:50:38 +08:00
liwei
2e6def8232 修复月子秘境数据更新异常bug 2022-10-24 16:38:18 +08:00
a26f05416f 打印错误日志 2022-10-24 14:47:36 +08:00
69556d7806 错误校验 2022-10-24 14:31:51 +08:00
liwei1dao
2027cc3184 上传竞技场系统 2022-10-24 13:42:29 +08:00
05a0e37ab9 获取远程用户 2022-10-24 12:01:24 +08:00
liwei1dao
88d0b5519f 上传竞技场代码 2022-10-24 11:14:01 +08:00
liwei1dao
13dec018fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-24 10:55:41 +08:00
liwei1dao
3ba2458a49 上传竞技场代码 2022-10-24 10:55:18 +08:00
574178dfc6 创建开服数据 2022-10-24 10:26:30 +08:00
dbf0e35c37 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 17:43:17 +08:00
18e0f621cc 跨服时候处理 2022-10-21 17:42:52 +08:00
c9b1b99d64 助战排行榜 2022-10-21 17:34:41 +08:00
1c556e3e21 好友助战英雄列表 2022-10-21 17:34:40 +08:00
liwei1dao
b4882bfca7 上传竞技场api代码 2022-10-21 15:26:43 +08:00
liwei1dao
04b0c315ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-21 15:00:16 +08:00
liwei1dao
30a1b1c409 上传战斗类型判断处理 2022-10-21 14:56:56 +08:00
liwei1dao
e7edca436e 上传竞技场代码 2022-10-21 14:55:46 +08:00
d3ce4a2073 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 12:03:06 +08:00
46ec0b910f 爬塔赛季数据处理 2022-10-21 12:02:54 +08:00
liwei1dao
17714c9595 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 11:15:37 +08:00
liwei1dao
1d3658a4a0 修复推送接口 2022-10-21 11:15:14 +08:00
bf61a61845 战斗报错 2022-10-21 11:05:03 +08:00
liwei1dao
5fed8e4e3d 装备锻造接口补充 2022-10-21 10:35:56 +08:00
liwei1dao
929c00c967 上传装备道具接口优化 移除调用源对象 2022-10-21 10:32:40 +08:00
liwei1dao
b46952cebd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-21 10:12:54 +08:00
liwei1dao
7f161e9ee2 上传装备锻造 2022-10-21 10:12:39 +08:00
462811cbbb 加一些校验 2022-10-20 18:48:14 +08:00
8d08a26cc4 一键查询多名英雄信息 2022-10-20 18:22:09 +08:00
991a1e6bfd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 18:18:30 +08:00
77327b99c2 爬塔助战相关协议修改 2022-10-20 18:18:01 +08:00
48119603bf 助战RPC 2022-10-20 18:14:20 +08:00
liwei1dao
f7679c2ab5 战斗友好助战系统补充 2022-10-20 18:10:37 +08:00
liwei1dao
a07752a4e3 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 18:06:42 +08:00
liwei1dao
5e12c92998 上传战斗 2022-10-20 18:06:11 +08:00
74a6b6ea58 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 18:03:57 +08:00
02f8b18c1b 优化 2022-10-20 18:03:33 +08:00
56b809406c 助战推送 2022-10-20 18:01:22 +08:00
60a36c51b7 助战英雄 2022-10-20 17:33:58 +08:00
91e60bd283 助战英雄列表 2022-10-20 17:33:58 +08:00
liwei1dao
636f7e08b2 上传助战布阵代码 2022-10-20 17:08:27 +08:00
bc8cefa482 助战记录 2022-10-20 16:18:23 +08:00
9dd2ae45cf 获取随机在线玩家数据bug 2022-10-20 16:16:38 +08:00
a60a40d760 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-20 16:06:07 +08:00
727c7ecd82 赛季塔定时清理 修改数据等 2022-10-20 16:05:48 +08:00
ea9abe6b27 好友助战 2022-10-20 14:44:33 +08:00
e2d1707d1d 助战英雄校验 2022-10-20 14:44:33 +08:00
5bbaada9e2 修复跨服用户搜索 2022-10-20 14:44:33 +08:00
50b4710e89 加一些日志打印 2022-10-20 11:08:57 +08:00
800d0203d1 数据校验 2022-10-20 10:12:39 +08:00
28dcdb73e1 bug 2022-10-20 10:04:09 +08:00
18256d7dc6 合成返回 2022-10-20 09:56:12 +08:00
f34efe5f45 判断是不是跨服 2022-10-20 09:31:00 +08:00
c247137d7e 查询接口调整 2022-10-19 19:43:39 +08:00
232a0fc1e5 一个小bug 2022-10-19 19:39:13 +08:00
eee83cc6d1 升星精灵升级 需求变更 直接修改英雄id 2022-10-19 18:45:08 +08:00
0c74105f21 英雄合成类型修改 2022-10-19 18:31:06 +08:00
liwei1dao
cbf7198e4a 上传月子秘境代码优化 2022-10-19 18:29:08 +08:00
de42696f16 json 同步 2022-10-19 18:26:17 +08:00
2b4a117304 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 18:00:24 +08:00
9138866fad 跨服查询英雄数据 2022-10-19 18:00:09 +08:00
liwei1dao
d24e3cc238 上传代码 2022-10-19 17:34:03 +08:00
liwei1dao
d4487ee428 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 17:29:23 +08:00
liwei1dao
bb2daca70b 移除聊天系统废弃消息 2022-10-19 17:29:09 +08:00
2f6722bc5a 修复跨服好友申请 2022-10-19 17:25:50 +08:00
liwei1dao
e5f8fe912c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 17:19:20 +08:00
liwei1dao
01b5775dbd 上传聊天系统优化 2022-10-19 17:19:06 +08:00
ddf5d1816f 美食馆人数不够的情况 2022-10-19 16:45:54 +08:00
d72c9fb67d 获取跨服玩家信息 2022-10-19 16:09:36 +08:00
9e20298edd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-19 15:47:25 +08:00
liwei1dao
a48e4cca9f 上传聊天频道 2022-10-19 15:39:18 +08:00
3bcc8a7b54 好感度计算 2022-10-19 15:19:39 +08:00
liwei1dao
a48c616907 修复聊天获取消息校验处理 2022-10-19 15:18:26 +08:00
liwei1dao
79785852f6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 15:03:04 +08:00
liwei1dao
26703b7b56 上传gm和rtask 跨服接口 2022-10-19 15:02:51 +08:00
7da9c703ec Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:52:50 +08:00
fe17144107 一个在线也没有 那么 就去随机取指定数量的玩家 2022-10-19 14:52:18 +08:00
1baeb5cef0 好友跨服修改 2022-10-19 14:23:20 +08:00
liwei1dao
b0eec24368 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 14:19:41 +08:00
liwei1dao
eb93beb54a 上传 秘境与聊天系统跨服升级 2022-10-19 14:19:23 +08:00
313927637d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-19 11:55:04 +08:00
6ef841ed72 增加好感度剧情解锁条件 2022-10-19 11:54:53 +08:00
liwei1dao
1a3030da01 升级聊天私聊频道为跨服系统 2022-10-19 10:08:51 +08:00
fd572e6f92 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 18:02:11 +08:00
85409bd46a 需求变更 增加多个随机剧情奖励。新增好感度奖励 2022-10-18 18:01:55 +08:00
7fe93f2bb2 好友跨服处理 2022-10-18 17:56:31 +08:00
e3066d4b19 羁绊领奖协议调整 2022-10-18 16:42:06 +08:00
dbccb138d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-10-18 15:16:52 +08:00
690685f849 跨服获取其他玩家英雄数据 2022-10-18 15:10:26 +08:00
f33022e322 更好好友搜索Proto 2022-10-18 14:11:54 +08:00
8ea5357d82 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-18 12:05:59 +08:00
765d9ce833 铁匠铺获取在线玩家数据 2022-10-18 12:05:45 +08:00
daffea5833 跨服搜索好友 2022-10-18 12:01:33 +08:00
6ddec9b66c 修改清理的session key 2022-10-18 10:18:14 +08:00
f51f492164 跨服session 2022-10-18 10:15:27 +08:00
85bb6f5391 跨服查好友 2022-10-18 10:15:26 +08:00
f3c8c8f52c 清理赛季塔数据 2022-10-17 19:52:41 +08:00
liwei1dao
9a78cbbacf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-17 18:34:38 +08:00
liwei1dao
9431b19d2e 补充跨服id 获取接口 2022-10-17 18:34:29 +08:00
d1e1069ba7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-17 17:59:07 +08:00
732fe14319 支持查询其他玩家的英雄信息
查询接口支持跨服查询
2022-10-17 17:58:50 +08:00
e47071fab9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-17 14:28:18 +08:00
3b8d6601e9 查看其它玩家数据 2022-10-17 14:28:07 +08:00
9875ed8a2f 英雄合成功能配置类型修改 2022-10-17 14:16:02 +08:00
61b35955c8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 19:03:28 +08:00
7a85b1bd7d 卡牌合成 2022-10-14 19:03:12 +08:00
liwei1dao
20112cb548 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 18:32:59 +08:00
liwei1dao
6e65b33560 上传装备出售算法优化 2022-10-14 18:32:47 +08:00
43b5f9c798 修改背景ID类型 2022-10-14 18:30:33 +08:00
f109832c7a 加日志 2022-10-14 16:31:50 +08:00
c8db8bbfe6 优化 2022-10-14 15:06:33 +08:00
caf1b0cdc9 增加详细羁绊数据推送,加一些错误日志 2022-10-14 14:06:56 +08:00
6d4a95f461 携程推送羁绊信息 2022-10-14 11:19:52 +08:00
ae21093938 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 11:17:53 +08:00
a5fd3f0304 接口整合 2022-10-14 11:17:38 +08:00
liwei
f8a6b936e3 修复异常代码 2022-10-14 11:16:52 +08:00
liwei1dao
b83337f12a 上传模块封装消息推送代码 2022-10-14 10:53:29 +08:00
liwei1dao
9ef6b5d085 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 10:31:23 +08:00
liwei1dao
7f5f1b46cc 上传底层 2022-10-14 10:31:18 +08:00
fb2986e834 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-14 10:20:35 +08:00
8869bf49a0 羁绊信息变化推送 2022-10-14 10:20:03 +08:00
liwei1dao
483accd591 上传秘境战斗数据同步bug 2022-10-14 10:10:21 +08:00
9157de9471 发奖判断 2022-10-13 18:59:06 +08:00
153ffd253f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 18:53:22 +08:00
925131626d 激活信息返回 2022-10-13 18:53:01 +08:00