Commit Graph

2296 Commits

Author SHA1 Message Date
a325224d95 玩家阵容展示 2022-10-13 18:50:03 +08:00
liwei1dao
90cc4b1f5c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 18:02:05 +08:00
liwei1dao
4678cbd83e 上传月子秘境代码 2022-10-13 18:01:24 +08:00
18058e075f 羁绊数据bug 2022-10-13 17:09:04 +08:00
ff0b042738 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 15:30:14 +08:00
d591b8f964 查询最佳通关记录 2022-10-13 15:29:59 +08:00
c572e0bf92 update玩家战斗记录 2022-10-13 15:27:53 +08:00
b82329cd0f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 15:26:34 +08:00
2b26cdf465 羁绊好感度奖励 2022-10-13 15:26:15 +08:00
liwei1dao
9ad0ff2a48 上传月之秘境购买测试配置文件优化 2022-10-13 15:25:55 +08:00
liwei1dao
06e49d60df Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 15:19:52 +08:00
liwei1dao
6c3eae319f 上传月之秘境bug修复 2022-10-13 15:19:46 +08:00
42630f6c97 update 2022-10-13 14:46:43 +08:00
0117c511f2 user if nil 2022-10-13 14:34:01 +08:00
cd47c52680 指定字段更新 2022-10-13 14:34:01 +08:00
d3ad5ff7aa Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 14:14:31 +08:00
504b0b8db3 战斗校验 2022-10-13 14:14:15 +08:00
liwei1dao
aa6d1d2134 上传梦境配置 2022-10-13 14:06:25 +08:00
liwei1dao
50145884f3 优化月之秘境代码 2022-10-13 13:46:19 +08:00
liwei1dao
cf91bd07e2 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 12:06:37 +08:00
liwei1dao
0c5a38f403 上传db保护代码 2022-10-13 12:06:23 +08:00
d5aac3f900 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-13 12:03:05 +08:00
830997df43 查询狩猎记录接口 2022-10-13 12:02:02 +08:00
liwei1dao
df28036e54 优化数据库连接对象错误保护 2022-10-13 12:00:39 +08:00
liwei1dao
462c3d7dc0 上传代码 2022-10-13 11:41:10 +08:00
d60181b948 激活羁绊信息 2022-10-13 10:14:40 +08:00
liwei1dao
eba546d0a2 上传战斗系统修复 2022-10-13 09:43:57 +08:00
e72ec3d5c9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 18:49:58 +08:00
712531131d 查询其他玩家战斗记录 2022-10-12 18:49:35 +08:00
ebc74b528e 条件判断错误 2022-10-12 18:38:02 +08:00
2bb2f2710d 修改login go 2022-10-12 18:12:50 +08:00
105ba21a3a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 17:50:18 +08:00
745d861e4c 记录通关时间 2022-10-12 17:50:03 +08:00
ed40e62436 去除未使用的包 2022-10-12 17:40:59 +08:00
liwei1dao
a56dcf115d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 17:39:49 +08:00
liwei1dao
8ce067043c 上传月之秘境分布式锁 2022-10-12 17:39:29 +08:00
392d17e691 玩家战斗记录查询 2022-10-12 17:39:08 +08:00
b907145109 玩家战斗记录 2022-10-12 17:39:08 +08:00
liwei1dao
a2858fda57 上传月之秘境代码 2022-10-12 17:17:17 +08:00
c53a6c294e 心魔塔查询玩家信息接口 2022-10-12 16:41:06 +08:00
720b187333 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 15:38:44 +08:00
eca5c2e750 给英雄赠送礼物 2022-10-12 15:38:09 +08:00
a61c656723 优化登录 2022-10-12 15:23:52 +08:00
liwei1dao
ddab5ed2f2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-12 14:00:40 +08:00
liwei1dao
5da178166a 上传月之秘境优化 2022-10-12 12:34:23 +08:00
a3cfa77afe Merge branch 2022-10-12 11:37:29 +08:00
044ba74bd4 解析 2022-10-12 11:35:55 +08:00
liwei1dao
366bd86cb8 上传月之秘境代码 2022-10-12 11:32:56 +08:00
liwei1dao
248ee4ed5e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-10-12 11:31:08 +08:00
liwei1dao
8cf678dcf2 上传月之秘境代码 2022-10-12 11:30:36 +08:00
4061f0dd79 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-12 10:50:15 +08:00
2ee66ded5a 增加英雄羁绊经验 2022-10-12 10:49:20 +08:00
liwei1dao
e01253f69f 上传月之秘境触发机制 2022-10-12 10:48:27 +08:00
liwei1dao
50fd39e1f0 上传月之秘境数据层优化 2022-10-12 10:13:04 +08:00
e1e6498215 玩家信息修改协议 2022-10-12 09:37:28 +08:00
531718d3a2 查询玩家心魔塔最高层数数据 2022-10-11 18:47:53 +08:00
17465a2f63 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-11 09:58:49 +08:00
d77cf70284 获取英雄羁绊详细信息 2022-10-11 09:58:33 +08:00
cb703366fc 改协议名 2022-10-11 09:39:25 +08:00
d95e45c574 bingo 跳过随机任务 2022-10-10 14:53:04 +08:00
5f6de83b62 bingo 跳过随机任务 2022-10-10 14:52:44 +08:00
c808b353a4 随机任务支持bingo 2022-10-10 14:40:26 +08:00
485021f72f 英雄调用加经验接口也推送属性变化 2022-10-10 11:29:38 +08:00
5b624437d3 铁匠铺清除数量为0的订单数据 2022-10-10 11:16:38 +08:00
a7777dc379 铁匠铺升级台子缩短总订单时长 2022-10-10 10:47:07 +08:00
5d0e95b627 英雄羁绊领奖 2022-10-09 18:33:45 +08:00
7554cc51b0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-09 16:08:12 +08:00
46f9b0065c 羁绊新增一些接口 2022-10-09 16:07:43 +08:00
liwei1dao
fa78695a20 上传装备添加多个叠加bug 2022-10-09 16:01:05 +08:00
liwei1dao
2a69fe0450 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-10-09 14:31:05 +08:00
liwei1dao
4754609b29 上传战斗系统代码 2022-10-09 14:30:56 +08:00
fc54a8d888 英雄羁绊信息 2022-10-09 10:33:20 +08:00
1f46ee40df 数据库字段对应的pb 类型 2022-10-08 18:02:50 +08:00
65d4128452 心魔塔优化 2022-10-08 15:44:09 +08:00
05e00e0c0b 改包名 2022-10-08 15:32:51 +08:00
03bd4e3efa 补充日志 2022-10-08 11:03:53 +08:00
46965d395d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-30 18:47:23 +08:00
90f40af815 爬塔 先发推送英雄经验变化在推送结果数据 2022-09-29 16:11:20 +08:00
bc1a5a0603 装备成长属性计算 2022-09-29 16:06:22 +08:00
460adef54e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-29 14:58:04 +08:00
7f7b549274 补充日志 2022-09-29 14:57:59 +08:00
df5f033b1c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-29 14:51:37 +08:00
d4aa9e4d8d 战斗结束加加经验升级也推送随机任务 2022-09-29 14:51:23 +08:00
f5d13ea80e Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-29 14:24:44 +08:00
3d1a49d85f 获取单次升级的等级 2022-09-29 14:24:28 +08:00
55c25671d6 修改任务累加逻辑 2022-09-28 23:08:19 +08:00
149932a66c 优化 2022-09-28 21:36:33 +08:00
6d099c13ca Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-28 21:13:14 +08:00
9310055d61 英雄达到最大等级 时候取当前经验有bug 2022-09-28 21:13:10 +08:00
liwei1dao
ba3f28b4d6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-28 21:03:26 +08:00
liwei1dao
656fb4226b 优化日志输出代码 2022-09-28 21:03:21 +08:00
60e0219ab1 去掉无效注释 2022-09-28 16:20:21 +08:00
0ef0451aeb 共鸣返还材料 2022-09-28 16:06:16 +08:00
7b0f50f21f 返还对应数量的升星卡 2022-09-28 15:25:41 +08:00
ea72987609 参数错误 2022-09-28 14:38:54 +08:00
2c6b53ad07 共鸣配置获取 取英雄原始星级 2022-09-28 14:20:25 +08:00
87ff904049 抽卡次数 2022-09-28 10:48:28 +08:00
fb66529f5f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-27 23:53:42 +08:00
0a6af317af 抽卡增加卡池 2022-09-27 23:53:16 +08:00
7f438f8cb5 更新userexpand 2022-09-27 23:29:13 +08:00
303edd3b30 更改初始化时机 2022-09-27 23:01:36 +08:00
50e376655c 更新任务结束逻辑 2022-09-27 22:43:28 +08:00
a8f3add1a7 更新条件 2022-09-27 22:02:43 +08:00
e7653fbe34 增加日志 2022-09-27 22:02:43 +08:00
69a790966d 克隆英雄信息 重置套装id属性 2022-09-27 22:02:07 +08:00
5c0ff5165b 套装属性任务处理 2022-09-27 21:25:46 +08:00
0f320cb41b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-27 20:41:31 +08:00
3e93ba1994 获取原始星级 2022-09-27 20:41:01 +08:00
f909fca637 更新表 2022-09-27 20:38:26 +08:00
liwei1dao
42adce6fd3 上传道具使用掉落组更换 2022-09-27 20:16:21 +08:00
liwei1dao
ec2b903fdc 上传代码优化 2022-09-27 19:00:20 +08:00
4d171b8901 更新随机任务流程 2022-09-27 18:17:47 +08:00
liwei1dao
9aa7af41d2 上传pvp和pve商店列表覆盖的bug 2022-09-27 17:23:38 +08:00
cb87f7ce8d 更新配置 2022-09-27 15:49:54 +08:00
5293d17d80 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-27 15:26:48 +08:00
65b0733f99 更新配置 2022-09-27 15:26:44 +08:00
24f5a63d2a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-27 14:04:10 +08:00
b34c217857 bingo:Iamyoudad 2022-09-27 14:03:47 +08:00
2856f18728 优化调试GUI 2022-09-27 11:08:46 +08:00
245361a871 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-27 00:05:19 +08:00
31687fc973 修改gui方便调试 2022-09-27 00:03:34 +08:00
8fd9b0d0bb 删除卡牌日志 2022-09-26 23:43:50 +08:00
a1f165fd90 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-26 23:34:19 +08:00
4219ea4a59 一次可以共鸣好几级 2022-09-26 23:34:03 +08:00
adaed4127c update 2022-09-26 23:14:28 +08:00
49df61b4e0 更新无选项情况 2022-09-26 22:48:47 +08:00
9258a7ceb2 修改任务结束奖励 2022-09-26 21:51:18 +08:00
58c3de27c3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-26 20:49:08 +08:00
d13ffbeb7c 更新校验流程 2022-09-26 20:48:59 +08:00
51731fbafb 消耗校验 2022-09-26 20:46:42 +08:00
liwei1dao
97fc44039d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-26 20:25:25 +08:00
liwei1dao
b586682d1d 上传战斗翻译 2022-09-26 20:25:20 +08:00
90a954c781 修改登录时初始化 2022-09-26 20:24:12 +08:00
0636ab4e19 共鸣能量点数判断 2022-09-26 20:14:33 +08:00
0d17bcec73 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-26 19:55:22 +08:00
0b6c570ea5 更新校验流程 2022-09-26 19:55:16 +08:00
0210e6d4d3 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-26 19:54:02 +08:00
637fb163dd 战斗结束给英雄加经验 做下英雄id 校验 2022-09-26 19:52:07 +08:00
fdc86244b5 更新随机任务流程 2022-09-26 17:47:34 +08:00
cf9ec32b05 去掉测试代码 2022-09-26 17:13:39 +08:00
babd410071 修改日常任务配置逻辑 2022-09-26 16:33:31 +08:00
57829a5ea0 暴击 暴击伤害,效果命中,效果抵抗 属性赋值 2022-09-26 13:46:32 +08:00
75a5a0f29d CloneNewHero 2022-09-26 13:39:10 +08:00
d4b6c368cb 配置同步 2022-09-26 11:59:59 +08:00
5385c292b4 战斗校验 2022-09-26 11:10:33 +08:00
b06f43ebdc 藏书馆奖励类型修改 2022-09-26 09:49:57 +08:00
b4226c8518 保存当前随机任务ID 2022-09-26 09:30:08 +08:00
45fea5cf76 合并日常和随机任务条件 2022-09-23 19:53:30 +08:00
dd2705a6a9 战斗部分参数透传回去 2022-09-23 16:36:52 +08:00
986bc3a397 创建多个羁绊信息 2022-09-23 15:32:35 +08:00
b35f18cf26 修改随机任务战斗结束处理 2022-09-23 14:45:38 +08:00
f3319fa989 条件校验参数修改 2022-09-23 14:39:29 +08:00
ea768c5733 修改协议名 2022-09-23 13:39:50 +08:00
08fc298cf6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-23 12:09:24 +08:00
a1abccac4f 更新等级经验协议 2022-09-23 12:09:19 +08:00
liwei1dao
1a817d452b 上传商店配置 2022-09-23 11:41:04 +08:00
22e0c83866 随机任务条件数据初始 2022-09-22 23:09:54 +08:00
liwei1dao
7f0db52213 上传聊天超链接 2022-09-22 22:45:09 +08:00
liwei1dao
45aa790e69 上传装备分享 2022-09-22 22:02:24 +08:00
liwei1dao
a602310920 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-22 21:40:02 +08:00
liwei1dao
868d2ca99a 上传装备强化分享超链接处理 2022-09-22 21:39:55 +08:00
c1c76649d4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-22 21:27:58 +08:00
2a902a1b25 更新随机任务配置 2022-09-22 21:27:53 +08:00
liwei1dao
862a7b8f8b 上传颜色表修改 2022-09-22 21:20:08 +08:00
8fa0f78888 战斗标题 2022-09-22 18:42:09 +08:00
liwei1dao
b0a4811445 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-22 18:31:59 +08:00
liwei1dao
85d1e4dfc3 上传战斗标题字段添加 2022-09-22 18:31:43 +08:00
fb46cdd14f 英雄基础属性计算 2022-09-22 17:19:25 +08:00
3df4d95fe6 觉醒附加属性优化 2022-09-22 16:54:56 +08:00
cc955cc160 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-22 16:06:00 +08:00
bef3272839 共鸣觉醒百分百属性计算 2022-09-22 16:05:42 +08:00
liwei1dao
cace2487f9 上传聊天消息 2022-09-22 14:58:23 +08:00
liwei1dao
af5ef67b63 上传聊天消息 2022-09-22 14:58:06 +08:00
liwei1dao
9807d74171 上传聊天消息新加字段 2022-09-22 14:08:33 +08:00
liwei1dao
6824d0d3b2 上传聊天分享扩展 2022-09-22 14:06:37 +08:00
45c70915f9 爬塔胜利加对应英雄经验 2022-09-22 13:49:35 +08:00
liwei1dao
f1788349d6 上传日志输出控制 2022-09-21 21:20:32 +08:00
liwei1dao
7739567b3a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-21 20:03:14 +08:00
liwei1dao
439ef722d8 上传跨服配置项 2022-09-21 20:02:58 +08:00
0fd8abad53 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-21 19:41:11 +08:00
25c0a21c35 gm解析 2022-09-21 19:40:56 +08:00
22eeab8deb 等级经验优化 2022-09-21 18:11:49 +08:00
c9818ebbee 优化玩家等级经验 2022-09-21 18:01:59 +08:00
e68bbbe2d8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-21 16:44:40 +08:00
0b2b489543 gm 指令增加 修改关卡信息。升级上限校验修复 2022-09-21 16:44:19 +08:00
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
liwei1dao
ff5de7ef90 移除game模块 2022-09-07 09:28:09 +08:00
66ff038d4e 参数校验 2022-09-06 20:20:38 +08:00
3f5c6ba3ab battle 赋值 2022-09-06 19:54:51 +08:00
33d20f8f13 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-06 19:37:37 +08:00
b8e8b7a5df 主线战斗 2022-09-06 19:37:14 +08:00
7b9ad86089 支线剧情任务优化 2022-09-06 19:11:16 +08:00
liwei1dao
99f48b3e43 上传战斗流程代码 2022-09-06 19:09:59 +08:00
liwei1dao
42d1a3f6c2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-06 18:02:51 +08:00
liwei1dao
cf65a54b8f 上传跨服消息分发优化 2022-09-06 18:02:46 +08:00
5e571fcdbc 支线剧情任务 2022-09-06 17:25:26 +08:00
liwei1dao
526e32e708 上传战斗业务对接接口 2022-09-06 17:00:25 +08:00
liwei1dao
b838460200 上传战报数据独享 2022-09-06 16:44:19 +08:00
liwei1dao
c77443c862 上传月之秘境代码 2022-09-06 15:57:26 +08:00
liwei1dao
0a229ceb56 上传战斗系统相关接口 2022-09-06 12:42:06 +08:00
liwei1dao
583a482a3f 上传战斗接口 2022-09-06 11:37:29 +08:00
liwei1dao
8ab7ba0ed0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-06 11:05:07 +08:00
liwei1dao
a387383e4a 上传战斗记录数据 2022-09-06 11:05:01 +08:00
4cf9594a75 命名修改 2022-09-06 10:51:25 +08:00
4f78b63c06 创建怪物英雄 2022-09-06 10:40:41 +08:00
8422b3b3a3 bug 2022-09-06 09:45:30 +08:00
5358359316 转string 2022-09-02 19:03:21 +08:00
15b8284462 viking boss 通关时间字段修改 + 随机任务 2022-09-02 18:42:16 +08:00
455952d877 viking boss类型校验 2022-09-02 17:24:07 +08:00
66997a30ca 一些优化 2022-09-02 17:19:06 +08:00
31258667c8 铁匠铺台子保底字段修改+ 单元测试 2022-09-02 14:12:21 +08:00
5377fa936b 没有订单的时候计算正在制作的食材 2022-09-01 20:22:48 +08:00
6339f7c0ad 随机任务+订单跨天bug 2022-09-01 19:45:37 +08:00
812155fc7d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 18:55:27 +08:00
c38efd8c42 美食家订单bug 2022-09-01 18:55:02 +08:00
liwei1dao
33af640bd4 上传月子秘境测试修复 2022-09-01 15:19:39 +08:00
8c11261751 更新测试 2022-09-01 14:58:40 +08:00
liwei1dao
6b4dae65e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 14:42:57 +08:00
liwei1dao
ce838025f3 上传月之秘境代码 2022-09-01 14:41:59 +08:00
ee1bc3fcc2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 14:39:36 +08:00
8ea4b38ad2 mainline 配置表调整 2022-09-01 14:39:11 +08:00
d045ecad3f 更新配置 2022-09-01 10:23:22 +08:00
a1b86a0579 更新新任务 2022-09-01 10:09:55 +08:00
3a1bdcc4ba Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 10:08:58 +08:00
ecefefe768 json 同步 2022-09-01 10:08:29 +08:00
liwei1dao
1c08ebf8d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-09-01 09:56:10 +08:00
645514ed3d 美食家 加一个订单开始时间 2022-08-31 19:49:33 +08:00
liwei1dao
c4890b796b 上传月子秘境 对接聊天系统推送好友消息 2022-08-31 19:45:56 +08:00
a47f734c16 狩猎 2022-08-31 19:25:21 +08:00
057dd305aa 美食家配置表合并 2022-08-31 17:26:44 +08:00
431c95ebb0 随机任务埋点 2022-08-31 17:14:47 +08:00
91026c85c3 随机任务埋点 2022-08-31 17:14:33 +08:00
liwei1dao
d975c28b68 装备套装星级和等级属性添加 2022-08-31 16:11:23 +08:00
liwei1dao
8e71ed1091 上传月之秘境代码优化 2022-08-31 14:29:17 +08:00
b37cbfbc48 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-31 13:34:24 +08:00
c934218f47 bugs 2022-08-31 13:34:06 +08:00
liwei1dao
3222c9fc4e 上传配置文件加载修复 2022-08-31 11:09:58 +08:00
liwei1dao
058712919b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-31 11:06:39 +08:00
liwei1dao
efa4bc698b 上传随机任务埋点 2022-08-31 11:03:32 +08:00
562498ac25 全局drop配置文件调用 2022-08-31 11:02:11 +08:00
8f08ad88b9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-31 09:47:49 +08:00
82b83161ef 铁匠铺去掉数量为0 的订单 2022-08-31 09:46:11 +08:00
liwei1dao
54e737fafe 随机任务埋点 2022-08-30 18:56:14 +08:00
liwei1dao
df08889bb8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 18:03:35 +08:00
liwei1dao
9611f22a2c 修复随机任务接口代码 2022-08-30 18:03:32 +08:00
e7f1af0c2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-30 17:58:47 +08:00
bf07eaaa89 狩猎相关 2022-08-30 17:58:24 +08:00
liwei1dao
0f02d1b280 上传随机任务接口以及底层对象支持 2022-08-30 17:57:32 +08:00
1315707ce4 铁匠铺bug 2022-08-30 17:14:35 +08:00
liwei1dao
8645ecfa17 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-30 15:15:00 +08:00
liwei1dao
9bd7cdf62a 上传月之秘境相关代码 2022-08-30 15:14:10 +08:00
d8477d7ce7 记录铁匠铺正在做订单开始时间 2022-08-30 14:39:29 +08:00
liwei1dao
8fd90c6c37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 13:46:28 +08:00
liwei1dao
e94540662b 上传月之秘境模块 2022-08-30 13:46:25 +08:00
2188bb269a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 12:02:14 +08:00
93357d6eeb 更新随机任务枚举 2022-08-30 12:02:06 +08:00
8490699f6d drop接口修改 支持多参数 2022-08-30 11:34:15 +08:00
a875f850ba 模块注册 2022-08-29 19:09:35 +08:00
1d7d54f745 update 2022-08-29 18:48:31 +08:00
f99145deac update 2022-08-29 18:47:00 +08:00
38de051978 维京 购买 排行 功能自测 2022-08-29 18:26:17 +08:00
fe868ea764 Merge branches 'meixiongfeng' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-29 11:47:00 +08:00
liwei1dao
d94e4a4460 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-29 09:29:27 +08:00
liwei1dao
9831c451c4 上传装备补充需求 装备锁定以及装备出售接口 2022-08-29 09:29:21 +08:00
2feb69cb6f viking 2022-08-26 19:03:14 +08:00
liwei
689ba47749 上传武馆需求优化 2022-08-26 17:53:34 +08:00
6200efd55b update 2022-08-26 17:38:29 +08:00
d3bd8b5de0 update 2022-08-26 17:33:41 +08:00
e20dd5d33c 更新配置 2022-08-26 17:11:24 +08:00
2a1f9ce395 viking 2022-08-26 17:04:27 +08:00
ae6ffabe3b Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-26 15:46:36 +08:00
b16cc0ce5c bug 2022-08-26 15:46:18 +08:00
liwei1dao
2b7f9e4a9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-26 15:43:09 +08:00
liwei1dao
6c04e4ad8c 上传页面调试工具集成到web服务下 2022-08-26 15:42:59 +08:00
3b50014bc4 update gui 2022-08-25 19:22:51 +08:00
7f2f36c544 铁匠铺bug + viking 2022-08-25 19:04:42 +08:00
749faa1b65 update json 2022-08-25 16:30:07 +08:00
liwei1dao
24885902af 修复配置中心 启动接口被多次执行的bug 2022-08-25 11:15:43 +08:00
liwei1dao
b5c5636fb6 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-25 10:57:21 +08:00
liwei1dao
e9cbc55192 上传 2022-08-25 10:56:09 +08:00
liwei
ee365ff313 上传武馆接口参数校验 2022-08-25 09:51:50 +08:00
liwei1dao
4c203aa3b2 上传武馆升级概率机制 2022-08-25 09:48:32 +08:00
9ef0b28252 配置表更新 2022-08-24 20:01:21 +08:00
4e75419f38 通过uid创建索引 2022-08-24 19:09:05 +08:00
43ff5abd83 美食馆获取一些其他玩家信息 2022-08-24 18:13:43 +08:00
959a155424 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 17:58:13 +08:00
8aed7bc49b 删除排行榜数据接口 2022-08-24 17:57:53 +08:00
liwei1dao
3cf5f9bb3c 添加武馆练功状态添加 2022-08-24 17:44:43 +08:00
liwei1dao
5ec1af1f54 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 17:42:31 +08:00
liwei1dao
b809e50bb6 上传武馆领取奖励后 状态修改 2022-08-24 17:42:25 +08:00
823b585ede get rank 2022-08-24 17:10:38 +08:00
3edbb71e97 update config 2022-08-24 16:52:42 +08:00
8d6a271d6c 排行榜 2022-08-24 16:48:49 +08:00
liwei1dao
9f4740d418 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 09:53:50 +08:00
liwei1dao
23176056ac 上传定时模块 2022-08-24 09:53:43 +08:00
cf19393862 更新随机任务 2022-08-24 09:43:49 +08:00
liwei
0aa9bc9f66 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 09:36:41 +08:00
9c8a484094 日志输出毫秒 2022-08-24 09:36:04 +08:00
liwei
780e254c4e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-24 09:35:54 +08:00
liwei
3021ae4d93 上传武馆的英雄校验 2022-08-24 09:35:11 +08:00
liwei1dao
2949f8880f 添加db系统过期机制 2022-08-23 18:42:59 +08:00
6bbdda1924 更新错误码 2022-08-23 16:45:51 +08:00
b7bb3ab4dc 更新任务 2022-08-23 16:45:13 +08:00
liwei
a0b542b20d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-23 14:57:13 +08:00
liwei
58d4143827 修复武馆协议学历恶化异常错误 2022-08-23 14:57:05 +08:00
b1932382bf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-23 14:55:48 +08:00
6b0077e883 铁匠铺bug 2022-08-23 14:55:32 +08:00
liwei1dao
7da333d4a4 上传武馆柱子解锁限制 2022-08-23 14:01:38 +08:00
liwei1dao
e88401e98d 修复武馆配置文件表名变动 2022-08-23 11:24:07 +08:00
be67f409c4 桌台技能升级 重计算订单消耗时间 2022-08-23 10:55:21 +08:00
870b59d260 添加限定条件-剧情ID 2022-08-22 18:44:38 +08:00
288e899d39 更新随机任务限定条件 2022-08-22 18:41:40 +08:00
6ff804b692 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-22 17:33:39 +08:00
141113f7cf 查询章节ID接口 2022-08-22 17:33:35 +08:00
liwei1dao
b63eabb605 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-22 16:30:54 +08:00
liwei1dao
8d0652643f 上传评论与武馆的协议标题问题 2022-08-22 16:30:46 +08:00
6840a0c890 更新随机任务协议 2022-08-22 15:27:31 +08:00
fba3d2184c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-22 09:44:32 +08:00
2dcb9eab44 报错修改 2022-08-19 20:04:21 +08:00
3e479c2321 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-19 19:16:40 +08:00
21dabd2f98 修改任务类型 2022-08-19 18:33:21 +08:00
52cebd0430 铁匠铺 2022-08-19 18:19:43 +08:00
42673f6bbe 更新配置 2022-08-19 18:13:13 +08:00
781466ba57 更新助战协议 2022-08-19 15:31:13 +08:00
7bb58fa2ff 更新好友助战 2022-08-19 15:23:07 +08:00
509043d8d4 update 2022-08-19 15:23:07 +08:00
f05347cc2f 优化全局配置 2022-08-19 12:06:48 +08:00
0f35317220 推送取消练功状态 2022-08-19 10:21:54 +08:00
e047f4a883 英雄练功接口 2022-08-19 10:17:50 +08:00
5dabbeca17 更新gui存储 2022-08-18 21:04:57 +08:00
1dfd64da0c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 20:45:19 +08:00
7880b80fdd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 20:09:29 +08:00
d45f5fdc8a 更新点赞 2022-08-18 20:09:22 +08:00
liwei1dao
052822208e 上传武馆代码 2022-08-18 19:57:14 +08:00
liwei1dao
f73ca86f97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 19:55:57 +08:00
liwei1dao
3ea3ca84e4 上传武馆代码 2022-08-18 19:55:52 +08:00
0c2b4fcd1c 一些bug 2022-08-18 19:34:22 +08:00
4de5172db3 更新配置 2022-08-18 18:52:22 +08:00
fd96c61556 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 18:25:11 +08:00
3c3b0743bb 爬塔测试 2022-08-18 18:23:40 +08:00
liwei
0f5b8d6986 上传评论点赞接口优化 2022-08-18 17:55:10 +08:00
121e7c94d2 更新协议 2022-08-18 17:10:02 +08:00
liwei1dao
e17d949942 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 17:07:10 +08:00
liwei1dao
397f959184 上传武馆优化 2022-08-18 17:07:04 +08:00
87fb35d43c 赛季塔 2022-08-18 16:56:21 +08:00
8c8e785517 更改协议名称 2022-08-18 16:04:22 +08:00
7a06050a7c 更新下线时间 2022-08-18 15:46:05 +08:00
f1f8b2cfd0 美食馆领取奖励 2022-08-18 15:29:55 +08:00
faa70b6921 爆红 2022-08-18 15:17:00 +08:00
1ea4663391 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-18 15:11:33 +08:00
aaeb434528 订单跨天情况 2022-08-18 15:11:20 +08:00
liwei1dao
126ddb9681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 15:10:06 +08:00
liwei1dao
cb7fff3445 同步配置文件命令修改 2022-08-18 15:09:34 +08:00
fad4d1744b 更新好友列表数据状态 2022-08-18 14:43:00 +08:00
b3a2f3719e 更新字段 2022-08-18 12:06:42 +08:00
aa8914c14e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:36:22 +08:00
0e2db951be Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:36:10 +08:00
117019a57d 随机掉落逻辑 2022-08-18 11:35:47 +08:00
liwei
e3d177e476 修复空对象异常错误 2022-08-18 11:34:56 +08:00
liwei
34bc631c9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:33:21 +08:00
51d0f01383 更新在线好友搜索 2022-08-18 11:32:33 +08:00
85c0fc0b72 更新本服在线用户 2022-08-18 11:32:33 +08:00
liwei
0af3ef8c60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:05:41 +08:00
liwei1dao
6d844a192f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:05:32 +08:00
liwei1dao
d56453ebb2 移除socket 过期代码,后面加心跳机制后再补上去 2022-08-18 11:05:25 +08:00
5da57b76ec update 2022-08-18 10:46:13 +08:00
eda8d58118 update 2022-08-18 10:46:13 +08:00
liwei
714b2369e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 10:33:55 +08:00
liwei1dao
58e8c9002d 上传socket 读取超时设置 2022-08-18 10:32:47 +08:00
liwei1dao
ad390040d7 广播消息不发送未登录用户修复 2022-08-18 10:28:31 +08:00
liwei
1e8873c096 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 10:03:17 +08:00
bad7c44903 更新配置 2022-08-18 10:01:04 +08:00
liwei1dao
98f149b3ee 上传聊天成功返回 2022-08-18 09:52:18 +08:00
e3a3f3396b 更新配置 2022-08-18 09:46:37 +08:00
6c258e903b 好友搜索 2022-08-18 09:31:24 +08:00
d735a6bb15 随机任务 2022-08-18 09:31:21 +08:00
48270ee931 刪除不用的文件 2022-08-17 19:09:53 +08:00
b0db5645ea 丛林美食馆 2022-08-17 18:57:15 +08:00
liwei
5dc57b66c8 上传装备配置表穿戴错误问题 2022-08-17 17:20:59 +08:00
liwei
fe69c0bfbe 装备升级配置表异常保护处理 2022-08-17 17:15:57 +08:00
4402d62a42 升到满级还想继续升级的bug 2022-08-17 15:18:59 +08:00
1b55e1fadb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-17 14:56:35 +08:00
d853b31603 美食家 2022-08-17 14:55:22 +08:00
liwei1dao
94db272d64 上传武馆解锁接口 2022-08-17 10:38:23 +08:00
liwei1dao
5452d8a93c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-17 09:55:00 +08:00
liwei1dao
ba0169ab47 上传转呗强化扣款逻辑修复 2022-08-17 09:54:41 +08:00
2dcebd44c4 发奖励 2022-08-17 09:53:03 +08:00
liwei1dao
a317fca98c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-17 09:37:58 +08:00
fc788396dc 美食家 2022-08-16 18:53:15 +08:00
8b7822b836 抽卡推送获取英雄数据
美食家代码
2022-08-16 16:24:04 +08:00
61c9f00eaa 抽卡推送获取卡信息
美食家
2022-08-16 16:22:35 +08:00
4434f27e4c 模块名修改 2022-08-16 15:05:12 +08:00
6dc481f07d 给英雄加经验接口 2022-08-16 15:02:44 +08:00
96c421265d 领取奖励 2022-08-16 14:44:05 +08:00
liwei1dao
030eb04f44 上传武馆代码 2022-08-16 14:24:57 +08:00
302e85dc59 爬塔数据保存bug 2022-08-16 14:15:43 +08:00
3fdd7fe115 配置文件修改 2022-08-16 13:37:56 +08:00
3eb6773160 美食馆 2022-08-16 11:05:46 +08:00
6368eee720 获取数据断线问题 2022-08-16 10:48:58 +08:00
123132b175 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-16 10:31:41 +08:00
42ee59ff2f 爬塔db 错误 2022-08-16 10:30:03 +08:00
liwei1dao
32086143e7 上传熊猫武馆代码 2022-08-16 10:10:20 +08:00
eefc249ba3 update list 2022-08-15 18:35:28 +08:00
9a040f7b94 json 上传 2022-08-15 18:25:47 +08:00
afc2468ef6 配置修改 2022-08-15 17:37:56 +08:00
bc9fdabfc3 抽卡协议修改 2022-08-15 17:11:45 +08:00
liwei1dao
e845ed0adc 上传武馆模块代码 2022-08-15 16:35:18 +08:00
liwei
8f80f08d5f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-15 14:40:41 +08:00
liwei
7e9ca63928 上传道具使用的bug 2022-08-15 14:39:24 +08:00
1484b92816 抽卡 2022-08-15 13:00:58 +08:00
liwei1dao
d8284654d7 上传道具使用 2022-08-12 18:59:38 +08:00
liwei1dao
c9f67d7414 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-12 18:55:18 +08:00
liwei1dao
bcd9916491 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-12 18:53:51 +08:00
d7fbfe3dd6 配置表更新 2022-08-12 18:53:51 +08:00
liwei1dao
cecd70bfa9 修复道具使用的问题 2022-08-12 18:30:22 +08:00
24fb25692f 共鸣属性分配BUG 2022-08-12 10:43:49 +08:00
d61274b14f 共鸣协议 修改 支持多参数 2022-08-11 20:58:40 +08:00
02148af676 共鸣bug 2022-08-11 20:20:08 +08:00
0e0c88c29a 创建单个英雄接口调整 2022-08-11 19:45:16 +08:00
80a8fb20c5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 18:09:39 +08:00
601019c9b1 共鸣能量分配属性类型修改 2022-08-11 18:09:20 +08:00
206fa0f9bb 添加测试接口 2022-08-11 18:07:12 +08:00
liwei1dao
8c158797c6 修复db层代码接口错误 2022-08-11 18:05:21 +08:00
liwei1dao
c834ab0d9a 上传道具合成处理以及掉落组表二次处理 2022-08-11 18:00:42 +08:00
a8a42d97c1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 17:10:57 +08:00
6ee83fa224 配置表重定义key 并支持热更 2022-08-11 17:10:33 +08:00
liwei1dao
d8e5f48caa 优化聊天私聊不推送自己的问题 2022-08-11 16:20:28 +08:00
liwei1dao
63c2aa8b7f 上传评论问题 2022-08-11 15:53:11 +08:00
liwei1dao
a515c59e21 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 12:02:18 +08:00
liwei1dao
9ade1bb5a5 修复聊天系统消息群发机制 2022-08-11 12:02:13 +08:00
e289290571 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 11:37:22 +08:00
161f8a4c20 技能升级配置表结构变化 对应读取程序修改 2022-08-11 11:37:03 +08:00
liwei1dao
377026b7ab 聊天业务bug修复 2022-08-11 10:41:43 +08:00
liwei1dao
36d3f893c8 上传聊天业务代码优化 2022-08-11 10:40:54 +08:00
liwei1dao
fe159fb96e 上传日志输出规范调整 2022-08-11 09:59:25 +08:00
55127dc69b 更新推送监听 2022-08-10 19:31:21 +08:00
646cabda56 更新点赞 2022-08-10 19:31:21 +08:00
liwei1dao
fcc53d71c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 19:28:57 +08:00
liwei1dao
18edbbad87 上传武器添加数据库报错问题,以及日志堆栈信息调整 2022-08-10 19:28:53 +08:00
2f96ac75b7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 18:48:51 +08:00
88afd36d50 爬塔发奖 2022-08-10 18:48:30 +08:00
liwei1dao
ccbac50506 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-10 18:43:03 +08:00
liwei1dao
0712c670fe 优化rpcx系统握手连接机制,避免重复连接情况,优化日志系统,错误日志自动输出错误文件以及行号 2022-08-10 18:42:06 +08:00
e7b9aabd08 爬塔相关 2022-08-10 16:55:54 +08:00
b20759142d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 15:25:14 +08:00
1670917a59 用户扩展数据图鉴数据保存 2022-08-10 15:24:47 +08:00
000219e54b 解决冲突 2022-08-10 15:17:49 +08:00
liwei1dao
3132135e6f 上传论坛模块测试优化以及编解码系统修复 2022-08-10 14:46:34 +08:00
liwei1dao
676770156e 上传装备添加的bug 2022-08-10 13:40:30 +08:00
liwei1dao
c03ba65bf6 上传论坛模块 2022-08-10 13:38:11 +08:00
liwei1dao
1785037abb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-09 18:39:26 +08:00
liwei1dao
81f0247969 上传数据层代码优化 2022-08-09 18:39:21 +08:00
b457b06bc9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-09 18:09:38 +08:00
e69db22bf1 优化+爬塔 2022-08-09 18:09:14 +08:00
zhaocy
4338450e0f update gui 2022-08-09 18:03:02 +08:00
liwei1dao
5e2a9fdf45 升级db系统 维护多数据节点连接实例 2022-08-09 13:35:23 +08:00
de510f42ac 同步dev 增加英雄的共鸣附加属性 2022-08-09 11:29:05 +08:00
liwei1dao
fb419359d0 上传编码指针代码内存重叠问题 2022-08-08 19:44:52 +08:00
liwei1dao
76011b4405 上传新的日志系统以及编解码系统升级 2022-08-08 14:05:40 +08:00
liwei1dao
35d0080275 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-08 09:25:09 +08:00
liwei1dao
43ec7f57cf 上传日志系统以及redis库接口升级 2022-08-08 09:25:02 +08:00
c70465f741 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-05 16:49:45 +08:00
3f2cb94f1e 一键领取推送 2022-08-05 16:48:16 +08:00
liwei1dao
b4ac656754 上传道具出售价格叠加bug 2022-08-05 16:15:59 +08:00
299a430127 整理优化 2022-08-03 17:53:32 +08:00
5277ca09cf 技能升级 请求参数支持一次消耗多个技能卡 2022-08-03 14:05:06 +08:00
e54b34c550 bug 2022-08-03 10:45:42 +08:00
49a42793c6 配置表更新 2022-08-03 10:29:27 +08:00
f327295b52 去掉newhero 解析 使用hero配表 2022-08-03 10:02:51 +08:00
796ec966dd 登录推送服务器时间戳 2022-08-03 09:33:02 +08:00
ba619a1c08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-02 12:05:18 +08:00
4b150256d0 资源发放消耗批量处理,接口返回值统一 2022-08-02 12:05:00 +08:00
liwei1dao
50c50a4490 上传背包格子使用 完毕 清理的问题 2022-08-02 09:46:05 +08:00
liwei1dao
79d8cf4e31 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 19:28:22 +08:00
liwei1dao
f3d9577674 上传英雄合成代码 2022-08-01 19:28:11 +08:00
7bb39c45e2 一次创建多个英雄接口 2022-08-01 19:01:41 +08:00
2d7ee15f07 Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 18:40:11 +08:00
80ff9fffc7 一键领取 2022-08-01 18:39:44 +08:00
liwei1dao
2a435e6833 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 18:23:46 +08:00
liwei1dao
d14eea92de 优化道具使用 2022-08-01 18:23:32 +08:00
b6f1fe1c02 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 18:11:36 +08:00
1445c7629e bug 2022-08-01 18:11:08 +08:00
liwei1dao
c1c5481f44 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 17:41:43 +08:00
liwei1dao
74aad51512 上传道具使用修改 2022-08-01 17:41:29 +08:00
1d942d918f Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 17:11:05 +08:00
5fb205395e 配置表更新 2022-08-01 17:10:39 +08:00
zhaocy
38ebd454d0 update 2022-08-01 16:16:02 +08:00
880d0f0fcb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 15:58:51 +08:00
2c0bb0087e 加一些日志 2022-08-01 15:58:29 +08:00
zhaocy
7681be0aba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	modules/task/api_receive.go
2022-08-01 15:23:56 +08:00
zhaocy
739d2324f3 update 2022-08-01 15:21:40 +08:00
335de3109a 记录扩展数据 2022-08-01 15:14:13 +08:00
fb40ce3f19 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 15:02:34 +08:00
9a0666f828 更新代码,修改一些错误命名 2022-08-01 15:02:14 +08:00
zhaocy
fe90ea1ec4 update 2022-08-01 14:49:26 +08:00
zhaocy
c2bd05cac8 update 2022-08-01 14:27:33 +08:00
zhaocy
48306f8119 update 2022-08-01 14:14:34 +08:00
b65e44ee95 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 13:54:38 +08:00
91f56e50b1 cmg 单元测试 2022-08-01 13:54:21 +08:00
liwei
50069fe7c2 升级武器模块类的日志输出 2022-08-01 12:10:13 +08:00
liwei
3e411d20ff 修复装备升级异常bug 2022-08-01 12:02:29 +08:00
liwei1dao
3fa1d9a74d 上传道具的使用逻辑补充 2022-08-01 11:39:42 +08:00
ff497dbb36 创建指定英雄错误码返回 2022-08-01 11:36:37 +08:00
57cbd8460a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 11:20:32 +08:00
1bb3d823e2 获得指定星级等级英雄数量赋值 2022-08-01 11:20:15 +08:00
zhaocy
eade84e7cf 用户签名 2022-08-01 11:13:44 +08:00
zhaocy
e0d3cbe429 签名协议 2022-08-01 11:11:27 +08:00
303a6969b7 获取指定星级等级英雄 接口参数调整 2022-08-01 10:42:20 +08:00
1e7dc159e4 客户端GM控制台发送指令解析并发放资源 2022-08-01 10:25:42 +08:00
7af40d1031 update 2022-07-29 16:36:59 +08:00
286e0e4e52 堆叠数量 2022-07-29 16:23:24 +08:00
liwei1dao
8d9708ccc4 上传道具最后操作时间 2022-07-29 10:33:26 +08:00
liwei1dao
24efd14c67 上传道具背包new标签处理 2022-07-29 10:31:01 +08:00
liwei1dao
d1dee6e1db 上传武器穿戴错误码细分 2022-07-29 09:26:00 +08:00
liwei1dao
277aa4ce82 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 21:23:21 +08:00
liwei1dao
052f3479a6 修改物品出售的消息推送处理 2022-07-28 21:23:17 +08:00
a857a5ab63 1.GM 后台发送邮件, 特殊英雄等信息2. 配置表同步 2022-07-28 18:18:57 +08:00
liwei1dao
02752df2cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 18:11:46 +08:00
liwei1dao
3df44c2554 道具创建时读取过期时间 2022-07-28 18:11:42 +08:00
f85674bcd0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 15:01:13 +08:00
dd21220b46 hp属性计算问题,玩家外围属性 2022-07-28 15:00:50 +08:00
liwei1dao
8cee759b62 上传日志 2022-07-28 14:30:14 +08:00
zhaocy
47a28e7589 细化错误码 2022-07-28 11:59:43 +08:00
zhaocy
9e3ade03ed 重置玩家活跃度 2022-07-28 11:58:47 +08:00
liwei1dao
2b4e932c6e 补充密钥无效的错误日志 2022-07-28 11:33:01 +08:00
liwei1dao
394dfde6b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 10:59:51 +08:00
liwei1dao
5cb32b352e 上传商店批量购买处理 2022-07-28 10:59:47 +08:00
f4c0ecea3a 优化 2022-07-27 20:39:01 +08:00
zhaocy
2a06c90585 配置空判断 2022-07-27 14:28:01 +08:00
liwei1dao
e36e16ae92 gm 2022-07-27 14:16:21 +08:00
liwei1dao
1e4244a8b4 上传商店bug修复 2022-07-27 10:57:47 +08:00
599aa44c6f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 23:15:19 +08:00
6953df5cd2 属性优化 2022-07-26 23:14:52 +08:00
zhaocy
b4b32c4f5d 活跃度变更修改 2022-07-26 23:10:31 +08:00
zhaocy
49fc4d1d50 更新配置 2022-07-26 22:05:15 +08:00
liwei1dao
cb71088ab2 修复物品新标识为处理问题 2022-07-26 20:17:47 +08:00
liwei1dao
398783c256 上传item 写入mgo日志异常bug修复 2022-07-26 20:12:32 +08:00
liwei1dao
158a66407c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 19:53:44 +08:00
liwei1dao
99388bf759 上传mgo 日志 异常 检测 2022-07-26 19:53:40 +08:00
6473ad595b 共鸣属性计算 2022-07-26 19:29:12 +08:00
zhaocy
fa2a7d0489 update errcode 2022-07-26 18:20:14 +08:00
b640d088b8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 17:08:08 +08:00
9e2fd1fbb7 玩家离线清理玩家缓存数据 2022-07-26 17:07:44 +08:00
zhaocy
ea86522c75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 16:53:00 +08:00
zhaocy
d17ad438d4 清空缓存 2022-07-26 16:52:53 +08:00
liwei1dao
6036aefa5b 上传聊天数据读取的 2022-07-26 15:57:30 +08:00
liwei1dao
9706fc4847 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 15:14:41 +08:00
liwei1dao
9f4e3edac8 上传lua 集群处理 2022-07-26 15:14:37 +08:00
d9203fae7d 加日志 2022-07-26 15:05:29 +08:00
35b47d8491 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 13:58:13 +08:00
0e38efe9d3 离线事件监听。离线清除玩家缓存信息 2022-07-26 13:57:54 +08:00
liwei1dao
fc27cf0d09 上传shop 协议补充 2022-07-26 13:40:35 +08:00
liwei1dao
c5b5cb452c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 11:36:27 +08:00
liwei1dao
969be76600 上传shop 模块剩余次数返回 2022-07-26 11:36:07 +08:00
5608c5824b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-26 10:26:31 +08:00
3c93c6a3d0 添加测试文件 2022-07-26 10:26:15 +08:00
liwei1dao
ca68b3f9e9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-26 10:21:09 +08:00
f5a202bfea Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 09:40:17 +08:00
5e0e0391e3 抽卡 2022-07-26 09:39:40 +08:00
zhaocy
8978d1f372 更新任务列表bug 2022-07-26 09:30:46 +08:00
zhaocy
e65167a016 更新成就 2022-07-25 22:01:00 +08:00
zhaocy
5a9a34816f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 21:54:30 +08:00
zhaocy
4d5cedc949 修改成就任务 2022-07-25 21:52:14 +08:00
650ac5fd4f 英雄对象返回 2022-07-25 21:28:59 +08:00
5947d5dfd5 推送英雄变更数据 2022-07-25 21:09:25 +08:00
f3fb53e13c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 18:44:43 +08:00
cd77830576 克隆数据清理装备数据 2022-07-25 18:44:10 +08:00
zhaocy
c8f8f19bd1 更新捏人 2022-07-25 18:40:01 +08:00
zhaocy
b1e30b250b 形象配置 2022-07-25 18:40:01 +08:00
zhaocy
4b2873db8e 等级推送 2022-07-25 18:40:01 +08:00
zhaocy
ef6f6efa69 玩家等级优化 2022-07-25 18:40:00 +08:00
liwei1dao
88ae9d1694 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 18:39:55 +08:00
e06b0d8d31 属性计算优化 2022-07-25 18:39:12 +08:00
liwei1dao
61ef1a3ce2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 18:14:28 +08:00
10fb331b52 克隆英雄对象 2022-07-25 18:13:27 +08:00
liwei1dao
53076796e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 17:36:34 +08:00
97beb8c48d 数据结构调整 2022-07-25 17:35:06 +08:00
liwei1dao
13ef34b170 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 16:41:04 +08:00
liwei1dao
65dc3ece12 上传gm 模块 2022-07-25 16:40:20 +08:00
liwei1dao
4e1db72bce 修改gm模块为web模块 2022-07-25 16:35:35 +08:00
7d3628f6dc 报错修改 2022-07-25 16:23:29 +08:00
1c577a821f 抽卡活动 2022-07-25 16:18:35 +08:00
liwei1dao
4573ab8a64 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 16:10:35 +08:00
liwei1dao
ffde5decbe 上传创角回应修改 2022-07-25 16:10:09 +08:00
09572897b6 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 15:55:56 +08:00
05cd8a2d5c 优化接口 返回指针对象 2022-07-25 15:55:33 +08:00
liwei1dao
3be9f754ba 修改商店模块购买次数共享bug 2022-07-25 15:41:58 +08:00
c7d8bc15dc 资源id 由原来的int 转string 2022-07-25 14:41:44 +08:00
720aca33dc 英雄堆叠数量优化 2022-07-25 12:00:06 +08:00
liwei1dao
e2a480b1c4 上传代码 2022-07-23 16:27:08 +08:00
6f61a5102a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 01:40:28 +08:00
4335663fbc 英雄优化 2022-07-23 01:40:20 +08:00
liwei1dao
6442e4aff2 修改物品使用的消息推送机制 2022-07-23 01:00:57 +08:00
liwei
1f97b9f5be Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 00:30:49 +08:00
liwei
45ac29b18a 上传装备bug修复 2022-07-23 00:30:34 +08:00
c81e76b1d6 英雄叠加 2022-07-23 00:29:32 +08:00
251526932d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 00:19:10 +08:00
1bd6d9dfaf 堆叠数量bug 2022-07-23 00:18:46 +08:00
liwei1dao
3d3b3b8553 上传道具修改 2022-07-22 23:29:25 +08:00
liwei1dao
33dbbbdebf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 23:18:15 +08:00
liwei1dao
83d63a274a 上传物品购买返回空对象问题 2022-07-22 23:18:10 +08:00
zhaocy
ce60c619a8 更新任务进度 2022-07-22 23:16:02 +08:00
zhaocy
7a6a06614f 任务优化 2022-07-22 23:16:02 +08:00
02b2294af3 推送 2022-07-22 22:47:15 +08:00
82e8d0e608 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 22:14:46 +08:00
45c304c3d6 英雄变更推送打包 2022-07-22 22:14:21 +08:00
liwei
d520420919 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 22:06:16 +08:00
liwei
5755b8101a 上传物品叠加-1 的bug 2022-07-22 22:05:39 +08:00
1f6222e2bd 资源统一发放 有数据才推送 2022-07-22 22:04:32 +08:00
dc2ba18195 创角获取英雄的数据推送 2022-07-22 21:59:05 +08:00
liwei
49cffb0594 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 20:35:34 +08:00
liwei
58c51c3708 上传购买接口错误代码 2022-07-22 20:35:32 +08:00
liwei1dao
a2c64d9c8f 上传道具出售和使用代码 2022-07-22 20:33:25 +08:00
6397161f92 cominit 表名修改 2022-07-22 20:03:59 +08:00
liwei
5d21812274 上传商品购买扣费bug 2022-07-22 20:02:00 +08:00
liwei1dao
2686593ab0 上传道具背包使用 2022-07-22 19:36:47 +08:00
liwei1dao
991c40f416 上传道具使用配置 2022-07-22 19:35:59 +08:00
liwei1dao
46cdc69c14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 19:34:32 +08:00
liwei1dao
2bf8b2bf12 上传道具使用配置 2022-07-22 19:34:05 +08:00
zhaocy
374d9ce3c9 删除不用的接口 2022-07-22 19:21:06 +08:00
liwei
79024873d5 上传商店消耗代码 2022-07-22 19:10:37 +08:00
liwei
34307b6b72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 19:09:27 +08:00
liwei1dao
efc585f8e3 上传商店购买金币消耗异常问题 2022-07-22 19:09:16 +08:00
02fc1a4e2b 抽卡消耗 增加一些错误码 2022-07-22 19:08:52 +08:00
liwei
aee37daac5 上传道具使用和出售 2022-07-22 18:31:24 +08:00
zhaocy
544dd3b374 删除错误引用 2022-07-22 18:25:19 +08:00
zhaocy
4f32f23c0f 接口测试 2022-07-22 18:25:17 +08:00
zhaocy
a087b3f668 增加任务类型 2022-07-22 18:24:14 +08:00
liwei1dao
8a10729d97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 18:09:49 +08:00
744c0fa2b5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 18:09:17 +08:00
liwei1dao
5ab2a02575 上传道具使用集合出售 2022-07-22 18:09:07 +08:00
cc3452d881 离线通知dbservice 抽卡优化 2022-07-22 18:08:51 +08:00
liwei1dao
b9650a5ea6 上传gm接口代码 2022-07-22 17:05:28 +08:00
liwei1dao
77e141ec29 上传装备套装数据维护 2022-07-22 16:41:40 +08:00
liwei1dao
233f9f4367 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 16:37:08 +08:00
liwei1dao
6052a984b0 上传离线推送跨服集群 2022-07-22 16:36:50 +08:00
liwei1dao
999c7f3c41 上传用户离线通知日志服务器处理数据同步 2022-07-22 16:21:31 +08:00
liwei1dao
bf921ff420 上传武器装备异常日志 2022-07-22 16:10:24 +08:00
90675a76d7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:53:46 +08:00
36c74e2323 同步套装id信息 2022-07-22 15:53:40 +08:00
liwei1dao
9d3294f068 上传装备 一件多穿的bug 2022-07-22 15:53:18 +08:00
liwei1dao
ae13a7f85c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:18:03 +08:00
liwei1dao
9f6f4b5bc0 上传自动注册gm api 和武器接口优化 2022-07-22 15:17:49 +08:00
257e044e08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 14:29:36 +08:00
7326b8209d 获取图鉴信息 2022-07-22 14:29:15 +08:00
liwei1dao
3c5c9d4c55 上传商店最后售价 2022-07-22 13:58:50 +08:00
8050f7a77d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:56:42 +08:00
0ca4bc689a 升级后等级差值穿给任务模块 2022-07-22 11:56:16 +08:00
liwei
2df1a12c58 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/gateway
	bin/mainte
	bin/start.sh
	bin/stop.sh
	bin/worker
2022-07-22 11:54:46 +08:00
zhaocy
893c3eec6e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:45:16 +08:00
zhaocy
865df37ac3 更新测试 2022-07-22 11:45:09 +08:00
52b0aeaf35 邮件优化 增加一些错误码 2022-07-22 11:31:15 +08:00
fc3420bfb8 附件领取用户校验 2022-07-22 10:50:07 +08:00
liwei
e4653a0112 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 20:48:33 +08:00
zhaocy
9989b8376f 修改用户初始 2022-07-21 20:34:10 +08:00
2250c07da4 创角获得道具按配置表数据填充 2022-07-21 20:23:04 +08:00
62000a8ef9 解决冲突 2022-07-21 19:56:40 +08:00
690f23f480 主线任务默认第一章节 2022-07-21 19:54:24 +08:00
b4281c9c84 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 19:47:14 +08:00
6ca39af90a 英雄升级任务统计 打印错误日志 2022-07-21 19:46:45 +08:00
zhaocy
3579db4eae 更新配置 2022-07-21 19:45:00 +08:00
zhaocy
3c439e2aa2 修改属性计算 2022-07-21 19:44:02 +08:00
zhaocy
2b59b99946 更改任务key 2022-07-21 19:44:01 +08:00
zhaocy
49ae24219c 任务完成推送 2022-07-21 19:43:57 +08:00
21e6225520 属性推送合并,增加一些错误码 2022-07-21 19:13:52 +08:00
liwei
3fcf0b4e09 修复codec编码工具错误代码 2022-07-21 18:23:19 +08:00
fe5fae9ca8 主线章节挑战完成后推送新的章节 2022-07-21 17:43:31 +08:00
liwei
00eec6c3c6 上传武器消息推送错误 2022-07-21 17:03:14 +08:00
448875978a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 16:05:06 +08:00
56a013a5c4 推送消息合并 2022-07-21 16:04:35 +08:00
liwei
86fe4f9bed 修复武器列表同步问题 2022-07-21 14:44:29 +08:00
liwei1dao
0b347d7f2e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 14:42:15 +08:00
liwei1dao
9d39dc141e 上传武器装备数据更新异常bug 2022-07-21 14:42:11 +08:00
3809abc381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 11:58:59 +08:00
a943ca337a 添加邮件测试功能,修复堆叠英雄bug 2022-07-21 11:58:54 +08:00
liwei1dao
253386266f 修复上传消息推送bug以及服务发现bug 2022-07-21 11:56:22 +08:00
liwei1dao
28d91331f5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-21 09:34:50 +08:00
d5de595b59 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-20 21:22:53 +08:00
595d83581f 报错处理,英雄变更消息推送 2022-07-20 21:22:35 +08:00
zhaocy
1204eb0212 用户数据初始化 2022-07-20 21:14:19 +08:00
liwei1dao
27a6f9d7f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 21:05:00 +08:00
liwei1dao
4bb0dc308a 上传聊天调试优化代码 2022-07-20 21:04:34 +08:00
fc38b7f4ca 抽卡保底逻辑 2022-07-20 20:59:06 +08:00
98575d23df Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-20 18:11:50 +08:00
1c2ea3d15f 抽卡保底相关逻辑 2022-07-20 18:10:27 +08:00
liwei1dao
9b4eb509f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 17:57:10 +08:00
liwei1dao
335aa7284b 上传聊天服务代码 2022-07-20 17:56:09 +08:00
zhaocy
3946216c04 用户设置 2022-07-20 17:44:15 +08:00
zhaocy
2333b055bb 装备叠卡修改 2022-07-20 17:42:45 +08:00
liwei1dao
5f83525eeb 上传代码修复 2022-07-20 14:19:30 +08:00
liwei1dao
560eda6b87 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 14:04:37 +08:00
liwei1dao
cdedf4414d 上传聊天系统业务开发 2022-07-20 14:01:59 +08:00
0099f3d01c 抽卡 2022-07-19 19:38:32 +08:00
liwei1dao
0031d7bfe8 上传聊天模块跨服成员聊天维护 2022-07-19 19:35:58 +08:00
13800c4273 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-19 18:38:47 +08:00
f8c111a669 加一些错误码,再加一些数据校验 2022-07-19 18:37:38 +08:00
liwei1dao
3eef4844c6 上传聊天系统以及底层通信扩展 2022-07-19 18:09:45 +08:00
zhaocy
19c7bfdb84 卡牌攻略 2022-07-19 16:23:18 +08:00
zhaocy
094c47885f 更新消卡逻辑 2022-07-19 14:36:00 +08:00
989cc98065 抽卡配置表解析, 推送协议大写改小写 2022-07-19 14:32:38 +08:00
23ea4597bc 消耗英雄推送消息 2022-07-19 13:48:48 +08:00
6e0a8c9a7d 接口参数uid 改session对象 2022-07-19 12:05:31 +08:00
c72a7edde2 属性推送subType 2022-07-19 11:03:06 +08:00
zhaocy
1251ec38a0 添加攻略类型 2022-07-19 10:49:03 +08:00
zhaocy
d49aae3ab7 修改英雄叠加逻辑 2022-07-19 10:49:03 +08:00
d8d9079065 协议修改 2022-07-19 10:37:45 +08:00
liwei1dao
9320b53f45 上传聊天模块以及底层消息广播接口 2022-07-18 18:37:06 +08:00
zhaocy
03e2337b36 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 17:10:34 +08:00
zhaocy
62703c4cde 叠加英雄处理 2022-07-18 17:10:29 +08:00
73b72596fb 所有添加资源的地方打印日志,方便定位问题 2022-07-18 17:09:12 +08:00
ac8e54f599 主线章节 字段变更 2022-07-18 16:51:26 +08:00
93df38efd2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 16:13:49 +08:00
c22b917747 配置表更新 2022-07-18 16:13:28 +08:00
zhaocy
76dfb1651f update 2022-07-18 15:30:28 +08:00
zhaocy
aa253f24ec 修改是否叠加的判断 2022-07-18 15:03:11 +08:00
62c05813e3 配置文件变更 2022-07-18 15:02:30 +08:00
0c338b2465 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 14:11:12 +08:00
dba9df09f2 添加测试协议 2022-07-18 14:10:48 +08:00
zhaocy
e82097fa14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 13:39:04 +08:00
zhaocy
a6d674cf1e 接口测试 2022-07-18 13:39:00 +08:00
liwei1dao
c9d1d5b655 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-18 11:14:33 +08:00
liwei1dao
938d4b47fc 上传商店折扣结算 2022-07-18 10:58:37 +08:00
8d7e6fca4e 道具不足详细日志 2022-07-18 10:40:40 +08:00
liwei1dao
fe776970a9 上传道具出售接口 2022-07-18 10:10:56 +08:00
liwei1dao
3db2d0dc46 上传hero_test 测试脚本 2022-07-18 09:28:59 +08:00
liwei1dao
928f2ccc11 修复codec 编码库json解析错误 2022-07-15 21:10:56 +08:00
liwei1dao
f8653cdd3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-15 20:08:19 +08:00
liwei1dao
9e699cc116 提交道具背包优化 2022-07-15 20:08:03 +08:00
59ed0e621a 英雄升级协议调整 2022-07-15 18:40:07 +08:00
3c1aad6c92 配置表数据同步 2022-07-15 17:44:57 +08:00
3ff97fd76d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-15 16:41:48 +08:00
fe034ea284 增加一些错误码 2022-07-15 16:41:20 +08:00
liwei1dao
840bc4c986 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-15 16:15:04 +08:00
liwei1dao
12b8a79432 上传redis 批量读写优化 2022-07-15 16:14:54 +08:00
liwei1dao
a2273fa1d1 优化redis 批量读写 2022-07-15 16:03:03 +08:00
1f036cc7a4 新增一些错误码 2022-07-15 15:20:46 +08:00
2d7405baea update 2022-07-15 13:42:08 +08:00
0d9b59a4c3 报错 2022-07-15 10:57:47 +08:00
zhaocy
c87bca9004 接口测试 2022-07-15 10:37:11 +08:00
zhaocy
3fccabd82b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-14 17:46:04 +08:00
zhaocy
8697a9fe10 优化测试报告 2022-07-14 17:45:55 +08:00
liwei1dao
025f80cd7c 上传修复 item 数据没有uid 字段错误 2022-07-14 16:08:12 +08:00
0a37601f1a 资源整合,所有变更资源主动推送给客户端 2022-07-14 15:53:08 +08:00
dd1ba19d30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-14 14:20:07 +08:00
76de1d7245 优化 2022-07-14 14:19:54 +08:00
liwei1dao
c413f3a99c 上传跨服调用远程消息处理 2022-07-14 11:43:37 +08:00
liwei1dao
5df960b247 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-14 09:35:32 +08:00
liwei1dao
6baa4d5197 上传武器资源更改消息推送 2022-07-13 19:30:50 +08:00
liwei1dao
2071a13416 上传资源更改消息推送 2022-07-13 19:30:09 +08:00
liwei1dao
522aa5e01f 上传公告系统后台接口 2022-07-13 18:59:04 +08:00
liwei1dao
f47005cc18 上传编解码优化 2022-07-13 18:20:27 +08:00
liwei1dao
51f729dcd6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:50:39 +08:00
liwei1dao
5036f6b2b0 上传API接口校验扫描 2022-07-13 16:50:35 +08:00
71bac26e10 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:31:14 +08:00
7c0ea7a0c9 统一接口处理日志 2022-07-13 16:30:39 +08:00
zhaocy
0b7f26bab3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:17:38 +08:00
zhaocy
fb3a2ce08a 支持测试接口连续调用 2022-07-13 16:17:33 +08:00
liwei1dao
1a96cde1c8 回复mgolog 目录 2022-07-13 16:15:10 +08:00
liwei1dao
710f28831e 上传日志优化 2022-07-13 16:12:56 +08:00
liwei1dao
c251a63adc 上传网关日志开关 2022-07-13 15:50:19 +08:00
liwei1dao
acbeae031c 伤处模块日志优化 2022-07-13 15:46:27 +08:00
liwei1dao
2bb353817e 上传日志优化代码 2022-07-13 15:06:48 +08:00
liwei1dao
0e7e6169a2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-13 15:06:19 +08:00
8b8595a7de 部分函数subType 修改 2022-07-13 14:32:01 +08:00
liwei1dao
3af54fdb14 上传gm模块补充 2022-07-13 14:14:26 +08:00
e40621b335 数据校验 2022-07-13 11:32:06 +08:00
liwei1dao
c6c2b5daae 开发系统公告 2022-07-13 11:25:37 +08:00
cfc9a018f0 去掉不需要的打印信息 2022-07-13 09:35:32 +08:00
liwei1dao
3e119d80df 上传底层编码库代码优化 2022-07-12 20:38:49 +08:00
2b49c1f082 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-12 17:17:16 +08:00
liwei1dao
fc28127008 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-12 17:17:14 +08:00
liwei1dao
89ee5478d2 上传底层反射优化代码 2022-07-12 17:13:59 +08:00
zhaocy
c046fe1b12 测试用例支持递归处理 2022-07-12 16:12:29 +08:00
liwei1dao
afecd0e065 上传编解码系统优化 2022-07-12 14:24:28 +08:00
1ef8ec4073 uid 创建索引 2022-07-12 11:06:07 +08:00
bd548b5ff5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-12 10:48:21 +08:00
a8d5b601b5 update 2022-07-12 10:47:49 +08:00
zhaocy
c1b506f25e 列表中初始属性 2022-07-12 10:34:06 +08:00
zhaocy
a564f3dcf5 deprecated method 2022-07-11 18:55:44 +08:00
zhaocy
549be3d0ba 修改消卡 2022-07-08 11:25:10 +08:00
zhaocy
83dd0f905f 更新配置 2022-07-07 19:22:11 +08:00
2b979efb5c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-07 17:53:37 +08:00
7cba00531a check 2022-07-07 17:52:44 +08:00
zhaocy
4762680af6 修改任务处理 2022-07-07 17:27:26 +08:00
zhaocy
e0522afbe8 修改check 2022-07-07 17:01:58 +08:00
447800b886 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-07 15:39:29 +08:00
c2a7ecee40 1.主线关卡优化 2.修改获取资源协议 2022-07-07 15:39:03 +08:00
zhaocy
5f7d75b6af 修改英雄详情 2022-07-07 15:07:06 +08:00
zhaocy
b6feed3aba 活跃度 2022-07-07 14:36:33 +08:00
de94573629 主线章节配置文件调整 逻辑优化 2022-07-07 11:43:40 +08:00
f5176f92b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-06 19:51:00 +08:00
d10027f37c 主线校验 2022-07-06 19:50:05 +08:00
zhaocy
dcd168a31b 任务模块 2022-07-06 19:46:06 +08:00
9178a5b900 主线章节 2022-07-06 15:37:34 +08:00
62eec8a69a 提供对外接口 用来修改主线关卡信息 2022-07-05 19:24:00 +08:00
469f2274c6 主线关卡 2022-07-05 18:47:01 +08:00
e071cf0d44 共鸣消耗配置修改 2022-07-05 15:34:55 +08:00
4588c8378c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-05 12:04:21 +08:00
42f6168644 优化 2022-07-05 12:03:56 +08:00
zhaocy
0e77e182f8 任务模块 2022-07-05 12:01:05 +08:00
liwei1dao
d841560c25 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-05 11:31:12 +08:00
liwei1dao
e8a1a1f51d 测试shop buy接口 2022-07-05 11:30:43 +08:00
liwei1dao
23976f7cd2 修复测试shop系统代码, 2022-07-05 11:08:20 +08:00
952557ffaf 邮件附件类型定义ATN 类型 并调用通用加道具接口 2022-07-05 11:06:25 +08:00
2e7050e6ee 升级消耗 2022-07-04 20:17:02 +08:00
e4ff953a13 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 19:24:51 +08:00
0234d141e7 消耗资源接口调用 2022-07-04 19:24:21 +08:00
liwei1dao
4a367661e7 上传用户资源类似数据结构 2022-07-04 19:22:45 +08:00
liwei1dao
ccfe0dfc02 上传商城api接口代码 2022-07-04 19:09:13 +08:00
liwei1dao
813568cb63 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 18:21:13 +08:00
liwei1dao
e0d825b2ae 上传网关会话管理优化 2022-07-04 18:21:09 +08:00
zhaocy
8e08ebf663 添加ip 2022-07-04 18:16:03 +08:00
zhaocy
622c4ef343 添加ip 2022-07-04 17:55:54 +08:00
zhaocy
2428fd27bb 服务列表接口 2022-07-04 17:48:54 +08:00
zhaocy
b5b3b11691 用户会话接口 2022-07-04 17:48:54 +08:00
30dadce861 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 17:35:37 +08:00
fe136f26ea 创建邮件接口 2022-07-04 17:15:01 +08:00
zhaocy
df746c0bc0 添加用户等级 2022-07-04 17:13:47 +08:00
5aefe22270 修复英雄共鸣bug 2022-07-04 17:05:29 +08:00
zhaocy
b5680788f4 改checklist手动调用 2022-07-04 14:56:06 +08:00
76dc1a3574 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 14:19:07 +08:00
4e1e05dc79 check 方法调用 2022-07-04 14:18:31 +08:00
liwei1dao
0ccbf30291 处理道具背包接口bug 2022-07-04 13:55:49 +08:00
liwei1dao
19f9759e63 上传武器的装配修复 2022-07-04 12:06:05 +08:00
5a3c7d08b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 11:44:43 +08:00
zhaocy
d3fc1d40e9 初始英雄技能 2022-07-04 11:43:27 +08:00
05c317072f 觉醒成功 修改技能保存玩家技能数据 2022-07-04 11:33:13 +08:00
zhaocy
491b7a271e 修复金币初始化 2022-07-04 11:23:06 +08:00
13648d9471 消耗英雄卡片 2022-07-04 10:59:57 +08:00
4a17e34518 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 10:50:02 +08:00
a1d04d68d6 属性变化计算 2022-07-04 10:49:23 +08:00
zhaocy
fcbf950fde 修改协议名 2022-07-04 10:40:59 +08:00
liwei1dao
d1ae2a1878 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-04 10:14:50 +08:00
zhaocy
0ae51dfa29 修改响应命名 2022-07-04 10:13:39 +08:00
liwei1dao
e765b72d4c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-04 09:43:13 +08:00
zhaocy
78ee56deda 修改属性key 2022-07-01 18:50:41 +08:00
40dfd55866 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 18:46:08 +08:00
69fe11a076 属性计算 2022-07-01 18:45:38 +08:00
liwei1dao
88957a495b 上传武器消息返回头信息修改 2022-07-01 18:18:52 +08:00
liwei1dao
47ea034812 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 18:16:31 +08:00
liwei1dao
906b096475 上传商店模块代码 2022-07-01 18:16:23 +08:00
zhaocy
47467267b5 修改全局配置 2022-07-01 16:30:57 +08:00
f016a11cd4 参数优化 2022-07-01 16:21:12 +08:00
ab0809dcf1 db service 2022-07-01 15:19:57 +08:00
bd6d48b33d module命名修改 2022-07-01 15:04:26 +08:00
82e8b97a0b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 15:01:39 +08:00
fac442d1c7 check 校验 模块名称修改 2022-07-01 15:00:51 +08:00
zhaocy
b08afb9bbd check修改 2022-07-01 14:51:11 +08:00
liwei1dao
93b6ad9e89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-01 14:40:20 +08:00
liwei1dao
a4185295d8 处理错误码附加信息为空情况 2022-07-01 14:19:56 +08:00
56307b8956 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 13:54:49 +08:00