This commit is contained in:
NTG_Lenovo 2024-12-03 15:08:15 +09:00
parent 96c185998e
commit 2c0fcd5e48
151 changed files with 786 additions and 3827 deletions

View File

@ -10240,7 +10240,7 @@ Camera:
m_Depth: 1
m_CullingMask:
serializedVersion: 2
m_Bits: 2147614679
m_Bits: 2148138967
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -11752,8 +11752,10 @@ MonoBehaviour:
_moveToPlayerDuration: 0.2
_moveToCenterDuration: 0.15
_centerPosition: {x: -340, y: 0, z: 0}
_endPositionOffset: {x: 0, y: 20, z: 0}
_endPositionOffset: {x: 0, y: 0.1, z: 0}
_endScale: {x: 0.3, y: 0.3, z: 0.3}
_cameraDistance: {x: 5, y: 15}
_offsetY: {x: 20, y: 15}
--- !u!1001 &1008526203
PrefabInstance:
m_ObjectHideFlags: 0
@ -21409,6 +21411,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<StageDataSo>k__BackingField: {fileID: 11400000, guid: 5fd0220da8e388e4c872a9fcc80d2c76, type: 2}
_vomitingObject: {fileID: 7264946127367919962, guid: d02f28b2bb526af478050f2f027be8e9, type: 3}
_mushroomObject: {fileID: 9017181398980009727, guid: 6ae3ef0fd03a4f14bb60802eb4fc0fa8, type: 3}
_normalRewardBoxObject: {fileID: 5271591928794914848, guid: c939d59e0cc02ec45b0610f6b470031f, type: 3}
_rareRewardBoxObject: {fileID: 5271591928794914848, guid: 6609b1f764f239e4a94f6f88be3d4916, type: 3}
@ -22613,7 +22616,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
version: 1073741824
data:
dataString: UEsDBBQAAAgIAABIIexHw7YYvAIAAPoFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI5wUlpdCyt12g7R7aotJVD5senHhCLIwd+aNAK/77jh1DApUiJZp5M/PmzUy+CJemhsIqfa85e1QMyM8e8d/kR691PsCOrpRc8k84Yt44s5UH0YB5oZYrtKc+zKgNWM2LX3IlPDhBo5O8VHozZyuYKmMNmksqDKBLK+ujJZq+emQXA/bx/enfvQN+FSAt6O+ofjJII7CfJoPbAHayEHRTA/Ok25h0MhjFsJvBKCAldhRBTaJCCcFNJETsvg4NT2ltHLaDAMYpNhioeHwFfFXZED7qhj+XpQEbiWq6n3GNSjV5yW/VyLehZt3Q+6DC+UrD2+vAq0n7+M0/btylVpuHY+U08TVsxYv1C90X1NiOvl3z7Jy6k1sq1jQX8FaBfFL3WjnJ0Gm186HOwNWsk+rU27SCYt3iGq4XRld/n1XaTvQQut8tLdQPrYLXrfWvAbMUKsgfU3pPtEx8StA4vD/YT1ggEwuh1XPE+Fe66m5adNxxbSy6Ip9o9dgFTggYyAKi7n0PkJ5erpz2ucg8cPViODtVWkIwR4I1SCrsfoEZ7eUKXPg6vC48d9QfXWQXfcdbuggJ5hafJBeuhdqehq1xfU3Y6ePXv3c/BFOp7SOY6tlZwWVHbe94QoGnSspmc7tiHsOWTpe06IRZ2FmnYUYtDdWQDi4Y64ailiFCOiH8LocGAiNswD/vXt+KYl0RzORJyXB7Z+9Af+U4O78QktAbOmF5ObpK8/HNbd4f5kPICxjmyZjBeJKScEJcotxULBq9okq4XbLtReK5+IwvYCx1msoweabp9p5/blRn8lyWalloAPncZDg1CxqL4A+GzRnHNpdgLZdhL8lXRoQq1sCyU6IsCDvfWU2zNktGav6hrLdkZBp+hBnx5tNF4up+cNj64mfJQODogL1yARtae1dyIIf/UEsDBBQAAAgIAABIIeyfkg7JbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz0jPVUVBKL0osyCgGChiCOKWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7EfDthi8AgAA+gUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7J+SDslsAAAAdwAAAAkAJAAAAAAAAAAAAAAACQMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADAAwAAAAA=
dataString: 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
file_cachedStartup: {fileID: 0}
cacheStartup: 0
showNavGraphs: 1

View File

@ -29,7 +29,7 @@ namespace BlueWater.BehaviorTrees.Actions
if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent)
{
_canVomit = true;
_vomitingPosition = Utils.RandomPositionOnGraph();
_vomitingPosition = Utils.RandomPositionOnGraph(1);
_customer.AIMovement.Move(_vomitingPosition);
}
}

View File

@ -25,8 +25,6 @@ namespace BlueWater.BehaviorTrees.Actions
if (_customer.IsWaitTimeOver())
{
_customer.UnregisterPlayerInteraction();
EventManager.InvokeMissedServing();
EventManager.InvokeCheckedSkin(_customer.CustomerSkin);
return TaskStatus.Failure;
}

View File

@ -98,9 +98,6 @@ namespace BlueWater.Npcs.Customers
[field: SerializeField]
public string InteractionMessage { get; set; }
[SerializeField]
private Vomiting _vomiting;
[field: Title("실시간 데이터")]
[field: SerializeField]
@ -345,6 +342,7 @@ namespace BlueWater.Npcs.Customers
}
EventManager.InvokeCocktailServedToCustomer(cocktailData, IsServedPlayer);
EventManager.InvokeOrderResult(this, IsOrderedCorrected);
EventManager.InvokeSucceedServing(IsOrderedCorrected);
EventManager.InvokeCheckedSkin(CustomerSkin);
}
@ -453,8 +451,10 @@ namespace BlueWater.Npcs.Customers
if (isWaitTimeOver)
{
EventManager.InvokeOrderResult(this, false);
EventManager.InvokeMissedServing();
EventManager.InvokeCheckedSkin(CustomerSkin);
}
return isWaitTimeOver;
}
@ -496,21 +496,7 @@ namespace BlueWater.Npcs.Customers
public void InstanceVomit()
{
var spawnPosition = transform.position + new Vector3(0f, 0f, -0.4f);
Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation);
TycoonStageController.VomitCount++;
if (TycoonStageController.VomitCount >= 3)
{
var random = Random.Range(0, 101);
if (random <= 20)
{
EventManager.InvokeCreateMushroom();
}
else
{
EventManager.InvokeCreateMold();
}
TycoonStageController.VomitCount = 0;
}
EventManager.InvokeCreateVomiting(spawnPosition);
IsVomited = true;
StateMachineController.TransitionToState(IdleState, this);
}

View File

@ -228,6 +228,13 @@ namespace BlueWater
OnOrderResult?.Invoke(orderedCustomer, orderedCorrected);
}
// 손님에게 서빙을 하지 못했을 때 이벤트
public static Action<bool> OnSucceedServing;
public static void InvokeSucceedServing(bool isSucceed)
{
OnSucceedServing?.Invoke(isSucceed);
}
// 손님에게 서빙을 하지 못했을 때 이벤트
public static Action OnMissedServing;
public static void InvokeMissedServing()
@ -310,6 +317,13 @@ namespace BlueWater
{
OnCleaningResult?.Invoke(isSucceed);
}
// 구토 생성 이벤트
public static Action<Vector3> OnCreateVomiting;
public static void InvokeCreateVomiting(Vector3 spawnPosition)
{
OnCreateVomiting?.Invoke(spawnPosition);
}
// 버섯 생성 이벤트
public static Action OnCreateMushroom;

View File

@ -34,13 +34,6 @@ namespace BlueWater.Tycoons
public event Action OnInteractionCompleted;
protected override void OnEnable()
{
base.OnEnable();
Initialize();
}
protected override void Start()
{
base.Start();

View File

@ -116,6 +116,12 @@ namespace BlueWater
[SerializeField]
private Vector3 _endScale = new(0.3f, 0.3f, 0.3f);
[SerializeField]
private Vector2 _cameraDistance = new(5f, 15f);
[SerializeField]
private Vector2 _offsetY = new(20f, 15f);
private Barrel _currentBarrel;
private IObjectPool<Liquid> _liquidObjectPool;
private IObjectPool<Garnish> _garnishObjectPool;
@ -565,14 +571,19 @@ namespace BlueWater
var startScale = _liquidPanel.transform.localScale;
var startPosition = _liquidPanel.transform.position;
Camera mainCamera = TycoonCameraManager.Instance.MainCamera;
var elapsedTime = 0f;
while (elapsedTime <= _moveToPlayerDuration)
{
var playerPosition = _tycoonPlayer.transform.position;
var playerScreenPosition = TycoonCameraManager.Instance.MainCamera.WorldToScreenPoint(playerPosition);
var panelWorldPosition = _overlayCamera.ScreenToWorldPoint(new Vector3(playerScreenPosition.x,
playerScreenPosition.y, _overlayCamera.nearClipPlane));
panelWorldPosition += _endPositionOffset;
var distance = Vector3.Distance(playerPosition, mainCamera.transform.position);
float t = Mathf.InverseLerp(_cameraDistance.x, _cameraDistance.y, distance);
float offsetY = Mathf.Lerp(_offsetY.x, _offsetY.y, t);
var playerViewportPoint = mainCamera.WorldToViewportPoint(playerPosition);
var panelWorldPosition = _overlayCamera.ViewportToWorldPoint(new Vector3(playerViewportPoint.x,
playerViewportPoint.y, _overlayCamera.nearClipPlane));
panelWorldPosition.y += offsetY;
var lerpTime = elapsedTime / _moveToPlayerDuration;
_liquidPanel.transform.position = Vector3.Lerp(startPosition, panelWorldPosition, lerpTime);
@ -590,10 +601,13 @@ namespace BlueWater
while (!_isCompleted && !_isPouring)
{
var playerPosition = _tycoonPlayer.transform.position;
var playerScreenPosition = TycoonCameraManager.Instance.MainCamera.WorldToScreenPoint(playerPosition);
var panelWorldPosition = _overlayCamera.ScreenToWorldPoint(new Vector3(playerScreenPosition.x,
playerScreenPosition.y, _overlayCamera.nearClipPlane));
panelWorldPosition += _endPositionOffset;
var distance = Vector3.Distance(playerPosition, mainCamera.transform.position);
float t = Mathf.InverseLerp(_cameraDistance.x, _cameraDistance.y, distance);
float offsetY = Mathf.Lerp(_offsetY.x, _offsetY.y, t);
var playerViewportPoint = mainCamera.WorldToViewportPoint(playerPosition);
var panelWorldPosition = _overlayCamera.ViewportToWorldPoint(new Vector3(playerViewportPoint.x,
playerViewportPoint.y, _overlayCamera.nearClipPlane));
panelWorldPosition.y += offsetY;
_liquidPanel.transform.position = panelWorldPosition;
yield return waitTime;
@ -631,8 +645,6 @@ namespace BlueWater
_liquidPanel.SetActive(false);
}
public int GetMaxLiquidCount() => _maxLiquidCount;
#endregion
}
}

View File

@ -5,6 +5,7 @@ using BlueWater.Items;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
using Random = UnityEngine.Random;
namespace BlueWater.Tycoons
{
@ -12,6 +13,9 @@ namespace BlueWater.Tycoons
{
[field: SerializeField, Required]
public StageDataSo StageDataSo { get; private set; }
[SerializeField]
private Vomiting _vomitingObject;
[SerializeField]
private Mushroom _mushroomObject;
@ -40,6 +44,7 @@ namespace BlueWater.Tycoons
EventManager.OnMakeCocktailCompleted += AddInstanceCocktail;
EventManager.OnCocktailServedToCustomer += RemoveInstanceCocktail;
EventManager.OnCocktailDiscarded += RemoveInstanceCocktail;
EventManager.OnCreateVomiting += CreateVomiting;
EventManager.OnCreateMushroom += CreateMushroom;
EventManager.OnLevelUp += CreateChest;
}
@ -59,6 +64,7 @@ namespace BlueWater.Tycoons
EventManager.OnMakeCocktailCompleted -= AddInstanceCocktail;
EventManager.OnCocktailServedToCustomer -= RemoveInstanceCocktail;
EventManager.OnCocktailDiscarded -= RemoveInstanceCocktail;
EventManager.OnCreateVomiting -= CreateVomiting;
EventManager.OnCreateMushroom -= CreateMushroom;
EventManager.OnLevelUp -= CreateChest;
}
@ -117,18 +123,31 @@ namespace BlueWater.Tycoons
return instanceCount < orderedCount;
}
private void PrintInstanceCocktailDatas()
[Button("구토 생성")]
public void CreateVomiting(Vector3 spawnPosition)
{
foreach (var element in InstanceCocktailDatas)
var vomitingObject = Instantiate(_vomitingObject, spawnPosition, _vomitingObject.transform.rotation);
vomitingObject.Initialize();
VomitCount++;
if (VomitCount >= 3)
{
print($"key : {element.Key}, Value : {element.Value}");
var random = Random.Range(0, 101);
if (random <= 20)
{
EventManager.InvokeCreateMushroom();
}
else
{
EventManager.InvokeCreateMold();
}
VomitCount = 0;
}
print("\n");
}
[Button("버섯 생성")]
public void CreateMushroom()
{
var spawnPosition = Utils.RandomPositionOnGraph();
var spawnPosition = Utils.RandomPositionOnGraph(1);
var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation);
mushroom.Initialize();
}
@ -138,7 +157,7 @@ namespace BlueWater.Tycoons
{
if (levelData.Idx == "1") return;
var spawnPosition = Utils.RandomPositionOnGraph();
var spawnPosition = Utils.RandomPositionOnGraph(1);
var rewardBox = levelData.RewardBoxType switch
{

View File

@ -196,6 +196,11 @@ namespace BlueWater
);
}
public float GetCurrentBaseCameraDistance()
{
return _baseCameraComposer.CameraDistance;
}
#endregion
}
}

View File

@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using BlueWater.Npcs.Customers;
@ -197,7 +198,7 @@ namespace BlueWater.Uis
{
EventManager.OnShowResult += Open;
EventManager.OnCheckedSkin += AddCustomerCount;
EventManager.OnOrderResult += AddServingCount;
EventManager.OnSucceedServing += AddServingCount;
EventManager.OnMissedServing += AddMissedServingCount;
EventManager.OnCleaningResult += AddCleaningCount;
EventManager.OnAddedGold += AddGoldCount;
@ -234,7 +235,7 @@ namespace BlueWater.Uis
{
EventManager.OnShowResult -= Open;
EventManager.OnCheckedSkin -= AddCustomerCount;
EventManager.OnOrderResult -= AddServingCount;
EventManager.OnSucceedServing -= AddServingCount;
EventManager.OnMissedServing -= AddMissedServingCount;
EventManager.OnCleaningResult -= AddCleaningCount;
EventManager.OnAddedGold -= AddGoldCount;
@ -442,12 +443,12 @@ namespace BlueWater.Uis
case 1:
_pumpkinCount++;
break;
default:
break;
default:;
throw new Exception("손님 스킨 인덱스 오류");
}
}
private void AddServingCount(Customer orderedCustomer, bool orderedCorrected)
private void AddServingCount(bool orderedCorrected)
{
if (orderedCorrected)
{
@ -459,7 +460,7 @@ namespace BlueWater.Uis
}
}
private void AddMissedServingCount() => _failedServingCount++;
private void AddMissedServingCount() => _missServingCount++;
private void AddCleaningCount(bool isSucceed)
{

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 KiB

View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 153 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 KiB

View File

Before

Width:  |  Height:  |  Size: 544 KiB

After

Width:  |  Height:  |  Size: 544 KiB

View File

Before

Width:  |  Height:  |  Size: 513 KiB

After

Width:  |  Height:  |  Size: 513 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 KiB

View File

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 KiB

View File

@ -1,166 +0,0 @@
fileFormatVersion: 2
guid: 284734c4624b35b499152e028f90e6f6
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: 1024
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: 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: 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: 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:
- serializedVersion: 2
name: AddAllLiquid_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 1024
height: 1024
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 16e7929403eb41d47a15b1f14a3fdf8d
internalID: -254146654
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: d1b704d6b847fbc4fb98f9d6cafe62ad
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
AddAllLiquid_0: -254146654
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 KiB

View File

@ -1,166 +0,0 @@
fileFormatVersion: 2
guid: 4708f67b3712d4743af7cb6092edf3c7
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: 1024
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: 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: 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: 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:
- serializedVersion: 2
name: AddGanish1_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 1024
height: 1024
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 32d439fcac266a2499025b0247d9ccbb
internalID: 1704811524
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 8856fbf45b6399e4ba69a71f1303a365
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
AddGanish1_0: 1704811524
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 494 KiB

View File

@ -1,143 +0,0 @@
fileFormatVersion: 2
guid: 70238c4151e9085429d18be7f6f8a2ae
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: 1024
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: 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: 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: 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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 KiB

View File

@ -1,143 +0,0 @@
fileFormatVersion: 2
guid: b1b88ceef90370a4295ed9f58140349a
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: 1024
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: 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: 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: 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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 KiB

View File

@ -1,143 +0,0 @@
fileFormatVersion: 2
guid: d9dbcf5d304083541a40ff4b3cb9048f
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: 1024
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: 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: 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: 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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 KiB

Some files were not shown because too many files have changed in this diff Show More