Commit Graph

342 Commits

Author SHA1 Message Date
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
9c697977da 上传协议名调整 2022-06-29 09:44:21 +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
liwei1dao
01ab77d885 修改武器套装校验 2022-06-28 19:54:45 +08:00
6dc86fa32e hero count 字段名变更 2022-06-28 19:30:41 +08:00
liwei1dao
7d14cab842 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 19:27:12 +08:00
liwei1dao
c750a08761 处理武器套装效果校验 2022-06-28 19:26:43 +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
zhaocy
1d602288dd 修改英雄列表 2022-06-28 17:50:32 +08:00
liwei1dao
d152ec4cd4 优化worker会话对象管理 2022-06-28 17:46:04 +08:00
liwei1dao
4d961c8b15 上传武器api接口变量优化 2022-06-28 17:25:04 +08:00
liwei1dao
e6029d61bb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 17:23:08 +08:00
90d753bb3b check函数名修改 2022-06-28 17:21:44 +08:00
593a094314 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 17:19:03 +08:00
1a1603e11f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-28 17:18:57 +08:00
liwei1dao
51e5536701 上传接口调整 2022-06-28 17:18:48 +08:00
82685619b9 check 方法 2022-06-28 17:18:20 +08:00
liwei1dao
a1b7648183 Merge branches 'liwei' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-28 17:15:19 +08:00
liwei1dao
9089ab2344 修复check校验函数格式优化 2022-06-28 17:14:31 +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
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