Commit Graph

5817 Commits

Author SHA1 Message Date
4f8166850b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 14:40:08 +08:00
e2fb4deb76 【石阵秘境】图鉴点击领取报错 2023-09-27 14:40:04 +08:00
liwei1dao
e4e08a2201 上传竞技场异常问题 2023-09-27 14:11:06 +08:00
liwei1dao
1456fa9f8d 上传传功塔代码 2023-09-27 10:27:14 +08:00
175ba83533 接口调整 2023-09-27 10:15:06 +08:00
4eca46e2a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 10:06:45 +08:00
29f8677fda 获取英雄虚拟等级属性 2023-09-27 10:06:40 +08:00
77f055447a 新增称号资源 2023-09-26 19:06:38 +08:00
liwei1dao
23886a2763 移除废弃表格 2023-09-26 19:04:31 +08:00
liwei1dao
6c1d210184 上传进度解锁 2023-09-26 18:24:10 +08:00
liwei1dao
ea3b997d53 补充战斗校验代码 2023-09-26 17:07:13 +08:00
liwei1dao
1306bead39 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-26 16:06:13 +08:00
liwei1dao
41a038effc 上传主线挂卡进度计算 2023-09-26 16:06:08 +08:00
liwei1dao
c3e87e1f69 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-29 14:09:59 +08:00
liwei1dao
a2a395227d 竞技场埋点补充 2023-09-29 14:09:51 +08:00
2c77138db1 商队协议调整 2023-09-26 15:29:45 +08:00
271b5d319b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-26 14:15:12 +08:00
557c23bfc1 过滤维京远征boss数据 2023-09-26 14:15:09 +08:00
ca4f0faed5 庆典活动调整 2023-09-26 13:42:41 +08:00
a8b73f3b34 商队数据调整 2023-09-25 19:23:22 +08:00
d6f4fee1cd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-25 17:19:51 +08:00
663b010404 优化 2023-09-25 17:19:47 +08:00
a81132f346 #35642 任务 【梦工场系统】 <-后端-> 【巨怪商队】 - 走势图新增 2023-09-25 16:37:28 +08:00
liwei1dao
0401199c94 上传测试服配置 2023-09-25 15:59:54 +08:00
liwei1dao
c5da477a08 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-25 15:36:03 +08:00
liwei1dao
019455923d 修复代码 2023-09-25 15:35:59 +08:00
f08bc06433 商队等级奖励 手动领取修复 2023-09-25 14:31:05 +08:00
21e5607d2f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-25 11:29:03 +08:00
be4b752590 需求 屏蔽铁匠铺任务红点 2023-09-25 11:29:00 +08:00
liwei1dao
abaf242108 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 19:26:48 +08:00
liwei1dao
4deef2c8b6 上传主线经验消耗 2023-09-22 19:26:44 +08:00
3f26279a89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 19:22:25 +08:00
liwei1dao
4af3391a4d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 19:15:15 +08:00
liwei1dao
cfe814687e 上传添加体力错误修复 2023-09-22 19:11:48 +08:00
25a7fcf2c0 容错处理 防止玩家数据不多的时候未创角的号入榜 2023-09-22 18:51:55 +08:00
c309920b31 加日志 2023-09-22 17:15:18 +08:00
3af91399dc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 16:05:45 +08:00
1ccfb1822c 经验接口调整 2023-09-22 16:05:41 +08:00
liwei1dao
f9865c390b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 15:55:35 +08:00
liwei1dao
535cb0a9cc 同步事件战斗经验推送 2023-09-22 15:55:31 +08:00
dcdc8252ea Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 15:45:03 +08:00
liwei1dao
fb7c10480d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 15:44:35 +08:00
liwei1dao
4aec88acb9 上传 用户经验满级后处理机制 2023-09-22 15:44:14 +08:00
6dd558df10 更新等级 2023-09-22 15:37:28 +08:00
f7469a9560 商队盈利调整 2023-09-22 15:26:14 +08:00
1cb46ae804 bug 云朵小步层数奖励读取字段错误 2023-09-22 14:16:00 +08:00
b4f3c6e1aa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 14:09:01 +08:00
f8ab538b16 排行记录商队等级 2023-09-22 14:08:54 +08:00
liwei1dao
65312b75a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-22 09:42:45 +08:00
liwei1dao
62aa62f83f 修复用户代理错误导致网关服务崩溃的问题 2023-09-22 09:42:41 +08:00
8288dc1d2a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 19:20:37 +08:00
c072240117 商队盈利收益奖励手动领取 2023-09-21 19:12:57 +08:00
liwei1dao
f8f330cb91 上传世界任务战斗经验不展示 2023-09-21 17:35:22 +08:00
liwei1dao
f5f8ac8f6a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 16:42:41 +08:00
liwei1dao
bd8055d883 上传道具分解错误处理 2023-09-21 16:42:34 +08:00
959a059405 商队 涨跌幅度千分比走区间配置 2023-09-21 15:30:17 +08:00
79f9aeb43a 添加错误输出 2023-09-21 15:15:19 +08:00
a821f8aa6a 道具加成达上限 2023-09-21 15:09:07 +08:00
eef7dc1400 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 14:53:14 +08:00
e07f9357bf #35313 缺陷 【梦工场系统】 <-后端-> 【玩家信息】储钱罐功能未生效 2023-09-21 14:53:07 +08:00
liwei1dao
d3bfe0480f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 14:41:37 +08:00
liwei1dao
1d98dfa1b6 上传登录绑定服务节点 2023-09-21 14:41:31 +08:00
9ac37cd500 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-21 14:40:56 +08:00
32008bc90e 道具提升修改 2023-09-21 14:40:52 +08:00
liwei1dao
d241547c51 上传网关用户离线通知 2023-09-21 14:33:50 +08:00
liwei1dao
9adbc2492d 上传日常任务功能开启推送 2023-09-21 11:20:45 +08:00
liwei1dao
31157c9154 上传自己的个人信息同步 2023-09-19 16:45:39 +08:00
liwei1dao
37bb93a7b9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-19 16:41:59 +08:00
liwei1dao
898822736d 上传日常任务代码 2023-09-19 16:41:41 +08:00
cc818d023f 加日志 2023-09-19 16:39:22 +08:00
cbdab7f6f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-19 15:14:36 +08:00
e69492097c session 绑定之前 数据异常处理 2023-09-19 15:14:21 +08:00
liwei1dao
a2773d3524 上传代码 2023-09-19 11:08:23 +08:00
1ff9bef70c #35016 任务 【梦工场系统】 <-后端-> 【完成条件】 - 驯龙养成等级 2023-09-19 10:34:55 +08:00
8ba44bf097 道具加成条件限制 2023-09-19 10:05:23 +08:00
04ae401832 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-18 19:19:43 +08:00
c86bf2c37a 初始养成数据 2023-09-18 19:19:39 +08:00
liwei1dao
ac608e99a2 上传错误日志提示 2023-09-18 19:09:43 +08:00
liwei1dao
221ed62dac 上传日常开关限制 2023-09-18 18:24:00 +08:00
liwei1dao
e7be493477 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-18 17:55:07 +08:00
liwei1dao
0405e8682f 管卡编辑器掉落组修改 2023-09-18 17:55:01 +08:00
b622edae29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-18 17:49:35 +08:00
9661f12346 #34936 子任务 【梦工场系统】 <-后端-> 【驯龙养成】道具提升 2023-09-18 17:49:14 +08:00
5529d8edb7 错误信息补充 2023-09-18 17:11:54 +08:00
liwei1dao
5019a65824 上传捕羊大赛等级 2023-09-18 16:55:42 +08:00
dad0c67a6a 优化 2023-09-18 14:24:09 +08:00
liwei1dao
fe682f9f39 优化日志输出 2023-09-15 22:23:36 +08:00
liwei1dao
038d417a1d 上传战报信息 2023-09-15 21:36:34 +08:00
liwei1dao
8abb284977 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-15 17:52:56 +08:00
liwei1dao
5af1eccf79 上传战斗后援占位 2023-09-15 17:52:53 +08:00
4e07455a63 活动修改 2023-09-15 16:35:56 +08:00
e94f325002 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-15 16:03:04 +08:00
1e20c347e0 活动修改 2023-09-15 16:03:00 +08:00
liwei1dao
326276f337 上传主线失败特殊处理 2023-09-15 16:00:07 +08:00
82d7a728e9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-15 14:56:15 +08:00
448025b2ac 羁绊优化 2023-09-15 14:56:11 +08:00
liwei1dao
f4c49864dc 上传用户登录代码 2023-09-15 14:40:45 +08:00
liwei1dao
d7d67fbcb6 上传公会boos代码 2023-09-14 17:16:50 +08:00
liwei1dao
2e214bf274 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 16:38:52 +08:00
liwei1dao
e41c99ae84 上传gm命令 2023-09-14 16:38:49 +08:00
a4143f24e3 数据校验 2023-09-14 16:23:47 +08:00
bf2b99fedf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 16:19:23 +08:00
402eb4deed 驯龙数据修复 2023-09-14 16:19:19 +08:00
liwei1dao
0f9525eecb 上传捕羊埋点 2023-09-14 15:39:57 +08:00
liwei1dao
68eb6bb282 上传压测时长显示 2023-09-14 15:24:25 +08:00
d86fb743c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 14:40:35 +08:00
2e0181cc92 商队测试 2023-09-14 14:36:20 +08:00
liwei1dao
4fb3c714fb 上传主线机器人 2023-09-14 14:32:39 +08:00
65524b7008 update 2023-09-14 14:27:17 +08:00
63c615ef43 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 14:23:46 +08:00
b98daf11fa 爬塔前置条件判断 2023-09-14 14:23:43 +08:00
liwei1dao
562f5018e3 上传主线代码 2023-09-14 14:19:05 +08:00
a1f7e39c9e 驯龙养成优化 2023-09-14 11:17:40 +08:00
b49cb804d2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 11:11:31 +08:00
4da2453476 驯龙升阶后重置养成属性次数 2023-09-14 11:11:28 +08:00
liwei1dao
f30ee60e87 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-14 11:03:18 +08:00
liwei1dao
d3d4998ec7 上传配置 2023-09-14 11:03:14 +08:00
83a5794a4d 功夫塔测试 2023-09-14 10:36:34 +08:00
6f894c14d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 17:41:37 +08:00
5bcdcc4709 随机顾客奖励发放 2023-09-13 17:41:34 +08:00
liwei1dao
77e828e0b4 上传配置 2023-09-13 17:19:03 +08:00
d63f01cdfb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 17:07:47 +08:00
3d3d2f117b 铁匠铺顾客收购装备优化 2023-09-13 17:07:44 +08:00
liwei1dao
ba2f8c4ba2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 16:37:24 +08:00
liwei1dao
b917b9cd72 上传坐骑变更 2023-09-13 16:36:38 +08:00
700a2ce734 update 2023-09-13 16:19:28 +08:00
a7c81df8b9 配置校验 2023-09-13 15:49:39 +08:00
4d1ab8302a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 11:39:44 +08:00
258b44f9e7 模块初始化校验 2023-09-13 11:39:40 +08:00
liwei1dao
fa73f04193 上传创角回应 2023-09-13 11:34:35 +08:00
65e6456f00 update 2023-09-13 11:33:56 +08:00
6784338b43 错误检测 2023-09-13 11:33:47 +08:00
liwei1dao
d0151b0eae 修复爬塔 2023-09-13 11:12:56 +08:00
liwei1dao
9c1b873a97 修复红点 2023-09-13 10:38:39 +08:00
5e87336c24 资源发放错误 2023-09-13 10:34:34 +08:00
b436e3549c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 10:29:37 +08:00
96b7321da5 消息异步处理 2023-09-13 10:29:33 +08:00
liwei1dao
4eab259a14 上传创号优化 2023-09-13 10:27:05 +08:00
liwei1dao
0a1234fd98 上传info还原 2023-09-13 10:17:08 +08:00
liwei1dao
947ffbe74d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-13 10:14:18 +08:00
liwei1dao
8254a62cfb 上传创号优化 2023-09-13 10:14:13 +08:00
ae92a60cbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 19:11:08 +08:00
fa35943a80 新增gm 解锁 2023-09-12 19:11:03 +08:00
liwei1dao
dec719d2f2 优化登录流程 2023-09-12 19:10:01 +08:00
482112158b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 18:32:17 +08:00
liwei1dao
59ebeeae38 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 18:32:15 +08:00
af5c089189 update 2023-09-12 18:32:13 +08:00
liwei1dao
452d58bfbc 上传异步优化 2023-09-12 18:32:09 +08:00
liwei1dao
e18e23ec95 上传异步处理 2023-09-12 18:25:51 +08:00
765a02c1ff 查询玩家接口调整 2023-09-12 16:26:42 +08:00
5cf344907c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 15:32:16 +08:00
0d8d2e2775 update 2023-09-12 15:32:10 +08:00
liwei1dao
5083db9588 优化redis 缓存过期时间 2023-09-12 15:29:15 +08:00
b2a3a9b49e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 15:14:25 +08:00
6e89c06973 体力恢复调整 2023-09-12 15:14:21 +08:00
liwei1dao
81dd2f0f86 上传代码优化 2023-09-12 15:06:50 +08:00
liwei1dao
a60bbac8f4 上传武官柱子解锁优化 2023-09-12 11:53:51 +08:00
liwei1dao
4f4acd6304 上传代码 2023-09-12 11:22:52 +08:00
liwei1dao
01f6a38cab 上传星座图bug修复 2023-09-12 09:59:20 +08:00
f711ac613c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-12 09:48:06 +08:00
5ce7e72a8b update 2023-09-12 09:48:03 +08:00
liwei1dao
97ba3aafa2 上传日志补充 2023-09-11 18:32:27 +08:00
liwei1dao
022c51d459 上传代码优化 2023-09-11 17:39:46 +08:00
82f1f44917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:56:33 +08:00
ced15fa917 异常处理 2023-09-11 16:56:30 +08:00
liwei1dao
b39dfb89fa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:54:36 +08:00
liwei1dao
de0aa19c25 上传代码优化 2023-09-11 16:54:31 +08:00
ae3cc9c369 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:48:30 +08:00
564818cc0a 优化 2023-09-11 16:48:26 +08:00
liwei1dao
1955ce04ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-11 16:18:53 +08:00
liwei1dao
9bfdbfa20c 上传底层广播消息奔溃处理 2023-09-11 16:18:47 +08:00
01832e0de2 配置同步 2023-09-11 14:53:44 +08:00
c08678a30a 商队测试 + 铁匠铺掉落 2023-09-11 14:43:16 +08:00
liwei1dao
5b41afb95c 上传秘境异常修复 2023-09-08 20:43:12 +08:00
liwei1dao
a71ac34402 上传竞技场错误修复 2023-09-08 20:40:54 +08:00
liwei1dao
40c7889b19 上传pb代码 2023-09-08 18:04:13 +08:00
liwei1dao
a1ceea9b91 上传网关错误信息 2023-09-08 17:56:53 +08:00
1b9c52d6c6 update 2023-09-08 17:49:57 +08:00
d97cc253fa Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 17:23:43 +08:00
c638c3ec4a 数据清里 2023-09-08 17:23:39 +08:00
liwei1dao
d8fdd05951 上传机器人代码 2023-09-08 16:07:18 +08:00
liwei1dao
147a02d25c 上传机器人 2023-09-08 15:57:57 +08:00
05c56d6e00 爬塔战斗 2023-09-08 15:43:36 +08:00
a5e480e6ff 测试 2023-09-08 15:31:34 +08:00
liwei1dao
35003a0d66 上传 2023-09-08 15:11:30 +08:00
liwei1dao
203c146049 上传 2023-09-08 15:11:09 +08:00
liwei1dao
5f64da3f34 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 15:08:38 +08:00
liwei1dao
74822bd141 上传新的机器人框架 2023-09-08 15:08:34 +08:00
050d1deb2f update 2023-09-08 15:01:27 +08:00
6a2f3806e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 14:57:20 +08:00
bc97b6dcca 异步调用 session push 2023-09-08 14:57:17 +08:00
liwei1dao
aee3a8d5c9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-08 14:55:06 +08:00
liwei1dao
59aff5c46b 上传事件 2023-09-08 14:55:02 +08:00
8b26e067ea 条件开启优化 2023-09-08 14:45:25 +08:00
47880f27d5 坐骑资源接口优化 2023-09-08 14:10:15 +08:00
ab9ec2a86b 条件开启功能优化 2023-09-08 11:26:10 +08:00
8767e561ff Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 19:17:40 +08:00
4d32a1420c 异常处理 2023-09-07 19:17:36 +08:00
liwei1dao
7a0916b006 上传用户信息 2023-09-07 19:04:08 +08:00
liwei1dao
d5d9fbb785 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 18:59:03 +08:00
liwei1dao
c384360a02 上传 2023-09-07 18:58:43 +08:00
02f60eb381 开启通知接口 2023-09-07 18:57:53 +08:00
1359923623 等级奖励错误修复 2023-09-07 18:37:50 +08:00
1df2df9367 调试上传 2023-09-07 18:31:44 +08:00
bf9a56b291 移除不用定义 2023-09-07 17:47:55 +08:00
758acdce06 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 17:44:13 +08:00
a4db4a0fe9 部分活动移除 2023-09-07 17:44:08 +08:00
liwei1dao
9000fc18dd 上传编译代码 2023-09-07 17:08:59 +08:00
liwei1dao
ef8cecd870 优化压测机器人代码 2023-09-07 15:45:42 +08:00
1bb9439b8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 15:37:39 +08:00
cf2e23b8dd 转盘活动改功能 2023-09-07 15:37:21 +08:00
liwei1dao
10e8095c9a 上传结算消息 2023-09-07 14:51:35 +08:00
liwei1dao
116962fb5c 上传初始段位 2023-09-07 14:48:46 +08:00
liwei1dao
ac4f450264 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 14:17:17 +08:00
liwei1dao
84e96db42d 上传补羊结算 2023-09-07 14:17:12 +08:00
0aef4c74c2 解决冲突 2023-09-07 11:14:25 +08:00
25c168a479 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-07 11:13:29 +08:00
55a616a27c gm 修改坐骑等级 2023-09-07 11:12:57 +08:00
liwei1dao
b15e4e2a3a 上传推送 2023-09-07 10:19:16 +08:00
liwei1dao
816019c108 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 19:02:34 +08:00
liwei1dao
8e579dde24 上传gm命令 2023-09-06 19:02:21 +08:00
ff64c3984a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 18:28:31 +08:00
03b236bed2 测试优化 2023-09-06 18:28:27 +08:00
liwei1dao
22283a26ff 上传服务配置 2023-09-06 16:44:07 +08:00
liwei1dao
d3d0461934 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 15:01:52 +08:00
liwei1dao
fd8f3eef0d 上传机器人输出报表 2023-09-06 15:01:47 +08:00
f2c318f5d0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 11:16:21 +08:00
b1bcfcd1dc 铁匠铺顾客刷新修改 2023-09-06 11:16:17 +08:00
liwei1dao
7efd39ba8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-06 10:00:17 +08:00
liwei1dao
976e458493 上传boos难度保存 2023-09-06 10:00:12 +08:00
2efcdf34e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 20:08:03 +08:00
a20b9db3a1 通过区服id 和唯一id 查询坐骑信息 批处理 2023-09-05 20:07:59 +08:00
liwei1dao
449fc414ba 上传寻龙代码 2023-09-05 20:03:13 +08:00
217530b674 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 19:59:39 +08:00
9d76ca5ac3 update 2023-09-05 19:59:35 +08:00
liwei1dao
3a82a419f2 上传boos 2023-09-05 19:03:28 +08:00
liwei1dao
46db315d4a 上传boos代码 2023-09-05 19:02:16 +08:00
liwei1dao
dfd123190c 上传机器人代码 2023-09-05 18:44:15 +08:00
liwei1dao
d6c56bbb16 上传主线bug修复 2023-09-05 18:10:33 +08:00
7a5ce064a9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 17:40:53 +08:00
68ea7033ff 铁匠铺 顾客上限 2023-09-05 17:40:49 +08:00
liwei1dao
4d4b2f78d4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 17:08:45 +08:00
liwei1dao
19a0b5d06a 上传捕养大赛 2023-09-05 17:08:39 +08:00
b102f80188 通过区服id 和唯一id 查询坐骑信息 2023-09-05 16:48:35 +08:00
ddc9d6d1e3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 16:21:58 +08:00
f769198052 坐骑资源变化推送 2023-09-05 16:21:52 +08:00
liwei1dao
b5edd8bdb0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 15:57:25 +08:00
liwei1dao
d2ba6d407d 上传boos模型代码 2023-09-05 15:57:21 +08:00
f8c118c3bb 铁匠铺藏品图鉴积分 2023-09-05 13:54:38 +08:00
bf96d301b0 #33705 子任务 【梦工场系统】 <-后端-> 【铁匠破】图鉴需要一键激活 2023-09-05 11:43:17 +08:00
4871c79f75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 10:42:49 +08:00
b79d9cb6c0 高品质打造修复 2023-09-05 10:42:45 +08:00
liwei1dao
568ff98d89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 09:55:14 +08:00
liwei1dao
dcbcd100a0 上传主线类型9关卡处理 2023-09-05 09:55:10 +08:00
8668d4a124 gm 加满好感动 2023-09-05 09:53:24 +08:00
cbbc4afea8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-05 09:27:50 +08:00
94a6ebefc4 update 2023-09-05 09:27:45 +08:00
liwei1dao
4468e48f87 上传服务端代码 2023-09-04 16:34:32 +08:00
liwei1dao
5714107c43 上传进度代码 2023-09-04 16:25:54 +08:00
liwei1dao
2e9045e499 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-04 15:52:55 +08:00
liwei1dao
bc0bed7e94 上传登录排队逻辑 2023-09-04 15:52:47 +08:00
93a9e850e4 养成交互次数所用道具 恢复 2023-09-04 15:01:37 +08:00
e81cbc8096 掉落 2023-09-04 11:57:07 +08:00
4ce720a7f2 掉落组 2023-09-04 11:51:30 +08:00
liwei1dao
f0be3be2bf 上传挤号代码优化 2023-09-01 21:50:31 +08:00
f12695f3de Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 19:38:24 +08:00
36af474469 session 重置 2023-09-01 19:38:20 +08:00
liwei1dao
3d5290fe45 上传配置 2023-09-01 18:29:44 +08:00
liwei1dao
2ed0577e23 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 18:23:02 +08:00
liwei1dao
4cc3749e26 上传代码 2023-09-01 18:22:58 +08:00
e506055534 参数校验 2023-09-01 18:12:40 +08:00
367b03f601 errmessage 返回 2023-09-01 17:40:34 +08:00
0d56de59aa 版署gm 2023-09-01 17:06:44 +08:00
8c759910c8 update 2023-09-01 16:26:25 +08:00
bf08bb5d6c subtype 2023-09-01 16:20:52 +08:00
278f30346a 驯龙接口补充 2023-09-01 15:01:49 +08:00
0d47281050 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 14:52:57 +08:00
a627891dae 训练增加cd 2023-09-01 14:52:51 +08:00
liwei1dao
7006b7cd0a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 14:49:30 +08:00
liwei1dao
6a133f07fd 上传新捕养大赛 2023-09-01 14:49:26 +08:00
9662b6f512 坐骑属性 2023-09-01 14:17:53 +08:00
040c5c969e 坐骑属性 2023-09-01 12:28:15 +08:00
13c4c39db6 函数注册 2023-09-01 12:25:36 +08:00
e29b744153 坐骑属性 2023-09-01 12:13:04 +08:00
liwei1dao
5c3768034d 上传修复 2023-09-01 11:56:53 +08:00
liwei1dao
9c27602bbf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 11:54:27 +08:00
liwei1dao
54f2f6f176 上传主线初始化 2023-09-01 11:54:23 +08:00
2935394ebf 配置更新 2023-09-01 11:30:23 +08:00
3f3a8e6ccc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-01 11:20:34 +08:00
b839fc7d38 坐骑加经验 2023-09-01 11:20:21 +08:00
liwei1dao
bde7f61578 上传主线boos需求 2023-09-01 11:00:13 +08:00
f8b9dba761 推送数据校验 2023-09-01 09:33:15 +08:00
7219bdcb14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-31 18:42:44 +08:00
6ff124663d 模块注册 2023-08-31 18:42:40 +08:00
liwei1dao
3f3dc26a4c 上传装备技能校验 2023-08-31 18:35:25 +08:00
liwei1dao
562dfe93aa 上传新的捕养模块 2023-08-31 18:19:13 +08:00
d581c883d8 坐骑资源分发 2023-08-31 18:04:28 +08:00
liwei1dao
cff3e80c60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-31 16:48:30 +08:00
liwei1dao
8b4656e416 上传竞技场派上榜头像问题 2023-08-31 16:48:25 +08:00
24d71fee78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-31 16:38:29 +08:00
cbe61844e3 坐骑养成 2023-08-31 16:38:25 +08:00
liwei1dao
8acef69bd5 补充机器人的逻辑 2023-08-31 16:37:45 +08:00
liwei1dao
2333e29b5b 上传战斗记录过期时间 2023-08-31 16:18:43 +08:00
liwei1dao
1408f61ddf 上传战斗记录代码 2023-08-31 12:38:21 +08:00
liwei1dao
eeeeca21d9 上传配置 2023-08-31 11:21:25 +08:00
096299c16e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-30 19:41:15 +08:00
bfce8fb1a2 驯龙 2023-08-30 19:40:27 +08:00
liwei1dao
aea2373d29 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-30 18:46:21 +08:00
liwei1dao
651669499f 上传周长任务 2023-08-30 18:46:17 +08:00
afdc37a244 209 埋点 2023-08-30 17:03:18 +08:00
fe281176c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-29 19:11:12 +08:00
39d889e7a7 商队赛季结束 结算并清理相关数据 2023-08-29 19:11:08 +08:00
liwei1dao
b1d2ef7dae 上传任务代码 2023-08-29 17:41:26 +08:00
liwei1dao
0ef53d8ae6 上传周长代码 2023-08-29 16:57:05 +08:00
bc6284afc2 商队等级奖励修复 2023-08-29 16:46:19 +08:00
4c11d7540d 移除调试代码 2023-08-29 16:35:31 +08:00
b941b855cd 商队继续货物修改 2023-08-29 16:29:48 +08:00
fc8826511e Rtype212 商队到达指定城市 2023-08-29 15:46:22 +08:00
338607d7ce 赛季结束 清理商队背包数据 2023-08-29 15:38:45 +08:00
f9b652e280 进度邮件奖励 2023-08-30 01:19:02 +08:00
7e0a0f6641 商队等级奖励改发邮件 2023-08-30 00:24:10 +08:00
8cb9c0f847 第一次创建商队数据 就进行货物刷新 2023-08-30 00:16:08 +08:00
abdc8180ee 商队修改 2023-08-29 14:03:26 +08:00
0d29fc9327 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-29 10:43:19 +08:00
74c239a721 英雄接口扩展 2023-08-29 10:43:15 +08:00
liwei1dao
0c427a29bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-29 10:14:14 +08:00
liwei1dao
10461d3d02 上传分享数据补充 2023-08-29 10:14:09 +08:00
f64ffa6b30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 19:42:59 +08:00
ba260707ad AI英雄养成相关 2023-08-28 19:42:55 +08:00
liwei1dao
c206675c48 上传开服活动和累充活动bug 2023-08-28 16:53:34 +08:00
liwei1dao
c3ee1c11cd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 16:12:34 +08:00
liwei1dao
635e82d3d1 上传竞技场段位查找 2023-08-28 16:12:30 +08:00
76bce0d76d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 15:26:17 +08:00
7ecade27a6 英雄养成 2023-08-28 15:26:14 +08:00
liwei1dao
ad3b7b61a2 上传机器人代码 2023-08-28 15:08:02 +08:00
1acf6eafe7 update 2023-08-28 14:17:05 +08:00
1b15516ac3 机器人回响判断 2023-08-28 14:08:27 +08:00
cdc0afecc3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 13:49:54 +08:00
9a25a35d78 获取回响信息 2023-08-28 13:49:51 +08:00
liwei1dao
487b691df1 上传机器人 2023-08-28 13:47:05 +08:00
ee20a2db32 check 该英雄天赋满级 2023-08-28 11:40:47 +08:00
4029b664e4 #32746 任务 优化需求 后端 任务埋点ai逻辑 199 2023-08-28 11:36:50 +08:00
liwei1dao
ab2f83c4e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-28 10:57:45 +08:00
liwei1dao
aa630dba11 上传机器人逻辑代码 2023-08-28 10:57:35 +08:00
67eb89d326 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 21:10:38 +08:00
38aeb3fbc3 庆典活动任意boss 计算次数修复 2023-08-25 21:10:34 +08:00
liwei1dao
f0b8f589be Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 19:26:12 +08:00
liwei1dao
fcde9a61f8 上传商店 2023-08-25 19:26:10 +08:00
004ce954e1 埋点问题 2023-08-25 19:22:53 +08:00
a59443fffb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 19:08:44 +08:00
33bdc8e35d 主线章节成就解锁,商店解锁 2023-08-25 19:08:40 +08:00
liwei1dao
e8bceb22ee Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 19:02:03 +08:00
liwei1dao
e726b2f7b7 上传商店代码 2023-08-25 19:02:00 +08:00
c174fd7189 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 18:49:57 +08:00
8f8aadc2bd 章节总奖励领取 2023-08-25 18:49:53 +08:00
liwei1dao
dd93a8956b 上传公会同意cd判断 2023-08-25 17:58:51 +08:00
liwei1dao
4a4915577b 上传压测机器人 2023-08-25 17:52:32 +08:00
liwei1dao
100b79516b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 17:18:36 +08:00
liwei1dao
1f5d6a6841 上传代码 2023-08-25 17:18:33 +08:00
b9ad48eb9a 典藏月卡ID错误 2023-08-25 16:55:58 +08:00
e2ed9ec84c #32000 任务 【梦工场系统】 【战斗】觉醒、回响技能插入 2023-08-25 16:43:04 +08:00
964bc90175 维京任务测试 + 觉醒回响技能带入战斗 2023-08-25 16:36:19 +08:00
6f3af2146c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 15:41:45 +08:00
e561b35f8f 活动开启结束通知 2023-08-25 15:41:41 +08:00
liwei1dao
935eea9304 上传代码优化 2023-08-25 15:24:26 +08:00
liwei1dao
ad6fb57f2b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 12:06:45 +08:00
liwei1dao
44582d4b30 上传星座图 2023-08-25 12:06:42 +08:00
liwei1dao
32cc3221f5 上传星真图代码 2023-08-25 12:04:26 +08:00
906cb85fc3 好友申请 如果在好友列表中就删除申请列表中的数据 2023-08-25 12:02:19 +08:00
cda331e3f1 许愿招募 时间到了 时间清理处理 2023-08-25 11:23:03 +08:00
b42db6f120 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-25 11:09:50 +08:00
91b455c836 许愿招募CD校验 2023-08-25 11:09:26 +08:00
liwei1dao
d756c4d933 上传战斗回放代码 2023-08-25 11:01:48 +08:00
d10ae5d48a 活动协议整理 2023-08-25 10:38:34 +08:00
c6d33b2738 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-24 19:23:27 +08:00
3ef9eb20eb 活动通知 2023-08-24 19:23:23 +08:00
liwei1dao
9f221bf4fc 优化装备升级机器单元 2023-08-24 19:10:19 +08:00
liwei1dao
b23a88b63f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-24 18:45:10 +08:00
liwei1dao
3b460674dd 战令关闭结算处理 2023-08-24 18:45:06 +08:00
2690497519 主线成就系统 2023-08-24 18:26:23 +08:00
7f480a670f 挑战结束更新塔信息 2023-08-24 17:35:26 +08:00
d2628f0349 商店解锁优化 功夫塔任务 2023-08-24 16:19:47 +08:00
76c08a3c29 功夫大师 2023-08-24 15:23:20 +08:00
liwei1dao
ff2243d413 上传机器人代码 2023-08-24 15:21:43 +08:00
liwei1dao
255bcb30e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-24 14:39:46 +08:00
liwei1dao
6b0d6cedc8 上传压测机器人代码 2023-08-24 14:39:44 +08:00
a933f60623 主线 任务解锁事件监听 变更消息推送 2023-08-24 11:54:23 +08:00
f4c421f2cc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-24 11:33:36 +08:00
bc02e321ef 限购 2023-08-24 11:30:45 +08:00
liwei1dao
3a756f0fd2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-24 11:24:49 +08:00
liwei1dao
db8b745933 上传代码 2023-08-24 11:24:43 +08:00
d8638a2bc0 主线商店调整 2023-08-24 11:15:47 +08:00
93999a011f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-24 11:04:37 +08:00
5c7b92bd99 觉醒 回响 技能处理 2023-08-24 11:04:33 +08:00
liwei1dao
635ec1a35c 上传压测工具代码 2023-08-23 19:17:04 +08:00
liwei1dao
3db40119a8 上传压测机器人代码 2023-08-23 19:01:10 +08:00
liwei1dao
7835ad53a1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-23 18:34:21 +08:00
liwei1dao
362b421ce6 上传压测工具 2023-08-23 18:34:19 +08:00
5d95f02dbe 秘境随机事件修复 2023-08-23 17:45:15 +08:00
322d0130c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-23 17:23:16 +08:00