Commit Graph

4207 Commits

Author SHA1 Message Date
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
fed0de37af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 20:54:52 +08:00
a766977fbd 主线关卡领取奖励红点推送 2023-06-15 20:54:13 +08:00
402f931b51 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 20:26:10 +08:00
221c9844db 好友红点 2023-06-15 20:25:46 +08:00
acfb281523 羁绊红点注册 2023-06-15 20:24:34 +08:00
c5d64aebf1 err对象返回 2023-06-15 19:57:44 +08:00
3b9f8f85a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 18:47:10 +08:00
fdcd38e622 红点 2023-06-15 18:47:04 +08:00
f57ec9d2fd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 17:42:32 +08:00
0d621cd9ae 任务中多条件校验 2023-06-15 17:42:25 +08:00
liwei1dao
ea2bafc2b2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 17:33:30 +08:00
liwei1dao
a0fb371cda 上传装备强化统计修复 2023-06-15 17:33:21 +08:00
edc845ca0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 16:24:40 +08:00
2e31065499 羁绊红点 2023-06-15 16:24:30 +08:00
liwei1dao
e42fa2b91f 上传任务41和42 的数据插入机制 2023-06-15 15:41:24 +08:00
liwei1dao
56c0671fd2 上传竞技场红点 2023-06-15 15:15:40 +08:00
5091d2c9b9 Rtype51 2023-06-15 13:47:44 +08:00
309690ca97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 13:44:42 +08:00
cd3d246b48 铁匠铺下单n个装备 买点 2023-06-15 13:44:33 +08:00
liwei1dao
9449cdcb04 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:59:19 +08:00
liwei1dao
e44cde1b9b 上传红点推送接口 2023-06-15 11:59:10 +08:00
cd3e4eb14e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:40:28 +08:00
ebcc7ec57f 修复铁匠铺任务进度 2023-06-15 11:40:21 +08:00
liwei1dao
bfbb7b69a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:34:41 +08:00
liwei1dao
794fe30c21 上传星作图数据库修复 2023-06-15 11:34:35 +08:00
cb1c32f356 db创建索引 2023-06-15 11:30:51 +08:00
dca0850ff3 英雄 天赋增加英雄等级校验 2023-06-15 11:10:16 +08:00
72e9f12905 铁匠铺手册台收藏家红点 2023-06-15 09:45:49 +08:00
liwei1dao
d7c80fcde9 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 20:53:48 +08:00
liwei1dao
6cd42dc9f1 上传代码 2023-06-14 20:53:05 +08:00
fb970cc355 battle errordata 2023-06-14 18:45:29 +08:00
2892a2d38f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 18:12:38 +08:00
76e670c350 删除测试数据 2023-06-14 18:12:32 +08:00
f44e853bbc gm 主线调整 2023-06-14 18:11:10 +08:00
f41a8d0ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 18:06:41 +08:00
1ba179f675 条件状态判断 2023-06-14 18:06:37 +08:00
liwei1dao
f0dbc0c991 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 17:55:58 +08:00
liwei1dao
a7a056d6b7 上传支付配置同步 2023-06-14 17:55:19 +08:00
4f2660fabb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 16:36:19 +08:00
ba4dfa300f 更改协议名 2023-06-14 16:36:10 +08:00
liwei1dao
609c5db7dd 上传配置代码 2023-06-14 16:07:54 +08:00
liwei1dao
e39d88ad01 上传定制装备未入库bug 2023-06-14 15:46:19 +08:00
c03a1c3873 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:24:08 +08:00
1bb52c4df9 update 2023-06-14 15:24:02 +08:00
liwei1dao
d89d09a182 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:16:51 +08:00
liwei1dao
589dc28e25 上传代码 2023-06-14 15:16:43 +08:00
cca1a56cdb Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:11:51 +08:00
a5c6d0d045 铁匠铺红点信息 2023-06-14 15:10:49 +08:00
liwei1dao
953cb783db 上传后台消息推送 2023-06-14 11:20:23 +08:00
b50497a9e8 修改推送顺序 2023-06-14 10:35:35 +08:00
5cdac676ad update config 2023-06-14 10:08:34 +08:00
liwei1dao
3814c6fd32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 09:13:53 +08:00
liwei1dao
24067fdc01 上传错误码修复异常 2023-06-14 09:13:47 +08:00
108b59823c 收到战报数据清空预扣体力值 2023-06-13 15:37:28 +08:00
81b2bf3b6c 主线体力消耗 2023-06-13 15:19:32 +08:00
1c68fe0051 gm 主线跳过修复 2023-06-13 14:27:11 +08:00
34df1dbb35 优化 抽卡获得顺序问题 2023-06-13 12:27:42 +08:00
0f8384554b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 18:38:42 +08:00
bf6517b740 update测试api 2023-06-12 18:38:15 +08:00
9aa7f785f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 17:21:45 +08:00
2853b38c97 英雄数据结构优化 2023-06-12 17:21:40 +08:00
liwei1dao
460a614dfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 17:05:18 +08:00
liwei1dao
5bbf812032 上传代码 2023-06-12 17:05:13 +08:00
liwei1dao
4d4ab2f40c 上传装备强化奔溃修复 2023-06-12 16:58:30 +08:00
1b205d6486 公告字符长度校验 2023-06-12 16:50:13 +08:00
liwei1dao
ee0bc82fbd 修复升级漏洞 2023-06-09 22:14:29 +08:00
liwei1dao
4bb2cd7219 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 22:11:29 +08:00
liwei1dao
12d66a7ac7 上传代码 2023-06-09 22:11:15 +08:00
44d2364bf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 21:55:13 +08:00
73b1ac3cb6 update 2023-06-09 21:55:06 +08:00
b105a3ff13 code 1030 2023-06-09 21:53:44 +08:00
f44d0af84c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 20:46:06 +08:00
408a1bceb7 图鉴批处理优化 2023-06-09 20:45:50 +08:00
liwei1dao
18a9c8ab66 上传武馆npc踢馆条件管理 2023-06-09 18:21:36 +08:00
03fd5d2018 功能开启条件校验接口 2023-06-09 18:15:12 +08:00
65b97a090e 接口调整 2023-06-09 18:14:06 +08:00
08a8764fe6 移出测试代码 2023-06-09 18:01:00 +08:00
9272f7d210 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 17:59:46 +08:00
0597d946a2 查询opencond 配置 2023-06-09 17:59:37 +08:00
2dc37245e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 17:43:56 +08:00
11caf9c623 铁匠铺任务进度 2023-06-09 17:43:41 +08:00
a4c58224e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 16:48:42 +08:00
e8c3d27a84 商队等级 2023-06-09 16:48:33 +08:00
liwei1dao
db9a6687a1 修复装备强化 2023-06-09 16:09:22 +08:00
liwei1dao
f1908b1ef0 上传竞技场连胜判断 2023-06-09 14:10:38 +08:00
d439182012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 13:53:53 +08:00
dcef2d09e3 修改参数长度判断 2023-06-09 13:53:38 +08:00
liwei1dao
4c633216c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 13:50:39 +08:00
liwei1dao
d593bd13c8 伤处装备套装机制改动 2023-06-09 13:50:26 +08:00
752ef2d4b1 gm 跳转功夫大师塔 2023-06-09 12:01:19 +08:00
1267ff1129 gm 调整vip 等级做校验 2023-06-09 11:20:31 +08:00
acfcdbd4b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 11:08:05 +08:00
4f0192d25f GM 解锁所有难度 2023-06-09 11:08:02 +08:00
9bb0d46e95 推送清理已完成的任务 2023-06-09 10:53:21 +08:00
liwei1dao
73ced03a17 上传装备产出随机 2023-06-08 22:02:56 +08:00
liwei1dao
50a630dc7a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 21:16:12 +08:00
liwei1dao
ecc590160c 上传装备埋点修复 2023-06-08 21:15:54 +08:00
ad279e82b6 图鉴检测 2023-06-08 21:10:06 +08:00
b023c7dd3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 20:54:26 +08:00
768dd1e304 err 2023-06-08 20:54:20 +08:00
liwei1dao
a1f3bf1ae2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 20:51:29 +08:00