Commit Graph

3577 Commits

Author SHA1 Message Date
3dd57b242e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 15:42:16 +08:00
9485d650f1 配置整理 2023-05-17 15:35:55 +08:00
dbad4c408a 优化 2023-05-17 15:24:01 +08:00
liwei1dao
75c234a274 上传新用户账号信息 2023-05-17 14:48:09 +08:00
liwei1dao
c2399706fc 移除不必要配置 2023-05-17 14:46:19 +08:00
93e6c996ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 14:25:57 +08:00
05215495db 更新分组任务接口 2023-05-17 14:25:49 +08:00
1da5837986 移出不需要的配置 2023-05-17 14:13:41 +08:00
aa62f3961f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 14:10:25 +08:00
6ccc98d308 天赋配置调整 新增解锁技能需求 2023-05-17 14:10:22 +08:00
liwei1dao
7e6a86024f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 11:57:43 +08:00
liwei1dao
c1b65c4314 上传皮肤需求代码 2023-05-17 11:57:38 +08:00
d542633257 背包整理 2023-05-17 11:43:23 +08:00
5b5d24041d uopdate 2023-05-17 10:27:05 +08:00
bb6ba7f9db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 17:18:49 +08:00
454d12f7ce 商队任务接口 2023-05-16 17:18:27 +08:00
049f5ed8f5 跑商任务接取处理 2023-05-16 17:13:21 +08:00
d959191c8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 15:56:10 +08:00
ce736c1a19 随机触发事件 2023-05-16 15:56:07 +08:00
d45353e82b 随机触发事件处理 2023-05-16 15:55:58 +08:00
liwei1dao
1cf88da6ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 13:52:26 +08:00
liwei1dao
601ba317cc 上传竞技场战斗记录属性补充 2023-05-16 13:52:21 +08:00
344b9351ff 跳转城市获取随机事件任务 2023-05-16 11:47:57 +08:00
26d84899d9 出售或购买获取虚拟币 2023-05-15 19:24:16 +08:00
fdbd9728f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 18:41:59 +08:00
a01629af75 物品刷新 2023-05-15 18:41:55 +08:00
liwei1dao
f3dce490f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 18:04:47 +08:00
liwei1dao
8204440960 上传竞技场优化 2023-05-15 18:04:40 +08:00
e08cec7a65 刷新城市信息和货物信息接口 2023-05-15 16:22:33 +08:00
b55b98e1ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 15:09:31 +08:00
5e7b0441fc 商队商品购买 2023-05-15 15:09:27 +08:00
liwei1dao
4308373500 上传捕羊大赛代码 2023-05-15 11:55:12 +08:00
liwei1dao
f194a837df Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 11:33:00 +08:00
liwei1dao
dfdadc8b09 上传配置代码 2023-05-15 11:32:54 +08:00
de36b0da8f 添加虚拟币资源 2023-05-15 11:03:22 +08:00
45952b8f11 跑商买卖 2023-05-12 21:55:52 +08:00
liwei1dao
4a87420318 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 20:50:46 +08:00
liwei1dao
7a331ccefb 上传战斗优化 2023-05-12 20:50:41 +08:00
dbdc0f17ae 跑商数据初始化+协议优化 2023-05-12 20:49:40 +08:00
ef4f779ef2 跑商协议调整 2023-05-12 19:59:48 +08:00
763dcd6c0b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 19:15:27 +08:00
1949c0e4ea 商队 2023-05-12 19:15:23 +08:00
liwei1dao
1cd38733aa 上传任务锁代码 2023-05-12 18:24:03 +08:00
fc391d0a91 update 2023-05-12 16:42:37 +08:00
76c2db3a85 修改公会解散CD 2023-05-12 16:35:36 +08:00
c4d2ab391c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 15:29:39 +08:00
b633b02b08 修复跨服任务 2023-05-12 15:24:22 +08:00
liwei1dao
75247e1390 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 10:44:21 +08:00
liwei1dao
605507501b 上传装备升级副属性找不到错误返回 2023-05-12 10:44:15 +08:00
f814ed19ce 维京新增奖励 2023-05-12 10:13:24 +08:00
9b7f8f3ffe update 2023-05-11 22:28:40 +08:00
65f841e958 公会申请等级限制 2023-05-11 20:17:58 +08:00
bfd49fb493 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-11 19:36:59 +08:00
72565977fe 英雄新增属性 2023-05-11 19:36:53 +08:00
6b4beb5765 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-11 19:05:04 +08:00
ac232ccfcd update 2023-05-11 19:04:51 +08:00
liwei1dao
cfb1580054 添加日志 2023-05-11 17:49:22 +08:00
f035a8290f 功夫大师塔调整 2023-05-11 16:46:52 +08:00
bc51e58381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 16:28:25 +08:00
2c80d0b6c2 数据校验 2023-05-10 16:28:22 +08:00
liwei1dao
b1bfc4e385 上传修改时间服务器时间接口 2023-05-10 16:01:42 +08:00
liwei1dao
b2bd909b91 上传用户时间校验 2023-05-10 15:33:54 +08:00
11cf7a9fac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:31:34 +08:00
666749a699 修改图鉴领取的问题 2023-05-10 10:31:16 +08:00
b6e489501f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:30:55 +08:00
72867cea6e 打造一次升多级情况 2023-05-10 10:30:53 +08:00
liwei1dao
f7b7eb85d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:29:58 +08:00
liwei1dao
d3d0c627ff 上传每日一练刷新机制 2023-05-10 10:29:52 +08:00
d0fed35a83 记录英雄赠送食物的开始时间 2023-05-09 16:23:31 +08:00
72b1d99a19 熔岩打造提示缺少熔岩问题 2023-05-09 16:01:20 +08:00
8c72293119 入榜条件 2023-05-09 15:22:54 +08:00
84720ed7f1 update 2023-05-08 20:23:49 +08:00
4b5ebf9268 接口补充 2023-05-08 20:06:06 +08:00
liwei1dao
4a2971f08e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 20:04:16 +08:00
liwei1dao
f1c0979c1a 上传接口 2023-05-08 20:04:09 +08:00
90dc48d146 自动出售接口补充 2023-05-08 19:48:20 +08:00
4efb6a2ce1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 19:43:01 +08:00
77d0636bd1 工具台技能加成 2023-05-08 19:42:58 +08:00
liwei1dao
953f158445 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 19:38:58 +08:00
liwei1dao
4d697b4e70 上传代码 2023-05-08 19:38:52 +08:00
7b9035f254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 18:54:10 +08:00
97d388fe38 一键出售装备道具等资源 2023-05-08 18:54:06 +08:00
bb3398e78e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 18:20:53 +08:00
49917a6443 任务随机修改 2023-05-08 18:20:30 +08:00
00eab14456 工具测试协议优化 2023-05-08 18:19:57 +08:00
59d8a04f93 炉温消耗打折问题 2023-05-08 17:53:36 +08:00
bd859c2653 装备自动出售不入背包 2023-05-08 16:42:20 +08:00
81419dc31b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 15:21:53 +08:00
cc32aaa029 羁绊等级需要手动激活 2023-05-08 15:21:48 +08:00
liwei1dao
281081ea80 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 10:56:31 +08:00
liwei1dao
fed2b37db2 上传捕羊代码 2023-05-08 10:56:25 +08:00
33784184b7 羁绊剧情奖励 2023-05-08 10:18:01 +08:00
95ba9c3983 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 19:28:11 +08:00
852880bdc3 条件开启功能自动解锁 2023-05-05 19:28:06 +08:00
liwei1dao
997531550a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 19:24:41 +08:00
liwei1dao
28d745e3ca 上传捕羊大赛调试优化 2023-05-05 19:24:29 +08:00
dbe12ea192 更新任务触发 2023-05-05 16:57:38 +08:00
cc356997a3 update 2023-05-05 16:57:38 +08:00
af5808a748 功能条件开启 2023-05-05 16:09:46 +08:00
e4fda1c747 删除剧情奖励 2023-05-05 12:04:27 +08:00
cc60845b92 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 10:58:14 +08:00
1bc334123a 配置整理 以table表导出的数据为准 2023-05-05 10:58:10 +08:00
6c411a7f70 羁绊 调整 2023-05-05 10:33:56 +08:00
liwei1dao
29f24d7e0a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-04 19:13:42 +08:00
liwei1dao
87d5b92097 上传代码 2023-05-04 19:13:21 +08:00
8dca163a32 羁绊等级更新 2023-05-04 18:42:42 +08:00
f6d0dbb7dd 赠送礼物优化 2023-05-04 16:30:56 +08:00
a11dfcbaba 好感度调整 2023-05-04 14:37:35 +08:00
495d7172b4 上传好感度 2023-05-04 12:02:11 +08:00
62d1dfccc6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-04 11:56:58 +08:00
41285d522c 给英雄赠送食物 2023-05-04 11:56:55 +08:00
liwei1dao
8d727166c9 上传武馆npc 战斗失败消失bug 2023-05-04 10:43:58 +08:00
e56b025019 英雄升星 属性刷新问题 2023-04-28 23:08:11 +08:00
fc4493f591 update 2023-04-28 21:42:52 +08:00
d401f2135f update 2023-04-28 21:20:04 +08:00
ec82443fec update log 2023-04-28 21:05:57 +08:00
71cad1c28f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 20:49:27 +08:00
511697792e update 2023-04-28 20:49:17 +08:00
f125c6d835 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 18:37:46 +08:00
e31941c379 竞技场保存玩家等级 2023-04-28 18:37:39 +08:00
d08eaf01af 金币消耗 2023-04-28 18:30:26 +08:00
ad76eb3828 掉落组奖励 2023-04-28 17:59:57 +08:00
f58a37f1f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 16:52:03 +08:00
94cca4d515 旧时光自动解锁 2023-04-28 16:51:45 +08:00
37a8884ec7 竞技场 记录玩家等级 2023-04-28 15:22:03 +08:00
5ad4705391 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-28 14:39:54 +08:00
0387e04255 金币消耗埋点 2023-04-28 14:39:43 +08:00
968a9d3ae6 更新任务状态 2023-04-28 14:39:27 +08:00
ce2fa0c91a 竞技场购买报错修复 2023-04-28 13:47:12 +08:00
166f969d19 add log 2023-04-28 12:08:54 +08:00
ec82c61917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-27 20:07:50 +08:00
9d68493fe1 关卡编辑器状态更新 2023-04-27 20:07:28 +08:00
b81109db68 gm 满觉醒 获取觉醒等级问题 2023-04-27 17:33:02 +08:00
041bcb7d37 商队修改 2023-04-27 17:03:02 +08:00
83e26c8986 周任务 领取奖励后 自动发放宝箱奖励 2023-04-26 20:00:02 +08:00
fae0e4b489 打造N次装备 2023-04-26 15:12:53 +08:00
059c9f40da Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-26 13:42:50 +08:00
7cf7635882 教习资源初始值 2023-04-26 13:42:46 +08:00
57b9b40982 update global 2023-04-26 11:03:28 +08:00
1748262048 新需求 一次可以同时打造多件装备 2023-04-26 10:15:33 +08:00
edba38487b 发放木桩类型资源跨服处理异常问题修复 2023-04-25 19:42:36 +08:00
99d3c97f8c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-25 18:48:14 +08:00
b7700786c8 update 2023-04-25 18:48:10 +08:00
48ac8dc350 更新旧时光 2023-04-25 18:27:51 +08:00
bf8a33eba4 旧时光 2023-04-25 18:26:46 +08:00
5152b9a469 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-25 17:49:21 +08:00
19f286b1e2 商队相关 2023-04-25 17:49:06 +08:00
d511fb2756 商队系统改造 2023-04-24 20:35:03 +08:00
cc550d9da5 小游戏奖励调整 2023-04-24 14:06:01 +08:00
08c6070abc 初始默认给坐骑 2023-04-24 11:16:52 +08:00
64cd3da633 校验在线用户状态 2023-04-23 19:45:35 +08:00
63a4212c93 捕羊大赛新增加入退伍规则 2023-04-23 18:57:13 +08:00
9fe5a687a1 签到功能调整,不发送签到奖励 2023-04-23 15:42:02 +08:00
1fc9ebb98d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-23 15:24:55 +08:00
dccbdde57f 签到小游戏 玩法调整 2023-04-23 15:24:51 +08:00
f1fa24a36e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-23 14:54:13 +08:00
8804225486 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-23 14:51:12 +08:00
d5bd4f925f 接口补充 查询最近一起游戏的玩家信息 2023-04-23 14:49:37 +08:00
a9bc2516c4 补羊大赛 领取奖励 2023-04-23 11:57:10 +08:00
58ecd65e7d update 2023-04-23 10:17:56 +08:00
9448a51507 配置同步 2023-04-21 21:08:54 +08:00
88881e2527 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-21 19:11:05 +08:00
liwei1dao
2ff92487cf 上传捕羊大赛代码 2023-04-21 19:03:50 +08:00
6c3cf0b013 好感度测试 2023-04-21 18:46:43 +08:00
liwei1dao
8bb7c27a7b 同步配置文件和捕羊大赛代码 2023-04-21 18:11:49 +08:00
liwei1dao
ec088d4b13 上传捕羊大赛代码 2023-04-21 16:54:26 +08:00
liwei1dao
27dbb36ee6 优化item代码 2023-04-20 21:18:34 +08:00
liwei1dao
e40f849605 上传捕羊大赛邀请逻辑优化 2023-04-20 21:16:34 +08:00
liwei1dao
eb5ae6d13b 上传邀请代码 2023-04-20 21:08:56 +08:00
liwei1dao
53721a47c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 20:58:29 +08:00
liwei1dao
6cfb67a14a 上传捕羊大赛代码 2023-04-20 20:58:24 +08:00
4ec983d257 update 2023-04-20 19:06:48 +08:00
52e08a5c7a 天赋树重置 2023-04-20 18:42:24 +08:00
5969eb80cd 功能测试 2023-04-20 18:32:04 +08:00
631c924514 世界任务GM 2023-04-20 18:24:10 +08:00
b1e7078985 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:12:50 +08:00
49c99c2843 update 2023-04-20 17:12:35 +08:00
liwei1dao
44319e8d2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:05:28 +08:00
liwei1dao
10f8849fbe 同步代码 2023-04-20 17:05:14 +08:00
d8cb4f78af 统计阵营总好感度 2023-04-20 16:27:59 +08:00
8811db5c1b 羁绊属性计算 2023-04-20 16:22:14 +08:00
302e292041 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 14:53:33 +08:00
93996e3c80 声望 2023-04-20 14:40:55 +08:00
liwei1dao
50d5b3409a 上传武馆踢馆延迟 2023-04-20 13:53:48 +08:00
702375e8b3 赠送美食 2023-04-20 11:58:52 +08:00
liwei1dao
4fceb5f841 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-19 20:20:19 +08:00
liwei1dao
3cce3dfb04 同步配置 2023-04-19 20:20:05 +08:00
2dd073d135 剧情奖励 传记等数据处理 2023-04-19 19:43:24 +08:00
14e7091594 声望 2023-04-19 19:29:25 +08:00
liwei1dao
c707bcb94b 上传捕羊大赛代码 2023-04-19 18:30:24 +08:00
0e6aba2b9e 好感度 2023-04-19 18:01:53 +08:00
a73e753c19 踢馆去掉对话框奖励 2023-04-19 13:45:15 +08:00
14a658f62e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-19 11:47:46 +08:00
8d8e67c32a 一键踢馆修改 2023-04-19 11:45:47 +08:00
liwei1dao
a05275d234 上传战斗计时结束 2023-04-18 21:09:06 +08:00
liwei1dao
ee83d78681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-18 20:31:13 +08:00
liwei1dao
0bdcd919ce 上传服务配置 2023-04-18 20:28:43 +08:00
99affaf831 npc踢馆 领奖 2023-04-18 20:10:57 +08:00
7da8284b73 状态还原 2023-04-18 20:07:13 +08:00
c501d3c205 踢馆成功不通关剧情获得奖励 2023-04-18 18:37:58 +08:00