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

yyl

1 天以前 6bcbcf0494eceb60e2754c966d66bd531c5be2a9

 Main/System/InternalAffairs/GoldRushWorkerWin.cs

@@ -42,13 +42,14 @@

    protected override void OnPreOpen()
    {
        CreateManagerScroller();
        
        CreateWorkersScroller();
        GoldRushManager.Instance.OnGoldRushCampEvent += OnGoldRushCampEvent;
        GoldRushManager.Instance.OnGoldRushInfoEvent += OnGoldRushInfoEvent;
        workMgrScroller.OnRefreshCell += OnRefreshWorkMgrCell;
        workersScroller.OnRefreshCell += OnRefreshWorkersCell;
        GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
        PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefreshEvent;

        if (functionOrder == 0)
        {
@@ -68,6 +69,16 @@
        workMgrScroller.OnRefreshCell -= OnRefreshWorkMgrCell;
        workersScroller.OnRefreshCell -= OnRefreshWorkersCell;
        GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
        PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefreshEvent;
    }


    void OnPlayerDataRefreshEvent(PlayerDataType type)
    {
        if (type == GoldRushManager.Instance.unLockMoneyType)
        {
            workersScroller.m_Scorller.RefreshActiveCellViews();
        }
    }


@@ -76,6 +87,7 @@
        if (functionOrder == 0)
        {
            RefreshWorkingList();
            CreateManagerScroller();
            DispalyWorkMgr();
        }
        else
@@ -113,8 +125,11 @@
    //派遣中的队列 + 完成的队列，动态变化的
    void CreateManagerScroller()
    {
        if (workMgrScroller.GetNumberOfCells(workMgrScroller.m_Scorller) == goldRushMissionList.Count)
            return;
        
        workMgrScroller.Refresh();
        for (int i = 0; i < GoldRushManager.Instance.warehouseMaxCnt; ++i)
        for (int i = 0; i < goldRushMissionList.Count; ++i)
        {
            workMgrScroller.AddCell(ScrollerDataType.Header, i);
        }