抽卡：修复新人卡池特殊处理问题

shared/domain/activityField/gachaField.ts

@@ -111,8 +111,8 @@ export class GachaListReturn {
             this.turntable = userGacha.turntable;
             this.pickHero = userGacha.pickHero;
             this.guideResultCount = userGacha.guideResultCount||0;
-            this.remainFloor = getGachaRemainFloor(this.gachaId, userGacha.floor);
         }
+        this.remainFloor = getGachaRemainFloor(this.gachaId, userGacha?.floor||[]);
     }
 }
 

shared/pubUtils/util.ts

@@ -807,8 +807,11 @@ export function getGachaRemainFloor(gachaId: number, userFloor: Floor[]) {
 
     for(let floorId of dicGacha.floor) {
         let dicGachaFloor = gameData.gachaFloor.get(floorId);
+        console.log('##### floorId', floorId, dicGachaFloor)
         if(dicGachaFloor && dicGachaFloor.floorType == GACHA_FLOOR_TYPE.MAIN_FLOOR) {
             let myFloor = userFloor.find(cur => cur.id == floorId);
+            console.log('#### dicGacha#', gachaId, dicGachaFloor.param, (myFloor?.count||0))
+
             return dicGachaFloor.param - (myFloor?.count||0);
         }
     }

shared/resource/jsons/dic_zyz_gacha.json

@@ -4,7 +4,7 @@
         "gachaType": 1,
         "floor": "&",
         "name": "新手招募1",
-        "count": "1&10",
+        "count": "1&",
         "free": "&",
         "cost": "22001&1",
         "percent": "16&100",
@@ -19,7 +19,7 @@
         "gachaType": 1,
         "floor": "&",
         "name": "新手招募2",
-        "count": "1&10",
+        "count": "1&",
         "free": "&",
         "cost": "22001&1",
         "percent": "17&100",