装备：修复天晶继承

game-server/app/services/equipService.ts

@@ -25,36 +25,32 @@ export function getRandSeResult(id: number, randSe: RandSe[], originSe: RandSe[]
         }
         let newSeid = nextRandEffect? nextRandEffect.id: seid;
         newRandSe.push(getJewelRandSe(id, newSeid));
-        chosen.push(seid);
+        chosen.push(newSeid);
         startId++;
     }
 
-    if(originId) {  // 天晶继承的原天晶
+    let randomResult: number[] = getRandEelm(randomEffect.filter(cur => !chosen.includes(cur)), effectCount); // 随机出的结果
-        for (let i = startId; i < randSe.length; i++) {
+    if(randomResult.length < effectCount) { // 去上轮之后不够，把上轮加入
-            newRandSe.push(randSe[i]);
+        let chosenRandom = getRandEelm(chosen, effectCount - randomResult.length);
-        }
+        randomResult.push(...chosenRandom);
-    } else { // 洗练
+    }
-        let randomResult: number[] = getRandEelm(randomEffect.filter(cur => !chosen.includes(cur)), effectCount); // 随机出的结果
+    if(randomResult.length < effectCount) { // 还是不够
-        if(randomResult.length < effectCount) { // 去上轮之后不够，把上轮加入
+        let allRandom = getRandEelm(randomEffect, effectCount - randomResult.length);
-            let chosenRandom = getRandEelm(chosen, effectCount - randomResult.length);
+        randomResult.push(...allRandom);
-            randomResult.push(...chosenRandom);
+    }
-        }
+
-        if(randomResult.length < effectCount) { // 还是不够
+    console.log('##### getRandSeResult', startId, effectCount)
-            let allRandom = getRandEelm(randomEffect, effectCount - randomResult.length);
+
-            randomResult.push(...allRandom);
+    for (let i = startId; i < effectCount; i++) {
-        }
+        if(randSe[i]) {
-    
+            if(randSe[i] && randSe[i].locked) {
-        for (let i = startId; i < effectCount; i++) {
+                newRandSe.push(randSe[i]);
-            if(randSe[i]) {
-                if(randSe[i] && randSe[i].locked) {
-                    newRandSe.push(randSe[i]);
-                } else {
-                    newRandSe.push(getJewelRandSe(randSe[i].id, randomResult[i]));
-                }
             } else {
-                newRandSe.push(getJewelRandSe(i + 1, randomResult[i]));
+                newRandSe.push(getJewelRandSe(randSe[i].id, randomResult[i]));
             }
-        }    
+        } else {
+            newRandSe.push(getJewelRandSe(i + 1, randomResult[i]));
+        }
     }
 
     return newRandSe