Commit Graph

464 Commits

Author SHA1 Message Date
6d4a95f461 携程推送羁绊信息 2022-10-14 11:19:52 +08:00
a5fd3f0304 接口整合 2022-10-14 11:17:38 +08:00
8869bf49a0 羁绊信息变化推送 2022-10-14 10:20:03 +08:00
2b26cdf465 羁绊好感度奖励 2022-10-13 15:26:15 +08:00
830997df43 查询狩猎记录接口 2022-10-13 12:02:02 +08:00
745d861e4c 记录通关时间 2022-10-12 17:50:03 +08:00
c53a6c294e 心魔塔查询玩家信息接口 2022-10-12 16:41:06 +08:00
liwei1dao
e01253f69f 上传月之秘境触发机制 2022-10-12 10:48:27 +08:00
liwei1dao
50fd39e1f0 上传月之秘境数据层优化 2022-10-12 10:13:04 +08:00
e1e6498215 玩家信息修改协议 2022-10-12 09:37:28 +08:00
c808b353a4 随机任务支持bingo 2022-10-10 14:40:26 +08:00
5d0e95b627 英雄羁绊领奖 2022-10-09 18:33:45 +08:00
46f9b0065c 羁绊新增一些接口 2022-10-09 16:07:43 +08:00
65b0733f99 更新配置 2022-09-27 15:26:44 +08:00
45fea5cf76 合并日常和随机任务条件 2022-09-23 19:53:30 +08:00
f3319fa989 条件校验参数修改 2022-09-23 14:39:29 +08:00
22e0c83866 随机任务条件数据初始 2022-09-22 23:09:54 +08:00
liwei1dao
1422576f86 上传cmd restart 命令 2022-09-22 11:04:13 +08:00
liwei1dao
439ef722d8 上传跨服配置项 2022-09-21 20:02:58 +08:00
liwei1dao
cd575f383d 上传跨服配置代码 2022-09-21 19:07:41 +08:00
e68bbbe2d8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-21 16:44:40 +08:00
0b2b489543 gm 指令增加 修改关卡信息。升级上限校验修复 2022-09-21 16:44:19 +08:00
liwei1dao
2bb6f4de0f 上传服务初始化异常检测输出 2022-09-21 16:36:03 +08:00
liwei1dao
8fcd812986 上传cmd 启动配置文件修复 2022-09-21 16:14:45 +08:00
liwei1dao
97cff7c81c 上传服务cmd 启动程序 2022-09-21 14:44:44 +08:00
e62274636c 好友助战奖励更新 2022-09-19 19:33:10 +08:00
d50ed5dac7 GM模块提供接口 2022-09-19 10:41:41 +08:00
liwei1dao
9aa508a206 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-16 15:31:57 +08:00
liwei1dao
11f99c0dc0 上传聊天公告附加数据 2022-09-16 15:31:49 +08:00
6337ba17dd boss 关卡类型定义 2022-09-16 15:30:15 +08:00
liwei1dao
9fd21926aa 上传网关服务与 Service_Mainte 服务简练界面,实现Service_Mainte 服务器主动推送用户消息 2022-09-16 14:15:41 +08:00
2320b9a280 更新功能开启 2022-09-15 20:34:02 +08:00
liwei1dao
82a2f11b9a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-15 15:56:43 +08:00
liwei1dao
0f76996627 上传聊天消息公告推送 2022-09-15 15:56:39 +08:00
6c8c6fba73 更新随机任务战斗任务 2022-09-14 19:16:03 +08:00
b102f917d6 小层排行优化 2022-09-14 19:06:31 +08:00
dda5235629 记录爬塔明细数据 2022-09-13 20:09:30 +08:00
400827f108 时间计算的问题 2022-09-13 11:58:44 +08:00
29a9f788e1 狩猎加获取好友排行 2022-09-08 17:14:12 +08:00
6584cb33e9 开放好友列表接口 2022-09-08 15:49:17 +08:00
5e2eba49d4 增加功能列表协议 2022-09-08 15:49:17 +08:00
3c5b1ea290 排行榜支持多类型放同一张表 2022-09-08 15:48:26 +08:00
900910e101 藏书馆 2022-09-07 20:07:56 +08:00
5e571fcdbc 支线剧情任务 2022-09-06 17:25:26 +08:00
liwei1dao
526e32e708 上传战斗业务对接接口 2022-09-06 17:00:25 +08:00
liwei1dao
b838460200 上传战报数据独享 2022-09-06 16:44:19 +08:00
liwei1dao
c77443c862 上传月之秘境代码 2022-09-06 15:57:26 +08:00
liwei1dao
0a229ceb56 上传战斗系统相关接口 2022-09-06 12:42:06 +08:00
liwei1dao
583a482a3f 上传战斗接口 2022-09-06 11:37:29 +08:00
liwei1dao
8ab7ba0ed0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-06 11:05:07 +08:00
liwei1dao
a387383e4a 上传战斗记录数据 2022-09-06 11:05:01 +08:00
4f78b63c06 创建怪物英雄 2022-09-06 10:40:41 +08:00
8c11261751 更新测试 2022-09-01 14:58:40 +08:00
liwei1dao
6b4dae65e6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 14:42:57 +08:00
liwei1dao
ce838025f3 上传月之秘境代码 2022-09-01 14:41:59 +08:00
ee1bc3fcc2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 14:39:36 +08:00
8ea4b38ad2 mainline 配置表调整 2022-09-01 14:39:11 +08:00
a1b86a0579 更新新任务 2022-09-01 10:09:55 +08:00
3a1bdcc4ba Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-09-01 10:08:58 +08:00
ecefefe768 json 同步 2022-09-01 10:08:29 +08:00
liwei1dao
1c08ebf8d9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-09-01 09:56:10 +08:00
liwei1dao
c4890b796b 上传月子秘境 对接聊天系统推送好友消息 2022-08-31 19:45:56 +08:00
431c95ebb0 随机任务埋点 2022-08-31 17:14:47 +08:00
e7f1af0c2c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-30 17:58:47 +08:00
bf07eaaa89 狩猎相关 2022-08-30 17:58:24 +08:00
liwei1dao
0f02d1b280 上传随机任务接口以及底层对象支持 2022-08-30 17:57:32 +08:00
liwei1dao
8fd90c6c37 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-30 13:46:28 +08:00
liwei1dao
e94540662b 上传月之秘境模块 2022-08-30 13:46:25 +08:00
93357d6eeb 更新随机任务枚举 2022-08-30 12:02:06 +08:00
1d7d54f745 update 2022-08-29 18:48:31 +08:00
f99145deac update 2022-08-29 18:47:00 +08:00
38de051978 维京 购买 排行 功能自测 2022-08-29 18:26:17 +08:00
7f2f36c544 铁匠铺bug + viking 2022-08-25 19:04:42 +08:00
8d6a271d6c 排行榜 2022-08-24 16:48:49 +08:00
liwei1dao
23176056ac 上传定时模块 2022-08-24 09:53:43 +08:00
b7bb3ab4dc 更新任务 2022-08-23 16:45:13 +08:00
288e899d39 更新随机任务限定条件 2022-08-22 18:41:40 +08:00
141113f7cf 查询章节ID接口 2022-08-22 17:33:35 +08:00
3e479c2321 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-19 19:16:40 +08:00
21dabd2f98 修改任务类型 2022-08-19 18:33:21 +08:00
52cebd0430 铁匠铺 2022-08-19 18:19:43 +08:00
e047f4a883 英雄练功接口 2022-08-19 10:17:50 +08:00
0c2b4fcd1c 一些bug 2022-08-18 19:34:22 +08:00
87fb35d43c 赛季塔 2022-08-18 16:56:21 +08:00
0e2db951be Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:36:10 +08:00
117019a57d 随机掉落逻辑 2022-08-18 11:35:47 +08:00
85c0fc0b72 更新本服在线用户 2022-08-18 11:32:33 +08:00
d735a6bb15 随机任务 2022-08-18 09:31:21 +08:00
fc788396dc 美食家 2022-08-16 18:53:15 +08:00
6dc481f07d 给英雄加经验接口 2022-08-16 15:02:44 +08:00
3eb6773160 美食馆 2022-08-16 11:05:46 +08:00
liwei1dao
a6bdf3dc4e 上传熊猫武馆代码 2022-08-16 09:57:32 +08:00
liwei1dao
e845ed0adc 上传武馆模块代码 2022-08-15 16:35:18 +08:00
0e0c88c29a 创建单个英雄接口调整 2022-08-11 19:45:16 +08:00
80a8fb20c5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 18:09:39 +08:00
601019c9b1 共鸣能量分配属性类型修改 2022-08-11 18:09:20 +08:00
206fa0f9bb 添加测试接口 2022-08-11 18:07:12 +08:00
liwei1dao
ccbac50506 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-10 18:43:03 +08:00
liwei1dao
0712c670fe 优化rpcx系统握手连接机制,避免重复连接情况,优化日志系统,错误日志自动输出错误文件以及行号 2022-08-10 18:42:06 +08:00
e7b9aabd08 爬塔相关 2022-08-10 16:55:54 +08:00
liwei1dao
1785037abb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-09 18:39:26 +08:00
liwei1dao
81f0247969 上传数据层代码优化 2022-08-09 18:39:21 +08:00
b457b06bc9 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-09 18:09:38 +08:00
e69db22bf1 优化+爬塔 2022-08-09 18:09:14 +08:00
zhaocy
3048233bf2 update 2022-08-09 18:01:05 +08:00
4b150256d0 资源发放消耗批量处理,接口返回值统一 2022-08-02 12:05:00 +08:00
7bb39c45e2 一次创建多个英雄接口 2022-08-01 19:01:41 +08:00
9a0666f828 更新代码,修改一些错误命名 2022-08-01 15:02:14 +08:00
ff497dbb36 创建指定英雄错误码返回 2022-08-01 11:36:37 +08:00
1bb3d823e2 获得指定星级等级英雄数量赋值 2022-08-01 11:20:15 +08:00
303a6969b7 获取指定星级等级英雄 接口参数调整 2022-08-01 10:42:20 +08:00
a857a5ab63 1.GM 后台发送邮件, 特殊英雄等信息2. 配置表同步 2022-07-28 18:18:57 +08:00
zhaocy
b4b32c4f5d 活跃度变更修改 2022-07-26 23:10:31 +08:00
liwei1dao
ca68b3f9e9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-26 10:21:09 +08:00
zhaocy
ef6f6efa69 玩家等级优化 2022-07-25 18:40:00 +08:00
liwei1dao
13ef34b170 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 16:41:04 +08:00
liwei1dao
65dc3ece12 上传gm 模块 2022-07-25 16:40:20 +08:00
liwei1dao
4e1db72bce 修改gm模块为web模块 2022-07-25 16:35:35 +08:00
cbb8f9db8e 接口名修改 2022-07-25 16:16:10 +08:00
c7d8bc15dc 资源id 由原来的int 转string 2022-07-25 14:41:44 +08:00
zhaocy
374d9ce3c9 删除不用的接口 2022-07-22 19:21:06 +08:00
zhaocy
4f32f23c0f 接口测试 2022-07-22 18:25:17 +08:00
744c0fa2b5 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 18:09:17 +08:00
cc3452d881 离线通知dbservice 抽卡优化 2022-07-22 18:08:51 +08:00
liwei1dao
b9650a5ea6 上传gm接口代码 2022-07-22 17:05:28 +08:00
liwei1dao
999c7f3c41 上传用户离线通知日志服务器处理数据同步 2022-07-22 16:21:31 +08:00
liwei1dao
9f6f4b5bc0 上传自动注册gm api 和武器接口优化 2022-07-22 15:17:49 +08:00
zhaocy
3579db4eae 更新配置 2022-07-21 19:45:00 +08:00
zhaocy
2b59b99946 更改任务key 2022-07-21 19:44:01 +08:00
zhaocy
49ae24219c 任务完成推送 2022-07-21 19:43:57 +08:00
a943ca337a 添加邮件测试功能,修复堆叠英雄bug 2022-07-21 11:58:54 +08:00
fc38b7f4ca 抽卡保底逻辑 2022-07-20 20:59:06 +08:00
98575d23df Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-20 18:11:50 +08:00
1c2ea3d15f 抽卡保底相关逻辑 2022-07-20 18:10:27 +08:00
liwei1dao
9b4eb509f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 17:57:10 +08:00
zhaocy
3946216c04 用户设置 2022-07-20 17:44:15 +08:00
liwei1dao
5f83525eeb 上传代码修复 2022-07-20 14:19:30 +08:00
liwei1dao
560eda6b87 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 14:04:37 +08:00
liwei1dao
cdedf4414d 上传聊天系统业务开发 2022-07-20 14:01:59 +08:00
liwei1dao
3eef4844c6 上传聊天系统以及底层通信扩展 2022-07-19 18:09:45 +08:00
6e0a8c9a7d 接口参数uid 改session对象 2022-07-19 12:05:31 +08:00
zhaocy
1251ec38a0 添加攻略类型 2022-07-19 10:49:03 +08:00
zhaocy
bdcf51ae8a 更新配置 2022-07-19 10:12:37 +08:00
zhaocy
03e2337b36 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 17:10:34 +08:00
zhaocy
62703c4cde 叠加英雄处理 2022-07-18 17:10:29 +08:00
ac8e54f599 主线章节 字段变更 2022-07-18 16:51:26 +08:00
0a37601f1a 资源整合,所有变更资源主动推送给客户端 2022-07-14 15:53:08 +08:00
liwei1dao
acbeae031c 伤处模块日志优化 2022-07-13 15:46:27 +08:00
liwei1dao
2bb353817e 上传日志优化代码 2022-07-13 15:06:48 +08:00
zhaocy
a564f3dcf5 deprecated method 2022-07-11 18:55:44 +08:00
zhaocy
b6feed3aba 活跃度 2022-07-07 14:36:33 +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
zhaocy
0e77e182f8 任务模块 2022-07-05 12:01:05 +08:00
liwei1dao
96daa17ae6 上传用户会话消息谁送接口 2022-07-04 19:23:35 +08:00
liwei1dao
e0d825b2ae 上传网关会话管理优化 2022-07-04 18:21:09 +08:00
zhaocy
b5b3b11691 用户会话接口 2022-07-04 17:48:54 +08:00
fe136f26ea 创建邮件接口 2022-07-04 17:15:01 +08:00
13648d9471 消耗英雄卡片 2022-07-04 10:59:57 +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
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
17ac51b676 上传pb 修改 2022-06-30 13:47:30 +08:00
zhaocy
cfc67b5bef 添加叠加字段 2022-06-29 10:27:59 +08:00
liwei1dao
92ee1d454d 上传会话对象绑定uid 2022-06-28 19:07:28 +08:00
zhaocy
9e986f40f3 proto重命名 2022-06-28 18:05:44 +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
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
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
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
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
liwei1dao
4891d635d7 上传武器相关配置和接口重构 2022-06-27 17:45:02 +08:00
liwei1dao
fd99d99406 修改道具模块命名以及武器配置代码 2022-06-27 15:37:33 +08:00
liwei1dao
e90a8fbb3c 更新模块接口 2022-06-24 10:12:54 +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
f589bf55cc 上传用户离线以及论坛模块 2022-06-23 15:03:47 +08:00
liwei1dao
6f0ebc4a93 上传equipment 模块代码 2022-06-23 14:32:13 +08:00
500753f1af 启动dbservice 先检验日志表是否有数据没写完 2022-06-21 14:20:56 +08:00
7cf62a2056 日志接口查询 2022-06-21 11:08:06 +08:00
zhaocy
cab6a2d07b robot统一通知处理 2022-06-17 16:59:44 +08:00
zhaocy
ce3440d7f9 数据层接口测试 2022-06-17 13:51:43 +08:00
zhaocy
c77f36ca3a pb正反序列化替换新的方法 2022-06-17 11:41:35 +08:00
liwei1dao
d3dfc01011 优化api 校验接口返回参数设计 2022-06-16 14:53:28 +08:00
liwei1dao
4bd57b56fd 上传统一错误码消息实现 2022-06-16 12:26:49 +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
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
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
0ab655b9c4 数据库操作类型定义枚举 2022-06-13 18:03:35 +08:00
10f5922475 日志写表 2022-06-13 17:40:10 +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
zhaocy
2c2457f2ac proto替换Any 2022-06-10 14:20:05 +08:00
liwei1dao
cdf146f287 上传代码 2022-06-09 16:10:20 +08:00
liwei1dao
8ca83cb6ab 上传背包相关接口优化 2022-06-09 15:15:52 +08:00
liwei1dao
83e65faf96 上传背包接口补充 2022-06-09 11:24:49 +08:00
liwei1dao
4372d4d283 上传comm定义文件优化 2022-06-08 19:27:18 +08:00
liwei1dao
0a9e855257 补充代码注释 2022-06-08 19:10:43 +08:00
liwei1dao
455f930339 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-08 17:57:27 +08:00
liwei1dao
351fea4d53 上传机器人代码 2022-06-08 17:57:02 +08:00
1236804deb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-08 17:55:02 +08:00
a9b31d063e 提供接口给其他模块调用 2022-06-08 17:54:24 +08:00
liwei1dao
acf4969646 定义用户创建角色事件 2022-06-08 15:53:58 +08:00
liwei1dao
28c99a8893 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-07 20:22:47 +08:00
liwei1dao
6a7f120755 上传lego 框架代码 2022-06-07 20:18:22 +08:00
zhaocy
c5e99c6604 好友协议 2022-06-07 19:45:52 +08:00
zhaocy
593a036393 Merge branch 'dev' into f66
# Conflicts:
#	comm/core.go
#	modules/user/login_comp.go
2022-06-07 17:20:42 +08:00
zhaocy
d4fa18143a update login 2022-06-07 17:18:34 +08:00
liwei1dao
1b595e0a11 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-07 11:57:48 +08:00
liwei1dao
ea9b9a394c 上传用户会话接口 2022-06-07 11:57:32 +08:00
fa15d16231 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-07 10:18:15 +08:00
liwei1dao
7ada2ce4a4 上传uid 类型优化 2022-06-07 09:59:48 +08:00
liwei1dao
8e8efe12d2 上传代码协议优化 2022-06-06 19:33:51 +08:00
liwei1dao
0b938958e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-06 18:47:35 +08:00
liwei1dao
c25df3e397 上传协议优化 2022-06-06 18:46:28 +08:00
zhaocy
13ef42edcc Merge branch 'zhaocy' into dev
# Conflicts:
#	comm/core.go
2022-06-06 18:45:22 +08:00
zhaocy
e8c9f63901 update Robot 2022-06-06 18:42:03 +08:00
ec3b62d370 邮件相关 2022-06-06 18:38:03 +08:00
liwei1dao
1cdf4b29df Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-06 17:18:36 +08:00
liwei1dao
991fb40dda 上传背包模块代码 2022-06-06 17:17:37 +08:00
zhaocy
5b7d9f8cea Merge remote-tracking branch 'origin/liwei' into zhaocy 2022-06-06 14:44:34 +08:00
zhaocy
750c7756b0 Merge branch 'zhaocy' into dev 2022-06-06 14:41:47 +08:00