Commit Graph

2850 Commits

Author SHA1 Message Date
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
liwei
b4047f86eb Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-02 09:46:11 +08:00
liwei1dao
50c50a4490 上传背包格子使用 完毕 清理的问题 2022-08-02 09:46:05 +08:00
liwei
c820816bf0 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
	modules/equipment/api_upgrade.go
2022-08-01 19:28:50 +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
liwei
94286b4292 装备等级上限处理 2022-08-01 19:04:42 +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
c50ccf05b8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev 2022-08-01 12:04:16 +08:00
7e8eb390e8 Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng 2022-08-01 12:03:29 +08:00
21899a4755 注册gm 2022-08-01 12:03:19 +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