Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
commit
d48bd0883e
|
@ -83,7 +83,7 @@ public class GuildHelpHelpOtherRequestHandler extends BaseHandler<Family.GuildHe
|
|||
}
|
||||
}
|
||||
int targetUid = proto.getUid();
|
||||
User target = UserManager.getUser(targetUid);
|
||||
User target = PlayerLogic.getInstance().getUserByRpc(targetUid);
|
||||
int b = target.getGuildMyInfo().getGuidHelpInfo().getOrDefault(proto.getType(),-2);
|
||||
if(b==-2||b==sGuildHelpConfig.getRecourseTime()[1]){
|
||||
throw new ErrorCodeException("援助失败");
|
||||
|
|
|
@ -14,8 +14,8 @@ import com.ljsd.common.mogodb.dblog.*;
|
|||
|
||||
public final class ActivityMission extends MongoBase {
|
||||
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>();
|
||||
@Transient
|
||||
private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ;
|
||||
// @Transient
|
||||
// private LogHashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo, Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>> activityMissionMapLog ;
|
||||
private int activityState;
|
||||
private int openType;
|
||||
private int v;
|
||||
|
@ -40,9 +40,9 @@ public final class ActivityMission extends MongoBase {
|
|||
}
|
||||
|
||||
public Map<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> getActivityMissionMap() {
|
||||
if( null == activityMissionMapLog && activityMissionMap != null)
|
||||
activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
|
||||
return this.activityMissionMapLog;
|
||||
// if( null == activityMissionMapLog && activityMissionMap != null)
|
||||
// activityMissionMapLog = new LogHashMap( this,"activityMissionMap",activityMissionMap);
|
||||
return activityMissionMap;
|
||||
}
|
||||
|
||||
public int getActivityState() {
|
||||
|
|
|
@ -12,8 +12,8 @@ import com.ljsd.common.mogodb.dblog.*;
|
|||
|
||||
public final class LuckWheelMission extends MongoBase {
|
||||
private HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> posInfoMap = new HashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>();
|
||||
@Transient
|
||||
private LogHashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo, Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>> posInfoMapLog ;
|
||||
// @Transient
|
||||
// private LogHashMap<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo, Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo>> posInfoMapLog ;
|
||||
private int refreshTime;
|
||||
|
||||
public LuckWheelMission() {
|
||||
|
@ -27,9 +27,9 @@ public final class LuckWheelMission extends MongoBase {
|
|||
}
|
||||
|
||||
public Map<Integer, com.ljsd.jieling.jbean.LuckWheelPosInfo> getPosInfoMap() {
|
||||
if( null == posInfoMapLog && posInfoMap != null)
|
||||
posInfoMapLog = new LogHashMap( this,"posInfoMap",posInfoMap);
|
||||
return this.posInfoMapLog;
|
||||
// if( null == posInfoMapLog && posInfoMap != null)
|
||||
// posInfoMapLog = new LogHashMap( this,"posInfoMap",posInfoMap);
|
||||
return posInfoMap;
|
||||
}
|
||||
|
||||
public int getRefreshTime() {
|
||||
|
|
|
@ -1,27 +1,13 @@
|
|||
package com.ljsd.jieling.jbean;
|
||||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.Set;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.LinkedList;
|
||||
import org.springframework.data.annotation.Transient;
|
||||
import com.ljsd.common.mogodb.dblog.*;
|
||||
|
||||
public final class PropertyItem extends MongoBase {
|
||||
private String id;
|
||||
private int equipId;
|
||||
private int level;
|
||||
private String heroId;
|
||||
private HashMap<Integer, Integer> propertyValueByIdMap = new HashMap<Integer, Integer>(); // 主属性 key 对应PropertyConfig id
|
||||
@Transient
|
||||
private LogHashMap<Integer, Integer, Map<Integer, Integer>> propertyValueByIdMapLog ;
|
||||
private HashMap<Integer, Integer> secondValueByIdMap = new HashMap<Integer, Integer>(); // //副属性
|
||||
@Transient
|
||||
private LogHashMap<Integer, Integer, Map<Integer, Integer>> secondValueByIdMapLog ;
|
||||
private int createTime;
|
||||
private int createTime;
|
||||
private int skill;
|
||||
private int isLocked;
|
||||
|
||||
|
@ -34,10 +20,6 @@ public final class PropertyItem extends MongoBase {
|
|||
this.equipId = _o_.equipId;
|
||||
this.level = _o_.level;
|
||||
this.heroId = _o_.heroId;
|
||||
this.propertyValueByIdMap = new HashMap<Integer, Integer>();
|
||||
_o_.propertyValueByIdMap.forEach((_k_, _v_) -> this.propertyValueByIdMap.put(_k_, _v_));
|
||||
this.secondValueByIdMap = new HashMap<Integer, Integer>();
|
||||
_o_.secondValueByIdMap.forEach((_k_, _v_) -> this.secondValueByIdMap.put(_k_, _v_));
|
||||
this.createTime = _o_.createTime;
|
||||
this.skill = _o_.skill;
|
||||
this.isLocked = _o_.isLocked;
|
||||
|
@ -59,19 +41,7 @@ public final class PropertyItem extends MongoBase {
|
|||
return this.heroId;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getPropertyValueByIdMap() { // 主属性 key 对应PropertyConfig id
|
||||
if( null == propertyValueByIdMapLog && propertyValueByIdMap != null)
|
||||
propertyValueByIdMapLog = new LogHashMap( this,"propertyValueByIdMap",propertyValueByIdMap);
|
||||
return this.propertyValueByIdMapLog;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getSecondValueByIdMap() { // //副属性
|
||||
if( null == secondValueByIdMapLog && secondValueByIdMap != null)
|
||||
secondValueByIdMapLog = new LogHashMap( this,"secondValueByIdMap",secondValueByIdMap);
|
||||
return this.secondValueByIdMapLog;
|
||||
}
|
||||
|
||||
public int getCreateTime() {
|
||||
public int getCreateTime() {
|
||||
return this.createTime;
|
||||
}
|
||||
|
||||
|
@ -127,8 +97,6 @@ public final class PropertyItem extends MongoBase {
|
|||
_sb_.append(this.equipId).append(",");
|
||||
_sb_.append(this.level).append(",");
|
||||
_sb_.append("T").append(this.heroId.length()).append(",");
|
||||
_sb_.append(this.propertyValueByIdMap).append(",");
|
||||
_sb_.append(this.secondValueByIdMap).append(",");
|
||||
_sb_.append(this.createTime).append(",");
|
||||
_sb_.append(this.skill).append(",");
|
||||
_sb_.append(this.isLocked).append(",");
|
||||
|
|
Loading…
Reference in New Issue