阈值修改提交
parent
dbcb1f98f9
commit
f0abc728be
|
@ -308,7 +308,7 @@ public class EndExpeditionBattleRequest extends BaseHandler<Expedition.EndExpedi
|
||||||
List<Integer> itemNum = new ArrayList<>(itemList.size());
|
List<Integer> itemNum = new ArrayList<>(itemList.size());
|
||||||
itemList.forEach(item->{
|
itemList.forEach(item->{
|
||||||
itemId.add(item.getItemId());
|
itemId.add(item.getItemId());
|
||||||
itemNum.add(item.getItemNum());
|
itemNum.add((int)item.getItemNum());
|
||||||
});
|
});
|
||||||
|
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),user.getExpeditionManager().getExpeditionLeve(),oldlay-1,nodeInfo.getType(),"胜利",itemId,itemNum);
|
ReportUtil.onReportEvent(user, ReportEventEnum.START_TIANGONG.getType(),user.getExpeditionManager().getExpeditionLeve(),oldlay-1,nodeInfo.getType(),"胜利",itemId,itemNum);
|
||||||
|
|
|
@ -2329,7 +2329,7 @@ public class MapLogic {
|
||||||
List<Integer> itemNumList = new ArrayList<>();
|
List<Integer> itemNumList = new ArrayList<>();
|
||||||
itemDrop.forEach(item->{
|
itemDrop.forEach(item->{
|
||||||
itemIdList.add(item.getItemId());
|
itemIdList.add(item.getItemId());
|
||||||
itemNumList.add(item.getItemNum());
|
itemNumList.add((int)item.getItemNum());
|
||||||
});
|
});
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",itemIdList,itemNumList,"成功");
|
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",itemIdList,itemNumList,"成功");
|
||||||
}
|
}
|
||||||
|
@ -3156,7 +3156,7 @@ public class MapLogic {
|
||||||
List<Integer> itemNumList = new ArrayList<>();
|
List<Integer> itemNumList = new ArrayList<>();
|
||||||
itemDrop.forEach(item->{
|
itemDrop.forEach(item->{
|
||||||
itemIdList.add(item.getItemId());
|
itemIdList.add(item.getItemId());
|
||||||
itemNumList.add(item.getItemNum());
|
itemNumList.add((int)item.getItemNum());
|
||||||
});
|
});
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_DAILY_DUNGEON.getType(),id,sDailyChallengeConfig.getType(),sDailyChallengeConfig.getMonsterId(),MonsterUtil.getMonsterForce(new int[]{sDailyChallengeConfig.getMonsterId()}),new Date(),"",0,itemIdList,itemNumList,type==1?"挑战":"扫荡",isFailed?"失败":"通过");
|
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_DAILY_DUNGEON.getType(),id,sDailyChallengeConfig.getType(),sDailyChallengeConfig.getMonsterId(),MonsterUtil.getMonsterForce(new int[]{sDailyChallengeConfig.getMonsterId()}),new Date(),"",0,itemIdList,itemNumList,type==1?"挑战":"扫荡",isFailed?"失败":"通过");
|
||||||
user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_CHALLENGE,sDailyChallengeConfig.getType());
|
user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_CHALLENGE,sDailyChallengeConfig.getType());
|
||||||
|
|
|
@ -2347,7 +2347,7 @@ public class HeroLogic{
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
int hasHeroNum = user.getHeroManager().getHeroMap().size();
|
int hasHeroNum = user.getHeroManager().getHeroMap().size();
|
||||||
int itemId = item.getItemId();
|
int itemId = item.getItemId();
|
||||||
int itemNum = item.getItemNum();
|
int itemNum = (int)item.getItemNum();
|
||||||
SItem sItem = SItem.getsItemMap().get(itemId);
|
SItem sItem = SItem.getsItemMap().get(itemId);
|
||||||
if (sItem == null || itemNum <= 0 || itemNum >= Integer.MAX_VALUE) {
|
if (sItem == null || itemNum <= 0 || itemNum >= Integer.MAX_VALUE) {
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||||
|
@ -2758,7 +2758,7 @@ public class HeroLogic{
|
||||||
List<Integer> itemNum = new ArrayList<>(itemList.size());
|
List<Integer> itemNum = new ArrayList<>(itemList.size());
|
||||||
itemList.forEach(item->{
|
itemList.forEach(item->{
|
||||||
itemId.add(item.getItemId());
|
itemId.add(item.getItemId());
|
||||||
itemNum.add(item.getItemNum());
|
itemNum.add((int)item.getItemNum());
|
||||||
});
|
});
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.HERO_COMPOSITION.getType(),String.valueOf(hero.getTemplateId()),hero.getLevel(user.getHeroManager()),hero.getStar(),itemId,itemNum);
|
ReportUtil.onReportEvent(user,ReportEventEnum.HERO_COMPOSITION.getType(),String.valueOf(hero.getTemplateId()),hero.getLevel(user.getHeroManager()),hero.getStar(),itemId,itemNum);
|
||||||
hero.setLevel(user,1);
|
hero.setLevel(user,1);
|
||||||
|
|
|
@ -70,11 +70,11 @@ public class ItemLogic {
|
||||||
if (cost.length() == 0) {
|
if (cost.length() == 0) {
|
||||||
cost = new StringBuilder(item.getItemId() + "#" + item.getItemNum());
|
cost = new StringBuilder(item.getItemId() + "#" + item.getItemNum());
|
||||||
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
||||||
reward = getStringBuilder(reward, item.getItemNum(), sItem.getResolveReward());
|
reward = getStringBuilder(reward, (int)item.getItemNum(), sItem.getResolveReward());
|
||||||
} else {
|
} else {
|
||||||
cost.append("|").append(item.getItemId()).append("#").append(item.getItemNum());
|
cost.append("|").append(item.getItemId()).append("#").append(item.getItemNum());
|
||||||
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
||||||
reward = getStringBuilder(reward, item.getItemNum(), sItem.getResolveReward());
|
reward = getStringBuilder(reward, (int)item.getItemNum(), sItem.getResolveReward());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int[][] costItemArr = StringUtil.parseFiledInt2(cost.toString());
|
int[][] costItemArr = StringUtil.parseFiledInt2(cost.toString());
|
||||||
|
@ -173,11 +173,11 @@ public class ItemLogic {
|
||||||
if (cost.length() == 0) {
|
if (cost.length() == 0) {
|
||||||
cost = new StringBuilder(item.getItemId() + "#" + item.getItemNum());
|
cost = new StringBuilder(item.getItemId() + "#" + item.getItemNum());
|
||||||
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
||||||
reward = getStringBuilder(reward, item.getItemNum(), sItem.getRewardGroup());
|
reward = getStringBuilder(reward, (int)item.getItemNum(), sItem.getRewardGroup());
|
||||||
} else {
|
} else {
|
||||||
cost.append("|").append(item.getItemId()).append("#").append(item.getItemNum());
|
cost.append("|").append(item.getItemId()).append("#").append(item.getItemNum());
|
||||||
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
SItem sItem = SItem.getsItemMap().get(item.getItemId());
|
||||||
reward = getStringBuilder(reward, item.getItemNum(), sItem.getRewardGroup());
|
reward = getStringBuilder(reward, (int)item.getItemNum(), sItem.getRewardGroup());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int[][] costItemArr = StringUtil.parseFiledInt2(cost.toString());
|
int[][] costItemArr = StringUtil.parseFiledInt2(cost.toString());
|
||||||
|
@ -209,7 +209,7 @@ public class ItemLogic {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean use = ItemUtil.itemCost(user, new int[][]{{item.getItemId(), item.getItemNum()}}, BIReason.SKIN_USE_CONSUME, 1);
|
boolean use = ItemUtil.itemCost(user, new int[][]{{item.getItemId(), (int)item.getItemNum()}}, BIReason.SKIN_USE_CONSUME, 1);
|
||||||
if (!use) {
|
if (!use) {
|
||||||
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
||||||
}
|
}
|
||||||
|
@ -404,7 +404,7 @@ public class ItemLogic {
|
||||||
List<Integer> itemNum = new ArrayList<>(reportMap.size());
|
List<Integer> itemNum = new ArrayList<>(reportMap.size());
|
||||||
reportMap.forEach(item -> {
|
reportMap.forEach(item -> {
|
||||||
itemId.add(item.getItemId());
|
itemId.add(item.getItemId());
|
||||||
itemNum.add(item.getItemNum());
|
itemNum.add((int)item.getItemNum());
|
||||||
});
|
});
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_DECOMPOSITION.getType(), reportIdLevelQuality.toString(), itemId, itemNum);
|
ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_DECOMPOSITION.getType(), reportIdLevelQuality.toString(), itemId, itemNum);
|
||||||
sendUseAndPriceItemMessage(session, MessageTypeProto.MessageType.USER_AND_PRICE_ITEM_RESPONSE_VALUE, drop);
|
sendUseAndPriceItemMessage(session, MessageTypeProto.MessageType.USER_AND_PRICE_ITEM_RESPONSE_VALUE, drop);
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class CBean2Proto {
|
||||||
* @param itemNum 道具数量,一般是增量,-1 表示全量
|
* @param itemNum 道具数量,一般是增量,-1 表示全量
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static CommonProto.Item getItem(Item item,int itemNum){
|
public static CommonProto.Item getItem(Item item,long itemNum){
|
||||||
if(itemNum == -1){
|
if(itemNum == -1){
|
||||||
itemNum = (int) item.getItemNum();
|
itemNum = (int) item.getItemNum();
|
||||||
}
|
}
|
||||||
|
|
|
@ -576,8 +576,8 @@ public class ItemUtil {
|
||||||
|
|
||||||
for (Map.Entry<Integer, Long> entry : itemMap.entrySet()) {
|
for (Map.Entry<Integer, Long> entry : itemMap.entrySet()) {
|
||||||
SItem sItem = SItem.getsItemMap().get (entry.getKey());
|
SItem sItem = SItem.getsItemMap().get (entry.getKey());
|
||||||
int itemNumlimit = sItem.getItemNumlimit();
|
long itemNumlimit = sItem.getItemNumlimit();
|
||||||
int itemNum = entry.getValue().intValue();
|
long itemNum = entry.getValue().intValue();
|
||||||
if(itemNum <= 0){
|
if(itemNum <= 0){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -628,7 +628,7 @@ public class ItemUtil {
|
||||||
|
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.GET_ITEM.getType(),itemNum,String.valueOf(reason),item.getItemId());
|
ReportUtil.onReportEvent(user,ReportEventEnum.GET_ITEM.getType(),itemNum,String.valueOf(reason),item.getItemId());
|
||||||
|
|
||||||
baseItemReport(user,item.getItemId(),itemNum,1,reason);
|
baseItemReport(user,item.getItemId(),(int)itemNum,1,reason);
|
||||||
|
|
||||||
if(sItem.getId() == Global.EXP){
|
if(sItem.getId() == Global.EXP){
|
||||||
userLevelUp(user,itemNum);
|
userLevelUp(user,itemNum);
|
||||||
|
@ -694,8 +694,8 @@ public class ItemUtil {
|
||||||
|
|
||||||
for (Map.Entry<Integer, Long> entry : itemMap.entrySet()) {
|
for (Map.Entry<Integer, Long> entry : itemMap.entrySet()) {
|
||||||
SItem sItem = SItem.getsItemMap().get (entry.getKey());
|
SItem sItem = SItem.getsItemMap().get (entry.getKey());
|
||||||
int itemNumlimit = sItem.getItemNumlimit();
|
long itemNumlimit = sItem.getItemNumlimit();
|
||||||
int itemNum = entry.getValue().intValue();
|
long itemNum = entry.getValue().intValue();
|
||||||
if(itemNum <= 0){
|
if(itemNum <= 0){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -746,7 +746,7 @@ public class ItemUtil {
|
||||||
|
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.GET_ITEM.getType(),itemNum,String.valueOf(reason),item.getItemId());
|
ReportUtil.onReportEvent(user,ReportEventEnum.GET_ITEM.getType(),itemNum,String.valueOf(reason),item.getItemId());
|
||||||
|
|
||||||
baseItemReport(user,item.getItemId(),itemNum,1,reason);
|
baseItemReport(user,item.getItemId(),(int)itemNum,1,reason);
|
||||||
|
|
||||||
if(sItem.getId() == Global.EXP){
|
if(sItem.getId() == Global.EXP){
|
||||||
userLevelUp(user,itemNum);
|
userLevelUp(user,itemNum);
|
||||||
|
@ -799,7 +799,7 @@ public class ItemUtil {
|
||||||
/**
|
/**
|
||||||
* 玩家升级 //zsx 保留 TODO 由事件分发到 playlogic 去处理
|
* 玩家升级 //zsx 保留 TODO 由事件分发到 playlogic 去处理
|
||||||
*/
|
*/
|
||||||
public static void userLevelUp(User user, int addExp) throws Exception {
|
public static void userLevelUp(User user, long addExp) throws Exception {
|
||||||
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
||||||
if (addExp <= 0) {
|
if (addExp <= 0) {
|
||||||
return;
|
return;
|
||||||
|
@ -808,7 +808,7 @@ public class ItemUtil {
|
||||||
if (playerInfoManager.getExp() >= maxExp) {
|
if (playerInfoManager.getExp() >= maxExp) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int curExp = MathUtils.setBetweenWithMax(playerInfoManager.getExp() + addExp, 0, maxExp);
|
int curExp = MathUtils.setBetweenWithMax(playerInfoManager.getExp() + (int)addExp, 0, maxExp);
|
||||||
int oldLevel = playerInfoManager.getLevel();
|
int oldLevel = playerInfoManager.getLevel();
|
||||||
SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(oldLevel);
|
SPlayerLevelConfig sPlayerLevelConfig = SPlayerLevelConfig.getsPlayerLevelConfigMap().get(oldLevel);
|
||||||
int levelUpExp;
|
int levelUpExp;
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class SItem implements BaseConfig {
|
||||||
private int ifopen;
|
private int ifopen;
|
||||||
private int ifResolve;
|
private int ifResolve;
|
||||||
private String resolveReward;
|
private String resolveReward;
|
||||||
private int itemNumlimit;
|
private long itemNumlimit;
|
||||||
private int[][] extraReward;
|
private int[][] extraReward;
|
||||||
|
|
||||||
private int recycle;
|
private int recycle;
|
||||||
|
@ -108,7 +108,7 @@ public class SItem implements BaseConfig {
|
||||||
return resolveReward;
|
return resolveReward;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getItemNumlimit() {
|
public long getItemNumlimit() {
|
||||||
return itemNumlimit;
|
return itemNumlimit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue