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

yyl

2 天以前 0f1a1548a26c1812a6a20a0f7cc17a598132bad8

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

 Main/System/HappyXB/HeroCallWin.cs

@@ -79,7 +79,7 @@
        int dayMaxCount = HappyXBModel.Instance.GetDailyFreeCount((int)HappXBTitle.HeroCallAdvanced);
        if (todayFreeCount < dayMaxCount)
        {
            call1Text.text = Language.Get("L1127") + (dayMaxCount - todayFreeCount) + "/" + dayMaxCount;
            call1Text.text = Language.Get("L1100", Language.Get("L1127"), (dayMaxCount - todayFreeCount) + "/" + dayMaxCount);
        }
        else
        {

 Main/System/Message/RichNormalEvent.cs

@@ -96,25 +96,15 @@
            //     break;
            case RichTextEventEnum.OPENUI:
                {
                    // int id = 0;
                    // if (int.TryParse(href.mSplits["openui"], out id))
                    // {
                    //     WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)id);
                    // }
                    // else
                    // {
                    //     var list = href.mSplits["openui"].Split('_');
                    //     int funcOrder = 0;
                    //     if (list.Length != 1)
                    //     {
                    //         funcOrder = int.Parse(list[1]);
                    //     }
                    //     WindowJumpMgr.Instance.WindowJumpToEx(list[0], 1, 0, funcOrder);
                    //     if (list.Length > 2)
                    //     {
                    //         ModelCenter.Instance.GetModel<RoleModel>().openUIMark = int.Parse(list[2]);
                    //     }
                    // }
                    int id = 0;
                    if (int.TryParse(href.mSplits["openui"], out id))
                    {
                        UIJumpManager.Instance.OpenWindow(id);
                    }
                    else
                    {
                        Debug.LogError("RichNormalEvent.cs: OPENUI 参数错误");
                    }
                }
                break;
            case RichTextEventEnum.OPENURL: