Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2 天以前 6bcbcf0494eceb60e2754c966d66bd531c5be2a9

 Main/System/Battle/BattleField/StoryBattleField.cs

@@ -179,17 +179,19 @@
    }


    //请求单次战斗
    public void RequestFight()
    //请求单次战斗, 返回是否成功操作（预判下一次是可以继续的状态）
    public bool RequestFight()
    {
        if (IsPause)
        {
            //外部控制 IsPause
            //还需考虑其他不可战斗状况，主线的BOSS战斗也是另外一个场景且不能切出来 等跳过或者结束
            return;
            return true;
        }
        if (BattleManager.Instance.isWaitServerStory)
            return;
        { 
            return true;
        }

        //   当前没有在播放战斗录像
        if (!recordPlayer.IsPlaying())
@@ -209,7 +211,7 @@
                        dropList.Add(item.gridIndex);
                    }
                    EquipModel.Instance.NotifyItemDrop(dropList, null);
                    return;
                    return false;
                }

                //   检查一下锤子的消耗
@@ -217,8 +219,10 @@
                {
                    //多次防范
                    if (GetBattleMode() != BattleMode.Stop)
                    {
                        HaveRest();
                    return;
                    }
                    return true;
                }

                // 请求下一个战斗包 或者检查战斗是否结束
@@ -245,7 +249,7 @@
                else
                {
                    BattleDebug.LogError("unknown battle state");
                    return;
                    return true;
                }


@@ -258,13 +262,21 @@
                {
                    BattleManager.Instance.MainFightRequest(4);
                }
                return true;
            }
            else
            { 
            }
        }
        else
        {
            if (!AutoFightModel.Instance.isAutoAttack)
            {

                BattleDebug.LogError("action doesnt finish, wait a moment please");
            }
        }
        return false;
    }
    
    protected override void SetRootNodePosition()