Commit Graph

64 Commits (e28e8947234b3ed0191aa356fb81656777020892)

Author SHA1 Message Date
wangyuan 388b2e5495 bloody 2019-09-23 17:56:22 +08:00
wangyuan bdc84eb2fc reconnect 2019-09-23 17:20:02 +08:00
wangyuan 45fe740b3d cal score 2019-09-19 16:23:17 +08:00
wangyuan 3086a1f5bc fix bloody 2019-09-19 15:46:26 +08:00
wangyuan 5bc5543ce5 进入游戏狂欢时刻 2019-09-09 20:34:10 +08:00
wangyuan f5ec857e24 自动发现服务器 2019-09-09 16:07:11 +08:00
wangyuan f85de0b94c fix random 2019-09-09 12:38:21 +08:00
wangyuan 9dfd5db209 怪物正常化 2019-09-09 11:12:53 +08:00
wangyuan 082e21cadf fix creature 2019-09-09 11:11:28 +08:00
wangyuan 404ea07089 fix 2019-09-07 20:06:57 +08:00
wangyuan 0db40f7fde bloody 2019-09-07 20:03:06 +08:00
wangyuan 201f510e38 bloody 2019-09-07 14:12:09 +08:00
wangyuan 932a2bfe1b Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/StringUtil.java
2019-09-06 11:09:05 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00