hch
78 分钟以前 eca2ad1e47a2ab01fd41174da16700ee415daa52
Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
10个文件已修改
72 ■■■■■ 已修改文件
Main/System/Arena/ArenaManager.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/BoneField/BoneFieldManager.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Chat/ChatManager.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/FirstCharge/FirstChargeManager.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/LineupRecommend/LineupRecommendManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Mail/MailManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/PlayerProfile/RenameManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/TianziBillborad/TianziBillboradManager.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/TianziBillborad/TianziBillboradRankWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Arena/ArenaManager.cs
@@ -41,7 +41,7 @@
    public event Action OnUpdateGameRecInfo;
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += BeforePlayerDataInitializeEventOnRelogin;
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        InitTable();
        InitRedpoint();
@@ -49,15 +49,14 @@
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= BeforePlayerDataInitializeEventOnRelogin;
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
    }
    public void OnBeforePlayerDataInitializeEvent()
    public void BeforePlayerDataInitializeEventOnRelogin()
    {
        matchInfoList.Clear();
        gameRecDict.Clear();
        allFaceInfoDict.Clear();
    }
    void InitRedpoint()
Main/System/BoneField/BoneFieldManager.cs
@@ -9,7 +9,6 @@
    public Redpoint parentRedpoint = new Redpoint(MainRedDot.MainChallengeRedpoint, MainRedDot.BoneFieldRepoint);
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEvent;
        DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
@@ -18,7 +17,6 @@
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEvent;
        DungeonManager.Instance.UpdateFBInfoListEvent -= OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
@@ -51,11 +49,6 @@
        if (mapId != DataMapID)
            return;
        UpdateRedPoint();
    }
    public void OnBeforePlayerDataInitializeEvent()
    {
        //mailDataDict.Clear();
    }
    public void UpdateRedPoint()
Main/System/Chat/ChatManager.cs
@@ -38,7 +38,7 @@
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
        GuildManager.Instance.EnterOrQuitGuildEvent += EnterOrQuitGuildEvent;
@@ -100,11 +100,13 @@
            b = (byte)(sysBubbleColorArr.Length > 2 ? sysBubbleColorArr[2] : 0),
            a = (byte)(sysBubbleColorArr.Length > 3 ? sysBubbleColorArr[3] : 255),
        };
        ParseChatBubbleConfig();
    }
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
        GuildManager.Instance.EnterOrQuitGuildEvent -= EnterOrQuitGuildEvent;
    }
@@ -119,12 +121,11 @@
        }
    }
    private void OnBeforePlayerDataInitializeEvent()
    private void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        talkDict.Clear();
        playerInfoDict.Clear();
        currentDay = -1;
        ParseChatBubbleConfig();
        nowChatChannel = ChatChannel.World;
        nowChatTab = ChatTab.World;
    }
Main/System/FirstCharge/FirstChargeManager.cs
@@ -25,17 +25,22 @@
    public event Action OnUpdateFirstChargeInfo;
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
        RechargeManager.Instance.rechargeCountEvent += OnRechargeCountEvent;
        TaskManager.Instance.OnTaskUpdate += OnTaskUpdate;
        FuncConfigConfig config = FuncConfigConfig.Get("FirstCharge");
        taskID = int.Parse(config.Numerical1);
        nextTaskID = int.Parse(config.Numerical2);
        InitClickTabDict();
        InitRedPoint();
    }
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
        RechargeManager.Instance.rechargeCountEvent -= OnRechargeCountEvent;
        TaskManager.Instance.OnTaskUpdate -= OnTaskUpdate;
@@ -113,13 +118,9 @@
        }
    }
    public void OnBeforePlayerDataInitializeEvent()
    public void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        firstChargeInfoDict.Clear();
        FuncConfigConfig config = FuncConfigConfig.Get("FirstCharge");
        taskID = int.Parse(config.Numerical1);
        nextTaskID = int.Parse(config.Numerical2);
    }
    public void OnPlayerLoginOk()
Main/System/LineupRecommend/LineupRecommendManager.cs
@@ -20,7 +20,7 @@
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
        HeroManager.Instance.onHeroChangeEvent += OnHeroChangeEvent;
        HeroManager.Instance.onHeroDeleteEvent += OnHeroDeleteEvent;
@@ -30,7 +30,7 @@
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
        HeroManager.Instance.onHeroChangeEvent -= OnHeroChangeEvent;
        HeroManager.Instance.onHeroDeleteEvent -= OnHeroDeleteEvent;
@@ -64,7 +64,7 @@
        UpdateRedPoint();
    }
    private void OnBeforePlayerDataInitializeEvent()
    private void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        haveDict.Clear();
    }
Main/System/Mail/MailManager.cs
@@ -27,16 +27,16 @@
    {
        tabRedpoint0 = new Redpoint(MainRedDot.MailRepoint, GetTabRedpointId(MailCategory.Personal));
        tabRedpoint1 = new Redpoint(MainRedDot.MailRepoint, GetTabRedpointId(MailCategory.Global));
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        personalMailMaxLimitCount = int.Parse(FuncConfigConfig.Get("PersonalMail").Numerical1);
    }
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
    }
    public void OnBeforePlayerDataInitializeEvent()
    public void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        mailDataDict.Clear();
    }
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
@@ -47,7 +47,7 @@
    public event Action OnTimeOut;
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
        PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefreshEvent;
        PackManager.Instance.RefreshItemEvent += OnRefreshItemEvent;
@@ -59,7 +59,7 @@
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
        PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefreshEvent;
        PackManager.Instance.RefreshItemEvent -= OnRefreshItemEvent;
@@ -97,7 +97,7 @@
        UpdateRedPoint();
    }
    public void OnBeforePlayerDataInitializeEvent()
    public void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        dataDict.Clear();
        nowIDDict.Clear();
Main/System/PlayerProfile/RenameManager.cs
@@ -7,7 +7,7 @@
    public int moneyNeed;
    public override void Init()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        FuncConfigConfig config = FuncConfigConfig.Get("PlayerRename");
        int[] arr = ConfigParse.GetMultipleStr<int>(config.Numerical3);
@@ -17,10 +17,10 @@
    public override void Release()
    {
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
    }
    private void OnBeforePlayerDataInitializeEvent()
    private void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        RenameManagerCount = 0;
    }
Main/System/TianziBillborad/TianziBillboradManager.cs
@@ -8,7 +8,6 @@
    public readonly int rankType = 2;    // 榜单类型
    public readonly int funcId = 39;    // 功能Id
    public readonly int DataMapID = 30020;
    public int nowTabIndex;     // 0 排行榜 1 奖励
    public byte todayLineID;    //今日是哪个lineID,对应副本表的功能线路ID
    public ulong historyHurt;    //本考验历史最大伤害
    public ulong todayHurt;    //本考验今日最大伤害
@@ -21,7 +20,7 @@
    {
        EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnSettlement);
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
        DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
@@ -36,7 +35,7 @@
    {
        EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnSettlement);
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
        DungeonManager.Instance.UpdateFBInfoListEvent -= OnUpdateFBInfoChangeEvent;
        AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
@@ -44,13 +43,11 @@
        UpdateTianziKYInfoExent -= OnUpdateTianziKYInfoExent;
    }
    private void OnBeforePlayerDataInitializeEvent()
    private void OnBeforePlayerDataInitializeEventOnRelogin()
    {
        nowTabIndex = 0;
        todayLineID = 0;
        historyHurt = 0;
        todayHurt = 0;
       // ClearBar();
        isSkipSweepTip = false;
    }
Main/System/TianziBillborad/TianziBillboradRankWin.cs
@@ -80,7 +80,6 @@
    protected override void OpenSubUIByTabIndex()
    {
        TianziBillboradManager.Instance.nowTabIndex = functionOrder;
        transRank.SetActive(functionOrder == 0);
        transAward.SetActive(functionOrder == 1);
        Display();