Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
0ad0e87617
|
@ -1308,4 +1308,16 @@ public class RedisUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void remove(String key){
|
||||||
|
|
||||||
|
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
||||||
|
try {
|
||||||
|
redisTemplate.delete(key);
|
||||||
|
return;
|
||||||
|
} catch (Exception e) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,6 +159,9 @@ public interface BIReason {
|
||||||
int SKIN_USE_REWARD = 90;//激活皮肤获得头像
|
int SKIN_USE_REWARD = 90;//激活皮肤获得头像
|
||||||
int SUB_ACTIVITY_FINISH = 91;//易经宝库活动结束补发
|
int SUB_ACTIVITY_FINISH = 91;//易经宝库活动结束补发
|
||||||
|
|
||||||
|
int ARENA_WIN_REWARD = 92;//竞技场胜利奖励
|
||||||
|
int ARENA_LOSE_REWARD = 93;//竞技场失败奖励
|
||||||
|
|
||||||
int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级
|
int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级
|
||||||
int SECRETBOX_CONSUME = 1001;//秘盒抽卡
|
int SECRETBOX_CONSUME = 1001;//秘盒抽卡
|
||||||
int DECOMPOSE_ITEM_CONSUME = 1002;//分解道具消耗
|
int DECOMPOSE_ITEM_CONSUME = 1002;//分解道具消耗
|
||||||
|
|
|
@ -90,8 +90,11 @@ public class ArenaChallengeHandler extends BaseHandler<ArenaInfoProto.ArenaChall
|
||||||
if(defScore == -1){
|
if(defScore == -1){
|
||||||
defScore = SArenaSetting.getSArenaSetting().getScore();
|
defScore = SArenaSetting.getSArenaSetting().getScore();
|
||||||
}
|
}
|
||||||
defScoreChange = ArenaLogic.getInstance().calScore(defScore, myscore,fightResult==1?0:1);
|
|
||||||
myscoreChange = ArenaLogic.getInstance().calScore(myscore, defScore,fightResult);
|
if (fightResult == 1){
|
||||||
|
// defScoreChange = ArenaLogic.getInstance().calScore(defScore, myscore,0);
|
||||||
|
myscoreChange = ArenaLogic.getInstance().calScore(myscore, defScore,fightResult);
|
||||||
|
}
|
||||||
if(defUser.getArenaManager().getCount()!=0 && defUser.getArenaManager().getSeason() == curSeason){
|
if(defUser.getArenaManager().getCount()!=0 && defUser.getArenaManager().getSeason() == curSeason){
|
||||||
arenaRecord.setAttackId(uid);
|
arenaRecord.setAttackId(uid);
|
||||||
arenaRecord.setDefScore(defScoreChange);
|
arenaRecord.setDefScore(defScoreChange);
|
||||||
|
@ -108,8 +111,10 @@ public class ArenaChallengeHandler extends BaseHandler<ArenaInfoProto.ArenaChall
|
||||||
if(fightResult == -1){
|
if(fightResult == -1){
|
||||||
throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
|
throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
|
||||||
}
|
}
|
||||||
myscoreChange = ArenaLogic.getInstance().calScore(myscore, defScore,fightResult);
|
if (fightResult == 1){
|
||||||
defScoreChange = ArenaLogic.getInstance().calScore(defScore, myscore,fightResult^1);
|
myscoreChange = ArenaLogic.getInstance().calScore(myscore, defScore,fightResult);
|
||||||
|
}
|
||||||
|
// defScoreChange = ArenaLogic.getInstance().calScore(defScore, myscore,fightResult^1);
|
||||||
|
|
||||||
}
|
}
|
||||||
LOGGER.info("the uid={},the defUid={},myscore={},defScore={},fightResult={},myScoreChange={},defScoreChange={}",uid,challengeUid,myscore,defScore,fightResult,myscoreChange,defScoreChange);
|
LOGGER.info("the uid={},the defUid={},myscore={},defScore={},fightResult={},myScoreChange={},defScoreChange={}",uid,challengeUid,myscore,defScore,fightResult,myscoreChange,defScoreChange);
|
||||||
|
@ -129,6 +134,7 @@ public class ArenaChallengeHandler extends BaseHandler<ArenaInfoProto.ArenaChall
|
||||||
.setMyScoreChange(myscoreChange).setDefScoreChange(defScoreChange)
|
.setMyScoreChange(myscoreChange).setDefScoreChange(defScoreChange)
|
||||||
.addAllArenaEnemys(ArenaLogic.getInstance().getArenaEnemyList(arenaManager.getArenaEnemies()))
|
.addAllArenaEnemys(ArenaLogic.getInstance().getArenaEnemyList(arenaManager.getArenaEnemies()))
|
||||||
.setFightResult(fightResult)
|
.setFightResult(fightResult)
|
||||||
|
.setDrop(ArenaLogic.getInstance().getArenaReward(user,fightResult))
|
||||||
.build();
|
.build();
|
||||||
user.getUserMissionManager().onGameEvent(user, GameEvent.ARENA_CHALLENGE,fightResult, myscore + myscoreChange);
|
user.getUserMissionManager().onGameEvent(user, GameEvent.ARENA_CHALLENGE,fightResult, myscore + myscoreChange);
|
||||||
if(defUser!=null && defUser.getArenaManager().getCount()>0) {
|
if(defUser!=null && defUser.getArenaManager().getCount()>0) {
|
||||||
|
|
|
@ -223,7 +223,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler<HeroInfoProto.C
|
||||||
}
|
}
|
||||||
builder.append(entry.getKey()).append("-").append(entry.getValue());
|
builder.append(entry.getKey()).append("-").append(entry.getValue());
|
||||||
}
|
}
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),builder.toString(),new ArrayList<>(consumeMap.values()),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values()));
|
ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),builder.toString(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values()));
|
||||||
ItemUtil.itemCost(user, consumeMap, BIReason.COMPLEX_EQUIP_CONSUME, 0);
|
ItemUtil.itemCost(user, consumeMap, BIReason.COMPLEX_EQUIP_CONSUME, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,11 +86,14 @@ public enum ReportEventEnum {
|
||||||
BEAST_LEVEL(59,"beast_level",new CommonEventHandler(),new String[]{"beast_id","old_level","new_level","cost_item_list_info"}),
|
BEAST_LEVEL(59,"beast_level",new CommonEventHandler(),new String[]{"beast_id","old_level","new_level","cost_item_list_info"}),
|
||||||
BEAST_STAR(60,"beast_star",new CommonEventHandler(),new String[]{"beast_id","old_star","new_star","cost_item_list","cost_beast_list"}),
|
BEAST_STAR(60,"beast_star",new CommonEventHandler(),new String[]{"beast_id","old_star","new_star","cost_item_list","cost_beast_list"}),
|
||||||
BEAST_SUMMON(61,"beast_summon",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),
|
BEAST_SUMMON(61,"beast_summon",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),
|
||||||
|
BEAST_CABINET(62,"beast_cabinet",new CommonEventHandler(),new String[]{"beast_id","summon_type","cost_item_id","cost_amount","reward_nums_list"}),
|
||||||
|
|
||||||
|
|
||||||
VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""});
|
VIP_LEVEL_UP(100,"", new VipLevelUpEventHandler(),new String[]{""});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private int type;
|
private int type;
|
||||||
|
|
||||||
private String eventName;
|
private String eventName;
|
||||||
|
|
|
@ -17,19 +17,19 @@ public class ReportUserEvent {
|
||||||
private Map<Integer,Map<String,Object>> userProperties;
|
private Map<Integer,Map<String,Object>> userProperties;
|
||||||
|
|
||||||
public ReportUserEvent setAccount_id(String accountId){
|
public ReportUserEvent setAccount_id(String accountId){
|
||||||
baseInfo.put("#account_id",accountId);
|
baseInfo.put("#account_id",accountId==null?"unknown":accountId);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
public ReportUserEvent setDistinct_id(String distinct_id){
|
public ReportUserEvent setDistinct_id(String distinct_id){
|
||||||
baseInfo.put("#distinct_id",distinct_id);
|
baseInfo.put("#distinct_id",distinct_id==null?"unknown":distinct_id);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
public ReportUserEvent setDevice_id(String device_id){
|
public ReportUserEvent setDevice_id(String device_id){
|
||||||
baseInfo.put("#device_id",device_id);
|
baseInfo.put("#device_id",device_id==null?"unknown":device_id);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
public ReportUserEvent setIp(String ip){
|
public ReportUserEvent setIp(String ip){
|
||||||
baseInfo.put("#ip",ip);
|
baseInfo.put("#ip",ip==null?"unknown":ip);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
public ReportUserEvent setCountry_code(int country_code){
|
public ReportUserEvent setCountry_code(int country_code){
|
||||||
|
|
|
@ -176,6 +176,8 @@ public class ActivityLogic implements IEventHandler{
|
||||||
if (null == abstractActivity) {
|
if (null == abstractActivity) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if(openActivityIds.contains(sGlobalActivity.getId()))
|
||||||
|
continue;
|
||||||
abstractActivity.onActivityStart();
|
abstractActivity.onActivityStart();
|
||||||
openActivityIds.add(sGlobalActivity.getId());
|
openActivityIds.add(sGlobalActivity.getId());
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,21 +71,27 @@ class SheJiActivity extends AbstractActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//删除本榜单
|
||||||
|
String key = RedisUtil.getInstence().getKey(RedisKey.EXPERT_RANK, Integer.toString(id));
|
||||||
|
String key2 = RedisUtil.getInstence().getKey(RedisKey.GUILD_SHEJI_SCORE_RANK, Integer.toString(id));
|
||||||
|
RedisUtil.getInstence().remove(key);
|
||||||
|
RedisUtil.getInstence().remove(key2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initActivity(User user) throws Exception {
|
public void initActivity(User user) throws Exception {
|
||||||
super.initActivity(user);
|
super.initActivity(user);
|
||||||
//初始化移除道具
|
//初始化移除道具
|
||||||
SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1);
|
// SGodSacrificeSetting sGodSacrificeSetting = STableManager.getConfig(SGodSacrificeSetting.class).get(1);
|
||||||
if (null != sGodSacrificeSetting) {
|
// if (null != sGodSacrificeSetting) {
|
||||||
if (sGodSacrificeSetting.getItemDelete() == 1) {
|
// if (sGodSacrificeSetting.getItemDelete() == 1) {
|
||||||
int[] activityItems = sGodSacrificeSetting.getActivityItems();
|
// int[] activityItems = sGodSacrificeSetting.getActivityItems();
|
||||||
for (int item : activityItems) {
|
// for (int item : activityItems) {
|
||||||
user.getItemManager().removeItem(item);
|
// user.getItemManager().removeItem(item);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -552,6 +552,24 @@ public class ArenaLogic {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 竞技场战斗胜利/失败奖励掉落
|
||||||
|
* @param user
|
||||||
|
* @param fightResult
|
||||||
|
* @return
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public CommonProto.Drop.Builder getArenaReward(User user, int fightResult) throws Exception {
|
||||||
|
// 获取配置文件
|
||||||
|
SArenaSetting sArenaSetting = SArenaSetting.getSArenaSetting();
|
||||||
|
// 三元 赢家奖励:输家奖励
|
||||||
|
int rewardGroupId = fightResult == 1?sArenaSetting.getBattleWinReward():sArenaSetting.getBattleLoseReward();
|
||||||
|
// 三元 赢家标记:输家标记
|
||||||
|
int reason = fightResult == 1?BIReason.ARENA_WIN_REWARD:BIReason.ARENA_LOSE_REWARD;
|
||||||
|
int[] dropList = new int[1];
|
||||||
|
dropList[0]=rewardGroupId;
|
||||||
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropList,1,0, reason);
|
||||||
|
return drop;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -409,6 +409,10 @@ public class HeroLogic{
|
||||||
case 9:
|
case 9:
|
||||||
eventEnum = ReportEventEnum.BEAST_SUMMON;
|
eventEnum = ReportEventEnum.BEAST_SUMMON;
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
eventEnum = ReportEventEnum.BEAST_CABINET;
|
||||||
|
activityId = sLotterySetting.getActivityId();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -240,10 +240,6 @@ public class SRechargeCommodityConfig implements BaseConfig {
|
||||||
return dailyUpdate;
|
return dailyUpdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int[] getPassiveSkill() {
|
|
||||||
return passiveSkill;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static TreeMap<Double, Integer> getRecharegeHeroTime() {
|
public static TreeMap<Double, Integer> getRecharegeHeroTime() {
|
||||||
return recharegeHeroTime;
|
return recharegeHeroTime;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue