Commit Graph

416 Commits

Author SHA1 Message Date
0e38efe9d3 离线事件监听。离线清除玩家缓存信息 2022-07-26 13:57:54 +08:00
liwei1dao
fc27cf0d09 上传shop 协议补充 2022-07-26 13:40:35 +08:00
liwei1dao
969be76600 上传shop 模块剩余次数返回 2022-07-26 11:36:07 +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
liwei1dao
a09167d66a 移除proto,采用svn 的proto 源处理 2022-07-26 10:19:56 +08:00
zhaocy
4d5cedc949 修改成就任务 2022-07-25 21:52:14 +08:00
zhaocy
b1e30b250b 形象配置 2022-07-25 18:40:01 +08:00
zhaocy
4b2873db8e 等级推送 2022-07-25 18:40:01 +08:00
liwei1dao
ffde5decbe 上传创角回应修改 2022-07-25 16:10:09 +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
liwei1dao
e2a480b1c4 上传代码 2022-07-23 16:27:08 +08:00
02fc1a4e2b 抽卡消耗 增加一些错误码 2022-07-22 19:08:52 +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
liwei1dao
5ab2a02575 上传道具使用集合出售 2022-07-22 18:09:07 +08:00
cc3452d881 离线通知dbservice 抽卡优化 2022-07-22 18:08:51 +08:00
36c74e2323 同步套装id信息 2022-07-22 15:53:40 +08:00
7326b8209d 获取图鉴信息 2022-07-22 14:29:15 +08:00
52b0aeaf35 邮件优化 增加一些错误码 2022-07-22 11:31:15 +08:00
zhaocy
3579db4eae 更新配置 2022-07-21 19:45:00 +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
fe5fae9ca8 主线章节挑战完成后推送新的章节 2022-07-21 17:43:31 +08:00
56a013a5c4 推送消息合并 2022-07-21 16:04:35 +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
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
zhaocy
18765f9e03 添加用户扩展字段 2022-07-20 18:02:37 +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
zhaocy
3946216c04 用户设置 2022-07-20 17:44:15 +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
ba3b102dd0 代码合并 2022-07-19 18:39:43 +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
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
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
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
aa253f24ec 修改是否叠加的判断 2022-07-18 15:03:11 +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
0fa2477f53 错误码 2022-07-18 13:46:11 +08:00
zhaocy
a6d674cf1e 接口测试 2022-07-18 13:39:00 +08:00
liwei1dao
fe776970a9 上传道具出售接口 2022-07-18 10:10:56 +08:00
59ed0e621a 英雄升级协议调整 2022-07-15 18:40:07 +08:00
3c1aad6c92 配置表数据同步 2022-07-15 17:44:57 +08:00
fe034ea284 增加一些错误码 2022-07-15 16:41:20 +08:00
1f036cc7a4 新增一些错误码 2022-07-15 15:20:46 +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
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
6baa4d5197 上传武器资源更改消息推送 2022-07-13 19:30:50 +08:00
liwei1dao
2071a13416 上传资源更改消息推送 2022-07-13 19:30:09 +08:00
liwei1dao
c6c2b5daae 开发系统公告 2022-07-13 11:25:37 +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
zhaocy
c046fe1b12 测试用例支持递归处理 2022-07-12 16:12:29 +08:00
liwei1dao
afecd0e065 上传编解码系统优化 2022-07-12 14:24:28 +08:00
a8d5b601b5 update 2022-07-12 10:47:49 +08:00
7cba00531a check 2022-07-07 17:52:44 +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
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
739b382f28 解决冲突 2022-07-06 19:47:17 +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
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
23976f7cd2 修复测试shop系统代码, 2022-07-05 11:08:20 +08:00
952557ffaf 邮件附件类型定义ATN 类型 并调用通用加道具接口 2022-07-05 11:06:25 +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
df746c0bc0 添加用户等级 2022-07-04 17:13:47 +08:00
zhaocy
b5680788f4 改checklist手动调用 2022-07-04 14:56:06 +08:00
zhaocy
fcbf950fde 修改协议名 2022-07-04 10:40:59 +08:00
zhaocy
0ae51dfa29 修改响应命名 2022-07-04 10:13:39 +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
906b096475 上传商店模块代码 2022-07-01 18:16:23 +08:00
liwei1dao
2eb02b80fb 上传协议修改 2022-07-01 11:58:59 +08:00
zhaocy
318198e924 修改属性累加 2022-06-30 20:16:18 +08:00
liwei1dao
a5508dcd47 上传梦工厂协议接口优化测试 2022-06-30 20:07:35 +08:00
liwei1dao
45478668fd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-30 18:41:47 +08:00
liwei1dao
04c1bb2aa8 上传道具模块优化 2022-06-30 18:41:00 +08:00
7e0cd3af74 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-30 18:11:24 +08:00
5d50f3b05a 英雄觉醒 2022-06-30 18:10:53 +08:00
zhaocy
9743f02396 用户资源接口 2022-06-30 17:46:13 +08:00
zhaocy
08d12b0f36 修复配置加载 2022-06-30 16:31:36 +08:00
liwei1dao
10dfa52f8c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-30 13:48:11 +08:00
liwei1dao
17ac51b676 上传pb 修改 2022-06-30 13:47:30 +08:00
zhaocy
bc5cf00841 修改抽卡 2022-06-30 10:55:52 +08:00
zhaocy
59304f4417 修改新用户逻辑 2022-06-29 19:54:55 +08:00
2146984966 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-29 18:07:42 +08:00
4406de02c4 数据校验 2022-06-29 18:06:44 +08:00
zhaocy
a2b4c91aff 属性推送 2022-06-29 17:59:05 +08:00
7378905273 proto.go文件上传 2022-06-29 17:49:09 +08:00
b3d92d2416 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-29 17:46:45 +08:00
2cb2b54cf8 共鸣 2022-06-29 17:43:48 +08:00
zhaocy
dea561817f 修复卡叠加逻辑 2022-06-29 17:15:31 +08:00
19f9409784 技能升级 2022-06-29 11:32:49 +08:00
zhaocy
19a1ef270f 更改pb命名 2022-06-29 11:24:18 +08:00
22559d61f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-29 10:39:52 +08:00
f5c6ab50cd 协议名称修改 2022-06-29 10:39:29 +08:00
zhaocy
cfc67b5bef 添加叠加字段 2022-06-29 10:27:59 +08:00
liwei1dao
84b50e8a21 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 20:18:08 +08:00
liwei1dao
c04fe355ba 上传协议命名优化 2022-06-28 20:17:48 +08:00
f5bce578c5 技能升级 2022-06-28 20:15:51 +08:00
zhaocy
a8f1b82ca1 增加套装id字段 2022-06-28 19:27:16 +08:00
6871a1a50b 报错修改 2022-06-28 19:17:25 +08:00
8e5c18f2a7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 19:15:28 +08:00
842c8e4e11 升星 2022-06-28 19:10:57 +08:00
zhaocy
9e986f40f3 proto重命名 2022-06-28 18:05:44 +08:00
liwei1dao
21f60f9d7e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 17:55:47 +08:00
zhaocy
55c6844301 pb重命名 2022-06-28 17:50:32 +08:00
liwei1dao
d152ec4cd4 优化worker会话对象管理 2022-06-28 17:46:04 +08:00
95f071b3bc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 17:13:42 +08:00
47a011fc4a update 2022-06-28 17:13:10 +08:00
liwei1dao
50bb5a92a8 上传会话对象消息队列优化 2022-06-28 17:09:32 +08:00
liwei1dao
6098f3edda 上传协议修改代码 2022-06-28 15:43:02 +08:00
liwei1dao
ce2f052465 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 15:03:40 +08:00
liwei1dao
b6a3ce955a 上传 变量接口命名规范 2022-06-28 14:51:58 +08:00
zhaocy
773736f089 初始化英雄 2022-06-28 12:03:14 +08:00
liwei1dao
35c5689bb5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-27 19:52:14 +08:00
liwei1dao
12c321c4b3 上传武器代码优化 2022-06-27 19:52:08 +08:00
18cf7796b6 配置文件生成文件 2022-06-27 19:24:16 +08:00
08de4af442 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng
# Conflicts:
#	modules/hero/configure_comp.go
#	modules/hero/module.go
#	pb/errorcode.pb.go
#	pb/hero_msg.pb.go
#	pb/proto/errorcode.proto
#	pb/proto/hero/hero_msg.proto
2022-06-27 19:19:44 +08:00
726dcccf88 英雄升级 2022-06-27 19:12:46 +08:00
zhaocy
3e019314c7 解决冲突 2022-06-27 19:08:54 +08:00
liwei1dao
4b5468aaeb 修改物品背包模块名 2022-06-27 17:47:18 +08:00
liwei1dao
4891d635d7 上传武器相关配置和接口重构 2022-06-27 17:45:02 +08:00
86105e9930 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-24 19:23:33 +08:00
e57e0677df 新增全局变量配置文件 2022-06-24 19:23:04 +08:00
liwei1dao
2584d994ce 上传装备升级业务逻辑代码 2022-06-24 17:22:49 +08:00
liwei1dao
cbc121ada6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-24 12:03:07 +08:00
liwei1dao
191d416405 上传装备协议代码优化 2022-06-24 12:02:42 +08:00
41989713a7 命名规范 协议接口定义 2022-06-24 11:22:27 +08:00
liwei1dao
b7e83a6371 上传英雄装备更新接口 2022-06-24 10:38:47 +08:00
liwei1dao
4ede7128c3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-24 10:12:28 +08:00
liwei1dao
c48ceefa17 上传武器背包api接口 2022-06-24 09:58:44 +08:00
zhaocy
9afc5ab67a 装备接口 2022-06-24 09:51:23 +08:00
13c97031d3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-23 18:14:45 +08:00
1f47bcf51d 接口相关 2022-06-23 18:04:40 +08:00
liwei1dao
f030bc6a04 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-23 18:03:34 +08:00
liwei1dao
d183100176 上传背包接口优化 2022-06-23 18:03:19 +08:00
6c870dd119 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-23 16:32:42 +08:00
2fa4600ad1 协议字段调整 2022-06-23 16:32:16 +08:00
6c9325201e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-23 16:15:28 +08:00
5a8f88f353 卡牌养成相关协议 2022-06-23 16:14:59 +08:00
liwei1dao
f589bf55cc 上传用户离线以及论坛模块 2022-06-23 15:03:47 +08:00
liwei1dao
2f7a6cb58c 上传错误码新增 2022-06-23 14:34:41 +08:00
liwei1dao
d2350fad0c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-23 14:32:30 +08:00
liwei1dao
6f0ebc4a93 上传equipment 模块代码 2022-06-23 14:32:13 +08:00
8e5090d112 小整型 2022-06-23 12:07:16 +08:00
5ac2fd6137 英雄 装备 数据结构 2022-06-22 19:28:34 +08:00
zhaocy
c864dd5432 重名uid 2022-06-21 14:02:36 +08:00
liwei1dao
f0df016e8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-21 13:53:10 +08:00
liwei1dao
f13f5da1c5 上传pb tag标签处理 2022-06-21 13:50:56 +08:00
liwei1dao
107ff99562 优化redis 以及model接口 2022-06-21 13:42:06 +08:00
zhaocy
6b5d3f93be 统一字段命名 2022-06-21 11:58:46 +08:00
7cf62a2056 日志接口查询 2022-06-21 11:08:06 +08:00
zhaocy
7de30d1a69 修改网关秘钥校验 2022-06-17 16:34:08 +08:00
zhaocy
ce3440d7f9 数据层接口测试 2022-06-17 13:51:43 +08:00
zhaocy
4da4c572e5 更新接口chk 2022-06-16 20:26:20 +08:00
zhaocy
67190818ae 数据层接口修改 2022-06-16 18:31:08 +08:00
c3ae56797a 上传协议规范格式 2022-06-16 16:17:40 +08:00
liwei1dao
58555cd808 上传协议规范格式 2022-06-16 16:05:39 +08:00
liwei1dao
7c09e141cd 用户执行连异常捕捉 推送客户端 2022-06-16 15:31:42 +08:00
zhaocy
ee5f7f899e 修改user接口 2022-06-16 15:21:34 +08:00
liwei1dao
d3dfc01011 优化api 校验接口返回参数设计 2022-06-16 14:53:28 +08:00