修复抽牌BUG

unco999 · Feb 10, 2022 · 9a961e3 · 9a961e3
1 parent 52b2a5d
commit 9a961e3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/game/scripts/src/Manager/BattleGameLoop.ts b/game/scripts/src/Manager/BattleGameLoop.ts
@@ -1,11 +1,9 @@
 import { ScenesBuildbehavior } from "../Build/Scenesbuilder";
 import { damage } from "../feature/damage";
 import { AbilityCard } from "../instance/Ability";
-import { Card } from "../instance/Card";
-import { BattleArea, Cardheaps, Grave, Hand, Hide, Scenes } from "../instance/Scenes";
+import { BattleArea, Cardheaps, Grave, Hand, Hide } from "../instance/Scenes";
 import { Unit } from "../instance/Unit";
 import { Timers } from "../lib/timers";
-import { LinkedList } from "../structure/Linkedlist";
 import { BATTLE_BRACH_STATE, clear_option_mask_state, get_current_battle_brach, get_current_operate_brach, loop_end_clear, set_current_battle_brach, set_current_operate_brach, Set_option_mask_state, STRATEGY_BRACH_STATE } from "./nettablefuc";
 import { Battle_Select_Brach, GameLoopMaskClearBlue, GameLoopMaskClearBlueSkip, GameLoopMaskClearRed, GameLoopMaskClearRedSkip, GameLoopMaskSkipBlue, GameLoopMaskSkipRed, get_oparaotr_current, get_settlement_current, isBattleSettlement, IsblueOperater, IsRedOperater, operate, optionMask, SetGameLoopMasK, set_oparator_false, strategy_Select_Brach } from "./statusSwitcher";
 
@@ -252,7 +250,7 @@ export class faultCard extends GameLoopState {
     entry() {
         super.entry();
         this.Set_cuurent_option_player = GameRules.Red.GetPlayerID().toString()
-        Timers.CreateTimer(0.33,()=>{
+        Timers.CreateTimer(0.5,()=>{
             this.create_solider() //每回合刷小兵
         })
         if (!this.host.init) {
@@ -263,18 +261,19 @@ export class faultCard extends GameLoopState {
             this.host.init = true;
             GameRules.SceneManager.update();
         } else {
+
         }
     }
 
 
     init_give_cards() {
        const redScenesHand = GameRules.SceneManager.GetCardheapsScene(GameRules.Red.GetPlayerID()) as Cardheaps
        const BlueScenesHand = GameRules.SceneManager.GetCardheapsScene(GameRules.Blue.GetPlayerID()) as Cardheaps
-       for(let i = 0 ; i < (IsInToolsMode() ? 16 : 5); i++){
-          const redCard = redScenesHand.takeAHand(!IsInToolsMode() && true)
-          const blueCard = BlueScenesHand.takeAHand(!IsInToolsMode() && true)
-          GameRules.SceneManager.change_secens(redCard.UUID,"HAND")
-          GameRules.SceneManager.change_secens(blueCard.UUID,"HAND")
+       for(let i = 0 ; i < 5; i++){
+          const redCard = redScenesHand.takeAHand(true)
+          const blueCard = BlueScenesHand.takeAHand(true)
+          redCard && GameRules.SceneManager.change_secens(redCard.UUID,"HAND")
+          blueCard && GameRules.SceneManager.change_secens(blueCard.UUID,"HAND")
        }
        this.initflag = true;
     }

diff --git a/game/scripts/src/System/ChooseHeroCard.ts b/game/scripts/src/System/ChooseHeroCard.ts
@@ -260,6 +260,7 @@ export class showtime extends ChooseHerostate{
                 GameRules.gamemainloop = new BattleGameLoop()
                 GameRules.gamemainloop.StartcuurentsettingState = new faultCard(GameRules.gamemainloop,STRATEGY_BRACH_STATE.上路)
             })
+            return 1
         }
         return 1
     }

diff --git a/game/scripts/src/instance/Scenes.ts b/game/scripts/src/instance/Scenes.ts
@@ -152,13 +152,15 @@ export class Cardheaps extends Scenes {
         let card:Card;
         for(const key in this.CardPool){
             if(isSmall){
-                if(card.type == 'SmallSkill'){
+                if(this.CardPool[key].type == 'SmallSkill'){
+                    print("找到一张小技能卡")
                     return this.CardPool[key]
                 }
+                continue
             }
             card = this.CardPool[key]
+            return card
         }
-        return card
      }