Commit Graph

2296 Commits

Author SHA1 Message Date
liwei1dao
126ddb9681 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 15:10:06 +08:00
liwei1dao
cb7fff3445 同步配置文件命令修改 2022-08-18 15:09:34 +08:00
fad4d1744b 更新好友列表数据状态 2022-08-18 14:43:00 +08:00
b3a2f3719e 更新字段 2022-08-18 12:06:42 +08:00
aa8914c14e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:36:22 +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
liwei
e3d177e476 修复空对象异常错误 2022-08-18 11:34:56 +08:00
liwei
34bc631c9c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:33:21 +08:00
51d0f01383 更新在线好友搜索 2022-08-18 11:32:33 +08:00
85c0fc0b72 更新本服在线用户 2022-08-18 11:32:33 +08:00
liwei
0af3ef8c60 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:05:41 +08:00
liwei1dao
6d844a192f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 11:05:32 +08:00
liwei1dao
d56453ebb2 移除socket 过期代码,后面加心跳机制后再补上去 2022-08-18 11:05:25 +08:00
5da57b76ec update 2022-08-18 10:46:13 +08:00
eda8d58118 update 2022-08-18 10:46:13 +08:00
liwei
714b2369e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 10:33:55 +08:00
liwei1dao
58e8c9002d 上传socket 读取超时设置 2022-08-18 10:32:47 +08:00
liwei1dao
ad390040d7 广播消息不发送未登录用户修复 2022-08-18 10:28:31 +08:00
liwei
1e8873c096 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-18 10:03:17 +08:00
bad7c44903 更新配置 2022-08-18 10:01:04 +08:00
liwei1dao
98f149b3ee 上传聊天成功返回 2022-08-18 09:52:18 +08:00
e3a3f3396b 更新配置 2022-08-18 09:46:37 +08:00
6c258e903b 好友搜索 2022-08-18 09:31:24 +08:00
d735a6bb15 随机任务 2022-08-18 09:31:21 +08:00
48270ee931 刪除不用的文件 2022-08-17 19:09:53 +08:00
b0db5645ea 丛林美食馆 2022-08-17 18:57:15 +08:00
liwei
5dc57b66c8 上传装备配置表穿戴错误问题 2022-08-17 17:20:59 +08:00
liwei
fe69c0bfbe 装备升级配置表异常保护处理 2022-08-17 17:15:57 +08:00
4402d62a42 升到满级还想继续升级的bug 2022-08-17 15:18:59 +08:00
1b55e1fadb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-17 14:56:35 +08:00
d853b31603 美食家 2022-08-17 14:55:22 +08:00
liwei1dao
94db272d64 上传武馆解锁接口 2022-08-17 10:38:23 +08:00
liwei1dao
5452d8a93c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-17 09:55:00 +08:00
liwei1dao
ba0169ab47 上传转呗强化扣款逻辑修复 2022-08-17 09:54:41 +08:00
2dcebd44c4 发奖励 2022-08-17 09:53:03 +08:00
liwei1dao
a317fca98c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-17 09:37:58 +08:00
fc788396dc 美食家 2022-08-16 18:53:15 +08:00
8b7822b836 抽卡推送获取英雄数据
美食家代码
2022-08-16 16:24:04 +08:00
61c9f00eaa 抽卡推送获取卡信息
美食家
2022-08-16 16:22:35 +08:00
4434f27e4c 模块名修改 2022-08-16 15:05:12 +08:00
6dc481f07d 给英雄加经验接口 2022-08-16 15:02:44 +08:00
96c421265d 领取奖励 2022-08-16 14:44:05 +08:00
liwei1dao
030eb04f44 上传武馆代码 2022-08-16 14:24:57 +08:00
302e85dc59 爬塔数据保存bug 2022-08-16 14:15:43 +08:00
3fdd7fe115 配置文件修改 2022-08-16 13:37:56 +08:00
3eb6773160 美食馆 2022-08-16 11:05:46 +08:00
6368eee720 获取数据断线问题 2022-08-16 10:48:58 +08:00
123132b175 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-16 10:31:41 +08:00
42ee59ff2f 爬塔db 错误 2022-08-16 10:30:03 +08:00
liwei1dao
32086143e7 上传熊猫武馆代码 2022-08-16 10:10:20 +08:00
eefc249ba3 update list 2022-08-15 18:35:28 +08:00
9a040f7b94 json 上传 2022-08-15 18:25:47 +08:00
afc2468ef6 配置修改 2022-08-15 17:37:56 +08:00
bc9fdabfc3 抽卡协议修改 2022-08-15 17:11:45 +08:00
liwei1dao
e845ed0adc 上传武馆模块代码 2022-08-15 16:35:18 +08:00
liwei
8f80f08d5f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-15 14:40:41 +08:00
liwei
7e9ca63928 上传道具使用的bug 2022-08-15 14:39:24 +08:00
1484b92816 抽卡 2022-08-15 13:00:58 +08:00
liwei1dao
d8284654d7 上传道具使用 2022-08-12 18:59:38 +08:00
liwei1dao
c9f67d7414 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-12 18:55:18 +08:00
liwei1dao
bcd9916491 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-08-12 18:53:51 +08:00
d7fbfe3dd6 配置表更新 2022-08-12 18:53:51 +08:00
liwei1dao
cecd70bfa9 修复道具使用的问题 2022-08-12 18:30:22 +08:00
24fb25692f 共鸣属性分配BUG 2022-08-12 10:43:49 +08:00
d61274b14f 共鸣协议 修改 支持多参数 2022-08-11 20:58:40 +08:00
02148af676 共鸣bug 2022-08-11 20:20:08 +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
8c158797c6 修复db层代码接口错误 2022-08-11 18:05:21 +08:00
liwei1dao
c834ab0d9a 上传道具合成处理以及掉落组表二次处理 2022-08-11 18:00:42 +08:00
a8a42d97c1 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 17:10:57 +08:00
6ee83fa224 配置表重定义key 并支持热更 2022-08-11 17:10:33 +08:00
liwei1dao
d8e5f48caa 优化聊天私聊不推送自己的问题 2022-08-11 16:20:28 +08:00
liwei1dao
63c2aa8b7f 上传评论问题 2022-08-11 15:53:11 +08:00
liwei1dao
a515c59e21 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 12:02:18 +08:00
liwei1dao
9ade1bb5a5 修复聊天系统消息群发机制 2022-08-11 12:02:13 +08:00
e289290571 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-11 11:37:22 +08:00
161f8a4c20 技能升级配置表结构变化 对应读取程序修改 2022-08-11 11:37:03 +08:00
liwei1dao
377026b7ab 聊天业务bug修复 2022-08-11 10:41:43 +08:00
liwei1dao
36d3f893c8 上传聊天业务代码优化 2022-08-11 10:40:54 +08:00
liwei1dao
fe159fb96e 上传日志输出规范调整 2022-08-11 09:59:25 +08:00
55127dc69b 更新推送监听 2022-08-10 19:31:21 +08:00
646cabda56 更新点赞 2022-08-10 19:31:21 +08:00
liwei1dao
fcc53d71c6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 19:28:57 +08:00
liwei1dao
18edbbad87 上传武器添加数据库报错问题,以及日志堆栈信息调整 2022-08-10 19:28:53 +08:00
2f96ac75b7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 18:48:51 +08:00
88afd36d50 爬塔发奖 2022-08-10 18:48:30 +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
b20759142d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-10 15:25:14 +08:00
1670917a59 用户扩展数据图鉴数据保存 2022-08-10 15:24:47 +08:00
000219e54b 解决冲突 2022-08-10 15:17:49 +08:00
liwei1dao
3132135e6f 上传论坛模块测试优化以及编解码系统修复 2022-08-10 14:46:34 +08:00
liwei1dao
676770156e 上传装备添加的bug 2022-08-10 13:40:30 +08:00
liwei1dao
c03ba65bf6 上传论坛模块 2022-08-10 13:38:11 +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
4338450e0f update gui 2022-08-09 18:03:02 +08:00
liwei1dao
5e2a9fdf45 升级db系统 维护多数据节点连接实例 2022-08-09 13:35:23 +08:00
de510f42ac 同步dev 增加英雄的共鸣附加属性 2022-08-09 11:29:05 +08:00
liwei1dao
fb419359d0 上传编码指针代码内存重叠问题 2022-08-08 19:44:52 +08:00
liwei1dao
76011b4405 上传新的日志系统以及编解码系统升级 2022-08-08 14:05:40 +08:00
liwei1dao
35d0080275 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-08 09:25:09 +08:00
liwei1dao
43ec7f57cf 上传日志系统以及redis库接口升级 2022-08-08 09:25:02 +08:00
c70465f741 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-05 16:49:45 +08:00
3f2cb94f1e 一键领取推送 2022-08-05 16:48:16 +08:00
liwei1dao
b4ac656754 上传道具出售价格叠加bug 2022-08-05 16:15:59 +08:00
299a430127 整理优化 2022-08-03 17:53:32 +08:00
5277ca09cf 技能升级 请求参数支持一次消耗多个技能卡 2022-08-03 14:05:06 +08:00
e54b34c550 bug 2022-08-03 10:45:42 +08:00
49a42793c6 配置表更新 2022-08-03 10:29:27 +08:00
f327295b52 去掉newhero 解析 使用hero配表 2022-08-03 10:02:51 +08:00
796ec966dd 登录推送服务器时间戳 2022-08-03 09:33:02 +08:00
ba619a1c08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-02 12:05:18 +08:00
4b150256d0 资源发放消耗批量处理,接口返回值统一 2022-08-02 12:05:00 +08:00
liwei1dao
50c50a4490 上传背包格子使用 完毕 清理的问题 2022-08-02 09:46:05 +08:00
liwei1dao
79d8cf4e31 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 19:28:22 +08:00
liwei1dao
f3d9577674 上传英雄合成代码 2022-08-01 19:28:11 +08:00
7bb39c45e2 一次创建多个英雄接口 2022-08-01 19:01:41 +08:00
2d7ee15f07 Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 18:40:11 +08:00
80ff9fffc7 一键领取 2022-08-01 18:39:44 +08:00
liwei1dao
2a435e6833 Merge branches 'dev' and 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 18:23:46 +08:00
liwei1dao
d14eea92de 优化道具使用 2022-08-01 18:23:32 +08:00
b6f1fe1c02 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 18:11:36 +08:00
1445c7629e bug 2022-08-01 18:11:08 +08:00
liwei1dao
c1c5481f44 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 17:41:43 +08:00
liwei1dao
74aad51512 上传道具使用修改 2022-08-01 17:41:29 +08:00
1d942d918f Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 17:11:05 +08:00
5fb205395e 配置表更新 2022-08-01 17:10:39 +08:00
zhaocy
38ebd454d0 update 2022-08-01 16:16:02 +08:00
880d0f0fcb Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 15:58:51 +08:00
2c0bb0087e 加一些日志 2022-08-01 15:58:29 +08:00
zhaocy
7681be0aba Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
# Conflicts:
#	modules/task/api_receive.go
2022-08-01 15:23:56 +08:00
zhaocy
739d2324f3 update 2022-08-01 15:21:40 +08:00
335de3109a 记录扩展数据 2022-08-01 15:14:13 +08:00
fb40ce3f19 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 15:02:34 +08:00
9a0666f828 更新代码,修改一些错误命名 2022-08-01 15:02:14 +08:00
zhaocy
fe90ea1ec4 update 2022-08-01 14:49:26 +08:00
zhaocy
c2bd05cac8 update 2022-08-01 14:27:33 +08:00
zhaocy
48306f8119 update 2022-08-01 14:14:34 +08:00
b65e44ee95 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 13:54:38 +08:00
91f56e50b1 cmg 单元测试 2022-08-01 13:54:21 +08:00
liwei
50069fe7c2 升级武器模块类的日志输出 2022-08-01 12:10:13 +08:00
liwei
3e411d20ff 修复装备升级异常bug 2022-08-01 12:02:29 +08:00
liwei1dao
3fa1d9a74d 上传道具的使用逻辑补充 2022-08-01 11:39:42 +08:00
ff497dbb36 创建指定英雄错误码返回 2022-08-01 11:36:37 +08:00
57cbd8460a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 11:20:32 +08:00
1bb3d823e2 获得指定星级等级英雄数量赋值 2022-08-01 11:20:15 +08:00
zhaocy
eade84e7cf 用户签名 2022-08-01 11:13:44 +08:00
zhaocy
e0d3cbe429 签名协议 2022-08-01 11:11:27 +08:00
303a6969b7 获取指定星级等级英雄 接口参数调整 2022-08-01 10:42:20 +08:00
1e7dc159e4 客户端GM控制台发送指令解析并发放资源 2022-08-01 10:25:42 +08:00
7af40d1031 update 2022-07-29 16:36:59 +08:00
286e0e4e52 堆叠数量 2022-07-29 16:23:24 +08:00
liwei1dao
8d9708ccc4 上传道具最后操作时间 2022-07-29 10:33:26 +08:00
liwei1dao
24efd14c67 上传道具背包new标签处理 2022-07-29 10:31:01 +08:00
liwei1dao
d1dee6e1db 上传武器穿戴错误码细分 2022-07-29 09:26:00 +08:00
liwei1dao
277aa4ce82 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 21:23:21 +08:00
liwei1dao
052f3479a6 修改物品出售的消息推送处理 2022-07-28 21:23:17 +08:00
a857a5ab63 1.GM 后台发送邮件, 特殊英雄等信息2. 配置表同步 2022-07-28 18:18:57 +08:00
liwei1dao
02752df2cf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 18:11:46 +08:00
liwei1dao
3df44c2554 道具创建时读取过期时间 2022-07-28 18:11:42 +08:00
f85674bcd0 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 15:01:13 +08:00
dd21220b46 hp属性计算问题,玩家外围属性 2022-07-28 15:00:50 +08:00
liwei1dao
8cee759b62 上传日志 2022-07-28 14:30:14 +08:00
zhaocy
47a28e7589 细化错误码 2022-07-28 11:59:43 +08:00
zhaocy
9e3ade03ed 重置玩家活跃度 2022-07-28 11:58:47 +08:00
liwei1dao
2b4e932c6e 补充密钥无效的错误日志 2022-07-28 11:33:01 +08:00
liwei1dao
394dfde6b1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-28 10:59:51 +08:00
liwei1dao
5cb32b352e 上传商店批量购买处理 2022-07-28 10:59:47 +08:00
f4c0ecea3a 优化 2022-07-27 20:39:01 +08:00
zhaocy
2a06c90585 配置空判断 2022-07-27 14:28:01 +08:00
liwei1dao
e36e16ae92 gm 2022-07-27 14:16:21 +08:00
liwei1dao
1e4244a8b4 上传商店bug修复 2022-07-27 10:57:47 +08:00
599aa44c6f Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 23:15:19 +08:00
6953df5cd2 属性优化 2022-07-26 23:14:52 +08:00
zhaocy
b4b32c4f5d 活跃度变更修改 2022-07-26 23:10:31 +08:00
zhaocy
49fc4d1d50 更新配置 2022-07-26 22:05:15 +08:00
liwei1dao
cb71088ab2 修复物品新标识为处理问题 2022-07-26 20:17:47 +08:00
liwei1dao
398783c256 上传item 写入mgo日志异常bug修复 2022-07-26 20:12:32 +08:00
liwei1dao
158a66407c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 19:53:44 +08:00
liwei1dao
99388bf759 上传mgo 日志 异常 检测 2022-07-26 19:53:40 +08:00
6473ad595b 共鸣属性计算 2022-07-26 19:29:12 +08:00
zhaocy
fa2a7d0489 update errcode 2022-07-26 18:20:14 +08:00
b640d088b8 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 17:08:08 +08:00
9e2fd1fbb7 玩家离线清理玩家缓存数据 2022-07-26 17:07:44 +08:00
zhaocy
ea86522c75 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 16:53:00 +08:00
zhaocy
d17ad438d4 清空缓存 2022-07-26 16:52:53 +08:00
liwei1dao
6036aefa5b 上传聊天数据读取的 2022-07-26 15:57:30 +08:00
liwei1dao
9706fc4847 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 15:14:41 +08:00
liwei1dao
9f4e3edac8 上传lua 集群处理 2022-07-26 15:14:37 +08:00
d9203fae7d 加日志 2022-07-26 15:05:29 +08:00
35b47d8491 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 13:58:13 +08:00
0e38efe9d3 离线事件监听。离线清除玩家缓存信息 2022-07-26 13:57:54 +08:00
liwei1dao
fc27cf0d09 上传shop 协议补充 2022-07-26 13:40:35 +08:00
liwei1dao
c5b5cb452c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 11:36:27 +08:00
liwei1dao
969be76600 上传shop 模块剩余次数返回 2022-07-26 11:36:07 +08:00
5608c5824b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-26 10:26:31 +08:00
3c93c6a3d0 添加测试文件 2022-07-26 10:26:15 +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
f5a202bfea Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-26 09:40:17 +08:00
5e0e0391e3 抽卡 2022-07-26 09:39:40 +08:00
zhaocy
8978d1f372 更新任务列表bug 2022-07-26 09:30:46 +08:00
zhaocy
e65167a016 更新成就 2022-07-25 22:01:00 +08:00
zhaocy
5a9a34816f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 21:54:30 +08:00
zhaocy
4d5cedc949 修改成就任务 2022-07-25 21:52:14 +08:00
650ac5fd4f 英雄对象返回 2022-07-25 21:28:59 +08:00
5947d5dfd5 推送英雄变更数据 2022-07-25 21:09:25 +08:00
f3fb53e13c Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 18:44:43 +08:00
cd77830576 克隆数据清理装备数据 2022-07-25 18:44:10 +08:00
zhaocy
c8f8f19bd1 更新捏人 2022-07-25 18:40:01 +08:00
zhaocy
b1e30b250b 形象配置 2022-07-25 18:40:01 +08:00
zhaocy
4b2873db8e 等级推送 2022-07-25 18:40:01 +08:00
zhaocy
ef6f6efa69 玩家等级优化 2022-07-25 18:40:00 +08:00
liwei1dao
88ae9d1694 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 18:39:55 +08:00
e06b0d8d31 属性计算优化 2022-07-25 18:39:12 +08:00
liwei1dao
61ef1a3ce2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 18:14:28 +08:00
10fb331b52 克隆英雄对象 2022-07-25 18:13:27 +08:00
liwei1dao
53076796e5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 17:36:34 +08:00
97beb8c48d 数据结构调整 2022-07-25 17:35:06 +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
7d3628f6dc 报错修改 2022-07-25 16:23:29 +08:00
1c577a821f 抽卡活动 2022-07-25 16:18:35 +08:00
liwei1dao
4573ab8a64 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-25 16:10:35 +08:00
liwei1dao
ffde5decbe 上传创角回应修改 2022-07-25 16:10:09 +08:00
09572897b6 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-25 15:55:56 +08:00
05cd8a2d5c 优化接口 返回指针对象 2022-07-25 15:55:33 +08:00
liwei1dao
3be9f754ba 修改商店模块购买次数共享bug 2022-07-25 15:41:58 +08:00
c7d8bc15dc 资源id 由原来的int 转string 2022-07-25 14:41:44 +08:00
720aca33dc 英雄堆叠数量优化 2022-07-25 12:00:06 +08:00
liwei1dao
e2a480b1c4 上传代码 2022-07-23 16:27:08 +08:00
6f61a5102a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 01:40:28 +08:00
4335663fbc 英雄优化 2022-07-23 01:40:20 +08:00
liwei1dao
6442e4aff2 修改物品使用的消息推送机制 2022-07-23 01:00:57 +08:00
liwei
1f97b9f5be Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 00:30:49 +08:00
liwei
45ac29b18a 上传装备bug修复 2022-07-23 00:30:34 +08:00
c81e76b1d6 英雄叠加 2022-07-23 00:29:32 +08:00
251526932d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-23 00:19:10 +08:00
1bd6d9dfaf 堆叠数量bug 2022-07-23 00:18:46 +08:00
liwei1dao
3d3b3b8553 上传道具修改 2022-07-22 23:29:25 +08:00
liwei1dao
33dbbbdebf Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 23:18:15 +08:00
liwei1dao
83d63a274a 上传物品购买返回空对象问题 2022-07-22 23:18:10 +08:00
zhaocy
ce60c619a8 更新任务进度 2022-07-22 23:16:02 +08:00
zhaocy
7a6a06614f 任务优化 2022-07-22 23:16:02 +08:00
02b2294af3 推送 2022-07-22 22:47:15 +08:00
82e8d0e608 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 22:14:46 +08:00
45c304c3d6 英雄变更推送打包 2022-07-22 22:14:21 +08:00
liwei
d520420919 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 22:06:16 +08:00
liwei
5755b8101a 上传物品叠加-1 的bug 2022-07-22 22:05:39 +08:00
1f6222e2bd 资源统一发放 有数据才推送 2022-07-22 22:04:32 +08:00
dc2ba18195 创角获取英雄的数据推送 2022-07-22 21:59:05 +08:00
liwei
49cffb0594 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 20:35:34 +08:00
liwei
58c51c3708 上传购买接口错误代码 2022-07-22 20:35:32 +08:00
liwei1dao
a2c64d9c8f 上传道具出售和使用代码 2022-07-22 20:33:25 +08:00
6397161f92 cominit 表名修改 2022-07-22 20:03:59 +08:00
liwei
5d21812274 上传商品购买扣费bug 2022-07-22 20:02:00 +08:00
liwei1dao
2686593ab0 上传道具背包使用 2022-07-22 19:36:47 +08:00
liwei1dao
991c40f416 上传道具使用配置 2022-07-22 19:35:59 +08:00
liwei1dao
46cdc69c14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 19:34:32 +08:00
liwei1dao
2bf8b2bf12 上传道具使用配置 2022-07-22 19:34:05 +08:00
zhaocy
374d9ce3c9 删除不用的接口 2022-07-22 19:21:06 +08:00
liwei
79024873d5 上传商店消耗代码 2022-07-22 19:10:37 +08:00
liwei
34307b6b72 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 19:09:27 +08:00
liwei1dao
efc585f8e3 上传商店购买金币消耗异常问题 2022-07-22 19:09:16 +08:00
02fc1a4e2b 抽卡消耗 增加一些错误码 2022-07-22 19:08:52 +08:00
liwei
aee37daac5 上传道具使用和出售 2022-07-22 18:31:24 +08:00
zhaocy
544dd3b374 删除错误引用 2022-07-22 18:25:19 +08:00
zhaocy
4f32f23c0f 接口测试 2022-07-22 18:25:17 +08:00
zhaocy
a087b3f668 增加任务类型 2022-07-22 18:24:14 +08:00
liwei1dao
8a10729d97 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 18:09:49 +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
liwei1dao
5ab2a02575 上传道具使用集合出售 2022-07-22 18:09:07 +08:00
cc3452d881 离线通知dbservice 抽卡优化 2022-07-22 18:08:51 +08:00
liwei1dao
b9650a5ea6 上传gm接口代码 2022-07-22 17:05:28 +08:00
liwei1dao
77e141ec29 上传装备套装数据维护 2022-07-22 16:41:40 +08:00
liwei1dao
233f9f4367 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 16:37:08 +08:00
liwei1dao
6052a984b0 上传离线推送跨服集群 2022-07-22 16:36:50 +08:00
liwei1dao
999c7f3c41 上传用户离线通知日志服务器处理数据同步 2022-07-22 16:21:31 +08:00
liwei1dao
bf921ff420 上传武器装备异常日志 2022-07-22 16:10:24 +08:00
90675a76d7 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:53:46 +08:00
36c74e2323 同步套装id信息 2022-07-22 15:53:40 +08:00
liwei1dao
9d3294f068 上传装备 一件多穿的bug 2022-07-22 15:53:18 +08:00
liwei1dao
ae13a7f85c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 15:18:03 +08:00
liwei1dao
9f6f4b5bc0 上传自动注册gm api 和武器接口优化 2022-07-22 15:17:49 +08:00
257e044e08 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 14:29:36 +08:00
7326b8209d 获取图鉴信息 2022-07-22 14:29:15 +08:00
liwei1dao
3c5c9d4c55 上传商店最后售价 2022-07-22 13:58:50 +08:00
8050f7a77d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:56:42 +08:00
0ca4bc689a 升级后等级差值穿给任务模块 2022-07-22 11:56:16 +08:00
liwei
2df1a12c58 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	bin/gateway
	bin/mainte
	bin/start.sh
	bin/stop.sh
	bin/worker
2022-07-22 11:54:46 +08:00
zhaocy
893c3eec6e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-22 11:45:16 +08:00
zhaocy
865df37ac3 更新测试 2022-07-22 11:45:09 +08:00
52b0aeaf35 邮件优化 增加一些错误码 2022-07-22 11:31:15 +08:00
fc3420bfb8 附件领取用户校验 2022-07-22 10:50:07 +08:00
liwei
e4653a0112 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 20:48:33 +08:00
zhaocy
9989b8376f 修改用户初始 2022-07-21 20:34:10 +08:00
2250c07da4 创角获得道具按配置表数据填充 2022-07-21 20:23:04 +08:00
62000a8ef9 解决冲突 2022-07-21 19:56:40 +08:00
690f23f480 主线任务默认第一章节 2022-07-21 19:54:24 +08:00
b4281c9c84 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 19:47:14 +08:00
6ca39af90a 英雄升级任务统计 打印错误日志 2022-07-21 19:46:45 +08:00
zhaocy
3579db4eae 更新配置 2022-07-21 19:45:00 +08:00
zhaocy
3c439e2aa2 修改属性计算 2022-07-21 19:44:02 +08:00
zhaocy
2b59b99946 更改任务key 2022-07-21 19:44:01 +08:00
zhaocy
49ae24219c 任务完成推送 2022-07-21 19:43:57 +08:00
21e6225520 属性推送合并,增加一些错误码 2022-07-21 19:13:52 +08:00
liwei
3fcf0b4e09 修复codec编码工具错误代码 2022-07-21 18:23:19 +08:00
fe5fae9ca8 主线章节挑战完成后推送新的章节 2022-07-21 17:43:31 +08:00
liwei
00eec6c3c6 上传武器消息推送错误 2022-07-21 17:03:14 +08:00
448875978a Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 16:05:06 +08:00
56a013a5c4 推送消息合并 2022-07-21 16:04:35 +08:00
liwei
86fe4f9bed 修复武器列表同步问题 2022-07-21 14:44:29 +08:00
liwei1dao
0b347d7f2e Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 14:42:15 +08:00
liwei1dao
9d39dc141e 上传武器装备数据更新异常bug 2022-07-21 14:42:11 +08:00
3809abc381 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-21 11:58:59 +08:00
a943ca337a 添加邮件测试功能,修复堆叠英雄bug 2022-07-21 11:58:54 +08:00
liwei1dao
253386266f 修复上传消息推送bug以及服务发现bug 2022-07-21 11:56:22 +08:00
liwei1dao
28d91331f5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-21 09:34:50 +08:00
d5de595b59 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-20 21:22:53 +08:00
595d83581f 报错处理,英雄变更消息推送 2022-07-20 21:22:35 +08:00
zhaocy
1204eb0212 用户数据初始化 2022-07-20 21:14:19 +08:00
liwei1dao
27a6f9d7f0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-20 21:05:00 +08:00
liwei1dao
4bb0dc308a 上传聊天调试优化代码 2022-07-20 21:04:34 +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
liwei1dao
335aa7284b 上传聊天服务代码 2022-07-20 17:56:09 +08:00
zhaocy
3946216c04 用户设置 2022-07-20 17:44:15 +08:00
zhaocy
2333b055bb 装备叠卡修改 2022-07-20 17:42:45 +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
0099f3d01c 抽卡 2022-07-19 19:38:32 +08:00
liwei1dao
0031d7bfe8 上传聊天模块跨服成员聊天维护 2022-07-19 19:35:58 +08:00
13800c4273 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-19 18:38:47 +08:00
f8c111a669 加一些错误码,再加一些数据校验 2022-07-19 18:37:38 +08:00
liwei1dao
3eef4844c6 上传聊天系统以及底层通信扩展 2022-07-19 18:09:45 +08:00
zhaocy
19c7bfdb84 卡牌攻略 2022-07-19 16:23:18 +08:00
zhaocy
094c47885f 更新消卡逻辑 2022-07-19 14:36:00 +08:00
989cc98065 抽卡配置表解析, 推送协议大写改小写 2022-07-19 14:32:38 +08:00
23ea4597bc 消耗英雄推送消息 2022-07-19 13:48:48 +08:00
6e0a8c9a7d 接口参数uid 改session对象 2022-07-19 12:05:31 +08:00
c72a7edde2 属性推送subType 2022-07-19 11:03:06 +08:00
zhaocy
1251ec38a0 添加攻略类型 2022-07-19 10:49:03 +08:00
zhaocy
d49aae3ab7 修改英雄叠加逻辑 2022-07-19 10:49:03 +08:00
d8d9079065 协议修改 2022-07-19 10:37:45 +08:00
liwei1dao
9320b53f45 上传聊天模块以及底层消息广播接口 2022-07-18 18:37:06 +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
73b72596fb 所有添加资源的地方打印日志,方便定位问题 2022-07-18 17:09:12 +08:00
ac8e54f599 主线章节 字段变更 2022-07-18 16:51:26 +08:00
93df38efd2 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 16:13:49 +08:00
c22b917747 配置表更新 2022-07-18 16:13:28 +08:00
zhaocy
76dfb1651f update 2022-07-18 15:30:28 +08:00
zhaocy
aa253f24ec 修改是否叠加的判断 2022-07-18 15:03:11 +08:00
62c05813e3 配置文件变更 2022-07-18 15:02:30 +08:00
0c338b2465 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 14:11:12 +08:00
dba9df09f2 添加测试协议 2022-07-18 14:10:48 +08:00
zhaocy
e82097fa14 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-18 13:39:04 +08:00
zhaocy
a6d674cf1e 接口测试 2022-07-18 13:39:00 +08:00
liwei1dao
c9d1d5b655 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-18 11:14:33 +08:00
liwei1dao
938d4b47fc 上传商店折扣结算 2022-07-18 10:58:37 +08:00
8d7e6fca4e 道具不足详细日志 2022-07-18 10:40:40 +08:00
liwei1dao
fe776970a9 上传道具出售接口 2022-07-18 10:10:56 +08:00
liwei1dao
3db2d0dc46 上传hero_test 测试脚本 2022-07-18 09:28:59 +08:00
liwei1dao
928f2ccc11 修复codec 编码库json解析错误 2022-07-15 21:10:56 +08:00
liwei1dao
f8653cdd3d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-15 20:08:19 +08:00
liwei1dao
9e699cc116 提交道具背包优化 2022-07-15 20:08:03 +08:00
59ed0e621a 英雄升级协议调整 2022-07-15 18:40:07 +08:00
3c1aad6c92 配置表数据同步 2022-07-15 17:44:57 +08:00
3ff97fd76d Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-15 16:41:48 +08:00
fe034ea284 增加一些错误码 2022-07-15 16:41:20 +08:00
liwei1dao
840bc4c986 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-15 16:15:04 +08:00
liwei1dao
12b8a79432 上传redis 批量读写优化 2022-07-15 16:14:54 +08:00
liwei1dao
a2273fa1d1 优化redis 批量读写 2022-07-15 16:03:03 +08:00
1f036cc7a4 新增一些错误码 2022-07-15 15:20:46 +08:00
2d7405baea update 2022-07-15 13:42:08 +08:00
0d9b59a4c3 报错 2022-07-15 10:57:47 +08:00
zhaocy
c87bca9004 接口测试 2022-07-15 10:37:11 +08:00
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
liwei1dao
025f80cd7c 上传修复 item 数据没有uid 字段错误 2022-07-14 16:08:12 +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
c413f3a99c 上传跨服调用远程消息处理 2022-07-14 11:43:37 +08:00
liwei1dao
5df960b247 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-14 09:35:32 +08:00
liwei1dao
6baa4d5197 上传武器资源更改消息推送 2022-07-13 19:30:50 +08:00
liwei1dao
2071a13416 上传资源更改消息推送 2022-07-13 19:30:09 +08:00
liwei1dao
522aa5e01f 上传公告系统后台接口 2022-07-13 18:59:04 +08:00
liwei1dao
f47005cc18 上传编解码优化 2022-07-13 18:20:27 +08:00
liwei1dao
51f729dcd6 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:50:39 +08:00
liwei1dao
5036f6b2b0 上传API接口校验扫描 2022-07-13 16:50:35 +08:00
71bac26e10 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:31:14 +08:00
7c0ea7a0c9 统一接口处理日志 2022-07-13 16:30:39 +08:00
zhaocy
0b7f26bab3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-13 16:17:38 +08:00
zhaocy
fb3a2ce08a 支持测试接口连续调用 2022-07-13 16:17:33 +08:00
liwei1dao
1a96cde1c8 回复mgolog 目录 2022-07-13 16:15:10 +08:00
liwei1dao
710f28831e 上传日志优化 2022-07-13 16:12:56 +08:00
liwei1dao
c251a63adc 上传网关日志开关 2022-07-13 15:50:19 +08:00
liwei1dao
acbeae031c 伤处模块日志优化 2022-07-13 15:46:27 +08:00
liwei1dao
2bb353817e 上传日志优化代码 2022-07-13 15:06:48 +08:00
liwei1dao
0e7e6169a2 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-13 15:06:19 +08:00
8b8595a7de 部分函数subType 修改 2022-07-13 14:32:01 +08:00
liwei1dao
3af54fdb14 上传gm模块补充 2022-07-13 14:14:26 +08:00
e40621b335 数据校验 2022-07-13 11:32:06 +08:00
liwei1dao
c6c2b5daae 开发系统公告 2022-07-13 11:25:37 +08:00
cfc9a018f0 去掉不需要的打印信息 2022-07-13 09:35:32 +08:00
liwei1dao
3e119d80df 上传底层编码库代码优化 2022-07-12 20:38:49 +08:00
2b49c1f082 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-12 17:17:16 +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
liwei1dao
89ee5478d2 上传底层反射优化代码 2022-07-12 17:13:59 +08:00
zhaocy
c046fe1b12 测试用例支持递归处理 2022-07-12 16:12:29 +08:00
liwei1dao
afecd0e065 上传编解码系统优化 2022-07-12 14:24:28 +08:00
1ef8ec4073 uid 创建索引 2022-07-12 11:06:07 +08:00
bd548b5ff5 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-07-12 10:48:21 +08:00
a8d5b601b5 update 2022-07-12 10:47:49 +08:00
zhaocy
c1b506f25e 列表中初始属性 2022-07-12 10:34:06 +08:00
zhaocy
a564f3dcf5 deprecated method 2022-07-11 18:55:44 +08:00
zhaocy
549be3d0ba 修改消卡 2022-07-08 11:25:10 +08:00
zhaocy
83dd0f905f 更新配置 2022-07-07 19:22:11 +08:00
2b979efb5c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-07 17:53:37 +08:00
7cba00531a check 2022-07-07 17:52:44 +08:00
zhaocy
4762680af6 修改任务处理 2022-07-07 17:27:26 +08:00
zhaocy
e0522afbe8 修改check 2022-07-07 17:01:58 +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
5f7d75b6af 修改英雄详情 2022-07-07 15:07:06 +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
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
d841560c25 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-05 11:31:12 +08:00
liwei1dao
e8a1a1f51d 测试shop buy接口 2022-07-05 11:30:43 +08:00
liwei1dao
23976f7cd2 修复测试shop系统代码, 2022-07-05 11:08:20 +08:00
952557ffaf 邮件附件类型定义ATN 类型 并调用通用加道具接口 2022-07-05 11:06:25 +08:00
2e7050e6ee 升级消耗 2022-07-04 20:17:02 +08:00
e4ff953a13 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 19:24:51 +08:00
0234d141e7 消耗资源接口调用 2022-07-04 19:24:21 +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
622c4ef343 添加ip 2022-07-04 17:55:54 +08:00
zhaocy
2428fd27bb 服务列表接口 2022-07-04 17:48:54 +08:00
zhaocy
b5b3b11691 用户会话接口 2022-07-04 17:48:54 +08:00
30dadce861 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 17:35:37 +08:00
fe136f26ea 创建邮件接口 2022-07-04 17:15:01 +08:00
zhaocy
df746c0bc0 添加用户等级 2022-07-04 17:13:47 +08:00
5aefe22270 修复英雄共鸣bug 2022-07-04 17:05:29 +08:00
zhaocy
b5680788f4 改checklist手动调用 2022-07-04 14:56:06 +08:00
76dc1a3574 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 14:19:07 +08:00
4e1e05dc79 check 方法调用 2022-07-04 14:18:31 +08:00
liwei1dao
0ccbf30291 处理道具背包接口bug 2022-07-04 13:55:49 +08:00
liwei1dao
19f9759e63 上传武器的装配修复 2022-07-04 12:06:05 +08:00
5a3c7d08b4 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 11:44:43 +08:00
zhaocy
d3fc1d40e9 初始英雄技能 2022-07-04 11:43:27 +08:00
05c317072f 觉醒成功 修改技能保存玩家技能数据 2022-07-04 11:33:13 +08:00
zhaocy
491b7a271e 修复金币初始化 2022-07-04 11:23:06 +08:00
13648d9471 消耗英雄卡片 2022-07-04 10:59:57 +08:00
4a17e34518 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-07-04 10:50:02 +08:00
a1d04d68d6 属性变化计算 2022-07-04 10:49:23 +08:00
zhaocy
fcbf950fde 修改协议名 2022-07-04 10:40:59 +08:00
liwei1dao
d1ae2a1878 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-07-04 10:14:50 +08:00
zhaocy
0ae51dfa29 修改响应命名 2022-07-04 10:13:39 +08:00
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
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
5ac2fd6137 英雄 装备 数据结构 2022-06-22 19:28:34 +08:00
liwei1dao
db9910c066 移除背包的db组件 2022-06-21 15:45:50 +08:00
eb638559cf Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 15:05:23 +08:00
44465ef6ea 报错 2022-06-21 15:04:59 +08:00
51c3854979 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 15:02:19 +08:00
5d1f1f90a0 报错修改 2022-06-21 15:01:54 +08:00
liwei1dao
25257fcf9a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 14:54:47 +08:00
liwei1dao
900cededc5 上传消息分法配置系统 2022-06-21 14:54:42 +08:00
89ce9e9b08 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-21 14:22:24 +08:00
500753f1af 启动dbservice 先检验日志表是否有数据没写完 2022-06-21 14:20:56 +08:00
zhaocy
c864dd5432 重名uid 2022-06-21 14:02:36 +08:00
aa426a1328 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-21 14:00:37 +08:00
fad5a938a5 uid 当做索引 2022-06-21 14:00:20 +08:00
liwei1dao
14710e9893 同步dev 2022-06-21 13:55:52 +08:00
liwei1dao
f0df016e8b Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-21 13:53:10 +08:00
liwei1dao
f13f5da1c5 上传pb tag标签处理 2022-06-21 13:50:56 +08:00
liwei1dao
107ff99562 优化redis 以及model接口 2022-06-21 13:42:06 +08:00
f54b2985ac Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-21 12:00:00 +08:00
zhaocy
6b5d3f93be 统一字段命名 2022-06-21 11:58:46 +08:00
5b4517d0a8 Merge branch 'liwei' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-21 11:52:31 +08:00
7cf62a2056 日志接口查询 2022-06-21 11:08:06 +08:00
liwei1dao
e464879799 调整背包数据层接口 2022-06-20 14:44:56 +08:00
zhaocy
182e3743ad 所有协议加上秘钥认证 2022-06-17 18:28:35 +08:00
zhaocy
cab6a2d07b robot统一通知处理 2022-06-17 16:59:44 +08:00
zhaocy
028727449b 添加缓存失效设置 2022-06-17 16:34:09 +08:00
zhaocy
7de30d1a69 修改网关秘钥校验 2022-06-17 16:34:08 +08:00
b007be914d update 2022-06-17 15:52:07 +08:00
def537a01a 优化 2022-06-17 15:46:07 +08:00
a54dcebfe9 类型同步修改 2022-06-17 14:11:12 +08:00
zhaocy
ce3440d7f9 数据层接口测试 2022-06-17 13:51:43 +08:00
zhaocy
4da4c572e5 更新接口chk 2022-06-16 20:26:20 +08:00
zhaocy
bba410cb3c 优化hm字段的更新 2022-06-16 19:00:50 +08:00
zhaocy
67190818ae 数据层接口修改 2022-06-16 18:31:08 +08:00
c3ae56797a 上传协议规范格式 2022-06-16 16:17:40 +08:00
liwei1dao
58555cd808 上传协议规范格式 2022-06-16 16:05:39 +08:00
zhaocy
10941376f1 修改errcode 2022-06-16 15:28:08 +08:00
zhaocy
ee5f7f899e 修改user接口 2022-06-16 15:21:34 +08:00
zhaocy
24749bb718 修改friend接口 2022-06-16 15:14:46 +08:00
zhaocy
db0df37526 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 15:13:08 +08:00
1b32f51406 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 15:01:18 +08:00
bcd9ef78bb 优化api 校验接口返回参数设计 2022-06-16 15:01:07 +08:00
liwei1dao
2b9ac7d902 修复网关模块api接口调整 2022-06-16 14:57:46 +08:00
liwei1dao
ef5f831319 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 14:53:31 +08:00
liwei1dao
d3dfc01011 优化api 校验接口返回参数设计 2022-06-16 14:53:28 +08:00
a3ecb3f3f5 api checke 2022-06-16 13:46:20 +08:00
liwei1dao
4bd57b56fd 上传统一错误码消息实现 2022-06-16 12:26:49 +08:00
3c8183b5f8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-16 11:40:20 +08:00
e5a8d3a710 接口修改 数据同步 2022-06-16 11:39:09 +08:00
zhaocy
494502ed5e 修改session缓存 2022-06-15 19:46:24 +08:00
zhaocy
b4ec3d86fb 修改api check 2022-06-15 19:25:55 +08:00
zhaocy
3879ccf652 add check 2022-06-15 18:40:05 +08:00
d9a5fbe5ba 报错修改 2022-06-15 18:37:36 +08:00
zhaocy
f6ccb37e3b 初始化修复 2022-06-15 17:46:13 +08:00
zhaocy
c7278719ba 更新db接口调用 2022-06-15 17:36:09 +08:00
25cc58223c 去掉不需要的引用 2022-06-15 16:23:26 +08:00
7bed325224 接口参数校验 2022-06-15 14:46:59 +08:00
c16a4648fe Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-15 14:17:22 +08:00
fee90b333d 模块整理,优化 2022-06-15 14:16:46 +08:00
zhaocy
b053cde0a3 拆分模块方法 2022-06-15 14:09:41 +08:00
zhaocy
e387e9b8e5 更新user缓存结构 2022-06-15 14:09:41 +08:00
zhaocy
d373a401de 暂存 2022-06-15 14:09:41 +08:00
zhaocy
924da6fdd8 暂存pull dev 2022-06-15 14:09:41 +08:00
zhaocy
b9d51378f3 添加判空 2022-06-15 14:09:40 +08:00
zhaocy
69cfaf0737 model创建 2022-06-15 14:09:40 +08:00
liwei1dao
c7517d345a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-15 13:36:13 +08:00
liwei1dao
35be79ffc7 补充项目接口注释说明 2022-06-15 13:35:36 +08:00
b912c45092 db cache 模块合并 2022-06-15 11:24:42 +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
liwei1dao
3bf2feba6b 上传 模块测试 模板 2022-06-14 17:33:22 +08:00
liwei1dao
7081e9a8cb 上传接口调整代码 2022-06-14 15:36:58 +08:00
liwei1dao
8ff4813033 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 15:32:29 +08:00
liwei1dao
ea15865a4a 上传测试脚本代码 2022-06-14 15:32:15 +08:00
0211168611 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 15:27:21 +08:00
7737d3be78 结构调整 2022-06-14 15:26:47 +08:00
liwei1dao
76cdd23c91 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-14 15:23:37 +08:00
liwei1dao
4931d310e2 去除底层互相引用方式该由上层按需执行保存引用对象 2022-06-14 15:21:49 +08:00
f113741536 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-14 14:23:37 +08:00
liwei1dao
11a63977c3 上传基类模块接口定义类型转换异常的bug修复 2022-06-14 14:23:20 +08:00
0b1757a11d 参数名修改 2022-06-14 14:23:16 +08:00
7025402736 报错 2022-06-14 14:07:38 +08:00
e530dd6ed7 Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 13:47:20 +08:00
1a08906062 db 模块迁移 2022-06-14 13:46:43 +08:00
liwei1dao
b3226065b9 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-14 13:40:10 +08:00
liwei1dao
3f3721abb2 调整基础模块基础组件接口 2022-06-14 13:40:06 +08:00
c63c16a2b7 报错修改 2022-06-14 12:54:40 +08:00
fd6903dcf1 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-14 12:47:53 +08:00
43850fdd5d 测试文件 2022-06-14 12:47:35 +08:00
liwei1dao
91bc6c65a6 上传db优化 2022-06-14 11:42:24 +08:00
liwei1dao
c9b1b47f4d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-14 11:41:22 +08:00
liwei1dao
0b7aea4610 优化基础业务模块基类接口 2022-06-14 11:40:32 +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
84005d7974 还原redis接口 2022-06-13 20:47:32 +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
a36305f174 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-13 18:03:52 +08:00
0ab655b9c4 数据库操作类型定义枚举 2022-06-13 18:03:35 +08:00
liwei1dao
46f33d6e73 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 18:00:35 +08:00
liwei1dao
46cf7e2740 上传基础缓存组件和db组件的初始化过程 2022-06-13 18:00:18 +08:00
liwei1dao
bf91c8c8d2 上传缓存基础组件命名错误 2022-06-13 17:41:49 +08:00
b9ddf78232 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-13 17:40:26 +08:00
10f5922475 日志写表 2022-06-13 17:40:10 +08:00
liwei1dao
34351ec69b 优化redis 哈希接口 2022-06-13 13:58:17 +08:00
liwei1dao
1d53007bf7 修复背包模块代码错误 2022-06-13 12:42:34 +08:00
liwei1dao
f78a2e20bc 上传 背包数据结构调整优化 2022-06-13 12:36:36 +08:00
liwei1dao
20ef5c5280 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-13 11:01:31 +08:00
liwei1dao
a1c923fbf8 暂存修改 2022-06-13 11:01:02 +08:00
zhaocy
4733acd291 更新user字段 2022-06-13 10:59:44 +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
liwei1dao
d4d8c074e0 保存rpcx代码优化 2022-06-10 19:22:02 +08:00
zhaocy
cfd3cba23b 更新好友接口 2022-06-10 14:20:25 +08:00
zhaocy
2c2457f2ac proto替换Any 2022-06-10 14:20:05 +08:00
zhaocy
9277322537 测试好友接口2 2022-06-09 19:03:58 +08:00
zhaocy
43c75ecc5c 好友接口测试1 2022-06-09 18:45:50 +08:00
liwei1dao
cdf146f287 上传代码 2022-06-09 16:10:20 +08:00
liwei1dao
8ca83cb6ab 上传背包相关接口优化 2022-06-09 15:15:52 +08:00
5a94516649 接口拆分 分类 2022-06-09 14:08:57 +08:00
liwei1dao
152a8d859e 拆分api文件 2022-06-09 13:36:57 +08:00
liwei1dao
f9185698e0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-09 11:26:10 +08:00
liwei1dao
83e65faf96 上传背包接口补充 2022-06-09 11:24:49 +08:00
f7725db74b 报错修改 2022-06-09 11:10:14 +08:00
616198cf8e 编码规范 增加注释 2022-06-09 10:34:10 +08:00
4cd16973eb 编码规范 增加注释 2022-06-09 10:33:45 +08:00
0b5359589b 代码注释 增加测试接口 2022-06-08 19:36:28 +08:00
liwei1dao
0a9e855257 补充代码注释 2022-06-08 19:10:43 +08:00
zhaocy
3dbdfdf8a7 添加创角事件 2022-06-08 18:00:58 +08:00
zhaocy
8252162014 更新好友db 2022-06-08 18:00:58 +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
zhaocy
d74fdd9f6f 注册好友模块 2022-06-08 14:49:27 +08:00
liwei1dao
a65a61604f Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-08 14:35:05 +08:00
liwei1dao
ec3acfc7b6 上传梦工厂golang项目说明文档 2022-06-08 14:34:40 +08:00
zhaocy
7223f11afb 优化机器人测试输入出 2022-06-08 10:32:52 +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
534677cb1f Merge branches 'dev' and 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-07 20:10:11 +08:00
35a1353df5 邮件协议完善 2022-06-07 20:05:07 +08:00
liwei1dao
aa47570de9 上传测试代码 2022-06-07 19:50:08 +08:00
zhaocy
c5e99c6604 好友协议 2022-06-07 19:45:52 +08:00
zhaocy
1a4aa01d1e Merge branch 'f67' into dev
# Conflicts:
#	pb/mail.pb.go
#	pb/user_db.pb.go
2022-06-07 18:32:36 +08:00
zhaocy
8048801620 创角 2022-06-07 18:14:49 +08:00
1fda87e83d Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-07 17:31:00 +08:00
f85141f6f8 邮件协议完善 2022-06-07 17:28:00 +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
1caf66f729 。。。 2022-06-07 10:19:31 +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
zhaocy
6e9bad8887 Merge branch 'dev' into f66
# Conflicts:
#	modules/user/login_comp.go
2022-06-07 10:05:51 +08:00
zhaocy
e122abaa4b update 2022-06-07 10:03:04 +08:00
liwei1dao
10b415789c Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into liwei 2022-06-07 10:00:29 +08:00
liwei1dao
7ada2ce4a4 上传uid 类型优化 2022-06-07 09:59:48 +08:00
liwei1dao
7a13637dd3 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-06-06 19:46:18 +08:00
liwei1dao
8e8efe12d2 上传代码协议优化 2022-06-06 19:33:51 +08:00
zhaocy
81f1c47c05 update sendmsg params 2022-06-06 18:50:12 +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
941fbc2b0a Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-06-06 17:42:38 +08:00
liwei1dao
3e39b41446 上传背包系统代码 2022-06-06 17:35:15 +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
5e0724c795 读取配置文件 2022-06-06 15:58:03 +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
zhaocy
b8e69234ee update robot 2022-06-06 14:40:16 +08:00
liwei1dao
1c1aec3cc8 上传数据库结构模板 2022-06-06 13:45:59 +08:00
zhaocy
42ca630ca9 login 2022-06-01 19:39:51 +08:00
liwei1dao
aeb1a1ab4d 优化用户路由祖册接口 2022-06-01 17:41:48 +08:00
liwei1dao
7550002f7a 扩展基础模块内置接口 2022-06-01 16:38:01 +08:00
liwei1dao
ba8e0f92c7 Merge branch 'master' of http://git.legu.cc/liwei_3d/go_dreamfactory 2022-06-01 15:58:03 +08:00
liwei1dao
1b0b37dc2e 上传基础模块接口补充 2022-06-01 15:57:46 +08:00
zhaocy
932f1ec591 Merge branch 'master' of http://git.legu.cc/liwei_3d/go_dreamfactory 2022-06-01 15:55:45 +08:00
zhaocy
277739e2b7 db测试 2022-06-01 15:53:16 +08:00
liwei1dao
126ff41523 上传代码 2022-06-01 14:52:33 +08:00
liwei1dao
0e1f31c0b9 上传配置中心系统接口代码 2022-06-01 13:41:31 +08:00
liwei1dao
98a97f3ce7 优化项目结构 2022-06-01 09:27:35 +08:00
liwei1dao
cec2f4ced8 上传用户消息回复 2022-05-31 18:47:34 +08:00
liwei1dao
ae8827b476 上传RPC 服务定义 2022-05-31 17:08:25 +08:00
liwei1dao
670342ec91 上传消息分发处理 2022-05-31 16:35:44 +08:00
liwei1dao
8fe33b1347 上传有路由代码 2022-05-31 10:00:20 +08:00
liwei1dao
e45751e8f7 上传初始项目代码 2022-05-30 19:03:11 +08:00
liwei1dao
2d94990066 上传服务代码 2022-05-30 16:28:02 +08:00
liwei1dao
e98230033f 上传演示项目代码 2022-05-30 10:34:12 +08:00
liwei1dao
bb583c2663 上传初始化项目代码 2022-05-27 17:27:01 +08:00