Commit Graph

1779 Commits

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