Commit Graph

805 Commits

Author SHA1 Message Date
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