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

Ver 0.2.3.2 타이틀 변경

Browse Source 
+ 타이틀 씬 교체
+ 타이틀 씬 오브젝트 및 Ui 수정
+ 타이틀 씬 스파인 풀 속도 각각 다르게 설정
+ 타이틀 씬 Player Input 변경
This commit is contained in:
Nam Tae Gun 2024-06-29 03:50:09 +09:00
parent 01790645af
commit d20ff75eff
16 changed files with 6939 additions and 6303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5316
Assets/01.Scenes/00.CombatTitle.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/01.Scenes/00.CombatTitle.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fba5b932ccd629c4eb5144ef6902637c
guid: 580d8444d5f5965408bf05cd3a59709b
DefaultImporter:
externalObjects: {}
userData:

6157
Assets/01.Scenes/99.Title.unity
View File

File diff suppressed because it is too large Load Diff

8
Assets/01.Scenes/Old.meta Normal file
View File

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

1512
Assets/01.Scenes/Old/00.CombatTitle.unity Normal file
View File

File diff suppressed because it is too large Load Diff

2
Assets/01.Scenes/99.Title.unity.meta → Assets/01.Scenes/Old/00.CombatTitle.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 580d8444d5f5965408bf05cd3a59709b
guid: fba5b932ccd629c4eb5144ef6902637c
DefaultImporter:
externalObjects: {}
userData:

14
Assets/02.Scripts/CombatTitle.cs
View File

@ -2,10 +2,12 @@ using Sirenix.OdinInspector;
using TMPro;
using UnityEditor;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
namespace BlueWater
namespace BlueWater.Titles
{
public class CombatTitle : MonoBehaviour
{
@ -37,11 +39,15 @@ namespace BlueWater
#endif
}
public void OnMoveScene(InputAction.CallbackContext context)
public void OnMenuInteraction(InputAction.CallbackContext context)
{
if (context.started)
if (context.performed)
{
MoveCombatScene();
var current = EventSystem.current.currentSelectedGameObject;
if (!current) return;
var currenButton = current.GetComponent<Button>();
currenButton.onClick.Invoke();
}
}

17
Assets/02.Scripts/NewBlueWater.inputactions
View File

@ -682,7 +682,7 @@
"id": "3c9a6525-f8a5-4036-b9b9-a6407d876df1",
"actions": [
{
"name": "MoveScene",
"name": "MenuInteraction",
"type": "Button",
"id": "70079543-a5e9-4137-85af-1ad206da8794",
"expectedControlType": "",
@ -695,22 +695,11 @@
{
"name": "",
"id": "ca74d4d0-460f-4482-9070-cba00b2b231f",
"path": "<Keyboard>/anyKey",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "",
"action": "MoveScene",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6c126a8e-89d3-4729-9177-dd4cbcfdd46a",
"path": "*/{PrimaryAction}",
"interactions": "",
"processors": "",
"groups": "",
"action": "MoveScene",
"action": "MenuInteraction",
"isComposite": false,
"isPartOfComposite": false
}

8
Assets/02.Scripts/Ui/Title.meta Normal file
View File

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

55
Assets/02.Scripts/Ui/Title/TitleMenuButton.cs Normal file
View File

@ -0,0 +1,55 @@
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
namespace BlueWater.Titles
{
public class TitleMenuButton : MonoBehaviour, ISelectHandler, IDeselectHandler, IPointerEnterHandler, IPointerExitHandler
{
[SerializeField, Required]
private Button _targetButton;
[SerializeField, Required]
private Image _selectedImage;
[SerializeField]
private Color _highlightedColor;
private Color _originalColor;
private void Start()
{
_originalColor = _selectedImage.color;
}
public void OnSelect(BaseEventData eventData)
{
_selectedImage.color = _originalColor;
_selectedImage.enabled = true;
}
public void OnDeselect(BaseEventData eventData)
{
_selectedImage.enabled = false;
}
public void OnPointerEnter(PointerEventData eventData)
{
if (EventSystem.current.currentSelectedGameObject == gameObject) return;
_selectedImage.color = _highlightedColor;
_selectedImage.enabled = true;
}
public void OnPointerExit(PointerEventData eventData)
{
if (EventSystem.current.currentSelectedGameObject == gameObject) return;
_selectedImage.color = _originalColor;
_selectedImage.enabled = false;
}
}
}

2
Assets/02.Scripts/Ui/Title/TitleMenuButton.cs.meta Normal file
View File

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

BIN
Assets/03.Images/Ui/LineRed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

141
Assets/03.Images/Ui/LineRed.png.meta Normal file
View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 5a6a33286645736499caef60e479872d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

4
Assets/05.Prefabs/Props/Spines/SummerGrass01.prefab
View File

@ -62,7 +62,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2752040085647730666, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3}
propertyPath: m_Layer
value: 0
value: 16
objectReference: {fileID: 0}
- target: {fileID: 3210918493867778633, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3}
propertyPath: m_Name
@ -74,7 +74,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3210918493867778633, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3}
propertyPath: m_TagString
value: DamageableProps
value: Untagged
objectReference: {fileID: 0}
- target: {fileID: 6575084072466315881, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3}
propertyPath: _dieAnimationName

2
ProjectSettings/EditorBuildSettings.asset
View File

@ -7,7 +7,7 @@ EditorBuildSettings:
m_Scenes:
- enabled: 1
path: Assets/01.Scenes/00.CombatTitle.unity
guid: fba5b932ccd629c4eb5144ef6902637c
guid: 580d8444d5f5965408bf05cd3a59709b
- enabled: 1
path: Assets/01.Scenes/02.Combat.unity
guid: d4d297edf223adf4cb07955b48f82498

2
ProjectSettings/ProjectSettings.asset
View File

@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 0.2.3.1
bundleVersion: 0.2.3.2
preloadedAssets:
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
metroInputSource: 0