liuzhiwei
2020-12-15 dd651e6ced907e7856d31fee478db45c7d994ea4
Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
4 files modified
26 ■■■■ changed files
Assets/Resources/UI/Final/InputNamePanel.prefab 2 ●●● patch | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs 12 ●●●●● patch | view | raw | blame | history
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs 11 ●●●● patch | view | raw | blame | history
Assets/Scripts/Guide/GuidePanelNew.cs 1 ●●●● patch | view | raw | blame | history
Assets/Resources/UI/Final/InputNamePanel.prefab
@@ -415,7 +415,7 @@
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: "\u70B9\u51FB\u8F93\u5165\u6846\uFF0C\u8F93\u5165\u60A8\u7684\u7528\u6237\u540D\uFF0C\u540D\u79F0\u6700\u957F7\u4E2A\u6587\u5B57\uFF0C\u8BA9\u5927\u5BB6\u8BA4\u8BC6\u4E0B\u4F60\u5427~"
  m_Text: "\u7559\u4E0B\u60A8\u7684\u5C0A\u8D35\u5927\u540D\uFF0C\u4E4B\u540E\u53EF\u67E5\u770B\u4E16\u754C\u73A9\u5BB6\u5206\u6570\u6392\u884C\u699C\uFF0C\u5FEB\u6765\u770B\u770B\u81EA\u5DF1\u7684\u5B9E\u529B\u5427\uFF01"
--- !u!1 &2797794196881182319
GameObject:
  m_ObjectHideFlags: 0
Assets/Scripts/GameAnalytics_SDK/TDAA_SDKManager.cs
@@ -43,11 +43,12 @@
        maxLevel = PlayerPrefs.GetInt(maxLevelStr);
        maxWave = PlayerPrefs.GetInt(maxWaveStr);
        AddListener();
        //AddListener();
    }
    private void AddListener()
    public void AddListener()
    {
        //Debug.Log("AddListener");
        EventCenter.Ins.Add<int, int>((int)KTGMGemClient.EventType.EndlessCompletedPort, EndlessCompletedPort);
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessLevelCompleted, EndlessLevelCompleted);
    }
@@ -67,6 +68,7 @@
    /// </summary>
    private void EndlessLevelCompleted()
    {
        //CommonDebugHelper.Debug("无尽模式完成,开始传各种");
        OnUseSkill(GameConfig.EndlessPortUseSkillTowerCount);
        OnOpenTower(GameConfig.EndlessOpenAttackTowerCount);
        OnClickTowerBuyBtn(GameConfig.EndlessBuyTowerCount);
@@ -229,7 +231,7 @@
            // };
            //dic[key] = 1;
           CommonDebugHelper.Debug("漏斗流统计:" + key);
            //CommonDebugHelper.Debug("漏斗流统计:" + key);
            OnEvent(key, dic);
            statisticsStep = step;
@@ -360,9 +362,9 @@
        CommonDebugHelper.Debug($"玩家达到第{level}关{wave}波");
        Dictionary<string, object> dic = new Dictionary<string, object>
        {
            { $"第{level}关{wave}波", 1}
            { $"第{level}关", 1}
        };
        OnEvent("玩家完成第x关y波的次数", dic);
        OnEvent("玩家完成第x关的次数", dic);
    }
Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -37,7 +37,9 @@
    void Start()
    {
        AudioSourceManager.Ins.Play(AudioEnum.BGM1);
        EventCenter.Ins.RemoveAllListener();
        TDAA_SDKManager.Ins.AddListener();
        isLogining = false;
@@ -82,12 +84,9 @@
        if (GameConfig.isFirstStart)
        {
            waitTime = 0f;
            //第一次启动,初始化并且埋点
            if (!GameConfig.useSDK)
            {
                TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
                TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
            }
            Debug.Log("初始化TDAA_SDKManager");
            TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
            TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
        }
        SetStart();
Assets/Scripts/Guide/GuidePanelNew.cs
@@ -605,7 +605,6 @@
        {
            colorCount++;
            warningImg.DOFade(colorCount % 2, 1.0f).OnComplete(SetWarningColor);
            CommonDebugHelper.Debug($"执行了{colorCount}次");
        }
        else
        {