diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs index 30c2ec77c4..0bc558f676 100644 --- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs +++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs @@ -165,6 +165,11 @@ namespace SDK //sdk 埋点 public void CustomEvent(string events, string desc, string type) { + Debug.Log("sdk打点事件:" + events + "|" + desc + "|" + type); + if(events == null||events == "") + { + return; + } proxy.CustomEvent(events, desc, type); } //sdk 新手引导上报 diff --git a/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs b/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs index 7040f5a919..a2c2e56a1b 100644 --- a/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs +++ b/Assets/LuaFramework/Scripts/SDK/SdkCustomEvent.cs @@ -10,9 +10,12 @@ namespace SDK public static void Init() { - dic.Add("Start-game", new string[] {"Start-game", "启动游戏", "4387bk", "prs5vr", "juas2d"}); - dic.Add("Load-updates", new string[] { "Load-updates", "加载更新包", "nvgpba", "nrgy40","h2ea12" }); - dic.Add("End-loading", new string[] { "End-loading", "加载更新包完成", "5k6zad", "sr4gtb", "d4bboh"}); + dic.Add("Start-game", new string[] {"Start_game", "启动游戏", "4387bk", "prs5vr", "" }); + dic.Add("startzip", new string[] { "startzip", "开始解压", "bcdd8g", "p6yr7v", "" }); + dic.Add("Endzip", new string[] { "Endzip", "结束解压", "nvgpba", "nrgy40", "" }); + dic.Add("Load-updates", new string[] { "Load_updates", "加载更新包", "nvgpba", "nrgy40", "" }); + dic.Add("End-loading", new string[] { "End_loading", "加载更新包完成", "5k6zad", "sr4gtb", "" }); + dic.Add("sdk_init", new string[] { "sdk_init", "sdk初始化", "", "", "" }); CustomEvent("Start-game"); } diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 72419834ac..bb14ad8e1e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2261,6 +2261,7 @@ FBSDKCustomEventType = { EndZip = 14,--结束解压 LoadUpdates = 15,--加载更新包 EndLoading = 16,--加载更新包完成 + CreateCharacter = 17,--SDK初始化 }--副本玩法类型 CarBonTypeId = { TRIAL = 1, diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index db3bc32027..92e59c4e58 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -12,24 +12,24 @@ function this.SetisFirstLogVal(isDayFirst) end end function this.SendCustomEvents(CustomType,info) -if not AppConst.isSDKLogin then return end + if not AppConst.isSDKLogin then return end local curConfigData = nil + info = tonumber(info) for _, configInfo in ConfigPairs(customEventConfig) do - if CustomType == configInfo.CustomEventType and info == configInfo.value then + if CustomType == configInfo.CustomEventType and (configInfo.value == "0" or info == tonumber(configInfo.value)) then curConfigData = configInfo - break - end - end - if curConfigData then - if AppConst.SdkPackageName == "com.tcxgpcsb.pass" then - LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidTest.." "..curConfigData.Info) - this.SendCustomEvent(curConfigData.tokenAndroidTest,curConfigData.Info,curConfigData.type) - elseif AppConst.SdkPackageName == "com.tcxgp.pass" then - LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidRelease.." "..curConfigData.Info) - this.SendCustomEvent(curConfigData.tokenAndroidRelease,curConfigData.Info,curConfigData.type) - elseif AppConst.SdkPackageName == "com.tcx.pass" then - LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenIos.." "..curConfigData.Info) - this.SendCustomEvent(curConfigData.tokenIos,curConfigData.Info,curConfigData.type) + if curConfigData then + if AppConst.SdkPackageName == "com.tcxazcsb.pass" then + LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidTest.." "..curConfigData.Info) + this.SendCustomEvent(curConfigData.tokenAndroidTest,curConfigData.Info,curConfigData.type) + elseif AppConst.SdkPackageName == "com.tcxaz.pass" then + LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidRelease.." "..curConfigData.Info) + this.SendCustomEvent(curConfigData.tokenAndroidRelease,curConfigData.Info,curConfigData.type) + elseif AppConst.SdkPackageName == "com.tcx.pass" then + LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenIos.." "..curConfigData.Info) + this.SendCustomEvent(curConfigData.tokenIos,curConfigData.Info,curConfigData.type) + end + end end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua index d4ee095bda..0963d18346 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua @@ -151,6 +151,8 @@ function CreateNamePopup:BindEvent() PopupTipPanel.ShowTip(Language[10837]) this:ClosePanel() end + -- 发送创建角色事件 + CustomEventManager.SendCustomEvents(FBSDKCustomEventType.CreateCharacter) end -- 类型3 为修改名称 类型1 为创建角色 diff --git a/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs b/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs index ec9b8272e3..407c00ce43 100644 --- a/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs +++ b/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs @@ -153,8 +153,8 @@ namespace GameLogic public void InitLanguageConfig() { - if (ConfigManager.Instance.GetConfigInfo("Setting.LanguagePackager.isActive") == "1") - { + //if (ConfigManager.Instance.GetConfigInfo("Setting.LanguagePackager.isActive") == "1") + //{ if (!PlayerPrefs.HasKey("language")) { @@ -179,11 +179,11 @@ namespace GameLogic { PlayerPrefs.SetInt("language_flag", PlayerPrefs.GetInt("language")); } - } - else - { - PlayerPrefs.SetInt("language", 0); - } + //} + //else + //{ + // PlayerPrefs.SetInt("language", 0); + //} string languageStr = ""; switch (GetLanguageType())