Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
d48947533b
|
@ -10,6 +10,10 @@ public interface Global {
|
||||||
int GOLD = 14; //金币
|
int GOLD = 14; //金币
|
||||||
int SOULCRYSTAL = 15; // 魂晶id
|
int SOULCRYSTAL = 15; // 魂晶id
|
||||||
int GEM = 16; // 妖精id
|
int GEM = 16; // 妖精id
|
||||||
|
int DEVILJADE = 22; // 妖灵玉
|
||||||
|
int ELITEPROOF = 25; // 精英证明
|
||||||
|
int HEARTFIRE = 26; // 心火明晶
|
||||||
|
|
||||||
int SEND_CARD_COUNT = 20; // 每页发送卡牌个数
|
int SEND_CARD_COUNT = 20; // 每页发送卡牌个数
|
||||||
int SEND_ITEM_COUNT = 200; // 每页发送道具个数
|
int SEND_ITEM_COUNT = 200; // 每页发送道具个数
|
||||||
int SEND_EQUIP_COUNT = 20; // 每页发送装备个数
|
int SEND_EQUIP_COUNT = 20; // 每页发送装备个数
|
||||||
|
|
|
@ -30,6 +30,9 @@ public class KtEventUtils {
|
||||||
currencyMap.put(Global.SOULCRYSTAL,"currency_1_d"); //魂晶
|
currencyMap.put(Global.SOULCRYSTAL,"currency_1_d"); //魂晶
|
||||||
currencyMap.put(Global.GEM,"currency_2_d"); //妖精
|
currencyMap.put(Global.GEM,"currency_2_d"); //妖精
|
||||||
currencyMap.put(Global.GOLD,"currency_3_d");//金币
|
currencyMap.put(Global.GOLD,"currency_3_d");//金币
|
||||||
|
currencyMap.put(Global.DEVILJADE,"currency_4_d");//妖灵玉
|
||||||
|
currencyMap.put(Global.ELITEPROOF,"currency_5_d");//精英证明
|
||||||
|
currencyMap.put(Global.HEARTFIRE,"currency_6_d");//心火明晶
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Gson gson = new Gson();
|
private static Gson gson = new Gson();
|
||||||
|
|
|
@ -206,7 +206,7 @@ public class CumulationData {
|
||||||
if(count == null){
|
if(count == null){
|
||||||
count = 0;
|
count = 0;
|
||||||
}
|
}
|
||||||
heroUpStarTimesMap.put(heroStar,count+1);
|
heroUpSomeStarTimesMap.put(heroStar,count+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -407,6 +407,7 @@ public class PlayerManager extends MongoBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRechargedaily(int rechargedaily) {
|
public void setRechargedaily(int rechargedaily) {
|
||||||
|
updateString("rechargedaily", rechargedaily);
|
||||||
this.rechargedaily = rechargedaily;
|
this.rechargedaily = rechargedaily;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,10 @@ public class DoFix {
|
||||||
int activityId = 14;
|
int activityId = 14;
|
||||||
ActivityManager activityManager = user.getActivityManager();
|
ActivityManager activityManager = user.getActivityManager();
|
||||||
ActivityMission activityMission = activityManager.getActivityMissionMap().get(activityId);
|
ActivityMission activityMission = activityManager.getActivityMissionMap().get(activityId);
|
||||||
if(activityMission.getValue()!=0){
|
if (null == activityMission) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (activityMission.getValue() != 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int sum = 0;
|
int sum = 0;
|
||||||
|
@ -49,7 +52,7 @@ public class DoFix {
|
||||||
sum++;
|
sum++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(sum==0){
|
if (sum == 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
activityMission.setValue(sum);
|
activityMission.setValue(sum);
|
||||||
|
|
|
@ -35,6 +35,13 @@ public class StoreLogic {
|
||||||
|
|
||||||
private static Set<Integer> openStoreInfo = new HashSet<>();
|
private static Set<Integer> openStoreInfo = new HashSet<>();
|
||||||
|
|
||||||
|
private static Set<Integer> storeGiftType = new HashSet<>(3);
|
||||||
|
static {
|
||||||
|
storeGiftType.add(30);
|
||||||
|
storeGiftType.add(31);
|
||||||
|
storeGiftType.add(32);
|
||||||
|
}
|
||||||
|
|
||||||
public static void checkGlobalStore(boolean isStartServer) throws Exception {
|
public static void checkGlobalStore(boolean isStartServer) throws Exception {
|
||||||
long now = System.currentTimeMillis();
|
long now = System.currentTimeMillis();
|
||||||
for(SStoreTypeConfig sStoreTypeConfig : SStoreTypeConfig.getsStoreTypeConfigMap().values()){
|
for(SStoreTypeConfig sStoreTypeConfig : SStoreTypeConfig.getsStoreTypeConfigMap().values()){
|
||||||
|
@ -304,7 +311,7 @@ public class StoreLogic {
|
||||||
dropItems[i][1]= (int)(goods[i][1]*itemNum *(add/10000F) );
|
dropItems[i][1]= (int)(goods[i][1]*itemNum *(add/10000F) );
|
||||||
}
|
}
|
||||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.STORE_BUY_ITEM);
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.STORE_BUY_ITEM);
|
||||||
if(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() != StoreType.GIFT_STORE.getType()){
|
if(!storeGiftType.contains(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() )){
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum,SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType());
|
user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum,SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType());
|
||||||
}
|
}
|
||||||
if(itemId==10005){
|
if(itemId==10005){
|
||||||
|
|
Loading…
Reference in New Issue