Commit Graph

4608 Commits

Author SHA1 Message Date
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