우측 상단이나 좌측 상단에 기존처럼 나가기 버튼이 있어야 할 것 같습니다.
This commit is contained in:
parent
15388414a8
commit
b83eb4a430
|
|
@ -400,7 +400,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &108778914
|
--- !u!224 &108778914
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -566,7 +566,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &558023799
|
--- !u!224 &558023799
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6115,7 +6115,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &1566457456
|
--- !u!224 &1566457456
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -312,7 +312,6 @@ public class ProductSlot : CardBase
|
||||||
{
|
{
|
||||||
StopAllCoroutines();
|
StopAllCoroutines();
|
||||||
|
|
||||||
// 광고 이벤트 연결하기
|
|
||||||
GameManager.ADS.OnCompletedRewardedAd += OnCompletedRewardedAd;
|
GameManager.ADS.OnCompletedRewardedAd += OnCompletedRewardedAd;
|
||||||
|
|
||||||
DateTime loadTime = GameManager.Timer.LoadTime();
|
DateTime loadTime = GameManager.Timer.LoadTime();
|
||||||
|
|
|
||||||
|
|
@ -264,6 +264,138 @@ MonoBehaviour:
|
||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
m_BoolArgument: 0
|
m_BoolArgument: 0
|
||||||
m_CallState: 2
|
m_CallState: 2
|
||||||
|
--- !u!1 &2820602227435207343
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8070767547549588396}
|
||||||
|
- component: {fileID: 7026318972461340541}
|
||||||
|
- component: {fileID: 1828453322460216551}
|
||||||
|
- component: {fileID: 545112349955363323}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: btn_x
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &8070767547549588396
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2820602227435207343}
|
||||||
|
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: 456846148437764429}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: -84, y: -84}
|
||||||
|
m_SizeDelta: {x: 128, y: 128}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &7026318972461340541
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2820602227435207343}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1828453322460216551
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2820602227435207343}
|
||||||
|
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: c7be9d948878f3d4abcff3f46819093e, 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!114 &545112349955363323
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2820602227435207343}
|
||||||
|
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: 1828453322460216551}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 3645905085550438875}
|
||||||
|
m_TargetAssemblyTypeName: ShowPanel, Assembly-CSharp
|
||||||
|
m_MethodName: OnClick_Btn
|
||||||
|
m_Mode: 3
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 4
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
--- !u!1 &4363373613163025496
|
--- !u!1 &4363373613163025496
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -861,6 +993,7 @@ MonoBehaviour:
|
||||||
gos_off:
|
gos_off:
|
||||||
- {fileID: 0}
|
- {fileID: 0}
|
||||||
go_btns: {fileID: 8461513849143437229}
|
go_btns: {fileID: 8461513849143437229}
|
||||||
|
go_x: {fileID: 2820602227435207343}
|
||||||
isFull: 0
|
isFull: 0
|
||||||
--- !u!1 &8755086048526332932
|
--- !u!1 &8755086048526332932
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -894,6 +1027,7 @@ RectTransform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4838641313505026441}
|
- {fileID: 4838641313505026441}
|
||||||
|
- {fileID: 8070767547549588396}
|
||||||
- {fileID: 9045737269745101131}
|
- {fileID: 9045737269745101131}
|
||||||
m_Father: {fileID: 8404604730602711012}
|
m_Father: {fileID: 8404604730602711012}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ public class ShowPanel : MonoBehaviour
|
||||||
public Camera m_Cam;
|
public Camera m_Cam;
|
||||||
public SpriteRenderer i_image;
|
public SpriteRenderer i_image;
|
||||||
public GameObject[] gos_off;
|
public GameObject[] gos_off;
|
||||||
public GameObject go_btns;
|
public GameObject go_btns, go_x;
|
||||||
|
|
||||||
public bool isFull;
|
public bool isFull;
|
||||||
int zoomStep = 0;
|
int zoomStep = 0;
|
||||||
|
|
@ -16,6 +16,7 @@ public class ShowPanel : MonoBehaviour
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
DSUtil.InActivateGameObjects(gos_off);
|
DSUtil.InActivateGameObjects(gos_off);
|
||||||
go_btns.SetActive(true);
|
go_btns.SetActive(true);
|
||||||
|
go_x.SetActive(false);
|
||||||
|
|
||||||
i_image.sprite = data.HuntingImage();
|
i_image.sprite = data.HuntingImage();
|
||||||
isFull = false;
|
isFull = false;
|
||||||
|
|
@ -57,6 +58,7 @@ public class ShowPanel : MonoBehaviour
|
||||||
break;
|
break;
|
||||||
case 1: // 풀 스크린
|
case 1: // 풀 스크린
|
||||||
go_btns.SetActive(false);
|
go_btns.SetActive(false);
|
||||||
|
go_x.SetActive(true);
|
||||||
Invoke("Set_Full", Time.deltaTime);
|
Invoke("Set_Full", Time.deltaTime);
|
||||||
break;
|
break;
|
||||||
case 2: // 확대 (2단계까지만)
|
case 2: // 확대 (2단계까지만)
|
||||||
|
|
@ -75,6 +77,7 @@ public class ShowPanel : MonoBehaviour
|
||||||
{
|
{
|
||||||
isFull = false;
|
isFull = false;
|
||||||
go_btns.SetActive(true);
|
go_btns.SetActive(true);
|
||||||
|
go_x.SetActive(false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue