Commit Graph

681 Commits

Author SHA1 Message Date
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
e204ae71a3 check 函数 2022-07-01 13:53:17 +08:00
liwei1dao
76377b5e28 处理网关模块依赖报错问题 2022-07-01 13:44:36 +08:00
liwei1dao
9d2623904f 配置组件改名 2022-07-01 13:38:51 +08:00
liwei1dao
3a22b20237 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-01 12:11:53 +08:00
liwei1dao
b9aaff762b 上传模块基础对象的通用依赖封装 2022-07-01 12:11:25 +08:00
653d5f2dbd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 12:00:29 +08:00
1d5f7800dd 调用简化 2022-07-01 11:59:57 +08:00
liwei1dao
2eb02b80fb 上传协议修改 2022-07-01 11:58:59 +08:00
zhaocy
0fe2ef2d62 副属性计算 2022-07-01 09:57:16 +08:00
zhaocy
7106ae27f4 装备属性计算 2022-06-30 20:21:02 +08:00
1bf7d2d64d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-30 20:17:43 +08:00
0e3470b5f4 参数校验 2022-06-30 20:16:55 +08:00
zhaocy
318198e924 修改属性累加 2022-06-30 20:16:18 +08:00
liwei1dao
a5508dcd47 上传梦工厂协议接口优化测试 2022-06-30 20:07:35 +08:00
liwei1dao
8b2628339a 优化数据模型脚本 2022-06-30 18:43:10 +08:00