Commit Graph

413 Commits

Author SHA1 Message Date
liwei1dao
e765b72d4c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-04 09:43:13 +08:00
zhaocy
78ee56deda 修改属性key 2022-07-01 18:50:41 +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
88957a495b 上传武器消息返回头信息修改 2022-07-01 18:18:52 +08:00
liwei1dao
47ea034812 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 18:16:31 +08:00
liwei1dao
906b096475 上传商店模块代码 2022-07-01 18:16:23 +08:00
zhaocy
47467267b5 修改全局配置 2022-07-01 16:30:57 +08:00
f016a11cd4 参数优化 2022-07-01 16:21:12 +08:00
ab0809dcf1 db service 2022-07-01 15:19:57 +08:00
bd6d48b33d module命名修改 2022-07-01 15:04:26 +08:00
82e8b97a0b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 15:01:39 +08:00
fac442d1c7 check 校验 模块名称修改 2022-07-01 15:00:51 +08:00
zhaocy
b08afb9bbd check修改 2022-07-01 14:51:11 +08:00
liwei1dao
93b6ad9e89 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-01 14:40:20 +08:00
liwei1dao
a4185295d8 处理错误码附加信息为空情况 2022-07-01 14:19:56 +08:00
56307b8956 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 13:54:49 +08:00
e204ae71a3 check 函数 2022-07-01 13:53:17 +08:00
liwei1dao
76377b5e28 处理网关模块依赖报错问题 2022-07-01 13:44:36 +08:00
liwei1dao
9d2623904f 配置组件改名 2022-07-01 13:38:51 +08:00
liwei1dao
3a22b20237 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-01 12:11:53 +08:00
liwei1dao
b9aaff762b 上传模块基础对象的通用依赖封装 2022-07-01 12:11:25 +08:00
653d5f2dbd Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-01 12:00:29 +08:00
1d5f7800dd 调用简化 2022-07-01 11:59:57 +08:00
liwei1dao
2eb02b80fb 上传协议修改 2022-07-01 11:58:59 +08:00
zhaocy
0fe2ef2d62 副属性计算 2022-07-01 09:57:16 +08:00
zhaocy
7106ae27f4 装备属性计算 2022-06-30 20:21:02 +08:00
1bf7d2d64d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-30 20:17:43 +08:00
0e3470b5f4 参数校验 2022-06-30 20:16:55 +08:00
zhaocy
318198e924 修改属性累加 2022-06-30 20:16:18 +08:00
liwei1dao
a5508dcd47 上传梦工厂协议接口优化测试 2022-06-30 20:07:35 +08:00
liwei1dao
8b2628339a 优化数据模型脚本 2022-06-30 18:43:10 +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
31fc23c945 修改扣除资源接口参数 2022-06-30 17:06:19 +08:00
zhaocy
08d12b0f36 修复配置加载 2022-06-30 16:31:36 +08:00
810aec88cc Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-30 16:16:25 +08:00
718981064f 优化 2022-06-30 16:15:56 +08:00
liwei1dao
41e02f49bf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-30 16:13:15 +08:00
liwei1dao
0742fa1e89 上传代码优化 2022-06-30 16:13:00 +08:00
zhaocy
22457148d8 设置初始金币和卡牌 2022-06-30 15:25:17 +08:00
zhaocy
541ffb0d42 修改卡消耗 2022-06-30 15:25:17 +08:00
zhaocy
93570f645f 加载global配置 2022-06-30 15:25:16 +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
65560dfa5c 逻辑优化 2022-06-30 13:39:28 +08:00
zhaocy
bc5cf00841 修改抽卡 2022-06-30 10:55:52 +08:00
cde0da8b0a update 2022-06-30 10:54:24 +08:00
3e53851962 subType 2022-06-30 09:55:41 +08:00
00c3c9b9be 文件名称统一 2022-06-30 09:36:27 +08:00
zhaocy
0a65f8b288 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-29 19:55:01 +08:00
zhaocy
59304f4417 修改新用户逻辑 2022-06-29 19:54:55 +08:00
bd1b5b2735 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-29 19:32:16 +08:00
53f6b93f6b 推送属性变化 2022-06-29 19:31:52 +08:00
zhaocy
de0befd8bb 修改消耗卡2 2022-06-29 19:25:17 +08:00
zhaocy
7ed2750398 修改消耗卡 2022-06-29 19:23:59 +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
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
wnp
0ca5037497 增加注释 2022-06-29 17:34:11 +08:00
wnp
7670cb6505 推送权限测试 2022-06-29 17:31:08 +08:00
zhaocy
dea561817f 修复卡叠加逻辑 2022-06-29 17:15:31 +08:00
wnp
e6f13429bf gateway.modules 代码注释+格式修改 2022-06-29 15:36:15 +08:00
wnp
9558e7c4ff 推送权限测试 2022-06-29 14:40:59 +08:00
wnp
f463f686ab gateway.module命名修改 2022-06-29 13:49:55 +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
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