Commit Graph

6774 Commits

Author SHA1 Message Date
liwei1dao
e34714b16d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-02-01 17:16:28 +08:00
liwei1dao
19302bc1af 上传扫荡代码 2024-02-01 17:16:24 +08:00
f3a9c6dc61 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-02-01 15:04:19 +08:00
9088f5cf75 三消结算连胜奖励加成 2024-02-01 15:04:15 +08:00
liwei1dao
7307ab888f 上传竞技场代码 2024-02-01 14:35:39 +08:00
liwei1dao
6666868fca 上传竞技场连胜积分加成 2024-02-01 14:25:46 +08:00
liwei1dao
7d115768a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-02-01 13:44:37 +08:00
liwei1dao
d4b5f128dd 上传竞技场请求战斗参数异常错误 2024-02-01 13:44:32 +08:00
b8a56d4a06 升级异常处理 2024-02-01 13:40:44 +08:00
dff9353ec8 #45032 任务 【梦工场系统】 <-前端-> 【掠夺】 - 玩家姓名丢失 2024-02-01 11:18:42 +08:00
8fabb4a0fc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-02-01 10:33:56 +08:00
b2d9515fc3 移除不用模块方法 2024-02-01 10:33:52 +08:00
liwei1dao
e5a4a2621a 上传竞技场积分预扣 为负数的情况 2024-02-01 10:25:07 +08:00
liwei1dao
d54361d091 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-02-01 10:21:04 +08:00
liwei1dao
7546c87ff4 上传竞技场积分公式代码 2024-02-01 10:21:00 +08:00
6f0f2c5b84 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-02-01 10:18:09 +08:00
c586fb88fe 没创角的玩家 登录没必要通知 2024-02-01 10:17:59 +08:00
liwei1dao
1788e4bd5f 上传docker服务打包文件 2024-01-31 19:13:30 +08:00
liwei1dao
4b8bc3692d 上传竞技场错误处理 2024-01-31 18:18:31 +08:00
liwei1dao
b3273d8e13 上传代码 2024-01-31 14:58:09 +08:00
liwei1dao
04e8b8db59 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-31 14:04:31 +08:00
liwei1dao
92d914f90a 上传协议 2024-01-31 14:04:29 +08:00
256f021f55 优化 2024-01-31 14:01:57 +08:00
8f1179661f 掠夺船到达数据返回协议修改 2024-01-31 11:49:52 +08:00
b7f6d9a142 初始好友信息 2024-01-31 09:57:42 +08:00
84f3ed024c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-30 19:06:41 +08:00
3819d37d12 任务激活 2024-01-30 19:06:37 +08:00
liwei1dao
93c7d396b6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-30 18:43:00 +08:00
liwei1dao
2b71403b43 上传任务配置文件 2024-01-30 18:42:56 +08:00
715a697aac 循环塔赛季结束清理 2024-01-30 17:47:16 +08:00
704ac9b16d 循环塔循环时间支持配置 2024-01-30 17:36:55 +08:00
1042cdfb15 三消一次消除4个以上+1体力 2024-01-30 15:04:08 +08:00
4fe2e92dc6 掠夺结束时间 2024-01-30 14:43:18 +08:00
83170939c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-30 14:02:30 +08:00
c308268f09 update 2024-01-30 14:02:25 +08:00
liwei1dao
0662974c07 上传竞技场排行榜读取问题 2024-01-30 13:59:40 +08:00
liwei1dao
d80f4178fe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-30 13:54:40 +08:00
liwei1dao
a479a077ba 修复竞技场挑战阵型bug 2024-01-30 13:54:32 +08:00
1b7bd6b78e boss战斗技能带入 2024-01-30 13:35:15 +08:00
088117d780 积分boss 玩家信息带入 2024-01-30 11:58:54 +08:00
d2ade131a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-30 09:51:25 +08:00
1549f3beae 上传代码 2024-01-30 09:51:22 +08:00
liwei1dao
9f14ed050b 上传redis 过期以及重新加载问题 2024-01-30 09:39:38 +08:00
a7d9ef9aed 积分boss 显示玩家携带的buff 2024-01-29 19:57:55 +08:00
cf1cedccc6 积分boss 排行 获取自己的数据 2024-01-29 19:21:13 +08:00
1cd99f6b05 掠夺刷新消耗 2024-01-29 19:00:01 +08:00
d64dc44390 赛季结束刷新 2024-01-29 18:46:41 +08:00
9721eacc5e 配置同步 2024-01-29 17:44:25 +08:00
31a6480c67 石阵秘境阵容站位问题修复 2024-01-29 17:24:16 +08:00
2901d94934 满级回响 2024-01-29 16:31:00 +08:00
2a3ee38feb 系统广播消息 2024-01-29 16:15:29 +08:00
d46f52050d 统计不同难度的使用异化组合 2024-01-29 15:39:22 +08:00
87fdd69542 积分boss异化效果 2024-01-29 15:17:45 +08:00
ba7392307e 重置每日挑战次数 2024-01-29 11:42:10 +08:00
c4972613cf 掠夺pvp 次数记录 2024-01-29 11:31:16 +08:00
fe016596e3 掠夺运输次数校验 2024-01-29 11:28:02 +08:00
4ec2ce61ae 【掠夺】pvp布阵规则 2024-01-29 11:16:29 +08:00
c9f2b8e36c 积分埋点 2024-01-29 10:50:57 +08:00
33670d3129 积分boss 任务埋点 2024-01-29 10:18:15 +08:00
liwei1dao
3ffb67314e 上传竞技场战报写入 2024-01-27 01:45:33 +08:00
liwei1dao
32dac03fd5 上传代码 2024-01-26 23:45:49 +08:00
liwei1dao
ea8cdcb48d 上传配置 2024-01-26 22:40:15 +08:00
liwei1dao
e626eb06a5 上传配置 2024-01-26 22:20:59 +08:00
liwei1dao
c24ae0141a 上传竞技场 2024-01-26 19:54:07 +08:00
liwei1dao
9a08ffad16 上传战斗匹配日志 2024-01-26 19:38:42 +08:00
liwei1dao
ccfb093832 上传配置同步 2024-01-26 19:13:05 +08:00
liwei1dao
12a3a570e6 上传代码 2024-01-26 18:58:11 +08:00
liwei1dao
de51516271 上传工会远征信息 2024-01-26 18:08:49 +08:00
liwei1dao
d78dbad65e 上传附魔副本 2024-01-26 17:24:52 +08:00
liwei1dao
50533f693c 上传掠夺代码 2024-01-26 16:52:34 +08:00
liwei1dao
fb04fd18a4 上传掠夺代码 2024-01-26 16:15:22 +08:00
liwei1dao
d12ff517d6 上传代码 2024-01-26 15:43:16 +08:00
liwei1dao
3f65009669 上传竞技场代码 2024-01-26 15:33:41 +08:00
liwei1dao
86a782c35b 上传代码 2024-01-26 15:01:49 +08:00
liwei1dao
abd877dddd 上传代码 2024-01-26 14:40:14 +08:00
liwei1dao
2499ddf77e 上传三消战令错误 2024-01-26 11:53:52 +08:00
liwei1dao
0245ff8407 上传英雄表技能新增 2024-01-26 11:49:33 +08:00
liwei1dao
291108d835 上传代码 2024-01-26 11:21:11 +08:00
liwei1dao
135839a50a 上传掠夺表 2024-01-26 10:23:36 +08:00
liwei1dao
4a62c18b3c 上传木桩解锁 2024-01-26 09:57:18 +08:00
liwei1dao
327c9727f0 上传代码 2024-01-26 09:33:12 +08:00
liwei1dao
cc386efeba 上传掠夺技能属性生效 2024-01-25 18:45:13 +08:00
liwei1dao
96f5831e42 上传附魔副本时长数据 2024-01-25 18:00:35 +08:00
liwei1dao
d6bf9b0505 修复掠夺数据存储错误 2024-01-25 17:49:42 +08:00
liwei1dao
25bce89142 上传海岛开始和结束时间 2024-01-25 17:35:37 +08:00
liwei1dao
c87417c2f6 上传竞技场协议 2024-01-25 17:07:56 +08:00
liwei1dao
53792dc170 上传附魔副本代码 2024-01-25 15:55:25 +08:00
liwei1dao
87368517b3 上传公会信息 2024-01-25 10:49:38 +08:00
liwei1dao
d37c24e66b 上传退出公会埋点 2024-01-25 10:49:18 +08:00
liwei1dao
afa1ca9a9f 上传代码 2024-01-25 10:18:18 +08:00
liwei1dao
c3ffcaa0ab 上传代码 2024-01-25 09:56:54 +08:00
liwei1dao
72edcd40a8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-24 21:08:44 +08:00
liwei1dao
8d7ff80c05 上传代码 2024-01-24 21:08:42 +08:00
a53fc05aa7 积分boss成就奖励 2024-01-24 20:07:08 +08:00
686333c5b5 掠夺船未到达错误码 2024-01-24 20:03:32 +08:00
77986baa2e 掠夺记录返回 2024-01-24 19:45:01 +08:00
001f3a942c 掠夺战报数据 2024-01-24 19:37:03 +08:00
e9b4a67c0b 积分boss 成就 2024-01-24 19:26:03 +08:00
c5bb75fdfc 掠夺 货物更新 2024-01-24 18:50:07 +08:00
730bd56971 积分boss buff 带入 2024-01-24 18:43:45 +08:00
d4a34da74b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-24 18:32:39 +08:00
fd9fb02ca7 积分boss 我方 或敌方 buff 带入 2024-01-24 18:32:35 +08:00
liwei1dao
74c979181d 上传竞技场协议 2024-01-24 18:19:16 +08:00
liwei1dao
59a30fe5fa 上传协议 2024-01-24 18:07:53 +08:00
d7770b71fa 积分boss修改 2024-01-24 18:04:25 +08:00
63886d0780 战报模块注册 2024-01-24 14:58:08 +08:00
liwei1dao
622c5c77d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-24 13:39:49 +08:00
liwei1dao
a63c50eeea 上传代码 2024-01-24 13:39:45 +08:00
018b4cb59f 维京战报数据 2024-01-24 11:28:50 +08:00
5e81c701d9 战报数据记录 2024-01-24 10:45:59 +08:00
a9bfbd4419 上传代码 2024-01-24 09:35:11 +08:00
c041608dd4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-23 18:25:59 +08:00
27c49e1b82 错误信息返回 2024-01-23 18:25:55 +08:00
liwei1dao
22db9c7978 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-23 18:25:47 +08:00
liwei1dao
1bc6670bd9 上传竞技场代码 2024-01-23 18:25:42 +08:00
692d69d0ba 获得隐藏积分 2024-01-23 18:08:03 +08:00
22bcc92e0d 战斗记录 2024-01-23 17:37:58 +08:00
d60039220d 掠夺航海日志信息 2024-01-23 17:30:37 +08:00
c130575fb8 穿戴装备重新计算英雄战力 2024-01-23 17:05:09 +08:00
a29fc82bf9 掠夺航海术学习 2024-01-23 16:09:32 +08:00
32ac84f90a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-23 15:45:34 +08:00
2530db0416 掠夺积分奖励 2024-01-23 15:45:01 +08:00
liwei1dao
5e59745bff 上传战报代码 2024-01-23 14:14:29 +08:00
liwei1dao
7114425f0a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-23 13:57:19 +08:00
liwei1dao
c11a65e4e2 上传远征代码 2024-01-23 13:57:15 +08:00
b70c994e17 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-23 13:54:35 +08:00
c3a06a86f2 掠夺消耗资源解锁队列 2024-01-23 13:54:32 +08:00
40d54a061b 掠夺解锁新的队列 2024-01-23 12:39:50 +08:00
9e0e615b2f 属性克隆 2024-01-23 12:39:35 +08:00
liwei1dao
314ceb9f6c 上传公会信息 2024-01-23 10:28:05 +08:00
liwei1dao
0406fa38a1 上传公会远征协议代码 2024-01-23 10:25:44 +08:00
liwei1dao
3897ee817e 上传公会远征系统 2024-01-23 10:19:44 +08:00
6e8a7ca1f4 三消排行结算 2024-01-22 18:43:43 +08:00
2c47ef9356 #44293 任务 【梦工场系统】 <-后端-> 【三消】 - 新增GM指令 2024-01-22 17:18:56 +08:00
d8eab55292 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-22 17:03:28 +08:00
037cebe1ac 批量查询英雄数据 2024-01-22 17:03:24 +08:00
liwei1dao
3f27c55ce1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-22 16:48:11 +08:00
liwei1dao
1cffc898a6 上传代码 2024-01-22 16:45:24 +08:00
aa8ed33406 英雄属性计算 2024-01-22 16:43:17 +08:00
f45347bd10 英雄战力配置 2024-01-22 14:47:53 +08:00
85ae2a1d1c 三消规则debug 2024-01-22 14:47:26 +08:00
8dcb5b95c3 助战数据 过滤掉没有创建的玩家 2024-01-22 09:58:40 +08:00
fa5a27c603 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 22:55:38 +08:00
8ad0d55dcb 异常处理 2024-01-19 22:54:54 +08:00
liwei1dao
0baec0b759 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 22:25:26 +08:00
liwei1dao
c7848437f7 上传代码 2024-01-19 22:25:24 +08:00
0960ffa71d 错误信息输出 2024-01-19 21:51:48 +08:00
12909167e9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 21:00:37 +08:00
9793bb53bb 任务埋点 2024-01-19 21:00:33 +08:00
liwei1dao
448cbad2f7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 20:48:27 +08:00
liwei1dao
b686fb6de3 上传代码 2024-01-19 20:48:25 +08:00
474a14ab48 天赋技能只存放在天赋属性里 2024-01-19 20:30:48 +08:00
38d8112efa update 2024-01-19 20:21:31 +08:00
6a92fe74da Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 19:38:57 +08:00
3b4e7885ed 掠夺相关 2024-01-19 19:38:54 +08:00
liwei1dao
4e8ad41f96 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 18:13:03 +08:00
liwei1dao
2130b20d48 上传扫荡代码 2024-01-19 18:13:01 +08:00
f7736b4491 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 17:53:14 +08:00
20be979826 防守阵容设置 2024-01-19 17:53:08 +08:00
liwei1dao
df7465f47d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 17:28:04 +08:00
liwei1dao
97b5d3f9f6 修改一件超神装备 2024-01-19 17:28:00 +08:00
82e4ce81c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 15:24:07 +08:00
8fe9794580 到达时间配置调整 2024-01-19 15:24:03 +08:00
liwei1dao
a01deafe9d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 15:22:36 +08:00
liwei1dao
8c81fb620d 上传扫荡消耗代码 2024-01-19 15:22:34 +08:00
5b792ac541 掠夺分布式锁 2024-01-19 14:55:36 +08:00
liwei1dao
5a48d8a552 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 13:59:35 +08:00
liwei1dao
5a862a91e4 上传代码 2024-01-19 13:59:32 +08:00
3973536282 刷新货物 重置已出发的列表数据 2024-01-19 11:59:07 +08:00
3d6fc46cc2 gm 满属性英雄 天赋技能带入 2024-01-19 11:57:44 +08:00
ddc7aef6fd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 11:13:24 +08:00
3caf880fdf GM 满英雄, 删除旧英雄 并追加觉醒技能 2024-01-19 11:13:21 +08:00
c72dac2975 数据校验 2024-01-19 10:58:21 +08:00
liwei1dao
5bda101ab3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-19 10:26:28 +08:00
liwei1dao
5ae44de45e 上传辉月调整 2024-01-19 10:26:22 +08:00
3d53840adb 掠夺协议修改 2024-01-19 10:19:11 +08:00
1832ad09dd 掠夺报错修复 2024-01-19 10:01:09 +08:00
6d7d65483a 掠夺状态同步 2024-01-18 20:22:17 +08:00
f96fc69938 消息分发 2024-01-18 19:34:29 +08:00
31e58d8b3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-18 19:15:24 +08:00
5228b21178 英雄额外碎片数据记录 2024-01-18 19:15:20 +08:00
liwei1dao
ff400be6d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-18 18:44:51 +08:00
liwei1dao
d2ea61c01e 修复战斗记录过期机制 2024-01-18 18:44:48 +08:00
9230bbfbf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-18 17:39:20 +08:00
92e1220150 掠夺pvp 2024-01-18 17:39:17 +08:00
liwei1dao
6f40d053ff 修改最大星级错误日志补充 2024-01-18 16:40:00 +08:00
liwei1dao
411293356f 上传完成世界任务埋点 2024-01-18 15:51:52 +08:00
liwei1dao
a5dd9f2084 上传装备gm工具 2024-01-18 15:31:33 +08:00
liwei1dao
daf506cba7 上传协议 2024-01-18 15:14:01 +08:00
liwei1dao
b944ec9c07 上传协议 2024-01-18 15:12:44 +08:00
liwei1dao
343e7751c6 上传附魔属性值 2024-01-18 14:55:50 +08:00
liwei1dao
d8f937c64d 上传代码 2024-01-18 14:38:40 +08:00
liwei1dao
806ace049d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-18 14:02:41 +08:00
liwei1dao
87bee82e24 上传装备附魔协议 2024-01-18 14:02:36 +08:00
e26be8d16f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-18 11:56:10 +08:00
a1848b8237 掠夺刷新战前准备 2024-01-18 11:55:59 +08:00
liwei1dao
1d82bb8a63 上传埋点gm工具 2024-01-18 11:45:23 +08:00
liwei1dao
cc73d742eb 上传装备升级代码 2024-01-18 10:23:22 +08:00
liwei1dao
661e5e70d8 上传装备gm 2024-01-17 20:25:21 +08:00
liwei1dao
e75f8cf4b3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2024-01-17 19:51:30 +08:00