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

yyl

10 天以前 5a4e34c8a85737c0fa5b5775122da31155cbaef3

 Main/System/InternalAffairs/AffairBaseWin.cs

@@ -119,6 +119,20 @@
            autoBtn.SetActive(false);
            goldRushItemBtn.SetActive(false);
        }


        foreach (var npc in funcNPCs)
        {
            var key = npc.heroSkinID;
            if (!FuncOpen.Instance.IsFuncOpen(FuncNPCManager.Instance.funcNPCToFuncID[key]))
            {
                npc.SetActive(false);
            }
            else
            {
                npc.SetActive(true);
            }
        }
    }


@@ -172,8 +186,17 @@

    void OnFiveSecondEvent()
    {
        var index = FuncNPCManager.Instance.GetRandomAffairNpcTalk();
        var talk = FuncNPCManager.Instance.GetAffairTalk(funcNPCs[index].heroSkinID);
        var skinID = FuncNPCManager.Instance.GetRandomAffairNpcTalk();
        var talk = FuncNPCManager.Instance.GetAffairTalk(skinID);
        var index = 0;
        for (int i = 0; i < funcNPCs.Length; i++)
        {
            if (funcNPCs[i].heroSkinID == skinID)
            {
                index = i;
                break;
            }
        }
        if (talk != null)
        {
            talkTexts[index].text = Language.Get(talk);