Commit Graph

4207 Commits

Author SHA1 Message Date
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
fed0de37af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 20:54:52 +08:00