Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

1 天以前 ee7f8b5362d27b228274c197dba97b17cb6bda57

 Main/System/Battle/BattleField/RecordActions/BattleStartAction.cs

@@ -62,10 +62,24 @@

   public override void ForceFinish()
   {
      //正常开始之后到界面出现之前都点不了 所以这边不用强制完成 接口留着
      if (!isRun)
      {
         isRun = true;
         UniTaskExtension.DelayTime((GameObject)null, 1f, () =>
         {
            if (battleField ==null|| battleField.battleRootNode == null|| battleField.battleRootNode.battleStartNode == null)
            {
               return;
            }
            battleField.battleRootNode.battleStartNode.SetActive(false);
            StartBattleCallback();
         });
      }

      base.ForceFinish();
      // 完成就开始显示UI
      if (isFinish)
         return;

      // 这里无法强制执行 必须等待isFinish = true

   }
}