# Conflicts:
#	Assets/02.Scripts/Editor/JsonHelperEditor.cs
This commit is contained in:
SweetJJuya 2024-09-12 13:25:17 +09:00
commit 463ad93200
176 changed files with 14757 additions and 5358 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5077,7 +5077,7 @@ Transform:
m_GameObject: {fileID: 545850347} m_GameObject: {fileID: 545850347}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -9.2, y: 18.705118, z: -26.991896} m_LocalPosition: {x: -8.39, y: 9.641813, z: -17.050667}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -5171,7 +5171,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3} m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
CameraDistance: 29.1 CameraDistance: 15
DeadZoneDepth: 0 DeadZoneDepth: 0
Composition: Composition:
ScreenPosition: {x: 0, y: 0} ScreenPosition: {x: 0, y: 0}
@ -7843,7 +7843,7 @@ Transform:
m_GameObject: {fileID: 873223985} m_GameObject: {fileID: 873223985}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -9.2, y: 18.705118, z: -26.991896} m_LocalPosition: {x: -8.39, y: 9.641813, z: -17.050667}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -19994,7 +19994,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -9.2 value: -8.39
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@ -20002,7 +20002,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -4.7 value: -5.56
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

View File

@ -253,6 +253,8 @@ namespace BlueWater.Npcs.Customers
OnInteraction?.Invoke(); OnInteraction?.Invoke();
} }
public virtual void CancelInteraction() { }
public bool CanInteraction() => true; public bool CanInteraction() => true;
public void ShowInteractionUi() public void ShowInteractionUi()

View File

@ -98,6 +98,10 @@ namespace BlueWater.Players.Tycoons
{ {
_closestInteraction?.Interaction(); _closestInteraction?.Interaction();
} }
else if (context.canceled)
{
_closestInteraction?.CancelInteraction();
}
} }
public void OnDevelopKey01(InputAction.CallbackContext context) public void OnDevelopKey01(InputAction.CallbackContext context)

View File

@ -11,6 +11,7 @@ namespace BlueWater.Interfaces
float InteractionRadius { get; } float InteractionRadius { get; }
void Interaction(); void Interaction();
void CancelInteraction();
bool CanInteraction(); bool CanInteraction();
void ShowInteractionUi(); void ShowInteractionUi();
void HideInteractionUi(); void HideInteractionUi();

View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using BlueWater.Interfaces; using BlueWater.Interfaces;
using Newtonsoft.Json;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using UnityEngine; using UnityEngine;
@ -24,31 +23,31 @@ namespace BlueWater.Items
public string IngredientIdx1 { get; set; } public string IngredientIdx1 { get; set; }
[field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientRatio1 { get; set; } public int IngredientAmount1 { get; set; }
[field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx2 { get; set; } public string IngredientIdx2 { get; set; }
[field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientRatio2 { get; set; } public int IngredientAmount2 { get; set; }
[field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx3 { get; set; } public string IngredientIdx3 { get; set; }
[field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientRatio3 { get; set; } public int IngredientAmount3 { get; set; }
[field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx4 { get; set; } public string IngredientIdx4 { get; set; }
[field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientRatio4 { get; set; } public int IngredientAmount4 { get; set; }
[field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx5 { get; set; } public string IngredientIdx5 { get; set; }
[field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientRatio5 { get; set; } public int IngredientAmount5 { get; set; }
[BoxGroup("직접 추가하는 영역")] [BoxGroup("직접 추가하는 영역")]
[field: SerializeField, BoxGroup("직접 추가하는 영역")] [field: SerializeField, BoxGroup("직접 추가하는 영역")]
@ -58,13 +57,24 @@ namespace BlueWater.Items
{ {
var ingredients = new List<CocktailIngredient>(5); var ingredients = new List<CocktailIngredient>(5);
if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new CocktailIngredient(IngredientIdx1, IngredientRatio1)); if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new CocktailIngredient(IngredientIdx1, IngredientAmount1));
if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new CocktailIngredient(IngredientIdx2, IngredientRatio2)); if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new CocktailIngredient(IngredientIdx2, IngredientAmount2));
if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new CocktailIngredient(IngredientIdx3, IngredientRatio3)); if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new CocktailIngredient(IngredientIdx3, IngredientAmount3));
if (!string.IsNullOrEmpty(IngredientIdx4)) ingredients.Add(new CocktailIngredient(IngredientIdx4, IngredientRatio4)); if (!string.IsNullOrEmpty(IngredientIdx4)) ingredients.Add(new CocktailIngredient(IngredientIdx4, IngredientAmount4));
if (!string.IsNullOrEmpty(IngredientIdx5)) ingredients.Add(new CocktailIngredient(IngredientIdx5, IngredientRatio5)); if (!string.IsNullOrEmpty(IngredientIdx5)) ingredients.Add(new CocktailIngredient(IngredientIdx5, IngredientAmount5));
return ingredients; return ingredients;
} }
public int GetCocktailAmount(List<CocktailIngredient> cocktailIngredients)
{
var amount = 0;
foreach (var element in cocktailIngredients)
{
amount += element.Amount;
}
return amount;
}
} }
} }

View File

@ -6,12 +6,12 @@ namespace BlueWater.Items
public class CocktailIngredient public class CocktailIngredient
{ {
public string Idx { get; set; } public string Idx { get; set; }
public int Ratio { get; set; } public int Amount { get; set; }
public CocktailIngredient(string idx, int quantity) public CocktailIngredient(string idx, int amount)
{ {
Idx = idx; Idx = idx;
Ratio = quantity; Amount = amount;
} }
} }
} }

View File

@ -0,0 +1,34 @@
using System;
using BlueWater.Interfaces;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Items
{
[Serializable]
public class LiquidData : IIdx
{
[BoxGroup("Json 데이터 영역")]
[field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")]
public string Idx { get; set; }
[field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")]
public string Name { get; set; }
[field: SerializeField, Tooltip("총량"), BoxGroup("Json 데이터 영역")]
public int Amount { get; set; }
[BoxGroup("직접 추가하는 영역")]
[field: SerializeField, BoxGroup("직접 추가하는 영역")]
public Sprite Sprite { get; set; }
[BoxGroup("직접 추가하는 영역")]
[field: SerializeField, BoxGroup("직접 추가하는 영역")]
public Color Color { get; set; }
public int GetMaxAmount()
{
return Amount == 99999 ? int.MaxValue : Amount;
}
}
}

View File

@ -0,0 +1,10 @@
using UnityEngine;
namespace BlueWater.Items
{
[CreateAssetMenu(fileName = "LiquidDataTable", menuName = "ScriptableObjects/LiquidDataTable")]
public class LiquidDataSo : DataSo<LiquidData>
{
}
}

View File

@ -1,81 +0,0 @@
using System;
using System.Collections.Generic;
using BlueWater.Interfaces;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Items
{
public enum DrinkCategory
{
None = 0,
Alcohol,
Garnish
}
[Serializable]
public class DrinkData : IIdx
{
[BoxGroup("Json 데이터 영역")]
[field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")]
public string Idx { get; set; }
[field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")]
public string Name { get; set; }
[field: SerializeField, Tooltip("종류"), BoxGroup("Json 데이터 영역")]
public DrinkCategory Category { get; set; }
[field: SerializeField, Tooltip("총량"), BoxGroup("Json 데이터 영역")]
public int Amount { get; set; }
[field: SerializeField, Tooltip("도수"), BoxGroup("Json 데이터 영역")]
public int AlcoholVolume { get; set; }
[field: SerializeField, Tooltip("온도"), BoxGroup("Json 데이터 영역")]
public int CoolWarm { get; set; }
[field: SerializeField, Tooltip("맛"), BoxGroup("Json 데이터 영역")]
public int BitterSweet { get; set; }
[field: SerializeField, Tooltip("향"), BoxGroup("Json 데이터 영역")]
public int Scent { get; set; }
[field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx1 { get; set; }
[field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientQuantity1 { get; set; }
[field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx2 { get; set; }
[field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientQuantity2 { get; set; }
[field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")]
public string IngredientIdx3 { get; set; }
[field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")]
public int IngredientQuantity3 { get; set; }
[BoxGroup("직접 추가하는 영역")]
[field: SerializeField, BoxGroup("직접 추가하는 영역")]
public Sprite Sprite { get; set; }
[BoxGroup("직접 추가하는 영역")]
[field: SerializeField, BoxGroup("직접 추가하는 영역")]
public Color Color { get; set; }
public List<Ingredient> GetValidIngredients()
{
var ingredients = new List<Ingredient>(3);
if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new Ingredient(IngredientIdx1, IngredientQuantity1));
if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new Ingredient(IngredientIdx2, IngredientQuantity2));
if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new Ingredient(IngredientIdx3, IngredientQuantity3));
return ingredients;
}
}
}

View File

@ -1,10 +0,0 @@
using UnityEngine;
namespace BlueWater.Items
{
[CreateAssetMenu(fileName = "DrinkDataTable", menuName = "ScriptableObjects/DrinkDataTable")]
public class DrinkDataSo : DataSo<DrinkData>
{
}
}

View File

@ -206,6 +206,8 @@ namespace BlueWater.Items
OnAcquired(); OnAcquired();
} }
public virtual void CancelInteraction() { }
public virtual bool CanInteraction() => true; public virtual bool CanInteraction() => true;
public void ShowInteractionUi() public void ShowInteractionUi()

View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using UnityEngine; using UnityEngine;
using UnityEngine.Serialization;
using Random = UnityEngine.Random; using Random = UnityEngine.Random;
namespace BlueWater.Items namespace BlueWater.Items
@ -28,9 +29,9 @@ namespace BlueWater.Items
private CocktailDataSo _cocktailDataSo; private CocktailDataSo _cocktailDataSo;
private Dictionary<string, CocktailData> _cocktailDatas; private Dictionary<string, CocktailData> _cocktailDatas;
[SerializeField, Required] [FormerlySerializedAs("_drinkDataSo")] [SerializeField, Required]
private DrinkDataSo _drinkDataSo; private LiquidDataSo liquidDataSo;
private Dictionary<string, DrinkData> _drinkDatas; private Dictionary<string, LiquidData> _liquidDatas;
[field: SerializeField, Required] [field: SerializeField, Required]
public ItemSlotDataSo ItemSlotDataSo { get; private set; } public ItemSlotDataSo ItemSlotDataSo { get; private set; }
@ -57,7 +58,7 @@ namespace BlueWater.Items
_itemDropTables = InitializeDictionary(_itemDropTableSo.ItemDropTables, table => table.CharacterData.CharacterIdx); _itemDropTables = InitializeDictionary(_itemDropTableSo.ItemDropTables, table => table.CharacterData.CharacterIdx);
_foodDatas = InitializeDictionary(_foodDataSo.Datas, data => data.Idx); _foodDatas = InitializeDictionary(_foodDataSo.Datas, data => data.Idx);
_cocktailDatas = InitializeDictionary(_cocktailDataSo.Datas, data => data.Idx); _cocktailDatas = InitializeDictionary(_cocktailDataSo.Datas, data => data.Idx);
_drinkDatas = InitializeDictionary(_drinkDataSo.Datas, data => data.Idx); _liquidDatas = InitializeDictionary(liquidDataSo.Datas, data => data.Idx);
} }
private Dictionary<string, T> InitializeDictionary<T>(List<T> dataList, Func<T, string> keySelector) private Dictionary<string, T> InitializeDictionary<T>(List<T> dataList, Func<T, string> keySelector)
@ -133,6 +134,7 @@ namespace BlueWater.Items
public FoodData GetFoodDataByIdx(string idx) => GetDataByIdx(_foodDatas, idx); public FoodData GetFoodDataByIdx(string idx) => GetDataByIdx(_foodDatas, idx);
public CocktailData GetCocktailDataByIdx(string idx) => GetDataByIdx(_cocktailDatas, idx); public CocktailData GetCocktailDataByIdx(string idx) => GetDataByIdx(_cocktailDatas, idx);
public DrinkData GetDrinkDataByIdx(string idx) => GetDataByIdx(_drinkDatas, idx); public Dictionary<string, CocktailData> GetCocktailDatas() => _cocktailDatas;
public LiquidData GetLiquidDataByIdx(string idx) => GetDataByIdx(_liquidDatas, idx);
} }
} }

View File

@ -1,9 +1,13 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using BlueWater.Items;
using BlueWater.Tycoons;
using DG.Tweening;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.Pool; using UnityEngine.Pool;
using UnityEngine.Serialization;
namespace BlueWater namespace BlueWater
{ {
@ -12,6 +16,9 @@ namespace BlueWater
#region Variables #region Variables
[Title("컴포넌트")] [Title("컴포넌트")]
[SerializeField]
private GameObject _liquidPanel;
[SerializeField] [SerializeField]
private Renderer _renderTexture; private Renderer _renderTexture;
@ -21,6 +28,9 @@ namespace BlueWater
[SerializeField] [SerializeField]
private Collider2D _reachedCollider; private Collider2D _reachedCollider;
[SerializeField]
private TMP_Text _amountText;
[Title("스폰 데이터")] [Title("스폰 데이터")]
[SerializeField, Required] [SerializeField, Required]
private Transform _spawnTransform; private Transform _spawnTransform;
@ -38,9 +48,6 @@ namespace BlueWater
[SerializeField, Required, Tooltip("액체 프리팹")] [SerializeField, Required, Tooltip("액체 프리팹")]
private Liquid _liquidObject; private Liquid _liquidObject;
[SerializeField, Tooltip("떨어지는 액체의 색상")]
private Color _liquidColor = new(1f, 0.8431373f, 0f, 1f);
[SerializeField, Tooltip("초당 생성되는 액체 수(ml)")] [SerializeField, Tooltip("초당 생성되는 액체 수(ml)")]
private int _liquidsPerSecond = 80; private int _liquidsPerSecond = 80;
@ -57,10 +64,20 @@ namespace BlueWater
[SerializeField, Tooltip("오브젝트 풀링 최대 개수")] [SerializeField, Tooltip("오브젝트 풀링 최대 개수")]
private int _objectPoolCount = 1000; private int _objectPoolCount = 1000;
[Title("패널")]
[SerializeField]
private float _moveDuration = 0.5f;
[Title("실시간 정보")]
[SerializeField]
private Barrel _currentBarrel;
private IObjectPool<Liquid> _objectPool; private IObjectPool<Liquid> _objectPool;
private List<Liquid> _activeLiquids = new(); private List<Liquid> _activeLiquids = new();
private Dictionary<Color, int> _colorCounts = new(); private Dictionary<LiquidData, int> _liquidDataCounts = new();
private Material _instanceMaterial; private Material _instanceMaterial;
private Tween _showTween;
private Tween _hideTween;
private bool _isPouring; private bool _isPouring;
private float _startTime = float.PositiveInfinity; private float _startTime = float.PositiveInfinity;
@ -84,39 +101,56 @@ namespace BlueWater
private void Awake() private void Awake()
{ {
_objectPool = new ObjectPool<Liquid>(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount); _objectPool = new ObjectPool<Liquid>(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount);
_hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).From(-249f).Pause()
.SetAutoKill(false);
_showTween = _liquidPanel.transform.DOMoveX(-249f, _moveDuration).From(-150f).Pause()
.SetAutoKill(false);
} }
private void Start() private void Start()
{ {
TycoonEvents.OnDrinkUiOpened += Initialize; TycoonEvents.OnLiquidRegionEntered += ShowPanel;
TycoonEvents.OnDrinkUiClosed += ReleaseAllObject; TycoonEvents.OnLiquidRegionExited += HidePanel;
_instanceMaterial = Instantiate(_liquidRenderer.material); _instanceMaterial = Instantiate(_liquidRenderer.material);
_liquidRenderer.material = _instanceMaterial; _liquidRenderer.material = _instanceMaterial;
_timeInterval = 1f / _liquidsPerSecond;
_instanceMaterial.SetFloat(_liquidAmountHash, 0f); _instanceMaterial.SetFloat(_liquidAmountHash, 0f);
_timeInterval = 1f / _liquidsPerSecond;
_instanceLiquidCount = 0;
SetCurrentAmount(0f);
} }
private void Update() private void Update()
{ {
if (_isPouring) if (_isPouring)
{ {
if (_instanceLiquidCount >= _maxLiquidCount) // 현재 술의 재고가 없을 때
if (!_currentBarrel.CanConsume(1))
{ {
InActiveIsPouring(); InActiveIsPouring();
return; return;
} }
// 술이 완성되었을 때
if (_instanceLiquidCount >= _maxLiquidCount)
{
CompleteLiquid();
return;
}
if (Time.time - _startTime >= _timeInterval) if (Time.time - _startTime >= _timeInterval)
{ {
_objectPool.Get(); _objectPool.Get();
if (!_colorCounts.TryAdd(_liquidColor, 1)) if (!_liquidDataCounts.TryAdd(_currentBarrel.GetLiquidData(), 1))
{ {
_colorCounts[_liquidColor] += 1; _liquidDataCounts[_currentBarrel.GetLiquidData()] += 1;
} }
_currentBarrel.Consume(1);
_startTime = Time.time; _startTime = Time.time;
} }
} }
@ -130,21 +164,8 @@ namespace BlueWater
private void OnDestroy() private void OnDestroy()
{ {
TycoonEvents.OnDrinkUiOpened -= Initialize; TycoonEvents.OnLiquidRegionEntered -= ShowPanel;
TycoonEvents.OnDrinkUiClosed -= ReleaseAllObject; TycoonEvents.OnLiquidRegionExited -= HidePanel;
}
#endregion
// Initialize methods
#region Initialize methods
public void Initialize()
{
_instanceLiquidCount = 0;
_currentLiquidAmount = 0f;
_currentMixedColor = _liquidColor;
_instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity);
} }
#endregion #endregion
@ -165,10 +186,11 @@ namespace BlueWater
liquid.transform.rotation = Quaternion.identity; liquid.transform.rotation = Quaternion.identity;
liquid.gameObject.SetActive(true); liquid.gameObject.SetActive(true);
_instanceLiquidCount++; _instanceLiquidCount++;
liquid.Initialize(this, _reachedCollider, _liquidColor, _pushDirection.normalized * _pushPower); var liquidColor = _currentBarrel.GetLiquidData().Color;
if (_renderTexture && _renderTexture.material.GetColor(_renderTextureColorHash) != _liquidColor) liquid.Initialize(this, _reachedCollider, liquidColor, _pushDirection.normalized * _pushPower);
if (_renderTexture && _renderTexture.material.GetColor(_renderTextureColorHash) != liquidColor)
{ {
_renderTexture.material.SetColor(_renderTextureColorHash, _liquidColor); _renderTexture.material.SetColor(_renderTextureColorHash, liquidColor);
} }
_activeLiquids.Add(liquid); _activeLiquids.Add(liquid);
} }
@ -190,9 +212,6 @@ namespace BlueWater
// Custom methods // Custom methods
#region Custom methods #region Custom methods
[Button("기본 색상")]
private void DefaultColor() => _liquidColor = new Color(1f, 0.8431373f, 0f, 1f);
/// <summary> /// <summary>
/// 술 제조 과정 초기화 함수 /// 술 제조 과정 초기화 함수
/// </summary> /// </summary>
@ -204,14 +223,29 @@ namespace BlueWater
_activeLiquids[i].Destroy(); _activeLiquids[i].Destroy();
} }
_colorCounts.Clear(); _liquidDataCounts.Clear();
_instanceLiquidCount = 0; _instanceLiquidCount = 0;
_currentLiquidAmount = 0f; SetCurrentAmount(0f);
_instanceMaterial.SetFloat(_liquidAmountHash, 0f); _instanceMaterial.SetFloat(_liquidAmountHash, 0f);
} }
/// <summary>
/// 현재 상호작용 중인 Barrel 연동
/// </summary>
/// <param name="barrel"></param>
public void SetBarrel(Barrel barrel)
{
_currentBarrel = barrel;
}
public void ActiveIsPouring() public void ActiveIsPouring()
{ {
if (_instanceLiquidCount == 0)
{
_currentMixedColor = _currentBarrel.GetLiquidData().Color;
_instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity);
}
_startTime = Time.time; _startTime = Time.time;
_isPouring = true; _isPouring = true;
} }
@ -221,18 +255,113 @@ namespace BlueWater
_isPouring = false; _isPouring = false;
} }
private void SetCurrentAmount(float value)
{
_currentLiquidAmount = value;
if (_amountText)
{
var percent = (int)(_currentLiquidAmount / _maxLiquidCount * 100);
_amountText.text = $"{percent}%";
}
else
{
if (_amountText.enabled)
{
_amountText.enabled = false;
}
}
}
/// <summary>
/// 술을 완성한 경우
/// </summary>
private void CompleteLiquid()
{
InActiveIsPouring();
// TODO : 완성된 음료를 데이터베이스와 비교하기
var currentCocktailIngredients = new List<CocktailIngredient>(5);
foreach (var element in _liquidDataCounts)
{
var idx = element.Key.Idx;
var amount = element.Value;
currentCocktailIngredients.Add(new CocktailIngredient(idx, amount));
}
// ItemManager를 통해 모든 CocktailData 가져오기
var cocktailDatas = ItemManager.Instance.GetCocktailDatas();
CocktailData matchingCocktail = null;
// 모든 칵테일 데이터를 순회하면서 조건에 맞는 칵테일 찾기
foreach (var cocktailData in cocktailDatas.Values)
{
var validIngredients = cocktailData.GetValidIngredients();
// 조건 1: 재료 개수 동일 체크
if (validIngredients.Count != currentCocktailIngredients.Count)
continue;
var allIngredientsMatch = true;
// 현재 음료 재료를 하나씩 validIngredients와 비교
foreach (var currentIngredient in currentCocktailIngredients)
{
// 동일한 Idx를 가진 재료가 있는지 찾음
var matchingValidIngredient = validIngredients.FirstOrDefault(ingredient => ingredient.Idx == currentIngredient.Idx);
// 만약 Idx가 일치하는 재료가 없으면 조건 불충족
if (matchingValidIngredient == null)
{
allIngredientsMatch = false;
break;
}
// 조건 2: Amount 값이 RatioRange에 따른 오차 범위 내에 있는지 체크
var validAmount = matchingValidIngredient.Amount;
//var maxLiquidCount = cocktailData.GetCocktailAmount(validIngredients);
var range = _maxLiquidCount / 100 * cocktailData.RatioRange;
var minAmount = validAmount - range;
var maxAmount = validAmount + range;
if (currentIngredient.Amount < minAmount || currentIngredient.Amount > maxAmount)
{
allIngredientsMatch = false;
break;
}
}
// 조건이 모두 만족하면 매칭되는 칵테일을 찾음
if (allIngredientsMatch)
{
matchingCocktail = cocktailData;
break;
}
}
// 조건에 만족하는 칵테일이 없음
if (matchingCocktail == null)
{
matchingCocktail = ItemManager.Instance.GetCocktailDataByIdx("Cocktail000");
}
Debug.Log($"{matchingCocktail.Idx} 음료 완성");
// TODO : 플레이어 이벤트를 통해 음료 들기
}
/// <summary> /// <summary>
/// 사용된 색상의 비율에 맞게 색을 혼합시키는 함수 /// 사용된 색상의 비율에 맞게 색을 혼합시키는 함수
/// </summary> /// </summary>
private Color MixColorsByTime() private Color MixColorsByTime()
{ {
var totalCounts = _colorCounts.Values.Sum(); var totalCounts = _liquidDataCounts.Values.Sum();
var mixedColor = Color.black; var mixedColor = Color.black;
foreach (var element in _colorCounts) foreach (var element in _liquidDataCounts)
{ {
var color = element.Key; var color = element.Key.Color;
var count = element.Value; var count = element.Value;
var ratio = count / (float)totalCounts; var ratio = count / (float)totalCounts;
@ -250,7 +379,7 @@ namespace BlueWater
public void OnLiquidReached() public void OnLiquidReached()
{ {
_liquidReachedTime = Time.time; _liquidReachedTime = Time.time;
_currentLiquidAmount++; SetCurrentAmount(++_currentLiquidAmount);
var liquidAmount = Mathf.Clamp(_currentLiquidAmount / _maxLiquidCount, 0f, 1f); var liquidAmount = Mathf.Clamp(_currentLiquidAmount / _maxLiquidCount, 0f, 1f);
_instanceMaterial.SetFloat(_liquidAmountHash, liquidAmount); _instanceMaterial.SetFloat(_liquidAmountHash, liquidAmount);
_targetColor = MixColorsByTime(); _targetColor = MixColorsByTime();
@ -261,8 +390,18 @@ namespace BlueWater
} }
} }
public void ShowPanel()
{
_hideTween.Pause();
_showTween.Restart();
}
public void HidePanel()
{
_showTween.Pause();
_hideTween.Restart();
}
#endregion #endregion
} }
} }

View File

@ -0,0 +1,17 @@
using UnityEngine;
namespace BlueWater
{
public class LiquidInteractionRegion : MonoBehaviour
{
private void OnTriggerEnter(Collider other)
{
TycoonEvents.OnLiquidRegionEntered?.Invoke();
}
private void OnTriggerExit(Collider other)
{
TycoonEvents.OnLiquidRegionExited?.Invoke();
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: f0f3dc568d0721b48ad5f24339d24951

View File

@ -1,4 +1,3 @@
using BlueWater.Uis;
using UnityEngine; using UnityEngine;
namespace BlueWater.Tycoons namespace BlueWater.Tycoons
@ -10,7 +9,7 @@ namespace BlueWater.Tycoons
public override void Interaction() public override void Interaction()
{ {
TycoonUiManager.Instance.DrinkUi.Open(TycoonUiManager.Instance.PopupUiList); // TycoonUiManager.Instance.BarUi.Open(TycoonUiManager.Instance.PopupUiList);
} }
public void ActiveIsPouring() public void ActiveIsPouring()

View File

@ -0,0 +1,72 @@
using BlueWater.Items;
using UnityEngine;
namespace BlueWater.Tycoons
{
public class Barrel : InteractionFurniture
{
[SerializeField]
private string _idx;
[SerializeField]
private LiquidData _liquidData;
[SerializeField]
private int _currentAmount;
private LiquidController _liquidController;
protected override void Awake()
{
base.Awake();
_liquidController = FindAnyObjectByType<LiquidController>();
_liquidData = ItemManager.Instance.GetLiquidDataByIdx(_idx);
_currentAmount = _liquidData.GetMaxAmount();
}
public override void Interaction()
{
_liquidController.SetBarrel(this);
_liquidController.ActiveIsPouring();
}
public override void CancelInteraction()
{
_liquidController.InActiveIsPouring();
}
/// <summary>
/// 1. 플레이어가 빈 잔을 들고 있거나 완성되지 않은 잔을 들고 있을 때
/// </summary>
public override bool CanInteraction()
{
return true;
}
public bool CanConsume(int amount)
{
return _currentAmount - amount > 0;
}
public void Consume(int amount)
{
if (_currentAmount == int.MaxValue)
{
return;
}
_currentAmount -= amount;
}
public bool TryConsume(int amount)
{
if (!CanConsume(amount)) return false;
Consume(amount);
return true;
}
public LiquidData GetLiquidData() => _liquidData;
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 2568fe8d4d702ed4698ed46b9c2ad25a

View File

@ -1,46 +1,47 @@
using BlueWater.Items; // using BlueWater.Items;
using BlueWater.Uis; // using BlueWater.Uis;
using UnityEngine; // using UnityEngine;
// using UnityEngine.Serialization;
namespace BlueWater.Tycoons //
{ // namespace BlueWater.Tycoons
public class Brewing : InteractionFurniture // {
{ // public class Brewing : InteractionFurniture
[SerializeField] // {
private DrinkCategory _category; // [SerializeField]
// private DrinkCategory _category;
[SerializeField] //
private DrinkData _currentDrinkData; // [FormerlySerializedAs("_currentDrinkData")] [SerializeField]
// private LiquidData currentLiquidData;
[SerializeField] //
private int _currentQuantity; // [SerializeField]
// private int _currentQuantity;
public override void Interaction() //
{ // public override void Interaction()
var brewingUi = TycoonUiManager.Instance.BrewingUi; // {
brewingUi.SetBrewing(this); // var brewingUi = TycoonUiManager.Instance.BrewingUi;
brewingUi.Open(TycoonUiManager.Instance.PopupUiList); // brewingUi.SetBrewing(this);
} // brewingUi.Open(TycoonUiManager.Instance.PopupUiList);
// }
public override bool CanInteraction() //
{ // public override bool CanInteraction()
return !IsOpened; // {
} // return !IsOpened;
// }
public void SetDrink(DrinkData drinkData) //
{ // public void SetDrink(LiquidData liquidData)
_currentDrinkData = drinkData; // {
_currentQuantity = _currentDrinkData.Amount; // currentLiquidData = liquidData;
} // _currentQuantity = currentLiquidData.Amount;
// }
public bool IsEmptyDrink() //
{ // public bool IsEmptyDrink()
return _currentDrinkData == null || _currentQuantity <= 0; // {
} // return currentLiquidData == null || _currentQuantity <= 0;
// }
public DrinkCategory GetDrinkCategory() //
{ // public DrinkCategory GetDrinkCategory()
return _category; // {
} // return _category;
} // }
} // }
// }

View File

@ -94,6 +94,8 @@ namespace BlueWater.Tycoons
public abstract void Interaction(); public abstract void Interaction();
public virtual void CancelInteraction() { }
public virtual bool CanInteraction() => true; public virtual bool CanInteraction() => true;
public virtual void ShowInteractionUi() public virtual void ShowInteractionUi()

View File

@ -13,143 +13,227 @@ MonoBehaviour:
m_Name: CocktailDataTable m_Name: CocktailDataTable
m_EditorClassIdentifier: m_EditorClassIdentifier:
<Datas>k__BackingField: <Datas>k__BackingField:
- <Idx>k__BackingField: Cocktail300 - <Idx>k__BackingField: Cocktail000
<Name>k__BackingField: "\uB2EC\uBE5B \uC0D8\uBB3C" <Name>k__BackingField: "\uC4F0\uB808\uAE30"
<RatioRange>k__BackingField: 0 <RatioRange>k__BackingField: 0
<IngredientIdx1>k__BackingField: Drink100 <IngredientIdx1>k__BackingField:
<IngredientRatio1>k__BackingField: 100 <IngredientAmount1>k__BackingField: 0
<IngredientIdx2>k__BackingField: <IngredientIdx2>k__BackingField:
<IngredientRatio2>k__BackingField: 0 <IngredientAmount2>k__BackingField: 0
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail301 - <Idx>k__BackingField: Cocktail001
<Name>k__BackingField: "\uB9DD\uB839 \uB9E5\uC8FC" <Name>k__BackingField: "\uCE75\uD14C\uC77CA"
<RatioRange>k__BackingField: 0 <RatioRange>k__BackingField: 0
<IngredientIdx1>k__BackingField: Drink101 <IngredientIdx1>k__BackingField: LiquidA
<IngredientRatio1>k__BackingField: 100 <IngredientAmount1>k__BackingField: 400
<IngredientIdx2>k__BackingField: <IngredientIdx2>k__BackingField:
<IngredientRatio2>k__BackingField: 0 <IngredientAmount2>k__BackingField: 0
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail302 - <Idx>k__BackingField: Cocktail002
<Name>k__BackingField: "\uAC80\uC740 \uC218\uC5FC" <Name>k__BackingField: "\uCE75\uD14C\uC77CB"
<RatioRange>k__BackingField: 0 <RatioRange>k__BackingField: 0
<IngredientIdx1>k__BackingField: Drink102 <IngredientIdx1>k__BackingField: LiquidB
<IngredientRatio1>k__BackingField: 100 <IngredientAmount1>k__BackingField: 400
<IngredientIdx2>k__BackingField: <IngredientIdx2>k__BackingField:
<IngredientRatio2>k__BackingField: 0 <IngredientAmount2>k__BackingField: 0
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail303 - <Idx>k__BackingField: Cocktail003
<Name>k__BackingField: "\uC6A9\uC554 \uB9E5\uC8FC" <Name>k__BackingField: "\uCE75\uD14C\uC77CC"
<RatioRange>k__BackingField: 0 <RatioRange>k__BackingField: 0
<IngredientIdx1>k__BackingField: Drink103 <IngredientIdx1>k__BackingField: LiquidC
<IngredientRatio1>k__BackingField: 100 <IngredientAmount1>k__BackingField: 400
<IngredientIdx2>k__BackingField: <IngredientIdx2>k__BackingField:
<IngredientRatio2>k__BackingField: 0 <IngredientAmount2>k__BackingField: 0
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail304 - <Idx>k__BackingField: Cocktail004
<Name>k__BackingField: "\uC8FD\uC74C\uC758 \uC774\uC2AC" <Name>k__BackingField: "\uCE75\uD14C\uC77CD"
<RatioRange>k__BackingField: 0 <RatioRange>k__BackingField: 0
<IngredientIdx1>k__BackingField: Drink104 <IngredientIdx1>k__BackingField: LiquidD
<IngredientRatio1>k__BackingField: 100 <IngredientAmount1>k__BackingField: 400
<IngredientIdx2>k__BackingField: <IngredientIdx2>k__BackingField:
<IngredientRatio2>k__BackingField: 0 <IngredientAmount2>k__BackingField: 0
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail305 - <Idx>k__BackingField: Cocktail005
<Name>k__BackingField: "\uC5BC\uC74C" <Name>k__BackingField: "\uCE75\uD14C\uC77CE"
<RatioRange>k__BackingField: 0 <RatioRange>k__BackingField: 0
<IngredientIdx1>k__BackingField: Ice200 <IngredientIdx1>k__BackingField: LiquidE
<IngredientRatio1>k__BackingField: 100 <IngredientAmount1>k__BackingField: 400
<IngredientIdx2>k__BackingField: <IngredientIdx2>k__BackingField:
<IngredientRatio2>k__BackingField: 0 <IngredientAmount2>k__BackingField: 0
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail306 - <Idx>k__BackingField: Cocktail006
<Name>k__BackingField: "\uC5BC\uC5B4\uBD99\uC740 \uB9DD\uB839" <Name>k__BackingField: "\uCE75\uD14C\uC77CAC"
<RatioRange>k__BackingField: 5
<IngredientIdx1>k__BackingField: LiquidA
<IngredientAmount1>k__BackingField: 200
<IngredientIdx2>k__BackingField: LiquidC
<IngredientAmount2>k__BackingField: 200
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail007
<Name>k__BackingField: "\uCE75\uD14C\uC77CBD"
<RatioRange>k__BackingField: 5
<IngredientIdx1>k__BackingField: LiquidB
<IngredientAmount1>k__BackingField: 200
<IngredientIdx2>k__BackingField: LiquidD
<IngredientAmount2>k__BackingField: 200
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail008
<Name>k__BackingField: "\uCE75\uD14C\uC77CCD"
<RatioRange>k__BackingField: 5
<IngredientIdx1>k__BackingField: LiquidC
<IngredientAmount1>k__BackingField: 200
<IngredientIdx2>k__BackingField: LiquidD
<IngredientAmount2>k__BackingField: 200
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail009
<Name>k__BackingField: "\uCE75\uD14C\uC77CABE"
<RatioRange>k__BackingField: 10 <RatioRange>k__BackingField: 10
<IngredientIdx1>k__BackingField: Drink101 <IngredientIdx1>k__BackingField: LiquidA
<IngredientRatio1>k__BackingField: 80 <IngredientAmount1>k__BackingField: 100
<IngredientIdx2>k__BackingField: Ice200 <IngredientIdx2>k__BackingField: LiquidB
<IngredientRatio2>k__BackingField: 20 <IngredientAmount2>k__BackingField: 100
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField: LiquidE
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 200
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail307 - <Idx>k__BackingField: Cocktail010
<Name>k__BackingField: "\uC2AC\uB77C\uC784 \uD480" <Name>k__BackingField: "\uCE75\uD14C\uC77CCDE"
<RatioRange>k__BackingField: 25
<IngredientIdx1>k__BackingField: Drink100
<IngredientRatio1>k__BackingField: 50
<IngredientIdx2>k__BackingField: Ice200
<IngredientRatio2>k__BackingField: 50
<IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail308
<Name>k__BackingField: "\uBD88\uD0C4 \uC218\uC5FC"
<RatioRange>k__BackingField: 10 <RatioRange>k__BackingField: 10
<IngredientIdx1>k__BackingField: Drink102 <IngredientIdx1>k__BackingField: LiquidC
<IngredientRatio1>k__BackingField: 20 <IngredientAmount1>k__BackingField: 100
<IngredientIdx2>k__BackingField: Drink103 <IngredientIdx2>k__BackingField: LiquidD
<IngredientRatio2>k__BackingField: 80 <IngredientAmount2>k__BackingField: 100
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField: LiquidE
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 200
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail309 - <Idx>k__BackingField: Cocktail011
<Name>k__BackingField: "\uB77C\uBC14 \uACE0\uC2A4\uD2B8" <Name>k__BackingField: "\uCE75\uD14C\uC77CB1"
<RatioRange>k__BackingField: 15 <RatioRange>k__BackingField: 10
<IngredientIdx1>k__BackingField: Drink101 <IngredientIdx1>k__BackingField: LiquidB
<IngredientRatio1>k__BackingField: 50 <IngredientAmount1>k__BackingField: 320
<IngredientIdx2>k__BackingField: Drink103 <IngredientIdx2>k__BackingField: Garnish1
<IngredientRatio2>k__BackingField: 50 <IngredientAmount2>k__BackingField: 80
<IngredientIdx3>k__BackingField: <IngredientIdx3>k__BackingField:
<IngredientRatio3>k__BackingField: 0 <IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField: <IngredientIdx4>k__BackingField:
<IngredientRatio4>k__BackingField: 0 <IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField: <IngredientIdx5>k__BackingField:
<IngredientRatio5>k__BackingField: 0 <IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail012
<Name>k__BackingField: "\uCE75\uD14C\uC77CD1"
<RatioRange>k__BackingField: 10
<IngredientIdx1>k__BackingField: LiquidD
<IngredientAmount1>k__BackingField: 320
<IngredientIdx2>k__BackingField: Garnish1
<IngredientAmount2>k__BackingField: 80
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail013
<Name>k__BackingField: "\uCE75\uD14C\uC77CA2"
<RatioRange>k__BackingField: 5
<IngredientIdx1>k__BackingField: LiquidA
<IngredientAmount1>k__BackingField: 360
<IngredientIdx2>k__BackingField: Garnish2
<IngredientAmount2>k__BackingField: 40
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail014
<Name>k__BackingField: "\uCE75\uD14C\uC77CC2"
<RatioRange>k__BackingField: 5
<IngredientIdx1>k__BackingField: LiquidC
<IngredientAmount1>k__BackingField: 360
<IngredientIdx2>k__BackingField: Garnish2
<IngredientAmount2>k__BackingField: 40
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Cocktail015
<Name>k__BackingField: "\uCE75\uD14C\uC77CE2"
<RatioRange>k__BackingField: 5
<IngredientIdx1>k__BackingField: LiquidE
<IngredientAmount1>k__BackingField: 360
<IngredientIdx2>k__BackingField: Garnish2
<IngredientAmount2>k__BackingField: 40
<IngredientIdx3>k__BackingField:
<IngredientAmount3>k__BackingField: 0
<IngredientIdx4>k__BackingField:
<IngredientAmount4>k__BackingField: 0
<IngredientIdx5>k__BackingField:
<IngredientAmount5>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}

View File

@ -1,111 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f91e197a0d142b40ae1ec8bd1300fb3, type: 3}
m_Name: DrinkDataTable
m_EditorClassIdentifier:
<Datas>k__BackingField:
- <Idx>k__BackingField: Drink100
<Name>k__BackingField: "\uB2EC\uBE5B \uC0D8\uBB3C"
<Category>k__BackingField: 1
<Amount>k__BackingField: 99999
<AlcoholVolume>k__BackingField: 0
<CoolWarm>k__BackingField: 10
<BitterSweet>k__BackingField: 0
<Scent>k__BackingField: 0
<IngredientIdx1>k__BackingField: 0
<IngredientQuantity1>k__BackingField: 0
<IngredientIdx2>k__BackingField: 0
<IngredientQuantity2>k__BackingField: 0
<IngredientIdx3>k__BackingField: 0
<IngredientQuantity3>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
- <Idx>k__BackingField: Drink101
<Name>k__BackingField: "\uB9DD\uB839 \uB9E5\uC8FC"
<Category>k__BackingField: 1
<Amount>k__BackingField: 2000
<AlcoholVolume>k__BackingField: 7
<CoolWarm>k__BackingField: -20
<BitterSweet>k__BackingField: -10
<Scent>k__BackingField: 0
<IngredientIdx1>k__BackingField: Item00
<IngredientQuantity1>k__BackingField: 2
<IngredientIdx2>k__BackingField: 0
<IngredientQuantity2>k__BackingField: 0
<IngredientIdx3>k__BackingField: 0
<IngredientQuantity3>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
- <Idx>k__BackingField: Drink102
<Name>k__BackingField: "\uAC80\uC740 \uC218\uC5FC \uB7FC"
<Category>k__BackingField: 1
<Amount>k__BackingField: 1200
<AlcoholVolume>k__BackingField: 20
<CoolWarm>k__BackingField: -30
<BitterSweet>k__BackingField: -15
<Scent>k__BackingField: 0
<IngredientIdx1>k__BackingField: Item01
<IngredientQuantity1>k__BackingField: 3
<IngredientIdx2>k__BackingField: Item00
<IngredientQuantity2>k__BackingField: 1
<IngredientIdx3>k__BackingField: 0
<IngredientQuantity3>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
- <Idx>k__BackingField: Drink103
<Name>k__BackingField: "\uC6A9\uC554 \uB9E5\uC8FC"
<Category>k__BackingField: 1
<Amount>k__BackingField: 2800
<AlcoholVolume>k__BackingField: 6
<CoolWarm>k__BackingField: 20
<BitterSweet>k__BackingField: 10
<Scent>k__BackingField: 0
<IngredientIdx1>k__BackingField: Item02
<IngredientQuantity1>k__BackingField: 1
<IngredientIdx2>k__BackingField: Item03
<IngredientQuantity2>k__BackingField: 3
<IngredientIdx3>k__BackingField: 0
<IngredientQuantity3>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
- <Idx>k__BackingField: Drink104
<Name>k__BackingField: "\uC8FD\uC74C\uC758 \uC774\uC2AC"
<Category>k__BackingField: 1
<Amount>k__BackingField: 800
<AlcoholVolume>k__BackingField: 30
<CoolWarm>k__BackingField: -25
<BitterSweet>k__BackingField: 20
<Scent>k__BackingField: 0
<IngredientIdx1>k__BackingField: Item04
<IngredientQuantity1>k__BackingField: 2
<IngredientIdx2>k__BackingField: 0
<IngredientQuantity2>k__BackingField: 0
<IngredientIdx3>k__BackingField: 0
<IngredientQuantity3>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
- <Idx>k__BackingField: Ice200
<Name>k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC870\uAC01"
<Category>k__BackingField: 2
<Amount>k__BackingField: 1000
<AlcoholVolume>k__BackingField: 0
<CoolWarm>k__BackingField: -20
<BitterSweet>k__BackingField: 0
<Scent>k__BackingField: 0
<IngredientIdx1>k__BackingField: Item05
<IngredientQuantity1>k__BackingField: 2
<IngredientIdx2>k__BackingField: 0
<IngredientQuantity2>k__BackingField: 0
<IngredientIdx3>k__BackingField: 0
<IngredientQuantity3>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}

View File

@ -553,7 +553,7 @@ MonoBehaviour:
<Description>k__BackingField: <Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0} <ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Item00 - <Idx>k__BackingField: Ingredient00
<Name>k__BackingField: "\uC800\uC8FC \uBC1B\uC740 \uBCF4\uB9AC" <Name>k__BackingField: "\uC800\uC8FC \uBC1B\uC740 \uBCF4\uB9AC"
<Type>k__BackingField: 1 <Type>k__BackingField: 1
<IngredientType>k__BackingField: 0 <IngredientType>k__BackingField: 0
@ -563,7 +563,7 @@ MonoBehaviour:
<Description>k__BackingField: <Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0} <ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Item01 - <Idx>k__BackingField: Ingredient01
<Name>k__BackingField: "\uC2EC\uC5F0\uC758 \uD574\uCD08" <Name>k__BackingField: "\uC2EC\uC5F0\uC758 \uD574\uCD08"
<Type>k__BackingField: 1 <Type>k__BackingField: 1
<IngredientType>k__BackingField: 0 <IngredientType>k__BackingField: 0
@ -573,7 +573,7 @@ MonoBehaviour:
<Description>k__BackingField: <Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0} <ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Item02 - <Idx>k__BackingField: Ingredient02
<Name>k__BackingField: "\uB3C4\uAE68\uBE44 \uBD88" <Name>k__BackingField: "\uB3C4\uAE68\uBE44 \uBD88"
<Type>k__BackingField: 1 <Type>k__BackingField: 1
<IngredientType>k__BackingField: 0 <IngredientType>k__BackingField: 0
@ -583,7 +583,7 @@ MonoBehaviour:
<Description>k__BackingField: <Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0} <ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Item03 - <Idx>k__BackingField: Ingredient03
<Name>k__BackingField: "\uC6A9\uC554 \uBCF4\uB9AC" <Name>k__BackingField: "\uC6A9\uC554 \uBCF4\uB9AC"
<Type>k__BackingField: 1 <Type>k__BackingField: 1
<IngredientType>k__BackingField: 0 <IngredientType>k__BackingField: 0
@ -593,7 +593,7 @@ MonoBehaviour:
<Description>k__BackingField: <Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0} <ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Item04 - <Idx>k__BackingField: Ingredient04
<Name>k__BackingField: "\uC601\uD63C\uC758 \uC548\uAC1C" <Name>k__BackingField: "\uC601\uD63C\uC758 \uC548\uAC1C"
<Type>k__BackingField: 1 <Type>k__BackingField: 1
<IngredientType>k__BackingField: 0 <IngredientType>k__BackingField: 0
@ -603,7 +603,7 @@ MonoBehaviour:
<Description>k__BackingField: <Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0} <Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0} <ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: Item05 - <Idx>k__BackingField: Ingredient05
<Name>k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC601\uD63C" <Name>k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC601\uD63C"
<Type>k__BackingField: 1 <Type>k__BackingField: 1
<IngredientType>k__BackingField: 0 <IngredientType>k__BackingField: 0

View File

@ -0,0 +1,50 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1f91e197a0d142b40ae1ec8bd1300fb3, type: 3}
m_Name: LiquidDataTable
m_EditorClassIdentifier:
<Datas>k__BackingField:
- <Idx>k__BackingField: Garnish1
<Name>k__BackingField: "\uAC00\uB098\uC26C1"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 1}
- <Idx>k__BackingField: Garnish2
<Name>k__BackingField: "\uAC00\uB098\uC26C2"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 0, a: 1}
- <Idx>k__BackingField: LiquidA
<Name>k__BackingField: "\uC220 \uC6D0\uC561A"
<Amount>k__BackingField: 99999
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 1, g: 0, b: 0, a: 1}
- <Idx>k__BackingField: LiquidB
<Name>k__BackingField: "\uC220 \uC6D0\uC561B"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1}
- <Idx>k__BackingField: LiquidC
<Name>k__BackingField: "\uC220 \uC6D0\uC561C"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 1, g: 1, b: 0, a: 1}
- <Idx>k__BackingField: LiquidD
<Name>k__BackingField: "\uC220 \uC6D0\uC561D"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 1, b: 0, a: 1}
- <Idx>k__BackingField: LiquidE
<Name>k__BackingField: "\uC220 \uC6D0\uC561E"
<Amount>k__BackingField: 2000
<Sprite>k__BackingField: {fileID: 0}
<Color>k__BackingField: {r: 0, g: 0, b: 1, a: 1}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 24a7d2ebd11ba314684a6d3ef72f76a0 guid: d912288eee347ea4b98718ff38ef5d78
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000

View File

@ -34,11 +34,11 @@ namespace BlueWater.Tycoons
{ {
if (DrinkRecipes.Contains(idx)) return; if (DrinkRecipes.Contains(idx)) return;
var drinkData = ItemManager.Instance.GetDrinkDataByIdx(idx); var drinkData = ItemManager.Instance.GetLiquidDataByIdx(idx);
if (drinkData == null) return; if (drinkData == null) return;
DrinkRecipes.Add(idx); DrinkRecipes.Add(idx);
TycoonEvents.OnDrinkRecipeAcquired?.Invoke(idx); //TycoonEvents.OnDrinkRecipeAcquired?.Invoke(idx);
} }
} }
} }

View File

@ -6,14 +6,12 @@ namespace BlueWater
public static class TycoonEvents public static class TycoonEvents
{ {
// 음료 // 음료
public static Action<string> OnDrinkRecipeAcquired; // public static Action<string> OnDrinkRecipeAcquired;
// public static Action<LiquidData> OnDrinkRecipeSelected;
public static Action OnBrewingUiOpened; public static Action OnLiquidRegionEntered;
public static Action OnBrewingUiClosed; public static Action OnLiquidRegionExited;
public static Action<DrinkData> OnDrinkRecipeSelected;
public static Action OnDrinkUiOpened;
public static Action OnDrinkUiClosed;
// 요리 // 요리

View File

@ -1,188 +1,189 @@
using System.Collections.Generic; // using System.Collections.Generic;
using BlueWater.Items; // using BlueWater.Items;
using BlueWater.Tycoons; // using BlueWater.Tycoons;
using Sirenix.OdinInspector; // using Sirenix.OdinInspector;
using TMPro; // using TMPro;
using UnityEngine; // using UnityEngine;
using UnityEngine.UI; // using UnityEngine.Serialization;
// using UnityEngine.UI;
namespace BlueWater.Uis //
{ // namespace BlueWater.Uis
public class BrewingUi : SwitchActionPopupUi // {
{ // public class BrewingUi : SwitchActionPopupUi
[SerializeField, Required] // {
private DrinkRecipeSlotUi _drinkRecipeSlotUiPrefab; // [FormerlySerializedAs("_drinkRecipeSlotUiPrefab")] [SerializeField, Required]
// private LiquidRecipeSlotUi liquidRecipeSlotUiPrefab;
[SerializeField, Required] //
private Transform _drinkRecipeSpawnLocation; // [SerializeField, Required]
// private Transform _drinkRecipeSpawnLocation;
[SerializeField] //
private TMP_Text _recipeName; // [SerializeField]
// private TMP_Text _recipeName;
[SerializeField] //
private Image _drinkImage; // [SerializeField]
// private Image _drinkImage;
[SerializeField] //
private Button _convertButton; // [SerializeField]
// private Button _convertButton;
[Title("실시간 데이터")] //
[SerializeField] // [Title("실시간 데이터")]
private List<BrewingIngredientSlotUi> _brewingIngredientSlotUis = new(3); // [SerializeField]
// private List<BrewingIngredientSlotUi> _brewingIngredientSlotUis = new(3);
[SerializeField] //
private DrinkData _selectedDrinkData; // [FormerlySerializedAs("_selectedDrinkData")] [SerializeField]
// private LiquidData selectedLiquidData;
[SerializeField] //
private Brewing _currentBrewing; // [SerializeField]
// private Brewing _currentBrewing;
private List<DrinkRecipeSlotUi> _drinkRecipeSlotUis = new(); //
// private List<LiquidRecipeSlotUi> _drinkRecipeSlotUis = new();
private void Start() //
{ // private void Start()
Initialize(); // {
// Initialize();
TycoonEvents.OnDrinkRecipeAcquired += AddDrinkRecipe; //
TycoonEvents.OnDrinkRecipeSelected += SelectDrinkRecipe; // TycoonEvents.OnDrinkRecipeAcquired += AddDrinkRecipe;
} // TycoonEvents.OnDrinkRecipeSelected += SelectDrinkRecipe;
// }
private void OnDestroy() //
{ // private void OnDestroy()
TycoonEvents.OnDrinkRecipeAcquired -= AddDrinkRecipe; // {
TycoonEvents.OnDrinkRecipeSelected -= SelectDrinkRecipe; // TycoonEvents.OnDrinkRecipeAcquired -= AddDrinkRecipe;
} // TycoonEvents.OnDrinkRecipeSelected -= SelectDrinkRecipe;
// }
private void Initialize() //
{ // private void Initialize()
foreach (Transform element in _drinkRecipeSpawnLocation) // {
{ // foreach (Transform element in _drinkRecipeSpawnLocation)
Destroy(element.gameObject); // {
} // Destroy(element.gameObject);
// }
var drinkRecipes = DataManager.Instance.TycoonData.DrinkRecipes; //
foreach (var element in drinkRecipes) // var drinkRecipes = DataManager.Instance.TycoonData.DrinkRecipes;
{ // foreach (var element in drinkRecipes)
AddDrinkRecipe(element); // {
} // AddDrinkRecipe(element);
} // }
// }
public override void Open(List<PopupUi> popupUiList) //
{ // public override void Open(List<PopupUi> popupUiList)
base.Open(popupUiList); // {
// base.Open(popupUiList);
ResetBrewingUi(); //
TycoonEvents.OnBrewingUiOpened?.Invoke(); // ResetBrewingUi();
} // TycoonEvents.OnBrewingUiOpened?.Invoke();
// }
public override void Close() //
{ // public override void Close()
base.Close(); // {
// base.Close();
_currentBrewing = null; //
ResetBrewingUi(); // _currentBrewing = null;
TycoonEvents.OnBrewingUiClosed?.Invoke(); // ResetBrewingUi();
} // TycoonEvents.OnBrewingUiClosed?.Invoke();
// }
private void ResetBrewingUi() //
{ // private void ResetBrewingUi()
_selectedDrinkData = null; // {
_recipeName.text = null; // selectedLiquidData = null;
_drinkImage.enabled = false; // _recipeName.text = null;
SetBrewingIngredient(); // _drinkImage.enabled = false;
foreach (var element in _brewingIngredientSlotUis) // SetBrewingIngredient();
{ // foreach (var element in _brewingIngredientSlotUis)
element.gameObject.SetActive(false); // {
} // element.gameObject.SetActive(false);
} // }
// }
public void SetBrewing(Brewing brewing) //
{ // public void SetBrewing(Brewing brewing)
_currentBrewing = brewing; // {
ShowDrinkRecipeByCategory(); // _currentBrewing = brewing;
} // ShowDrinkRecipeByCategory();
// }
private void AddDrinkRecipe(string idx) //
{ // private void AddDrinkRecipe(string idx)
var instance = Instantiate(_drinkRecipeSlotUiPrefab, _drinkRecipeSpawnLocation); // {
instance.Initialize(idx); // var instance = Instantiate(liquidRecipeSlotUiPrefab, _drinkRecipeSpawnLocation);
_drinkRecipeSlotUis.Add(instance); // instance.Initialize(idx);
} // _drinkRecipeSlotUis.Add(instance);
// }
private void ShowDrinkRecipeByCategory() //
{ // private void ShowDrinkRecipeByCategory()
var currentDrinkCategory = _currentBrewing.GetDrinkCategory(); // {
foreach (var element in _drinkRecipeSlotUis) // var currentDrinkCategory = _currentBrewing.GetDrinkCategory();
{ // foreach (var element in _drinkRecipeSlotUis)
element.gameObject.SetActive(currentDrinkCategory == element.GetDrinkData().Category); // {
} // element.gameObject.SetActive(currentDrinkCategory == element.GetDrinkData().Category);
} // }
// }
public void SelectDrinkRecipe(DrinkData drinkData) //
{ // public void SelectDrinkRecipe(LiquidData liquidData)
_selectedDrinkData = drinkData; // {
// selectedLiquidData = liquidData;
_recipeName.text = _selectedDrinkData.Name; //
_drinkImage.sprite = drinkData.Sprite; // _recipeName.text = selectedLiquidData.Name;
_drinkImage.enabled = true; // _drinkImage.sprite = liquidData.Sprite;
// _drinkImage.enabled = true;
var ingredients = _selectedDrinkData.GetValidIngredients(); //
for (var i = 0; i < 3; i++) // var ingredients = selectedLiquidData.GetValidIngredients();
{ // for (var i = 0; i < 3; i++)
if (ingredients.Count > i) // {
{ // if (ingredients.Count > i)
_brewingIngredientSlotUis[i].SetIngredient(ingredients[i].Idx, ingredients[i].Quantity); // {
_brewingIngredientSlotUis[i].gameObject.SetActive(true); // _brewingIngredientSlotUis[i].SetIngredient(ingredients[i].Idx, ingredients[i].Quantity);
} // _brewingIngredientSlotUis[i].gameObject.SetActive(true);
else // }
{ // else
_brewingIngredientSlotUis[i].gameObject.SetActive(false); // {
} // _brewingIngredientSlotUis[i].gameObject.SetActive(false);
} // }
// }
SetBrewingIngredient(); //
} // SetBrewingIngredient();
// }
private void SetBrewingIngredient() //
{ // private void SetBrewingIngredient()
foreach (var element in _brewingIngredientSlotUis) // {
{ // foreach (var element in _brewingIngredientSlotUis)
element.SetQuantity(); // {
} // element.SetQuantity();
// }
CheckConvertButton(); //
} // CheckConvertButton();
// }
private void CheckConvertButton() //
{ // private void CheckConvertButton()
if (_selectedDrinkData == null || !_currentBrewing.IsEmptyDrink()) // {
{ // if (selectedLiquidData == null || !_currentBrewing.IsEmptyDrink())
_convertButton.interactable = false; // {
return; // _convertButton.interactable = false;
} // return;
// }
var ingredients = _selectedDrinkData.GetValidIngredients(); //
if (ingredients.Count <= 0) // var ingredients = selectedLiquidData.GetValidIngredients();
{ // if (ingredients.Count <= 0)
_convertButton.interactable = false; // {
return; // _convertButton.interactable = false;
} // return;
// }
for (var i = 0; i < ingredients.Count; i++) //
{ // for (var i = 0; i < ingredients.Count; i++)
if (_brewingIngredientSlotUis[i].GetIsEnough()) continue; // {
// if (_brewingIngredientSlotUis[i].GetIsEnough()) continue;
_convertButton.interactable = false; //
return; // _convertButton.interactable = false;
} // return;
// }
_convertButton.interactable = true; //
} // _convertButton.interactable = true;
// }
/// <summary> //
/// 술을 만들 때 최종 버튼 // /// <summary>
/// </summary> // /// 술을 만들 때 최종 버튼
public void ConvertButton() // /// </summary>
{ // public void ConvertButton()
_currentBrewing.SetDrink(_selectedDrinkData); // {
} // _currentBrewing.SetDrink(selectedLiquidData);
} // }
} // }
// }

View File

@ -0,0 +1,62 @@
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.UI;
namespace BlueWater
{
public class CenterSlider : MonoBehaviour
{
[SerializeField]
private RectTransform _fillRect;
[SerializeField]
private Image _fill;
[SerializeField]
private RectTransform _handleRect;
[SerializeField]
private float _minValue;
[SerializeField]
private float _maxValue = 1f;
[SerializeField]
private float _value;
[SerializeField]
private Color _minColor = Color.white;
[SerializeField]
private Color _maxColor = Color.white;
private readonly float _centerAnchorX = 0.5f;
private void Start()
{
SetValue(_value);
}
private void UpdateSlider(float value)
{
// 0 ~ 1값
var normalizedValue = (value - _minValue) / (_maxValue - _minValue);
_fill.color = normalizedValue < 0.5f ? _minColor : _maxColor;
_handleRect.anchorMin = new Vector2(normalizedValue, 0f);
_handleRect.anchorMax = new Vector2(normalizedValue, 1f);
_fillRect.anchorMin = new Vector2(Mathf.Clamp(_handleRect.anchorMin.x, 0, _centerAnchorX), 0);
_fillRect.anchorMax = new Vector2(Mathf.Clamp(_handleRect.anchorMin.x, _centerAnchorX, 1), 1);
}
[Button("값 추가")]
public void SetValue(float value)
{
var newValue = Mathf.Clamp(value, _minValue, _maxValue);
_value = newValue;
UpdateSlider(_value);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: d0b242c6d3d747f48ab34ff4e8485aaf

View File

@ -0,0 +1,56 @@
using Sirenix.OdinInspector;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
namespace BlueWater.Uis
{
public class CocktailStatusUi : MonoBehaviour
{
[Title("알코올")]
[SerializeField]
private Slider _alcoholSlider;
[SerializeField]
private TMP_Text _alcoholText;
[Title("온도")]
[SerializeField]
private CenterSlider _temperatureSlider;
[SerializeField]
private TMP_Text _temperatureText;
[Title("맛")]
[SerializeField]
private CenterSlider _bitterSweetSlider;
[SerializeField]
private TMP_Text _bitterSweetText;
[Title("향")]
[SerializeField]
private Slider _scentSlider;
[SerializeField]
private TMP_Text _scentText;
private const string AlcoholUnitText = "(alc)";
public void ResetCocktailStatus()
{
_alcoholSlider.value = 0f;
_temperatureSlider.SetValue(0f);
_bitterSweetSlider.SetValue(0f);
_scentSlider.value = 0f;
}
public void SetCocktailStatus(float alcohol, float temperature, float bitterSweet, float scent)
{
_alcoholSlider.value = alcohol;
_temperatureSlider.SetValue(temperature);
_bitterSweetSlider.SetValue(bitterSweet);
_scentSlider.value = scent;
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: f6deeba2587097647a0eeb3e8436bd9d

View File

@ -1,9 +0,0 @@
using UnityEngine;
namespace BlueWater.Uis
{
public class DrinkIngredientUi : MonoBehaviour
{
}
}

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 63ce83525ba260f46904cfce776fc892

View File

@ -1,23 +0,0 @@
using System.Collections.Generic;
namespace BlueWater.Uis
{
public class DrinkUi : SwitchActionPopupUi
{
public override void Open(List<PopupUi> popupUiList)
{
base.Open(popupUiList);
TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Bar);
TycoonEvents.OnDrinkUiOpened?.Invoke();
}
public override void Close()
{
base.Close();
TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Base);
TycoonEvents.OnDrinkUiClosed?.Invoke();
}
}
}

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 1e18fddab7a69284394b8b5bad8d1dbe

View File

@ -1,12 +1,13 @@
using System; using System;
using BlueWater.Items; using BlueWater.Items;
using UnityEngine; using UnityEngine;
using UnityEngine.Serialization;
using UnityEngine.UI; using UnityEngine.UI;
namespace BlueWater.Uis namespace BlueWater.Uis
{ {
[Serializable] [Serializable]
public class DrinkRecipeSlotUi : MonoBehaviour public class LiquidRecipeSlotUi : MonoBehaviour
{ {
[SerializeField] [SerializeField]
private Button _button; private Button _button;
@ -14,8 +15,8 @@ namespace BlueWater.Uis
[SerializeField] [SerializeField]
private Image _image; private Image _image;
[SerializeField] [FormerlySerializedAs("_drinkData")] [SerializeField]
private DrinkData _drinkData; private LiquidData liquidData;
private void Awake() private void Awake()
{ {
@ -24,15 +25,15 @@ namespace BlueWater.Uis
public void Initialize(string idx) public void Initialize(string idx)
{ {
_drinkData = ItemManager.Instance.GetDrinkDataByIdx(idx); liquidData = ItemManager.Instance.GetLiquidDataByIdx(idx);
_image.sprite = _drinkData.Sprite; _image.sprite = liquidData.Sprite;
} }
public void OnButtonClick() public void OnButtonClick()
{ {
TycoonEvents.OnDrinkRecipeSelected?.Invoke(_drinkData); //TycoonEvents.OnDrinkRecipeSelected?.Invoke(liquidData);
} }
public DrinkData GetDrinkData() => _drinkData; public LiquidData GetDrinkData() => liquidData;
} }
} }

View File

@ -6,16 +6,16 @@ using UnityEngine.UI;
namespace BlueWater.Uis namespace BlueWater.Uis
{ {
[Serializable] [Serializable]
public class DrinkIngredientSlotUi : MonoBehaviour public class LiquidSlotUi : MonoBehaviour
{ {
[SerializeField] [SerializeField]
private Button _button; private Button _button;
[SerializeField] [SerializeField]
private Image _image; private Image _fill;
[SerializeField] [SerializeField]
private TMP_Text _amount; private Image _image;
[SerializeField] [SerializeField]
private TMP_Text _name; private TMP_Text _name;

View File

@ -27,11 +27,8 @@ namespace BlueWater.Uis
[field: SerializeField] [field: SerializeField]
public TycoonStageUi TycoonStageUi { get; private set; } public TycoonStageUi TycoonStageUi { get; private set; }
[field: SerializeField] // [field: SerializeField]
public BrewingUi BrewingUi { get; private set; } // public BrewingUi BrewingUi { get; private set; }
[field: SerializeField]
public DrinkUi DrinkUi { get; private set; }
[SerializeField] [SerializeField]
private Image _fadeImage; private Image _fadeImage;
@ -83,8 +80,7 @@ namespace BlueWater.Uis
TycoonUpgradeUi = GetComponentInChildren<TycoonUpgradeUi>(true); TycoonUpgradeUi = GetComponentInChildren<TycoonUpgradeUi>(true);
TycoonManagementUi = GetComponentInChildren<TycoonManagementUi>(true); TycoonManagementUi = GetComponentInChildren<TycoonManagementUi>(true);
TycoonStageUi = GetComponentInChildren<TycoonStageUi>(true); TycoonStageUi = GetComponentInChildren<TycoonStageUi>(true);
BrewingUi = GetComponentInChildren<BrewingUi>(true); //BrewingUi = GetComponentInChildren<BrewingUi>(true);
DrinkUi = GetComponentInChildren<DrinkUi>(true);
_fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>(); _fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>();
PopupUiList = new List<PopupUi>(8); PopupUiList = new List<PopupUi>(8);
} }

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 4385ca50e81933c49aa259987339b498
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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.

After

Width:  |  Height:  |  Size: 56 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 36d530736d9579c418ddafc987341443
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 9e508ffd6f8853c4c8b20b63ad90622d
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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.

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 9f7d82fbc664fbb4d98842fc46db319d
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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:

View File

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: f91087f473887fc43bd9641a69852f3c
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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.

After

Width:  |  Height:  |  Size: 60 KiB

View File

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

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 06a2c6aed62612e41ad12d29e64f669e
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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.

After

Width:  |  Height:  |  Size: 49 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 3c873d1f63abbb8459c91a67c6e48712
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: 512
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.

After

Width:  |  Height:  |  Size: 124 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 3efc550bddc68a345b5400a832fb9a6a
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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.

After

Width:  |  Height:  |  Size: 191 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: cda1d961a563b6143a024170ed6f0f44
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: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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: 23 KiB

View File

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

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b57f93005908a754bb842b7dbcaddedd guid: 06a07650d842ee94390ca2505955e94d
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
@ -46,7 +46,7 @@ TextureImporter:
spriteMode: 1 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 7 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 19df9fcd0ddf5754890f7ea9c127b905
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: 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.

After

Width:  |  Height:  |  Size: 14 KiB

View File

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

After

Width:  |  Height:  |  Size: 30 KiB

View File

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

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 006a36cba2a146247a1d25b9e246faaa
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: 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.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 31d7e535d499d5f43ab64731acc3eec3
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: 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.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 997d0aea13894a9428bf9d9f7fb66762
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: 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.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,143 @@
fileFormatVersion: 2
guid: 3d04bfa220b9ebe40a4ae3f0a68c0911
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: 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.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

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

View File

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

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