Commit Graph

1261 Commits

Author SHA1 Message Date
liwei1dao
f7624aeabb 上传默认日志配置 2022-09-21 14:51:02 +08:00
liwei1dao
439a21cca4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-21 14:44:49 +08:00
liwei1dao
97cff7c81c 上传服务cmd 启动程序 2022-09-21 14:44:44 +08:00
d06a618d91 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-21 14:04:52 +08:00
f0614f6c19 优化活跃度初始化 2022-09-21 14:04:44 +08:00
02dd4ad63c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 22:34:39 +08:00
6b0d3b1be6 4星5星保底数据 2022-09-20 22:34:19 +08:00
802427073c 更新测试工具 2022-09-20 22:09:16 +08:00
ec54e9030c 战斗胜利加英雄经验 2022-09-20 21:27:18 +08:00
4c4280ebbd Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 21:18:46 +08:00
fbccb0d6e0 配置更新 2022-09-20 21:18:27 +08:00
69276c9c89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 20:47:09 +08:00
e9b29d0e6b 修复不同类型的判断 2022-09-20 20:47:04 +08:00
865f5f12f3 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 19:59:46 +08:00
ede2e777dd 抽卡 垮卡池情况 2022-09-20 19:59:31 +08:00
053f57bd07 更新任务记录 2022-09-20 19:51:37 +08:00
ced3f6856d 随机任务条件校验 2022-09-20 18:07:26 +08:00
3d22b50dd9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 17:33:36 +08:00
b065a666e1 随机任务记录 2022-09-20 17:33:32 +08:00
300eb4ecb0 闯关条件判断 2022-09-20 16:56:45 +08:00
257bd47c58 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 16:25:28 +08:00
341fcef859 配置更新 2022-09-20 16:24:37 +08:00
liwei1dao
6d0dcc41a6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-20 15:37:32 +08:00
liwei1dao
68ae162d5c 上传商店购买购买次数重置问题 2022-09-20 15:37:07 +08:00
4f64071522 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 19:33:15 +08:00
e62274636c 好友助战奖励更新 2022-09-19 19:33:10 +08:00
730973c39c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 18:50:22 +08:00
32318c3adf 图鉴字段修改 存入剧情id 字段 2022-09-19 18:49:58 +08:00
liwei
57d7a83a3f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 18:42:32 +08:00
liwei
8ce2eb637a 上传定时公告多次触发bug 2022-09-19 18:42:31 +08:00
1bee760df9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 17:57:05 +08:00
d352e0d8c1 藏书馆相关接口 2022-09-19 17:56:27 +08:00
liwei
714da99c01 上传配置中心没有定时校验bug 2022-09-19 17:23:54 +08:00
8cf0ee5890 过滤黑名单 2022-09-19 16:38:46 +08:00
28944ab215 更新奖励 2022-09-19 15:12:04 +08:00
liwei1dao
9153d95b20 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 14:03:44 +08:00
liwei1dao
ffba865133 上传网关分发异常日志输出 2022-09-19 14:03:39 +08:00
9d677413bc Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 14:02:04 +08:00
169a936ff0 参数校验 2022-09-19 14:01:47 +08:00
liwei1dao
2d8997be22 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 13:45:39 +08:00
liwei1dao
3a7e5fe8f2 上传 装备升级保底次数修复 2022-09-19 13:45:34 +08:00
f56269e519 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 11:08:03 +08:00
7666dc70d3 发放资源改用gm 发送 2022-09-19 11:07:48 +08:00
liwei1dao
16862ec78a 上传聊天gm命令 2022-09-19 11:02:28 +08:00
70935119a4 不推送gm 操作成功还是失败,客户端监听物品变化即可 2022-09-19 11:00:15 +08:00
53dda66f46 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 10:42:05 +08:00
d50ed5dac7 GM模块提供接口 2022-09-19 10:41:41 +08:00
726ceecc72 更新协议type 2022-09-19 10:05:55 +08:00
48f1bb7404 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-19 10:05:44 +08:00
220402c3ff Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-16 21:18:30 +08:00
484d889c57 登录邮件发金币 2022-09-16 21:18:03 +08:00
20db79f117 更新任务条件 2022-09-16 17:55:21 +08:00
liwei1dao
ff58a55669 添加聊天公告推送日志 2022-09-16 16:17:23 +08:00
dbdb809296 配置表更新 2022-09-16 15:53:56 +08:00
liwei1dao
9aa508a206 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-16 15:31:57 +08:00
liwei1dao
11f99c0dc0 上传聊天公告附加数据 2022-09-16 15:31:49 +08:00
6337ba17dd boss 关卡类型定义 2022-09-16 15:30:15 +08:00
8ac605b645 新关卡难度赋值 2022-09-16 15:28:12 +08:00
liwei1dao
0bac28f7fd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-16 14:15:57 +08:00
liwei1dao
9fd21926aa 上传网关服务与 Service_Mainte 服务简练界面,实现Service_Mainte 服务器主动推送用户消息 2022-09-16 14:15:41 +08:00
43761c21f9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-16 11:33:43 +08:00
c1ea01a4d6 boos关卡需求调整 2022-09-16 11:33:14 +08:00
8bf8349349 注释任务更新条件 2022-09-15 20:57:49 +08:00
2320b9a280 更新功能开启 2022-09-15 20:34:02 +08:00
621f50bff3 更新配置 2022-09-15 20:34:02 +08:00
b95ce261d4 changelist 2022-09-15 19:53:45 +08:00
52926a2f52 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-15 18:57:09 +08:00
06b07998e9 宝箱关卡 2022-09-15 18:56:55 +08:00
d99893e667 修复在线好友 2022-09-15 17:08:46 +08:00
170c0ba6d9 更新随件任务条件 2022-09-15 16:20:29 +08:00
67dafc242c 普通塔通关 发送广播消息 2022-09-15 16:02:54 +08:00
liwei1dao
82a2f11b9a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-15 15:56:43 +08:00
liwei1dao
0f76996627 上传聊天消息公告推送 2022-09-15 15:56:39 +08:00
e1deb005d9 装备附加属性计算 2022-09-15 15:27:14 +08:00
2a7506ce34 装备附加属性计算 2022-09-15 15:26:21 +08:00
690ec7a5d4 技能升级权重配置修改 2022-09-14 20:18:26 +08:00
6c8c6fba73 更新随机任务战斗任务 2022-09-14 19:16:03 +08:00
5d888f3400 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-14 19:07:47 +08:00
b102f917d6 小层排行优化 2022-09-14 19:06:31 +08:00
liwei1dao
bfb6e41284 上传网关日志优化 2022-09-14 11:56:54 +08:00
liwei1dao
1a8ae5e712 上传装备属性加成算法调整 2022-09-14 11:31:00 +08:00
liwei1dao
03b23e7282 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-13 20:13:10 +08:00
liwei1dao
37dbc13fc1 上传战斗角色 排序接口 2022-09-13 20:13:06 +08:00
05353d57eb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-13 20:09:49 +08:00
dda5235629 记录爬塔明细数据 2022-09-13 20:09:30 +08:00
f1ca15e4ec 随机任务战斗任务 2022-09-13 19:48:17 +08:00
1829ff0754 添加判空 2022-09-13 18:43:45 +08:00
569bcb8bfb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-13 18:04:36 +08:00
c04bb200ec 战报加人战斗时间
爬塔战斗相关
2022-09-13 18:03:55 +08:00
liwei1dao
cd21717051 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-13 17:59:46 +08:00
liwei1dao
ddb6879c02 上传战斗相关逻辑 2022-09-13 17:59:40 +08:00
400827f108 时间计算的问题 2022-09-13 11:58:44 +08:00
4430a3d7f5 铁匠铺订单累计时间计算 2022-09-13 10:46:04 +08:00
19ccac6357 session清理 2022-09-09 18:28:45 +08:00
18faf227be 限制多终端登录 2022-09-09 18:28:44 +08:00
dbba6a9af9 狩猎只有挑战新关卡才写排行 2022-09-09 18:13:24 +08:00
96c9013e08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 17:15:23 +08:00
0c75ee0f0f 主线流程优化 2022-09-09 17:15:06 +08:00
liwei1dao
d999e6c81b 上传装备协议 关闭c#关键字 2022-09-09 16:34:26 +08:00
liwei1dao
3b6aaa5122 修复装备出售消息接口错误 2022-09-09 16:25:29 +08:00
liwei1dao
ab7e069174 上传装备锁定修复 2022-09-09 16:15:17 +08:00
liwei1dao
1b188b8db6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 16:09:53 +08:00
liwei1dao
0d0cddf1de 上传装备锁定 2022-09-09 16:09:46 +08:00
1ae79fe77a 好友双向删除 2022-09-09 15:32:20 +08:00
feb59cbe6a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 15:26:37 +08:00
12dff3377f 狩猎战斗 2022-09-09 15:26:12 +08:00
liwei1dao
7cbbc9c8c6 上传战斗初始列表 怪物站位bug 2022-09-09 15:04:58 +08:00
cf0e0a5a2a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 14:23:47 +08:00
a96dc9884f 主线记录已挑战数据 2022-09-09 14:23:27 +08:00
liwei1dao
97e20fe8f3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 11:58:11 +08:00
liwei1dao
335b9391db 修复战斗地方数据不存在的bug 2022-09-09 11:58:05 +08:00
e1ee9a6c2f 修改成就 2022-09-09 11:52:38 +08:00
7b671c59b2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 11:36:19 +08:00
1201d3214e 通过战报获取阵容信息 2022-09-09 11:36:03 +08:00
liwei1dao
eada2cee45 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 11:18:12 +08:00
liwei1dao
2dccadc8b1 上传pb工具 2022-09-09 11:18:06 +08:00
8bd8f8a2f7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-09 10:36:16 +08:00
bebf95eb6a 配置表更新 + 代码加一些注释 2022-09-09 10:35:54 +08:00
liwei1dao
1feefea122 补充道具装备不可出售的逻辑判断 2022-09-09 10:10:46 +08:00
b96f83b345 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-08 20:13:25 +08:00
7f31dceaf4 远征战斗相关 2022-09-08 20:13:00 +08:00
liwei1dao
c78e026e65 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-08 17:25:18 +08:00
liwei1dao
0891851f61 上传战斗模块代码 2022-09-08 17:25:12 +08:00
29a9f788e1 狩猎加获取好友排行 2022-09-08 17:14:12 +08:00
6584cb33e9 开放好友列表接口 2022-09-08 15:49:17 +08:00
5e2eba49d4 增加功能列表协议 2022-09-08 15:49:17 +08:00
3c5b1ea290 排行榜支持多类型放同一张表 2022-09-08 15:48:26 +08:00
9209f23b14 挑战次数问题 2022-09-08 13:56:58 +08:00
2c8958d667 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-08 11:48:24 +08:00
09f0e25489 图书馆协议 2022-09-08 11:47:59 +08:00
liwei1dao
9166f265d1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-08 10:40:02 +08:00
liwei1dao
8c567c5150 上传战斗单波优化 2022-09-08 10:39:55 +08:00
900910e101 藏书馆 2022-09-07 20:07:56 +08:00
14c474cc0b 藏书馆 2022-09-07 20:06:43 +08:00
ddb72771ca Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-07 19:08:40 +08:00
57b33bcd93 测试修改 2022-09-07 19:08:22 +08:00
e3861971e7 update for golangci-lint 2022-09-07 18:25:58 +08:00
liwei1dao
ee8759a7a1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-07 18:17:15 +08:00
liwei1dao
f0691a779c 上传战斗协议结构修改 2022-09-07 18:17:10 +08:00
f45e137fbb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-07 16:06:24 +08:00
89f18a902c 表名封装 2022-09-07 16:06:09 +08:00
9254610758 update 2022-09-07 15:58:38 +08:00
55b19c4d68 狩猎排行 2022-09-07 14:55:11 +08:00
1d26a77746 狩猎购买 2022-09-07 12:09:35 +08:00
4bf64cc9df Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-07 11:36:52 +08:00
f3e91cf341 加一些错误码 删除测试代码 2022-09-07 11:36:37 +08:00
0b648ad558 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-07 11:20:33 +08:00
3529f0d117 狩猎挑战 2022-09-07 11:20:16 +08:00
liwei1dao
57153d13cf 上传时间轮系统 处理延时任务 2022-09-07 11:05:04 +08:00
liwei1dao
05ec2a1f9f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-07 09:28:14 +08:00