Commit Graph

1779 Commits

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