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

Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg

Browse Source
This commit is contained in:
NTG_Lenovo 2024-11-11 18:51:22 +09:00
commit d093750e27
4 changed files with 1803 additions and 1708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3409
Assets/01.Scenes/_A.LMG.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/02.Scripts/Tycoon/TycoonGameOver.cs
View File

@ -38,7 +38,7 @@ public class TycoonGameOver : MonoBehaviour
private GameObject _ship;
private Image _text;
[field: SerializeField, CLabel("REsultUI")]
[field: SerializeField, CLabel("ResultUI")]
private TycoonResultUi ResultUi;
void Start()

32
Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs
View File

@ -3,7 +3,9 @@ using System.Collections.Generic;
using BlueWater.Tycoons;
using UnityEngine;
using Sirenix.OdinInspector;
using TMPro;
using Unity.VisualScripting;
using UnityEngine.UI;
using UnityEngine.UIElements;
namespace BlueWater.Uis
@ -17,12 +19,26 @@ namespace BlueWater.Uis
[field: SerializeField, CLabel("카드프리펫")]
private GameObject Card;
private GameObject _panel;
[field: SerializeField, CLabel("카드목록(Cards)")]
private GameObject cards;
[field: SerializeField, CLabel("스크롤렉트")]
private ScrollRect cardScrollRect;
[field: SerializeField, CLabel("라운드수TextMesh")]
private TextMeshProUGUI roundTextMesh;
[field: SerializeField, CLabel("손님수TextMesh")]
private TextMeshProUGUI customerTextMesh;
[field: SerializeField, CLabel("골드TextMesh")]
private TextMeshProUGUI goldTextMesh;
[field: SerializeField, CLabel("시간TextMesh")]
private TextMeshProUGUI timeTextMesh;
public void Start()
{
_panel = transform.Find("Panel").gameObject;
@ -37,6 +53,10 @@ namespace BlueWater.Uis
public void StartResult()
{
_panel.SetActive(true);
roundTextMesh.text = $"Round : {TycoonManager.Instance.GetCurrentLevelData().Idx}";
goldTextMesh.text = $"Gold : {ES3.Load("EndGold", 0)}";
timeTextMesh.text = (int)playTime / 60 == 0 ? $"Time : {(int)playTime % 60}sec" : $"Time : {(int)playTime/60}min {(int)playTime%60}sec" ;
selectedCard = TycoonManager.Instance.CardDataSo.GetselectedCard(); //카드 정보 가져오기
//카드 정보 가져오기
@ -48,9 +68,19 @@ namespace BlueWater.Uis
newObject.GetComponent<TycoonResultCard>().SetCount(element.Value);
newObject.name = element.Key;
newObject.transform.SetParent(cards.transform);
newObject.transform.localPosition = Vector3.zero;
newObject.transform.localRotation = Quaternion.identity;
newObject.transform.localScale = new Vector3(1.0f,1.0f,1.0f);
}
// float newHeight = (selectedCard.Count / 5.0f - 2) * 250;
//
// var sizeDelta = cardScrollRect.content.sizeDelta;
// sizeDelta.y = newHeight;
// cardScrollRect.content.sizeDelta = sizeDelta;
}
}
}

68
Assets/05.Prefabs/Uis/Tycoons/ResultCard.prefab
View File

@ -75,6 +75,43 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1878235690508060588
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 500783730871117242}
m_Layer: 0
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &500783730871117242
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1878235690508060588}
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: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1301142170621799481}
- {fileID: 2184028235915989340}
m_Father: {fileID: 5063942582541577301}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1902740841703408668
GameObject:
m_ObjectHideFlags: 0
@ -108,13 +145,12 @@ RectTransform:
m_Children:
- {fileID: 2631534683619339739}
- {fileID: 4539851198141028537}
- {fileID: 2184028235915989340}
m_Father: {fileID: 5063942582541577301}
m_Father: {fileID: 500783730871117242}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3, y: 0.00008392334}
m_SizeDelta: {x: 250, y: 250}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 25}
m_SizeDelta: {x: 0, y: -50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3987507136697198223
CanvasRenderer:
@ -144,7 +180,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a3f37799e7eaafd428896a8e3bb15429, type: 3}
m_Sprite: {fileID: 21300000, guid: 72e42bd725cab234a9e47e512e5edfc3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -227,7 +263,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1301142170621799481}
- {fileID: 500783730871117242}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -411,18 +447,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9184018256795220473}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.00004459893}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1301142170621799481}
m_Father: {fileID: 500783730871117242}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -150}
m_SizeDelta: {x: 180, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3704132316340448211
CanvasRenderer:
m_ObjectHideFlags: 0