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

yyl

2025-09-30 c8194cde87466dc50c78d4b2417b68793a6eac42

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

 Main/System/InternalAffairs/GoldRushAutoBuyWin.cs

@@ -48,6 +48,7 @@
    void Buy()
    {
        RechargeManager.Instance.CTG(GoldRushManager.Instance.buyAutoCTGIDList[0]);
        CloseWindow();
    }

}

 Main/System/InternalAffairs/GoldRushLeader.cs

@@ -76,8 +76,15 @@

        Vector3 nextPos = leaderPathPointArr[moveIndex].transform.localPosition;
        if (isBack)
        { 
            leader.PlayAnimation("run_xiangzi", true, false);
        {
            if (GoldRushManager.Instance.HasWorking(tendID))
            {
                leader.PlayAnimation("run", true, false);
            }
            else
            { 
                leader.PlayAnimation("run_xiangzi", true, false);
            }
        }
        else
        {

 Main/System/InternalAffairs/GoldRushManager.cs

@@ -386,11 +386,20 @@
    }



    //有可进行和进行中的

    public bool HasWorking()

    public bool HasWork()

    {

        return campInfoDict.Values.Any(x => x.GoldID != 0);

    }



    //进行中的

    public bool HasWorking(int campID)

    {

        if (campInfoDict.ContainsKey(campID))

        {

            return campInfoDict[campID].GoldID != 0 && campInfoDict[campID].EndTime != 0;

        }

        return false;

    }



    public string GetCampItemName(GoldRushItemConfig config)

    {

@@ -685,7 +694,7 @@
            return;

        }



        if (UIHelper.GetMoneyCnt(52) <= 0 && !HasWorking())

        if (UIHelper.GetMoneyCnt(52) <= 0 && !HasWork())

        {

            PauseAutoWorking();

            SysNotifyMgr.Instance.ShowTip("GoldRush10");


 Main/System/InternalAffairs/GoldRushRefreshWin.cs

@@ -75,7 +75,7 @@
        if (endTime == 0)
        {
            //未开始
            timeText.text = TimeUtility.SecondsToMS(config.NeedSeconds);
            timeText.text = TimeUtility.SecondsToHMS(config.NeedSeconds);
            refreshRect.SetActive(true);
            callBackBtn.SetActive(false);

@@ -87,7 +87,7 @@
        }
        else
        {
            timeText.text = TimeUtility.SecondsToMS(endTime - TimeUtility.AllSeconds);
            timeText.text = TimeUtility.SecondsToHMS(endTime - TimeUtility.AllSeconds);
            refreshRect.SetActive(false);
            callBackBtn.SetActive(true);
            RefreshCallBackBtn();
@@ -121,7 +121,7 @@
        var endTime = GoldRushManager.Instance.GetCampEndTime(GoldRushManager.Instance.selectCampID);
        if (endTime != 0)
        {
            timeText.text = TimeUtility.SecondsToMS(endTime - TimeUtility.AllSeconds);
            timeText.text = TimeUtility.SecondsToHMS(endTime - TimeUtility.AllSeconds);

            var addStr = new string('.', (int)Time.time % 4);
            workingText.text = Language.Get("GoldRush37") + addStr;
@@ -153,11 +153,11 @@
        if (endTime == 0)
        {
            //未开始
            timeText.text = TimeUtility.SecondsToMS(config.NeedSeconds / Math.Max(1, count));
            timeText.text = TimeUtility.SecondsToHMS(config.NeedSeconds / Math.Max(1, count));
        }
        else
        {
            timeText.text = TimeUtility.SecondsToMS(endTime - TimeUtility.AllSeconds);
            timeText.text = TimeUtility.SecondsToHMS(endTime - TimeUtility.AllSeconds);
            RefreshCallBackBtn();
        }
    }

 Main/System/InternalAffairs/GoldRushWorkCell.cs

@@ -62,7 +62,7 @@
        {
            if (endTime != 0)
            {
                timeText.text = TimeUtility.SecondsToMS(endTime - TimeUtility.AllSeconds);
                timeText.text = TimeUtility.SecondsToHMS(endTime - TimeUtility.AllSeconds);
                //按原总时长当进度条
                slider.value = (config.NeedSeconds - (endTime - TimeUtility.AllSeconds)) / (float)config.NeedSeconds;
            }
@@ -77,7 +77,7 @@
                {
                    heroModels[i].SetActive(true);
                    var skinID = GoldRushManager.Instance.GetWorkerSkinID(campID, i);
                    heroModels[i].Create(skinID, 0.5f);
                    heroModels[i].Create(skinID, 0.6f, motionName:"run");
                }
                else
                {