Commit Graph

3577 Commits

Author SHA1 Message Date
64cd3da633 校验在线用户状态 2023-04-23 19:45:35 +08:00
63a4212c93 捕羊大赛新增加入退伍规则 2023-04-23 18:57:13 +08:00
9fe5a687a1 签到功能调整,不发送签到奖励 2023-04-23 15:42:02 +08:00
1fc9ebb98d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-23 15:24:55 +08:00
dccbdde57f 签到小游戏 玩法调整 2023-04-23 15:24:51 +08:00
f1fa24a36e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-23 14:54:13 +08:00
8804225486 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-23 14:51:12 +08:00
d5bd4f925f 接口补充 查询最近一起游戏的玩家信息 2023-04-23 14:49:37 +08:00
a9bc2516c4 补羊大赛 领取奖励 2023-04-23 11:57:10 +08:00
58ecd65e7d update 2023-04-23 10:17:56 +08:00
9448a51507 配置同步 2023-04-21 21:08:54 +08:00
88881e2527 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-21 19:11:05 +08:00
liwei1dao
2ff92487cf 上传捕羊大赛代码 2023-04-21 19:03:50 +08:00
6c3cf0b013 好感度测试 2023-04-21 18:46:43 +08:00
liwei1dao
8bb7c27a7b 同步配置文件和捕羊大赛代码 2023-04-21 18:11:49 +08:00
liwei1dao
ec088d4b13 上传捕羊大赛代码 2023-04-21 16:54:26 +08:00
liwei1dao
27dbb36ee6 优化item代码 2023-04-20 21:18:34 +08:00
liwei1dao
e40f849605 上传捕羊大赛邀请逻辑优化 2023-04-20 21:16:34 +08:00
liwei1dao
eb5ae6d13b 上传邀请代码 2023-04-20 21:08:56 +08:00
liwei1dao
53721a47c7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 20:58:29 +08:00
liwei1dao
6cfb67a14a 上传捕羊大赛代码 2023-04-20 20:58:24 +08:00
4ec983d257 update 2023-04-20 19:06:48 +08:00
52e08a5c7a 天赋树重置 2023-04-20 18:42:24 +08:00
5969eb80cd 功能测试 2023-04-20 18:32:04 +08:00
631c924514 世界任务GM 2023-04-20 18:24:10 +08:00
b1e7078985 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:12:50 +08:00
49c99c2843 update 2023-04-20 17:12:35 +08:00
liwei1dao
44319e8d2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 17:05:28 +08:00
liwei1dao
10f8849fbe 同步代码 2023-04-20 17:05:14 +08:00
d8cb4f78af 统计阵营总好感度 2023-04-20 16:27:59 +08:00
8811db5c1b 羁绊属性计算 2023-04-20 16:22:14 +08:00
302e292041 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-20 14:53:33 +08:00
93996e3c80 声望 2023-04-20 14:40:55 +08:00
liwei1dao
50d5b3409a 上传武馆踢馆延迟 2023-04-20 13:53:48 +08:00
702375e8b3 赠送美食 2023-04-20 11:58:52 +08:00
liwei1dao
4fceb5f841 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-19 20:20:19 +08:00
liwei1dao
3cce3dfb04 同步配置 2023-04-19 20:20:05 +08:00
2dd073d135 剧情奖励 传记等数据处理 2023-04-19 19:43:24 +08:00
14e7091594 声望 2023-04-19 19:29:25 +08:00
liwei1dao
c707bcb94b 上传捕羊大赛代码 2023-04-19 18:30:24 +08:00
0e6aba2b9e 好感度 2023-04-19 18:01:53 +08:00
a73e753c19 踢馆去掉对话框奖励 2023-04-19 13:45:15 +08:00
14a658f62e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-19 11:47:46 +08:00
8d8e67c32a 一键踢馆修改 2023-04-19 11:45:47 +08:00
liwei1dao
a05275d234 上传战斗计时结束 2023-04-18 21:09:06 +08:00
liwei1dao
ee83d78681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-18 20:31:13 +08:00
liwei1dao
0bdcd919ce 上传服务配置 2023-04-18 20:28:43 +08:00
99affaf831 npc踢馆 领奖 2023-04-18 20:10:57 +08:00
7da8284b73 状态还原 2023-04-18 20:07:13 +08:00
c501d3c205 踢馆成功不通关剧情获得奖励 2023-04-18 18:37:58 +08:00
a77e855a2e 优化 + 新增 一键踢馆GM 2023-04-18 18:34:29 +08:00
b05316b3c3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2023-04-18 15:56:59 +08:00
b543f6a6f7 好感度接口 2023-04-18 15:56:14 +08:00
liwei1dao
c518cd0a61 上传代码 2023-04-18 15:52:46 +08:00
liwei1dao
c0e0ec5119 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-17 18:55:16 +08:00
liwei1dao
f27130c3b4 上传配置文件 2023-04-17 18:55:11 +08:00
08c863333c 获取主城进度 2023-04-17 17:43:06 +08:00
liwei1dao
3345908fe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-14 22:08:41 +08:00
liwei1dao
8368c6d038 上传npc踢馆调整 2023-04-14 22:08:27 +08:00
25c8e898be 参数校验 2023-04-14 21:42:45 +08:00
e9a9f99b65 配置同步 2023-04-14 18:19:17 +08:00
260d936e20 购买价格组整合 2023-04-14 18:11:42 +08:00
2f99a821e9 更新状态 2023-04-14 14:18:05 +08:00
liwei1dao
4b49f25c16 上传错误返回信息优化 2023-04-14 12:21:58 +08:00
liwei1dao
a0d29a277e 上传错误信息数据返回前端 2023-04-14 10:42:58 +08:00
02a20470d5 错误信息监听 2023-04-14 10:26:46 +08:00
65c263ba8f 表名调整 2023-04-14 10:18:48 +08:00
832e9bd161 表名调整 2023-04-14 10:18:29 +08:00
a90a750abc 好友阵容数据查询 2023-04-13 20:21:02 +08:00
e305cd1264 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-13 19:22:50 +08:00
9f4b865c7c 记录costTime 2023-04-13 19:22:39 +08:00
liwei1dao
35f969d64f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-13 18:42:50 +08:00
f6e8cc96be Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-13 18:41:44 +08:00
liwei1dao
62818877c7 上传代码 2023-04-13 18:41:35 +08:00
946c3dc2b2 update 2023-04-13 18:41:34 +08:00
5cac675495 队长位置记录 2023-04-13 18:41:27 +08:00
4a8c9566d6 工具类模块 2023-04-13 17:46:36 +08:00
07cd30e7a0 加输出日志 2023-04-13 11:31:52 +08:00
7bde16235f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 18:40:31 +08:00
9703368034 rand 调整 2023-04-12 18:40:22 +08:00
955bf81c56 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 18:30:29 +08:00
3a96386715 update Rtask ctime 2023-04-12 18:30:13 +08:00
liwei1dao
c25ee07d24 上传代码 2023-04-12 18:18:36 +08:00
liwei1dao
e4caebee25 上传代码 2023-04-12 17:40:31 +08:00
liwei1dao
dcc30e776d 好友切磋 优化 2023-04-12 17:37:35 +08:00
liwei1dao
5d3a0e40c3 上传武馆切磋 优化 2023-04-12 17:14:46 +08:00
liwei1dao
e2f3ff5626 上传pvp加载同步代码 2023-04-12 17:12:01 +08:00
1e32d18a54 update 2023-04-12 17:02:52 +08:00
13aaa5d90a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 15:38:42 +08:00
f8beab3a84 优化 2023-04-12 15:38:35 +08:00
liwei1dao
2339f26196 上传pvp战斗结束推送 2023-04-12 15:34:14 +08:00
liwei1dao
451c53aaf7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 14:59:46 +08:00
liwei1dao
65421ac539 上传武馆切磋代码 2023-04-12 14:59:34 +08:00
a14e71e0f6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 11:44:36 +08:00
92b7b5747d 炉子升级后提升炉温上限时需要开启自动恢复 2023-04-12 11:44:32 +08:00
liwei1dao
2020be4db0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 10:32:35 +08:00
liwei1dao
305ab73d64 战斗指令不走通用 错误返回 2023-04-12 10:32:29 +08:00
0d37725262 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-12 10:09:08 +08:00
8dc7c56dfd 配置参数校验 2023-04-12 10:09:02 +08:00
liwei1dao
53ae11c8a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 19:25:13 +08:00
liwei1dao
6955acb918 上传配置 2023-04-11 19:24:59 +08:00
e872169e3b 掉落优化 2023-04-11 19:02:53 +08:00
958d1a8939 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 17:37:22 +08:00
fcf0b3a048 掉落相关处理 2023-04-11 17:37:18 +08:00
5f30a98235 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 15:23:48 +08:00
b3f3147475 更新任务参数校验策略 2023-04-11 15:23:42 +08:00
liwei1dao
d4a06fe214 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 15:23:21 +08:00
liwei1dao
f67ff3de1e 修复魔药消耗 2023-04-11 15:23:09 +08:00
641a8e00ed Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 14:22:57 +08:00
3175f6a184 调整参数顺序 2023-04-11 14:22:46 +08:00
liwei1dao
d285bad3a9 上传武馆状态同步 2023-04-11 13:54:50 +08:00
liwei1dao
feb0564e27 上传武馆提出好友推送 2023-04-11 10:56:25 +08:00
liwei1dao
5a44eaffdb 战斗中主动退出处理 2023-04-11 10:50:19 +08:00
liwei1dao
be9aead903 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-11 10:19:56 +08:00
liwei1dao
dd41812f61 上传pvp主动取消代码 2023-04-11 10:19:48 +08:00
c4f0e8fc26 update 2023-04-10 20:47:34 +08:00
bf56296aa6 update 2023-04-10 20:47:34 +08:00
24c248323f 日周常任务 2023-04-10 20:47:33 +08:00
4831fe3c5e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 18:54:29 +08:00
da1250a68a 交易奖励 2023-04-10 18:54:01 +08:00
liwei1dao
4cfcf51643 同步武馆踢人状态 2023-04-10 18:39:42 +08:00
c948f032c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 17:39:13 +08:00
69fbe8d12c 优化 2023-04-10 17:39:08 +08:00
liwei1dao
5598af6fb5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 17:10:46 +08:00
liwei1dao
313a705b94 修复武馆驱逐 消息推送 2023-04-10 17:10:34 +08:00
3ec456db01 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 16:49:12 +08:00
edeffa6e88 条件开启 2023-04-10 16:48:44 +08:00
liwei1dao
38a6311b11 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 16:30:57 +08:00
liwei1dao
50b7f88226 上传优化代码 2023-04-10 16:30:45 +08:00
afd86b95b0 条件解锁 2023-04-10 15:49:05 +08:00
2041c4af76 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-10 14:44:37 +08:00
1c53866593 接口调整 2023-04-10 14:44:10 +08:00
liwei1dao
6da2eeb0a6 上传聊天聊天代码 2023-04-10 12:01:24 +08:00
e8e9ef3475 update 2023-04-04 18:11:39 +08:00
83093f2dc0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-04 17:53:36 +08:00
b77c28dd0d update condi配置 2023-04-04 17:53:14 +08:00
990ac20953 手动激活 通知模块 2023-04-04 14:21:42 +08:00
liwei1dao
91f3b31030 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-04 14:12:50 +08:00
liwei1dao
fe8aaf9170 上传代码 2023-04-04 14:12:39 +08:00
4a18a075f5 update 2023-04-04 12:13:50 +08:00
d1dcc03e3a 新版日周常 2023-04-03 19:20:41 +08:00
6550da4cc0 update日常 2023-04-03 19:20:41 +08:00
f1e7ea36ef 维京重复挑战解锁问题修复 2023-04-03 18:07:31 +08:00
e98e8c7da7 update 2023-04-03 16:34:07 +08:00
142ff089aa 自动激活 和手动激活数据校验 2023-04-03 16:05:19 +08:00
4456644096 update 2023-04-03 15:33:45 +08:00
0a011f4dd9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 14:43:38 +08:00
27266cad54 记录手动激活功能开启数据 2023-04-03 14:43:01 +08:00
liwei1dao
6272919a6a 同步配置,优化战斗规则配置 2023-04-03 14:31:46 +08:00
liwei1dao
171e4798ca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 14:13:49 +08:00
liwei1dao
ecdc3a374f 上传战斗规则id 同步 2023-04-03 14:12:33 +08:00
0a416f53dc update 2023-04-03 12:01:26 +08:00
c5dfd7fad6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-03 11:20:25 +08:00
061f4011d2 GM 指令 2023-04-03 11:20:19 +08:00
22731a9e77 update 2023-04-03 11:08:48 +08:00
liwei1dao
79c1134386 上传图鉴修复 2023-04-01 20:25:45 +08:00
liwei1dao
ddaa7f2271 上传任务奖励分发 2023-04-01 20:03:30 +08:00
liwei
ac67d4f55c 上传代码优化 2023-04-01 18:28:52 +08:00
liwei1dao
b326ec8c32 上传代码优化 2023-04-01 18:05:44 +08:00
liwei1dao
72cc4fb9e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-04-01 17:24:58 +08:00
liwei1dao
f38c9f106c 上传 代码 2023-04-01 17:24:33 +08:00
e8d18907ed update 2023-04-01 15:20:38 +08:00
c220db525c update 2023-04-01 15:20:38 +08:00
liwei1dao
4cda2451d6 上传代码 2023-04-01 14:38:30 +08:00
liwei1dao
43342582a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 21:48:12 +08:00
liwei1dao
05ff2856a2 上传武馆代码优化 2023-03-31 21:47:56 +08:00
9b0ae604f7 条件判断 2023-03-31 21:42:54 +08:00
a8a900523b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 21:11:40 +08:00
ab5361f606 熟练度升级后不清零 2023-03-31 21:11:36 +08:00
3d728805d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 20:25:29 +08:00
719c2cde42 update reward 2023-03-31 20:25:17 +08:00
liwei1dao
28f532599d 上传武馆驱逐代码调整 2023-03-31 20:16:54 +08:00
liwei1dao
f54b48bb14 上传好友驱逐代码 2023-03-31 20:13:29 +08:00
liwei1dao
9ecd9cfa13 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 18:44:51 +08:00
liwei1dao
ddd8460353 上传武馆雕像数据同步 2023-03-31 18:44:37 +08:00
7d9e4030ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 18:39:49 +08:00
08dcfb5e59 opencond 2023-03-31 18:39:38 +08:00
liwei1dao
04154f8e8f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 17:43:11 +08:00
929a5fada2 update 2023-03-31 17:42:12 +08:00
liwei1dao
b0e7818a45 上传魔药代码 2023-03-31 17:42:06 +08:00
57472172ed 返回小游戏提示信息 2023-03-31 17:16:57 +08:00
81fae264e2 update 2023-03-31 17:01:44 +08:00
4f8f939e73 接口调用 2023-03-31 16:52:54 +08:00
718d76a21b 配置解析报错 2023-03-31 15:57:58 +08:00
c57970e6aa 优化 2023-03-31 15:51:09 +08:00
dd2182fa84 小游戏奖励额外配置 2023-03-31 15:27:02 +08:00
51d8ba2ba5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 15:18:20 +08:00
2b7aa34427 被动签到入口 2023-03-31 15:18:14 +08:00
0839dfa477 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 15:01:27 +08:00
9cc6a708e3 查询公会信息接口 2023-03-31 15:01:17 +08:00
b1075b08f4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 14:57:37 +08:00
6d1a0ae43d 自动签到 2023-03-31 14:57:28 +08:00
829953b4ff update 2023-03-31 14:54:17 +08:00
233c0f5f70 签到额外奖励,存储提示次数 2023-03-31 14:30:47 +08:00
5855952376 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 13:40:57 +08:00
e1cbced24b 签到功能调整 2023-03-31 12:02:03 +08:00
liwei1dao
7677810ff2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 11:27:28 +08:00
liwei1dao
0d141e7f0b 上传武馆需求调整 2023-03-31 11:26:55 +08:00
82974abfb1 章节领奖 2023-03-31 10:58:06 +08:00
e211f75c32 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-31 09:45:50 +08:00
9d1a02c9c8 移出废旧协议接口等 2023-03-31 09:45:46 +08:00
e60d7fb163 update 2023-03-31 09:43:04 +08:00
62834cc22c update 2023-03-30 21:26:19 +08:00
fc3d8c552d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:58:41 +08:00
467067643f update 2023-03-30 20:58:27 +08:00
liwei1dao
7e1ca9f7b5 上传回收代码 2023-03-30 20:50:49 +08:00
liwei1dao
c832d16998 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:45:43 +08:00
liwei1dao
8fbbd1e3f8 上传装备回收系数 2023-03-30 20:45:04 +08:00
adcc94a551 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:39:26 +08:00
707934fbef update 2023-03-30 20:37:59 +08:00
liwei1dao
b3badfd074 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 20:06:00 +08:00
liwei1dao
9823de2ac5 上传pvp逻辑代码 2023-03-30 20:05:45 +08:00
01a259c151 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 18:49:47 +08:00
2d871aed9a 图鉴奖励一键领取 2023-03-30 18:49:43 +08:00
liwei1dao
600d011f15 上传pvp主动取消战斗请求 2023-03-30 18:45:40 +08:00
21f46364ad Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 18:21:11 +08:00
193a4e86ed 图鉴积分修改 2023-03-30 18:21:06 +08:00
liwei1dao
490c750095 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:51:19 +08:00
liwei1dao
1391d464e6 上传练功状态设置代码优化 2023-03-30 17:50:41 +08:00
5e96e588f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:45:22 +08:00
ad7aa97c4b update 2023-03-30 17:45:09 +08:00
liwei1dao
58771acfec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 17:29:06 +08:00
liwei1dao
8bee568529 上传武馆升级代码 2023-03-30 17:28:49 +08:00
f0d2bb5c09 update 2023-03-30 17:19:12 +08:00
d4c92efa5b 商户NPC读配置 2023-03-30 16:49:16 +08:00
2c35ca7388 铁匠铺NPC数量读配置 2023-03-30 16:26:05 +08:00
2ab7af6f76 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 16:20:13 +08:00
189a1c9526 修复多次推送的问题 2023-03-30 16:16:29 +08:00
liwei1dao
6c0cd1758a 上传图鉴id调整 2023-03-30 15:32:11 +08:00
liwei1dao
06cd0981aa 上传资源代码 2023-03-30 15:28:12 +08:00
liwei1dao
b2a83f515c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:26:08 +08:00
liwei1dao
cc6f8c05d5 日志优化 2023-03-30 15:25:48 +08:00
88fb474863 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:25:25 +08:00
4c2b128a36 打印错误信息 2023-03-30 15:25:18 +08:00
55e58931ec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 15:15:20 +08:00
f5385563c6 添加任务埋点类型 2023-03-30 15:14:55 +08:00
liwei1dao
1d8fe7be12 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 14:16:25 +08:00
liwei1dao
67d28e43f2 暂时移除事件代码 2023-03-30 14:16:14 +08:00
liwei1dao
f0877961f9 上传代码优化 2023-03-30 14:14:02 +08:00
f7e1d4c923 任务埋点参数调整 2023-03-30 13:59:04 +08:00
440f4fe1f9 优化 2023-03-30 11:47:54 +08:00
4a199ed7d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-30 11:16:03 +08:00
ab9542bdaf 图鉴跨服接口 2023-03-30 11:15:58 +08:00
cfe15751c0 更新配置 2023-03-30 10:42:11 +08:00
c09c2152a0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 22:23:23 +08:00
7c709ccca7 更新派遣概率 2023-03-29 22:22:49 +08:00
7b53f63d5d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 21:10:46 +08:00
ed4c5c6788 update 2023-03-29 21:10:37 +08:00
liwei1dao
a38a228de4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 20:58:44 +08:00
liwei1dao
977d69832f 上传代码 2023-03-29 20:58:34 +08:00
7253886ac5 update 2023-03-29 19:24:17 +08:00
cf33b5b139 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 19:06:34 +08:00
27bef42a95 更新世界任务 2023-03-29 19:06:24 +08:00
40a0a1f651 写数据BUG 2023-03-29 18:36:55 +08:00
52def5abd2 激活条件 2023-03-29 18:32:47 +08:00
58978bb084 配置同步 2023-03-29 17:52:06 +08:00
26e5f07690 初始化数据 2023-03-29 17:49:31 +08:00
7016e5560f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 17:17:05 +08:00
085f47a0ca 新增任务埋点14 15 2023-03-29 17:17:01 +08:00
liwei1dao
e4c79509d1 上传武馆修复 2023-03-29 15:26:26 +08:00
liwei1dao
3cb44f1ce5 上传武馆雕像留存时间 2023-03-29 15:13:50 +08:00
a1e5d1f3d5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 11:31:38 +08:00
51a47bc312 武馆积分奖励发送 2023-03-29 11:31:28 +08:00
liwei1dao
12cc0f6fc2 上传服务配置 2023-03-29 11:26:09 +08:00
liwei1dao
39e7125c0e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:58:52 +08:00
liwei1dao
dd910fd977 上传武馆雕像刷新优化 2023-03-29 10:58:41 +08:00
a5405b51d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:50:32 +08:00
54a4682a69 激活修改 2023-03-29 10:50:25 +08:00
liwei1dao
eab92a1205 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:49:04 +08:00
liwei1dao
d61c897187 上传武馆雕像刷新时间 2023-03-29 10:48:52 +08:00
72c62c5aed 武馆积分奖励领取 2023-03-29 10:42:19 +08:00
6023cd673d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:21:34 +08:00
01b88e6ba8 单次领取改一次领所有奖励 2023-03-29 10:21:24 +08:00
liwei1dao
97b0dad942 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-29 10:16:13 +08:00
liwei1dao
e7f5b858d6 上传魔药接口 2023-03-29 10:16:02 +08:00
0c1d675c8e 铁匠铺非定制打造才玩小游戏 2023-03-28 19:04:12 +08:00
d41600bbdc update 2023-03-28 14:19:19 +08:00
387b23f97d update 2023-03-27 20:29:56 +08:00
d28ba58920 派遣任务随机刷新 2023-03-27 20:29:14 +08:00
0421c9f00e update req 2023-03-27 20:15:25 +08:00
449c921133 update 2023-03-27 20:01:36 +08:00
cbb23917c0 世界任务多任务 2023-03-27 19:57:52 +08:00
b53972e79f 世界任务多组支持 2023-03-27 19:57:48 +08:00
397ab14b79 多路任务支持 2023-03-27 19:56:13 +08:00
7068b0c635 美食馆菜品图鉴激活+功夫塔配置迁移 2023-03-27 19:01:06 +08:00
5d08d1610c 配置更新 2023-03-27 16:06:08 +08:00
47dd998643 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:55:19 +08:00
78fe971932 输出日志 2023-03-27 15:55:12 +08:00
liwei1dao
c559bcf069 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:47:34 +08:00
liwei1dao
b0d0ec205f 上传任务消息推送 2023-03-27 15:47:17 +08:00
f1cc783b7c 记录小游戏最高记录 2023-03-27 15:41:17 +08:00
78a39423a8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-27 15:00:10 +08:00
50d02359c7 铁匠铺小游戏 概率双倍打造双倍 2023-03-27 15:00:03 +08:00
liwei1dao
c001258929 上传武馆数据初始化修复 2023-03-27 14:26:01 +08:00
liwei1dao
28ccde1f34 上传拼图游戏接口 2023-03-27 09:53:15 +08:00
liwei1dao
9f55ca0628 上传资源默认 2023-03-24 22:45:09 +08:00
liwei1dao
61787d5cd2 上传木桩解锁调整 2023-03-24 21:56:53 +08:00
liwei1dao
6f1c7c7ea3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 20:44:15 +08:00
liwei1dao
4d402e8a2d 上传铁匠铺代码 2023-03-24 20:44:03 +08:00
cf59f160d4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 18:28:45 +08:00
93442b6877 美食馆 2023-03-24 18:28:17 +08:00
liwei1dao
41c8b08bbc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 17:52:07 +08:00
liwei1dao
377a551bab 上传武馆经验加成 2023-03-24 17:51:00 +08:00
9a24d60780 修改派遣随机策略 2023-03-24 17:50:46 +08:00
liwei1dao
977ce1e40a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 17:21:34 +08:00
liwei1dao
7c33752262 添加测试代码 2023-03-24 17:21:17 +08:00
a65ed662b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 15:20:31 +08:00
448b5e5b8c 炉温校验 2023-03-24 15:20:24 +08:00
liwei1dao
e190aaf3ab 上传武馆经验计算修复 2023-03-24 15:06:52 +08:00
4556ed552b 报错处理 2023-03-24 09:45:57 +08:00
b19b66a200 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-24 09:41:04 +08:00
cb4e23d12b GM 获取指定类型的道具 2023-03-24 09:40:53 +08:00
fd0580d4da update worldtask 2023-03-24 09:29:49 +08:00
64a50c4f57 worldtask 2023-03-24 09:29:49 +08:00
bf98281c0a update 2023-03-24 09:29:49 +08:00
14e1a5bb30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-23 17:49:54 +08:00
4b9ad93b84 移出旧主线 2023-03-23 17:49:39 +08:00
88bbfece23 更新Pb 2023-03-23 12:07:26 +08:00
21800d3fd9 update 2023-03-23 12:02:11 +08:00
755693518a update 2023-03-23 11:05:32 +08:00
50781b87a3 前置条件解锁 2023-03-21 13:43:47 +08:00
53999edfbe 需求调整,能同时打不同页签的塔 2023-03-20 18:19:31 +08:00
bd21f7ee76 武馆塔添加前置解锁条件 2023-03-20 16:11:21 +08:00
0da13ca917 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-17 20:45:31 +08:00
9622604dc5 修改炉温校验 2023-03-17 20:45:18 +08:00
a2f6075eba 解锁木桩,任务统计 配置更新 2023-03-17 18:57:22 +08:00
e2890b1a59 更新记数规则 2023-03-17 17:51:07 +08:00
f677a55ecc update 2023-03-17 15:45:07 +08:00
0c51fd3521 update 2023-03-17 15:42:58 +08:00
e3ef151ac2 update 2023-03-17 15:42:47 +08:00
5080121075 update 2023-03-17 15:31:50 +08:00
adbe3b7415 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-17 14:28:21 +08:00
cf5d2991d7 update Session 2023-03-17 14:28:09 +08:00
283b7382c4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 19:16:50 +08:00
fd8055110b update 2023-03-16 19:16:46 +08:00
97ea52b9e4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 18:13:33 +08:00
d3f0f0aada 修复在线玩家 2023-03-16 18:13:20 +08:00
liwei1dao
078b1af6fc 调整武馆经验收益计算 2023-03-16 17:48:08 +08:00
liwei1dao
457ed31fff 移除旧武馆 2023-03-16 16:49:28 +08:00
683fb2d72d add log 2023-03-16 16:25:28 +08:00
8ee109e673 重置任务数 2023-03-16 16:03:43 +08:00
5b25ca43e7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 15:14:03 +08:00
56fe04cbf7 英雄查询接口优化 减少查询次数调用 2023-03-16 15:13:50 +08:00
liwei1dao
cb29154698 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 14:44:54 +08:00
liwei1dao
260ff1c177 上传服务端代码 2023-03-16 14:44:36 +08:00
fd1e706014 update 2023-03-16 14:15:27 +08:00
ebff117d3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2023-03-16 14:15:04 +08:00
d3dbc468af 报错 2023-03-16 14:14:57 +08:00
liwei1dao
eda81986af 上传批量处理代码 2023-03-16 13:55:19 +08:00
79fb4b27eb 批量查询英雄接口 2023-03-16 13:52:50 +08:00