diff --git a/Assets/01.Scenes/01.Tycoon_1.unity b/Assets/01.Scenes/01.Tycoon_1.unity index 7968a8bb1..67ea7abcb 100644 --- a/Assets/01.Scenes/01.Tycoon_1.unity +++ b/Assets/01.Scenes/01.Tycoon_1.unity @@ -10827,7 +10827,6 @@ RectTransform: - {fileID: 1909799357} - {fileID: 587277061} - {fileID: 2055805161} - - {fileID: 1728221817} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 40.052, y: -1.303, z: -0.86} m_AnchorMin: {x: 0, y: 0} @@ -18667,7 +18666,21 @@ MonoBehaviour: _persistent: 0 k__BackingField: {fileID: 1665075870} k__BackingField: {fileID: 1665075872} + k__BackingField: {fileID: 0} _dailyBgm: TycoonDailyBgm1 + k__BackingField: + _maxPlayerHealth: 0 + _currentPlayerHealth: 0 + _playerMoveSpeedMultiplier: 0 + _currentExp: 0 + _currentGold: 0 + _currentLiquidAmountA: 0 + _currentLiquidAmountB: 0 + _currentLiquidAmountC: 0 + _currentLiquidAmountD: 0 + _currentLiquidAmountE: 0 + _currentGarnishAmount1: 0 + _currentGarnishAmount2: 0 k__BackingField: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2} k__BackingField: {fileID: 11400000, guid: 4607b374e49ab734da548949f9e10fed, type: 2} --- !u!114 &1665075870 @@ -19341,108 +19354,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723000583} m_CullTransparentMesh: 1 ---- !u!1001 &1728221816 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1049919592} - m_Modifications: - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_SizeDelta.x - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_SizeDelta.y - value: 800 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalRotation.w - value: -0.00000004371139 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalRotation.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -180 - objectReference: {fileID: 0} - - target: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7279465393450390489, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - propertyPath: m_Name - value: Card - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cf200ba34deabdb41847ac49e53704be, type: 3} ---- !u!224 &1728221817 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3945043186252027743, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - m_PrefabInstance: {fileID: 1728221816} - m_PrefabAsset: {fileID: 0} --- !u!1 &1730879242 GameObject: m_ObjectHideFlags: 0 @@ -24222,9 +24133,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3dd7358ce993836479029d580437bb79, type: 3} m_Name: m_EditorClassIdentifier: - card01: {fileID: 7279465393450390489, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - card02: {fileID: 7279465393450390489, guid: cf200ba34deabdb41847ac49e53704be, type: 3} - card03: {fileID: 7279465393450390489, guid: cf200ba34deabdb41847ac49e53704be, type: 3} + card01: {fileID: 7064336336293747033, guid: cf200ba34deabdb41847ac49e53704be, type: 3} + card02: {fileID: 7064336336293747033, guid: cf200ba34deabdb41847ac49e53704be, type: 3} + card03: {fileID: 7064336336293747033, guid: cf200ba34deabdb41847ac49e53704be, type: 3} --- !u!1 &2048187805 GameObject: m_ObjectHideFlags: 0 @@ -27160,11 +27071,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} ---- !u!4 &7827484746149782378 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4353418070280708860, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8086743652407108747 PrefabInstance: m_ObjectHideFlags: 0 @@ -27365,7 +27271,7 @@ PrefabInstance: - target: {fileID: 6526493802215800102, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} propertyPath: _targetTransform value: - objectReference: {fileID: 7827484746149782378} + objectReference: {fileID: 0} - target: {fileID: 6957473214045006851, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} propertyPath: m_Camera value: diff --git a/Assets/02.Scripts/Item/DataSo.cs b/Assets/02.Scripts/Item/DataSo.cs index 4e560aa01..024c85d00 100644 --- a/Assets/02.Scripts/Item/DataSo.cs +++ b/Assets/02.Scripts/Item/DataSo.cs @@ -8,9 +8,9 @@ namespace BlueWater.Items public class DataSo : ScriptableObject, IDataContainer { [SerializeField] - private List> _serializedDataList = new(); + protected List> _serializedDataList = new(); - private Dictionary _datas; + protected Dictionary _datas; private void OnEnable() { diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index 054e09f35..b4ea161e5 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -20,6 +20,7 @@ MonoBehaviour: k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uCD94\uAC00" k__BackingField: 10 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: d0b6eba4ac33ece44bccd11e57e415e8, type: 3} - k__BackingField: HeartHeal k__BackingField: k__BackingField: HeartHeal @@ -27,6 +28,7 @@ MonoBehaviour: k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uD68C\uBCF5" k__BackingField: 10 k__BackingField: 10 + k__BackingField: {fileID: 21300000, guid: 466393baecf741d449a05f3b63317368, type: 3} - k__BackingField: HeartAllHeal k__BackingField: k__BackingField: HeartAllHeal @@ -34,6 +36,7 @@ MonoBehaviour: k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 7579ee4fd1c5ed34d939eeef18c625be, type: 3} - k__BackingField: AddLiquidB k__BackingField: k__BackingField: AddLiquidB @@ -41,6 +44,7 @@ MonoBehaviour: k__BackingField: "B \uC220\uC744 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: b1b88ceef90370a4295ed9f58140349a, type: 3} - k__BackingField: AddLiquidC k__BackingField: k__BackingField: AddLiquidC @@ -48,6 +52,7 @@ MonoBehaviour: k__BackingField: "C \uC220\uC744 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: d9dbcf5d304083541a40ff4b3cb9048f, type: 3} - k__BackingField: AddLiquidD k__BackingField: k__BackingField: AddLiquidD @@ -55,6 +60,7 @@ MonoBehaviour: k__BackingField: "D \uC220\uC744 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: -667892039, guid: 45e4676179dde7e42bb09b8d94935f34, type: 3} - k__BackingField: AddLiquidE k__BackingField: k__BackingField: AddLiquidE @@ -62,6 +68,7 @@ MonoBehaviour: k__BackingField: "E \uC220\uC744 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 58964556f1712324b9d9ac4515f965aa, type: 3} - k__BackingField: AddGarnish1 k__BackingField: k__BackingField: AddGarnish1 @@ -69,6 +76,7 @@ MonoBehaviour: k__BackingField: "1\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 4708f67b3712d4743af7cb6092edf3c7, type: 3} - k__BackingField: AddGarnish2 k__BackingField: k__BackingField: AddGarnish2 @@ -76,6 +84,7 @@ MonoBehaviour: k__BackingField: "2\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 70238c4151e9085429d18be7f6f8a2ae, type: 3} - k__BackingField: AddAllLiquid k__BackingField: k__BackingField: AddAllLiquid @@ -83,6 +92,7 @@ MonoBehaviour: k__BackingField: "\uC804\uCCB4 \uC7AC\uB8CC 1000ml \uCD94\uAC00" k__BackingField: 0 k__BackingField: 10 + k__BackingField: {fileID: -254146654, guid: 284734c4624b35b499152e028f90e6f6, type: 3} - k__BackingField: ServerNpc k__BackingField: k__BackingField: ServerNpc @@ -90,6 +100,7 @@ MonoBehaviour: k__BackingField: "\uC11C\uBE59 \uC885\uC5C5\uC6D0 \uCD94\uAC00" k__BackingField: 5 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} - k__BackingField: CleanerNpc k__BackingField: k__BackingField: CleanerNpc @@ -97,6 +108,7 @@ MonoBehaviour: k__BackingField: "\uCCAD\uC18C \uC885\uC5C5\uC6D0 \uCD94\uAC00" k__BackingField: 5 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} - k__BackingField: ChefNpc k__BackingField: k__BackingField: ChefNpc @@ -104,6 +116,7 @@ MonoBehaviour: k__BackingField: "\uBC14\uD150\uD130 \uC885\uC5C5\uC6D0 \uCD94\uAC00" k__BackingField: 5 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 02ff51bea8718c447bea8470257b6782, type: 3} - k__BackingField: SpeedUp k__BackingField: k__BackingField: SpeedUp @@ -112,6 +125,7 @@ MonoBehaviour: 5% \uC99D\uAC00" k__BackingField: 10 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 1acb09a93fb040241a17107a288d6f54, type: 3} - k__BackingField: ExpGetUp k__BackingField: k__BackingField: ExpGetUp @@ -119,6 +133,7 @@ MonoBehaviour: k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD 5% \uC99D\uAC00" k__BackingField: 10 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 400a47b8bcd0a1e4b823160ce9f40232, type: 3} - k__BackingField: GoldGetUp k__BackingField: k__BackingField: GoldGetUp @@ -126,6 +141,7 @@ MonoBehaviour: k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 5% \uC99D\uAC00" k__BackingField: 10 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 121ed7da4e55d2a43ba798a00f95a474, type: 3} - k__BackingField: CleanUp k__BackingField: k__BackingField: CleanUp @@ -133,6 +149,7 @@ MonoBehaviour: k__BackingField: "\uB808\uC2A4\uD1A0\uB791 \uD55C\uBC88\uC5D0 \uCCAD\uC18C" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 1acb09a93fb040241a17107a288d6f54, type: 3} - k__BackingField: GuageReset k__BackingField: k__BackingField: GuageReset @@ -141,3 +158,4 @@ MonoBehaviour: \uCD08\uAE30\uD654" k__BackingField: 0 k__BackingField: 5 + k__BackingField: {fileID: 21300000, guid: 74feb2405992b004f9937758b66f9668, type: 3} diff --git a/Assets/02.Scripts/Tycoon/CardData.cs b/Assets/02.Scripts/Tycoon/CardData.cs index 86dd8ed5f..aaa8ac81c 100644 --- a/Assets/02.Scripts/Tycoon/CardData.cs +++ b/Assets/02.Scripts/Tycoon/CardData.cs @@ -25,5 +25,10 @@ namespace BlueWater [field: SerializeField, Tooltip("비율(%)"), BoxGroup("Json 데이터 영역")] public int Ratio { get; set; } + + [BoxGroup("직접 추가하는 영역")] + [field: SerializeField, BoxGroup("직접 추가하는 영역")] + public Sprite Sprite { get; set; } + } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/CardDataSo.cs b/Assets/02.Scripts/Tycoon/CardDataSo.cs index cbabf5a03..5fa9886a7 100644 --- a/Assets/02.Scripts/Tycoon/CardDataSo.cs +++ b/Assets/02.Scripts/Tycoon/CardDataSo.cs @@ -1,11 +1,47 @@ +using System.Collections.Generic; using BlueWater.Items; using UnityEngine; + namespace BlueWater { [CreateAssetMenu(fileName = "CardTable", menuName = "ScriptableObjects/CardTable")] + public class CardDataSo : DataSo { + private Dictionary _selectedCard = new Dictionary(); // 선택된 카드를 저장함. + + public CardData GetRandCardData() + { + var rand = Random.Range(0, 100); // 범위를 0-100으로 조정 + var checkAdd = 0; + foreach (var element in _datas.Values) + { + checkAdd += element.Ratio; // Ratio를 더하고 비교하도록 수정 + if (checkAdd > rand) return element; + } + return null; + } + // 카드를 선택했을 때 호출 + public void AddToSelectedCard(CardData cardData) + { + if (_selectedCard.ContainsKey(cardData.Idx)) + { + _selectedCard[cardData.Idx] += 1; + Debug.Log(_selectedCard[cardData.Idx]); + } + else // 신규 + { + _selectedCard[cardData.Idx] = 1; // TryAdd를 사용하지 않고 대입 + Debug.Log(_selectedCard[cardData.Idx]); + } + } + + // 카드가 MAX값인지 확인할 때 - MAX값이면 true를 리턴 + public bool CardMaxCheck(CardData cardData) + { + return _selectedCard.TryGetValue(cardData.Idx, out var value) && cardData.Max != 0 && value >= cardData.Max; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs index 34f8f8dd6..959cd5cc4 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs @@ -2,13 +2,12 @@ using System; using System.Collections; using BlueWater; using BlueWater.Tycoons; -using SingularityGroup.HotReload; +using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; using TMPro; using UnityEngine.EventSystems; using UnityEngine.UI; -using Object = UnityEngine.Object; // TextMeshPro 네임스페이스 추가 public enum Acceleration @@ -27,9 +26,12 @@ public enum Acceleration public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler ,IPointerMoveHandler { + [field: SerializeField, CLabel("SelectCardUi")] + private TycoonSelectCard _selectCardUi; + [field: Title("카드 속성")] - private CardData _cardData_IDX; + private CardData _cardDataForIDX; [field: SerializeField, CLabel("IDX"), ReadOnly] private string _cardData = "AddAllLiquid"; @@ -59,25 +61,35 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl private RectTransform rectTransform; - void Start() + private Camera mainCamera; + + private void Awake() { rectTransform = GetComponent(); - _cardData_IDX = TycoonManager.Instance.CardDataSo.GetDataByIdx("HeartPlus"); - - Transform nameTransform = transform.Find("Name "); + image = transform.Find("Image").GetComponent(); + _selectCardUi = transform.GetComponentInParent(); + } + + void Start() + { + mainCamera = TycoonCameraManager.Instance.MainCamera; + } + + //지정된 IDX값으로 정보값 초기화 + public void SetCard(string cardIdx) + { + _cardDataForIDX = TycoonManager.Instance.CardDataSo.GetDataByIdx(cardIdx); + + Transform nameTransform = transform.Find("Name"); Transform infoTransform = transform.Find("Infomation"); TextMeshProUGUI nametextComponent = nameTransform.GetComponent(); - nametextComponent.text = _cardData_IDX.Img; - Debug.Log(_cardData_IDX.Img); + nametextComponent.text = _cardDataForIDX.Img; TextMeshProUGUI infotextComponent = infoTransform.GetComponent(); - infotextComponent.text = _cardData_IDX.ScriptText; - Debug.Log(_cardData_IDX.ScriptText); - - image = transform.Find("Image").GetComponent(); - + infotextComponent.text = _cardDataForIDX.ScriptText; + image.sprite = _cardDataForIDX.Sprite; } [Button("회전")] @@ -94,6 +106,7 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl currentRotationCoroutine = StartCoroutine(RotateOverTime()); + // Resources.Load() } @@ -128,7 +141,14 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl // 마우스 클릭 시 호출 public void OnPointerClick(PointerEventData eventData) { - Debug.Log("ClickMouse"); + switch (_cardData) //탐색 후 행동... + { + //TycoonManager.Instance.TycoonStatus.CurrentExp += 10; 이런거 넣어주자... + case "": break; + default: Debug.Log("Not Found Card : IDX");break; + } + + TycoonManager.Instance.CardDataSo.AddToSelectedCard(_cardDataForIDX); } public void OnPointerMove(PointerEventData eventData) @@ -139,7 +159,7 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl Vector2 localPoint; // 마우스 포인터의 화면 좌표(eventData.position)를 이미지의 로컬 좌표(localPoint)로 변환 - if (RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, eventData.position, eventData.pressEventCamera, out localPoint)) + if (RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, eventData.position, mainCamera, out localPoint)) { // 이미지 내에서의 좌표를 정규화된 값으로 변환 (0,0)이 이미지의 왼쪽 아래, (1,1)이 오른쪽 위 Vector2 normalizedPoint = new Vector2( @@ -151,8 +171,8 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl Vector2 centeredNormalizedPoint = normalizedPoint - new Vector2(0.5f, 0.5f); // X와 Y축의 회전 각도를 마우스 위치에 따라 계산 (최대 회전 각도를 15도로 제한) - float rotationX = Mathf.Clamp(centeredNormalizedPoint.y * maxRotationAngle * 2, -maxRotationAngle, maxRotationAngle); - float rotationY = Mathf.Clamp(-centeredNormalizedPoint.x * maxRotationAngle * 2, -maxRotationAngle, maxRotationAngle); + float rotationX = Mathf.Clamp(-centeredNormalizedPoint.y * maxRotationAngle * 2, -maxRotationAngle, maxRotationAngle); + float rotationY = Mathf.Clamp(centeredNormalizedPoint.x * maxRotationAngle * 2, -maxRotationAngle, maxRotationAngle); // 회전을 적용 (X축은 위아래 기울기, Y축은 좌우 기울기) rectTransform.localRotation = Quaternion.Euler(rotationX, rotationY, 0f); @@ -181,15 +201,19 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl endRotationCoroutine = null; } - private IEnumerator RotateOverTime() + + + + private IEnumerator RotateOverTime() //카드를 회전시킴! { + RectTransform rectTransform = this.GetComponent(); Transform backObject = rectTransform.Find("Back"); backObject.gameObject.SetActive(true); Quaternion startRotation = rectTransform.localRotation; Quaternion targetRotation = Quaternion.Euler(0, 0, 0); - float elapsedTime = 0f; + float elapsedTime = 0.0f; while (elapsedTime < RotationDurationCard) { diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 1bf98d379..f8fc011a0 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -1,3 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using BlueWater.Tycoons; +using Mono.Cecil.Cil; using Sirenix.OdinInspector; using UnityEngine; @@ -6,6 +11,8 @@ namespace BlueWater.Uis public class TycoonSelectCard : MonoBehaviour { + private Camera mainCamera; + [field: SerializeField, CLabel("카드 1")] private GameObject card01; [field: SerializeField, CLabel("카드 2")] @@ -21,6 +28,11 @@ namespace BlueWater.Uis private TycoonCard _tycoonCard02Componet; private TycoonCard _tycoonCard03Componet; + void Start() + { + mainCamera = TycoonCameraManager.Instance.MainCamera; + } + [Button("카드 생성하기(레벨업)")] private void CreateCard() { @@ -56,26 +68,96 @@ namespace BlueWater.Uis _tycoonCard01Componet = _currentCard01.GetComponent(); _tycoonCard02Componet = _currentCard02.GetComponent(); _tycoonCard03Componet = _currentCard03.GetComponent(); + + + //----카드 값 지정 및 초기화---- + + CardData card; + + var card01Key = "NULL VAL"; + do + { + card = TycoonManager.Instance.CardDataSo.GetRandCardData(); + card01Key = card.Idx; + } while (TycoonManager.Instance.CardDataSo.CardMaxCheck(card)); + _tycoonCard01Componet.SetCard(card01Key); + + + var card02Key = "NULL VAL"; + do + { + card = TycoonManager.Instance.CardDataSo.GetRandCardData(); + card02Key = card.Idx; + + } while (TycoonManager.Instance.CardDataSo.CardMaxCheck(card) || card02Key.Equals(card01Key)); + _tycoonCard02Componet.SetCard(card02Key); + + + var card03Key = "NULL VAL"; + do + { + card = TycoonManager.Instance.CardDataSo.GetRandCardData(); + card03Key = card.Idx; + + } while (TycoonManager.Instance.CardDataSo.CardMaxCheck(card) || card03Key.Equals(card01Key) || card03Key.Equals(card02Key)); + _tycoonCard03Componet.SetCard(card03Key); + + //------------- _tycoonCard01Componet.Rotation_Start(); _tycoonCard02Componet.Rotation_Start(); _tycoonCard03Componet.Rotation_Start(); - } - + } + + public void SelectedCard(TycoonCard currTycoonCard) + { + SelectedAnimation(currTycoonCard); + } + + private IEnumerator SelectedAnimation(TycoonCard currTycoonCard) + { + + // 화면의 해상도를 가져옴 + float screenWidth = Screen.width; + float screenHeight = Screen.height; + + // 오브젝트를 월드 좌표로 변환 + Vector3 leftOffScreenPosition = Camera.main.ScreenToWorldPoint(new Vector3(-500, screenHeight / 2, Camera.main.nearClipPlane)); + Vector3 rightOffScreenPosition = Camera.main.ScreenToWorldPoint(new Vector3(screenWidth + 500, screenHeight / 2, Camera.main.nearClipPlane)); + + // 현재 위치를 가져옴 + Vector3 leftStartPosition = _tycoonCard02Componet.transform.position; + Vector3 rightStartPosition = _tycoonCard03Componet.transform.position; + + // 일정 시간 동안 오브젝트를 이동 + float elapsedTime = 0; + while (elapsedTime < 2f) + { + elapsedTime += Time.deltaTime; + + // Ease Expo Out 계산 (t는 0에서 1 사이의 값) + float t = elapsedTime / 2f; + float easeValue = 1 - Mathf.Pow(2, -10 * t); + + // 양쪽 오브젝트를 각각 이동 + _tycoonCard02Componet.transform.position = Vector3.Lerp(leftStartPosition, leftOffScreenPosition, easeValue); + _tycoonCard03Componet.transform.position = Vector3.Lerp(rightStartPosition, rightOffScreenPosition, easeValue); + + yield return null; // 한 프레임 대기 + } + + // 오브젝트 최종 위치 설정 (정확한 끝 위치 보장) + _tycoonCard02Componet.transform.position = leftOffScreenPosition; + _tycoonCard03Componet.transform.position = rightOffScreenPosition; + + } + private void Awake() { } - void Start() - { - - } - - void Update() - { - - } + } } diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike.meta b/Assets/03.Images/Ui/Tycoon/Loglike.meta similarity index 77% rename from Assets/03.Images/Ui/Tycoon/Roguelike.meta rename to Assets/03.Images/Ui/Tycoon/Loglike.meta index 6d5f21956..2be42186a 100644 --- a/Assets/03.Images/Ui/Tycoon/Roguelike.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e4249a5d8ffed0e42a0eefeafd4cf392 +guid: 0bc320b9446884242a57f37ed468723e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png new file mode 100644 index 000000000..4df9d71c0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_Img_Team.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta similarity index 92% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Card_Img_Team.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta index 980ddb148..0909ce137 100644 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_Img_Team.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddAllLiquid.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ea423b24550ff2640be14c058bbbbbcb +guid: 284734c4624b35b499152e028f90e6f6 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -97,12 +97,12 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: Card_Img_Team_0 + name: AddAllLiquid_0 rect: serializedVersion: 2 x: 0 y: 0 - width: 640 + width: 1024 height: 1024 alignment: 0 pivot: {x: 0, y: 0} @@ -112,8 +112,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 3ec636704b7223e43a425f754a3c2173 - internalID: -1079852288 + spriteID: 16e7929403eb41d47a15b1f14a3fdf8d + internalID: -254146654 vertices: [] indices: edges: [] @@ -122,7 +122,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 4de1ed0b6d487b2429addf58351d1b10 + spriteID: d1b704d6b847fbc4fb98f9d6cafe62ad internalID: 0 vertices: [] indices: @@ -132,7 +132,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - Card_Img_Team_0: -1079852288 + AddAllLiquid_0: -254146654 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png new file mode 100644 index 000000000..a2d633b8a Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Rare.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png.meta similarity index 91% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Rare.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png.meta index a25f768bc..4f8c351b9 100644 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Rare.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddGanish1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e6e35930f2dc844699720776ff1e95d +guid: 4708f67b3712d4743af7cb6092edf3c7 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -97,13 +97,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: Rare_0 + name: AddGanish1_0 rect: serializedVersion: 2 x: 0 y: 0 - width: 421 - height: 614 + width: 1024 + height: 1024 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -112,8 +112,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 8dcdee56df132a246ab13c5f9fb3544d - internalID: 21508930 + spriteID: 32d439fcac266a2499025b0247d9ccbb + internalID: 1704811524 vertices: [] indices: edges: [] @@ -122,7 +122,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: bb031d802172f524c90d562d61740da3 + spriteID: 8856fbf45b6399e4ba69a71f1303a365 internalID: 0 vertices: [] indices: @@ -132,7 +132,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - Rare_0: 21508930 + AddGanish1_0: 1704811524 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png new file mode 100644 index 000000000..14589c8de Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta new file mode 100644 index 000000000..35adbd959 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddGarnish2.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 70238c4151e9085429d18be7f6f8a2ae +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png new file mode 100644 index 000000000..66b4e86e8 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta new file mode 100644 index 000000000..7b5458f8e --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidB.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b1b88ceef90370a4295ed9f58140349a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png new file mode 100644 index 000000000..df5e86437 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta new file mode 100644 index 000000000..08d2ce7d6 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidC.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: d9dbcf5d304083541a40ff4b3cb9048f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png new file mode 100644 index 000000000..dbebba620 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta new file mode 100644 index 000000000..20f1387db --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidD.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 45e4676179dde7e42bb09b8d94935f34 +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: 2 + 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 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: AddLiquidD_0 + rect: + serializedVersion: 2 + x: 400 + y: 468 + width: 229 + height: 374 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: efdb2756a4bd66b43aeffcf9aab0ebc3 + internalID: -667892039 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 3b1c37614f8f29449bef26962781e4a9 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + AddLiquidD_0: -667892039 + AddLiquidD_1: -1982838524 + AddLiquidD_2: 1199438138 + AddLiquidD_3: 1297094540 + AddLiquidD_4: -642381366 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png new file mode 100644 index 000000000..f1adbcb53 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta new file mode 100644 index 000000000..3ad529c64 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/AddLiquidE.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 58964556f1712324b9d9ac4515f965aa +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png new file mode 100644 index 000000000..a6df75c72 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta new file mode 100644 index 000000000..e52bea40a --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ChefNpc.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 02ff51bea8718c447bea8470257b6782 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png new file mode 100644 index 000000000..27178f5ca Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta new file mode 100644 index 000000000..649911570 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/CleanUp.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 1acb09a93fb040241a17107a288d6f54 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png new file mode 100644 index 000000000..f57badb6d Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta new file mode 100644 index 000000000..6fe616dfd --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/ExpGetUp.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 400a47b8bcd0a1e4b823160ce9f40232 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png new file mode 100644 index 000000000..c4ffc0137 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Back.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta similarity index 92% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Back.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta index e7e6a9f96..8bcb63fa0 100644 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Back.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Back.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33358440a340f8442abee2ba64b1db48 +guid: e7481c4658aa1544fabd8323173e4e6a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -100,10 +100,10 @@ TextureImporter: name: Frame_Back_0 rect: serializedVersion: 2 - x: 0 + x: 185 y: 0 - width: 186 - height: 270 + width: 641 + height: 1024 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -112,8 +112,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: d42603919ae8fe345aaa67e50370b90b - internalID: -498442863 + spriteID: c8406de9d7ad9e14485353fdf13e2032 + internalID: 1160244810 vertices: [] indices: edges: [] @@ -122,7 +122,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 6fff6f60df7ee2b4283a0a9804402492 + spriteID: 6a148df6303e53a469a620422386fddd internalID: 0 vertices: [] indices: @@ -132,7 +132,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - Frame_Back_0: -498442863 + Frame_Back_0: 1160244810 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png new file mode 100644 index 000000000..40a06d4a0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Normal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta similarity index 91% rename from Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Normal.png.meta rename to Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta index 5e9c4c5ad..8680cd49d 100644 --- a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Normal.png.meta +++ b/Assets/03.Images/Ui/Tycoon/Loglike/Frame_Front.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ab5d303d899ad14e83d2bb6dbd45e08 +guid: 98f18d9519d31f44d898c3b2289ab273 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -97,13 +97,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: Normal_0 + name: Frame_Front_0 rect: serializedVersion: 2 - x: 0 + x: 186 y: 0 - width: 421 - height: 614 + width: 641 + height: 1024 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -112,8 +112,8 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: 0422c3ea291d9584daf211ece5690cf7 - internalID: 892393093 + spriteID: 8fc4f0adfef7e60489430ce2a498c519 + internalID: -479173315 vertices: [] indices: edges: [] @@ -122,7 +122,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 4e542ed093723394dbbc2813eeeae497 + spriteID: 690803adc9eed88469e078401d20df57 internalID: 0 vertices: [] indices: @@ -132,7 +132,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - Normal_0: 892393093 + Frame_Front_0: -479173315 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png new file mode 100644 index 000000000..c399ab36e Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta new file mode 100644 index 000000000..4ee2d06e0 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/GoldGetup.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 121ed7da4e55d2a43ba798a00f95a474 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png b/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png new file mode 100644 index 000000000..36a9efe7e Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png.meta new file mode 100644 index 000000000..6a0e06044 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/GuageReset.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 74feb2405992b004f9937758b66f9668 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png new file mode 100644 index 000000000..e4129207c Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta new file mode 100644 index 000000000..f0b04bc98 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartAllHeal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 7579ee4fd1c5ed34d939eeef18c625be +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png new file mode 100644 index 000000000..a73c1eefc Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta new file mode 100644 index 000000000..e9904d5b3 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartHeal.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 466393baecf741d449a05f3b63317368 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png new file mode 100644 index 000000000..e240fe8e0 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta new file mode 100644 index 000000000..5ac769a67 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Loglike/HeartPlus.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: d0b6eba4ac33ece44bccd11e57e415e8 +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 + 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: diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_Img_Team.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_Img_Team.png deleted file mode 100644 index d3e218727..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_Img_Team.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Back.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Back.png deleted file mode 100644 index a4e5cf296..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Back.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Normal.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Normal.png deleted file mode 100644 index 44ad93bb8..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Normal.png and /dev/null differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Rare.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Rare.png deleted file mode 100644 index 3eb329a2f..000000000 Binary files a/Assets/03.Images/Ui/Tycoon/Roguelike/Frame_Rare.png and /dev/null differ diff --git a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab index 56ca23e4e..728750653 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2943782663385093063 +--- !u!1 &724787420108250261 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,50 +8,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9199400030788091584} - - component: {fileID: 2171710615668606180} - - component: {fileID: 5832205689271844236} + - component: {fileID: 3008600308534228023} + - component: {fileID: 2887366681507643601} + - component: {fileID: 5148581156514830877} m_Layer: 5 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9199400030788091584 + m_IsActive: 1 +--- !u!224 &3008600308534228023 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943782663385093063} + m_GameObject: {fileID: 724787420108250261} m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3945043186252027743} + m_Father: {fileID: 179815468058268188} m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2171710615668606180 +--- !u!222 &2887366681507643601 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943782663385093063} + m_GameObject: {fileID: 724787420108250261} m_CullTransparentMesh: 1 ---- !u!114 &5832205689271844236 +--- !u!114 &5148581156514830877 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2943782663385093063} + m_GameObject: {fileID: 724787420108250261} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -498442863, guid: 33358440a340f8442abee2ba64b1db48, type: 3} + m_Sprite: {fileID: 1160244810, guid: e7481c4658aa1544fabd8323173e4e6a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -75,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3367794773895032679 +--- !u!1 &981401248960777935 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,355 +83,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6407304977742262138} - - component: {fileID: 4999947251592817492} - - component: {fileID: 5766635877287661826} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6407304977742262138 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3367794773895032679} - m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3945043186252027743} - m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4999947251592817492 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3367794773895032679} - m_CullTransparentMesh: 1 ---- !u!114 &5766635877287661826 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3367794773895032679} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: -1079852288, guid: ea423b24550ff2640be14c058bbbbbcb, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4954372994133229964 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 761962999104109761} - - component: {fileID: 5379141909738381352} - - component: {fileID: 3752849641387581418} - m_Layer: 5 - m_Name: Infomation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &761962999104109761 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954372994133229964} - m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1.6, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 3945043186252027743} - m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0, y: 104} - m_SizeDelta: {x: 500, y: 120} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5379141909738381352 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954372994133229964} - m_CullTransparentMesh: 1 ---- !u!114 &3752849641387581418 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4954372994133229964} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Infomation - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 56.480713, y: 1.0851669, z: 57.379795, w: 35.47911} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6408727219447932146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7519490804232866819} - - component: {fileID: 4380907822811519659} - - component: {fileID: 1209019601882638115} - m_Layer: 5 - m_Name: Frarme - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7519490804232866819 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6408727219447932146} - m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3945043186252027743} - m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4380907822811519659 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6408727219447932146} - m_CullTransparentMesh: 1 ---- !u!114 &1209019601882638115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6408727219447932146} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 892393093, guid: 3ab5d303d899ad14e83d2bb6dbd45e08, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7279465393450390489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3945043186252027743} - - component: {fileID: 519938834043385977} - m_Layer: 5 - m_Name: Card - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3945043186252027743 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7279465393450390489} - m_LocalRotation: {x: 0, y: -1, z: 0, w: -0.00000004371139} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6407304977742262138} - - {fileID: 7519490804232866819} - - {fileID: 4289739070687939296} - - {fileID: 761962999104109761} - - {fileID: 9199400030788091584} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 500, y: 800} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &519938834043385977 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7279465393450390489} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e080f1606bf24d4cb31f55f7958812a, type: 3} - m_Name: - m_EditorClassIdentifier: - _cardData: AddAllLiquid - CardName: - CardText: - RotationDurationCard: 3 - AccelerationCard: 2 - maxRotationAngle: 15 - returnSpeed: 3 ---- !u!1 &8388805008705484080 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4289739070687939296} - - component: {fileID: 4833202526536421552} - - component: {fileID: 6015961266973885280} + - component: {fileID: 808837985948070583} + - component: {fileID: 1817531066570754046} + - component: {fileID: 5827380525322113104} m_Layer: 5 m_Name: Name m_TagString: Untagged @@ -439,40 +93,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4289739070687939296 +--- !u!224 &808837985948070583 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8388805008705484080} + m_GameObject: {fileID: 981401248960777935} m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3945043186252027743} + m_Father: {fileID: 179815468058268188} m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -87} m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4833202526536421552 +--- !u!222 &1817531066570754046 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8388805008705484080} + m_GameObject: {fileID: 981401248960777935} m_CullTransparentMesh: 1 ---- !u!114 &6015961266973885280 +--- !u!114 &5827380525322113104 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8388805008705484080} + m_GameObject: {fileID: 981401248960777935} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -557,3 +211,350 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4040373129314125784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3478238202419372973} + - component: {fileID: 6418150485039294113} + - component: {fileID: 7377180935870639763} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3478238202419372973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4040373129314125784} + m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 179815468058268188} + m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6418150485039294113 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4040373129314125784} + m_CullTransparentMesh: 1 +--- !u!114 &7377180935870639763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4040373129314125784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -254146654, guid: 284734c4624b35b499152e028f90e6f6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6225316369443711300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1690995706547782924} + - component: {fileID: 3840258964051517194} + - component: {fileID: 5651409083208773626} + m_Layer: 5 + m_Name: Infomation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1690995706547782924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6225316369443711300} + m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1.6, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 179815468058268188} + m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -0, y: 104} + m_SizeDelta: {x: 500, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3840258964051517194 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6225316369443711300} + m_CullTransparentMesh: 1 +--- !u!114 &5651409083208773626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6225316369443711300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Infomation + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 56.480713, y: 1.0851669, z: 57.379795, w: 35.47911} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7064336336293747033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 179815468058268188} + - component: {fileID: 296970820561009192} + m_Layer: 5 + m_Name: Card + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &179815468058268188 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7064336336293747033} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3478238202419372973} + - {fileID: 4999405518196487197} + - {fileID: 808837985948070583} + - {fileID: 1690995706547782924} + - {fileID: 3008600308534228023} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &296970820561009192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7064336336293747033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1e080f1606bf24d4cb31f55f7958812a, type: 3} + m_Name: + m_EditorClassIdentifier: + _selectCardUi: {fileID: 0} + _cardData: AddAllLiquid + CardName: + CardText: + RotationDurationCard: 3 + AccelerationCard: 2 + maxRotationAngle: 15 + returnSpeed: 3 +--- !u!1 &8165761410676673944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4999405518196487197} + - component: {fileID: 6154276452622201835} + - component: {fileID: 9084313400144445291} + m_Layer: 5 + m_Name: Frarme + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4999405518196487197 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8165761410676673944} + m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 179815468058268188} + m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6154276452622201835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8165761410676673944} + m_CullTransparentMesh: 1 +--- !u!114 &9084313400144445291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8165761410676673944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -479173315, guid: 98f18d9519d31f44d898c3b2289ab273, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/09.Shaders/Fish.shadergraph b/Assets/09.Shaders/Fish.shadergraph index 16a45776f..71671378a 100644 --- a/Assets/09.Shaders/Fish.shadergraph +++ b/Assets/09.Shaders/Fish.shadergraph @@ -746,6 +746,7 @@ "m_OutputNode": { "m_Id": "" }, + "m_SubDatas": [], "m_ActiveTargets": [ { "m_Id": "56302c7c694f49cb84a7ae337084cfb0" @@ -2085,6 +2086,9 @@ "m_AlphaClip": false, "m_CastShadows": true, "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, "m_SupportsLODCrossFade": false, "m_CustomEditorGUI": "", "m_SupportVFX": false