텍스트 비교

두 텍스트 파일의 차이점을 찾아보세요

실시간 편집

변경 없는 행 숨기기

줄바꿈 비활성화

레이아웃

비교 단위

구문 강조

Diffchecker Desktop 가장 안전하게 Diffchecker를 사용하는 방법. 데스크톱 앱을 사용하면 비교 데이터가 외부로 전송되지 않습니다!데스크톱 앱 받기

Untitled Diff

생성일 6년 전비교 결과 만료 없음

102 삭제

행
총
삭제

글자
총
삭제

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

156 행

1 추가

행
총
추가

글자
총
추가

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

55 행

ESX = nil

local menuOpen = false

local wasOpen = false

Citizen.CreateThread(function()

while ESX == nil do

TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)

Citizen.Wait(0)

end

while ESX.GetPlayerData().job == nil do

Citizen.Wait(100)

end

ESX.PlayerData = ESX.GetPlayerData()

end)

Citizen.CreateThread(function()

while true do

Citizen.Wait(0)

local playerPed = PlayerPedId()

local coords = GetEntityCoords(playerPed)

if GetDistanceBetweenCoords(coords, Config.CircleZones.DrugDealer.coords, true) < 0.5 then

if not menuOpen then

ESX.ShowHelpNotification(_U('dealer_prompt'))

if IsControlJustReleased(0, 38) then

wasOpen = true

OpenDrugShop()

end

else

Citizen.Wait(500)

end

else

if wasOpen then

wasOpen = false

ESX.UI.Menu.CloseAll()

end

Citizen.Wait(500)

end

end)

function OpenDrugShop()

ESX.UI.Menu.CloseAll()

local elements = {}

menuOpen = true

for k, v in pairs(ESX.GetPlayerData().inventory) do

local price = Config.DrugDealerItems[v.name]

if price and v.count > 0 then

table.insert(elements, {

label = ('%s - %s'):format(v.label, _U('dealer_item', ESX.Math.GroupDigits(price))),

name = v.name,

price = price,

-- menu properties

type = 'slider',

value = 1,

min = 1,

max = v.count

})

end

ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'drug_shop', {

title = _U('dealer_title'),

align = 'top-left',

elements = elements

}, function(data, menu)

TriggerServerEvent('esx_drugs:sellDrug', data.current.name, data.current.value)

end, function(data, menu)

menu.close()

menuOpen = false

end)

end

AddEventHandler('onResourceStop', function(resource)

if resource == GetCurrentResourceName() then

if menuOpen then

ESX.UI.Menu.CloseAll()

end

end)

function OpenBuyLicenseMenu(licenseName)

menuOpen = true

local license = Config.LicensePrices[licenseName]

local elements = {

{

label = _U('license_no'),

value = 'no'

{

label = ('%s - %s'):format(license.label, _U('dealer_item', ESX.Math.GroupDigits(license.price))),

value = licenseName,

price = license.price,

licenseName = license.label

}

ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'license_shop', {

title = _U('license_title'),

align = 'top-left',

elements = elements

}, function(data, menu)

if data.current.value ~= 'no' then

ESX.TriggerServerCallback('esx_drugs:buyLicense', function(boughtLicense)

if boughtLicense then

ESX.ShowNotification(_U('license_bought', data.current.licenseName, ESX.Math.GroupDigits(data.current.price)))

else

ESX.ShowNotification(_U('license_bought_fail', data.current.licenseName))

end

end, data.current.value)

else

menu.close()

end

end, function(data, menu)

menu.close()

menuOpen = false

end)

end

function CreateBlipCircle(coords, text, radius, color, sprite)

local blip = AddBlipForRadius(coords, radius)

SetBlipHighDetail(blip, true)

SetBlipColour(blip, 1)

SetBlipAlpha (blip, 128)

-- create a blip in the middle

blip = AddBlipForCoord(coords)

SetBlipHighDetail(blip, true)

SetBlipSprite (blip, sprite)

SetBlipScale (blip, 1.0)

SetBlipColour (blip, color)

SetBlipAsShortRange(blip, true)

BeginTextCommandSetBlipName("STRING")

AddTextComponentString(text)

EndTextCommandSetBlipName(blip)

end

Citizen.CreateThread(function()

for k,zone in pairs(Config.CircleZones) do

CreateBlipCircle(zone.coords, zone.name, zone.radius, zone.color, zone.sprite)

end

end)

저장된 비교 결과

원본

파일 열기

ESX = nil
local menuOpen = false
local wasOpen = false

Citizen.CreateThread(function()
	while ESX == nil do
		TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
		Citizen.Wait(0)
	end

while ESX.GetPlayerData().job == nil do
		Citizen.Wait(100)
	end

ESX.PlayerData = ESX.GetPlayerData()
end)

Citizen.CreateThread(function()
	while true do
		Citizen.Wait(0)
		local playerPed = PlayerPedId()
		local coords = GetEntityCoords(playerPed)

if GetDistanceBetweenCoords(coords, Config.CircleZones.DrugDealer.coords, true) < 0.5 then
			if not menuOpen then
				ESX.ShowHelpNotification(_U('dealer_prompt'))

if IsControlJustReleased(0, 38) then
					wasOpen = true
					OpenDrugShop()
				end
			else
				Citizen.Wait(500)
			end
		else
			if wasOpen then
				wasOpen = false
				ESX.UI.Menu.CloseAll()
			end

Citizen.Wait(500)
		end
	end
end)

function OpenDrugShop()
	ESX.UI.Menu.CloseAll()
	local elements = {}
	menuOpen = true

for k, v in pairs(ESX.GetPlayerData().inventory) do
		local price = Config.DrugDealerItems[v.name]

if price and v.count > 0 then
			table.insert(elements, {
				label = ('%s - %s'):format(v.label, _U('dealer_item', ESX.Math.GroupDigits(price))),
				name = v.name,
				price = price,

-- menu properties
				type = 'slider',
				value = 1,
				min = 1,
				max = v.count
			})
		end
	end

ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'drug_shop', {
		title    = _U('dealer_title'),
		align    = 'top-left',
		elements = elements
	}, function(data, menu)
		TriggerServerEvent('esx_drugs:sellDrug', data.current.name, data.current.value)
	end, function(data, menu)
		menu.close()
		menuOpen = false
	end)
end

AddEventHandler('onResourceStop', function(resource)
	if resource == GetCurrentResourceName() then
		if menuOpen then
			ESX.UI.Menu.CloseAll()
		end
	end
end)

function OpenBuyLicenseMenu(licenseName)
	menuOpen = true
	local license = Config.LicensePrices[licenseName]

local elements = {
		{
			label = _U('license_no'),
			value = 'no'
		},

{
			label = ('%s - %s'):format(license.label, _U('dealer_item', ESX.Math.GroupDigits(license.price))),
			value = licenseName,
			price = license.price,
			licenseName = license.label
		}
	}

ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'license_shop', {
		title    = _U('license_title'),
		align    = 'top-left',
		elements = elements
	}, function(data, menu)

if data.current.value ~= 'no' then
			ESX.TriggerServerCallback('esx_drugs:buyLicense', function(boughtLicense)
				if boughtLicense then
					ESX.ShowNotification(_U('license_bought', data.current.licenseName, ESX.Math.GroupDigits(data.current.price)))
				else
					ESX.ShowNotification(_U('license_bought_fail', data.current.licenseName))
				end
			end, data.current.value)
		else
			menu.close()
		end

end, function(data, menu)
		menu.close()
		menuOpen = false
	end)
end

function CreateBlipCircle(coords, text, radius, color, sprite)
	local blip = AddBlipForRadius(coords, radius)

SetBlipHighDetail(blip, true)
	SetBlipColour(blip, 1)
	SetBlipAlpha (blip, 128)

-- create a blip in the middle
	blip = AddBlipForCoord(coords)

SetBlipHighDetail(blip, true)
	SetBlipSprite (blip, sprite)
	SetBlipScale  (blip, 1.0)
	SetBlipColour (blip, color)
	SetBlipAsShortRange(blip, true)

BeginTextCommandSetBlipName("STRING")
	AddTextComponentString(text)
	EndTextCommandSetBlipName(blip)
end

Citizen.CreateThread(function()
	for k,zone in pairs(Config.CircleZones) do
		CreateBlipCircle(zone.coords, zone.name, zone.radius, zone.color, zone.sprite)
	end
end)

수정본

파일 열기

ESX = nil
local menuOpen = false
local wasOpen = false

Citizen.CreateThread(function()
	while ESX == nil do
		TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
		Citizen.Wait(0)
	end

while ESX.GetPlayerData().job == nil do
		Citizen.Wait(100)
	end

ESX.PlayerData = ESX.GetPlayerData()
end)

AddEventHandler('onResourceStop', function(resource)
	if resource == GetCurrentResourceName() then
		if menuOpen then
			ESX.UI.Menu.CloseAll()
		end
	end
end)

function CreateBlipCircle(coords, text, radius, color, sprite)
	local blip = AddBlipForRadius(coords, radius)

SetBlipHighDetail(blip, true)
	SetBlipColour(blip, 1)
	SetBlipAlpha (blip, 128)

-- create a blip in the middle
	blip = AddBlipForCoord(coords)

SetBlipHighDetail(blip, true)
	SetBlipSprite (blip, sprite)
	SetBlipScale  (blip, 1.0)
	SetBlipColour (blip, color)
	SetBlipAsShortRange(blip, true)

BeginTextCommandSetBlipName("STRING")
	AddTextComponentString(text)
	EndTextCommandSetBlipName(blip)
end

Citizen.CreateThread(function()
	for k,zone in pairs(Config.CircleZones) do

CreateBlipCircle(zone.coords, zone.name, zone.radius, zone.color, zone.sprite)
	end
end)