Fix issues with corescripts, allow Fusion animations to work properly in plugins
This commit is contained in:
parent
3d1310651c
commit
2d887cd198
|
|
@ -7106,6 +7106,7 @@ end
|
||||||
declare class NetworkServer extends NetworkPeer
|
declare class NetworkServer extends NetworkPeer
|
||||||
function EncryptStringForPlayerId(self, toEncrypt: string, playerId: number): string
|
function EncryptStringForPlayerId(self, toEncrypt: string, playerId: number): string
|
||||||
function SetIsPlayerAuthenticationRequired(self, value: boolean): nil
|
function SetIsPlayerAuthenticationRequired(self, value: boolean): nil
|
||||||
|
function Start(self): nil
|
||||||
end
|
end
|
||||||
|
|
||||||
declare class NetworkReplicator extends Instance
|
declare class NetworkReplicator extends Instance
|
||||||
|
|
|
||||||
|
|
@ -175,7 +175,7 @@ do
|
||||||
end
|
end
|
||||||
|
|
||||||
local function performUpdateStep()
|
local function performUpdateStep()
|
||||||
External.performUpdateStep(time())
|
External.performUpdateStep(tick())
|
||||||
end
|
end
|
||||||
|
|
||||||
local stopSchedulerFunc = nil
|
local stopSchedulerFunc = nil
|
||||||
|
|
|
||||||
|
|
@ -125,14 +125,14 @@ if game.CoreGui.Version >= 3 and game.PlaceId ~= 130815926 then --todo: remove p
|
||||||
screenGui.CurrentLoadout,
|
screenGui.CurrentLoadout,
|
||||||
"CoreScripts/BackpackScripts/LoadoutScript"
|
"CoreScripts/BackpackScripts/LoadoutScript"
|
||||||
)
|
)
|
||||||
if game.CoreGui.Version >= 8 then
|
-- if game.CoreGui.Version >= 8 then
|
||||||
-- Wardrobe script handles all character dressing operations
|
-- -- Wardrobe script handles all character dressing operations
|
||||||
scriptContext:AddCoreScript(
|
-- scriptContext:AddCoreScript(
|
||||||
-1,
|
-- -1,
|
||||||
Backpack,
|
-- Backpack,
|
||||||
"CoreScripts/BackpackScripts/BackpackWardrobe"
|
-- "CoreScripts/BackpackScripts/BackpackWardrobe"
|
||||||
)
|
-- )
|
||||||
end
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
local IsPersonalServer = not not game.Workspace:FindFirstChild "PSVariable"
|
local IsPersonalServer = not not game.Workspace:FindFirstChild "PSVariable"
|
||||||
|
|
|
||||||
|
|
@ -304,23 +304,23 @@ InventoryButton.Active = true
|
||||||
InventoryButton.ZIndex = 3
|
InventoryButton.ZIndex = 3
|
||||||
InventoryButton.Parent = Tabs
|
InventoryButton.Parent = Tabs
|
||||||
|
|
||||||
if game.CoreGui.Version >= 8 then
|
-- if game.CoreGui.Version >= 8 then
|
||||||
local WardrobeButton = Instance.new "TextButton"
|
-- local WardrobeButton = Instance.new "TextButton"
|
||||||
WardrobeButton.RobloxLocked = true
|
-- WardrobeButton.RobloxLocked = true
|
||||||
WardrobeButton.Name = "WardrobeButton"
|
-- WardrobeButton.Name = "WardrobeButton"
|
||||||
WardrobeButton.Size = UDim2.new(0, 90, 0, 30)
|
-- WardrobeButton.Size = UDim2.new(0, 90, 0, 30)
|
||||||
WardrobeButton.Position = UDim2.new(0, 77, 1, -31)
|
-- WardrobeButton.Position = UDim2.new(0, 77, 1, -31)
|
||||||
WardrobeButton.BackgroundColor3 = Color3.new(0, 0, 0)
|
-- WardrobeButton.BackgroundColor3 = Color3.new(0, 0, 0)
|
||||||
WardrobeButton.BorderColor3 = Color3.new(1, 1, 1)
|
-- WardrobeButton.BorderColor3 = Color3.new(1, 1, 1)
|
||||||
WardrobeButton.Font = Enum.Font.ArialBold
|
-- WardrobeButton.Font = Enum.Font.ArialBold
|
||||||
WardrobeButton.FontSize = Enum.FontSize.Size18
|
-- WardrobeButton.FontSize = Enum.FontSize.Size18
|
||||||
WardrobeButton.Text = "Wardrobe"
|
-- WardrobeButton.Text = "Wardrobe"
|
||||||
WardrobeButton.AutoButtonColor = false
|
-- WardrobeButton.AutoButtonColor = false
|
||||||
WardrobeButton.TextColor3 = Color3.new(1, 1, 1)
|
-- WardrobeButton.TextColor3 = Color3.new(1, 1, 1)
|
||||||
WardrobeButton.Selected = false
|
-- WardrobeButton.Selected = false
|
||||||
WardrobeButton.Active = true
|
-- WardrobeButton.Active = true
|
||||||
WardrobeButton.Parent = Tabs
|
-- WardrobeButton.Parent = Tabs
|
||||||
end
|
-- end
|
||||||
|
|
||||||
local closeButton = Instance.new "TextButton"
|
local closeButton = Instance.new "TextButton"
|
||||||
closeButton.RobloxLocked = true
|
closeButton.RobloxLocked = true
|
||||||
|
|
|
||||||
|
|
@ -45,10 +45,10 @@ waitForChild(backpack.Tabs, "InventoryButton")
|
||||||
local inventoryButton = backpack.Tabs.InventoryButton
|
local inventoryButton = backpack.Tabs.InventoryButton
|
||||||
|
|
||||||
local wardrobeButton
|
local wardrobeButton
|
||||||
if game.CoreGui.Version >= 8 then
|
-- if game.CoreGui.Version >= 8 then
|
||||||
waitForChild(backpack.Tabs, "WardrobeButton")
|
-- waitForChild(backpack.Tabs, "WardrobeButton")
|
||||||
wardrobeButton = backpack.Tabs.WardrobeButton
|
-- wardrobeButton = backpack.Tabs.WardrobeButton
|
||||||
end
|
-- end
|
||||||
waitForChild(backpack.Parent, "ControlFrame")
|
waitForChild(backpack.Parent, "ControlFrame")
|
||||||
local backpackButton =
|
local backpackButton =
|
||||||
waitForChild(backpack.Parent.ControlFrame, "BackpackButton")
|
waitForChild(backpack.Parent.ControlFrame, "BackpackButton")
|
||||||
|
|
@ -443,17 +443,17 @@ inventoryButton.MouseLeave:connect(function()
|
||||||
mouseLeaveTab(inventoryButton)
|
mouseLeaveTab(inventoryButton)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
if game.CoreGui.Version >= 8 then
|
-- if game.CoreGui.Version >= 8 then
|
||||||
wardrobeButton.MouseButton1Click:connect(function()
|
-- wardrobeButton.MouseButton1Click:connect(function()
|
||||||
newTabClicked "wardrobe"
|
-- newTabClicked "wardrobe"
|
||||||
end)
|
-- end)
|
||||||
wardrobeButton.MouseEnter:connect(function()
|
-- wardrobeButton.MouseEnter:connect(function()
|
||||||
mouseOverTab(wardrobeButton)
|
-- mouseOverTab(wardrobeButton)
|
||||||
end)
|
-- end)
|
||||||
wardrobeButton.MouseLeave:connect(function()
|
-- wardrobeButton.MouseLeave:connect(function()
|
||||||
mouseLeaveTab(wardrobeButton)
|
-- mouseLeaveTab(wardrobeButton)
|
||||||
end)
|
-- end)
|
||||||
end
|
-- end
|
||||||
|
|
||||||
closeButton.MouseButton1Click:connect(closeBackpack)
|
closeButton.MouseButton1Click:connect(closeBackpack)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue