iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

대화 추가

Browse Source
This commit is contained in:
NTG_Lenovo 2025-02-27 14:29:11 +09:00
parent b41115b87f
commit 57f65859f0
21 changed files with 3336 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1747
Assets/01.Scenes/04.TycoonTest.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/02.Scripts/BlueWater/Tycoon/CustomerController.cs
View File

@ -149,7 +149,7 @@ namespace DDD.Tycoons
{
if (!element || element.IsReceivedItem || element.IsMatchedServer) continue;
if (servingTableItem.Idx != element.OrderedCraftRecipeData.Idx) continue;
if (servingTableItem.Idx != element.OrderedCraftRecipeData.Idx || servingTableItem.CraftingToolQueue.Count > 0) continue;
return element;
}

14
Assets/02.Scripts/DDD/Prop/Furniture/Bell.cs
View File

@ -23,6 +23,20 @@ namespace DDD.Tycoons
EventManager.OnEndedBell -= EndBell;
}
public override void Interaction()
{
base.Interaction();
GameManager.Instance.CurrentTycoonPlayer.IsCleaningMold = true;
}
public override void CancelInteraction()
{
base.CancelInteraction();
GameManager.Instance.CurrentTycoonPlayer.IsCleaningMold = false;
}
public override bool CanInteraction()
{
return !_activatedBell;

4
Assets/02.Scripts/DDD/Prop/Furniture/ServingTable.cs
View File

@ -138,7 +138,7 @@ namespace DDD.Tycoons
var serverCrew = (ServerCrew)crew;
serverCrew.TakeFromServingTable(CurrentCraftRecipeData, _orderedCustomer);
_itemSpriteRenderer.enabled = false;
// InteractionCanvas.BalloonUi.DiscardItem();
InteractionCanvas.BalloonUi.DiscardItem();
CurrentCraftRecipeData = null;
_orderedCustomer = null;
}
@ -149,7 +149,7 @@ namespace DDD.Tycoons
CurrentCraftRecipeData = serverCrew.CurrentPickupItem;
_itemSpriteRenderer.sprite = CurrentCraftRecipeData.Sprite;
_itemSpriteRenderer.enabled = true;
// InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem);
InteractionCanvas.BalloonUi.SetItemImage(CurrentCraftRecipeData.Sprite);
serverCrew.ResetMission();
}
}

8
Assets/03.Images/DDD/Ui/Characters.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3b9ee0a0171737346bf2008b4be21170
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/03.Images/DDD/Ui/Characters/Emily.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 783 KiB

156
Assets/03.Images/DDD/Ui/Characters/Emily.png.meta Normal file
View File

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: c493c34b1338a504abace527651c21e0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/03.Images/DDD/Ui/Characters/Lilith.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 562 KiB

156
Assets/03.Images/DDD/Ui/Characters/Lilith.png.meta Normal file
View File

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: 17ab9668e195c9f48aaf3078d126443b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/03.Images/DDD/Ui/Characters/Sephira.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 KiB

156
Assets/03.Images/DDD/Ui/Characters/Sephira.png.meta Normal file
View File

@ -0,0 +1,156 @@
fileFormatVersion: 2
guid: 80abf4a52ec3c8f4c84810d5da100207
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

2
Assets/03.Images/DDD/Ui/Tycoon/Food/CraftRecipe002.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
alignment: 7
spritePivot: {x: 0.5, y: 0.14}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}

2
Assets/03.Images/DDD/Ui/Tycoon/Food/CraftRecipe004.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
alignment: 7
spritePivot: {x: 0.5, y: 0.03}
spritePixelsToUnits: 2048
spriteBorder: {x: 0, y: 0, z: 0, w: 0}

2
Assets/03.Images/DDD/Ui/Tycoon/Food/CraftRecipe006.png.meta
View File

@ -46,7 +46,7 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
alignment: 7
spritePivot: {x: 0.5, y: 0.03}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}

11
Assets/05.Prefabs/BlueWater/Characters/Npcs/Crews/BartenderCrew.prefab
View File

@ -256,6 +256,8 @@ MeshRenderer:
m_Materials:
- {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2}
- {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
- {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2}
- {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -486,6 +488,7 @@ MonoBehaviour:
persistentDataName:
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
audioSource: {fileID: 0}
barkUISettings:
barkUI: {fileID: 9027939020919762395}
barkUIOffset: {x: 0, y: 0, z: 0}
@ -774,6 +777,7 @@ MonoBehaviour:
<SkeletonAnimation>k__BackingField: {fileID: 2961986041977982893}
_originalMaterial: {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2}
_replacementMaterial: {fileID: 2100000, guid: 288a49bf884b6fc4bbb57fe5d2f4da06, type: 2}
_isSkinSet: 1
_initialSkinName: 01Maid
_isRandomSkin: 1
_isRandomRange: 0
@ -1096,6 +1100,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@ -1146,7 +1154,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7522674838449308991}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3}
m_Name:
@ -1170,4 +1178,5 @@ MonoBehaviour:
waitUntilSequenceEnds: 0
cancelWaitUntilSequenceEndsIfReplacingBark: 0
waitForContinueButton: 0
hideOnConversationStart: 0
textDisplaySetting: 0

6
Assets/05.Prefabs/BlueWater/Characters/Npcs/Crews/CleanerCrew.prefab
View File

@ -1079,6 +1079,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 33.3
objectReference: {fileID: 0}
- target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@ -1129,7 +1133,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7522674838449308991}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3}
m_Name:

24
Assets/05.Prefabs/BlueWater/Characters/Npcs/Crews/ServerCrew.prefab
View File

@ -256,8 +256,6 @@ MeshRenderer:
m_Materials:
- {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2}
- {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
- {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2}
- {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -488,6 +486,7 @@ MonoBehaviour:
persistentDataName:
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
audioSource: {fileID: 0}
barkUISettings:
barkUI: {fileID: 9027939020919762395}
barkUIOffset: {x: 0, y: 0, z: 0}
@ -686,7 +685,6 @@ MonoBehaviour:
returnAfterBeingPushedAway: 0
progressAverage: 0
lastJobDensityResult: 0
centerOffsetCompatibility: NaN
repathRateCompatibility: NaN
canSearchCompability: 0
orientation: 0
@ -697,7 +695,6 @@ MonoBehaviour:
sensitivity: 10
maximumPeriod: 2
visualizeSensitivity: 0
targetCompatibility: {fileID: 0}
maxAcceleration: -2.5
rotationSpeed: 360
slowdownDistance: 1
@ -776,8 +773,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<SkeletonAnimation>k__BackingField: {fileID: 2961986041977982893}
_originalMaterial: {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2}
_originalMaterial: {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
_replacementMaterial: {fileID: 2100000, guid: 288a49bf884b6fc4bbb57fe5d2f4da06, type: 2}
_isSkinSet: 1
_initialSkinName: 01Maid
_isRandomSkin: 1
_isRandomRange: 0
@ -821,6 +819,7 @@ MonoBehaviour:
<BalloonUi>k__BackingField: {fileID: 1469338590548789471}
<SpineController>k__BackingField: {fileID: 5279376384905517670}
<AIMovement>k__BackingField: {fileID: 17978457728262906}
_createCrewSfxName: CreateCrew
--- !u!1 &7812544424410854405
GameObject:
m_ObjectHideFlags: 0
@ -889,8 +888,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uBB50\uAC00 \uC88B\uC744\uAE4C.."
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -978,10 +977,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 2397117528733804567}
m_Modifications:
- target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 627252455323728319, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_Sprite
value:
@ -1074,10 +1069,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@ -1128,7 +1119,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7522674838449308991}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3}
m_Name:
@ -1152,4 +1143,5 @@ MonoBehaviour:
waitUntilSequenceEnds: 0
cancelWaitUntilSequenceEndsIfReplacingBark: 0
waitForContinueButton: 0
hideOnConversationStart: 0
textDisplaySetting: 0

6
Assets/05.Prefabs/BlueWater/Characters/Npcs/Customer.prefab
View File

@ -1208,6 +1208,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 33.3
objectReference: {fileID: 0}
- target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@ -1247,7 +1251,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7522674838449308991}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3}
m_Name:

24
Assets/05.Prefabs/BlueWater/Uis/InteractionCanvas.prefab
View File

@ -10,7 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 4648285208244819224}
- component: {fileID: 5297442833789713246}
- component: {fileID: 8764364725249863370}
- component: {fileID: 5028824454365225125}
- component: {fileID: 8043919875794167790}
m_Layer: 0
@ -64,29 +63,6 @@ Canvas:
m_SortingLayerID: -403788685
m_SortingOrder: 5
m_TargetDisplay: 0
--- !u!114 &8764364725249863370
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5611097802189151736}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!114 &5028824454365225125
MonoBehaviour:
m_ObjectHideFlags: 0

8
Assets/05.Prefabs/BlueWater/Uis/Template Dialogue UI.prefab
View File

@ -4844,10 +4844,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 2535950354375172320}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 35.39, y: -7.915001}
m_SizeDelta: {x: 70.78, y: 15.830002}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8247504450067211572
CanvasRenderer:

1071
Assets/BlueWater.asset
View File

File diff suppressed because it is too large Load Diff