Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
4b2c5f5373
|
@ -19,7 +19,8 @@ public class MathUtils {
|
|||
|
||||
|
||||
public static void main(String[] args){
|
||||
System.out.println(forceToDouble(1231321));
|
||||
int i = randomFromWeight(new int[][]{{1,20},{2,30}});
|
||||
System.out.println(i);
|
||||
}
|
||||
public static int randomForStrArray(String [] rateArray) {
|
||||
return randomStrArray(rateArray, -1);
|
||||
|
@ -333,7 +334,30 @@ public class MathUtils {
|
|||
}
|
||||
public static double forceToDouble(double force){
|
||||
return force/Math.pow(10,8);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据权重纯随机
|
||||
* @return
|
||||
*/
|
||||
public static int[] randomForWeight(int[][] array,int count){
|
||||
int sum = 0;
|
||||
for(int[] weight:array){
|
||||
sum+=weight[1];
|
||||
}
|
||||
int[] random = new int[sum];
|
||||
int index = 0 ;
|
||||
for(int[] oneArray:array){
|
||||
for(int i = 0;i< oneArray[1];i++){
|
||||
random[index] = oneArray[0];
|
||||
index++;
|
||||
}
|
||||
}
|
||||
int[] result = new int[count];
|
||||
for(int i = 0 ; i <result.length;i++){
|
||||
result[i] =random[randomInt(random.length)];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -228,7 +228,7 @@ public class UserMissionManager extends MongoBase {
|
|||
}
|
||||
int[] refreshWeight = new int[2];
|
||||
refreshWeight[0] = maze.getId();
|
||||
refreshWeight[1] = maze.getTaskRefreshProbability();
|
||||
refreshWeight[1] = 1;
|
||||
mustList.add(refreshWeight);
|
||||
}
|
||||
int[][] mustArray = mustList.toArray(new int[mustList.size()][]);
|
||||
|
@ -236,16 +236,34 @@ public class UserMissionManager extends MongoBase {
|
|||
Arrays.stream(missions).forEach(mission->mustMissions.add(mission));
|
||||
}
|
||||
}
|
||||
List<int[]> missingRoomMission = new ArrayList<>();
|
||||
for(Map.Entry<Integer,SMazeTreasure> entry:SMazeTreasure.sMazeTreasureMap.entrySet()){
|
||||
int[] refreshWeight = new int[2];
|
||||
refreshWeight[0] = entry.getKey();
|
||||
refreshWeight[1] = entry.getValue().getTaskRefreshProbability();
|
||||
missingRoomMission.add(refreshWeight);
|
||||
int[][] qualityRate = SMazeTreasureSetting.sMazeTreasureSetting.getQualityRate();
|
||||
// List<int[]> missingRoomMission = new ArrayList<>();
|
||||
// for(Map.Entry<Integer,SMazeTreasure> entry:SMazeTreasure.sMazeTreasureMap.entrySet()){
|
||||
// int[] refreshWeight = new int[2];
|
||||
// refreshWeight[0] = entry.getKey();
|
||||
// refreshWeight[1] = entry.getValue().getTaskRefreshProbability();
|
||||
// missingRoomMission.add(refreshWeight);
|
||||
// }
|
||||
//根据品质来随机
|
||||
int[] qualityArray = MathUtils.randomForWeight(qualityRate, 6 - mustMissions.size());
|
||||
Map<Integer,Integer> qualityNum = new HashMap<>();
|
||||
for(int quality:qualityArray){
|
||||
qualityNum.put(quality,qualityNum.getOrDefault(quality,0)+1);
|
||||
}
|
||||
int[] missions = MathUtils.randomFromWeightWithTaking(missingRoomMission.toArray(new int[missingRoomMission.size()][]), 6-mustMissions.size());
|
||||
for(int mission:missions){
|
||||
missingRoomMissionType.addDoingMission(missingRoomMissionType.getMissionIndex()*10000+mission);
|
||||
for(int quality:qualityNum.keySet()){
|
||||
List<SMazeTreasure> sMazeTreasures = SMazeTreasure.mazeMapByTaskType.get(quality);
|
||||
int[][] treasures = new int[sMazeTreasures.size()][];
|
||||
for(int i = 0 ; i<sMazeTreasures.size();i++){
|
||||
|
||||
treasures[i] = new int[2];
|
||||
treasures[i][0] = sMazeTreasures.get(i).getId();
|
||||
treasures[i][1] = 1;
|
||||
}
|
||||
int[] ids = MathUtils.randomFromWeightWithTaking(treasures, qualityNum.get(quality));
|
||||
// int missionId = sMazeTreasures.get(MathUtils.randomInt(sMazeTreasures.size())).getId();
|
||||
for(int id:ids){
|
||||
missingRoomMissionType.addDoingMission(missingRoomMissionType.getMissionIndex()*10000+id);
|
||||
}
|
||||
}
|
||||
for(int mission:mustMissions){
|
||||
missingRoomMissionType.addDoingMission(missingRoomMissionType.getMissionIndex()*10000+mission);
|
||||
|
|
|
@ -16,8 +16,6 @@ public class SMazeTreasure implements BaseConfig {
|
|||
|
||||
private int taskType;
|
||||
|
||||
private int taskRefreshProbability;
|
||||
|
||||
private int[] takeItem;
|
||||
|
||||
private int wasteTime;
|
||||
|
@ -52,10 +50,6 @@ public class SMazeTreasure implements BaseConfig {
|
|||
return taskType;
|
||||
}
|
||||
|
||||
public int getTaskRefreshProbability() {
|
||||
return taskRefreshProbability;
|
||||
}
|
||||
|
||||
public int[] getTakeItem() {
|
||||
return takeItem;
|
||||
}
|
||||
|
|
|
@ -29,6 +29,8 @@ public class SMazeTreasureSetting implements BaseConfig {
|
|||
|
||||
private int firstRefresh;
|
||||
|
||||
private int[][] qualityRate;
|
||||
|
||||
public static SMazeTreasureSetting sMazeTreasureSetting;
|
||||
|
||||
|
||||
|
@ -77,4 +79,8 @@ public class SMazeTreasureSetting implements BaseConfig {
|
|||
public int getFirstRefresh() {
|
||||
return firstRefresh;
|
||||
}
|
||||
|
||||
public int[][] getQualityRate() {
|
||||
return qualityRate;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue