Commit Graph

177 Commits

Author SHA1 Message Date
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
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
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
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
liwei1dao
4bd57b56fd 上传统一错误码消息实现 2022-06-16 12:26:49 +08:00
liwei1dao
aea5c31b9e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-16 11:52:03 +08:00
liwei1dao
a646325524 上传redis 编解码库代码 2022-06-16 11:51:47 +08:00
zhaocy
3879ccf652 add check 2022-06-15 18:40:05 +08:00
zhaocy
c7278719ba 更新db接口调用 2022-06-15 17:36:09 +08:00
zhaocy
e387e9b8e5 更新user缓存结构 2022-06-15 14:09:41 +08:00
liwei1dao
0e7ce6a59a 上传底层代码修复 2022-06-13 19:23:51 +08:00
liwei1dao
e4345b394d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 12:37:10 +08:00
zhaocy
f73f0e407e 修改创角默认字段 2022-06-13 11:31:39 +08:00
liwei1dao
20ef5c5280 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 11:01:31 +08:00
liwei1dao
a1c923fbf8 暂存修改 2022-06-13 11:01:02 +08:00
zhaocy
4733acd291 更新user字段 2022-06-13 10:59:44 +08:00
zhaocy
04f807eb23 加入any.proto 2022-06-13 10:58:59 +08:00
liwei1dao
a309fe9a47 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 10:19:19 +08:00
zhaocy
cfd3cba23b 更新好友接口 2022-06-10 14:20:25 +08:00
zhaocy
2c2457f2ac proto替换Any 2022-06-10 14:20:05 +08:00
zhaocy
24bd4cec83 解决冲突 2022-06-09 19:27:26 +08:00
zhaocy
9277322537 测试好友接口2 2022-06-09 19:03:58 +08:00
zhaocy
43c75ecc5c 好友接口测试1 2022-06-09 18:45:50 +08:00
liwei1dao
8ca83cb6ab 上传背包相关接口优化 2022-06-09 15:15:52 +08:00
liwei1dao
152a8d859e 拆分api文件 2022-06-09 13:36:57 +08:00
liwei1dao
a837cbb62a 上传pb 目录结构优化 2022-06-09 12:40:52 +08:00
616198cf8e 编码规范 增加注释 2022-06-09 10:34:10 +08:00
zhaocy
f036c1a5e2 好友db测试 2022-06-08 18:00:58 +08:00
zhaocy
8252162014 更新好友db 2022-06-08 18:00:58 +08:00
liwei1dao
28c99a8893 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-07 20:22:47 +08:00
534677cb1f Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-07 20:10:11 +08:00
35a1353df5 邮件协议完善 2022-06-07 20:05:07 +08:00
liwei1dao
aa47570de9 上传测试代码 2022-06-07 19:50:08 +08:00
zhaocy
c5e99c6604 好友协议 2022-06-07 19:45:52 +08:00
zhaocy
1a4aa01d1e Merge branch 'f67' into dev
# Conflicts:
#	pb/mail.pb.go
#	pb/user_db.pb.go
2022-06-07 18:32:36 +08:00
zhaocy
8048801620 创角 2022-06-07 18:14:49 +08:00
1fda87e83d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-07 17:31:00 +08:00
f85141f6f8 邮件协议完善 2022-06-07 17:28:00 +08:00
zhaocy
593a036393 Merge branch 'dev' into f66
# Conflicts:
#	comm/core.go
#	modules/user/login_comp.go
2022-06-07 17:20:42 +08:00