From 52fb286afa307bf48469afe80682228bcc379b87 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 10 Apr 2021 19:08:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=80=E6=AC=A1=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=8C=85=E6=97=B6=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=B3=BB=E7=BB=9F=E8=AF=AD=E8=A8=80=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B8=B8=E6=88=8F=E5=86=85=E8=AF=AD=E8=A8=80=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/GameInit/SLanguageMoreLanguageMgr.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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()) From 47a6118d81be02f1cd11ce541b0e67b4ae7ffb63 Mon Sep 17 00:00:00 2001 From: JLIOSM1 <774727341@qq.com> Date: Tue, 16 Mar 2021 14:15:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90adjust=E3=80=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=A7=92=E8=89=B2=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scripts/SDK/SDKManager.cs | 5 ++++ .../Scripts/SDK/SdkCustomEvent.cs | 9 ++++-- .../~Lua/Common/GlobalDefine.lua | 1 + .../DataCenterService/CustomEventManager.lua | 30 +++++++++---------- .../~Lua/Modules/Popup/CreateNamePopup.lua | 2 ++ 5 files changed, 29 insertions(+), 18 deletions(-) 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..78ea73f235 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.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) + 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 为创建角色 From 798eedde7bfcd7095b202632d40e7d414b70ee17 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 10 Apr 2021 19:22:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90adjust=E3=80=91=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DataCenterService/CustomEventManager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index 78ea73f235..92e59c4e58 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -19,10 +19,10 @@ function this.SendCustomEvents(CustomType,info) if CustomType == configInfo.CustomEventType and (configInfo.value == "0" or info == tonumber(configInfo.value)) then curConfigData = configInfo if curConfigData then - if AppConst.SdkPackageName == "com.tcxgpcsb.pass" 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.tcxgp.pass" then + 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