Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
jiahuiwen 2022-04-25 15:36:56 +08:00
commit da292b31ab
5 changed files with 16 additions and 5 deletions

View File

@ -33,6 +33,9 @@ public class TransformationForceUpHandler extends BaseHandler<HeroInfoProto.Tran
int id = proto.getId();
User user = UserManager.getUser(iSession.getUid());
Map<Integer, SChangingForce> cardMap = STableManager.getConfig(SChangingForce.class);
id = user.getHeroManager().getTransformationForce()+1;
SChangingForce config = cardMap.get(id);
if (config == null) {
return;

View File

@ -1840,8 +1840,7 @@ public class ActivityLogic implements IEventHandler{
int[] result = new int[]{incs[0],incs[1]};
// 抽奖次数达到必出up次数
// 2022-4-21 策划需求【屏蔽点将台心愿招募】
if (count >= incs[3] && false){
if (count >= incs[3]){
// 次数归0
count = 0;
// 添加奖励
@ -1856,7 +1855,7 @@ public class ActivityLogic implements IEventHandler{
// 根据id获取奖池信息
SWishActivityPool pool = poolMap.get(entry.getKey());
// null意味着是up奖励
if (pool == null && false){
if (pool == null){
count = 0;
reward[i++] = result;
}

View File

@ -201,7 +201,7 @@ public class HeroManager extends MongoBase {
/**
*
*/
private int transformationForce;
private int transformationForce = 1 ;
public int getTransformationForce() {
return transformationForce;

View File

@ -2924,7 +2924,7 @@ public class HeroLogic {
// 变身卡单独提供得属性
combinedAttribute(card.getPropList(), heroAllAttribute);
// 每张变身卡提供得额外属性
combinedAttribute(arrayValue, heroAllAttribute);
//combinedAttribute(arrayValue, heroAllAttribute);
//变身卡升星属性
if(info.getStar() == 1){
combinedAttribute(card.getStar1UpProps(), heroAllAttribute);

View File

@ -32,6 +32,9 @@ public class SChangingCard implements BaseConfig {
private int isOpen;
private int starMax;
private int levelMax;
@Override
public void init() throws Exception {
@ -87,5 +90,11 @@ public class SChangingCard implements BaseConfig {
return isOpen;
}
public int getStarMax() {
return starMax;
}
public int getLevelMax() {
return levelMax;
}
}