Merge remote-tracking branch 'upstream/master'

Author: tinymins

!src-dist/src/global.zhcn_hd.lua

@@ -399,6 +399,7 @@ EncodeComponentsString = FunctionType
 EncodeData = FunctionType
 EncryptAES = FunctionType
 ENUM_MAP_WND_TYPE = TableType
+EnvokeAllTeammates = FunctionType
 EQUIPMENT_INVENTORY = TableType
 EQUIPMENT_REPRESENT = TableType
 EQUIPMENT_SUB = TableType
@@ -772,6 +773,7 @@ IsKeyDown = FunctionType
 IsLocalFileExist = FunctionType
 IsMiddleMapOpened = FunctionType
 IsMobileKungfu = FunctionType
+IsMobileSkill = FunctionType
 IsMobileStreamingEnable = FunctionType
 IsMonitorMsg = FunctionType
 IsMsgEditAllowed = FunctionType
@@ -1963,6 +1965,7 @@ Table_IsInForbidMap = FunctionType
 Table_IsInRougeLikeMap = FunctionType
 Table_IsLegalSkill = FunctionType
 Table_IsMobaBattleFieldMap = FunctionType
+Table_IsMobileBuff = FunctionType
 Table_IsNewcomerBattleFieldMap = FunctionType
 Table_IsPleasantGoatBattleFieldMap = FunctionType
 Table_IsProtectSkill = FunctionType

MY_!Base/src/lib/UI.UserSettings.lua

@@ -39,7 +39,7 @@ function D.Open(bImport)
 		w = W - 20, h = H - 60 - 40,
 		containerType = X.UI.WND_CONTAINER_STYLE.LEFT_TOP,
 	})
-	local nW = select(2, uiContainer:Width())
+	local nW = uiContainer:ContainerWidth()
 	local aGroup, tItemAll = {}, {}
 	for _, us in ipairs(X.GetRegisterUserSettingsList()) do
 		if us.szGroup and us.szLabel and (not bImport or tSettings[us.szKey]) then

MY_!Base/src/lib/UI.lua

@@ -4635,6 +4635,7 @@ end
 
 -- (number nW, number nH) Instance:ContainerSize() -- Get container size
 function OO:ContainerSize()
+	self:_checksum()
 	local raw = self.raws[1]
 	if raw then
 		raw = GetComponentElement(raw, 'MAIN_CONTAINER')
@@ -4644,6 +4645,16 @@ function OO:ContainerSize()
 	end
 end
 
+-- (number nW) Instance:ContainerWidth() -- Get container width
+function OO:ContainerWidth()
+	return (self:ContainerSize())
+end
+
+-- (number nH) Instance:ContainerHeight() -- Get container height
+function OO:ContainerHeight()
+	return (select(2, self:ContainerSize()))
+end
+
 -- (self) Instance:MinSize() -- Get element min size
 -- (self) Instance:MinSize(number nW, number nH) -- Set element min size
 function OO:MinSize(nW, nH)