公会大区修改,生成消耗原因方法提交

back_recharge
lvxinran 2019-11-05 15:15:26 +08:00
parent d070f16564
commit caa48c2cd0
5 changed files with 124 additions and 82 deletions

View File

@ -211,10 +211,10 @@ public class RedisKey {
return type + RedisKey.Delimiter_colon + key;
}
if(familyKey.contains(type)){
return type + RedisKey.Delimiter_colon + GameApplication.serverProperties.getAreaId();
return GameApplication.serverProperties.getAreaId()+RedisKey.Delimiter_colon+ type+RedisKey.Delimiter_colon;
}
if (withoutServerId) {
return GameApplication.areaId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key);
return GameApplication.areaId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key)+key;
} else {
return GameApplication.serverId + Delimiter_colon + type + Delimiter_colon + String.valueOf(key);
}

View File

@ -1058,7 +1058,7 @@ public class RedisUtil {
return type + RedisKey.Delimiter_colon + key;
}
if(RedisKey.familyKey.contains(type)){
return type + RedisKey.Delimiter_colon + GameApplication.serverProperties.getAreaId();
return GameApplication.serverProperties.getAreaId()+ RedisKey.Delimiter_colon+type + RedisKey.Delimiter_colon+key;
}
if(RedisKey.TOKEN.equals(type)||RedisKey.USER_SERVER_INFO.equals(type)||
RedisKey.CDKEY.equals(type)){

View File

@ -1,120 +1,121 @@
package com.ljsd.jieling.globals;
public interface BIReason {
int ADVENTURE_BASE_REWARD = 1; //探险基础收益
int ADVENTURE_RANDOM_REWARDD =2;//探险随机收益
int ADVENTURE_BASE_REWARD = 1;//探险基础收益
int ADVENTURE_RANDOM_REWARDD = 2;//探险随机收益
int DECOMPOS_ITEM_REWARD = 3 ;//分解道具奖励
int DECOMPOS_EQUIP_REWARD = 4 ;//分解道具奖励
int DECOMPOS_ITEM_REWARD = 3;//分解道具奖励
int DECOMPOS_EQUIP_REWARD = 4;//分解道具奖励
int DECOMPOS_HERO_REWARD = 5;//分解妖灵师获取奖励
int COMPOS_HERO_REWARD = 6 ;//合成妖灵师
int COMPOS_HERO_REWARD = 6;//合成妖灵师
int HERO_RANDOM = 7 ;//抽卡
int HERO_RANDOM = 7;//抽卡
int WORKSHOP_CREATEMATERIAL = 8; //基础打造
int WORKSHOP_CREATEQUIP = 9; // 装备打造
int WORKSHOP_MAKEFOOD = 10; // 装备打造
int WORKSHOP_CREATEMATERIAL = 8;//基础打造
int WORKSHOP_CREATEQUIP = 9;//装备打造
int WORKSHOP_MAKEFOOD = 10;//装备打造
int TAKE_MISSION_REWARD = 11;// 领取任务奖励
int TAKE_ACTIVITY_REWARD = 12;// 领取活动奖励
int TAKE_COPY_REWARD = 12;// 领取副本功绩奖励
int TAKE_MISSION_REWARD = 11;//领取任务奖励
int TAKE_ACTIVITY_REWARD = 12;//领取活动奖励
int TAKE_SECRET_REWARD = 13; //秘盒奖励
int TAKE_SECRET_REWARD = 13;//秘盒奖励
int TAKE_SECRET_EXTRA_REWARD = 14;//秘盒额外奖励
int USER_BORN_REWARD = 15 ;// 角色出生奖励
int USER_BORN_REWARD = 15;//角色出生奖励
int TAKE_MAIL_REWARD = 16 ;// 邮件奖励
int TAKE_MAIL_REWARD = 16;//邮件奖励
int TAKE_VIP_LEVEL_REWARD = 17 ;// 领取vip等级礼包奖励
int TAKE_VIP_DAILY_REWARD = 18 ;// 领取vip日常奖励
int TAKE_VIP_LEVEL_REWARD = 17;//领取vip等级礼包奖励
int TAKE_VIP_DAILY_REWARD = 18;//领取vip日常奖励
int STORE_BUY_ITEM = 19; //商店购买
int STORE_BUY_ITEM = 19;//商店购买
int MAP_EVENET_REWARD = 20; //地图事件点奖励
int MAP_GENERAL_FIGHT_REWARD = 21; //地图战斗
int MAP_FAST_FIGHT_REWARD = 22; //地图快速战斗
int MAP_MISSION_REWARD = 23; //地图任务奖励
int MAP_SWEEP_REWARD = 24; //扫荡地图副本
int MAP_EVENET_REWARD = 20;//地图事件点奖励
int MAP_GENERAL_FIGHT_REWARD = 21;//地图战斗
int MAP_FAST_FIGHT_REWARD = 22;//地图快速战斗
int MAP_MISSION_REWARD = 23;//地图任务奖励
int MAP_SWEEP_REWARD = 24;//扫荡地图副本
int LEVELDIFFICULTY_FIGHT_REWARD = 25; //关卡奖励
int LEVELDIFFICULTY_SWEEP_REWARD = 26; //关卡扫荡奖励
int LEVELDIFFICULTY_FIGHT_REWARD = 25;//关卡奖励
int LEVELDIFFICULTY_SWEEP_REWARD = 26;//关卡扫荡奖励
int USER_LEVELUPSTAMINA_REWARD = 27; //玩家升级加经验
int USER_LEVELUPSTAMINA_REWARD = 27;//玩家升级加经验
int GM_REWARD = 28; //gm加成
int GM_REWARD = 28;//gm加成
int VIP_DAY_REWARD = 29; //VIP 每日赠送
int VIP_DAY_REWARD = 29;//VIP每日赠送
int FRIEND_GIVE = 32; //好友赠送
int TAKE_COPY_REWARD = 30;//领取副本功绩奖励
int TREASURE_SCORE = 31;//孙龙宝藏获得积分
int FRIEND_GIVE = 32;//好友赠送
int BOMB_REWARD = 33;//炸弹掉落
int TOWER_SWEEP_REWARD = 34;//爬塔扫荡奖励
int WORK_SHOP_TECHNOGY_RESET_DROP =35 ; //工坊科技重置返回奖励
int WORK_SHOP_TECHNOGY_RESET_DROP = 35;//工坊科技重置返回奖励
int TAKE_STAR_REWARD = 36; // 领取星级奖励
int TAKE_STAR_REWARD = 36;//领取星级奖励
int TOWER_FLOOR_REWARD = 37; //领取试炼层级奖励
int TOWER_FLOOR_REWARD = 37;//领取试炼层级奖励
int MONTH_CARD_REWARD = 38;//月卡奖励
int BLESS_REWARD = 39;//云梦抽取奖励
int SEVEN_SCORE_REWARD = 40;//领取七日狂欢奖励
int TIME_REWARD=41; //道具按时回复
int TIME_REWARD= 41;//道具按时回复
int TEMPORARY_REWARD=42;//临时背包到背包
int TEMPORARY_REWARD= 42;//临时背包到背包
int SUDDENLY_REWARD = 43; // 精英怪奖励
int SUDDENLY_REWARD = 43;//精英怪奖励
int MONSTERATTACK_REWARD = 44; // 妖兽来袭奖励
int MONSTERATTACK_BACK = 45; // 妖兽来袭预扣归还
int MONSTERATTACK_REWARD = 44;//妖兽来袭奖励
int MONSTERATTACK_BACK = 45;//妖兽来袭预扣归还
int FIRST_ADVENTURE_REWARD = 46; // 秘境首次奖励外敌挑战券
int UPHERO_DECOMPOS_HERO_REWARD= 47 ;//进阶妖灵师返还奖励
int FIRST_ADVENTURE_REWARD = 46;//秘境首次奖励外敌挑战券
int UPHERO_DECOMPOS_HERO_REWARD= 47;//进阶妖灵师返还奖励
int GM_CHANGENAME = 48; // gm改名赠送
int BIND_PHONE = 49; // 修改手机号
int GM_CHANGENAME = 48;//gm改名赠送
int BIND_PHONE = 49;//修改手机号
int ENDLESS_REASON_CHANGE = 50;//无尽副本赛季更换
int RANDOM_SOULEQUIP = 51;//占星
int DIRECT_BUY = 52; // 直购
int TREASURE_SCORE = 53;//孙龙宝藏获得积分
int DIRECT_BUY = 52;//直购
int MAIN_LEVEL_STATE_REWARD = 53; // 关卡挂机奖励
int MAIN_LEVEL_STATE_REWARD = 53;//关卡挂机奖励
int LUCK_WHEEl_REWARD = 54; //幸运转盘
int LUCK_WHEEl_ADVANCE_REWARD = 55; //高级幸运转盘
int SYSTERM_OPEN_REWARD = 56; //系统开放奖励
int LUCK_WHEEl_REWARD = 54;//幸运转盘
int LUCK_WHEEl_ADVANCE_REWARD = 55;//高级幸运转盘
int SYSTERM_OPEN_REWARD = 56;//系统开放奖励
int HERO_BACK_REWARD = 57; // 英雄回溯返回东西
int EXTRA_DROP_REWARD = 58; // 额外赠送
int HERO_BACK_REWARD = 57 ; //英雄回溯返回东西
int EXTRA_DROP_REWARD=58;// 额外赠送
//道具消耗原因 1000开头
int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级
int SECRETBOX_CONSUME = 1001; //秘盒抽卡
int DECOMPOSE_ITEM_CONSUME = 1002; //分解道具消耗
int ADVENTURE_UPLEVEL_CONSUME = 1000;//秘境升级
int SECRETBOX_CONSUME = 1001;//秘盒抽卡
int DECOMPOSE_ITEM_CONSUME = 1002;//分解道具消耗
int UP_HEROSTAR_CONSUME = 1003;//升星消耗
int WORKSHOP_REBUILD_EQUIP_CONSUME = 1004; // 工坊重铸装备消耗
int WORKSHOP_CREATEMATERIAL_CONSUME = 1005; //工坊基础打造
int WORKSHOP_REBUILD_EQUIP_CONSUME = 1004;//工坊重铸装备消耗
int WORKSHOP_CREATEMATERIAL_CONSUME = 1005;//工坊基础打造
int WORKSHOP_EQUIP_CONSUME = 1006;//工坊装备打造
int WORKSHOP_TECHNOLOGY_CONSUME = 1007;//工坊科技树科技消耗
int ACTIVE_BLUE_CONSUME = 1008; //激活蓝图消耗
int ACTIVE_BLUE_CONSUME = 1008;//激活蓝图消耗
int STORE_HAND_REFRESH = 1009;//手动刷新商店
int USER_ITEM = 1010; // 使用道具
int USER_ITEM = 1010;//使用道具
int RANDOM_HERO_CONSUME = 1011;//聚灵
int UP_HERO_LEVEL_CONSUME = 1012; // 卡牌升级消耗
int UP_HERO_LEVEL_CONSUME = 1012;//卡牌升级消耗
int START_DIFFICULT = 1013;//关卡开始战斗消耗
int END_DIFFICULT = 1014;// 关卡结束战斗消耗
int COMPOS_HERO_CONSUME = 1014;// 合成英雄消耗
int POKEMON_LOAD_CONSUME = 1015;// 放置异妖组件消耗
int END_DIFFICULT = 1014;//关卡结束战斗消耗
int COMPOS_HERO_CONSUME = 1014;//合成英雄消耗
int POKEMON_LOAD_CONSUME = 1015;//放置异妖组件消耗
int POKEMON_ADVANCE_CONSUME = 1016;//异妖进阶消耗
int POKEMON_UPLEVEL_CONSUME = 1017;//异妖升级消耗
@ -123,35 +124,35 @@ public interface BIReason {
int MAP_ENTER_CONSUME = 1020;//进入滴入消耗
int MAP_EVENT_CONSUME = 1021;//地图事件点消耗
int ARENA_CHALLENGE_CONSUME = 1022; // 竞技场挑战消耗
int ARENA_CHALLENGE_CONSUME = 1022;//竞技场挑战消耗
int RINGFIRE_LOAD_CONSUME = 1023; // 放置天赋异妖
int RINGFIRE_LOAD_CONSUME = 1023;//放置天赋异妖
int BOMB_CONSUME = 1024; // 使用次元炸弹
int BOMB_CONSUME = 1024;//使用次元炸弹
int CHALLENGE_INVASIONBOSS_CONSUME = 1025; //挑战秘境外敌boss消耗
int CHALLENGE_INVASIONBOSS_CONSUME = 1025;//挑战秘境外敌boss消耗
int MAP_CONSUME = 1026; // 地图行为消耗
int MAP_CONSUME = 1026;//地图行为消耗
int BLESS_CHOOSE_CONSUME = 1027;//云梦抽取
int BUY_TREASURE_CONSUME = 1028;//购买孙龙的宝藏消耗
int LUCKYCAT_CONSUME = 1029; // 招财猫消耗
int LUCKYCAT_CONSUME = 1029;//招财猫消耗
int CREATE_GUILD_CONSUME = 1030; // 创建宗门消耗
int ENDLESS_CONSUME_EXECUTION = 1031; //无尽副本消耗行动力
int CREATE_GUILD_CONSUME = 1030;//创建宗门消耗
int ENDLESS_CONSUME_EXECUTION = 1031;//无尽副本消耗行动力
int ADVENTURE_CALL_BOSS_CONSUME = 1032; //召唤外敌消耗
int ADVENTURE_CALL_BOSS_CONSUME = 1032;//召唤外敌消耗
int MONSTERATTACK_CONSUME = 1033; // 妖兽来袭开启战斗消耗
int MONSTERATTACK_CONSUME = 1033;//妖兽来袭开启战斗消耗
int CHANGE_NAME = 1034; // 改名消耗
int CHANGE_NAME = 1034;//改名消耗
int ESPECIAL_EQUIP_UP_LEVEL_CONSUME = 1035;//法宝进阶消耗
@ -162,10 +163,10 @@ public interface BIReason {
int EXCHANGE_ACTIVITY_CLOSE = 1038;//限时兑换删除道具
int LUCK_WHEEL = 1039; //幸运转盘消耗
int LUCK_WHEEL_ADVANCE = 1040; //高级幸运转盘消耗
int LUCK_WHEEL = 1039;//幸运转盘消耗
int LUCK_WHEEL_ADVANCE = 1040;//高级幸运转盘消耗
int HERO_BACK_CONSUME = 1041; // 英雄回溯消耗
int HERO_BACK_CONSUME = 1041;//英雄回溯消耗
int TREASURE_LEVEL_UP_CONCUME = 1042;//孙龙宝藏等级提升消耗

View File

@ -411,9 +411,9 @@ public class GuildLogic {
if(!isSuccess){
throw new ErrorCodeException(ErrorCode.FAMILY_DO_AGAIN);
}
if(GuildFightLogic.getStatus()!=0&&(type==1||type==3)){
throw new ErrorCodeException(ErrorCode.FAMILY_NO_APPLY_IN_WAR);
}
// if(GuildFightLogic.getStatus()!=0&&(type==1||type==3)){
// throw new ErrorCodeException(ErrorCode.FAMILY_NO_APPLY_IN_WAR);
// }
try {
Map<Integer, GuildApply> applyGuild = GuilidManager.getApplyGuildInfos(guildId, 0);
switch (type){

View File

@ -0,0 +1,41 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
/**
* @author lvxinran
* @date 2019/11/5
* @discribe
*/
public class BIUtil {
public static void main(String[] args) {
outBIReasonFile("serverlogic\\src\\main\\java\\com\\ljsd\\jieling\\globals\\BIReason.java","conf\\BIoutput.txt");
}
public static void outBIReasonFile(String in,String out){
StringBuffer buf = new StringBuffer();
Path path = Paths.get(in);
try {
List<String> lines = Files.readAllLines(path);
lines.forEach(str -> buf.append(str));
} catch (IOException e) {
e.printStackTrace();
}
String replace = buf.toString().replace("}", "").replace(" ","");
String[] split = replace.split("=");
StringBuilder content = new StringBuilder();
for(String s:split){
String[] reason= s.split("int")[0].split(";//");
if(reason.length<2){
continue;
}
content.append(reason[0]).append("\t").append(reason[1].replaceAll(" ","")).append("\n");
}
try {
Files.write(Paths.get(out), content.toString().getBytes());
} catch (IOException e) {
e.printStackTrace();
}
}
}