Commit Graph

264 Commits (fd8e564a1583ee66a253f69ca6571e622f5be093)

Author SHA1 Message Date
zhangshanxue bfdddc8158 异常和错误提示修改 2019-10-22 11:59:23 +08:00
wangyuan e74583c539 change hero table 2019-10-18 10:13:39 +08:00
wangyuan 8b01d62c24 fix bug 2019-10-17 16:29:14 +08:00
wangyuan 29c503412b fix mainlevel 2019-10-17 13:47:04 +08:00
zhangshanxue aa2d6d0648 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-16 11:25:07 +08:00
zhangshanxue a2ac1eaf28 跑马灯 2019-10-16 11:25:03 +08:00
lvxinran 164a3cb45f 头像提交 2019-10-17 01:00:57 +08:00
wangyuan 8f34ad884a fix activity 2019-10-15 10:22:08 +08:00
wangyuan 8a4efef55c fix open 2019-10-14 20:00:27 +08:00
wangyuan 2acbce61b4 fix store 2019-10-14 16:32:30 +08:00
wangyuan 94ac2788df change classloader 2019-10-14 15:30:13 +08:00
zhangshanxue fb33d6bdb6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2019-10-11 16:55:39 +08:00
zhangshanxue 85996ead41 工具模块 配置模块提取 热更新优化 2019-10-11 16:32:20 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00