Commit Graph

6676 Commits

Author SHA1 Message Date
689b2babbe 取消匹配 2023-10-26 09:29:47 +08:00
liwei1dao
0034cea756 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-26 09:25:30 +08:00
liwei1dao
14a92fe425 上传代码 2023-10-26 09:25:22 +08:00
37d433b09c 游戏结算新增谁赢了 2023-10-25 19:47:45 +08:00
090345b4ac 对战开始初始化满体力 2023-10-25 18:24:37 +08:00
1d4276e6af 接口调整 优化 2023-10-25 18:09:36 +08:00
1d7207461e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 16:07:26 +08:00
f7431e126f xxl匹配 2023-10-25 16:07:22 +08:00
liwei1dao
ab07e59c30 上传藏宝图 2023-10-25 15:00:35 +08:00
liwei1dao
8b79cd7aae Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 14:17:07 +08:00
liwei1dao
833312fa68 上传游戏邀请 2023-10-25 14:17:02 +08:00
f406d53316 消除积分改累计值 2023-10-25 14:15:43 +08:00
86ea90004b 技能能量 2023-10-25 13:48:47 +08:00
a404633165 上传代码 2023-10-25 13:41:25 +08:00
a718218993 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 11:10:03 +08:00
a0c6b5485e 完善对战 2023-10-25 11:10:00 +08:00
liwei1dao
52fbce426e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-25 10:06:39 +08:00
liwei1dao
6d992bd005 上传代码 2023-10-25 10:06:33 +08:00
ad64ecc289 ai 能量进度统计 2023-10-25 09:53:36 +08:00
7822cff7ee 释放技能没有连消的情况 2023-10-24 20:10:26 +08:00
88ab2ea016 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 18:36:13 +08:00
2377793a98 新增错误 2023-10-24 18:36:10 +08:00
liwei1dao
821367a9e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 18:17:19 +08:00
liwei1dao
dc1a28339b 上传配置 2023-10-24 18:17:13 +08:00
a640c50d22 玩家技能 2023-10-24 18:09:58 +08:00
88dd4aea0e update 2023-10-24 17:39:14 +08:00
8e97e8d84e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 15:21:28 +08:00
79f58144d5 技能 2023-10-24 15:21:25 +08:00
liwei1dao
0ed81a543b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 14:04:14 +08:00
liwei1dao
ecc9144e42 上传主城同屏 2023-10-24 14:04:08 +08:00
a57f0eeeca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 12:00:21 +08:00
ca2a842154 恢复能量 体力 最大回合数读取配置 2023-10-24 12:00:17 +08:00
liwei1dao
c5db0bf402 上传代码 2023-10-24 11:47:42 +08:00
liwei1dao
c1cdd58324 上传捕羊游戏结束时间配置 2023-10-24 11:07:00 +08:00
liwei1dao
0f546d1be5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 10:55:07 +08:00
liwei1dao
f2dafe1e48 上传捕羊aiCD间隔 2023-10-24 10:55:02 +08:00
eb83dd957a 4消或5消生成新的元素 2023-10-24 10:30:21 +08:00
6cfbac78eb 协议同步 2023-10-24 10:28:39 +08:00
8ea3174625 update 2023-10-24 10:23:44 +08:00
liwei1dao
ed7bbef31f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-24 09:14:51 +08:00
liwei1dao
bb3a292585 上传猜颜色代码 2023-10-24 09:14:02 +08:00
3f2bf270ae 三消货币 2023-10-23 20:28:46 +08:00
7387b376ed 上传代码 2023-10-23 19:49:13 +08:00
9057112fda 操作结果返回操作动作 2023-10-23 19:05:13 +08:00
c55161fb6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-23 16:52:18 +08:00
da4b238cb9 不能交换的情况处理 2023-10-23 16:52:15 +08:00
liwei1dao
f7ac90a153 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-23 16:41:26 +08:00
liwei1dao
74344f18ac 上床捕羊匹配优化 2023-10-23 16:41:21 +08:00
90a1daf23a 初始玩家体力 2023-10-23 15:58:02 +08:00
48d84dc0bc 补充消除逻辑 优化权限 2023-10-23 15:32:40 +08:00
6d86f3a05b AI移动元素 2023-10-20 22:55:06 +08:00
1c23a60bf2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:58:50 +08:00
4504afde92 移除重复代码 2023-10-20 20:58:48 +08:00
liwei1dao
d9cc7346c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:57:49 +08:00
liwei1dao
125fc9cddd 上传测试服 2023-10-20 20:57:45 +08:00
c214107ff3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 20:57:43 +08:00
c8cf135258 update 2023-10-20 20:57:39 +08:00
liwei1dao
4139e2e36c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 18:28:49 +08:00
liwei1dao
d010bb73c3 上传才颜色和好友接口 以及同屏代码 2023-10-20 18:28:44 +08:00
a6aa603dc3 连消优化 2023-10-20 16:26:02 +08:00
e730baf179 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 14:13:40 +08:00
70f51721a0 update 2023-10-20 14:13:37 +08:00
liwei1dao
faff6c4269 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-20 14:13:33 +08:00
liwei1dao
7fb5b1963b 上传猜颜色配置读取 2023-10-20 14:13:28 +08:00
36a37c8c7c update 2023-10-20 12:44:36 +08:00
86111c04ea AI计时器整理 2023-10-20 11:37:08 +08:00
1ea7fb31bb 优化 2023-10-20 11:11:29 +08:00
41c5ad951a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 22:13:01 +08:00
236875a380 xxl 优化+测试 2023-10-19 22:12:58 +08:00
liwei1dao
eb000d90b7 上传代码 2023-10-19 18:45:47 +08:00
liwei1dao
daffb7d975 猜颜色 2023-10-19 18:38:23 +08:00
liwei1dao
2d36ac69a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 18:08:15 +08:00
liwei1dao
264ad9411f 上传猜颜色 2023-10-19 18:08:11 +08:00
c1c2790ddd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 16:19:30 +08:00
785b2f7881 规则完善 2023-10-19 16:19:26 +08:00
d89e6b0898 月卡每日奖励发放 2023-10-24 15:53:23 +08:00
liwei1dao
5834494afc 伤处签到和捕羊开启 2023-10-19 16:07:26 +08:00
liwei1dao
59843155f6 上传猜颜色 2023-10-19 15:52:30 +08:00
liwei1dao
5d667c74b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-19 15:03:01 +08:00
liwei1dao
5efc94222d 上传猜颜色 2023-10-19 15:02:57 +08:00
4ddf74c351 对战计时器+AI逻辑 2023-10-19 11:46:54 +08:00
4a3a03a811 检查月卡每日邮件奖励发放 2023-10-19 19:08:05 +08:00
20480d9104 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-18 19:00:10 +08:00
c69d00f744 xxl代码 2023-10-18 19:00:06 +08:00
liwei1dao
d28a2f3e65 上传捕羊代码 2023-10-18 18:37:51 +08:00
liwei1dao
d377ecca4b 上传代码 2023-10-18 18:33:23 +08:00
5711dd24ff 普通菜不入图鉴 2023-10-18 18:22:44 +08:00
500202dfe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-18 11:33:34 +08:00
30970cb7d9 ui小游戏额外奖励 2023-10-18 11:33:13 +08:00
liwei1dao
c7d382fe09 上传聊天信息 2023-10-18 11:30:14 +08:00
liwei1dao
af1884205d 上传头像框信息 2023-10-18 11:05:48 +08:00
8c3fe6c9e2 xxl 规则 2023-10-18 09:40:37 +08:00
f3d5dd51d3 接龙一键领取key修改 2023-10-17 17:44:59 +08:00
52a01ad52d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 16:17:31 +08:00
2167ade864 接龙新增本周最高记录字段 2023-10-17 16:17:28 +08:00
liwei1dao
976c305d50 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 16:09:27 +08:00
liwei1dao
f4184e1bcd 同步配置 2023-10-17 16:09:23 +08:00
684892291f update 2023-10-17 15:04:58 +08:00
6f5e36524b update 2023-10-17 14:40:32 +08:00
ed6c8f4171 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:36:29 +08:00
87ae8573e8 接龙增加游戏开始协议 2023-10-17 14:36:26 +08:00
liwei1dao
bfc79ea3ce Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:17:34 +08:00
liwei1dao
c2e625b3db 上传协议 2023-10-17 14:17:30 +08:00
df1c5e9d5b update 2023-10-17 14:16:51 +08:00
8f75f5a770 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:13:37 +08:00
dc14a1fa81 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 14:13:33 +08:00
liwei1dao
eeee4679d8 上传奖励发放 2023-10-17 14:09:17 +08:00
f270d0dcf3 奖励资源统一类型发放 2023-10-17 14:08:20 +08:00
liwei1dao
34e4761b47 上传奖励协议代码 2023-10-17 13:54:53 +08:00
292d007e29 邮件批处理 2023-10-17 11:55:56 +08:00
9df2c3f7b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 11:23:44 +08:00
liwei1dao
a5c989583d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 11:20:56 +08:00
5dcea3a8b1 接龙门票每日恢复处理 2023-10-17 11:20:54 +08:00
liwei1dao
7305c11762 上传资源回报优化 2023-10-17 11:20:52 +08:00
cfbe3558bc 接龙奖励改一键领取 2023-10-17 10:58:27 +08:00
083ed3c371 铁匠铺高星打造调整 2023-10-17 10:26:34 +08:00
liwei1dao
dc424c9cbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-17 10:22:06 +08:00
liwei1dao
da97665797 上传配置代码 2023-10-17 10:22:02 +08:00
601b6c1f63 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 19:22:19 +08:00
26b14e3db5 消消乐 2023-10-16 19:22:12 +08:00
liwei1dao
b9fbdf2a51 保存体力变化值 2023-10-16 17:31:08 +08:00
liwei1dao
76a39dc594 上传体力优化 2023-10-16 17:10:33 +08:00
liwei1dao
32e2027622 优化体力代码 2023-10-16 17:01:05 +08:00
liwei1dao
fe22b55d46 上传体力修复 2023-10-16 16:46:44 +08:00
liwei1dao
fce803d2ef Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 16:05:18 +08:00
liwei1dao
4aa24af2fd 上传体力红点 2023-10-16 16:05:14 +08:00
1c7edc3687 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 15:35:00 +08:00
68d496d6a3 快速接龙数据配置校验 2023-10-16 15:34:57 +08:00
liwei1dao
866ee2cf9f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-16 14:57:39 +08:00
liwei1dao
21dd60be53 上传消消乐模块 2023-10-16 14:57:29 +08:00
19dad4d7fa 快速接龙上传 2023-10-13 15:17:24 +08:00
liwei1dao
d2512168fa 上传成就代码 2023-10-13 14:31:23 +08:00
liwei1dao
326df2b8af Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-12 19:13:31 +08:00
liwei1dao
1cbfd710e3 上传捕羊匹配逻辑 2023-10-12 19:13:27 +08:00
56ad5f6ba5 创建工会也算完成加入工会任务 2023-10-12 15:25:40 +08:00
a747332c71 快速接龙 2023-10-12 14:33:27 +08:00
liwei1dao
e47d9cbc27 上传通用成就系统 2023-10-12 10:42:54 +08:00
liwei1dao
204e37675c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 18:36:05 +08:00
liwei1dao
da50a328a8 上传代码 2023-10-11 18:36:01 +08:00
d9a92ce0c8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 18:31:47 +08:00
9d19a76668 update 2023-10-11 18:31:43 +08:00
liwei1dao
3200484b8e 上传数据初始化 2023-10-11 18:18:45 +08:00
liwei1dao
8576d54cdd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 17:46:55 +08:00
liwei1dao
d41378285e 上传竞技场npc需求 2023-10-11 17:46:50 +08:00
0792661ab1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 17:45:37 +08:00
84ff03c2da #36575 任务 【梦工场系统】 <-后端-> 【石阵秘境】强化buff事件新增规则 2023-10-11 17:45:23 +08:00
liwei1dao
cc710d851f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-11 17:12:31 +08:00
liwei1dao
4702c4b03f 上传配置文件 2023-10-11 17:12:26 +08:00
1b7e6368a4 埋点236 2023-10-11 15:12:21 +08:00
5066b59911 英雄整理 2023-10-11 13:50:26 +08:00
d56c26255d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-10 19:04:32 +08:00
423b03086c 数组初始化 2023-10-10 19:04:29 +08:00
liwei1dao
537470e227 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-10 18:34:34 +08:00
liwei1dao
c638d3bbce 上传公会弹劾代码修复 2023-10-10 18:34:25 +08:00
d42497f2ea 优化 2023-10-10 14:37:52 +08:00
f2fd4ebb63 商队排行改跨服 2023-10-10 11:49:26 +08:00
8b233d1ea4 一键领取 2023-10-09 18:22:59 +08:00
cbe0c93635 列车结账收益奖励领取 2023-10-09 18:20:42 +08:00
2d233bb2cd GM邮件状态异常修复 2023-10-09 17:45:14 +08:00
0936223d7f 跨服处理 2023-10-09 17:38:09 +08:00
d905751909 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 17:25:51 +08:00
bc5251473a 邮件RPC 通知 2023-10-09 17:25:00 +08:00
liwei1dao
ce50e425c0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 17:00:38 +08:00
liwei1dao
0bb2d2493e 上传签名日志输出 2023-10-09 17:00:34 +08:00
f878aed122 首通奖励发放时机调整 2023-10-09 15:44:13 +08:00
03e4d02fbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 15:11:31 +08:00
a69ecd0716 配置解析 2023-10-09 15:11:27 +08:00
liwei1dao
349b637ee5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-09 12:17:04 +08:00
liwei1dao
96088d49b7 上传代码 2023-10-09 11:56:22 +08:00
67bddca0d4 移除测试代码 2023-10-09 11:50:33 +08:00
3de38ab74c 秘境房间随机规则优化 2023-10-09 10:18:31 +08:00
e6c43b0520 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 18:55:15 +08:00
823cd28c99 秘境掉落事件配置解析 2023-10-08 18:55:11 +08:00
liwei1dao
64c2205875 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 18:40:22 +08:00
liwei1dao
c68c0c9730 上传公会问题 2023-10-08 18:40:17 +08:00
cce089ca57 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 18:06:16 +08:00
b693081cfe 掉落奖励异常修复 2023-10-08 18:06:13 +08:00
liwei1dao
0692d9d7e2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 16:48:02 +08:00
liwei1dao
4383d49694 上传会长弹劾 2023-10-08 16:47:58 +08:00
d2ebddf88c 移除测试代码 2023-10-08 16:22:11 +08:00
1bdb587514 卸载称号 2023-10-08 16:16:44 +08:00
5b60d088b8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-08 16:14:38 +08:00
c26fcf44d7 商队价格走势图 价格调整 2023-10-08 16:14:34 +08:00
liwei1dao
a2fad05df7 上传存钱罐数据被清理的问题 2023-10-08 15:33:29 +08:00
liwei1dao
93972c5b6c 修复代码语法错误 2023-10-08 15:11:55 +08:00
aa4bd8ad9b 排行榜加入 称号数据 2023-10-08 14:07:58 +08:00
f0f24cf4e1 gm 加称号标签 2023-10-07 11:01:30 +08:00
084eb5e275 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-10-07 10:45:11 +08:00
liwei1dao
0a803ac021 上传升级代码 2023-09-28 16:21:27 +08:00
liwei1dao
d25970f9d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-28 16:16:22 +08:00
liwei1dao
5184a2a4ff 上传用户 2023-09-28 16:16:17 +08:00
3cb3435dd5 移除测试代码 2023-09-28 11:18:29 +08:00
edc97360e5 活动开启通知 2023-09-28 11:13:05 +08:00
e3293d4313 主线功能开启配置 2023-09-28 09:54:05 +08:00
5c8003e0ab Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 21:06:24 +08:00
54f63eb812 优化 2023-09-27 21:06:20 +08:00
liwei1dao
ca4b21d29d 上传结算处理 2023-09-27 20:18:13 +08:00
liwei1dao
0321057d6c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 18:04:51 +08:00
liwei1dao
4d58a75d53 上传武馆红点优化 2023-09-27 18:04:46 +08:00
e9975bb591 战斗校验 2023-09-27 17:38:41 +08:00
5fc2a0bb3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 17:04:28 +08:00
d168499bfb 远征双倍boss类型校验 2023-09-27 17:04:24 +08:00
liwei1dao
226f149d62 上传每日任务红点逻辑代码 2023-09-27 16:55:17 +08:00
liwei1dao
7bfc28c5a5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 15:38:28 +08:00
liwei1dao
8cac73974d 上传升级bug 2023-09-27 15:38:25 +08:00
143d07da94 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 15:24:27 +08:00
3af086d3b8 清理道具推送 2023-09-27 15:24:23 +08:00
liwei1dao
11cfa9b174 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-09-27 15:13:48 +08:00
liwei1dao
f53b3f7d20 上传捕养大赛结算和周长奖励 2023-09-27 15:13:43 +08:00
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
9d7df3fe53 #31777 任务 【梦工场系统】 <-后端-> 【主角信息】 - 名称修改需求 2023-08-23 17:23:12 +08:00
liwei1dao
605ad803b5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-23 16:14:20 +08:00
liwei1dao
5bf13fe203 上传机器人代码 2023-08-23 16:14:10 +08:00
97a8099117 主线商店 2023-08-23 16:11:08 +08:00
2c6cd7c337 特殊空事件类型处理 2023-08-22 17:18:55 +08:00
c608d2e90f 扣血加血 保护 2023-08-22 16:47:53 +08:00
798648c15a #31958 任务 【梦工场系统】 后端 【体力购买】- 次数限制与价格递增 2023-08-22 16:33:25 +08:00
9a519e9f6d 英雄死亡血量继承 2023-08-22 15:36:04 +08:00
44753e24c5 宝箱钥匙每日恢复 2023-08-22 14:53:05 +08:00
c1b6a6ad15 post 数据返回 2023-08-22 10:40:38 +08:00
128b63826c 好友申请 好友同意推送 2023-08-21 19:20:35 +08:00
dddb7e6e49 测试邮件gm 2023-08-21 19:05:14 +08:00
d7f25831cd gm 发放特殊收藏品 2023-08-21 18:48:55 +08:00
d0881162ca GM 满铁匠铺打造 满图鉴信息 2023-08-21 18:02:39 +08:00
5502e4c3b4 加好友推送通知 2023-08-21 16:46:12 +08:00
59e83d1026 好友信息补全 羁绊数据优化 2023-08-21 16:02:39 +08:00
f030c84326 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-21 10:25:40 +08:00
20290ad9e4 gm 创建全满英雄也需要创建羁绊数据 2023-08-21 10:25:36 +08:00
liwei1dao
5dc63fa4d2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 22:10:18 +08:00
liwei1dao
4a182ed2d8 上传推送礼包 用户会话释放导致推送异常bug 2023-08-18 22:10:16 +08:00
4623e5bfe4 GM =1 的道具不发 2023-08-18 21:15:38 +08:00
c2f157bb75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 20:35:23 +08:00
37b0667232 参数校验 2023-08-18 20:35:19 +08:00
liwei1dao
0c39c60bff 上传装备pro属性计算 2023-08-18 20:27:36 +08:00
liwei1dao
ed7ad30f95 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 20:09:25 +08:00
liwei1dao
a346e04e8f 上传配置 2023-08-18 20:09:22 +08:00
d4a9ef3d55 签名不校验长度 2023-08-18 19:40:34 +08:00
8f3e9ca3d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 19:15:46 +08:00
229441bbaf 战斗报错 2023-08-18 19:15:24 +08:00
liwei1dao
608f357c78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 18:41:59 +08:00
liwei1dao
5080f91b46 处理英雄合成 2023-08-18 18:41:50 +08:00
ef9d0bdc9b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 17:51:21 +08:00
43c0cefa39 英雄数据过滤校验 2023-08-18 17:51:17 +08:00
liwei1dao
bddabe2f29 上传战斗报错修复 2023-08-18 17:48:38 +08:00
liwei1dao
79b655cb41 上传商店剩余购买测试bug 2023-08-18 16:46:02 +08:00
liwei1dao
6bc5e60b7f 上传代码 2023-08-18 15:45:49 +08:00
liwei1dao
1f4ac80e88 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 15:38:36 +08:00
liwei1dao
f68ec270b9 上传带啊吗修复 2023-08-18 15:38:33 +08:00
10c7421d04 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-08-18 15:35:35 +08:00
3619ec697a 接口优化 2023-08-18 15:35:31 +08:00
liwei1dao
4f9419ceb5 上传英雄添加经验 2023-08-18 15:31:38 +08:00
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