Commit Graph

4911 Commits

Author SHA1 Message Date
c6a52059cb 战斗英雄信息+ 事件校验 2023-07-27 16:10:25 +08:00
a05d0c235f 上传世界任务变化 2023-07-27 15:57:34 +08:00
b83c20ac3c 上传宝箱兑换 2023-07-27 15:51:27 +08:00
a1e7da023d 校验完成事件后导致开启的传送门又关闭了 2023-07-27 15:50:42 +08:00
bc56a6c3ea 上传配置 2023-07-27 15:21:19 +08:00
cc24f33eac 上传任务宝箱领取代码 2023-07-27 15:12:07 +08:00
9d100dbfdb 上传工会消息转发配置 2023-07-27 14:48:30 +08:00
bedef819fe 打印未找到道具配置错误信息 2023-07-27 14:11:38 +08:00
ea907b1764 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 13:57:02 +08:00
bf169a3334 上传代码 2023-07-27 13:56:59 +08:00
9d76abac5e stageid 赋值 2023-07-27 12:01:25 +08:00
6d142ceac4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 11:56:01 +08:00
0daedcbfa7 秘境优化 2023-07-27 11:55:57 +08:00
c0be6359fe 上传主线修复 2023-07-27 11:51:33 +08:00
12d495ef7d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 11:44:32 +08:00
deb7fcc0c4 上传工会boos战代码 2023-07-27 11:44:29 +08:00
dd06dbf02b 报错 2023-07-27 11:23:56 +08:00
696085bb7c 石阵秘境结算rpc 通知 2023-07-27 11:15:05 +08:00
b9b920c844 优化 2023-07-27 11:02:40 +08:00
2c41019dea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 10:15:09 +08:00
aa549856c3 推送关卡boss 房间数据类型调整 2023-07-27 10:14:50 +08:00
fbdc11490b 上传清理排行榜 2023-07-27 10:10:15 +08:00
15a10c074d 上传工会排名数据 2023-07-27 10:08:41 +08:00
5b1085cd04 上传日常任务代码 2023-07-26 22:02:21 +08:00
df522d05f7 上传宝箱入库 2023-07-26 21:02:07 +08:00
f8196891e5 上传配置 2023-07-26 20:54:31 +08:00
deee1f3f15 上传主线和任务相关 2023-07-26 20:50:43 +08:00
22bf7e969c 上传日常任务 2023-07-26 20:39:04 +08:00
2bf552053d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 20:18:24 +08:00
f7329410d7 全服boss 数据生成 2023-07-26 20:18:20 +08:00
12f5f89dea 上传代码 2023-07-26 20:11:09 +08:00
d2cdc79341 命名问题 2023-07-26 19:51:37 +08:00
c3e87890bc update 2023-07-26 19:45:38 +08:00
7afd084cde update 2023-07-26 19:42:48 +08:00
085ffa0b4b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 19:17:15 +08:00
15ebfe8094 上传代码 2023-07-26 19:16:27 +08:00
ef433418d3 战斗事件处理 2023-07-26 19:07:46 +08:00
f3e53499d5 上传主线 2023-07-26 18:48:24 +08:00
50a72efde9 上传宝箱初始化 2023-07-26 17:40:07 +08:00
59e5ad1371 上传世界任务宝箱协议 2023-07-26 17:36:28 +08:00
66ede35f5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 17:04:47 +08:00
cbaeb72171 上传宝箱代码 2023-07-26 17:04:44 +08:00
5574d2affb 石阵数据生成 2023-07-26 16:55:08 +08:00
362d6a72d7 上传世界任务接口同步 2023-07-26 16:48:54 +08:00
419f07ac65 通关条件校验 2023-07-26 15:44:23 +08:00
4c816beaff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 15:42:05 +08:00
edc0ecf7e9 随机我方、敌方buff 2023-07-26 15:42:01 +08:00
47b5bf4c3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 15:15:34 +08:00
b2cb400165 上传工会战斗排名 2023-07-26 15:15:32 +08:00
fa0acb2647 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 14:44:09 +08:00
89afd772a5 启动服务 生成本服的BOSS数据 2023-07-26 14:43:25 +08:00
e2a908def5 上传工会战机好友记录 2023-07-26 14:27:05 +08:00
b6f9c93c71 上传代码配置 2023-07-26 14:05:14 +08:00
3bff8f6eef 上传配置中心 2023-07-26 12:31:34 +08:00
ca8d0feb99 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-26 12:02:25 +08:00
ebc029adf7 上传配置数据 2023-07-26 12:02:03 +08:00
91f0881103 已有buff 过滤 2023-07-26 10:34:45 +08:00
301f4c6af1 update 2023-07-25 20:05:13 +08:00
2985f7d570 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-25 19:48:40 +08:00
11837949b4 buff掉落配置调整 2023-07-25 19:48:37 +08:00
b53dfc9ad8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-25 19:48:26 +08:00
94e7c2e725 上传进度 2023-07-25 19:48:23 +08:00
ddd0dd5b5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-25 19:33:23 +08:00
a4e8ecfcdd 石阵秘境 2023-07-25 19:32:12 +08:00
857f58feba 上传代码 2023-07-25 19:25:31 +08:00
cddf0dfc54 上传工会boos战代码 2023-07-25 18:31:45 +08:00
2015c30bc6 上传可接取任务列表 2023-07-25 17:02:01 +08:00
9ecabce25c 上传日常任务 2023-07-25 16:55:34 +08:00
0d43df5c17 上传日常任务代码 2023-07-25 16:55:23 +08:00
5eb34491f5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-25 16:14:41 +08:00
bc2efc3530 上传新主线 2023-07-25 16:14:29 +08:00
50c1fa8877 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-25 16:09:45 +08:00
3293369ab7 石阵秘境 2023-07-25 16:09:41 +08:00
0bfb5ee096 优化gm异常情况 2023-07-25 15:20:41 +08:00
6b917ba72e 上传gm优化 2023-07-25 15:07:54 +08:00
77a00beecd 处理世界任务gm命令修复 2023-07-25 14:36:03 +08:00
853488cc52 上传答题协议优化 2023-07-25 10:15:22 +08:00
db05cddb70 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-25 10:08:36 +08:00
ae59f82e02 修复问答系统 2023-07-25 10:08:34 +08:00
948b4eeeed 删除测试文件 2023-07-24 18:35:25 +08:00
395cb5a44b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-24 18:27:47 +08:00
8136babd5b 石阵秘境 2023-07-24 18:27:43 +08:00
3df2f8019f 处理任务进度显示 2023-07-24 18:21:02 +08:00
6516f97ec6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-24 16:54:00 +08:00
a147523d00 上传洗练确认属性算法不一致问题 2023-07-24 16:53:57 +08:00
f227ddf96a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-24 16:15:52 +08:00
27ce02188a 石阵秘境配置解析 2023-07-24 16:15:49 +08:00
951782422c 日常任务推送 2023-07-24 16:08:36 +08:00
3ec4c59f61 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-24 16:07:19 +08:00
3a0fbeee63 上传武馆修炼优化 2023-07-24 16:07:17 +08:00
2a29f2f952 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-24 15:17:40 +08:00
27e5e83322 首通奖励推送 2023-07-24 15:17:37 +08:00
aecab14326 上传跑环任务 2023-07-24 15:17:14 +08:00
5ce6b12469 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-24 13:46:08 +08:00
577173ef76 上传周任务代码 2023-07-24 13:46:04 +08:00
d8ca98f2e2 map 初始化 2023-07-21 22:29:38 +08:00
b1b6df83a8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-21 20:41:54 +08:00
58910d3c6e 金币商店装备预览 2023-07-21 20:41:35 +08:00
3dd386a6fe 巨石秘境 2023-07-21 20:41:18 +08:00
5aa5d0d90f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-21 16:45:48 +08:00
562367e410 上传问卷调查代码 2023-07-21 16:45:26 +08:00
0a09dcedf9 抽卡 去掉抽出5星英雄后A次抽奖内不会再抽到5星英雄 规则 2023-07-21 14:49:15 +08:00
8433020849 上传武馆领奖bug 2023-07-21 11:33:27 +08:00
9def951db4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-20 18:30:22 +08:00
88efe7a225 石阵秘境 2023-07-20 18:30:03 +08:00
c70987c66e 上传任务代码 2023-07-20 18:18:54 +08:00
b3ca3c4f5b 上传日常任务 2023-07-20 18:15:50 +08:00
c94d65af7b 修复日常任务代码 2023-07-20 18:13:01 +08:00
f05e0a84bb 上传用户登录时间推送 2023-07-20 18:09:19 +08:00
f162e9685f 上传日常触发机制 2023-07-20 18:06:44 +08:00
c363d6e742 优化日志 2023-07-20 17:54:38 +08:00
1a535d07ca 上传配置 2023-07-20 17:52:10 +08:00
25b62c6aa8 上传日常任务代码 2023-07-20 17:43:32 +08:00
86bfa7953c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-20 15:42:20 +08:00
291034c9bc 上传带啊吗 2023-07-20 15:42:15 +08:00
fc9876d582 db数据实例化 2023-07-20 15:39:41 +08:00
b68eb58f28 阵营塔循环塔战斗类型分开 2023-07-20 14:50:25 +08:00
a2cfc059d3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-19 18:38:03 +08:00
24e1525ec4 石阵秘境协议 2023-07-19 18:38:00 +08:00
3d50e2551a 上传共鸣水晶排序问题 2023-07-19 18:18:38 +08:00
8f84a12855 上传工会boos战代码 2023-07-19 18:11:40 +08:00
fb084e55d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-19 17:44:37 +08:00
306c463838 上传工会boos优化 2023-07-19 17:44:35 +08:00
41d66bdc5f 活动结束 补发没有领取的圣桃树奖励 2023-07-19 15:05:43 +08:00
e6df343936 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-19 14:28:34 +08:00
ce72ae32bb 圣桃树活动 配置时间为天 2023-07-19 14:28:31 +08:00
defae669b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-19 14:14:27 +08:00
a3a50eed67 上传工会boos战代码 2023-07-19 14:14:24 +08:00
1033d34b64 批量发送邮件改红点推送 2023-07-19 10:13:32 +08:00
438dda8e45 #28744 子任务 【梦工场系统】 <-后端-> 【英雄回响】回响配置调整 2023-07-19 09:41:41 +08:00
3b33ec34a9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-19 09:29:46 +08:00
714526e357 回响属性配置调整 2023-07-19 09:29:43 +08:00
593472e461 上传招募代码 2023-07-18 19:21:34 +08:00
e102d2f548 上传代码 2023-07-18 18:25:31 +08:00
8cde9ee7f0 上传代码 2023-07-18 18:18:47 +08:00
b20f5c5a4f 上传配置 2023-07-18 17:49:32 +08:00
5f1ef25006 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-18 17:33:26 +08:00
0ac9adff03 排行榜里玩家头像 用玩家皮肤字段表示 2023-07-18 17:33:23 +08:00
92373d9ab9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-18 17:30:44 +08:00
5942706007 上传配置 2023-07-18 17:30:42 +08:00
b81c5a7a74 构建一个虚拟等级的英雄 2023-07-18 17:28:33 +08:00
23b0a66fd5 邮件接口扩展 新增动态参数 2023-07-18 17:23:53 +08:00
6cc41aa886 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-18 17:19:50 +08:00
8452a0062b 通过邮件id 批量发送邮件 2023-07-18 17:19:47 +08:00
caee5a30c6 上传代码 2023-07-18 17:15:45 +08:00
f5fddc539e 上传代码 2023-07-18 17:12:36 +08:00
c68e33a785 修复编译错误 2023-07-18 17:08:00 +08:00
1109709ffd 上传代码 2023-07-18 17:06:43 +08:00
aa5d494761 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-18 17:02:28 +08:00
a001631410 上传代码 2023-07-18 17:02:26 +08:00
30c284b222 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-18 16:34:42 +08:00
6c04048d2e 限定招募抽到5星替换成心愿英雄 2023-07-18 16:34:39 +08:00
77d5c22b86 上传工会代码 2023-07-18 16:16:51 +08:00
4b22acb0d2 上传 2023-07-18 15:31:14 +08:00
687446986d 修复代码 2023-07-18 14:38:42 +08:00
3f8f56b741 上传支付代码修复 2023-07-18 14:29:12 +08:00
815426f20c 上传代码 2023-07-18 14:02:24 +08:00
5647f0273b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-18 11:15:51 +08:00
4e39cb4afe 邮件奖励优化 商队重置数据补充 2023-07-18 11:15:47 +08:00
175c3391f3 上传配置 2023-07-18 10:58:56 +08:00
28c7975613 上传代码和配置 2023-07-18 10:30:56 +08:00
9069e57a77 上传今日领取 2023-07-18 10:03:04 +08:00
daa6ae4123 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-17 19:59:01 +08:00
37cc987fc9 商队调整 2023-07-17 19:58:56 +08:00
a07f14631b 上传工会boos战代码 2023-07-17 18:47:44 +08:00
f665defda7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-17 18:00:14 +08:00
c8a4e47592 上传工会任务代码 2023-07-17 17:59:39 +08:00
622413cd4a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-17 17:44:30 +08:00
7a8ddde9dd 更新 优化体力 2023-07-17 17:44:27 +08:00
a84588068a 上传工会任务代码 2023-07-17 15:24:38 +08:00
0dc3be1fad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-17 15:23:57 +08:00
82f1562291 上传工会任务代码优化 2023-07-17 15:23:55 +08:00
8d5eaf8547 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-17 14:46:28 +08:00
9c8ec08e22 update 2023-07-17 14:46:23 +08:00
7dbb1e2424 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-17 13:41:35 +08:00
08b3412db1 上传工会boos战代码 2023-07-17 13:41:29 +08:00
62e5ef42b8 更新虚拟币 2023-07-17 11:51:11 +08:00
01fff352e0 商队任务过滤 类型为2 的任务组 做过就不再出现 2023-07-17 10:15:37 +08:00
b4284d5c69 商队需求商品系数/千分比字段赋值 2023-07-14 21:52:10 +08:00
733d6f5658 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-14 21:20:02 +08:00
077493cf61 update 2023-07-14 21:19:59 +08:00
e0c946a7df 上传任务修改 2023-07-14 21:02:20 +08:00
a371394040 上传pb文件 2023-07-14 20:17:27 +08:00
d429fc412b 排行加性别字段 2023-07-14 20:16:10 +08:00
b5c8b5aa16 阵营每日通关数据重置 2023-07-14 20:14:56 +08:00
81f2b568ef 循环塔排行 2023-07-14 19:55:20 +08:00
f13cb072e4 赠送友情点不用判断在线 2023-07-14 18:54:45 +08:00
a2e890eefd 临时需求 点赞给好友加友情点 2023-07-14 18:52:37 +08:00
96f906ddae 阵营排行 2023-07-14 18:38:57 +08:00
6fa9bfef8f 圣桃领奖校验 2023-07-14 17:08:11 +08:00
74e7f6a424 自动连续战斗 排行问题修复 2023-07-14 16:31:54 +08:00
7aa09a1e12 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-14 15:36:02 +08:00
28fcdd8166 商队小道消息开发 2023-07-14 15:35:58 +08:00
1bc39a1114 上传商队任务接取逻辑优化 2023-07-14 14:57:35 +08:00
aa692be3a2 处理商队任务是否可以重复接取 2023-07-14 14:50:48 +08:00
ac23f1043f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-14 14:04:56 +08:00
4feab9788e 上传世界任务跳转 2023-07-14 14:04:51 +08:00
b847ffd8fd 商队小道消息改造 2023-07-14 13:39:09 +08:00
2c7e328a8b 圣桃招募奖励领取时间校验 2023-07-14 11:00:37 +08:00
5f9600b77c 体力扣除修复 2023-07-13 19:22:32 +08:00
6eb02dfe2b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 18:40:00 +08:00
1c0578e5c7 赛季塔跨服排行 2023-07-13 18:39:56 +08:00
d4afc63b3a 上传工会申请列表优化 2023-07-13 17:08:48 +08:00
2061edcd25 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 16:51:13 +08:00
6921950914 修复工会活跃的bug 2023-07-13 16:51:10 +08:00
75bfe5e688 模块注册 2023-07-13 16:45:59 +08:00
e1dc59f4fb 批量打造优化 2023-07-13 16:38:20 +08:00
8dd12dd6d3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 16:04:12 +08:00
feb88b4af7 上传充值礼包代码 2023-07-13 16:04:09 +08:00
dd3e5244f9 同步 2023-07-13 15:38:29 +08:00
68dd6cd009 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 15:37:03 +08:00
4ca0fa397a 接口不同 校验普通塔是否通关 2023-07-13 15:36:59 +08:00
2e4519a4d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 15:36:20 +08:00
4185079536 上傳活動禮包代碼 2023-07-13 15:36:18 +08:00
ee00954ac0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 15:20:25 +08:00
7836bd7531 铁匠铺图鉴获得重复英雄奖励自动转碎片 2023-07-13 15:20:18 +08:00
f2dafd9e35 上傳共鳴水晶排序 2023-07-13 15:14:59 +08:00
1779d6d714 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 14:20:24 +08:00
9302152195 上传活动充值礼包 2023-07-13 14:20:22 +08:00
5d302312b2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 11:49:52 +08:00
116a01ba0e 打造触发材料消耗减少时处理 2023-07-13 11:49:49 +08:00
4238b67be1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 11:18:43 +08:00
68e3b4360c 修复时间轮系统bug 2023-07-13 11:18:39 +08:00
735c2ca114 心愿选定英雄返回 2023-07-13 10:51:24 +08:00
14626a8e67 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 10:35:21 +08:00
2b255c3242 限定招募 许愿招募 限定英雄 2023-07-13 10:35:17 +08:00
223289de32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 10:18:41 +08:00
782a67734b 上传商店优化 2023-07-13 10:18:39 +08:00
7c9e61d1b0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 10:14:12 +08:00
3c42593139 圣桃树奖励领取 2023-07-13 10:14:09 +08:00
72a3246f7e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-13 10:02:13 +08:00
7698142adf 上传商店和共鸣水晶 2023-07-13 10:02:10 +08:00
b493027127 循环塔初始层数为0 2023-07-12 19:31:30 +08:00
19f5ee166e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 18:19:23 +08:00
5d38eef5b9 #28091 缺陷 【梦工场系统】 【玩家信息】玩家信息中的功夫塔维京狩猎的功能更记录都是无记录,实际上我是有通关过的 2023-07-12 18:19:17 +08:00
48de8a84f9 上传传功最高等级 2023-07-12 18:08:24 +08:00
59577fa35f 上传商店代码修复 2023-07-12 17:16:00 +08:00
fa8e950733 装备洗练问题 2023-07-12 16:13:52 +08:00
7af53cf7ff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 16:07:51 +08:00
164067f12e 上传配置 2023-07-12 16:07:26 +08:00
47bc315e2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 16:03:33 +08:00
371460b902 招募相关 2023-07-12 16:03:30 +08:00
17df04439d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 15:53:06 +08:00
f90f2aa62e 上传gm工具修复 2023-07-12 15:49:30 +08:00
c78a491c56 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 11:41:02 +08:00
51e91a5ea1 抽卡新增限定和许愿抽 2023-07-12 11:40:59 +08:00
db0418df82 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 11:31:36 +08:00
d663458880 上传竞技场代码 2023-07-12 11:31:33 +08:00
16f0eddb18 删除不需要的日志信息 2023-07-12 09:49:06 +08:00
36e04cec3b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-12 09:46:46 +08:00
f7dbcd42bc 定时器 每天0点 校验是否 有结算任务 2023-07-12 09:46:42 +08:00
86f04723b0 上传战令代码 2023-07-11 21:44:52 +08:00
36d26e0448 上传代码 2023-07-11 21:06:15 +08:00
07066adfe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 20:50:10 +08:00
6a719b6b47 上传商队任务 2023-07-11 20:50:08 +08:00
471730d46f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 20:33:26 +08:00
ba1d0f0ad3 商队任务超时处理 2023-07-11 20:33:19 +08:00
d14f0e8d9f 上传传功塔代码 2023-07-11 20:09:45 +08:00
5f8665e133 上传世界任务商队支持 2023-07-11 20:01:27 +08:00
62a6b30293 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 19:55:03 +08:00
e76a4020d1 上传世界任务商队任务支持 2023-07-11 19:55:00 +08:00
5b1ac18386 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 19:50:56 +08:00
bc0c9f55c7 任务完成批处理 2023-07-11 19:50:53 +08:00
77c3f7531a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 19:48:18 +08:00
ed14517606 上传世界任务代码 2023-07-11 19:48:16 +08:00
ae2747e484 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 19:20:25 +08:00
91eed5d252 #27921 缺陷 【梦工场系统】 【觉醒】啊啊三阶段觉醒没显示加成 2023-07-11 19:20:21 +08:00
afe33770fd 上传任务代码 2023-07-11 19:06:24 +08:00
62d0e300fc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 18:46:34 +08:00
1ee426fcbc 上传水晶代码 2023-07-11 18:46:22 +08:00
ae8631a2c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 18:44:19 +08:00
eadf3027ca #27556 【巨怪商队】-背包使用负重的概念,商品配置负重值 2023-07-11 18:44:15 +08:00
f778c6829b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 18:40:31 +08:00
2ffc185bc0 上传埋点配置代码优化 2023-07-11 18:40:26 +08:00
2c714293c8 临时去掉循环塔 赛季塔 开启条件 2023-07-11 18:20:42 +08:00
29e0cdda57 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 17:28:37 +08:00
3ea012070b 商队计算下一周期 货物的信息 2023-07-11 17:28:34 +08:00
670ee97952 上传服务器代码 2023-07-11 16:01:40 +08:00
a878db2faf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 15:14:41 +08:00
b651cd3406 上传战斗代码 2023-07-11 15:14:38 +08:00
3e5f22f697 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 14:25:05 +08:00
d30356c0c2 初始化循环塔数据 2023-07-11 14:25:02 +08:00
3d5ff61e1d 上传代码 2023-07-11 14:19:56 +08:00
dbaa61e0f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 12:04:21 +08:00
da5d36256a 上传代码 2023-07-11 12:04:18 +08:00
2654416ceb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 11:39:22 +08:00
202000cdbc 战斗事件传入 2023-07-11 11:39:19 +08:00
c4ee0e3375 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-11 11:35:55 +08:00
76685f3a37 上传任务进度推送 2023-07-11 11:35:52 +08:00
de40390778 战斗全局事件 2023-07-11 11:21:57 +08:00
23327c0026 赛季塔每日挑战上限 2023-07-11 11:17:43 +08:00
2919cbb3a4 战斗胜利buf 获取 2023-07-11 10:05:48 +08:00
e5c7e05cb5 赛季结束时间 2023-07-10 21:24:24 +08:00
7130c5141f 赛季数据解析 2023-07-10 21:16:26 +08:00
adced06a7a #27819 好友黑名单BUG 2023-07-10 19:44:25 +08:00
509e1d6b60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 18:39:36 +08:00
bd70b4a435 商队修改 2023-07-10 18:39:33 +08:00
631994c63a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 18:15:05 +08:00
d7a0279330 上传网络优化 2023-07-10 18:15:02 +08:00
4558c28595 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 17:54:17 +08:00
ec65a9d6a4 跨服排行数据显示区服id 2023-07-10 17:54:13 +08:00
82dfe43457 上传共鸣水晶代码 2023-07-10 17:32:24 +08:00
16cb8c7108 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-10 17:25:00 +08:00
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