浏览代码

Fix previous changes

/main
uChema 3 年前
当前提交
5c004cab
共有 6 个文件被更改,包括 673 次插入52 次删除
  1. 28
      UOP1_Project/Assets/ScriptableObjects/Quests/Questline4/Quest1/Step1/SD-S1-Q1-QL4.asset
  2. 28
      UOP1_Project/Assets/ScriptableObjects/Quests/Questline4/Quest1/Step2/SD-S2-Q1-QL4.asset
  3. 246
      UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/TownsFolk4.png
  4. 96
      UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/TownsFolk4.png.meta
  5. 231
      UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/Townsfolk3.png
  6. 96
      UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/Townsfolk3.png.meta

28
UOP1_Project/Assets/ScriptableObjects/Quests/Questline4/Quest1/Step1/SD-S1-Q1-QL4.asset


m_Name: SD-S1-Q1-QL4
m_EditorClassIdentifier:
_actor: {fileID: 0}
_dialogueLines:
- m_TableReference:
m_TableCollectionName: Questline Dialogue
m_TableEntryReference:
m_KeyId: 0
m_Key: L1-SD-S1-Q1-QL4
m_FallbackState: 0
m_WaitForCompletion: 1
- m_TableReference:
m_TableCollectionName: Questline Dialogue
m_TableEntryReference:
m_KeyId: 0
m_Key: L2-SD-S1-Q1-QL4
m_FallbackState: 0
m_WaitForCompletion: 1
_choices:
- _response:
m_TableReference:
m_TableCollectionName: GUID:f81a49615d56c1a4fbbd14b4569b06f3
m_TableEntryReference:
m_KeyId: 20322714321281024
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
_nextDialogue: {fileID: 0}
_actionType: 0
_dialogueLines: []
_choices: []
_dialogueType: 0

28
UOP1_Project/Assets/ScriptableObjects/Quests/Questline4/Quest1/Step2/SD-S2-Q1-QL4.asset


m_Name: SD-S2-Q1-QL4
m_EditorClassIdentifier:
_actor: {fileID: 0}
_dialogueLines:
- m_TableReference:
m_TableCollectionName: Questline Dialogue
m_TableEntryReference:
m_KeyId: 0
m_Key: L1-SD-S2-Q1-QL4
m_FallbackState: 0
m_WaitForCompletion: 1
- m_TableReference:
m_TableCollectionName: Questline Dialogue
m_TableEntryReference:
m_KeyId: 0
m_Key: L2-SD-S2-Q1-QL4
m_FallbackState: 0
m_WaitForCompletion: 1
_choices:
- _response:
m_TableReference:
m_TableCollectionName: GUID:f81a49615d56c1a4fbbd14b4569b06f3
m_TableEntryReference:
m_KeyId: 20322714321281024
m_Key:
m_FallbackState: 0
m_WaitForCompletion: 0
_nextDialogue: {fileID: 0}
_actionType: 0
_dialogueLines: []
_choices: []
_dialogueType: 0

246
UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/TownsFolk4.png

之前 之后
宽度: 300  |  高度: 300  |  大小: 53 KiB

96
UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/TownsFolk4.png.meta


fileFormatVersion: 2
guid: f27b6bd5fc134e44681c9fe6dfbda7d8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

231
UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/Townsfolk3.png

之前 之后
宽度: 300  |  高度: 300  |  大小: 62 KiB

96
UOP1_Project/Assets/Scripts/Quests/Editor/ActorImages/Townsfolk3.png.meta


fileFormatVersion: 2
guid: 372ba692b4bbef54ea5a91d9ee550e7d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存