root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix serverlogic

back_recharge
wangyuan 2019-10-17 17:56:09 +08:00
parent d4d04d44a2
commit 321e8fab22
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java
View File

@ -110,14 +110,6 @@ public class CommonStaticConfig extends AbstractClassStaticConfig {
} catch (Exception e) {
LOGGER.error("SGlobalSystemConfig init fail");
}
try {
GuildFightLogic.familyFightStatus();
} catch (Exception e) {
LOGGER.error("SGuildSetting init fail");
}
try {
Map<Integer, SWorkShopSetting> sWorkShopSettingMapTmp = STableManager.getConfig(SWorkShopSetting.class);

2
serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
View File

@ -17,6 +17,7 @@ import com.ljsd.jieling.logic.dao.ServerConfig;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
import com.ljsd.jieling.logic.dao.root.GlobalSystemControl;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.family.GuildFightLogic;
import com.ljsd.jieling.logic.friend.FriendLogic;
import com.ljsd.jieling.logic.mission.GameEvent;
import com.ljsd.jieling.logic.mission.GameMisionType;
@ -216,6 +217,7 @@ public class GlobalDataManaager {
public void whenServerStart(ConfigurableApplicationContext configurableApplicationContext){
try {
GuildFightLogic.familyFightStatus();
ActivityLogic.getInstance().checkSecretBoxSeason();
checkSystemFunctioIsOpen();
GlobalSystemControl globalSystemControl = MongoUtil.getInstence().getMyMongoTemplate().findById(GameApplication.serverId, GlobalSystemControl.class);

3
serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
View File

@ -346,6 +346,7 @@ public class CombatLogic {
public void getInvasionBoss(ISession session,FightInfoProto.AdventureBossInfoResponse.Builder builder) throws Exception {
int uid = session.getUid();
Map<String, Integer> myHurtInfo = RedisUtil.getInstence().getMapValues(RedisKey.ADVENTRUEN_BOSS_OWN, Integer.toString(uid), String.class, Integer.class);
if(myHurtInfo!=null&&!myHurtInfo.isEmpty()){
int now = (int)(TimeUtils.now()/1000);
@ -394,7 +395,7 @@ public class CombatLogic {
.setBossId(bossId)
.setBossGroupId(adventureBoss.getBossGroupId())
.setMyHurt(myHurtInfo.get(bossId))
.setRemainTime(remainTime)
.setLevelTime(remainTime+now)
.setTotalHp(adventureBoss.getTotalHp())
.setArenaLevel(adventureBoss.getArenaLevel())
.setBossRemainlHp(adventureBoss.getRemainHp())