Commit Graph

488 Commits

Author SHA1 Message Date
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
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
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
e90a8fbb3c 更新模块接口 2022-06-24 10:12:54 +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
12bcbc72c2 删除丢弃的配置 2022-06-23 18:39:48 +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
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