diff --git a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs index 174db625cc..6cead430c9 100644 --- a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs @@ -119,7 +119,12 @@ namespace GameLogic Dictionary data = stringToDic(trackData); ThinkingAnalyticsAPI.Track(trackEvent, data); } - + + // 设置访客Id + public string GetDeviceId() + { + return ThinkingAnalyticsAPI.GetDeviceId(); + } // Debug.Log("TA.TAExample - current disctinct ID is: " + ThinkingAnalyticsAPI.GetDistinctId()); diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_anim.anim b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_anim.anim index 5f3b96e253..33ac69845c 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_anim.anim +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Effect_c_gy_00092_attack_01 + m_Name: Effect_c_gy_00092_attack_01_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_controller.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_controller.controller index c1be62d523..df2edeaa1a 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_controller.controller +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_01_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Effect_c_gy_00092_attack_01 + m_Name: Effect_c_gy_00092_attack_01_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_01_controller.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_01_controller.controller index 127b695905..0ff6b3cb9c 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_01_controller.controller +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_01_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Effect_c_gy_00092_attack_02_01 + m_Name: Effect_c_gy_00092_attack_02_01_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_anim.anim b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_anim.anim index cac79f0cb3..ea05ed79a3 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_anim.anim +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Effect_c_gy_00092_attack_02 + m_Name: Effect_c_gy_00092_attack_02_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_controller.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_controller.controller index 7884f59f40..40364b78c4 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_controller.controller +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_c_gy_00092_attack_02_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Effect_c_gy_00092_attack_02 + m_Name: Effect_c_gy_00092_attack_02_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01_controller.controller similarity index 97% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01.controller rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01_controller.controller index 2568dc699c..e101fb45f5 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01.controller +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01_controller.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Effect_ls_11_qiongqi_attack_01 + m_Name: Effect_ls_11_qiongqi_attack_01_controller serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01.controller.meta b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01_controller.controller.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01.controller.meta rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Animation/Effect_ls_11_qiongqi_attack_01_controller.controller.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001.mat b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001.mat rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001_mat.mat index f5907cff4a..843f85da2a 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: eff_glow_001 + m_Name: eff_glow_001_mat m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001.mat.meta rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_glow_001_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002.mat b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002.mat rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002_mat.mat index 8c0026c6ad..e36f765563 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: eff_kuoquan_002 + m_Name: eff_kuoquan_002_mat m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002.mat.meta rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_kuoquan_002_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003.mat b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003.mat rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003_mat.mat index 2224090fcc..436d579b6a 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: eff_shan_003 + m_Name: eff_shan_003_mat m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003.mat.meta rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/eff_shan_003_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02.mat b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02.mat rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02_mat.mat index dbbb13f4cf..68e79e617f 100644 --- a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02.mat +++ b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: hitBigFix02 + m_Name: hitBigFix02_mat m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02.mat.meta b/Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02.mat.meta rename to Assets/ManagedResources/EffectResSkill/Effect_c_gy_00092/Materials/hitBigFix02_mat.mat.meta diff --git a/Assets/ManagedResources/Effects/Materials/Default-Diffuse.mat b/Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat similarity index 100% rename from Assets/ManagedResources/Effects/Materials/Default-Diffuse.mat rename to Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat diff --git a/Assets/ManagedResources/Effects/Materials/Default-Diffuse.mat.meta b/Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/Effects/Materials/Default-Diffuse.mat.meta rename to Assets/ManagedResources/Effects/Materials/Default-Diffuse_mat.mat.meta diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua index e37162ef23..0e8728bc66 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua @@ -177,21 +177,30 @@ function this.SubmitBattleRecord() end local _, rcd = this.isHaveRecord() if rcd then - NetManager.GMEvent("//".. PlayerManager.uid .."|"..rcd.seed.."|"..rcd.fightMaxRound.."|"..BattleManager.PrintBattleTable(rcd.fightData)) + NetManager.GMEvent("//".. (rcd.fightId or "") .."|".. PlayerManager.uid .."|"..rcd.seed.."|"..rcd.fightMaxRound.."|"..BattleManager.PrintBattleTable(rcd.fightData)) end this.isSubmit = false PopupTipPanel.ShowTip(Language[12296]) end -- 上报战斗日志 -function this.SubmitCheckFight() +function this.SubmitCheckFight(fr, br) if not this.isSubmit then PopupTipPanel.ShowTip(Language[12295]) return end local _, rcd = this.isHaveRecord() if rcd then - NetManager.GMEvent("//check_fight|".. PlayerManager.uid .."|"..rcd.seed.."|"..rcd.fightMaxRound.."|"..BattleManager.PrintBattleTable(rcd.fightData)) + local gmStr = "//check_fight" + .."|fightId = ".. (rcd.fightId or "") + .."|uid = ".. PlayerManager.uid + .."|seed = "..rcd.seed + .."|maxRound = "..rcd.fightMaxRound + .."|client_result = "..(fr or "") + .."|server_result = "..(br or "") + .."|fightdata = "..BattleManager.PrintBattleTable(rcd.fightData) + LogWarn("submit record: \n"..gmStr) + NetManager.GMEvent(gmStr) end this.isSubmit = false PopupTipPanel.ShowTip(Language[12296]) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 1fe8d5ddae..f099ebb663 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -557,6 +557,15 @@ function RoleLogic:SetRelive(hpf, caster) self.reliveHPF = hpf or 1 self.reliveCaster = caster RoleManager.AddReliveRole(self) + -- local maxHp = self.data:GetData(RoleDataName.MaxHp) + -- local reHp = floor(self.reliveHPF * maxHp) + -- self.data:SetValue(RoleDataName.Hp, reHp) + -- -- 发送复活事件 + -- --self.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- -- 复活的血量算做加血 + -- BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) + -- return true end return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 8a94fd20d1..bc13f66559 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -246,8 +246,8 @@ end -- 外部调用 function this:ShowNameShow(result, str) - if true then return end this.fightResult = result + if true then return end if str then local nameList = string.split(str, "|") BattleView:SetNameStr(str) @@ -361,7 +361,7 @@ function this.BattleEnd(result) NetManager.MapFightResultRequest(10000, "", levelId, fightType, function (msg) -- 结果检测 if msg.result ~= this.lastBattleResult.result then - BattleRecordManager.SubmitCheckFight() + BattleRecordManager.SubmitCheckFight(this.lastBattleResult.result, msg.result) end for i=1, #msg.remainHpList do @@ -389,7 +389,7 @@ function this.BattleEnd(result) --ExpeditionManager.UpdateHeroHpValue(msg.heroInfo) --ExpeditionManager.UpdateNodeValue(msg) --nodeInfo if msg.result ~= this.lastBattleResult.result then - BattleRecordManager.SubmitCheckFight() + BattleRecordManager.SubmitCheckFight(this.lastBattleResult.result, msg.result) end this.lastBattleResult.result = msg.result this.lastBattleResult.drop = msg.drop @@ -416,7 +416,7 @@ function this.BattleEnd(result) -- 判断是否需要进行结果检测 if this.fightResult then if result ~= this.fightResult then - BattleRecordManager.SubmitCheckFight() + BattleRecordManager.SubmitCheckFight(this.fightResult, result) end end -- 直接显示结果 diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua index ebf0c19d02..d39ff1e4f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua @@ -68,6 +68,17 @@ function this.GetDistinctId() end return "" end +-- 获取设备Id +function this.GetDeviceId() + if AppConst.isSDK then + if AndroidDeviceInfo.Instance:GetVersionCode() > 24 then + return App.TAMgr:GetDeviceId() + end + return AndroidDeviceInfo.Instance:GetDeviceID() + end + return "" +end + -- 登录 function this.Login(accountId) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index c5b4b53148..5f07b19eab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua @@ -49,6 +49,7 @@ function this.Initialize() account = AppConst.isSDK and tostring(AppConst.OpenId) or "", Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "", xx_id = AppConst.isSDK and AppConst.SdkChannel or "", + device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "" }) ThinkingAnalyticsManager.Track("create_account") end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index cc85554bd6..36a80bd149 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -33,7 +33,7 @@ end --请求登录 function this.LoginRequest(openId, func) local data = PlayerInfoProto_pb.LoginRequest() - data.device_id_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetDeviceID() or "" + data.device_id_s = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "" data.idfa_sOr_imei_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetIMEICode() or "" data.brand_type_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetDeviceBrand() or "" data.brand_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetDeviceModel() or "" diff --git a/Assets/Source/Generate/GameLogic_ThinkingAnalyticsManagerWrap.cs b/Assets/Source/Generate/GameLogic_ThinkingAnalyticsManagerWrap.cs index a9b4b8b8a6..29b469e666 100644 --- a/Assets/Source/Generate/GameLogic_ThinkingAnalyticsManagerWrap.cs +++ b/Assets/Source/Generate/GameLogic_ThinkingAnalyticsManagerWrap.cs @@ -17,6 +17,7 @@ public class GameLogic_ThinkingAnalyticsManagerWrap L.RegFunction("SetSuperProperties", SetSuperProperties); L.RegFunction("ClearSuperProperties", ClearSuperProperties); L.RegFunction("Track", Track); + L.RegFunction("GetDeviceId", GetDeviceId); L.RegFunction("__eq", op_Equality); L.RegFunction("__tostring", ToLua.op_ToString); L.EndClass(); @@ -190,6 +191,23 @@ public class GameLogic_ThinkingAnalyticsManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int GetDeviceId(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 1); + GameLogic.ThinkingAnalyticsManager obj = (GameLogic.ThinkingAnalyticsManager)ToLua.CheckObject(L, 1); + string o = obj.GetDeviceId(); + LuaDLL.lua_pushstring(L, o); + return 1; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int op_Equality(IntPtr L) {