Commit Graph

248 Commits

Author SHA1 Message Date
zhaocy
3fccabd82b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-14 17:46:04 +08:00
zhaocy
8697a9fe10 优化测试报告 2022-07-14 17:45:55 +08:00
0a37601f1a 资源整合,所有变更资源主动推送给客户端 2022-07-14 15:53:08 +08:00
dd1ba19d30 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-14 14:20:07 +08:00
76de1d7245 优化 2022-07-14 14:19:54 +08:00
liwei1dao
6baa4d5197 上传武器资源更改消息推送 2022-07-13 19:30:50 +08:00
liwei1dao
2071a13416 上传资源更改消息推送 2022-07-13 19:30:09 +08:00
liwei1dao
c6c2b5daae 开发系统公告 2022-07-13 11:25:37 +08:00
liwei1dao
fc28127008 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-12 17:17:14 +08:00
zhaocy
c046fe1b12 测试用例支持递归处理 2022-07-12 16:12:29 +08:00
liwei1dao
afecd0e065 上传编解码系统优化 2022-07-12 14:24:28 +08:00
a8d5b601b5 update 2022-07-12 10:47:49 +08:00
7cba00531a check 2022-07-07 17:52:44 +08:00
447800b886 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-07 15:39:29 +08:00
c2a7ecee40 1.主线关卡优化 2.修改获取资源协议 2022-07-07 15:39:03 +08:00
zhaocy
b6feed3aba 活跃度 2022-07-07 14:36:33 +08:00
de94573629 主线章节配置文件调整 逻辑优化 2022-07-07 11:43:40 +08:00
f5176f92b7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-06 19:51:00 +08:00
d10027f37c 主线校验 2022-07-06 19:50:05 +08:00
zhaocy
739b382f28 解决冲突 2022-07-06 19:47:17 +08:00
zhaocy
dcd168a31b 任务模块 2022-07-06 19:46:06 +08:00
9178a5b900 主线章节 2022-07-06 15:37:34 +08:00
62eec8a69a 提供对外接口 用来修改主线关卡信息 2022-07-05 19:24:00 +08:00
469f2274c6 主线关卡 2022-07-05 18:47:01 +08:00
e071cf0d44 共鸣消耗配置修改 2022-07-05 15:34:55 +08:00
4588c8378c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-05 12:04:21 +08:00
42f6168644 优化 2022-07-05 12:03:56 +08:00
liwei1dao
d841560c25 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-05 11:31:12 +08:00
liwei1dao
23976f7cd2 修复测试shop系统代码, 2022-07-05 11:08:20 +08:00
952557ffaf 邮件附件类型定义ATN 类型 并调用通用加道具接口 2022-07-05 11:06:25 +08:00
liwei1dao
4a367661e7 上传用户资源类似数据结构 2022-07-04 19:22:45 +08:00
liwei1dao
ccfe0dfc02 上传商城api接口代码 2022-07-04 19:09:13 +08:00
liwei1dao
813568cb63 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 18:21:13 +08:00
liwei1dao
e0d825b2ae 上传网关会话管理优化 2022-07-04 18:21:09 +08:00
zhaocy
8e08ebf663 添加ip 2022-07-04 18:16:03 +08:00
zhaocy
df746c0bc0 添加用户等级 2022-07-04 17:13:47 +08:00
zhaocy
b5680788f4 改checklist手动调用 2022-07-04 14:56:06 +08:00
zhaocy
fcbf950fde 修改协议名 2022-07-04 10:40:59 +08:00
zhaocy
0ae51dfa29 修改响应命名 2022-07-04 10:13:39 +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
906b096475 上传商店模块代码 2022-07-01 18:16:23 +08:00
liwei1dao
2eb02b80fb 上传协议修改 2022-07-01 11:58:59 +08:00
zhaocy
318198e924 修改属性累加 2022-06-30 20:16:18 +08:00
liwei1dao
a5508dcd47 上传梦工厂协议接口优化测试 2022-06-30 20:07:35 +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
zhaocy
08d12b0f36 修复配置加载 2022-06-30 16:31:36 +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
zhaocy
bc5cf00841 修改抽卡 2022-06-30 10:55:52 +08:00
zhaocy
59304f4417 修改新用户逻辑 2022-06-29 19:54:55 +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
7378905273 proto.go文件上传 2022-06-29 17:49:09 +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
zhaocy
dea561817f 修复卡叠加逻辑 2022-06-29 17:15:31 +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
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
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
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
b7e83a6371 上传英雄装备更新接口 2022-06-24 10:38:47 +08:00