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

yyl

9 天以前 e038d0986f510de9d298ebdf6036e32c6b3733b9

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

 Main/Component/UI/Common/FuncOpen.cs

@@ -370,8 +370,7 @@
            return string.Empty;
        }
        string connector = Language.Get("FunctionPreview01"); // "且"
        string unlockStr = Language.Get("FunctionPreview02"); // "解锁"
        string result = string.Join(connector, conditionStrs) + unlockStr;
        string result = string.Join(connector, conditionStrs);
        return result;
    }


 Main/System/NewBieGuidance/NewBieCenter.cs

@@ -529,6 +529,7 @@
                completeGuidesBuf.Add(allGuideKeys[i]);

            }

        }

        BattleManager.Instance.storyBattleField.IsPause = false;



    }



@@ -543,6 +544,7 @@
        UIManager.Instance.CloseWindow<NewBieWin>();



        completeGuidesBuf.Clear();

        BattleManager.Instance.storyBattleField.IsPause = false;

    }



    public void ResetGuide(int _guide)