Commit Graph

4292 Commits

Author SHA1 Message Date
85273d0114 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 18:35:18 +08:00
74ce02f26a 功能测试 2023-07-05 18:35:14 +08:00
1dc59551ad 上传代码 2023-07-05 18:17:21 +08:00
c0a1f83758 上传道具代码 2023-07-05 17:14:48 +08:00
2b1c8141ca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 16:00:11 +08:00
39fe1e88c9 英雄加经验 返回给英雄唯一id 2023-07-05 16:00:08 +08:00
fe4dbfe780 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 15:51:18 +08:00
490aa9ac7c 上传世界任务相关代码 2023-07-05 15:51:13 +08:00
460725a94f update 2023-07-05 14:35:37 +08:00
a8f980547c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 14:31:10 +08:00
dd7e674d1f 接口补充 查询已经开启的功能 2023-07-05 14:31:06 +08:00
85db31e26e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 14:14:46 +08:00
651d6c41aa 上传新手引导需求 2023-07-05 14:14:44 +08:00
be474a1442 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 11:38:39 +08:00
f9e4ae25e2 顾客设置唯一ID 2023-07-05 11:38:22 +08:00
fe029e048e 上传新世界任务代码 2023-07-05 11:26:53 +08:00
d78a529218 上传武馆代码 2023-07-05 11:24:03 +08:00
56d838d08c 上传木桩时间重置错误 2023-07-05 11:16:07 +08:00
051f2e36c4 上传商队任务接口调整 2023-07-05 11:07:15 +08:00
2aea968464 上传接取商队任务修改 2023-07-05 11:01:29 +08:00
1cf6fdff92 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 11:00:43 +08:00
8b5487378f 上传新的世界任务模块 2023-07-05 11:00:41 +08:00
c74f05e451 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 10:24:45 +08:00
19cfefc98a 必须强制做的任务 2023-07-05 10:24:42 +08:00
e9916d2df2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 10:07:59 +08:00
294ca41b0b 添加武馆配置校验 2023-07-05 10:07:57 +08:00
7e07a0828f taskid 校验 2023-07-05 10:07:51 +08:00
2eff495aa3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 09:54:36 +08:00
1cc2787df0 任务超时记录,清空数据状态 2023-07-05 09:54:32 +08:00
827a1beccf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 18:54:33 +08:00
19e083aa57 判空 2023-07-04 18:54:27 +08:00
eab16c8518 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 18:30:35 +08:00
a0c07187a2 上传代码 2023-07-04 18:30:31 +08:00
c02bbc94c6 报错修改 2023-07-04 18:27:51 +08:00
86405a4199 解析报错 2023-07-04 18:21:00 +08:00
06315e72e7 配置表字段变更 2023-07-04 18:05:35 +08:00
c5c35059d2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 17:57:29 +08:00
2fd9090794 检查配置 2023-07-04 17:57:17 +08:00
d56e624b5c 商队购买上限 2023-07-04 17:16:49 +08:00
41622f696e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 17:02:30 +08:00
d9c5c66836 英雄经验 2023-07-04 17:02:26 +08:00
92a08ee808 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 16:56:16 +08:00
e9ef7c8f98 上传商城代码优化 2023-07-04 16:56:11 +08:00
b26c0b5f20 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 16:06:39 +08:00
c668e6b81b 商队修改 2023-07-04 16:06:36 +08:00
df8e156e4a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 15:45:59 +08:00
acd896bb24 悬赏任务加权重 2023-07-04 15:45:46 +08:00
ecdc7b2ff0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 14:39:18 +08:00
35367e18fc 优化武馆接口 2023-07-04 14:39:14 +08:00
ba04b59dcc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 14:06:24 +08:00
2ca9e725ae 商队taskid 2023-07-04 14:06:18 +08:00
e648b283ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 11:38:36 +08:00
16e3e1d37c 储蓄金 2023-07-04 11:38:29 +08:00
895af10c67 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 11:29:32 +08:00
0389b95d06 功能条件开启默认值修改
0 表示未开启 1 已开启 需要手动激活, 2 已开启可以使用
2023-07-04 11:29:29 +08:00
245323e09d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-04 10:56:55 +08:00
796d6c06d6 上传木桩错误信息 2023-07-04 10:55:43 +08:00
63b663e5d1 任务超时处理 2023-07-04 10:53:13 +08:00
51ad46b312 任务进度更新 2023-07-03 19:23:48 +08:00
1a89bb8db0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-03 19:12:42 +08:00
960b5fd14a 上传商队任务接取 2023-07-03 19:12:37 +08:00
5eb865c139 储蓄金领取 2023-07-03 19:06:50 +08:00
efd3478564 商队taskid记录 2023-07-03 18:07:15 +08:00
2d88b0ba5c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-03 17:37:43 +08:00
dce50c2604 新增维京 狩猎体力消耗埋点 2023-07-03 17:37:39 +08:00
992417d129 上传代码 2023-07-03 17:37:19 +08:00
d2d8b498cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-03 17:27:29 +08:00
18dd3fc53e 上传代码 2023-07-03 17:27:27 +08:00
316905d7f7 溢出经验转金币 2023-07-03 17:26:16 +08:00
5b3f3e0ac5 上传竞技场代码 2023-07-03 16:51:38 +08:00
9bada8a427 上传竞技场机器人信息处理 2023-07-03 16:36:46 +08:00
3cd8e75da1 移除不用的文件 2023-07-03 16:04:50 +08:00
486026fe6c 英雄最大等级限制 2023-07-03 16:00:43 +08:00
588fc4c5a8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-03 15:24:47 +08:00
1526401578 商队任务开启 2023-07-03 15:24:44 +08:00
af70a4f3f3 上传武官切磋 失败形象显示优化 2023-07-03 14:26:45 +08:00
ae58f1c98b 上传武官道具使用限制 2023-07-03 14:20:39 +08:00
1eabef7769 上传配置 2023-07-03 14:14:02 +08:00
c5a605c3df 教习使用限制 2023-07-03 11:22:55 +08:00
a943f1837e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-03 09:42:38 +08:00
eed5cf07a0 update 2023-06-30 23:08:31 +08:00
ce6306a157 上传代金卷需求开发 2023-06-30 18:20:08 +08:00
7b809c856d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-30 17:47:27 +08:00
a2eb455151 狩猎新增英雄经验奖励 2023-06-30 17:47:23 +08:00
c0cae0b509 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-30 16:10:25 +08:00
32c7289e4f 任务次数限制 2023-06-30 16:10:16 +08:00
a9a6325ccb 回收session 2023-06-30 14:47:02 +08:00
32701a664c 条件开启新增好友数量条件 2023-06-30 11:47:33 +08:00
dde670cbab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-30 10:49:03 +08:00
2bf027ab27 条件开启增加好友数量条件 2023-06-30 10:48:59 +08:00
f9f151b711 好友变化通知 2023-06-30 10:22:30 +08:00
00739ad63e 上传好友武馆bug 2023-06-29 19:30:40 +08:00
21d4881d24 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 18:28:10 +08:00
52be8710cb 上传 装备属性计算不一致bug 2023-06-29 18:28:08 +08:00
21894ab024 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 18:04:03 +08:00
4c2d96512e 铁匠铺交易屏蔽错误码 2023-06-29 18:03:52 +08:00
0f0411a5b3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 18:03:13 +08:00
a58d90e552 上传战斗校验 失败成功分析 2023-06-29 18:03:06 +08:00
d1ffca6153 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 17:57:45 +08:00
b2a25608a3 铁匠铺交易 2023-06-29 17:57:39 +08:00