앨범 작업 중...
This commit is contained in:
parent
dfb5b137f0
commit
777435d013
File diff suppressed because it is too large
Load Diff
|
|
@ -5332,8 +5332,8 @@ RectTransform:
|
|||
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: -11.37}
|
||||
m_SizeDelta: {x: 0, y: -480.4}
|
||||
m_AnchoredPosition: {x: 0, y: -11.69}
|
||||
m_SizeDelta: {x: 0, y: -479.75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &37784574
|
||||
MonoBehaviour:
|
||||
|
|
@ -43372,6 +43372,127 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 639042539}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &644139345
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 644139346}
|
||||
- component: {fileID: 644139349}
|
||||
- component: {fileID: 644139348}
|
||||
- component: {fileID: 644139347}
|
||||
m_Layer: 5
|
||||
m_Name: btn_collection
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &644139346
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 644139345}
|
||||
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: 1366111348}
|
||||
m_Father: {fileID: 1535761049}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 126}
|
||||
m_SizeDelta: {x: 380, y: 140}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &644139347
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 644139345}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 644139348}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &644139348
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 644139345}
|
||||
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: 21300000, guid: 6facc842ead05744184e7db7ba064b48, 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!222 &644139349
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 644139345}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &644550602
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -84189,6 +84310,142 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1352789303}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1366111347
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1366111348}
|
||||
- component: {fileID: 1366111350}
|
||||
- component: {fileID: 1366111349}
|
||||
m_Layer: 5
|
||||
m_Name: btnName
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1366111348
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1366111347}
|
||||
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: []
|
||||
m_Father: {fileID: 644139346}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1366111349
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1366111347}
|
||||
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: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\uC218\uC9D1 \uBAA9\uB85D"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 1cd9f54883d04fa4a8273aaf06ef64e9, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, 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: 55
|
||||
m_fontSizeBase: 55
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 4096
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 1
|
||||
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: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &1366111350
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1366111347}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1366377249
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -100772,6 +101029,7 @@ RectTransform:
|
|||
- {fileID: 37784573}
|
||||
- {fileID: 1260021393}
|
||||
- {fileID: 1710184186}
|
||||
- {fileID: 644139346}
|
||||
- {fileID: 2088694188}
|
||||
- {fileID: 425765869}
|
||||
m_Father: {fileID: 301590531}
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ public class HuntingPanel : MonoBehaviour
|
|||
|
||||
// 하단 UI에 가려지는것을 방지하기 위한 프리팹.
|
||||
// 2개 생성하면 데이터의 길이가 4의 배수가 되지 않아도 홀수로 끝나도 위에까지 올라온다.
|
||||
Instantiate(EmptySlotPrefab, Content);
|
||||
Instantiate(EmptySlotPrefab, Content);
|
||||
//Instantiate(EmptySlotPrefab, Content);
|
||||
//Instantiate(EmptySlotPrefab, Content);
|
||||
|
||||
if (GameManager.Instance != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
using UnityEngine;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using CodeJay.Classes;
|
||||
using UnityEngine.ResourceManagement.AsyncOperations;
|
||||
using BansheeGz.BGDatabase;
|
||||
using UnityEngine.EventSystems;
|
||||
using TMPro;
|
||||
|
||||
public class HuntingSlot : MonoBehaviour
|
||||
{
|
||||
|
|
@ -12,16 +13,10 @@ public class HuntingSlot : MonoBehaviour
|
|||
[Space(20)]
|
||||
[SerializeField] private Image AI_Left;
|
||||
[SerializeField] private Image AI_Right;
|
||||
[SerializeField] private Image Frame_Left;
|
||||
[SerializeField] private Image Frame_Right;
|
||||
[SerializeField] private Image Block_Left;
|
||||
[SerializeField] private Image Block_Right;
|
||||
[SerializeField] private Image Block_Lock_Left;
|
||||
[SerializeField] private Image Block_Lock_Right;
|
||||
[SerializeField] private Image Block_Heart_Left;
|
||||
[SerializeField] private Image Block_Heart_Right;
|
||||
[SerializeField] private GameObject ClearGO_Left;
|
||||
[SerializeField] private GameObject ClearGO_Right;
|
||||
[SerializeField] private GameObject Block_Left;
|
||||
[SerializeField] private GameObject Block_Right;
|
||||
public GameObject[] gos_openbutton;
|
||||
public TextMeshProUGUI[] texts_price;
|
||||
|
||||
[SerializeField] private GameObject[] Right_GOs;
|
||||
|
||||
|
|
@ -45,6 +40,15 @@ public class HuntingSlot : MonoBehaviour
|
|||
_data_left = GameManager.DB.GetHuntingData(index);
|
||||
_data_right = GameManager.DB.GetHuntingData(index + 1);
|
||||
|
||||
gos_openbutton[0].SetActive(false);
|
||||
gos_openbutton[1].SetActive(false);
|
||||
if (_data_left != null && _data_left.Index == unlockTargetIndex)
|
||||
gos_openbutton[0].SetActive(true);
|
||||
if (_data_right != null && _data_right.Index == unlockTargetIndex)
|
||||
gos_openbutton[1].SetActive(true);
|
||||
texts_price[0].text = _data_left.Index.ToString();
|
||||
texts_price[1].text = _data_right.Index.ToString();
|
||||
|
||||
_huntigdata_left = DB_HuntingData.GetEntity(new BansheeGz.BGDatabase.BGId(_data_left.HuntingDataID));
|
||||
|
||||
if (GameManager.BGDatabase.LoadUnlockHuntingImageHandle[_huntigdata_left.GetDBF_UnlockImageAddressablesAddress()].Status == AsyncOperationStatus.Succeeded)
|
||||
|
|
@ -81,40 +85,21 @@ public class HuntingSlot : MonoBehaviour
|
|||
_fullview_Left = true;
|
||||
_fullview_Right = true;
|
||||
|
||||
ClearGO_Left.SetActive(true);
|
||||
ClearGO_Right.SetActive(true);
|
||||
|
||||
Frame_Left.enabled = false;
|
||||
Frame_Right.enabled = false;
|
||||
|
||||
Block_Lock_Left.enabled = false;
|
||||
Block_Lock_Right.enabled = false;
|
||||
Block_Heart_Left.enabled = false;
|
||||
Block_Heart_Right.enabled = false;
|
||||
|
||||
Block_Left.enabled = false;
|
||||
Block_Right.enabled = false;
|
||||
Block_Left.SetActive(false);
|
||||
Block_Right.SetActive(false);
|
||||
}
|
||||
else if (_data_left.Index > unlockTargetIndex)
|
||||
{
|
||||
_fullview_Left = false;
|
||||
_fullview_Right = false;
|
||||
|
||||
ClearGO_Left.SetActive(false);
|
||||
Frame_Left.enabled = false;
|
||||
Block_Left.enabled = true;
|
||||
|
||||
Block_Lock_Left.enabled = true;
|
||||
Block_Heart_Left.enabled = false;
|
||||
// 왼쪽 클리어 못함
|
||||
Block_Left.SetActive(true);
|
||||
|
||||
if (_data_right != null)
|
||||
{
|
||||
ClearGO_Right.SetActive(false);
|
||||
Frame_Right.enabled = false;
|
||||
Block_Right.enabled = true;
|
||||
|
||||
Block_Lock_Right.enabled = true;
|
||||
Block_Heart_Right.enabled = false;
|
||||
// 당연히 오른쪽 클리어 못함
|
||||
Block_Right.SetActive(true);
|
||||
}
|
||||
}
|
||||
else if (_data_left.Index == unlockTargetIndex)
|
||||
|
|
@ -123,21 +108,13 @@ public class HuntingSlot : MonoBehaviour
|
|||
_fullview_Left = false;
|
||||
_fullview_Right = false;
|
||||
|
||||
ClearGO_Left.SetActive(false);
|
||||
Frame_Left.enabled = true;
|
||||
Block_Left.enabled = true;
|
||||
|
||||
Block_Lock_Left.enabled = false;
|
||||
Block_Heart_Left.enabled = true;
|
||||
// 왼쪽 클리어 못 함
|
||||
Block_Left.SetActive(true);
|
||||
|
||||
if (_data_right != null)
|
||||
{
|
||||
ClearGO_Right.SetActive(false);
|
||||
Frame_Right.enabled = false;
|
||||
Block_Right.enabled = true;
|
||||
|
||||
Block_Lock_Right.enabled = true;
|
||||
Block_Heart_Right.enabled = false;
|
||||
// 왼쪽 클리어 못 했으니 열 수 없음
|
||||
Block_Right.SetActive(true);
|
||||
}
|
||||
}
|
||||
else if (_data_right != null)
|
||||
|
|
@ -150,38 +127,19 @@ public class HuntingSlot : MonoBehaviour
|
|||
_fullview_Left = true;
|
||||
_fullview_Right = false;
|
||||
|
||||
ClearGO_Left.SetActive(true);
|
||||
Frame_Left.enabled = false;
|
||||
Block_Left.enabled = false;
|
||||
// 왼쪽 클리어 함
|
||||
Block_Left.SetActive(false);
|
||||
|
||||
Block_Lock_Left.enabled = false;
|
||||
Block_Heart_Left.enabled = false;
|
||||
|
||||
ClearGO_Right.SetActive(false);
|
||||
Frame_Right.enabled = true;
|
||||
Block_Right.enabled = true;
|
||||
|
||||
Block_Lock_Right.enabled = false;
|
||||
Block_Heart_Right.enabled = true;
|
||||
// 오른쪽 클리어 못 함
|
||||
Block_Right.SetActive(true);
|
||||
}
|
||||
else if (_data_right.Index < unlockTargetIndex)
|
||||
{
|
||||
_fullview_Left = true;
|
||||
_fullview_Right = true;
|
||||
|
||||
ClearGO_Left.SetActive(true);
|
||||
ClearGO_Right.SetActive(true);
|
||||
|
||||
Frame_Left.enabled = false;
|
||||
Frame_Right.enabled = false;
|
||||
|
||||
Block_Left.enabled = false;
|
||||
Block_Right.enabled = false;
|
||||
|
||||
Block_Lock_Left.enabled = false;
|
||||
Block_Lock_Right.enabled = false;
|
||||
Block_Heart_Left.enabled = false;
|
||||
Block_Heart_Right.enabled = false;
|
||||
Block_Left.SetActive(false);
|
||||
Block_Right.SetActive(false);
|
||||
}
|
||||
}
|
||||
// 왼쪽 데이터만 있고(총 데이터가 홀수일 경우) 클리어함
|
||||
|
|
@ -190,12 +148,8 @@ public class HuntingSlot : MonoBehaviour
|
|||
_fullview_Left = true;
|
||||
_fullview_Right = false;
|
||||
|
||||
ClearGO_Left.SetActive(true);
|
||||
Frame_Left.enabled = false;
|
||||
Block_Left.enabled = false;
|
||||
|
||||
Block_Lock_Left.enabled = false;
|
||||
Block_Heart_Left.enabled = false;
|
||||
// 왼쪽 클리어 함
|
||||
Block_Left.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue