Commit Graph

413 Commits

Author SHA1 Message Date
95f071b3bc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 17:13:42 +08:00
25e04df951 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 17:13:37 +08:00
47a011fc4a update 2022-06-28 17:13:10 +08:00
liwei1dao
09ecaa3207 上传接口格式优化 2022-06-28 17:11:00 +08:00
liwei1dao
73a8d59ebe Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 17:10:10 +08:00
liwei1dao
50bb5a92a8 上传会话对象消息队列优化 2022-06-28 17:09:32 +08:00
liwei1dao
6098f3edda 上传协议修改代码 2022-06-28 15:43:02 +08:00
f2cf68f173 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 15:26:28 +08:00
bc588b0e92 update 2022-06-28 15:25:58 +08:00
fedb567675 update 2022-06-28 15:24:40 +08:00
zhaocy
f8fd28cb3b 方法重命名 2022-06-28 15:14:08 +08:00
zhaocy
aca7543d7e 方法重命名 2022-06-28 15:05:11 +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
9d47098166 命名修改 2022-06-28 14:58:04 +08:00
b81ccf78e3 命名修改 2022-06-28 14:54:09 +08:00
liwei1dao
b6a3ce955a 上传 变量接口命名规范 2022-06-28 14:51:58 +08:00
d32cea4d30 命名修改 2022-06-28 14:50:39 +08:00
e14e4563fb 英雄一键升级 2022-06-28 14:25:51 +08:00
zhaocy
0b446c3559 user接口实现 2022-06-28 14:18:30 +08:00
zhaocy
71ef2821f2 英雄列表空处理 2022-06-28 14:01:52 +08:00
06ae1ca510 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	modules/hero/api.go
#	modules/hero/api_heroStrengthen.go
#	modules/hero/module.go
2022-06-28 12:50:53 +08:00
e4d543647d 英雄升级 2022-06-28 12:07:12 +08:00
liwei1dao
6c58432270 上传武器测试纠正代码 2022-06-28 12:04:02 +08:00
zhaocy
773736f089 初始化英雄 2022-06-28 12:03:14 +08:00
liwei1dao
69d8663f90 上传模块接口同步 2022-06-28 09:35:24 +08:00
liwei1dao
8109ffe81d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 09:32:50 +08:00
zhaocy
c73eb9c9e2 hero对外接口实现 2022-06-28 09:27:44 +08:00
liwei1dao
76869b494f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-27 20:30:11 +08:00
liwei1dao
6342019a25 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-27 20:27:53 +08:00
zhaocy
8d0a0a0043 update robot 2022-06-27 20:27:49 +08:00
liwei1dao
0432e36de4 上传相关接口代码 2022-06-27 20:27:36 +08:00
zhaocy
01cd864ba1 解决冲突 2022-06-27 20:02:37 +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
b7d1b011a8 merge 2022-06-27 19:48:39 +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
a8a980fc50 更新配置 2022-06-27 19:09:08 +08:00
zhaocy
3e019314c7 解决冲突 2022-06-27 19:08:54 +08:00
zhaocy
469225f6ab 获取hero接口修改 2022-06-27 18:29:13 +08:00
zhaocy
b6c265e44c 配置错误处理 2022-06-27 18:29:10 +08:00
liwei1dao
4c11b17184 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-27 17:51:21 +08:00
liwei1dao
4b5468aaeb 修改物品背包模块名 2022-06-27 17:47:18 +08:00
liwei1dao
4891d635d7 上传武器相关配置和接口重构 2022-06-27 17:45:02 +08:00
7814e10fe7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-27 15:46:05 +08:00
05226c76f2 配置文件解析 2022-06-27 15:45:28 +08:00
liwei1dao
e15148dbbd 修复模块更改的错误 2022-06-27 15:45:03 +08:00
liwei1dao
e61ca99fec Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-27 15:37:51 +08:00
liwei1dao
fd99d99406 修改道具模块命名以及武器配置代码 2022-06-27 15:37:33 +08:00
ad778836cc 经验卡消耗配置 2022-06-27 11:10:10 +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
773a5db73b 修复武器升级逻辑代码 2022-06-24 17:28:25 +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
zhaocy
5b170b9d3d 英雄数值表 2022-06-23 18:38:21 +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
d183100176 上传背包接口优化 2022-06-23 18:03:19 +08:00
liwei1dao
e8a503c99b 移除不必要的接口定义 2022-06-23 15:09:03 +08:00
liwei1dao
f589bf55cc 上传用户离线以及论坛模块 2022-06-23 15:03:47 +08:00
liwei1dao
1f3106ce77 添加论坛模块以及用户离线通知 2022-06-23 15:03:25 +08:00
liwei1dao
426120cefb 上传背包测试脚本 2022-06-23 14:36:20 +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
5ac2fd6137 英雄 装备 数据结构 2022-06-22 19:28:34 +08:00
liwei1dao
db9910c066 移除背包的db组件 2022-06-21 15:45:50 +08:00
eb638559cf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 15:05:23 +08:00
44465ef6ea 报错 2022-06-21 15:04:59 +08:00
51c3854979 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 15:02:19 +08:00
5d1f1f90a0 报错修改 2022-06-21 15:01:54 +08:00
liwei1dao
25257fcf9a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 14:54:47 +08:00
liwei1dao
900cededc5 上传消息分法配置系统 2022-06-21 14:54:42 +08:00
89ce9e9b08 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 14:22:24 +08:00
500753f1af 启动dbservice 先检验日志表是否有数据没写完 2022-06-21 14:20:56 +08:00
zhaocy
c864dd5432 重名uid 2022-06-21 14:02:36 +08:00
aa426a1328 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-21 14:00:37 +08:00
fad5a938a5 uid 当做索引 2022-06-21 14:00:20 +08:00
liwei1dao
14710e9893 同步dev 2022-06-21 13:55:52 +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
f54b2985ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-21 12:00:00 +08:00
zhaocy
6b5d3f93be 统一字段命名 2022-06-21 11:58:46 +08:00
5b4517d0a8 Merge branch 'liwei' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-21 11:52:31 +08:00
7cf62a2056 日志接口查询 2022-06-21 11:08:06 +08:00
liwei1dao
e464879799 调整背包数据层接口 2022-06-20 14:44:56 +08:00
zhaocy
182e3743ad 所有协议加上秘钥认证 2022-06-17 18:28:35 +08:00
zhaocy
cab6a2d07b robot统一通知处理 2022-06-17 16:59:44 +08:00
zhaocy
028727449b 添加缓存失效设置 2022-06-17 16:34:09 +08:00
zhaocy
7de30d1a69 修改网关秘钥校验 2022-06-17 16:34:08 +08:00
b007be914d update 2022-06-17 15:52:07 +08:00
def537a01a 优化 2022-06-17 15:46:07 +08:00
a54dcebfe9 类型同步修改 2022-06-17 14:11:12 +08:00
zhaocy
ce3440d7f9 数据层接口测试 2022-06-17 13:51:43 +08:00
zhaocy
4da4c572e5 更新接口chk 2022-06-16 20:26:20 +08:00
zhaocy
bba410cb3c 优化hm字段的更新 2022-06-16 19:00:50 +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
zhaocy
10941376f1 修改errcode 2022-06-16 15:28:08 +08:00
zhaocy
ee5f7f899e 修改user接口 2022-06-16 15:21:34 +08:00
zhaocy
24749bb718 修改friend接口 2022-06-16 15:14:46 +08:00
zhaocy
db0df37526 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 15:13:08 +08:00
1b32f51406 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 15:01:18 +08:00
bcd9ef78bb 优化api 校验接口返回参数设计 2022-06-16 15:01:07 +08:00
liwei1dao
2b9ac7d902 修复网关模块api接口调整 2022-06-16 14:57:46 +08:00
liwei1dao
ef5f831319 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 14:53:31 +08:00
liwei1dao
d3dfc01011 优化api 校验接口返回参数设计 2022-06-16 14:53:28 +08:00
a3ecb3f3f5 api checke 2022-06-16 13:46:20 +08:00
liwei1dao
4bd57b56fd 上传统一错误码消息实现 2022-06-16 12:26:49 +08:00
3c8183b5f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 11:40:20 +08:00
e5a8d3a710 接口修改 数据同步 2022-06-16 11:39:09 +08:00
zhaocy
494502ed5e 修改session缓存 2022-06-15 19:46:24 +08:00
zhaocy
b4ec3d86fb 修改api check 2022-06-15 19:25:55 +08:00
zhaocy
3879ccf652 add check 2022-06-15 18:40:05 +08:00
d9a5fbe5ba 报错修改 2022-06-15 18:37:36 +08:00
zhaocy
f6ccb37e3b 初始化修复 2022-06-15 17:46:13 +08:00
zhaocy
c7278719ba 更新db接口调用 2022-06-15 17:36:09 +08:00
25cc58223c 去掉不需要的引用 2022-06-15 16:23:26 +08:00
7bed325224 接口参数校验 2022-06-15 14:46:59 +08:00
c16a4648fe Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-15 14:17:22 +08:00
fee90b333d 模块整理,优化 2022-06-15 14:16:46 +08:00
zhaocy
b053cde0a3 拆分模块方法 2022-06-15 14:09:41 +08:00
zhaocy
e387e9b8e5 更新user缓存结构 2022-06-15 14:09:41 +08:00
zhaocy
d373a401de 暂存 2022-06-15 14:09:41 +08:00
zhaocy
924da6fdd8 暂存pull dev 2022-06-15 14:09:41 +08:00
zhaocy
b9d51378f3 添加判空 2022-06-15 14:09:40 +08:00
zhaocy
69cfaf0737 model创建 2022-06-15 14:09:40 +08:00
liwei1dao
c7517d345a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-15 13:36:13 +08:00
liwei1dao
35be79ffc7 补充项目接口注释说明 2022-06-15 13:35:36 +08:00
b912c45092 db cache 模块合并 2022-06-15 11:24:42 +08:00
liwei1dao
ca0a418b4f 修复用户消息网关处理流代码 2022-06-15 11:12:58 +08:00
liwei1dao
de050c8b78 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-15 10:48:11 +08:00
liwei1dao
9e8a8104d8 上传api 接口检测代码 2022-06-15 10:48:01 +08:00
c731357301 model 数据落地 2022-06-14 19:32:02 +08:00
liwei1dao
3bf2feba6b 上传 模块测试 模板 2022-06-14 17:33:22 +08:00
liwei1dao
7081e9a8cb 上传接口调整代码 2022-06-14 15:36:58 +08:00
liwei1dao
8ff4813033 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 15:32:29 +08:00
liwei1dao
ea15865a4a 上传测试脚本代码 2022-06-14 15:32:15 +08:00
0211168611 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 15:27:21 +08:00
7737d3be78 结构调整 2022-06-14 15:26:47 +08:00
liwei1dao
76cdd23c91 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-14 15:23:37 +08:00
liwei1dao
4931d310e2 去除底层互相引用方式该由上层按需执行保存引用对象 2022-06-14 15:21:49 +08:00
f113741536 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-14 14:23:37 +08:00
liwei1dao
11a63977c3 上传基类模块接口定义类型转换异常的bug修复 2022-06-14 14:23:20 +08:00
0b1757a11d 参数名修改 2022-06-14 14:23:16 +08:00
7025402736 报错 2022-06-14 14:07:38 +08:00
e530dd6ed7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 13:47:20 +08:00
1a08906062 db 模块迁移 2022-06-14 13:46:43 +08:00
liwei1dao
b3226065b9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 13:40:10 +08:00
liwei1dao
3f3721abb2 调整基础模块基础组件接口 2022-06-14 13:40:06 +08:00
c63c16a2b7 报错修改 2022-06-14 12:54:40 +08:00
fd6903dcf1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-14 12:47:53 +08:00
43850fdd5d 测试文件 2022-06-14 12:47:35 +08:00
liwei1dao
91bc6c65a6 上传db优化 2022-06-14 11:42:24 +08:00
liwei1dao
c9b1b47f4d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-14 11:41:22 +08:00
liwei1dao
0b7aea4610 优化基础业务模块基类接口 2022-06-14 11:40:32 +08:00
d754581167 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-13 20:50:20 +08:00
0c4ece6630 写日志 封装接口 2022-06-13 20:50:03 +08:00
liwei1dao
84005d7974 还原redis接口 2022-06-13 20:47:32 +08:00
liwei1dao
eefe70d23d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-13 19:23:55 +08:00
liwei1dao
0e7ce6a59a 上传底层代码修复 2022-06-13 19:23:51 +08:00
a36305f174 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-13 18:03:52 +08:00
0ab655b9c4 数据库操作类型定义枚举 2022-06-13 18:03:35 +08:00
liwei1dao
46f33d6e73 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 18:00:35 +08:00
liwei1dao
46cf7e2740 上传基础缓存组件和db组件的初始化过程 2022-06-13 18:00:18 +08:00
liwei1dao
bf91c8c8d2 上传缓存基础组件命名错误 2022-06-13 17:41:49 +08:00
b9ddf78232 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-13 17:40:26 +08:00
10f5922475 日志写表 2022-06-13 17:40:10 +08:00
liwei1dao
34351ec69b 优化redis 哈希接口 2022-06-13 13:58:17 +08:00
liwei1dao
1d53007bf7 修复背包模块代码错误 2022-06-13 12:42:34 +08:00
liwei1dao
f78a2e20bc 上传 背包数据结构调整优化 2022-06-13 12:36:36 +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
liwei1dao
a309fe9a47 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 10:19:19 +08:00
liwei1dao
5b419e3ef6 上传rpcx底层服务发现机制优化,以及自定义选择器实现 2022-06-13 10:09:28 +08:00
liwei1dao
33436e7c98 上传微服务改造 2022-06-10 20:19:32 +08:00
liwei1dao
d4d8c074e0 保存rpcx代码优化 2022-06-10 19:22:02 +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
9277322537 测试好友接口2 2022-06-09 19:03:58 +08:00
zhaocy
43c75ecc5c 好友接口测试1 2022-06-09 18:45:50 +08:00
liwei1dao
cdf146f287 上传代码 2022-06-09 16:10:20 +08:00
liwei1dao
8ca83cb6ab 上传背包相关接口优化 2022-06-09 15:15:52 +08:00
5a94516649 接口拆分 分类 2022-06-09 14:08:57 +08:00
liwei1dao
152a8d859e 拆分api文件 2022-06-09 13:36:57 +08:00
liwei1dao
f9185698e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-09 11:26:10 +08:00
liwei1dao
83e65faf96 上传背包接口补充 2022-06-09 11:24:49 +08:00
f7725db74b 报错修改 2022-06-09 11:10:14 +08:00
616198cf8e 编码规范 增加注释 2022-06-09 10:34:10 +08:00
4cd16973eb 编码规范 增加注释 2022-06-09 10:33:45 +08:00
0b5359589b 代码注释 增加测试接口 2022-06-08 19:36:28 +08:00