Commit Graph

3227 Commits

Author SHA1 Message Date
9d1a02c9c8 移出废旧协议接口等 2023-03-31 09:45:46 +08:00
e60d7fb163 update 2023-03-31 09:43:04 +08:00
62834cc22c update 2023-03-30 21:26:19 +08:00
fc3d8c552d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:58:41 +08:00
467067643f update 2023-03-30 20:58:27 +08:00
liwei1dao
7e1ca9f7b5 上传回收代码 2023-03-30 20:50:49 +08:00
liwei1dao
c832d16998 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:45:43 +08:00
liwei1dao
8fbbd1e3f8 上传装备回收系数 2023-03-30 20:45:04 +08:00
adcc94a551 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:39:26 +08:00
707934fbef update 2023-03-30 20:37:59 +08:00
liwei1dao
b3badfd074 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:06:00 +08:00
liwei1dao
9823de2ac5 上传pvp逻辑代码 2023-03-30 20:05:45 +08:00
01a259c151 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 18:49:47 +08:00
2d871aed9a 图鉴奖励一键领取 2023-03-30 18:49:43 +08:00
liwei1dao
600d011f15 上传pvp主动取消战斗请求 2023-03-30 18:45:40 +08:00
21f46364ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 18:21:11 +08:00
193a4e86ed 图鉴积分修改 2023-03-30 18:21:06 +08:00
liwei1dao
490c750095 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:51:19 +08:00
liwei1dao
1391d464e6 上传练功状态设置代码优化 2023-03-30 17:50:41 +08:00
5e96e588f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:45:22 +08:00
ad7aa97c4b update 2023-03-30 17:45:09 +08:00
liwei1dao
58771acfec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:29:06 +08:00
liwei1dao
8bee568529 上传武馆升级代码 2023-03-30 17:28:49 +08:00
f0d2bb5c09 update 2023-03-30 17:19:12 +08:00
d4c92efa5b 商户NPC读配置 2023-03-30 16:49:16 +08:00
2c35ca7388 铁匠铺NPC数量读配置 2023-03-30 16:26:05 +08:00
2ab7af6f76 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 16:20:13 +08:00
189a1c9526 修复多次推送的问题 2023-03-30 16:16:29 +08:00
liwei1dao
6c0cd1758a 上传图鉴id调整 2023-03-30 15:32:11 +08:00
liwei1dao
06cd0981aa 上传资源代码 2023-03-30 15:28:12 +08:00
liwei1dao
b2a83f515c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:26:08 +08:00
liwei1dao
cc6f8c05d5 日志优化 2023-03-30 15:25:48 +08:00
88fb474863 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:25:25 +08:00
4c2b128a36 打印错误信息 2023-03-30 15:25:18 +08:00
55e58931ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:15:20 +08:00
f5385563c6 添加任务埋点类型 2023-03-30 15:14:55 +08:00
liwei1dao
1d8fe7be12 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 14:16:25 +08:00
liwei1dao
67d28e43f2 暂时移除事件代码 2023-03-30 14:16:14 +08:00
liwei1dao
f0877961f9 上传代码优化 2023-03-30 14:14:02 +08:00
f7e1d4c923 任务埋点参数调整 2023-03-30 13:59:04 +08:00
440f4fe1f9 优化 2023-03-30 11:47:54 +08:00
4a199ed7d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 11:16:03 +08:00
ab9542bdaf 图鉴跨服接口 2023-03-30 11:15:58 +08:00
cfe15751c0 更新配置 2023-03-30 10:42:11 +08:00
c09c2152a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 22:23:23 +08:00
7c709ccca7 更新派遣概率 2023-03-29 22:22:49 +08:00
7b53f63d5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 21:10:46 +08:00
ed4c5c6788 update 2023-03-29 21:10:37 +08:00
liwei1dao
a38a228de4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 20:58:44 +08:00
liwei1dao
977d69832f 上传代码 2023-03-29 20:58:34 +08:00
7253886ac5 update 2023-03-29 19:24:17 +08:00
cf33b5b139 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 19:06:34 +08:00
27bef42a95 更新世界任务 2023-03-29 19:06:24 +08:00
40a0a1f651 写数据BUG 2023-03-29 18:36:55 +08:00
52def5abd2 激活条件 2023-03-29 18:32:47 +08:00
58978bb084 配置同步 2023-03-29 17:52:06 +08:00
26e5f07690 初始化数据 2023-03-29 17:49:31 +08:00
7016e5560f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 17:17:05 +08:00
085f47a0ca 新增任务埋点14 15 2023-03-29 17:17:01 +08:00
liwei1dao
e4c79509d1 上传武馆修复 2023-03-29 15:26:26 +08:00
liwei1dao
3cb44f1ce5 上传武馆雕像留存时间 2023-03-29 15:13:50 +08:00
a1e5d1f3d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 11:31:38 +08:00
51a47bc312 武馆积分奖励发送 2023-03-29 11:31:28 +08:00
liwei1dao
12cc0f6fc2 上传服务配置 2023-03-29 11:26:09 +08:00
liwei1dao
39e7125c0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:58:52 +08:00
liwei1dao
dd910fd977 上传武馆雕像刷新优化 2023-03-29 10:58:41 +08:00
a5405b51d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:50:32 +08:00
54a4682a69 激活修改 2023-03-29 10:50:25 +08:00
liwei1dao
eab92a1205 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:49:04 +08:00
liwei1dao
d61c897187 上传武馆雕像刷新时间 2023-03-29 10:48:52 +08:00
72c62c5aed 武馆积分奖励领取 2023-03-29 10:42:19 +08:00
6023cd673d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:21:34 +08:00
01b88e6ba8 单次领取改一次领所有奖励 2023-03-29 10:21:24 +08:00
liwei1dao
97b0dad942 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:16:13 +08:00
liwei1dao
e7f5b858d6 上传魔药接口 2023-03-29 10:16:02 +08:00
0c1d675c8e 铁匠铺非定制打造才玩小游戏 2023-03-28 19:04:12 +08:00
d41600bbdc update 2023-03-28 14:19:19 +08:00
387b23f97d update 2023-03-27 20:29:56 +08:00
d28ba58920 派遣任务随机刷新 2023-03-27 20:29:14 +08:00
0421c9f00e update req 2023-03-27 20:15:25 +08:00
449c921133 update 2023-03-27 20:01:36 +08:00
cbb23917c0 世界任务多任务 2023-03-27 19:57:52 +08:00
b53972e79f 世界任务多组支持 2023-03-27 19:57:48 +08:00
397ab14b79 多路任务支持 2023-03-27 19:56:13 +08:00
7068b0c635 美食馆菜品图鉴激活+功夫塔配置迁移 2023-03-27 19:01:06 +08:00
5d08d1610c 配置更新 2023-03-27 16:06:08 +08:00
47dd998643 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:55:19 +08:00
78fe971932 输出日志 2023-03-27 15:55:12 +08:00
liwei1dao
c559bcf069 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:47:34 +08:00
liwei1dao
b0d0ec205f 上传任务消息推送 2023-03-27 15:47:17 +08:00
f1cc783b7c 记录小游戏最高记录 2023-03-27 15:41:17 +08:00
78a39423a8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:00:10 +08:00
50d02359c7 铁匠铺小游戏 概率双倍打造双倍 2023-03-27 15:00:03 +08:00
liwei1dao
c001258929 上传武馆数据初始化修复 2023-03-27 14:26:01 +08:00
liwei1dao
28ccde1f34 上传拼图游戏接口 2023-03-27 09:53:15 +08:00
liwei1dao
9f55ca0628 上传资源默认 2023-03-24 22:45:09 +08:00
liwei1dao
61787d5cd2 上传木桩解锁调整 2023-03-24 21:56:53 +08:00
liwei1dao
6f1c7c7ea3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 20:44:15 +08:00
liwei1dao
4d402e8a2d 上传铁匠铺代码 2023-03-24 20:44:03 +08:00
cf59f160d4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 18:28:45 +08:00
93442b6877 美食馆 2023-03-24 18:28:17 +08:00
liwei1dao
41c8b08bbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 17:52:07 +08:00
liwei1dao
377a551bab 上传武馆经验加成 2023-03-24 17:51:00 +08:00
9a24d60780 修改派遣随机策略 2023-03-24 17:50:46 +08:00
liwei1dao
977ce1e40a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 17:21:34 +08:00
liwei1dao
7c33752262 添加测试代码 2023-03-24 17:21:17 +08:00
a65ed662b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 15:20:31 +08:00
448b5e5b8c 炉温校验 2023-03-24 15:20:24 +08:00
liwei1dao
e190aaf3ab 上传武馆经验计算修复 2023-03-24 15:06:52 +08:00
4556ed552b 报错处理 2023-03-24 09:45:57 +08:00
b19b66a200 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 09:41:04 +08:00
cb4e23d12b GM 获取指定类型的道具 2023-03-24 09:40:53 +08:00
fd0580d4da update worldtask 2023-03-24 09:29:49 +08:00
64a50c4f57 worldtask 2023-03-24 09:29:49 +08:00
bf98281c0a update 2023-03-24 09:29:49 +08:00
14e1a5bb30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-23 17:49:54 +08:00
4b9ad93b84 移出旧主线 2023-03-23 17:49:39 +08:00
88bbfece23 更新Pb 2023-03-23 12:07:26 +08:00
21800d3fd9 update 2023-03-23 12:02:11 +08:00
755693518a update 2023-03-23 11:05:32 +08:00
50781b87a3 前置条件解锁 2023-03-21 13:43:47 +08:00
53999edfbe 需求调整,能同时打不同页签的塔 2023-03-20 18:19:31 +08:00
bd21f7ee76 武馆塔添加前置解锁条件 2023-03-20 16:11:21 +08:00
0da13ca917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-17 20:45:31 +08:00
9622604dc5 修改炉温校验 2023-03-17 20:45:18 +08:00
a2f6075eba 解锁木桩,任务统计 配置更新 2023-03-17 18:57:22 +08:00
e2890b1a59 更新记数规则 2023-03-17 17:51:07 +08:00
f677a55ecc update 2023-03-17 15:45:07 +08:00
0c51fd3521 update 2023-03-17 15:42:58 +08:00
e3ef151ac2 update 2023-03-17 15:42:47 +08:00
5080121075 update 2023-03-17 15:31:50 +08:00
adbe3b7415 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-17 14:28:21 +08:00
cf5d2991d7 update Session 2023-03-17 14:28:09 +08:00
283b7382c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 19:16:50 +08:00
fd8055110b update 2023-03-16 19:16:46 +08:00
97ea52b9e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 18:13:33 +08:00
d3f0f0aada 修复在线玩家 2023-03-16 18:13:20 +08:00
liwei1dao
078b1af6fc 调整武馆经验收益计算 2023-03-16 17:48:08 +08:00
liwei1dao
457ed31fff 移除旧武馆 2023-03-16 16:49:28 +08:00
683fb2d72d add log 2023-03-16 16:25:28 +08:00
8ee109e673 重置任务数 2023-03-16 16:03:43 +08:00
5b25ca43e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 15:14:03 +08:00
56fe04cbf7 英雄查询接口优化 减少查询次数调用 2023-03-16 15:13:50 +08:00
liwei1dao
cb29154698 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 14:44:54 +08:00
liwei1dao
260ff1c177 上传服务端代码 2023-03-16 14:44:36 +08:00
fd1e706014 update 2023-03-16 14:15:27 +08:00
ebff117d3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 14:15:04 +08:00
d3dbc468af 报错 2023-03-16 14:14:57 +08:00
liwei1dao
eda81986af 上传批量处理代码 2023-03-16 13:55:19 +08:00
79fb4b27eb 批量查询英雄接口 2023-03-16 13:52:50 +08:00
16c820858f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 13:42:59 +08:00
68fc794ee8 接口修改 2023-03-16 13:42:12 +08:00
liwei1dao
25eda8a254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 13:39:04 +08:00
liwei1dao
5a36995060 修改接口 2023-03-16 13:37:35 +08:00
94a883422a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 12:36:35 +08:00
d21716fa20 英雄登记支持批量操作 2023-03-16 12:36:30 +08:00
29b37be18e 去除公会自动创建 2023-03-16 11:31:14 +08:00
790fea5ca1 任务通知模块 2023-03-16 10:02:07 +08:00
1b613b0dd3 update 2023-03-15 17:35:36 +08:00
9d845d3f2d 英雄经验加满了不返回code 2023-03-15 17:16:26 +08:00
b305e25ff2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-15 17:06:36 +08:00
deb6355d36 触发任务 2023-03-15 17:06:30 +08:00
liwei1dao
1063650e63 上传代码 2023-03-15 16:57:16 +08:00
ea02710279 推送注册消息 2023-03-15 15:33:43 +08:00
72bb00422e 英雄可以取消注册 2023-03-15 15:15:16 +08:00
e7d3d0ca7a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-15 15:08:23 +08:00
ec892aa56f 英雄等级接口跨服处理 2023-03-15 15:08:01 +08:00
a5ee8db5ed 派遣额外要求 2023-03-15 14:23:37 +08:00
liwei1dao
1ede1a934e 上传配置 2023-03-15 10:00:59 +08:00
liwei1dao
02830457ed Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:54:14 +08:00
liwei1dao
c3cc2740a6 上传服务端配置 2023-03-14 18:53:52 +08:00
acc409c6b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:23:09 +08:00
37fea2cb80 优化 耗时测试 2023-03-14 18:22:50 +08:00
813083f63a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 18:19:43 +08:00
413362e21a 任务条件优化 2023-03-14 18:19:31 +08:00
liwei1dao
ad65e4b331 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 16:21:05 +08:00
liwei1dao
81d2f5f23c 上传api代码 2023-03-14 16:20:50 +08:00
4a3ca9166e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 14:42:14 +08:00
a97c348986 任务附件参数 2023-03-14 14:42:06 +08:00
liwei1dao
af0d0517b6 上传代码 2023-03-14 14:19:39 +08:00
liwei1dao
56851feaee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 10:08:45 +08:00
liwei1dao
ff5334445b 上传战斗代码 2023-03-14 10:08:35 +08:00
672be883dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-14 09:48:52 +08:00
8f8756cc07 移除旧模块 2023-03-14 09:48:45 +08:00
ae261afdad update 2023-03-13 19:26:40 +08:00
c63fb776d5 派遣优化 2023-03-13 19:26:40 +08:00
7360720f7e 派遣优化2 2023-03-13 19:26:40 +08:00
f01af25de3 派遣优化 2023-03-13 19:26:40 +08:00
db587b9198 update 2023-03-13 19:26:39 +08:00
liwei1dao
2ebaa538ae 上传测试服代码 2023-03-13 19:18:06 +08:00
a0a22dbd49 删除旧铁匠铺解析数据等信息 2023-03-13 14:19:34 +08:00
82c5d1023c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-13 10:31:16 +08:00
f1409ff23a 图鉴数据参数优化 2023-03-13 10:31:08 +08:00
liwei1dao
281036effb 回收session 2023-03-13 10:02:27 +08:00
liwei
090dbe1521 同步代码 2023-03-11 18:12:49 +08:00
liwei1dao
1f371a9b44 上传任务代码 2023-03-11 17:52:12 +08:00
liwei1dao
bdaad954b8 上传消息代码 2023-03-11 17:47:20 +08:00
d7e8851f7e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 16:50:23 +08:00
8c29001e84 update 2023-03-10 16:50:09 +08:00
015c407fbe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-10 16:44:54 +08:00