diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua index 4357204..e0c5811 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua @@ -168,11 +168,11 @@ function CLLMainLua.onCheckUpgrader(isHaveUpdated) end function CLLMainLua.begain() - pcall(fitIphoneX) local success, msg = pcall(CLLMainLua.init) if not success then printe(msg) end + pcall(fitIphoneX) -- 处理开始 if (CLCfgBase.self.isEditMode) then diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua index 1fbfad1..f083a4f 100644 --- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua +++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua @@ -595,8 +595,11 @@ end function fitIphoneX() local mode = SystemInfo.deviceModel + printw(mode) if - string.find(mode, "iPhone10,3") or string.find(mode, "iPhone10,6") or string.find(mode, "iPhone11,3") or + string.find(mode, "iPhone10,3") or + string.find(mode, "iPhone10,6") or + string.find(mode, "iPhone11,3") or string.find(mode, "iPhone11,6") or -- XS Max string.find(mode, "iPhone11,8") then -- xr