mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

메인 화면 UI 구조 변경

Browse Source
This commit is contained in:
aube.lee
2025-02-04 17:57:23 +09:00
parent a971567ffd
commit ab433ef46b
12 changed files with 2530 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Gameton-06/Assets/Gameton/Art/shop_Background.png LFS Normal file
View File

Binary file not shown.

127
Gameton-06/Assets/Gameton/Art/shop_Background.png.meta Normal file
View File

@@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 368a6e0f97b1a4241b397befdfdc1562
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: 3
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: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

2
Gameton-06/Assets/Gameton/Resources/GameData/heart.json
View File

@@ -1,7 +1,7 @@
{
"items": [
{
"characterId": 0,
"characterId": 1,
"currentHearts": 3,
"maxHearts": 3,
"heartRechargeTime": 600,

26
Gameton-06/Assets/Gameton/Resources/GameData/player.json
View File

@@ -2,32 +2,6 @@
"items": [
{
"id": 0,
"type": "w",
"name": "lulu",
"level": 1,
"experience": 0,
"hp": 100,
"mp": 100,
"attackPower": 50,
"defensivePower": 30,
"speed": 100,
"critical": 30
},
{
"id": 1,
"type": "w",
"name": "hicat",
"level": 1,
"experience": 0,
"hp": 100,
"mp": 100,
"attackPower": 50,
"defensivePower": 30,
"speed": 100,
"critical": 30
},
{
"id": 2,
"type": "b",
"name": "blac",
"level": 1,

2548
Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab
View File

File diff suppressed because it is too large Load Diff

38
Gameton-06/Assets/Gameton/Scenes/Lobby.unity
View File

@@ -280,7 +280,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &405613405
Transform:
m_ObjectHideFlags: 0
@@ -407,7 +407,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!108 &693928584
Light:
m_ObjectHideFlags: 0
@@ -766,7 +766,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1725939780
Transform:
m_ObjectHideFlags: 0
@@ -892,37 +892,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1968431292
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1968431293}
m_Layer: 0
m_Name: TON.Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1968431293
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1968431292}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.238264, y: -1.47, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -933,4 +902,3 @@ SceneRoots:
- {fileID: 405613405}
- {fileID: 1913746339}
- {fileID: 1725939780}
- {fileID: 1968431293}

16
Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity
View File

@@ -766,13 +766,21 @@ PrefabInstance:
propertyPath: m_Name
value: TON.Player_B
objectReference: {fileID: 0}
- target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
propertyPath: m_LocalScale.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
propertyPath: m_LocalScale.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
propertyPath: m_LocalPosition.x
value: -6.17
value: -6.18
objectReference: {fileID: 0}
- target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
propertyPath: m_LocalPosition.y
value: -1.8467308
value: -1.79
objectReference: {fileID: 0}
- target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
propertyPath: m_LocalPosition.z
@@ -806,6 +814,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8528093570479225059, guid: 5e94737fd3fb9c94eb47fb66ed914335, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []

15
Gameton-06/Assets/Gameton/Scripts/Common/PlayerDataManager.cs
View File

@@ -9,6 +9,8 @@ namespace TON
// 사용자가 생성해둔 플레이어 데이터를 싱글톤으로 전역 사용하기 위함
public List<PlayerData> playersData { get; private set; }
public PlayerData player { get; private set; }
protected override void Awake()
{
base.Awake();
@@ -24,5 +26,18 @@ namespace TON
}
}
public void SetCurrentUserData()
{
int characterId = PlayerPrefs.GetInt("SelectedPlayerIndex", -1);
if (characterId > -1)
{
player = playersData[characterId];
}
else
{
Debug.LogError("유효하지 않은 캐릭터 정보 입니다.");
}
}
}
}

2
Gameton-06/Assets/Gameton/Scripts/Scenes/LobbyScene.cs
View File

@@ -23,7 +23,7 @@ namespace TON
UIManager.Show<LobbyUI>(UIList.LobbyUI);
// UIManager.Show<ControllerUI>(UIList.ControllerUI);
PlayerSpawner.SpawnPlayerCharacter();
// PlayerSpawner.SpawnPlayerCharacter();
}

1
Gameton-06/Assets/Gameton/Scripts/UI/CharaterCreateUI.cs
View File

@@ -55,6 +55,7 @@ namespace TON
// 생성한 캐릭터를 저장한다
PlayerData player = new PlayerData(playerDatas.Count, selectedCharacter, characterName.text);
playerDatas.Add(player);
PlayerDataManager.Singleton.SetCurrentUserData();
JSONLoader.SaveToFile(playerDatas, "player");
// 하트 시스템을 생성한다

1
Gameton-06/Assets/Gameton/Scripts/UI/CharaterSelectUI.cs
View File

@@ -60,6 +60,7 @@ namespace TON
public void OnClickPlayButton()
{
PlayerPrefs.SetInt("SelectedPlayerIndex", currentSelectCharacterIndex);
PlayerDataManager.Singleton.SetCurrentUserData();
HeartDataManager.Singleton.SetCurrentUserHeart();
UIManager.Hide<CharaterSelectUI>(UIList.CharaterSelectUI);

10
Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs
View File

@@ -1,15 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace TON
{
public class LobbyUI : UIBase
{
public SerializableDictionary<string, Sprite> playerImages;
private void Start()
{
Image playerObj = GameObject.Find("TON.Player").GetComponent<Image>();
PlayerData player = PlayerDataManager.Singleton.player;
playerObj.sprite = playerImages.GetValueOrDefault(player.type);
}
public void OnClickStageEntryButton()
{
UIManager.Hide<LobbyUI>(UIList.LobbyUI);
UIManager.Show<StageEntryUI>(UIList.StageEntryUI);
}
}
}