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

yyl

4 天以前 e2510985a94f54236db54198063fedc0f960fa4a

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

 Main/Config/PartialConfigs/PlayerPropertyConfig.cs

@@ -106,6 +106,33 @@
        }
    }

    public static string GetBaseFullDescription(int id, long value, string format="{0}+{1}")
    {
        var config = Get(id);
        if (config == null)
        {
            return string.Empty;
        }
        string showName = config.ShowName;
        if (id == 6 || id == 16)
        {
            showName = Language.Get("herocard59");
        }
        else if (id == 7 || id == 17)
        {
            showName = Language.Get("herocard60");
        }
        else if (id == 8 || id == 18)
        {
            showName = Language.Get("herocard61");
        }
        return string.Format(format, showName, GetValueDescription(id, value));
    }





    //largeNumFormat 大数值格式：0 默认原数值 1 按万或者(K)显示 2 按6位数以上（才转换大数值，根据情况可统一调整）
    public static string GetValueDescription(int id, long value, int largeNumFormat = 2)
    {

 Main/System/BillboardRank/RankModel.cs

@@ -210,6 +210,14 @@
        }

        ranksServerMaxCnt[rankType] = package.DataTotal;



        if (package.DataTotal == 0)

        {

            m_RankPageDatas[rankType].Clear();

            m_RankIDToIndex[rankType].Clear();

            onRankRefresh?.Invoke(package.Type);

            return;

        }



        for (int i = 0; i < package.PageDataCnt; i++)

        {

            int id = (int)package.PageDataList[i].ID;


 Main/System/HappyXB/HappyXBModel.cs

@@ -41,6 +41,7 @@


    public int lhQuality;

    public int tenCallGuideID = 0;

    public bool startTenCallGuide = false;



    public override void Init()

    {


 Main/System/HeroUI/HeroBaseWin.cs

@@ -24,16 +24,23 @@
    }


    protected override void OnOpen()
    {
        if (HappyXBModel.Instance.startTenCallGuide)
        {
            NewBieCenter.Instance.StartNewBieGuide(HappyXBModel.Instance.tenCallGuideID);
            HappyXBModel.Instance.startTenCallGuide = false;

        }
    }

    protected override void OnPreClose()
    {
        base.OnPreClose();
        
    }


    public override void Refresh()
    {

    }




 Main/System/HeroUI/HeroGiftEatWin.cs

@@ -71,7 +71,7 @@
            for (int i = 0; i < addAttrTexts.Length; i++)
            {
                int id = PlayerPropertyConfig.basePerAttrs[i];
                addAttrTexts[i].text = PlayerPropertyConfig.GetFullDescription(id, hero.qualityConfig.StarAddPer,
                addAttrTexts[i].text = PlayerPropertyConfig.GetBaseFullDescription(id, hero.qualityConfig.StarAddPer,
                "{0}+" + UIHelper.AppendColor(TextColType.Green, "{1}", true));
            }
            addGiftTip.SetActive(!hero.IsFullGift());

 Main/System/Main/MainWin.cs

@@ -303,7 +303,7 @@
                {
                    if (!NewBieCenter.Instance.inGuiding)
                    {
                        NewBieCenter.Instance.StartNewBieGuide(HappyXBModel.Instance.tenCallGuideID);
                        HappyXBModel.Instance.startTenCallGuide = true;
                    }
                }
                currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);

 Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs

@@ -23,6 +23,7 @@
    public bool clickAnyWhereComplete = false;  
    public bool clickCompleteNoMask = false;    //非强制引导，任意点击关闭，勾选此项会隐藏蒙版，且点击其他区域不会响应按钮事件
    public int delayTime = 0;  //展示时间（毫秒），期间不可点击
    public string needWinName;

    // 引导的文本的箭头位置
    public enum ArrowPosition

 Main/System/NewBieGuidance/NewBieWin.cs

@@ -140,6 +140,12 @@
            {

                m_lastTargetPosition = m_ClickTarget.position;

                tryGuideCount = 0;

                if (!string.IsNullOrEmpty(stepConfig.needWinName) && !UIManager.Instance.IsOpened(stepConfig.needWinName))

                {

                    Debug.Log($"引导步骤{step}需要打开窗口{stepConfig.needWinName}");

                    ReportStepOver();

                    return;

                }

            }

            else

            {

@@ -147,7 +153,7 @@
                {



#if UNITY_EDITOR

                    if (!string.IsNullOrEmpty(stepConfig.UIElementPath))

                    if (!string.IsNullOrEmpty(stepConfig.UIElementPath) && string.IsNullOrEmpty(stepConfig.needWinName))

                        Debug.LogError($"引导步骤{step}找不到目标{stepConfig.UIElementPath}, 若不需要请删除路径");

#endif

                    ReportStepOver();


 Main/System/TianziBillborad/TianziBillboradPlayerTop3Cell.cs

@@ -23,12 +23,14 @@
            rankValueText.text = "0";//Language.Get("L1125");
            nameText.text = Language.Get("L1124");
            officialTitleCell.SetActive(false);
            model.SetActive(false);
            return;
        }
        officialTitleCell.SetActive(true);
        rankValueText.text = string.Format(valueFormat, UIHelper.ReplaceLargeNum(rankData.cmpValue2 + rankData.cmpValue * Constants.ExpPointValue));
        nameText.text = rankData.name1;
        officialTitleCell.InitUI((int)rankData.value1, (int)rankData.value2);
        model.SetActive(true);
        model.Create(HorseManager.Instance.GetOtherPlayerHorseSkinID((int)rankData.value6), (int)rankData.value5, rank == 1 ? 1f : 0.8f);
    }