Commit Graph

4608 Commits

Author SHA1 Message Date
c9d12bb33f 上传共鸣水晶代码 2023-07-10 17:24:57 +08:00
52ae906373 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 17:19:34 +08:00
7a336fa07b 循环塔 赛季塔挑战 2023-07-10 17:19:30 +08:00
a142ccc9ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 16:57:19 +08:00
bf2f0eaef8 上传网络优化和任务系统修复 2023-07-10 16:57:16 +08:00
b334c855fa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 14:24:25 +08:00
0fa47d4da0 阵营塔信息 2023-07-10 14:24:21 +08:00
574efd1a81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 14:22:16 +08:00
ebfc1c5b5d 上传共鸣水晶补充 2023-07-10 14:22:13 +08:00
6adbd3be87 协议优化 配置解析 2023-07-10 11:19:22 +08:00
ff98a1fba8 功夫塔通关记录 2023-07-10 10:45:36 +08:00
27740aa98e 同步配置 2023-07-07 18:38:54 +08:00
9aa031e32c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 18:04:49 +08:00
8515c26750 上传代码 2023-07-07 18:04:47 +08:00
b8b5282c94 一键超神FGM 2023-07-07 16:55:00 +08:00
8971e8ec82 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 15:59:33 +08:00
55e998b06d pro 属性 2023-07-07 15:59:29 +08:00
c48086f76d 上传任务修补 2023-07-07 15:35:10 +08:00
bad09620dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 15:11:55 +08:00
2b6db5ad16 上传任务完成条件请求 2023-07-07 15:11:51 +08:00
1427d47014 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 15:04:13 +08:00
246bb80bf3 英雄觉醒 配置支持增加多条属性 2023-07-07 15:04:10 +08:00
c089a161cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 14:39:04 +08:00
38a0f0249f 上传补杨大赛代码优化 2023-07-07 14:39:02 +08:00
94cdd0a0de 记录自动连续战斗 所用回合数 2023-07-07 14:38:08 +08:00
1bdaa38367 上传任务修复 2023-07-07 14:29:59 +08:00
14d1702f96 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 14:09:57 +08:00
65b62a400b 上传代码 2023-07-07 14:09:54 +08:00
0d566c0d4b 暂存测试代码 2023-07-07 10:37:12 +08:00
f0bae825b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 09:59:33 +08:00
2332a8eda2 上传代码 2023-07-07 09:59:31 +08:00
e909e71498 报错修复 2023-07-07 09:54:01 +08:00
bfd8688681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 09:45:24 +08:00
d6a821ad55 gm 获取满天赋 解锁难度1所有关卡 2023-07-07 09:45:21 +08:00
59ed36f7e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-07 09:17:26 +08:00
0bca2177a6 上传传功塔 2023-07-07 09:17:23 +08:00
cd2e9e18ac 设置满天赋 2023-07-06 22:59:21 +08:00
ef27e4d247 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 18:05:14 +08:00
7fe7f4f316 上传代码 2023-07-06 18:05:12 +08:00
6dd28fe10c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 18:02:52 +08:00
4a03deaeda 装备副本排行 2023-07-06 18:02:48 +08:00
5a191218dc 上传传功系统通知 2023-07-06 17:56:00 +08:00
3b45e361bc 上传测试服代码 2023-07-06 17:21:09 +08:00
218e97f62b 上传代码 2023-07-06 16:47:56 +08:00
e4a5caccd3 英雄传功接口 2023-07-06 15:39:26 +08:00
d1cfe5f910 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 15:30:50 +08:00
dd8edb4de4 装备副本排行 2023-07-06 15:30:47 +08:00
6961827dbf 上传自选宝箱 2023-07-06 15:27:25 +08:00
bea92b23d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 15:21:19 +08:00
bb1490daa8 上传任务代码 2023-07-06 15:21:16 +08:00
ea485b2073 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 14:20:43 +08:00
bccee8accc 接口补充 获取掉落相关数据 2023-07-06 14:20:40 +08:00
73ba1522c3 上传引导代码 2023-07-06 13:48:03 +08:00
88b95dfef3 上传传功房 2023-07-06 12:06:38 +08:00
d7ef8e1556 好感度经验取值千分比 2023-07-06 11:29:17 +08:00
d39d0520da Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 11:14:02 +08:00
c2384baf51 移除不需要的日志 2023-07-06 11:13:58 +08:00
2ecc5b1f3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 10:53:54 +08:00
ead9a69a44 派遣添加阵营条件 2023-07-06 10:53:47 +08:00
1a22b0eb31 上传世界任务代码 2023-07-06 10:50:15 +08:00
a936e2eddc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-06 10:12:48 +08:00
c8f8ff2ebc 上传武馆每日一练奖励 2023-07-06 10:12:46 +08:00
bc2ea1176d 任务校验 2023-07-06 10:07:06 +08:00
b22b585a08 上传代码 2023-07-05 19:45:41 +08:00
5800195195 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-05 18:41:00 +08:00
2eff1f1c9f 同步配置 2023-07-05 18:40:57 +08:00
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
a42336cab2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 16:20:53 +08:00
b32510074d 世界任务战斗添加经验 2023-06-29 16:20:50 +08:00
4d51bf7305 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 15:39:33 +08:00
289f992521 gm命令获取全部英雄,不会发送为-1的英雄 2023-06-29 15:39:30 +08:00
31ec56ffbf Rtype9 2023-06-29 15:36:56 +08:00
79245aacef 上传重置埋点接口 2023-06-29 14:56:02 +08:00
cc6feb9dda Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 14:42:57 +08:00
ef2fcfd842 上传埋点 重置接口 2023-06-29 14:42:54 +08:00
31c754c27c 竞技场最大上限特权处理 2023-06-29 14:37:21 +08:00
64da2e66c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 11:52:42 +08:00
12a81cf07b 虚拟财富低于一定值不计算 2023-06-29 11:52:38 +08:00
c3b9aee1a3 更改好友助战埋点 2023-06-29 11:30:57 +08:00
e9df7fb286 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 11:14:59 +08:00
0852ca8f68 update rtype9埋点 2023-06-29 11:14:52 +08:00
a90d952d07 添加客户端版本服务器 2023-06-29 10:53:21 +08:00
d5b15ce0f7 同步 2023-06-29 09:33:02 +08:00
59a355bf29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 09:02:23 +08:00
817f678d5d 百分比数值计算问题 2023-06-29 09:02:19 +08:00
2884bf156f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 18:15:18 +08:00
d169f9f25e 新需求 守护者之心获得设置上限 2023-06-28 18:15:14 +08:00
b765c8d03f 上传竞技场代码 2023-06-28 17:35:46 +08:00
f0c15515ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 16:09:27 +08:00
24eda00128 上传同步用户竞技场名称 2023-06-28 16:09:23 +08:00
0465ffb114 错误日志输出 2023-06-28 15:52:39 +08:00
c64d82abab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 15:21:34 +08:00
5b0e69c440 updateps 2023-06-28 15:21:28 +08:00
d5217953dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 14:42:07 +08:00
25a5ef9dc1 配置更新 2023-06-28 14:42:04 +08:00
b328df88f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:53:34 +08:00
7a7c076dec 上传随机宝箱批量使用代码 2023-06-28 11:53:32 +08:00
2de1ce8161 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:49:22 +08:00
37f64eee7b 抽卡每日次数校验 2023-06-28 11:49:18 +08:00
37b01c0f3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:25:21 +08:00
6351e3df70 修复世界任务战斗奖励发放bug 2023-06-28 11:25:15 +08:00
b416a9679b 赛季重置优化 2023-06-28 10:54:13 +08:00
8a6595dffe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 17:40:35 +08:00
4eb37bc7a2 单日抽卡上限 2023-06-27 17:40:30 +08:00
f6692be368 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 17:38:31 +08:00
a023dc65f9 公会任务激活 2023-06-27 17:38:24 +08:00
d98d6faf95 上传宝箱代码 2023-06-27 17:37:09 +08:00
e26f48d2c8 上传使用代码 2023-06-27 17:31:40 +08:00
e92fa0bfb4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 16:31:21 +08:00
dc50d95199 铁匠铺交易字段错误 2023-06-27 16:31:13 +08:00
28aa002a9e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 15:35:20 +08:00
e50f43bb68 上传竞技场排行榜更新 2023-06-27 15:35:18 +08:00
5e45649c8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 14:54:02 +08:00
268b0fc270 美食红点注册 2023-06-27 14:53:58 +08:00
c60b1d45c5 修复图鉴错误 2023-06-27 14:52:11 +08:00
d8b78ca40b Merge branch 'liwei' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 14:48:36 +08:00
efd31be11f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 14:38:07 +08:00
a38670f4c5 美食城图鉴红点 2023-06-27 14:38:03 +08:00
02563dfcb6 补充错误日志 2023-06-27 14:35:52 +08:00
0b2899765c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-27 14:30:48 +08:00
1b87931794 修改体力转经验 2023-06-27 14:30:34 +08:00
b671dccd5b 上传代码 2023-06-27 14:22:32 +08:00
ae9f9f42b7 bug 26481烹饪的菜吃了增加的好感度 2023-06-27 14:19:05 +08:00
10b33bd505 宝箱走新掉落 2023-06-27 11:01:05 +08:00
03be6755ca 上传装备埋点修复 2023-06-27 10:25:01 +08:00
f2f2938780 烹饪的菜吃了增加的好感度 字段调整 2023-06-26 23:00:06 +08:00
5d9afc817a 出售装备 返回err 对象 2023-06-26 22:29:24 +08:00
3aeceb557c 抽卡次数记录 2023-06-26 21:56:49 +08:00
9e1ebbd659 装备回收报错 2023-06-26 21:37:41 +08:00
4dfdad08a9 抽出5星英雄后A次抽奖内不会再抽到5星英雄 2023-06-26 21:28:05 +08:00
5053fe88ae 装备出售 2023-06-26 21:12:22 +08:00
b66472dc64 枚举定义抽卡类型 2023-06-26 20:40:20 +08:00
239c1756ff Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 20:11:04 +08:00
775716bde7 体力药剂使用 2023-06-26 18:54:27 +08:00
c892485391 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 18:29:50 +08:00
356c42614e 上传充值月卡问题 2023-06-26 18:29:47 +08:00
5e8d76cef8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 18:16:17 +08:00
2adbe3b573 修改体力溢出 2023-06-26 18:16:05 +08:00
f092dbbc95 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 18:11:58 +08:00
4f637ea9bf 小游戏发放额外奖励 2023-06-26 18:11:55 +08:00
9948eece60 抽卡规则调整 2023-06-26 17:49:33 +08:00
dd05f01756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 17:46:43 +08:00
c700e565a4 累计登录天数埋点 2023-06-26 17:46:27 +08:00
ca95f7e02d 修复待领取状态 2023-06-26 17:46:04 +08:00
34de6aa72d 上传竞技场设置防守阵型问题 2023-06-26 17:43:52 +08:00
1cc9c7a051 抽卡规则调整 2023-06-26 17:02:25 +08:00
0d7e23af9c 上传商店优化 2023-06-26 14:51:24 +08:00
081657a4b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-06-26 14:49:33 +08:00
cbda3c4c10 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-26 14:23:36 +08:00
0daa74e069 上传装备洗练和道具添加优化 2023-06-26 14:23:31 +08:00
d86d604769 移除维京manexp 字段 主角经验改用消耗体力转换经验 2023-06-26 12:06:20 +08:00
3136587f7b 上传配置 2023-06-25 21:21:05 +08:00
734a03e56d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 20:57:33 +08:00
355df5e380 上传bug修复代码 2023-06-25 20:57:30 +08:00
aa1fff7273 从掉落表获得的数据也插入到获得道具中,并通知客户端 2023-06-25 18:54:46 +08:00
14c145bc4f 维京战斗 获得英雄经验还是用map 类型 2023-06-25 18:45:55 +08:00
b773c55d60 英雄经验类型调整 2023-06-25 18:33:49 +08:00
f7ab12e4fd 增加战斗结束英雄经验推送 2023-06-25 18:27:02 +08:00
894d7ce1b2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 17:48:46 +08:00
6e61f6220a 掉落优化 2023-06-25 17:48:40 +08:00
acbf0e2f27 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 17:36:28 +08:00
3cdaf7611e 同步配置和洗练 2023-06-25 17:36:24 +08:00
ed188b41d2 推送炉温恢复满时间 2023-06-25 17:01:08 +08:00
8329525333 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 16:44:11 +08:00
284ce9af60 用户活动数据 2023-06-25 16:44:07 +08:00
3c8a57841b 上传错误吗信息 2023-06-25 16:24:55 +08:00
c15b96b3ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 14:52:05 +08:00
2043d4f468 上传工会创建时铭感词校验 2023-06-25 14:52:02 +08:00
afad9578de Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 14:25:34 +08:00
cf6f80a7d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-25 14:15:38 +08:00
5ab8508a76 上传装备主属性升级带啊吗 2023-06-25 14:15:36 +08:00
fff5836c03 输出详细的报错信息 2023-06-25 11:31:42 +08:00
5b014ef141 Rtype200 任务 2023-06-25 11:19:47 +08:00
d223ccb513 update 2023-06-21 19:09:36 +08:00
ddb7c86d48 错误码 2023-06-21 17:45:10 +08:00
a70b600062 抽卡 2023-06-21 17:21:41 +08:00
247aff493d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-21 17:20:25 +08:00
e6a573d2ac 上传道具修改 2023-06-21 17:20:21 +08:00
507200e985 err log 2023-06-21 16:46:49 +08:00
3d7d9b5189 errorcode 2023-06-21 16:44:08 +08:00
801bee697d 解决冲突 2023-06-21 16:42:50 +08:00
6122c95a96 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-06-21 16:26:01 +08:00
3d80bf1af6 抽卡 2023-06-21 16:24:21 +08:00
0e89369307 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-21 14:19:14 +08:00
a72a3196d8 更新errorcode 2023-06-21 14:19:08 +08:00
456b361442 主线新增掉落奖励 2023-06-21 11:45:18 +08:00
bd862f3475 维京走新掉落 2023-06-21 11:32:09 +08:00
e1b5fc5101 新版抽卡配置解析 2023-06-21 11:02:18 +08:00
3f932157a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-20 19:57:08 +08:00
cb34105c7a 活动测试数据 2023-06-20 19:57:04 +08:00
5a2d45130e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-20 18:16:29 +08:00
23f1bee9fc worldtask npc配置校验 2023-06-20 18:16:20 +08:00
53e4d49d2e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-20 17:22:13 +08:00
8e026e8f44 上传配置同步 2023-06-20 17:22:10 +08:00
81c17bf1ec 敏感词修改 2023-06-20 16:36:42 +08:00
825f29ab56 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-20 15:36:11 +08:00
67f1d979e0 上传铭感词系统 2023-06-20 15:36:06 +08:00
7ba1eb13a1 敏感词校验 2023-06-20 15:14:40 +08:00
8a1b0c0cc4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-20 15:11:33 +08:00
9011efb0c7 昵称敏感词校验 2023-06-20 15:11:24 +08:00
a0393cfc02 条件过滤 2023-06-20 14:50:09 +08:00
218f1d5665 铁匠铺打造消耗改list atn 2023-06-20 14:26:32 +08:00
790f72b53d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-20 12:02:02 +08:00
e0901115be GM 调整主线关卡记录扩展数据 2023-06-20 12:01:58 +08:00
f633922659 user ps 2023-06-20 10:35:40 +08:00
b6e2ef26bf 上传代码 2023-06-19 21:18:46 +08:00
015006cd8f 羁绊激活bug 2023-06-19 18:25:34 +08:00
0aec9e7eed 主线红点 2023-06-19 16:16:39 +08:00
16dca8f3db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-19 16:10:04 +08:00
0bfda14ee7 红点+ 活动 2023-06-19 16:10:00 +08:00
7452b09940 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-19 15:56:15 +08:00
018d03dd62 装备套装检索错误修复 2023-06-19 15:56:13 +08:00
91b3102d5e 羁绊数据 2023-06-19 15:40:52 +08:00
a986a225ca 添加任务条件容错处理 2023-06-19 14:20:26 +08:00
fbc5261f75 上传任务代码 2023-06-17 15:56:44 +08:00
564f317aff 上传代码 2023-06-17 15:15:40 +08:00
9b11b68040 上传任务优化 2023-06-17 02:34:12 +08:00
a850b4af7a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-17 01:32:21 +08:00
e85a870156 上传代码 2023-06-17 01:32:19 +08:00
85a9bc1115 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-16 21:24:33 +08:00
e1e66b5405 Reddot17106 ,Reddot17107合并 2023-06-16 21:24:26 +08:00
953b8504f4 同步配置 2023-06-16 21:15:21 +08:00
2131e2390f 战斗胜利 根据消耗体力获得经验 2023-06-16 19:23:18 +08:00
c45017fefe Rtype158 2023-06-16 18:42:38 +08:00
e357ddf671 update 2023-06-16 18:10:24 +08:00
ee97d178ca 消耗体力加经验 2023-06-16 18:09:09 +08:00
d8a25f4459 消耗体力加经验 2023-06-16 18:04:16 +08:00
c730cf7cee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-16 17:28:53 +08:00
86c95443b0 update 2023-06-16 17:28:14 +08:00
92ceaf9668 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-16 17:09:33 +08:00
f39d9756f7 Rtype199 2023-06-16 17:09:09 +08:00
liwei
46ccbd1e81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-16 16:06:39 +08:00
8753572ebc 签名校验 2023-06-16 16:05:41 +08:00
liwei
d0411dadc1 上传代码 2023-06-16 15:15:13 +08:00
liwei1dao
1359da0f16 上传发货api优化 2023-06-16 11:12:47 +08:00
59ad039502 update 2023-06-15 23:53:47 +08:00
8741b5fecd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 23:52:12 +08:00
28b0246604 红点类型 2023-06-15 23:52:08 +08:00
liwei1dao
43710b43ec 上传红点 2023-06-15 23:51:50 +08:00
a97c574ada Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 22:49:48 +08:00
16a840820b 红点接口调整 2023-06-15 22:49:44 +08:00
liwei1dao
48f00e2f9d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 22:43:43 +08:00
liwei1dao
10b20be9c2 上传红点修复 2023-06-15 22:43:35 +08:00
7407e5a536 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 22:37:51 +08:00
265b1a2fe6 gm修改章节id 2023-06-15 22:37:48 +08:00
liwei1dao
6d05352445 上传红点接口调整 2023-06-15 22:34:52 +08:00
d253ece803 gm 跳转设置stageid 2023-06-15 22:28:13 +08:00
liwei1dao
e6ecb1e31d Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 21:05:17 +08:00
liwei1dao
5c299aced4 红点需求 2023-06-15 21:05:06 +08:00
5f6fa01dab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 21:01:08 +08:00
f225ec088f update 2023-06-15 21:00:57 +08:00