liwei
|
25fbd68de0
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
Conflicts:
bin/json/game_opencond.json
|
2023-02-01 10:06:32 +08:00 |
|
liwei
|
82c4fc443e
|
上传配置
|
2023-02-01 10:05:48 +08:00 |
|
liwei1dao
|
afa59bd93b
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-02-01 10:04:11 +08:00 |
|
liwei1dao
|
489ab8e5d1
|
上传日志优化
|
2023-02-01 10:02:34 +08:00 |
|
|
d29c62f0ee
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 18:33:51 +08:00 |
|
|
336f252f62
|
英雄属性测试优化
|
2023-01-31 18:33:48 +08:00 |
|
|
f13707e51b
|
加索引
|
2023-01-31 18:19:45 +08:00 |
|
|
a0e7048039
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 17:20:50 +08:00 |
|
|
67e02f6b82
|
更新配置
|
2023-01-31 17:20:41 +08:00 |
|
liwei1dao
|
69957984af
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 17:07:03 +08:00 |
|
liwei1dao
|
3c8acf0392
|
上传月子秘境异常修复
|
2023-01-31 17:06:45 +08:00 |
|
|
a483ba3cd7
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 15:27:16 +08:00 |
|
|
1a55e9119b
|
update
|
2023-01-31 15:27:09 +08:00 |
|
|
0ba8c286ed
|
GM 修改主线扩展数据
|
2023-01-31 15:22:24 +08:00 |
|
|
db6fb51a8b
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 15:05:04 +08:00 |
|
|
7d990f06c5
|
功能开发条件支持多条件
|
2023-01-31 15:04:58 +08:00 |
|
|
b0b3e3444b
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 14:32:03 +08:00 |
|
|
dd7b8379f5
|
扩展数据初始化
|
2023-01-31 14:32:00 +08:00 |
|
liwei1dao
|
f532b7d254
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 14:25:16 +08:00 |
|
liwei1dao
|
94a9cf9315
|
补充日志代码
|
2023-01-31 14:25:01 +08:00 |
|
|
90120d9ea9
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 12:01:14 +08:00 |
|
|
05d2d6de84
|
统计主线进度
|
2023-01-31 12:01:09 +08:00 |
|
liwei1dao
|
e0d59fc0f8
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 11:54:21 +08:00 |
|
liwei1dao
|
d3f7e71d9f
|
上传平台日志级别
|
2023-01-31 11:54:01 +08:00 |
|
|
d97813c6c2
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 10:44:53 +08:00 |
|
|
8bef7ca2dd
|
遗漏的索引
|
2023-01-31 10:44:48 +08:00 |
|
liwei1dao
|
ebbb0c9e5d
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-31 10:44:33 +08:00 |
|
liwei1dao
|
ac1b3b0be2
|
补充db层数据清理锁安全
|
2023-01-31 10:44:15 +08:00 |
|
|
9077626a90
|
创建索引
|
2023-01-30 18:11:30 +08:00 |
|
|
baa0517b64
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-30 18:01:45 +08:00 |
|
|
e1a312beeb
|
心跳设置断线时间戳为服务器偏移时间
|
2023-01-30 18:01:41 +08:00 |
|
liwei1dao
|
cc0d94ea6c
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-30 17:59:23 +08:00 |
|
liwei1dao
|
5f77fc4a81
|
上传跨服平台对接
|
2023-01-30 17:59:03 +08:00 |
|
|
6b4aa7e8b5
|
临时屏蔽
|
2023-01-30 17:45:38 +08:00 |
|
|
d27ece2da0
|
更改设置心跳断线时机
|
2023-01-30 17:31:52 +08:00 |
|
|
ec3610dc6e
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-30 17:27:19 +08:00 |
|
|
0978999824
|
错误日志
|
2023-01-30 17:27:14 +08:00 |
|
|
814a390b6c
|
测试工具加心跳
|
2023-01-30 17:06:00 +08:00 |
|
|
193d29d45d
|
serverdata
|
2023-01-30 16:28:57 +08:00 |
|
|
aa9ed96811
|
数据校验BUG
|
2023-01-30 15:04:20 +08:00 |
|
|
a58102ab4c
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-30 11:53:00 +08:00 |
|
|
1f20a523a5
|
加日志
|
2023-01-30 11:52:53 +08:00 |
|
|
24e4277d05
|
Merge branch 'meixiongfeng' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-29 18:38:36 +08:00 |
|
|
da2b2d4ced
|
邮件上限检测
|
2023-01-29 18:37:40 +08:00 |
|
liwei1dao
|
689f6368cf
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-29 18:12:09 +08:00 |
|
liwei1dao
|
5b74551605
|
上传wocket 清理代码
|
2023-01-29 18:11:50 +08:00 |
|
|
8ef9e83b19
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-29 15:03:50 +08:00 |
|
|
2b425befab
|
功能列表校验
|
2023-01-29 15:03:17 +08:00 |
|
liwei1dao
|
b0d5a9b892
|
Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
|
2023-01-29 15:03:05 +08:00 |
|
liwei1dao
|
c7d421e421
|
优化心跳代码
|
2023-01-29 15:02:51 +08:00 |
|