テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

QSwap

Created 2 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

305 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

356 lines

; Merged Mod: .\0\RaidenShogun.ini, .\1\RaidenShogun.ini

; Constants ---------------------------

[Constants]

global persist $swapvar = 0

global $enable_burst_swap = 1

global $active

global persist $burst_swap = 0

global $creditinfo = 0

global persist $swapvar_select = 0

global $swapvar = 0

global $active= 0

global $is_burst = 0

global $is_burst_prev = 0

global $set_burst_swap = 0

global $burst_start_time

global $press = 0

global $isFirstime = 0

[KeySwap]

;Leave as is if you want swap happen when you press correct button

condition = $active == 1

;Change accordingly if you want swap to happen later (i.e after burst animation)

global $swap_delay = 0

; Match the number with that of your burst/skill

global $burst_duration = 8.2

;swap lock lock time after pressing the button

global $burst_cooldown = 18

[KeyQ]

key = q

type = cycle

condition = $active== 1

$swapvar = 0,1

type=cycle

$creditinfo = 0

$is_burst = 1,0

$press = 1,0

[Present]

post $active = 0

post $active= 0

post $is_burst_prev = $is_burst

post run = CommandListBurstStartTime

post run = CommandListOnBurstStart

if $is_burst_prev == 1 && $enable_burst_swap && time - $burst_start_time > $swap_delay

$swapvar = 1

else

$swapvar = 0

endif

; Shader ------------------------------

; Overrides ---------------------------

[TextureOverrideRaidenShogunPosition]

hash = e48c61f3

run = CommandListRaidenShogunPosition

$active = 1

$active= 1

[TextureOverrideRaidenShogunBlend]

hash = 1a495487

run = CommandListRaidenShogunBlend

[TextureOverrideRaidenShogunTexcoord]

hash = 0c37fc86

run = CommandListRaidenShogunTexcoord

[TextureOverrideRaidenShogunVertexLimitRaise]

hash = a05e7bec

[TextureOverrideRaidenShogunIB]

hash = 428c56cd

run = CommandListRaidenShogunIB

[TextureOverrideRaidenShogunHead]

hash = 428c56cd

match_first_index = 0

run = CommandListRaidenShogunHead

[TextureOverrideRaidenShogunBody]

hash = 428c56cd

match_first_index = 17769

run = CommandListRaidenShogunBody

[TextureOverrideRaidenShogunDress]

hash = 428c56cd

match_first_index = 52473

run = CommandListRaidenShogunDress

[TextureOverrideRaidenShogunFaceHeadDiffuse]

hash = 20174ee8

run = CommandListRaidenShogunFaceHeadDiffuse

[TextureOverrideRaidenShogunRemapBlend]

hash = fe5c0180

run = CommandListRaidenShogunRemapBlend

; CommandList -------------------------

[CommandListBurstStartTime]

if $press == 1 && $isFirstime == 0

$burst_start_time = time

$press = 0

$isFirstime = 1

endif

if time - $burst_start_time > $burst_cooldown

$isFirstime = 0

endif

[CommandListOnBurstStart]

if time - $burst_start_time > $burst_duration

$is_burst = 0

endif

if time - $burst_start_time < $burst_duration && $is_burst == 0

$is_burst = 1

endif

if time - $burst_start_time < $burst_cooldown && $press == 1

$press = 0

endif

[CommandListRaidenShogunPosition]

if $swapvar == 0

vb0 = ResourceRaidenShogunPosition.0

else if $swapvar == 1

vb0 = ResourceRaidenShogunPosition.1

endif

[CommandListRaidenShogunBlend]

if $swapvar == 0

vb1 = ResourceRaidenShogunBlend.0

handling = skip

draw = 14687,0

else if $swapvar == 1

vb1 = ResourceRaidenShogunBlend.1

handling = skip

draw = 18322,0

endif

[CommandListRaidenShogunTexcoord]

if $swapvar == 0

vb1 = ResourceRaidenShogunTexcoord.0

else if $swapvar == 1

vb1 = ResourceRaidenShogunTexcoord.1

endif

[CommandListRaidenShogunIB]

if $swapvar == 0

handling = skip

drawindexed = auto

else if $swapvar == 1

handling = skip

drawindexed = auto

endif

[CommandListRaidenShogunHead]

if $swapvar == 0

ib = ResourceRaidenShogunHeadIB.0

ps-t0 = ResourceRaidenShogunHeadDiffuse.0

ps-t1 = ResourceRaidenShogunHeadLightMap.0

ps-t2 = ResourceRaidenShogunHeadMetalMap.0

ps-t3 = ResourceRaidenShogunHeadShadowRamp.0

else if $swapvar == 1

ib = ResourceRaidenShogunHeadIB.1

ps-t0 = ResourceRaidenShogunHeadDiffuse.1

ps-t1 = ResourceRaidenShogunHeadLightMap.1

ps-t2 = ResourceRaidenShogunHeadMetalMap.1

ps-t3 = ResourceRaidenShogunHeadShadowRamp.1

endif

[CommandListRaidenShogunBody]

if $swapvar == 0

ib = ResourceRaidenShogunBodyIB.0

ps-t0 = ResourceRaidenShogunBodyDiffuse.0

ps-t1 = ResourceRaidenShogunBodyLightMap.0

ps-t2 = ResourceRaidenShogunBodyMetalMap.0

ps-t3 = ResourceRaidenShogunBodyShadowRamp.0

else if $swapvar == 1

ib = ResourceRaidenShogunBodyIB.1

ps-t0 = ResourceRaidenShogunBodyDiffuse.1

ps-t1 = ResourceRaidenShogunBodyLightMap.1

ps-t2 = ResourceRaidenShogunBodyMetalMap.1

ps-t3 = ResourceRaidenShogunBodyShadowRamp.1

endif

[CommandListRaidenShogunDress]

if $swapvar == 0

ib = ResourceRaidenShogunDressIB.0

ps-t0 = ResourceRaidenShogunDressDiffuse.0

ps-t1 = ResourceRaidenShogunDressLightMap.0

ps-t2 = ResourceRaidenShogunDressMetalMap.0

ps-t3 = ResourceRaidenShogunDressShadowRamp.0

else if $swapvar == 1

ib = ResourceRaidenShogunDressIB.1

ps-t0 = ResourceRaidenShogunDressDiffuse.1

ps-t1 = ResourceRaidenShogunDressLightMap.1

ps-t2 = ResourceRaidenShogunDressMetalMap.1

ps-t3 = ResourceRaidenShogunDressShadowRamp.1

endif

[CommandListRaidenShogunFaceHeadDiffuse]

if $swapvar == 0

ps-t0 = ResourceRaidenShogunFaceHeadDiffuse.0

endif

[CommandListRaidenShogunRemapBlend]

if $swapvar == 1

vb1 = ResourceRaidenShogunRemapBlend.1

handling = skip

draw = 18322,0

endif

; Resources ---------------------------

[ResourceRaidenShogunPosition.0]

type = Buffer

stride = 40

filename = .\0\RaidenShogunPosition.buf

[ResourceRaidenShogunBlend.0]

type = Buffer

stride = 32

filename = .\0\RaidenShogunBlend.buf

[ResourceRaidenShogunTexcoord.0]

type = Buffer

stride = 20

filename = .\0\RaidenShogunTexcoord.buf

[ResourceRaidenShogunHeadIB.0]

type = Buffer

format = DXGI_FORMAT_R16_UINT

filename = .\0\RaidenShogunHead.ib

[ResourceRaidenShogunBodyIB.0]

type = Buffer

format = DXGI_FORMAT_R16_UINT

filename = .\0\RaidenShogunBody.ib

[ResourceRaidenShogunDressIB.0]

type = Buffer

format = DXGI_FORMAT_R16_UINT

filename = .\0\RaidenShogunDress.ib

[ResourceRaidenShogunHeadDiffuse.0]

filename = .\0\RaidenShogunHeadDiffuse.dds

[ResourceRaidenShogunHeadLightMap.0]

filename = .\0\RaidenShogunHeadLightMap.dds

[ResourceRaidenShogunHeadMetalMap.0]

filename = .\0\RaidenShogunHeadMetalMap.dds

[ResourceRaidenShogunHeadShadowRamp.0]

filename = .\0\RaidenShogunHeadShadowRamp.jpg

[ResourceRaidenShogunBodyDiffuse.0]

filename = .\0\RaidenShogunBodyDiffuse.dds

[ResourceRaidenShogunBodyLightMap.0]

filename = .\0\RaidenShogunBodyLightMap.dds

[ResourceRaidenShogunBodyMetalMap.0]

filename = .\0\RaidenShogunBodyMetalMap.dds

[ResourceRaidenShogunBodyShadowRamp.0]

filename = .\0\RaidenShogunBodyShadowRamp.jpg

[ResourceRaidenShogunDressDiffuse.0]

filename = .\0\RaidenShogunDressDiffuse.dds

[ResourceRaidenShogunDressLightMap.0]

filename = .\0\RaidenShogunDressLightMap.dds

[ResourceRaidenShogunDressMetalMap.0]

filename = .\0\RaidenShogunDressMetalMap.dds

[ResourceRaidenShogunDressShadowRamp.0]

filename = .\0\RaidenShogunDressShadowRamp.jpg

[ResourceRaidenShogunFaceHeadDiffuse.0]

filename = .\0\RaidenShogunFaceHeadDiffuse.dds

[ResourceRaidenShogunRemapBlend.1]

type = Buffer

stride = 32

filename = .\1\RaidenShogunRemapBlend.buf

[ResourceRaidenShogunPosition.1]

type = Buffer

stride = 40

filename = .\1\RaidenShogunPosition.buf

[ResourceRaidenShogunBlend.1]

type = Buffer

stride = 32

filename = .\1\RaidenShogunBlend.buf

[ResourceRaidenShogunTexcoord.1]

type = Buffer

stride = 20

filename = .\1\RaidenShogunTexcoord.buf

[ResourceRaidenShogunHeadIB.1]

type = Buffer

format = DXGI_FORMAT_R16_UINT

filename = .\1\RaidenShogunHead.ib

[ResourceRaidenShogunBodyIB.1]

type = Buffer

format = DXGI_FORMAT_R16_UINT

filename = .\1\RaidenShogunBody.ib

[ResourceRaidenShogunDressIB.1]

type = Buffer

format = DXGI_FORMAT_R16_UINT

filename = .\1\RaidenShogunDress.ib

[ResourceRaidenShogunHeadDiffuse.1]

filename = .\1\RaidenShogunHeadDiffuse.dds

[ResourceRaidenShogunHeadLightMap.1]

filename = .\1\RaidenShogunHeadLightMap.dds

[ResourceRaidenShogunHeadMetalMap.1]

filename = .\1\RaidenShogunHeadMetalMap.dds

[ResourceRaidenShogunHeadShadowRamp.1]

filename = .\1\RaidenShogunHeadShadowRamp.jpg

[ResourceRaidenShogunBodyDiffuse.1]

filename = .\1\RaidenShogunBodyDiffuse.dds

[ResourceRaidenShogunBodyLightMap.1]

filename = .\1\RaidenShogunBodyLightMap.dds

[ResourceRaidenShogunBodyMetalMap.1]

filename = .\1\RaidenShogunBodyMetalMap.dds

[ResourceRaidenShogunBodyShadowRamp.1]

filename = .\1\RaidenShogunBodyShadowRamp.jpg

[ResourceRaidenShogunDressDiffuse.1]

filename = .\1\RaidenShogunDressDiffuse.dds

[ResourceRaidenShogunDressLightMap.1]

filename = .\1\RaidenShogunDressLightMap.dds

[ResourceRaidenShogunDressMetalMap.1]

filename = .\1\RaidenShogunDressMetalMap.dds

[ResourceRaidenShogunDressShadowRamp.1]

filename = .\1\RaidenShogunDressShadowRamp.jpg

; .ini generated by GIMI (Genshin-Impact-Model-Importer) mod merger script

; If you have any issues or find any bugs, please open a ticket at https://github.com/SilentNightSound/GI-Model-Importer/issues or contact SilentNightSound#7430 on discord

保存された差分

原文

ファイルを開く

; Merged Mod: .\0\RaidenShogun.ini, .\1\RaidenShogun.ini

; Constants ---------------------------

[Constants]
global persist $swapvar = 0
global $active
global $creditinfo = 0

[KeySwap]
condition = $active == 1
key = q
type = cycle
$swapvar = 0,1
$creditinfo = 0

[Present]
post $active = 0

; Shader ------------------------------

; Overrides ---------------------------

[TextureOverrideRaidenShogunPosition]
hash = e48c61f3
run = CommandListRaidenShogunPosition
$active = 1

[TextureOverrideRaidenShogunBlend]
hash = 1a495487
run = CommandListRaidenShogunBlend

[TextureOverrideRaidenShogunTexcoord]
hash = 0c37fc86
run = CommandListRaidenShogunTexcoord

[TextureOverrideRaidenShogunVertexLimitRaise]
hash = a05e7bec

[TextureOverrideRaidenShogunIB]
hash = 428c56cd
run = CommandListRaidenShogunIB

[TextureOverrideRaidenShogunHead]
hash = 428c56cd
match_first_index = 0
run = CommandListRaidenShogunHead

[TextureOverrideRaidenShogunBody]
hash = 428c56cd
match_first_index = 17769
run = CommandListRaidenShogunBody

[TextureOverrideRaidenShogunDress]
hash = 428c56cd
match_first_index = 52473
run = CommandListRaidenShogunDress

[TextureOverrideRaidenShogunFaceHeadDiffuse]
hash = 20174ee8
run = CommandListRaidenShogunFaceHeadDiffuse

[TextureOverrideRaidenShogunRemapBlend]
hash = fe5c0180
run = CommandListRaidenShogunRemapBlend

; CommandList -------------------------

[CommandListRaidenShogunPosition]
if $swapvar == 0
	vb0 = ResourceRaidenShogunPosition.0
else if $swapvar == 1
	vb0 = ResourceRaidenShogunPosition.1
endif

[CommandListRaidenShogunBlend]
if $swapvar == 0
	vb1 = ResourceRaidenShogunBlend.0
	handling = skip
	draw = 14687,0
else if $swapvar == 1
	vb1 = ResourceRaidenShogunBlend.1
	handling = skip
	draw = 18322,0
endif

[CommandListRaidenShogunTexcoord]
if $swapvar == 0
	vb1 = ResourceRaidenShogunTexcoord.0
else if $swapvar == 1
	vb1 = ResourceRaidenShogunTexcoord.1
endif

[CommandListRaidenShogunIB]
if $swapvar == 0
	handling = skip
	drawindexed = auto
else if $swapvar == 1
	handling = skip
	drawindexed = auto
endif

[CommandListRaidenShogunHead]
if $swapvar == 0
	ib = ResourceRaidenShogunHeadIB.0
	ps-t0 = ResourceRaidenShogunHeadDiffuse.0
	ps-t1 = ResourceRaidenShogunHeadLightMap.0
	ps-t2 = ResourceRaidenShogunHeadMetalMap.0
	ps-t3 = ResourceRaidenShogunHeadShadowRamp.0
else if $swapvar == 1
	ib = ResourceRaidenShogunHeadIB.1
	ps-t0 = ResourceRaidenShogunHeadDiffuse.1
	ps-t1 = ResourceRaidenShogunHeadLightMap.1
	ps-t2 = ResourceRaidenShogunHeadMetalMap.1
	ps-t3 = ResourceRaidenShogunHeadShadowRamp.1
endif

[CommandListRaidenShogunBody]
if $swapvar == 0
	ib = ResourceRaidenShogunBodyIB.0
	ps-t0 = ResourceRaidenShogunBodyDiffuse.0
	ps-t1 = ResourceRaidenShogunBodyLightMap.0
	ps-t2 = ResourceRaidenShogunBodyMetalMap.0
	ps-t3 = ResourceRaidenShogunBodyShadowRamp.0
else if $swapvar == 1
	ib = ResourceRaidenShogunBodyIB.1
	ps-t0 = ResourceRaidenShogunBodyDiffuse.1
	ps-t1 = ResourceRaidenShogunBodyLightMap.1
	ps-t2 = ResourceRaidenShogunBodyMetalMap.1
	ps-t3 = ResourceRaidenShogunBodyShadowRamp.1
endif

[CommandListRaidenShogunDress]
if $swapvar == 0
	ib = ResourceRaidenShogunDressIB.0
	ps-t0 = ResourceRaidenShogunDressDiffuse.0
	ps-t1 = ResourceRaidenShogunDressLightMap.0
	ps-t2 = ResourceRaidenShogunDressMetalMap.0
	ps-t3 = ResourceRaidenShogunDressShadowRamp.0
else if $swapvar == 1
	ib = ResourceRaidenShogunDressIB.1
	ps-t0 = ResourceRaidenShogunDressDiffuse.1
	ps-t1 = ResourceRaidenShogunDressLightMap.1
	ps-t2 = ResourceRaidenShogunDressMetalMap.1
	ps-t3 = ResourceRaidenShogunDressShadowRamp.1
endif

[CommandListRaidenShogunFaceHeadDiffuse]
if $swapvar == 0
	ps-t0 = ResourceRaidenShogunFaceHeadDiffuse.0
endif

[CommandListRaidenShogunRemapBlend]
if $swapvar == 1
	vb1 = ResourceRaidenShogunRemapBlend.1
	handling = skip
	draw = 18322,0
endif

; Resources ---------------------------

[ResourceRaidenShogunPosition.0]
type = Buffer
stride = 40
filename = .\0\RaidenShogunPosition.buf

[ResourceRaidenShogunBlend.0]
type = Buffer
stride = 32
filename = .\0\RaidenShogunBlend.buf

[ResourceRaidenShogunTexcoord.0]
type = Buffer
stride = 20
filename = .\0\RaidenShogunTexcoord.buf

[ResourceRaidenShogunHeadIB.0]
type = Buffer
format = DXGI_FORMAT_R16_UINT
filename = .\0\RaidenShogunHead.ib

[ResourceRaidenShogunBodyIB.0]
type = Buffer
format = DXGI_FORMAT_R16_UINT
filename = .\0\RaidenShogunBody.ib

[ResourceRaidenShogunDressIB.0]
type = Buffer
format = DXGI_FORMAT_R16_UINT
filename = .\0\RaidenShogunDress.ib

[ResourceRaidenShogunHeadDiffuse.0]
filename = .\0\RaidenShogunHeadDiffuse.dds

[ResourceRaidenShogunHeadLightMap.0]
filename = .\0\RaidenShogunHeadLightMap.dds

[ResourceRaidenShogunHeadMetalMap.0]
filename = .\0\RaidenShogunHeadMetalMap.dds

[ResourceRaidenShogunHeadShadowRamp.0]
filename = .\0\RaidenShogunHeadShadowRamp.jpg

[ResourceRaidenShogunBodyDiffuse.0]
filename = .\0\RaidenShogunBodyDiffuse.dds

[ResourceRaidenShogunBodyLightMap.0]
filename = .\0\RaidenShogunBodyLightMap.dds

[ResourceRaidenShogunBodyMetalMap.0]
filename = .\0\RaidenShogunBodyMetalMap.dds

[ResourceRaidenShogunBodyShadowRamp.0]
filename = .\0\RaidenShogunBodyShadowRamp.jpg

[ResourceRaidenShogunDressDiffuse.0]
filename = .\0\RaidenShogunDressDiffuse.dds

[ResourceRaidenShogunDressLightMap.0]
filename = .\0\RaidenShogunDressLightMap.dds

[ResourceRaidenShogunDressMetalMap.0]
filename = .\0\RaidenShogunDressMetalMap.dds

[ResourceRaidenShogunDressShadowRamp.0]
filename = .\0\RaidenShogunDressShadowRamp.jpg

[ResourceRaidenShogunFaceHeadDiffuse.0]
filename = .\0\RaidenShogunFaceHeadDiffuse.dds

[ResourceRaidenShogunRemapBlend.1]
type = Buffer
stride = 32
filename = .\1\RaidenShogunRemapBlend.buf

[ResourceRaidenShogunPosition.1]
type = Buffer
stride = 40
filename = .\1\RaidenShogunPosition.buf

[ResourceRaidenShogunBlend.1]
type = Buffer
stride = 32
filename = .\1\RaidenShogunBlend.buf

[ResourceRaidenShogunTexcoord.1]
type = Buffer
stride = 20
filename = .\1\RaidenShogunTexcoord.buf

[ResourceRaidenShogunHeadIB.1]
type = Buffer
format = DXGI_FORMAT_R16_UINT
filename = .\1\RaidenShogunHead.ib

[ResourceRaidenShogunBodyIB.1]
type = Buffer
format = DXGI_FORMAT_R16_UINT
filename = .\1\RaidenShogunBody.ib

[ResourceRaidenShogunDressIB.1]
type = Buffer
format = DXGI_FORMAT_R16_UINT
filename = .\1\RaidenShogunDress.ib

[ResourceRaidenShogunHeadDiffuse.1]
filename = .\1\RaidenShogunHeadDiffuse.dds

[ResourceRaidenShogunHeadLightMap.1]
filename = .\1\RaidenShogunHeadLightMap.dds

[ResourceRaidenShogunHeadMetalMap.1]
filename = .\1\RaidenShogunHeadMetalMap.dds

[ResourceRaidenShogunHeadShadowRamp.1]
filename = .\1\RaidenShogunHeadShadowRamp.jpg

[ResourceRaidenShogunBodyDiffuse.1]
filename = .\1\RaidenShogunBodyDiffuse.dds

[ResourceRaidenShogunBodyLightMap.1]
filename = .\1\RaidenShogunBodyLightMap.dds

[ResourceRaidenShogunBodyMetalMap.1]
filename = .\1\RaidenShogunBodyMetalMap.dds

[ResourceRaidenShogunBodyShadowRamp.1]
filename = .\1\RaidenShogunBodyShadowRamp.jpg

[ResourceRaidenShogunDressDiffuse.1]
filename = .\1\RaidenShogunDressDiffuse.dds

[ResourceRaidenShogunDressLightMap.1]
filename = .\1\RaidenShogunDressLightMap.dds

[ResourceRaidenShogunDressMetalMap.1]
filename = .\1\RaidenShogunDressMetalMap.dds

[ResourceRaidenShogunDressShadowRamp.1]
filename = .\1\RaidenShogunDressShadowRamp.jpg

; .ini generated by GIMI (Genshin-Impact-Model-Importer) mod merger script
; If you have any issues or find any bugs, please open a ticket at https://github.com/SilentNightSound/GI-Model-Importer/issues or contact SilentNightSound#7430 on discord

変更されたテキスト

ファイルを開く

; Merged Mod: .\0\RaidenShogun.ini, .\1\RaidenShogun.ini

; Constants ---------------------------

[Constants]
global $enable_burst_swap = 1
global persist $burst_swap = 0
global persist $swapvar_select = 0
global $swapvar = 0
global $active= 0
global $is_burst = 0
global $is_burst_prev = 0
global $set_burst_swap = 0
global $burst_start_time
global $press = 0
global $isFirstime = 0

;Leave as is if you want swap happen when you press correct button 
;Change accordingly if you want swap to happen later (i.e after burst animation)
global $swap_delay = 0

; Match the number with that of your burst/skill
global $burst_duration = 8.2

;swap lock lock time after pressing the button
global $burst_cooldown = 18

[KeyQ]
key = q
condition = $active== 1
type=cycle
$is_burst = 1,0
$press = 1,0

[Present]
post $active= 0
post $is_burst_prev = $is_burst
post run = CommandListBurstStartTime
post run = CommandListOnBurstStart

if $is_burst_prev == 1 && $enable_burst_swap && time - $burst_start_time > $swap_delay
	$swapvar = 1
else
	$swapvar = 0
endif
; Shader ------------------------------

; Overrides ---------------------------

[TextureOverrideRaidenShogunPosition]
hash = e48c61f3
run = CommandListRaidenShogunPosition
$active= 1