From c7715e7a87dd0dac2b15cdaf282aedb60eda77eb Mon Sep 17 00:00:00 2001
From: xuexinpeng <xuexinpeng0816@163.com>
Date: Sun, 24 Apr 2022 18:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E5=A4=96=E5=8C=96=E8=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transformation/TransformationForceUpHandler.java     | 3 +++
 .../java/com/ljsd/jieling/logic/dao/HeroManager.java     | 2 +-
 .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +-
 tablemanager/src/main/java/config/SChangingCard.java     | 9 +++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationForceUpHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationForceUpHandler.java
index 00ef12838..20c27fac4 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationForceUpHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationForceUpHandler.java
@@ -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;
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java
index aae81adfc..1b5f7e394 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java
@@ -201,7 +201,7 @@ public class HeroManager extends MongoBase {
     /**
      * 变身卡变身之力
      */
-    private int transformationForce;
+    private int transformationForce = 1 ;
 
     public int getTransformationForce() {
         return transformationForce;
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
index f3c715e9d..0a9a46809 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
@@ -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);
diff --git a/tablemanager/src/main/java/config/SChangingCard.java b/tablemanager/src/main/java/config/SChangingCard.java
index 9926b3e9a..7944b191a 100644
--- a/tablemanager/src/main/java/config/SChangingCard.java
+++ b/tablemanager/src/main/java/config/SChangingCard.java
@@ -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;
+    }
 }
\ No newline at end of file