Commit Graph

6676 Commits

Author SHA1 Message Date
39d4179bce 英雄经验接口优化 2023-08-18 15:28:38 +08:00
1b9e2c4f1e 新增数据埋点 2023-08-18 14:13:18 +08:00
2de025cf03 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 11:21:09 +08:00
71ecb7679f 商队排行规则调整 2023-08-18 11:21:05 +08:00
liwei1dao
06f149e4b9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 11:09:12 +08:00
liwei1dao
a19f0a39f4 用户登录埋点 2023-08-18 11:09:09 +08:00
5cd01c45c5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 11:05:55 +08:00
95a255be5d #31765 子任务 【梦工场系统】 <-后端-> 【巨怪商队】- 排行数据优化 2023-08-18 11:05:25 +08:00
liwei1dao
f7f74c4e07 上传计费点埋点和工会消息 2023-08-18 10:58:28 +08:00
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
af70a4f3f3 上传武官切磋 失败形象显示优化 2023-07-03 14:26:45 +08:00
ae58f1c98b 上传武官道具使用限制 2023-07-03 14:20:39 +08:00
1eabef7769 上传配置 2023-07-03 14:14:02 +08:00
c5a605c3df 教习使用限制 2023-07-03 11:22:55 +08:00
a943f1837e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-07-03 09:42:38 +08:00
eed5cf07a0 update 2023-06-30 23:08:31 +08:00
ce6306a157 上传代金卷需求开发 2023-06-30 18:20:08 +08:00
7b809c856d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-30 17:47:27 +08:00
a2eb455151 狩猎新增英雄经验奖励 2023-06-30 17:47:23 +08:00
c0cae0b509 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-30 16:10:25 +08:00
32c7289e4f 任务次数限制 2023-06-30 16:10:16 +08:00
a9a6325ccb 回收session 2023-06-30 14:47:02 +08:00
32701a664c 条件开启新增好友数量条件 2023-06-30 11:47:33 +08:00
dde670cbab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-30 10:49:03 +08:00
2bf027ab27 条件开启增加好友数量条件 2023-06-30 10:48:59 +08:00
f9f151b711 好友变化通知 2023-06-30 10:22:30 +08:00
00739ad63e 上传好友武馆bug 2023-06-29 19:30:40 +08:00
21d4881d24 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 18:28:10 +08:00
52be8710cb 上传 装备属性计算不一致bug 2023-06-29 18:28:08 +08:00
21894ab024 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 18:04:03 +08:00
4c2d96512e 铁匠铺交易屏蔽错误码 2023-06-29 18:03:52 +08:00
0f0411a5b3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 18:03:13 +08:00
a58d90e552 上传战斗校验 失败成功分析 2023-06-29 18:03:06 +08:00
d1ffca6153 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 17:57:45 +08:00
b2a25608a3 铁匠铺交易 2023-06-29 17:57:39 +08:00
a42336cab2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 16:20:53 +08:00
b32510074d 世界任务战斗添加经验 2023-06-29 16:20:50 +08:00
4d51bf7305 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 15:39:33 +08:00
289f992521 gm命令获取全部英雄,不会发送为-1的英雄 2023-06-29 15:39:30 +08:00
31ec56ffbf Rtype9 2023-06-29 15:36:56 +08:00
79245aacef 上传重置埋点接口 2023-06-29 14:56:02 +08:00
cc6feb9dda Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 14:42:57 +08:00
ef2fcfd842 上传埋点 重置接口 2023-06-29 14:42:54 +08:00
31c754c27c 竞技场最大上限特权处理 2023-06-29 14:37:21 +08:00
64da2e66c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 11:52:42 +08:00
12a81cf07b 虚拟财富低于一定值不计算 2023-06-29 11:52:38 +08:00
c3b9aee1a3 更改好友助战埋点 2023-06-29 11:30:57 +08:00
e9df7fb286 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 11:14:59 +08:00
0852ca8f68 update rtype9埋点 2023-06-29 11:14:52 +08:00
a90d952d07 添加客户端版本服务器 2023-06-29 10:53:21 +08:00
d5b15ce0f7 同步 2023-06-29 09:33:02 +08:00
59a355bf29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-29 09:02:23 +08:00
817f678d5d 百分比数值计算问题 2023-06-29 09:02:19 +08:00
2884bf156f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 18:15:18 +08:00
d169f9f25e 新需求 守护者之心获得设置上限 2023-06-28 18:15:14 +08:00
b765c8d03f 上传竞技场代码 2023-06-28 17:35:46 +08:00
f0c15515ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 16:09:27 +08:00
24eda00128 上传同步用户竞技场名称 2023-06-28 16:09:23 +08:00
0465ffb114 错误日志输出 2023-06-28 15:52:39 +08:00
c64d82abab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 15:21:34 +08:00
5b0e69c440 updateps 2023-06-28 15:21:28 +08:00
d5217953dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 14:42:07 +08:00
25a5ef9dc1 配置更新 2023-06-28 14:42:04 +08:00
b328df88f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:53:34 +08:00
7a7c076dec 上传随机宝箱批量使用代码 2023-06-28 11:53:32 +08:00
2de1ce8161 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:49:22 +08:00
37f64eee7b 抽卡每日次数校验 2023-06-28 11:49:18 +08:00
37b01c0f3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-28 11:25:21 +08:00
6351e3df70 修复世界任务战斗奖励发放bug 2023-06-28 11:25:15 +08:00
b416a9679b 赛季重置优化 2023-06-28 10:54:13 +08:00
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
a766977fbd 主线关卡领取奖励红点推送 2023-06-15 20:54:13 +08:00
402f931b51 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 20:26:10 +08:00
221c9844db 好友红点 2023-06-15 20:25:46 +08:00
acfb281523 羁绊红点注册 2023-06-15 20:24:34 +08:00
c5d64aebf1 err对象返回 2023-06-15 19:57:44 +08:00
3b9f8f85a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 18:47:10 +08:00
fdcd38e622 红点 2023-06-15 18:47:04 +08:00
f57ec9d2fd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 17:42:32 +08:00
0d621cd9ae 任务中多条件校验 2023-06-15 17:42:25 +08:00
liwei1dao
ea2bafc2b2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 17:33:30 +08:00
liwei1dao
a0fb371cda 上传装备强化统计修复 2023-06-15 17:33:21 +08:00
edc845ca0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 16:24:40 +08:00
2e31065499 羁绊红点 2023-06-15 16:24:30 +08:00
liwei1dao
e42fa2b91f 上传任务41和42 的数据插入机制 2023-06-15 15:41:24 +08:00
liwei1dao
56c0671fd2 上传竞技场红点 2023-06-15 15:15:40 +08:00
5091d2c9b9 Rtype51 2023-06-15 13:47:44 +08:00
309690ca97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 13:44:42 +08:00
cd3d246b48 铁匠铺下单n个装备 买点 2023-06-15 13:44:33 +08:00
liwei1dao
9449cdcb04 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:59:19 +08:00
liwei1dao
e44cde1b9b 上传红点推送接口 2023-06-15 11:59:10 +08:00
cd3e4eb14e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:40:28 +08:00
ebcc7ec57f 修复铁匠铺任务进度 2023-06-15 11:40:21 +08:00
liwei1dao
bfbb7b69a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-15 11:34:41 +08:00
liwei1dao
794fe30c21 上传星作图数据库修复 2023-06-15 11:34:35 +08:00
cb1c32f356 db创建索引 2023-06-15 11:30:51 +08:00
dca0850ff3 英雄 天赋增加英雄等级校验 2023-06-15 11:10:16 +08:00
72e9f12905 铁匠铺手册台收藏家红点 2023-06-15 09:45:49 +08:00
liwei1dao
d7c80fcde9 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 20:53:48 +08:00
liwei1dao
6cd42dc9f1 上传代码 2023-06-14 20:53:05 +08:00
fb970cc355 battle errordata 2023-06-14 18:45:29 +08:00
2892a2d38f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 18:12:38 +08:00
76e670c350 删除测试数据 2023-06-14 18:12:32 +08:00
f44e853bbc gm 主线调整 2023-06-14 18:11:10 +08:00
f41a8d0ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 18:06:41 +08:00
1ba179f675 条件状态判断 2023-06-14 18:06:37 +08:00
liwei1dao
f0dbc0c991 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 17:55:58 +08:00
liwei1dao
a7a056d6b7 上传支付配置同步 2023-06-14 17:55:19 +08:00
4f2660fabb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 16:36:19 +08:00
ba4dfa300f 更改协议名 2023-06-14 16:36:10 +08:00
liwei1dao
609c5db7dd 上传配置代码 2023-06-14 16:07:54 +08:00
liwei1dao
e39d88ad01 上传定制装备未入库bug 2023-06-14 15:46:19 +08:00
c03a1c3873 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:24:08 +08:00
1bb52c4df9 update 2023-06-14 15:24:02 +08:00
liwei1dao
d89d09a182 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:16:51 +08:00
liwei1dao
589dc28e25 上传代码 2023-06-14 15:16:43 +08:00
cca1a56cdb Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 15:11:51 +08:00
a5c6d0d045 铁匠铺红点信息 2023-06-14 15:10:49 +08:00
liwei1dao
953cb783db 上传后台消息推送 2023-06-14 11:20:23 +08:00
b50497a9e8 修改推送顺序 2023-06-14 10:35:35 +08:00
5cdac676ad update config 2023-06-14 10:08:34 +08:00
liwei1dao
3814c6fd32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-14 09:13:53 +08:00
liwei1dao
24067fdc01 上传错误码修复异常 2023-06-14 09:13:47 +08:00
108b59823c 收到战报数据清空预扣体力值 2023-06-13 15:37:28 +08:00
81b2bf3b6c 主线体力消耗 2023-06-13 15:19:32 +08:00
1c68fe0051 gm 主线跳过修复 2023-06-13 14:27:11 +08:00
34df1dbb35 优化 抽卡获得顺序问题 2023-06-13 12:27:42 +08:00
0f8384554b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 18:38:42 +08:00
bf6517b740 update测试api 2023-06-12 18:38:15 +08:00
9aa7f785f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 17:21:45 +08:00
2853b38c97 英雄数据结构优化 2023-06-12 17:21:40 +08:00
liwei1dao
460a614dfa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-12 17:05:18 +08:00
liwei1dao
5bbf812032 上传代码 2023-06-12 17:05:13 +08:00
liwei1dao
4d4ab2f40c 上传装备强化奔溃修复 2023-06-12 16:58:30 +08:00
1b205d6486 公告字符长度校验 2023-06-12 16:50:13 +08:00
liwei1dao
ee0bc82fbd 修复升级漏洞 2023-06-09 22:14:29 +08:00
liwei1dao
4bb2cd7219 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 22:11:29 +08:00
liwei1dao
12d66a7ac7 上传代码 2023-06-09 22:11:15 +08:00
44d2364bf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 21:55:13 +08:00
73b1ac3cb6 update 2023-06-09 21:55:06 +08:00
b105a3ff13 code 1030 2023-06-09 21:53:44 +08:00
f44d0af84c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 20:46:06 +08:00
408a1bceb7 图鉴批处理优化 2023-06-09 20:45:50 +08:00
liwei1dao
18a9c8ab66 上传武馆npc踢馆条件管理 2023-06-09 18:21:36 +08:00
03fd5d2018 功能开启条件校验接口 2023-06-09 18:15:12 +08:00
65b97a090e 接口调整 2023-06-09 18:14:06 +08:00
08a8764fe6 移出测试代码 2023-06-09 18:01:00 +08:00
9272f7d210 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 17:59:46 +08:00
0597d946a2 查询opencond 配置 2023-06-09 17:59:37 +08:00
2dc37245e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 17:43:56 +08:00
11caf9c623 铁匠铺任务进度 2023-06-09 17:43:41 +08:00
a4c58224e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 16:48:42 +08:00
e8c3d27a84 商队等级 2023-06-09 16:48:33 +08:00
liwei1dao
db9a6687a1 修复装备强化 2023-06-09 16:09:22 +08:00
liwei1dao
f1908b1ef0 上传竞技场连胜判断 2023-06-09 14:10:38 +08:00
d439182012 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 13:53:53 +08:00
dcef2d09e3 修改参数长度判断 2023-06-09 13:53:38 +08:00
liwei1dao
4c633216c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 13:50:39 +08:00
liwei1dao
d593bd13c8 伤处装备套装机制改动 2023-06-09 13:50:26 +08:00
752ef2d4b1 gm 跳转功夫大师塔 2023-06-09 12:01:19 +08:00
1267ff1129 gm 调整vip 等级做校验 2023-06-09 11:20:31 +08:00
acfcdbd4b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-09 11:08:05 +08:00
4f0192d25f GM 解锁所有难度 2023-06-09 11:08:02 +08:00
9bb0d46e95 推送清理已完成的任务 2023-06-09 10:53:21 +08:00
liwei1dao
73ced03a17 上传装备产出随机 2023-06-08 22:02:56 +08:00
liwei1dao
50a630dc7a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 21:16:12 +08:00
liwei1dao
ecc590160c 上传装备埋点修复 2023-06-08 21:15:54 +08:00
ad279e82b6 图鉴检测 2023-06-08 21:10:06 +08:00
b023c7dd3c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 20:54:26 +08:00
768dd1e304 err 2023-06-08 20:54:20 +08:00
liwei1dao
a1f3bf1ae2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 20:51:29 +08:00
liwei1dao
66dc7afd47 上传随机种子 2023-06-08 20:51:22 +08:00
3aea6bb3c8 修改worldtask gm 2023-06-08 20:38:54 +08:00
liwei1dao
0cbad2f4cb 优化任务激活接口 2023-06-08 18:47:08 +08:00
e88f98ca88 移出不要日志 2023-06-08 18:33:45 +08:00
6d50edeb45 图鉴id 查找 2023-06-08 17:44:00 +08:00
50f5108d23 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 16:30:44 +08:00
bd577e4219 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 16:29:27 +08:00
liwei1dao
3506ab4203 上传埋点代码 2023-06-08 16:29:25 +08:00
d487eee34e 铁匠铺获取图鉴信息 2023-06-08 16:29:20 +08:00
liwei1dao
44d965b9e6 上传埋点逻辑代码 2023-06-08 16:27:59 +08:00
057fa83752 注释随机周任务 2023-06-08 15:48:01 +08:00
00c07d4374 update接口参数 2023-06-08 15:48:01 +08:00
c9ae57c5bf update校验接口 2023-06-08 15:48:01 +08:00
e9a8793446 修改协议 2023-06-08 15:48:00 +08:00
e1f4ac61f2 修改accept协议 2023-06-08 15:48:00 +08:00
b64efd67e7 当前进行支持多任务 2023-06-08 15:48:00 +08:00
06e57e6650 支持当前有多任务并行 2023-06-08 15:47:59 +08:00
c5f69fd093 更新当前任务包含进度值 2023-06-08 15:47:59 +08:00
805ea699ed 世界任务进度 2023-06-08 15:47:57 +08:00
7644cb48ec errdata 2023-06-08 15:47:35 +08:00
bc2a0b8a43 更新当前任务包含进度值 2023-06-08 15:47:32 +08:00
liwei1dao
c5cf79f4b8 上传代码调整 2023-06-08 15:28:10 +08:00
47b59bd48d remove rdtask check 2023-06-08 15:21:00 +08:00
00c83158b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 15:11:57 +08:00
2f587ef3c3 精炼打造 2023-06-08 15:11:53 +08:00
liwei1dao
c11bfa0793 移除rtask 模块 2023-06-08 15:10:55 +08:00
liwei1dao
da9798df78 上传装备代码 2023-06-08 15:05:47 +08:00
liwei1dao
1d00476d2f 上传装备打造代码 2023-06-08 14:57:57 +08:00
liwei1dao
da9192d356 添加安全锁 2023-06-08 14:36:48 +08:00
liwei1dao
5de6a9f237 上传埋点代码 2023-06-08 14:34:33 +08:00
liwei1dao
8f12a6b70f 修复埋点异常bug 2023-06-08 14:28:39 +08:00
liwei1dao
5eade44a74 上传物品使用接口 2023-06-08 14:13:36 +08:00
liwei1dao
103ae988f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 13:53:50 +08:00
liwei1dao
dee39299e2 上传接口 2023-06-08 13:51:41 +08:00
e90822a523 获取资源失败 及时通知 2023-06-08 13:50:30 +08:00
9bb4a1e7ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-08 11:39:48 +08:00
3fe6c89068 连续自动战斗 自动使用体力药剂 2023-06-08 11:39:39 +08:00
liwei1dao
6983411410 上传分解合成代码补充 2023-06-08 09:51:26 +08:00
4c82ab7028 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 19:58:35 +08:00
ede298e3ed 更新旧时光关卡 2023-06-07 19:58:28 +08:00
liwei1dao
7779fa6bb2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 19:20:54 +08:00
liwei1dao
8f4526f7e4 上传代码 2023-06-07 19:20:38 +08:00
2f34d17669 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 18:20:37 +08:00
2459c429c5 配置校验 2023-06-07 18:20:31 +08:00
liwei1dao
f085ffb5a1 上传装备修改 2023-06-07 17:55:58 +08:00
liwei1dao
48255abe2b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 16:56:50 +08:00
liwei1dao
c6b647e51c 上传装备品质字段 2023-06-07 16:56:44 +08:00
acaed92bc5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-07 14:38:59 +08:00
7b48e25978 gm 一键增加教习资源 2023-06-07 14:38:55 +08:00
a60b77f2a9 启动校验配置文件 2023-06-07 11:25:29 +08:00
1b2e96a0c1 加错误码 2023-06-07 10:17:30 +08:00
e8744d1b76 优化 2023-06-06 21:28:09 +08:00
695e862bff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:47:51 +08:00
9c056126f2 获取英雄数据 2023-06-06 17:47:42 +08:00
851568b29b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:43:33 +08:00
9dd133e6ce errorcode 2023-06-06 17:43:22 +08:00
09c9538fc7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:39:14 +08:00
a54b5f25e8 189 任务埋点 进行一次定制打造 2023-06-06 17:39:05 +08:00
a5c6d42af7 更新公会任务进度 2023-06-06 17:25:11 +08:00
438f6cb55b 公会任务进度、公告字数限制 2023-06-06 17:25:10 +08:00
67f0f496d1 23167 申请校验问题 2023-06-06 17:25:10 +08:00
52451919ec update 2023-06-06 17:22:09 +08:00
4629b13af1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 17:16:18 +08:00
f578c50043 代码整理 2023-06-06 17:16:14 +08:00
liwei1dao
12315a53c7 上传埋点校验查询接口跨服使用优化 2023-06-06 17:08:59 +08:00
liwei1dao
559b96b287 修复战斗创建代码 2023-06-06 16:52:26 +08:00
e6a56d5563 update 2023-06-06 15:48:53 +08:00
9260eef2dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 15:19:30 +08:00
fa55fab6b0 opnecond 2023-06-06 15:19:13 +08:00
b6ab5221ed rdtask errdata 2023-06-06 15:16:50 +08:00
90e6c7a6b5 sys errdata 2023-06-06 15:15:31 +08:00
125f4b30f7 reputation errdata 2023-06-06 15:14:03 +08:00
06b5855745 linestory errdata 2023-06-06 15:12:20 +08:00
015c649c04 growtask errdata 2023-06-06 15:10:55 +08:00
905a40f1cb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 15:08:16 +08:00
506371da7e 结局冲突 2023-06-06 15:08:01 +08:00
ee8c3927cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 15:05:41 +08:00
a275e970cf friend errdata 2023-06-06 15:05:31 +08:00
a7699d8a87 update 2023-06-06 15:00:05 +08:00
c3b4c4c12a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 14:58:24 +08:00
be74d2b98b update 2023-06-06 14:58:07 +08:00
3d00711bd5 dispatch errordata 2023-06-06 14:44:52 +08:00
8d51010159 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 14:37:02 +08:00
355c63a42e 公会errordata 2023-06-06 14:36:57 +08:00
liwei1dao
a690762889 上传代码规范调整 2023-06-06 14:13:54 +08:00
liwei1dao
0310fe0676 上传代码规范化调整 2023-06-06 13:55:33 +08:00
8483f6b17d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 13:46:38 +08:00
04a478e3a9 errdata 对象返回 2023-06-06 13:46:30 +08:00
6eb2a1b45e user errdata修改 2023-06-06 11:37:05 +08:00
liwei1dao
42becbca4e 批量调整代码规范 2023-06-06 11:08:14 +08:00
210813d7f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 11:02:58 +08:00
f246a19a3c update 2023-06-06 11:02:47 +08:00
290484c3af errorcode 2023-06-06 11:01:50 +08:00
a649050155 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:33:55 +08:00
d446065b0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:33:46 +08:00
34698ddc60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:27:07 +08:00
e5eb0d5b19 updata 2023-06-06 10:26:56 +08:00
liwei1dao
d7efa47ab4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:26:23 +08:00
liwei1dao
82bf9f6d26 上传接口调整 2023-06-06 10:26:18 +08:00
1fe4cd65a8 修改ErrorData 2023-06-06 10:16:59 +08:00
047ab5fb9d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-06 10:13:09 +08:00
9d81c8b703 update 2023-06-06 10:11:54 +08:00
liwei1dao
9c0eb14e76 上传代码同步 2023-06-06 10:11:23 +08:00
885b4bbb50 代码整理 2023-06-06 09:56:12 +08:00
liwei1dao
1a2c3bed0b 上传代码规范调整 2023-06-06 09:52:44 +08:00
liwei1dao
91b99e07ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-05 20:04:51 +08:00
liwei1dao
3199ee3b92 修改进机场积分 2023-06-05 20:04:45 +08:00
b61085b0e1 优化调整 2023-06-05 16:14:34 +08:00
20d3a6e4b6 周任务结构更新 2023-06-05 10:04:21 +08:00
11f54ef56b update task 2023-06-05 10:04:21 +08:00
8487a59623 update 周任务 2023-06-05 10:04:21 +08:00
6394be1065 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 22:08:31 +08:00
eaf2c07678 配置同步 2023-06-02 22:08:29 +08:00
liwei1dao
5934f9f5a3 上传用户皮肤修改头像替换同步问题 2023-06-02 21:29:37 +08:00
23cdd31fcf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 20:00:58 +08:00
db4fb9bcae 更改消息顺序 2023-06-02 20:00:50 +08:00
43769fc6fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 17:33:21 +08:00
73b734a6ee 移出捏脸 2023-06-02 17:33:15 +08:00
liwei1dao
cc8e3036ff 合成优化 2023-06-02 17:32:39 +08:00
liwei1dao
840861f5dd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-02 11:50:12 +08:00
liwei1dao
df999ebbd3 上传道具代码 2023-06-02 11:49:44 +08:00
0a3033e8ed 修改接取时条件已完成但无需交付 2023-06-02 11:30:56 +08:00
liwei1dao
22f19839b6 上传代码 2023-06-01 20:51:40 +08:00
liwei1dao
544db8a3cf 上传代码 2023-06-01 18:53:08 +08:00
70aa49e386 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 18:07:02 +08:00
356a22a4c8 商队结算 2023-06-01 18:06:54 +08:00
liwei1dao
f51e3d366d 完善周日常任务 2023-06-01 18:06:39 +08:00
liwei1dao
a3b4fd5288 上传旧时光代码优化 2023-06-01 18:03:01 +08:00
liwei1dao
a70c3b8652 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 16:27:29 +08:00
liwei1dao
4c765eab8e 上传埋点中心代码 2023-06-01 16:27:23 +08:00
8d3acd80bd 消耗整合 2023-06-01 15:41:18 +08:00
01720f3128 update 2023-06-01 15:33:38 +08:00
c389cf463e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 15:32:49 +08:00
e17387c10f update 2023-06-01 15:32:43 +08:00
liwei1dao
22544c5df8 上传 2023-06-01 15:09:19 +08:00
8603bd6e76 更新任务接口调用 2023-06-01 14:59:06 +08:00
e1776f0966 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 14:56:40 +08:00
ab3528cd59 更新任务接口调用 2023-06-01 14:56:34 +08:00
liwei1dao
f6f77f32ff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 14:40:40 +08:00
liwei1dao
bd00553832 上传任务道具使用代码 2023-06-01 14:40:34 +08:00
d6bb445392 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 14:31:00 +08:00
3f606407d9 技能升级调整 2023-06-01 14:30:55 +08:00
4ce03856e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 13:57:14 +08:00
liwei1dao
7d3929305a 上传任务中心和旧时光优化 2023-06-01 13:56:41 +08:00
bf7aa00f74 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-06-01 10:31:26 +08:00
liwei1dao
6b88775848 优化埋点日志 2023-05-31 19:06:36 +08:00
liwei1dao
db0a7225fa 优化日志代码 2023-05-31 19:04:37 +08:00
30c82b64ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-31 18:37:00 +08:00
2258793716 天赋学习等级校验 2023-05-31 18:36:51 +08:00
4c1033ac04 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-31 18:35:29 +08:00
283410f2e6 补充ErrorData 2023-05-31 18:31:44 +08:00
732398c5ea 代码整理 2023-05-31 18:17:21 +08:00
liwei1dao
5d0d6a9253 上传代码规范优化 2023-05-31 18:01:53 +08:00
liwei1dao
1e7066a294 错误采集优化 2023-05-31 17:49:01 +08:00
liwei1dao
fa4b57748b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-31 15:45:49 +08:00
liwei1dao
c48cf68e26 上传埋点中中心协议 2023-05-31 15:40:46 +08:00
e5ba3481c4 删除废弃接口调用 2023-05-31 15:07:23 +08:00
4e70b9204a 更新任务校验接口调用 2023-05-31 13:41:46 +08:00
liwei1dao
6d560e4213 上传埋点中心校验接口优化 2023-05-31 11:30:05 +08:00
liwei1dao
da9038821e 上传竞技场代码优化 2023-05-31 11:04:52 +08:00
liwei1dao
85d861c4f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 21:25:38 +08:00
liwei1dao
c67b911d54 上传任务系统代码 2023-05-30 21:25:29 +08:00
94aff2223e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 19:02:39 +08:00
71a40f87ca 完善ErrorData 2023-05-30 19:02:32 +08:00
a99388c5f8 错误对象构建 2023-05-30 18:32:34 +08:00
bd4d8504b9 初始化 2023-05-30 17:59:45 +08:00
9d16c57768 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:47:29 +08:00
1a560f9ab7 map 初始化 2023-05-30 17:47:21 +08:00
3371088e78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:46:05 +08:00
ca6aa24fe9 errorData 2023-05-30 17:45:57 +08:00
4b89fd4362 update 2023-05-30 17:38:41 +08:00
aef30ba083 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:21:18 +08:00
961a2e8bcf 错误整合遗漏点 2023-05-30 17:21:12 +08:00
0e0caaca40 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 17:18:45 +08:00
52676533e4 add log 2023-05-30 17:18:32 +08:00
liwei1dao
9b4a845d29 上传代码 2023-05-30 17:17:04 +08:00
7667308a80 补充错误信息 2023-05-30 16:49:47 +08:00
81c5ec46d2 add log 2023-05-30 16:39:36 +08:00
85be4a2254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 16:35:40 +08:00
f17497338a 更新errorData 2023-05-30 16:35:35 +08:00
liwei1dao
0db1088c9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 16:34:39 +08:00
liwei1dao
0143e85b28 上传错误信息收集 2023-05-30 16:34:34 +08:00
cf41baf481 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 16:08:54 +08:00
ecfe9acdda 维京 狩猎 改体力消耗 2023-05-30 16:08:49 +08:00
a7faed061b 更新ErrorData 2023-05-30 15:53:01 +08:00
liwei1dao
c3c266557a 上传代码 2023-05-30 15:07:31 +08:00
liwei1dao
543a7083a4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 14:48:19 +08:00
liwei1dao
53969b4fe8 上传任务配置修复 2023-05-30 14:48:11 +08:00
15a4177778 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 14:39:02 +08:00
57115d4d74 任务 整合 2023-05-30 14:38:55 +08:00
liwei1dao
5915c6363d 埋点中心跨服触发处理 2023-05-30 14:33:14 +08:00
liwei1dao
c99a0dfd4a 上传任务接口调整 2023-05-30 14:23:13 +08:00
liwei1dao
935423bf0b 上传任务代码 2023-05-30 13:49:39 +08:00
7fb6fd8432 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 11:57:50 +08:00
24fafd65ec 交付校验修改 2023-05-30 11:57:20 +08:00
2a89f2800b Rtype160 2023-05-30 11:55:49 +08:00
e377d6f35a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 11:26:30 +08:00
8558bb682d Rtype57 Rtype54 重复 2023-05-30 11:26:27 +08:00
b8bc199f37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 11:03:55 +08:00
900ee8c362 任务通知条件校验 2023-05-30 11:03:45 +08:00
05140ef22c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-30 10:53:38 +08:00
778ca8879f 统计类型任务 2023-05-30 10:53:34 +08:00
liwei1dao
166a0c4ddc 上传事件同步通知 2023-05-29 22:03:13 +08:00
liwei1dao
9a96a796c8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 22:02:04 +08:00
liwei1dao
5ef5164624 上传任务错误代码 2023-05-29 22:01:47 +08:00
c8ef9eb4ec 装备打造 2023-05-29 21:58:01 +08:00
737d93f9c4 英雄送礼物问题修复 2023-05-29 21:51:10 +08:00
liwei1dao
c753d2fc90 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 21:21:22 +08:00
liwei1dao
9ee8823cb3 上传任务统计代码 2023-05-29 21:21:10 +08:00
85110dc808 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 20:10:49 +08:00
923cffe19d 世界任务战斗完成 2023-05-29 20:10:30 +08:00
liwei1dao
7a0a63377b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 19:45:50 +08:00
liwei1dao
8f0dba9fcd 上传任务修复代码 2023-05-29 19:45:39 +08:00
fd9173aa7b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 19:39:41 +08:00
fa1dec7514 错误码返回 2023-05-29 19:39:31 +08:00
7004aa13a4 处理err 2023-05-29 18:14:36 +08:00
53387bbd0b 更新任务接口 2023-05-29 18:12:08 +08:00
b3e16d641e 更改module命名 2023-05-29 18:12:08 +08:00
392c7d3ecf 世界任务通知事件 2023-05-29 18:12:08 +08:00
liwei1dao
82220d8ed1 同步代码 2023-05-29 18:02:10 +08:00
liwei1dao
363dcd530f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 17:51:01 +08:00
liwei1dao
1318e14db0 上传任务代码调整 2023-05-29 17:50:51 +08:00
fb5ab9f073 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 17:35:32 +08:00
a4d0f967df 错误码整合 2023-05-29 17:23:53 +08:00
liwei1dao
0bde395d6a 上传新埋点接口 2023-05-29 17:16:52 +08:00
liwei1dao
1a2d39eaec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 16:22:50 +08:00
liwei1dao
8ed57d862c 上传埋点中心 2023-05-29 16:22:06 +08:00
4dcfa9593d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 16:14:29 +08:00
afcbd2c766 update worldtask gm 2023-05-29 16:14:21 +08:00
liwei1dao
f4a376ad10 上传配置同步 2023-05-29 15:46:44 +08:00
982697ea1c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 15:23:52 +08:00
e1e364f9c2 bingo worldtask 2023-05-29 15:23:48 +08:00
liwei1dao
0ae9600577 同步配置表和协议机制 2023-05-29 14:49:52 +08:00
b156e9d4f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 14:38:44 +08:00
847fe86ea7 移出不用的模块 添加新接口 2023-05-29 14:38:41 +08:00
0c0615b756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-29 10:47:19 +08:00
edb52d8be2 优化任务完成后方法调用 2023-05-29 10:47:10 +08:00
liwei1dao
863227d5a6 上传代码 2023-05-26 21:40:22 +08:00
d0576acabf 接取返回已完成条件 2023-05-26 21:22:58 +08:00
liwei1dao
84580a242d 上传代码 2023-05-26 21:21:25 +08:00
liwei1dao
f5aad7f0bd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 20:29:15 +08:00
liwei1dao
c991176089 上传任务修改 2023-05-26 20:29:08 +08:00
ac66175afd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 20:22:55 +08:00
69d1b28953 类型为2 的图鉴 2023-05-26 20:22:46 +08:00
liwei1dao
4b23e35bea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 19:14:23 +08:00
liwei1dao
a2dfecd664 上传旧时光任务判断 2023-05-26 19:14:16 +08:00
e232fbb71d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 18:59:11 +08:00
0c04eb6694 Rtype187 2023-05-26 18:59:01 +08:00
a85aac429a 获得指定材料任务 2023-05-26 18:58:37 +08:00
liwei1dao
1089324677 上传代码 2023-05-26 18:30:18 +08:00
d68ff5437c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 17:02:57 +08:00
a78f2da607 更改任务类型 2023-05-26 17:02:51 +08:00
fa1bb31c2f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 17:02:43 +08:00
ff32e73ae6 Rtype119 Rtype120 2023-05-26 17:02:36 +08:00
c00990de8c 修改Rtype123 2023-05-26 16:53:44 +08:00
61250eaaf2 Rtype123 2023-05-26 16:42:57 +08:00
aa477d139c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 16:24:50 +08:00
f6ac63de88 上传错误码 2023-05-26 16:24:47 +08:00
06cf76081d 共鸣查询接口补充 2023-05-26 16:10:25 +08:00
liwei1dao
01b746ee7f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 16:08:04 +08:00
liwei1dao
862341dd9d 上传67号锚点 2023-05-26 16:07:59 +08:00
83a24c9c8c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 15:31:39 +08:00
42080ee2c6 注册Rtype111 2023-05-26 15:31:28 +08:00
liwei1dao
d7da1b1e18 上传任务埋点错误 2023-05-26 15:23:03 +08:00
8358b89945 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 15:13:24 +08:00
4870ad0bbf 任务类型注册修改 2023-05-26 15:13:13 +08:00
f80668f79b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 15:04:09 +08:00
57d4a3ee95 Rtype167 Rtype165 2023-05-26 15:04:02 +08:00
liwei1dao
079a86c298 上传任务配置 2023-05-26 14:50:38 +08:00
bfc3bb8bc1 上传配置 2023-05-26 14:20:22 +08:00
63e9cb068a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 14:14:50 +08:00
c453d04bf6 返回错误信息 2023-05-26 14:14:22 +08:00
0c3b382923 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 13:39:00 +08:00
48bcda8afc Rtype61 2023-05-26 13:38:44 +08:00
liwei1dao
978fe81b35 上传星像埋点 2023-05-26 12:31:57 +08:00
liwei1dao
fc2f667599 上传配置未找到错误 2023-05-26 12:10:36 +08:00
liwei1dao
be6df0efd0 上传配置 2023-05-26 11:37:34 +08:00
b5d3384fca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-26 11:04:08 +08:00
25f4dd7bfb 优化任务通知接口 2023-05-26 10:59:32 +08:00
liwei1dao
6082476693 上传代码 2023-05-26 10:50:56 +08:00
74f5d0328f 调整任务类型分类 2023-05-26 09:31:42 +08:00
aee07aa8f7 埋点接口优化 2023-05-25 22:31:51 +08:00
liwei1dao
41eba13ab5 上传代码 2023-05-25 22:26:23 +08:00
liwei1dao
1bb1752209 上传任务修复 2023-05-25 20:22:36 +08:00
5c3ed137ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 20:06:48 +08:00
0fd9bac9f9 优化userErrCode 2023-05-25 20:06:39 +08:00
liwei1dao
511f052a90 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 20:00:20 +08:00
liwei1dao
61dd85b752 优化易步硕 2023-05-25 20:00:14 +08:00
1c8e81fad9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 19:10:47 +08:00
2336a63e23 商队刷新返回刷新时间 2023-05-25 19:10:42 +08:00
liwei1dao
824b866183 上传代码 2023-05-25 18:49:16 +08:00
563ae94a22 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 18:48:11 +08:00
576e63bb69 去掉74任务 2023-05-25 18:48:08 +08:00
64e9ff0fe7 删除枚举 2023-05-25 18:45:17 +08:00
56a6f6c6ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 18:43:28 +08:00
30ccfc256c 修改任务枚举 2023-05-25 18:43:20 +08:00
e941bb199d 通关状态推送 2023-05-25 18:38:27 +08:00
90cd46979f update 2023-05-25 18:32:37 +08:00
a5217a3839 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 17:51:36 +08:00
b4218fcc0d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 17:51:13 +08:00
9054a1dbb9 进度查询 2023-05-25 17:51:12 +08:00
0892a6c8e9 公会埋点 2023-05-25 17:51:04 +08:00
a6462bd0a1 上次代码 2023-05-25 17:39:13 +08:00
liwei1dao
d3f537f229 上传星阵图 2023-05-25 17:16:12 +08:00
liwei1dao
ff3cc52b3a 上传任务修复 2023-05-25 17:11:36 +08:00
5ded8e1488 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 16:06:53 +08:00
40012007d7 整理任务类型 2023-05-25 16:06:47 +08:00
726b325c56 Rtype40埋点 2023-05-25 16:06:25 +08:00
72708679b2 任务埋点数据调整 2023-05-25 15:58:24 +08:00
8c22d48913 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 15:00:38 +08:00
05b935a22a 134 埋点参数 2023-05-25 15:00:33 +08:00
liwei1dao
eeffd69920 上传任务修复 2023-05-25 14:35:27 +08:00
875fa1c36b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-25 13:42:52 +08:00
f375b528eb update 2023-05-25 13:42:42 +08:00
liwei1dao
f359272ce8 上传埋点中心 2023-05-25 13:42:09 +08:00
bbf8a2d57c 修改任务接口 2023-05-24 23:59:02 +08:00
liwei1dao
46ec141a48 上传装备查询接口 2023-05-24 22:46:25 +08:00
liwei1dao
53ae82a235 上传埋点代码 2023-05-24 22:37:28 +08:00
liwei1dao
c759dfae0b 上传任务埋点代码处理 2023-05-24 22:29:48 +08:00
liwei1dao
9f0ad2ed8c 上传42号埋点问题 2023-05-24 22:04:33 +08:00
4fe3f22982 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 20:58:31 +08:00
2757932e48 修复筛选条件问题 2023-05-24 20:58:24 +08:00
liwei1dao
bb95120cfe 上传任务埋点错误 2023-05-24 20:55:19 +08:00
2125e8fb0c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:36:05 +08:00
6afcd78e36 任务埋点整理3 2023-05-24 19:36:01 +08:00
8d35b9be80 报错处理 2023-05-24 19:31:18 +08:00
6c1af1394f 报错修改 2023-05-24 19:18:12 +08:00
f78006a681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:13:38 +08:00
18a438b117 83埋点 2023-05-24 19:13:35 +08:00
liwei1dao
d9ef723c42 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:06:58 +08:00
liwei1dao
0220678a3d 上传好友助战埋点 2023-05-24 19:06:52 +08:00
3f3d5e3ded Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 19:01:43 +08:00
0c86e1bec5 参数调整 2023-05-24 19:01:40 +08:00
liwei1dao
51ffe78927 上传强化装备埋点 2023-05-24 18:58:45 +08:00
liwei1dao
3d48f7cc12 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 18:52:42 +08:00
liwei1dao
c361042acf 上传旧时光代码 2023-05-24 18:52:32 +08:00
a857bb8a5a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 18:46:33 +08:00
1202958027 埋点数据调整 2023-05-24 18:46:02 +08:00
48c68c04fd 世界任务GM修复 2023-05-24 18:39:24 +08:00
6f691d06ae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 17:48:55 +08:00
4a86e8523f 非埋点的任务校验 2023-05-24 17:48:45 +08:00
liwei1dao
8bc2b5ed00 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 17:45:27 +08:00
liwei1dao
54566ec0cd 上传数据模块调整 2023-05-24 17:45:19 +08:00
d48e2a9454 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 17:20:39 +08:00
ef0363f78b 任务类型整理2 2023-05-24 17:20:31 +08:00
458c2347a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 16:27:37 +08:00
a371d1952b 任务参数调整 2023-05-24 16:27:32 +08:00
e73b025e95 删除丢弃的函数 2023-05-24 15:40:39 +08:00
1fa4dfe510 任务类型整理1 2023-05-24 15:36:12 +08:00
bdb0932bd4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-24 14:59:57 +08:00
ee517f963e 修改完成条件校验 2023-05-24 14:57:29 +08:00
a46e6cd3f2 活动开启时间取开服时间做相应计算 2023-05-24 11:02:00 +08:00
c5e09f3281 商队结算 2023-05-23 19:11:50 +08:00
92f2aaeea2 邮件参数补充 2023-05-23 17:24:45 +08:00
e24b610db9 update 2023-05-23 17:21:26 +08:00
b7f5b20b1a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 17:08:10 +08:00
7dcbbd3802 时间轮清理 2023-05-23 17:08:03 +08:00
liwei1dao
183d54ba98 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 17:06:46 +08:00
liwei1dao
bcb60fc93e 上传任务代码 2023-05-23 17:06:37 +08:00
liwei1dao
3d591a2a9f 同步段位代码 2023-05-23 17:05:31 +08:00
d573f458da Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 17:02:16 +08:00
140550b781 商队功能补充 2023-05-23 17:02:08 +08:00
liwei1dao
44a529cb21 上传代码 2023-05-23 16:07:50 +08:00
liwei1dao
e7a604d694 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 16:03:44 +08:00
liwei1dao
a4a40f0e7d 优化日志堆栈输出和任务系统代码 2023-05-23 16:03:34 +08:00
liwei
ed50769ca0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 15:50:22 +08:00
310f06821f GM-worldtask 2023-05-23 12:03:06 +08:00
6e2f8e997c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:19:40 +08:00
018a382080 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:18:53 +08:00
liwei1dao
2c7d5c6919 修复竞技场 初始化没有匹配定位数据 2023-05-23 11:18:50 +08:00
liwei1dao
2e66805b3a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:15:46 +08:00
liwei1dao
c6e51e9dcd 上传服务器代码 2023-05-23 11:15:40 +08:00
fe77509053 浇水任务类型 2023-05-23 11:15:34 +08:00
d997a995c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-23 11:11:19 +08:00
1f4488e6e7 奖励邮件 2023-05-23 11:11:17 +08:00
liwei1dao
da320698af 修复竞技场玩家信息同步 2023-05-23 10:54:39 +08:00
liwei1dao
82b29a3657 优化竞技场机器人头像等级信息 2023-05-23 10:51:01 +08:00
liwei1dao
27ca07a422 上传代码修复 2023-05-23 10:26:54 +08:00
1a4d0801a8 武馆派遣悬赏新增 2023-05-23 10:08:06 +08:00
cd798d8c34 任务触发区分接取和创号 2023-05-23 09:45:02 +08:00
0cf6580c37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 19:08:39 +08:00
dfb6f29b5c 测试数据 2023-05-22 19:08:34 +08:00
liwei1dao
ddf7f77315 上传任务埋点代码 2023-05-22 19:02:01 +08:00
liwei1dao
95dc4efb22 同步代码 2023-05-22 18:31:49 +08:00
58b0b993a8 名称修改 2023-05-22 18:25:29 +08:00
519880d6bc update 2023-05-22 18:24:21 +08:00
ae069e2504 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 18:08:33 +08:00
90de92da72 任务记录类型判断 2023-05-22 18:08:26 +08:00
bcd4c9a1a0 新增刷新商队城市货物信息接口 2023-05-22 17:32:01 +08:00
edef2d3606 任务埋点数据 2023-05-22 17:02:08 +08:00
d417eec3ce 新增任务埋点 2023-05-22 15:02:18 +08:00
c7752a6abe 玩家头像写入 2023-05-22 14:40:25 +08:00
5f28fb8d86 排行数据 2023-05-22 13:48:21 +08:00
da98862db6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-22 10:57:57 +08:00
c43567a707 记录上一次货物变动的价格 2023-05-22 10:57:54 +08:00
liwei1dao
574adb566d 上传代码 2023-05-22 10:50:21 +08:00
liwei1dao
04032ba2c9 上传登录调整 2023-05-22 10:34:46 +08:00
cbb2e96764 update 2023-05-19 20:26:00 +08:00
a1f28a0ba6 出售加价计算错误 2023-05-19 20:15:43 +08:00
28dc696beb 城市购买饱和系数 2023-05-19 19:49:16 +08:00
97b2284820 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-19 18:37:34 +08:00
1e32c6c476 商队优化 2023-05-19 18:37:31 +08:00
590701affe 签名响应字段未设置 2023-05-19 15:56:04 +08:00
f2735668f7 修改注释 2023-05-19 15:38:14 +08:00
96ab51a518 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-19 15:23:19 +08:00
97f7b7058a update 2023-05-19 15:23:03 +08:00
2d49493354 城市和货物刷新时间一致 2023-05-19 15:16:09 +08:00
2cf51eec34 商队优化 2023-05-19 13:53:06 +08:00
1a70d06daf pb 更新 去掉打印 2023-05-18 21:58:24 +08:00
09660487b6 默认皮肤 2023-05-18 21:52:35 +08:00
263269ee60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-18 19:42:30 +08:00
e586f872f1 跑商修改 2023-05-18 19:42:24 +08:00
2c41d30c7b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-18 17:54:20 +08:00
275ee9e1b1 新任务埋点数据 2023-05-18 17:39:27 +08:00
90b916f282 修改世界任务响应Code 2023-05-18 16:01:27 +08:00
c2c20474f0 需求单 21936 狩猎掉落组升级 2023-05-18 15:00:32 +08:00
65e87aaf09 狩猎自动出售 自动购买门票 2023-05-18 14:44:07 +08:00
d1760688c5 worldtask pb 2023-05-18 11:58:54 +08:00
aaaa9f56db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 19:50:16 +08:00
e619683813 配置同步 2023-05-17 19:50:02 +08:00
liwei1dao
ba20d5fd20 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 18:59:09 +08:00
liwei1dao
eadbb9bcfe 上传捕羊大赛复活 2023-05-17 18:59:03 +08:00
8d4e4fa1ce Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 18:57:00 +08:00
1267123e1a 商队等级提示发奖 2023-05-17 18:56:57 +08:00
liwei1dao
6f128e9379 竞技场修复 2023-05-17 18:50:46 +08:00
liwei1dao
ece1e4e401 竞技场修复 2023-05-17 18:49:44 +08:00
liwei1dao
21192e3884 上传代码修复 2023-05-17 17:08:35 +08:00
liwei1dao
52351439e8 上传日志添加 2023-05-17 17:00:35 +08:00
liwei1dao
a70204f3b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 16:48:02 +08:00
liwei1dao
f75130e947 优化捕羊大赛匹配程序 2023-05-17 16:47:53 +08:00
3dd57b242e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 15:42:16 +08:00
9485d650f1 配置整理 2023-05-17 15:35:55 +08:00
dbad4c408a 优化 2023-05-17 15:24:01 +08:00
liwei1dao
75c234a274 上传新用户账号信息 2023-05-17 14:48:09 +08:00
liwei1dao
c2399706fc 移除不必要配置 2023-05-17 14:46:19 +08:00
93e6c996ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 14:25:57 +08:00
05215495db 更新分组任务接口 2023-05-17 14:25:49 +08:00
1da5837986 移出不需要的配置 2023-05-17 14:13:41 +08:00
aa62f3961f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 14:10:25 +08:00
6ccc98d308 天赋配置调整 新增解锁技能需求 2023-05-17 14:10:22 +08:00
liwei1dao
7e6a86024f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-17 11:57:43 +08:00
liwei1dao
c1b65c4314 上传皮肤需求代码 2023-05-17 11:57:38 +08:00
d542633257 背包整理 2023-05-17 11:43:23 +08:00
5b5d24041d uopdate 2023-05-17 10:27:05 +08:00
bb6ba7f9db Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 17:18:49 +08:00
454d12f7ce 商队任务接口 2023-05-16 17:18:27 +08:00
049f5ed8f5 跑商任务接取处理 2023-05-16 17:13:21 +08:00
d959191c8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 15:56:10 +08:00
ce736c1a19 随机触发事件 2023-05-16 15:56:07 +08:00
d45353e82b 随机触发事件处理 2023-05-16 15:55:58 +08:00
liwei1dao
1cf88da6ba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-16 13:52:26 +08:00
liwei1dao
601ba317cc 上传竞技场战斗记录属性补充 2023-05-16 13:52:21 +08:00
344b9351ff 跳转城市获取随机事件任务 2023-05-16 11:47:57 +08:00
26d84899d9 出售或购买获取虚拟币 2023-05-15 19:24:16 +08:00
fdbd9728f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 18:41:59 +08:00
a01629af75 物品刷新 2023-05-15 18:41:55 +08:00
liwei1dao
f3dce490f1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 18:04:47 +08:00
liwei1dao
8204440960 上传竞技场优化 2023-05-15 18:04:40 +08:00
e08cec7a65 刷新城市信息和货物信息接口 2023-05-15 16:22:33 +08:00
b55b98e1ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 15:09:31 +08:00
5e7b0441fc 商队商品购买 2023-05-15 15:09:27 +08:00
liwei1dao
4308373500 上传捕羊大赛代码 2023-05-15 11:55:12 +08:00
liwei1dao
f194a837df Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-15 11:33:00 +08:00
liwei1dao
dfdadc8b09 上传配置代码 2023-05-15 11:32:54 +08:00
de36b0da8f 添加虚拟币资源 2023-05-15 11:03:22 +08:00
45952b8f11 跑商买卖 2023-05-12 21:55:52 +08:00
liwei1dao
4a87420318 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 20:50:46 +08:00
liwei1dao
7a331ccefb 上传战斗优化 2023-05-12 20:50:41 +08:00
dbdc0f17ae 跑商数据初始化+协议优化 2023-05-12 20:49:40 +08:00
ef4f779ef2 跑商协议调整 2023-05-12 19:59:48 +08:00
763dcd6c0b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 19:15:27 +08:00
1949c0e4ea 商队 2023-05-12 19:15:23 +08:00
liwei1dao
1cd38733aa 上传任务锁代码 2023-05-12 18:24:03 +08:00
fc391d0a91 update 2023-05-12 16:42:37 +08:00
76c2db3a85 修改公会解散CD 2023-05-12 16:35:36 +08:00
c4d2ab391c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 15:29:39 +08:00
b633b02b08 修复跨服任务 2023-05-12 15:24:22 +08:00
liwei1dao
75247e1390 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-12 10:44:21 +08:00
liwei1dao
605507501b 上传装备升级副属性找不到错误返回 2023-05-12 10:44:15 +08:00
f814ed19ce 维京新增奖励 2023-05-12 10:13:24 +08:00
9b7f8f3ffe update 2023-05-11 22:28:40 +08:00
65f841e958 公会申请等级限制 2023-05-11 20:17:58 +08:00
bfd49fb493 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-11 19:36:59 +08:00
72565977fe 英雄新增属性 2023-05-11 19:36:53 +08:00
6b4beb5765 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-11 19:05:04 +08:00
ac232ccfcd update 2023-05-11 19:04:51 +08:00
liwei1dao
cfb1580054 添加日志 2023-05-11 17:49:22 +08:00
f035a8290f 功夫大师塔调整 2023-05-11 16:46:52 +08:00
bc51e58381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 16:28:25 +08:00
2c80d0b6c2 数据校验 2023-05-10 16:28:22 +08:00
liwei1dao
b1bfc4e385 上传修改时间服务器时间接口 2023-05-10 16:01:42 +08:00
liwei1dao
b2bd909b91 上传用户时间校验 2023-05-10 15:33:54 +08:00
11cf7a9fac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:31:34 +08:00
666749a699 修改图鉴领取的问题 2023-05-10 10:31:16 +08:00
b6e489501f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:30:55 +08:00
72867cea6e 打造一次升多级情况 2023-05-10 10:30:53 +08:00
liwei1dao
f7b7eb85d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-10 10:29:58 +08:00
liwei1dao
d3d0c627ff 上传每日一练刷新机制 2023-05-10 10:29:52 +08:00
d0fed35a83 记录英雄赠送食物的开始时间 2023-05-09 16:23:31 +08:00
72b1d99a19 熔岩打造提示缺少熔岩问题 2023-05-09 16:01:20 +08:00
8c72293119 入榜条件 2023-05-09 15:22:54 +08:00
84720ed7f1 update 2023-05-08 20:23:49 +08:00
4b5ebf9268 接口补充 2023-05-08 20:06:06 +08:00
liwei1dao
4a2971f08e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 20:04:16 +08:00
liwei1dao
f1c0979c1a 上传接口 2023-05-08 20:04:09 +08:00
90dc48d146 自动出售接口补充 2023-05-08 19:48:20 +08:00
4efb6a2ce1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 19:43:01 +08:00
77d0636bd1 工具台技能加成 2023-05-08 19:42:58 +08:00
liwei1dao
953f158445 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 19:38:58 +08:00
liwei1dao
4d697b4e70 上传代码 2023-05-08 19:38:52 +08:00
7b9035f254 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 18:54:10 +08:00
97d388fe38 一键出售装备道具等资源 2023-05-08 18:54:06 +08:00
bb3398e78e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 18:20:53 +08:00
49917a6443 任务随机修改 2023-05-08 18:20:30 +08:00
00eab14456 工具测试协议优化 2023-05-08 18:19:57 +08:00
59d8a04f93 炉温消耗打折问题 2023-05-08 17:53:36 +08:00
bd859c2653 装备自动出售不入背包 2023-05-08 16:42:20 +08:00
81419dc31b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 15:21:53 +08:00
cc32aaa029 羁绊等级需要手动激活 2023-05-08 15:21:48 +08:00
liwei1dao
281081ea80 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-08 10:56:31 +08:00
liwei1dao
fed2b37db2 上传捕羊代码 2023-05-08 10:56:25 +08:00
33784184b7 羁绊剧情奖励 2023-05-08 10:18:01 +08:00
95ba9c3983 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 19:28:11 +08:00
852880bdc3 条件开启功能自动解锁 2023-05-05 19:28:06 +08:00
liwei1dao
997531550a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 19:24:41 +08:00
liwei1dao
28d745e3ca 上传捕羊大赛调试优化 2023-05-05 19:24:29 +08:00
dbe12ea192 更新任务触发 2023-05-05 16:57:38 +08:00
cc356997a3 update 2023-05-05 16:57:38 +08:00
af5808a748 功能条件开启 2023-05-05 16:09:46 +08:00
e4fda1c747 删除剧情奖励 2023-05-05 12:04:27 +08:00
cc60845b92 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-05-05 10:58:14 +08:00