liwei
10a7368f30
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-08 19:45:29 +08:00
liwei1dao
fb419359d0
上传编码指针代码内存重叠问题
2022-08-08 19:44:52 +08:00
liwei
4e29474ab9
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-08 19:08:04 +08:00
liwei1dao
fa554438c9
优化日志分割代码
2022-08-08 16:10:42 +08:00
liwei1dao
e167cce59e
上传日志文件备份优化
2022-08-08 15:56:15 +08:00
liwei
b5a9eb2ccc
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-08 14:29:51 +08:00
liwei1dao
280ec994c1
修复排序map输出
2022-08-08 14:29:30 +08:00
liwei
c6a2bf7dd8
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-08 14:06:27 +08:00
liwei1dao
6ce92147bb
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-08 14:05:43 +08:00
liwei1dao
76011b4405
上传新的日志系统以及编解码系统升级
2022-08-08 14:05:40 +08:00
liwei
46f722458e
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2022-08-08 10:51:17 +08:00
b9817ee6d5
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng
2022-08-08 09:28:29 +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
629dfcf2c1
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into meixiongfeng
2022-08-05 18:42:48 +08:00
liwei
d49a0553a7
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-05 16:49:55 +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
9caed95379
一键领取推送
2022-08-05 16:47:06 +08:00
liwei
beeedfbde1
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-05 16:16:23 +08:00
liwei1dao
b4ac656754
上传道具出售价格叠加bug
2022-08-05 16:15:59 +08:00
liwei
3f95be8396
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-04 11:52:53 +08:00
liwei1dao
a17c67077b
同步配置文件
2022-08-04 11:52:15 +08:00
liwei
f9bc78747b
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-04 11:48:14 +08:00
liwei1dao
8288147d00
上传配置更新
2022-08-04 11:47:13 +08:00
299a430127
整理优化
2022-08-03 17:53:32 +08:00
liwei
b5bb0016be
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-03 14:05:50 +08:00
5277ca09cf
技能升级 请求参数支持一次消耗多个技能卡
2022-08-03 14:05:06 +08:00
liwei
057555eb61
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-03 10:46:25 +08:00
e54b34c550
bug
2022-08-03 10:45:42 +08:00
liwei
a1d3c19257
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
2022-08-03 10:30:52 +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
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
