Commit Graph

5817 Commits

Author SHA1 Message Date
7cc1b6af45 #31719 缺陷 【梦工场系统】 <-QA-> 【石阵秘境】结算时奖励发放判断错误 2023-08-18 10:48:39 +08:00
7b1f234bb1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 10:41:38 +08:00
959775f19c 活动更新通知 2023-08-18 10:41:34 +08:00
liwei1dao
74150fbb06 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 10:37:17 +08:00
liwei1dao
13df3ec330 上传埋点类型 2023-08-18 10:37:09 +08:00
feac8878c8 战斗失败血量继承 2023-08-17 21:07:36 +08:00
3cd85c4d91 小关通关条件校验 2023-08-17 20:55:50 +08:00
058f3b5ffd 总结算的时候记录通关数据 2023-08-17 18:37:00 +08:00
7d2f1dfcc8 埋点校验 2023-08-17 18:33:54 +08:00
892168f020 记录是否首通 2023-08-17 17:32:05 +08:00
aee41b80f9 Rtype222 2023-08-17 17:12:22 +08:00
d8cd9cafbc 埋点 Rtype226 Rtype222 2023-08-17 17:05:09 +08:00
liwei1dao
f013b29dc9 上传背包查询接口 2023-08-17 16:58:11 +08:00
liwei1dao
bdefb36245 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-17 16:53:25 +08:00
liwei1dao
fc8695732a 上传好友木桩解锁条件 2023-08-17 16:53:19 +08:00
560cb4a421 手动结束秘境 清除指定道具 2023-08-17 16:47:00 +08:00
28da971b5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-17 15:42:35 +08:00
bbf46cbf98 秘境埋点 2023-08-17 15:42:30 +08:00
liwei1dao
5a7e972350 上传商店装备够吗价格调整 2023-08-17 15:41:00 +08:00
liwei1dao
d1ca1a5e94 上传商店装备价格 2023-08-17 15:37:49 +08:00
liwei1dao
78b87913c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-17 15:20:07 +08:00
liwei1dao
fd4893d99c 上传装备出售调整 2023-08-17 15:20:00 +08:00
28990fea5e 事件消耗异常问题 2023-08-17 14:24:48 +08:00
c5b358007b 秘境 房间初始化 2023-08-17 11:34:00 +08:00
06f569a8ba 任务统计 2023-08-17 10:21:23 +08:00
a079a06c7c 商队任务统计 2023-08-17 10:16:29 +08:00
a15be334b0 获得三选一buff 的时候需重置buff 三选一次数 2023-08-17 09:53:40 +08:00
f595e78333 英雄接口优化 2023-08-17 09:33:00 +08:00
9fce1aa3f2 重置buff 三选一事件处理 2023-08-16 18:35:34 +08:00
b77b4d8025 特权处理 累计选择3个关卡开局所选类型的buff后,可额外触发一次随机buff三选一事件 2023-08-16 18:09:39 +08:00
0644ca11f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-16 17:42:06 +08:00
aa865e24bf 特权 2023-08-16 17:42:03 +08:00
liwei1dao
c79125e4b9 上传日志补充 2023-08-16 17:07:48 +08:00
liwei1dao
2a2f482a59 调整用户初始体力值 2023-08-16 16:58:56 +08:00
liwei1dao
76952788c8 主线探索进度过滤出生点 2023-08-16 16:53:31 +08:00
liwei1dao
122c21a875 上传竞技场代码 2023-08-16 16:49:23 +08:00
liwei1dao
fac8056e97 修复爬塔错误 2023-08-16 16:41:45 +08:00
liwei1dao
549b9a25dc 上传世界任务战斗失败埋点触发 2023-08-16 16:28:06 +08:00
liwei1dao
d4f1df7e77 上传底层资源接口 2023-08-16 16:01:09 +08:00
1b2ab62a96 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-16 15:47:05 +08:00
adaf4b91a5 重置三选一buff 2023-08-16 15:46:50 +08:00
liwei1dao
e1c8df0b9a 上传主线返回信息优化 2023-08-16 15:40:57 +08:00
liwei1dao
7f6799d5d8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-16 15:23:33 +08:00
liwei1dao
e3123e34fc 上传现时基金领取错误 2023-08-16 15:23:30 +08:00
a32f369c6a 迷宫特权 2023-08-16 15:00:29 +08:00
3a632f0d28 战斗被动事件处理 新增特权 2023-08-16 14:44:17 +08:00
3c7cd6298d 获得数据 2023-08-16 10:49:29 +08:00
liwei1dao
9a6987ce16 上传战斗任务 2023-08-15 20:43:57 +08:00
liwei1dao
d732f0ce4a 上传主线任务战斗事件 2023-08-15 20:42:18 +08:00
liwei1dao
65502bbe67 上传战斗事件同步 2023-08-15 20:12:37 +08:00
liwei1dao
f4a80c4a30 上传战斗同步 2023-08-15 20:10:28 +08:00
liwei1dao
6026f8fed7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 18:16:26 +08:00
liwei1dao
a80a7d76a8 上传协议 2023-08-15 18:16:23 +08:00
1a31f4d61a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 17:44:01 +08:00
09d5c01902 bingo 玩家等级校验处理 2023-08-15 17:43:58 +08:00
liwei1dao
7151471b16 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 16:54:19 +08:00
liwei1dao
1e0e55ac0e 上传协议 2023-08-15 16:54:14 +08:00
87c7b5e4a3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 16:50:52 +08:00
4703c97cec 抽卡 返回首次获得的英雄数据 2023-08-15 16:50:47 +08:00
liwei1dao
a464e3be40 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 16:14:01 +08:00
liwei1dao
8e26591bf0 上传基金推送 2023-08-15 16:13:56 +08:00
73799d57bb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 15:31:22 +08:00
eea2ab9e52 新增事件处理 图鉴记录技能id 2023-08-15 15:31:17 +08:00
liwei1dao
9b7bcecc13 上传迷宫成就任务 2023-08-15 15:09:49 +08:00
0f5ee04eee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 10:50:56 +08:00
41fa965b34 许愿招募 消耗配置 2023-08-15 10:50:53 +08:00
liwei1dao
097459164a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 10:37:21 +08:00
liwei1dao
571640ca1a 移除废弃系统 2023-08-15 10:37:19 +08:00
d88acab0c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-15 10:29:32 +08:00
fbf8accb59 #31123 任务 【梦工场系统】 【招募】兑换功能拓展 2023-08-15 10:29:28 +08:00
liwei1dao
c84eff7063 上传剧情修复 2023-08-15 10:13:06 +08:00
liwei1dao
47d09224a0 上传剧情奖励bug 2023-08-15 10:00:03 +08:00
liwei1dao
2d3666e0ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-14 18:25:34 +08:00
liwei1dao
6d46425050 上传代码 2023-08-14 18:25:30 +08:00
8a228f008a 移除测试代码 2023-08-14 17:53:59 +08:00
d8bc36d47a 商队埋点 2023-08-14 17:46:31 +08:00
72d18c8eb7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-14 17:27:05 +08:00
153d5c4974 天赋树奖励 2023-08-14 17:25:42 +08:00
b1ea3363b0 庆典活动循环处理 2023-08-14 17:09:11 +08:00
liwei1dao
f93fcdab8d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-14 15:35:21 +08:00
liwei1dao
921916bbfc 上传月梦战令经验保留 2023-08-14 15:35:18 +08:00
0c51cb9d37 今日消耗体力转换活动道具修复 2023-08-14 15:04:02 +08:00
5ae788b91d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-14 14:57:00 +08:00
f58b616c29 秘境掉落优化 2023-08-14 14:56:56 +08:00
liwei1dao
b73f6dc807 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-14 14:02:48 +08:00
liwei1dao
4d06a68bc0 上传英雄使用限制 2023-08-14 14:02:39 +08:00
5bfa66a65d 掉落优化 2023-08-14 11:12:40 +08:00
5abb015088 update 2023-08-12 00:53:28 +08:00
d0d557ac23 配置更新 2023-08-12 00:42:14 +08:00
64ef4708bb update 2023-08-12 00:19:06 +08:00
1d2cda271a 传送门开启校验 2023-08-11 23:51:05 +08:00
26e2c85b79 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 23:19:09 +08:00
ef8176943b 事件处理 2023-08-11 23:19:06 +08:00
liwei1dao
ebec6c04b2 上传图鉴 2023-08-11 22:48:37 +08:00
liwei1dao
b52069d07b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 22:35:53 +08:00
liwei1dao
07206e7f92 上传代码 2023-08-11 22:35:50 +08:00
a621f8b495 update 2023-08-11 22:28:42 +08:00
16c0a8e649 剧情新事件处理 2023-08-11 22:21:50 +08:00
577fbdf0f2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 22:07:25 +08:00
f0eec43f06 优化 2023-08-11 22:07:08 +08:00
liwei1dao
8525c7646f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 22:01:52 +08:00
liwei1dao
885ea3da93 上传代码 2023-08-11 22:01:44 +08:00
a03e85d4f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 21:16:07 +08:00
6118ba0292 传送门修复 2023-08-11 21:16:03 +08:00
433f72c4e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 21:07:09 +08:00
5a52a1f59a 上传配置 2023-08-11 21:07:05 +08:00
a956ac7d94 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 20:43:34 +08:00
5804197090 秘境优化调整 2023-08-11 20:42:16 +08:00
1b01c4ce59 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 18:49:03 +08:00
21a1d815d3 上传任务推送修复 2023-08-11 18:49:01 +08:00
378a891dbf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 18:45:05 +08:00
f67b789a0a 强化buff 2023-08-11 18:44:41 +08:00
ec846fa3e4 上传协议 2023-08-11 17:58:01 +08:00
34fc762f60 上传月梦战令 2023-08-11 17:53:16 +08:00
cca5f100db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 17:50:39 +08:00
078dde24dd 上传功能开启 2023-08-11 17:50:36 +08:00
0e575e5ba7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 17:22:55 +08:00
a56e96c86f 移除测试代码 2023-08-11 17:22:49 +08:00
6bb451f8a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 16:37:16 +08:00
329cd3e09f 同步配置 2023-08-11 16:37:13 +08:00
6e372aa4d8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 16:23:42 +08:00
e126c92e05 事件校验 设置完成状态 2023-08-11 16:22:47 +08:00
8fae590683 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 16:20:23 +08:00
030eb2c358 上传周长协议 2023-08-11 16:19:37 +08:00
ef306f6d54 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 15:54:04 +08:00
770fcb0e32 秘境事件处理 2023-08-11 15:54:00 +08:00
6b42df800b 上传错误 2023-08-11 15:19:42 +08:00
8855903a7c 剧情事件 2023-08-11 14:42:33 +08:00
2a67942996 开服签到 从1 开始 2023-08-11 12:36:29 +08:00
3baea4ad44 update 2023-08-11 12:11:23 +08:00
087c7639ce Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 11:49:43 +08:00
cd3b25cbbd 秘境优化 2023-08-11 11:49:40 +08:00
d3be677957 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-11 11:41:53 +08:00
ffffd51ee4 月梦战令提交 2023-08-11 11:41:51 +08:00
6f5437b3f1 新增gm 秘境事件 2023-08-11 11:20:16 +08:00
98b3d8de16 秘境同步 2023-08-11 10:15:36 +08:00
d8db74c167 上传开服任务 2023-08-10 21:38:55 +08:00
9a8cd6a7b2 上传配置 2023-08-10 21:31:45 +08:00
3cab7559f7 上传迷宫代码 2023-08-10 21:27:28 +08:00
76f2921605 上传迷宫图鉴 2023-08-10 21:22:38 +08:00
7fadd063e1 上传配置读取 2023-08-10 21:02:04 +08:00
2b39b7527f 配置上传 2023-08-10 20:59:42 +08:00
6d917c37ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 20:58:02 +08:00
87f4c1c3a6 上传配置 2023-08-10 20:56:10 +08:00
54e12d7ead Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 20:55:46 +08:00
332d4cc0f2 秘境商店 2023-08-10 20:55:00 +08:00
04e3e99bde 上传迷宫天赋树 2023-08-10 20:42:48 +08:00
47b21022c8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 20:28:45 +08:00
269c02486c 上传礼包修复 2023-08-10 20:28:42 +08:00
b76fb0dd66 商店协议+扣血事件 2023-08-10 19:47:06 +08:00
4d6db57482 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 18:29:20 +08:00
4c02b5b321 回血 2023-08-10 18:29:17 +08:00
93e5b0c64f 上传巨石秘境 2023-08-10 18:28:29 +08:00
9d25b5038a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 17:17:55 +08:00
bc803d2203 上传礼包过期处理 2023-08-10 17:17:52 +08:00
7e63436373 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 16:58:35 +08:00
5b0bc648fc 宝箱事件处理 2023-08-10 16:58:31 +08:00
f3c14c4eb7 上传隐藏关卡 2023-08-10 16:51:30 +08:00
1d4c478bd8 工会任务推送优化 2023-08-10 16:26:04 +08:00
d247d3e723 上传推送礼包 2023-08-10 16:02:02 +08:00
972b5a4df7 上传配置 2023-08-10 15:46:33 +08:00
959a467d3a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 15:22:51 +08:00
08b16d62e7 上传用户属性埋点优化 2023-08-10 15:22:49 +08:00
d290a7c684 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 15:13:34 +08:00
52908e0305 秘境新增宝箱类型事件 2023-08-10 15:13:31 +08:00
1791302429 上传任务枚举 2023-08-10 14:54:33 +08:00
995b264851 上传配置 2023-08-10 13:58:08 +08:00
22ee3dfeb3 上传配置 2023-08-10 11:35:28 +08:00
a6194027a6 update 2023-08-10 11:04:31 +08:00
d41fec6475 update 2023-08-10 10:55:55 +08:00
561d2f520f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-10 10:48:40 +08:00
2005ba62d8 优化 2023-08-10 10:48:36 +08:00
423210ad81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 22:08:31 +08:00
2fd3c2cff2 上传代码 2023-08-09 22:08:28 +08:00
5247fb8970 排行榜新增性别字段 2023-08-09 22:07:34 +08:00
9078e843ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 21:37:25 +08:00
b657714a0d 移动到出生点 直接去上一层 2023-08-09 21:37:18 +08:00
0ccf413083 上传代码 2023-08-09 21:21:49 +08:00
f1a78ff53f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 21:07:20 +08:00
f73edbbe48 上传代码 2023-08-09 21:07:17 +08:00
378525c2ef Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 20:56:53 +08:00
8d2d5f51e5 删除测试代码 2023-08-09 20:56:49 +08:00
403e6a9ade Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 20:30:00 +08:00
9030a548bf 上传战令经验上线 2023-08-09 20:29:56 +08:00
32bac33a10 记录上次位置 2023-08-09 20:24:58 +08:00
193deb145d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 19:25:59 +08:00
711ed83145 矿工小游戏+配置 2023-08-09 19:25:56 +08:00
503d47db87 上传协议修复 2023-08-09 19:04:07 +08:00
b6120c49f5 上传功能开启调整 2023-08-09 18:38:13 +08:00
ef2d617760 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 18:25:49 +08:00
4f18818c37 上传模块代码 2023-08-09 18:25:46 +08:00
cb960129f4 新增任务埋点类型208 拥有X名回响达到满级的X阵容守护者 2023-08-09 18:16:51 +08:00
37521c3256 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 18:08:00 +08:00
0d9e9f86a0 活动优化 + 错误码补充 2023-08-09 18:07:56 +08:00
2febf8cfaf 上传故事线代码 2023-08-09 17:32:36 +08:00
6565526983 上传故事线代码 2023-08-09 17:25:04 +08:00
87efa40182 上传累充优化 2023-08-09 16:35:38 +08:00
caee666da3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 16:34:42 +08:00
5f2576bed6 上传累充 2023-08-09 16:34:40 +08:00
bda8c44208 迷宫总奖励领取 2023-08-09 16:33:21 +08:00
cfb6ad7b74 上传配置表 2023-08-09 16:31:11 +08:00
4ef118b97f 上传战令代码 2023-08-09 16:21:36 +08:00
71af1ba949 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:50:24 +08:00
7a86e715f0 上传故事线代码 2023-08-09 15:50:21 +08:00
55badf5ad9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:39:20 +08:00
a8ab4be054 清除非本日获得的碎片数据 2023-08-09 15:39:16 +08:00
e7e6b6864e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:30:33 +08:00
7a64f0a2a4 上传战令代码 2023-08-09 15:30:31 +08:00
9408a2acfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:17:48 +08:00
2dc5cad9c8 小游戏数据记录问题修复 2023-08-09 15:17:44 +08:00
b63eae8242 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 15:13:31 +08:00
6bd3a03139 上传战令代码 2023-08-09 15:13:28 +08:00
f6df32fd27 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 11:59:46 +08:00
f428579e2a 消耗体力转换活动道具 2023-08-09 11:59:43 +08:00
e82c67e8cd 每日消耗体力转换成活动道具 2023-08-09 11:59:27 +08:00
19cf3de8bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-09 11:28:38 +08:00
65f23c5973 上传累充一键领取 2023-08-09 11:28:34 +08:00
8040b0df25 迷宫小游戏领奖校验 2023-08-09 10:50:19 +08:00
50a7845250 迷宫小游戏 2023-08-09 10:04:56 +08:00
12adac2095 活动优化 2023-08-08 21:42:48 +08:00
40f4650305 拼图领取进度奖励 2023-08-08 20:52:11 +08:00
68ae59e874 迷宫小游戏 2023-08-08 20:39:51 +08:00
a311fe9572 推送 2023-08-08 20:12:37 +08:00
6a45e51aea 活动变更推送 2023-08-08 19:49:16 +08:00
76f3f39a6c update 2023-08-08 19:00:15 +08:00
8a310420c5 活动bug 2023-08-08 18:40:18 +08:00
eb5ed69bb6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 18:20:26 +08:00
25908393bf 拼图小游戏活动 2023-08-08 18:20:22 +08:00
b6e52bc0c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 18:10:38 +08:00
958191d92f 上传活动列表 2023-08-08 18:10:35 +08:00
64e3110284 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 17:11:04 +08:00
3d765a2486 统计每日体力消耗 2023-08-08 17:11:00 +08:00
45b4198b2d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 16:42:29 +08:00
248bfe49c9 上传代码 2023-08-08 16:42:27 +08:00
f30a450339 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 15:49:56 +08:00
6a20b847de 小游戏活动 2023-08-08 15:49:52 +08:00
8a4e1f8dcd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 15:43:26 +08:00
5d2edfd33b 上传剧情活动代码 2023-08-08 15:43:24 +08:00
ba4a095fff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 14:27:32 +08:00
5c6f49ad1f 活动优化 2023-08-08 14:27:29 +08:00
99b42be702 上传购物中心 2023-08-08 14:25:19 +08:00
2dd77e7b20 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 13:44:32 +08:00
552841d0f0 上传购物中心 2023-08-08 13:44:30 +08:00
ad79b477e6 庆典活动 2023-08-08 12:51:14 +08:00
eb835f6ae7 解析报错 2023-08-08 12:03:58 +08:00
675cd2525d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 11:53:21 +08:00
d2d710e6c8 登录事件 2023-08-08 11:47:32 +08:00
942253c7e1 上传购物中心优化 2023-08-08 11:44:44 +08:00
2a7ea6dd84 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 10:21:03 +08:00
bdef99be51 活动枚举 2023-08-08 10:20:59 +08:00
1e557ed2ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-08 10:15:12 +08:00
cec5bec0fc 上传商店中心 2023-08-08 10:15:07 +08:00
f017ac5e8d 奖励推送 2023-08-08 10:05:00 +08:00
a71bf2b3ee 活动类型枚举 2023-08-08 09:56:37 +08:00
99c99f0483 转盘获得奖励的数据 2023-08-07 19:32:56 +08:00
216d131096 转盘校验 2023-08-07 18:19:13 +08:00
4cd798dca8 大转盘消耗 读价格组 消耗校验 2023-08-07 17:29:17 +08:00
02bc489cd9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:42:34 +08:00
7849ef513b 大转盘 返回当前获得奖励的id 2023-08-07 16:42:29 +08:00
599399e11e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:31:41 +08:00
59cbc7eb8b 上传周长任务限制 2023-08-07 16:31:39 +08:00
163317542a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:31:11 +08:00
a065967370 活动领取奖励数据校验 2023-08-07 16:31:07 +08:00
0012758f06 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 16:28:18 +08:00
f73939d0c6 上传周长任务代码 2023-08-07 16:28:13 +08:00
ed86c3b6ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 14:30:27 +08:00
48ad5eeb80 大转盘活动领取校验 2023-08-07 14:30:23 +08:00
efc62cab6e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-07 09:52:23 +08:00
c51e726398 上传剧情活动类型定义 2023-08-07 09:52:16 +08:00
d8221d1ce9 商队随机事件触发概率问题 2023-08-04 22:12:26 +08:00
5d555698ab 初始门票 2023-08-04 20:34:26 +08:00
297fbdfca6 存储城市刷新时间 2023-08-04 19:12:34 +08:00
a8d8194605 商队修改 2023-08-04 18:46:50 +08:00
781911205e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 17:07:17 +08:00
93b40d4b98 新增工会等级解锁条件 2023-08-04 17:07:14 +08:00
a464b5dbf1 上传竞技场 2023-08-04 16:55:01 +08:00
ace966196f 上传竞技场挑战卷 2023-08-04 16:43:34 +08:00
ed181eea96 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 16:30:49 +08:00
13fd75e2e9 上传竞技场代码 2023-08-04 16:30:47 +08:00
073f13b76d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 15:54:32 +08:00
3023f1b107 好感动计算调整 2023-08-04 15:54:28 +08:00
bf5a489cb3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-04 15:41:02 +08:00
5d67a41e80 上传配置 2023-08-04 15:28:05 +08:00
990d3eafc8 庆典活动数据变化贴推送 2023-08-04 14:47:52 +08:00
e7959048eb 开服庆典活动 2023-08-04 11:43:25 +08:00
a8158f0d1d 转盘活动结束 邮件补发 2023-08-03 18:22:33 +08:00
7eaf52a795 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 18:01:54 +08:00
13ad24eecc 转盘活动结束 抽奖卷转换成其他道具 2023-08-03 18:00:57 +08:00
0b8f65dd3c 上传购物中心添加首充礼包 2023-08-03 17:54:14 +08:00
29a423ae74 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 17:21:57 +08:00
3fc5f15cc9 上传累充积分添加 2023-08-03 17:21:23 +08:00
f9d898d604 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 16:23:31 +08:00
3967a950c1 商队需求改动 2023-08-03 16:23:11 +08:00
a66d962b18 上传日常任务修复 2023-08-03 16:19:22 +08:00
4c3a0f2a88 上传活动指南代码 2023-08-03 11:27:44 +08:00
cf58b1901a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-03 10:39:43 +08:00
98e903573e 上传红点任务 2023-08-03 10:39:40 +08:00
a8b6ffd38d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 18:54:12 +08:00
2107b54b65 商队结算积分超出部分转其他道具 2023-08-02 18:54:09 +08:00
5dbabf4432 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 18:45:12 +08:00
a8b90eecac 上传红点需求 2023-08-02 18:45:09 +08:00
6f09e9996f 阵营塔红点返回进度信息 2023-08-02 18:18:05 +08:00
be0037cd3b 功能开启主线校验 2023-08-02 18:03:26 +08:00
35b050eb2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 17:39:30 +08:00
44201e1d47 功能开启 主线关卡校验 2023-08-02 17:39:27 +08:00
7d521d84fa 上传日志输出代码 2023-08-02 17:29:47 +08:00
7b1b393922 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 17:11:28 +08:00
2ee68b9822 上传购物中心代码 2023-08-02 17:11:26 +08:00
f624b4caf3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 16:57:59 +08:00
6849c04075 大转盘 2023-08-02 16:57:56 +08:00
d44d6069a9 上传支付系统代码 2023-08-02 16:43:40 +08:00
c38b63a7c6 上传活动接口通知 2023-08-02 16:29:03 +08:00
27908f10f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 16:26:31 +08:00
bf8bd075ac 上传代码 2023-08-02 16:18:53 +08:00
a1f533fa45 红点::29101 种族塔 今日剩余可挑战关卡 2023-08-02 15:36:21 +08:00
420d583445 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 15:09:23 +08:00
40c22784b2 活动改造 2023-08-02 15:08:37 +08:00
cafc95a48b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 15:03:46 +08:00
cc022d0ac2 上传代码 2023-08-02 15:03:27 +08:00
7fce25f60e 暂存 2023-08-02 11:45:02 +08:00
29ef73838e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-02 09:31:13 +08:00
2cb0595452 update 2023-08-02 09:31:10 +08:00
48160400dc 上传开服任务和守护者任务 2023-08-01 17:58:14 +08:00
3cc286864b 商队 取小道消息数据bug 2023-08-01 17:22:01 +08:00
6a6219805e 活动领奖 2023-08-01 15:47:15 +08:00
5b1a020ffa 上传红点进度信息 2023-08-01 13:56:24 +08:00
75d72cd542 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-01 13:45:51 +08:00
37dc040fbe 上传红点进度信息 2023-08-01 13:45:49 +08:00
58dad82fe0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-01 13:45:15 +08:00
26dda9b8b1 活动数据接口 2023-08-01 13:45:13 +08:00
09d202d65d 上传红点信息 2023-08-01 13:40:00 +08:00
32433c9c25 上传红点处理 2023-08-01 11:36:06 +08:00
ef949f0107 上传活动统一接口 2023-07-31 17:38:03 +08:00
3d2c87b003 活动分类 2023-07-31 17:20:11 +08:00
6b093203f3 活动礼包 2023-07-31 17:13:58 +08:00
db2ca38d15 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-31 17:11:03 +08:00
6cbe07efed 活动通知 2023-07-31 17:11:00 +08:00
7c23eab670 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-31 16:10:33 +08:00
04b132ce7d 添加复合任务埋点 2023-07-31 16:10:31 +08:00
47d28b4227 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-31 15:57:11 +08:00
9b6b139483 石阵秘境守护者挂了的数据记录 2023-07-31 15:57:07 +08:00
68fe09c637 上传战斗代码 2023-07-31 15:53:00 +08:00
d764899b85 上传复合调查的协议修复 2023-07-31 15:40:15 +08:00
285e99acc4 保底次数修复 2023-07-31 09:45:51 +08:00
d08d6482a1 石阵秘境血量继承 2023-07-28 22:08:56 +08:00
9a2a02b9dc BattleRole tid 赋值问题 2023-07-28 20:06:47 +08:00
0608014645 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 19:36:28 +08:00
4d51ce4327 战斗传参优化 2023-07-28 19:36:25 +08:00
6dd06f6ed8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 18:22:58 +08:00
e71e47992d 上传代码 2023-07-28 18:22:56 +08:00
855f59a462 空数据过滤 2023-07-28 18:14:13 +08:00
78a28de946 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 17:43:09 +08:00
a1d5836ef1 GM 循环塔跳关 2023-07-28 17:43:05 +08:00
8ee7621236 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 16:52:51 +08:00
88ecdc1fd0 上传每日任务消息推送 2023-07-28 16:52:48 +08:00
1046349550 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 16:08:34 +08:00
fd5c8d73c5 觉醒 pro 属性 2023-07-28 16:08:31 +08:00
c088678d72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 15:51:43 +08:00
336c757bba 上传主线奖励代码 2023-07-28 15:51:41 +08:00
4502137617 觉醒属性配置更改 2023-07-28 15:48:27 +08:00
78b0d60e70 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 15:35:21 +08:00
7b24313cc8 秘境环境buff 带入 2023-07-28 15:32:39 +08:00
1b06e0af29 上传复合调查任务相关 2023-07-28 15:30:48 +08:00
c852f93d64 上传战斗协议 2023-07-28 14:19:52 +08:00
8c8c670279 上传战斗代码 2023-07-28 14:13:12 +08:00
f5a8908f13 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 14:10:47 +08:00
9507b8ceaa 上传代码 2023-07-28 12:00:30 +08:00
e78d2590e5 float64 类型转换 2023-07-28 11:50:01 +08:00
41b33e1e86 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 11:35:28 +08:00
b7c529d7c5 秘境战斗相关 2023-07-28 11:35:24 +08:00
8245bed3d3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 11:09:33 +08:00
8555b46bcb 上传配置信息 2023-07-28 11:09:29 +08:00
5edbb5c709 战斗事件合并 2023-07-28 10:45:20 +08:00
9d025545f4 战斗结束 发送英雄信息 2023-07-28 09:54:33 +08:00
489d327b54 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 09:45:34 +08:00
9c1ac0abee 英雄血量继承 2023-07-28 09:45:31 +08:00
b3fa33eb10 上传主线代码 2023-07-28 09:44:22 +08:00
0611e6bbc3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-28 09:41:35 +08:00
afecad234c 上传主线代码 2023-07-28 09:41:30 +08:00
91f8df9c0c boss 事件处理 2023-07-27 21:05:12 +08:00
6854378d3b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 20:19:31 +08:00
6f09a394fe buff 三选一 2023-07-27 20:19:28 +08:00
84a1152895 上传武馆修复 2023-07-27 20:16:41 +08:00
5f29818bea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 20:00:37 +08:00
57d52b1fd3 上传代码 2023-07-27 20:00:35 +08:00
317f374799 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 19:09:32 +08:00
4956cc6c9c update 2023-07-27 19:09:29 +08:00
749b210ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 19:09:25 +08:00
c20b66c5cc 上传代码 2023-07-27 19:09:23 +08:00
3cf137827f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 18:54:26 +08:00
020c01e9c5 update 2023-07-27 18:54:23 +08:00
32d328121b 上传主线代码 2023-07-27 18:39:29 +08:00
6449aa7fdd 上传代码 2023-07-27 18:21:37 +08:00
2acec819af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 18:08:04 +08:00
9abc06944c 上传兑换任务 2023-07-27 18:08:02 +08:00
79bc9c48a2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 18:02:07 +08:00
3371001d4c 战斗事件处理 2023-07-27 18:02:01 +08:00
2b138edc69 上传代码 2023-07-27 17:50:51 +08:00
6c99d9da7b 战斗事件校验 校验传送门开启后 触发新的事件导致传送门又关闭 2023-07-27 17:15:24 +08:00
2f3dc0aaa8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 17:04:40 +08:00
3c836e6756 调试bug 2023-07-27 17:04:36 +08:00
cb09010997 上传配置同步代码 2023-07-27 17:02:26 +08:00
0f85389b6e 上传协议 2023-07-27 16:39:24 +08:00
f9fefeaba5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 16:18:33 +08:00
95d906e734 上传战斗同步 2023-07-27 16:18:31 +08:00
e170526f75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-27 16:10:29 +08:00
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
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