테스트맵 : 스킬
This commit is contained in:
parent
c1c9f7bc00
commit
a70e91f1a6
|
|
@ -105,6 +105,6 @@ pc 애님 (캐스팅 추가)
|
||||||
-- 몬스터 지정(grid)
|
-- 몬스터 지정(grid)
|
||||||
-- 스탯을 참고할 스폰 아이디 지정 (grid)
|
-- 스탯을 참고할 스폰 아이디 지정 (grid)
|
||||||
-- 마리 수 지정 (화살표)
|
-- 마리 수 지정 (화살표)
|
||||||
- 원하는 스킬 착용(어떻게?)
|
- 스킬 사용
|
||||||
- 원하는 클래스로 변경
|
-- 스크롤뷰와 grid로 모든 스킬을 보여주자
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4185,10 +4185,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 121, y: -333}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3875964648245462270
|
--- !u!222 &3875964648245462270
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -12247,10 +12247,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 121, y: -232}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &987827436419641488
|
--- !u!222 &987827436419641488
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -13085,7 +13085,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &2931286266799411332
|
--- !u!224 &2931286266799411332
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -17588,9 +17588,9 @@ RectTransform:
|
||||||
- {fileID: 1156520485920347372}
|
- {fileID: 1156520485920347372}
|
||||||
m_Father: {fileID: 4546882025923078743}
|
m_Father: {fileID: 4546882025923078743}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 197.84, y: 0}
|
||||||
m_SizeDelta: {x: 116.24, y: 110.83}
|
m_SizeDelta: {x: 116.24, y: 110.83}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5502611037725276666
|
--- !u!222 &5502611037725276666
|
||||||
|
|
@ -26393,6 +26393,81 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 323.5, y: -57}
|
m_AnchoredPosition: {x: 323.5, y: -57}
|
||||||
m_SizeDelta: {x: 115, y: 114}
|
m_SizeDelta: {x: 115, y: 114}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &2040303337869473622
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6607383590716807925}
|
||||||
|
- component: {fileID: 6001942118829984246}
|
||||||
|
- component: {fileID: 8722165255236541168}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Content
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6607383590716807925
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2040303337869473622}
|
||||||
|
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: 3288498722805300974}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0, y: 1}
|
||||||
|
--- !u!114 &6001942118829984246
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2040303337869473622}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_HorizontalFit: 0
|
||||||
|
m_VerticalFit: 2
|
||||||
|
--- !u!114 &8722165255236541168
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2040303337869473622}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Padding:
|
||||||
|
m_Left: 0
|
||||||
|
m_Right: 0
|
||||||
|
m_Top: 0
|
||||||
|
m_Bottom: 0
|
||||||
|
m_ChildAlignment: 0
|
||||||
|
m_StartCorner: 0
|
||||||
|
m_StartAxis: 0
|
||||||
|
m_CellSize: {x: 80, y: 80}
|
||||||
|
m_Spacing: {x: 5, y: 5}
|
||||||
|
m_Constraint: 1
|
||||||
|
m_ConstraintCount: 3
|
||||||
--- !u!1 &2048073296754467902
|
--- !u!1 &2048073296754467902
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -26767,9 +26842,9 @@ RectTransform:
|
||||||
- {fileID: 6185809200227087122}
|
- {fileID: 6185809200227087122}
|
||||||
m_Father: {fileID: 365265949171303323}
|
m_Father: {fileID: 365265949171303323}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 34.365, y: -34.98}
|
||||||
m_SizeDelta: {x: 68.73, y: 69.96}
|
m_SizeDelta: {x: 68.73, y: 69.96}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4656096652649122635
|
--- !u!222 &4656096652649122635
|
||||||
|
|
@ -28206,10 +28281,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 30, y: -30}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1025175467207679131
|
--- !u!222 &1025175467207679131
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -38969,9 +39044,9 @@ RectTransform:
|
||||||
- {fileID: 8627581003307384079}
|
- {fileID: 8627581003307384079}
|
||||||
m_Father: {fileID: 4546882025923078743}
|
m_Father: {fileID: 4546882025923078743}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: -66.64, y: 0}
|
||||||
m_SizeDelta: {x: 116.24, y: 110.83}
|
m_SizeDelta: {x: 116.24, y: 110.83}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4326302710291113810
|
--- !u!222 &4326302710291113810
|
||||||
|
|
@ -44994,10 +45069,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 30, y: -232}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4520777005139245164
|
--- !u!222 &4520777005139245164
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -54439,7 +54514,7 @@ RectTransform:
|
||||||
m_Father: {fileID: 8846584700612234991}
|
m_Father: {fileID: 8846584700612234991}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0.076, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -58953,10 +59028,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 30, y: -333}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5575149044663304857
|
--- !u!222 &5575149044663304857
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -63267,10 +63342,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 30, y: -131}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7693815851412756338
|
--- !u!222 &7693815851412756338
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -67642,9 +67717,9 @@ RectTransform:
|
||||||
- {fileID: 2834052695919924752}
|
- {fileID: 2834052695919924752}
|
||||||
m_Father: {fileID: 365265949171303323}
|
m_Father: {fileID: 365265949171303323}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 425.52002, y: -30.5}
|
||||||
m_SizeDelta: {x: 54, y: 61}
|
m_SizeDelta: {x: 54, y: 61}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8304982110673110685
|
--- !u!222 &8304982110673110685
|
||||||
|
|
@ -70113,10 +70188,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 121, y: -131}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5672886145270032371
|
--- !u!222 &5672886145270032371
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -81122,6 +81197,58 @@ MonoBehaviour:
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!1 &6455558682443836629
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1402876061955995860}
|
||||||
|
- component: {fileID: 1671743925682952777}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: TM_Skills
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1402876061955995860
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6455558682443836629}
|
||||||
|
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: 5901117376602709786}
|
||||||
|
m_Father: {fileID: 5140710283611032768}
|
||||||
|
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 &1671743925682952777
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6455558682443836629}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 68281030f59fa4d4ca7c92ffd1e29d59, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_ScrollRect: {fileID: 2423111728483067558}
|
||||||
|
m_Content: {fileID: 0}
|
||||||
|
go_card: {fileID: 3755946904853327015, guid: ba9d3a9dca146764c9eab1afcce6c695, type: 3}
|
||||||
--- !u!1 &6470673966957830157
|
--- !u!1 &6470673966957830157
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -81761,6 +81888,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8888671814135876509}
|
- {fileID: 8888671814135876509}
|
||||||
- {fileID: 8534670524448106821}
|
- {fileID: 8534670524448106821}
|
||||||
|
- {fileID: 1402876061955995860}
|
||||||
- {fileID: 2328545748799572744}
|
- {fileID: 2328545748799572744}
|
||||||
m_Father: {fileID: 5707331028172779298}
|
m_Father: {fileID: 5707331028172779298}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -81784,6 +81912,8 @@ MonoBehaviour:
|
||||||
gos:
|
gos:
|
||||||
- {fileID: 2189738708965043825}
|
- {fileID: 2189738708965043825}
|
||||||
- {fileID: 7990808232000889390}
|
- {fileID: 7990808232000889390}
|
||||||
|
- {fileID: 6455558682443836629}
|
||||||
|
m_TM_Skills: {fileID: 1671743925682952777}
|
||||||
m_TM_ClassChange: {fileID: 6388885253746773237}
|
m_TM_ClassChange: {fileID: 6388885253746773237}
|
||||||
--- !u!1 &6538721847544858486
|
--- !u!1 &6538721847544858486
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -88714,9 +88844,9 @@ RectTransform:
|
||||||
- {fileID: 3353969789094138875}
|
- {fileID: 3353969789094138875}
|
||||||
m_Father: {fileID: 4546882025923078743}
|
m_Father: {fileID: 4546882025923078743}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: -198.88, y: 0}
|
||||||
m_SizeDelta: {x: 116.24, y: 110.83}
|
m_SizeDelta: {x: 116.24, y: 110.83}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3070673849616192957
|
--- !u!222 &3070673849616192957
|
||||||
|
|
@ -90576,9 +90706,9 @@ RectTransform:
|
||||||
- {fileID: 1629699223974361622}
|
- {fileID: 1629699223974361622}
|
||||||
m_Father: {fileID: 365265949171303323}
|
m_Father: {fileID: 365265949171303323}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 233.62502, y: -34.98}
|
||||||
m_SizeDelta: {x: 68.73, y: 69.96}
|
m_SizeDelta: {x: 68.73, y: 69.96}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5056128966559254441
|
--- !u!222 &5056128966559254441
|
||||||
|
|
@ -97410,7 +97540,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 &2647977513349308266
|
--- !u!224 &2647977513349308266
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -99297,6 +99427,82 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &7977637879722072568
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5901117376602709786}
|
||||||
|
- component: {fileID: 5637349372244370500}
|
||||||
|
- component: {fileID: 2423111728483067558}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: scrollview_
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &5901117376602709786
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7977637879722072568}
|
||||||
|
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: 3288498722805300974}
|
||||||
|
m_Father: {fileID: 1402876061955995860}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -288.54, y: 74.16}
|
||||||
|
m_SizeDelta: {x: 256.23, y: 264.12}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5637349372244370500
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7977637879722072568}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &2423111728483067558
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7977637879722072568}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Content: {fileID: 6607383590716807925}
|
||||||
|
m_Horizontal: 0
|
||||||
|
m_Vertical: 1
|
||||||
|
m_MovementType: 1
|
||||||
|
m_Elasticity: 0.1
|
||||||
|
m_Inertia: 1
|
||||||
|
m_DecelerationRate: 0.135
|
||||||
|
m_ScrollSensitivity: 1
|
||||||
|
m_Viewport: {fileID: 3288498722805300974}
|
||||||
|
m_HorizontalScrollbar: {fileID: 0}
|
||||||
|
m_VerticalScrollbar: {fileID: 0}
|
||||||
|
m_HorizontalScrollbarVisibility: 0
|
||||||
|
m_VerticalScrollbarVisibility: 0
|
||||||
|
m_HorizontalScrollbarSpacing: 0
|
||||||
|
m_VerticalScrollbarSpacing: 0
|
||||||
|
m_OnValueChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
--- !u!1 &7982414795782354612
|
--- !u!1 &7982414795782354612
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -100374,9 +100580,9 @@ RectTransform:
|
||||||
- {fileID: 2114765989467969691}
|
- {fileID: 2114765989467969691}
|
||||||
m_Father: {fileID: 4546882025923078743}
|
m_Father: {fileID: 4546882025923078743}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 65.59999, y: 0}
|
||||||
m_SizeDelta: {x: 116.24, y: 110.83}
|
m_SizeDelta: {x: 116.24, y: 110.83}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &549673083284403424
|
--- !u!222 &549673083284403424
|
||||||
|
|
@ -102954,6 +103160,96 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: -330.99997, y: -624}
|
m_AnchoredPosition: {x: -330.99997, y: -624}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &8241931866955642065
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3288498722805300974}
|
||||||
|
- component: {fileID: 3671222348367252917}
|
||||||
|
- component: {fileID: 7507760526164355661}
|
||||||
|
- component: {fileID: 1190526320336729249}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Viewport
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3288498722805300974
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8241931866955642065}
|
||||||
|
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: 6607383590716807925}
|
||||||
|
m_Father: {fileID: 5901117376602709786}
|
||||||
|
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, y: 1}
|
||||||
|
--- !u!222 &3671222348367252917
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8241931866955642065}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &7507760526164355661
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8241931866955642065}
|
||||||
|
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: 65f581562538e304cbbfe8ee3beab09c, 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 &1190526320336729249
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8241931866955642065}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_ShowMaskGraphic: 0
|
||||||
--- !u!1 &8242294127826119187
|
--- !u!1 &8242294127826119187
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -110903,10 +111199,10 @@ RectTransform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8520504982765498959}
|
m_Father: {fileID: 8520504982765498959}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 121, y: -30}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 60, y: 60}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2311960555711157178
|
--- !u!222 &2311960555711157178
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -114620,9 +114916,9 @@ RectTransform:
|
||||||
- {fileID: 2281335782828250375}
|
- {fileID: 2281335782828250375}
|
||||||
m_Father: {fileID: 365265949171303323}
|
m_Father: {fileID: 365265949171303323}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 133.99501, y: -34.98}
|
||||||
m_SizeDelta: {x: 68.73, y: 69.96}
|
m_SizeDelta: {x: 68.73, y: 69.96}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5826074212647485071
|
--- !u!222 &5826074212647485071
|
||||||
|
|
@ -117214,9 +117510,9 @@ RectTransform:
|
||||||
- {fileID: 269495131661886090}
|
- {fileID: 269495131661886090}
|
||||||
m_Father: {fileID: 365265949171303323}
|
m_Father: {fileID: 365265949171303323}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 333.255, y: -34.98}
|
||||||
m_SizeDelta: {x: 68.73, y: 69.96}
|
m_SizeDelta: {x: 68.73, y: 69.96}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6032891398466555591
|
--- !u!222 &6032891398466555591
|
||||||
|
|
@ -142078,12 +142374,12 @@ PrefabInstance:
|
||||||
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.x
|
propertyPath: m_AnchorMax.x
|
||||||
value: 0.845
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
- target: {fileID: 6641322232018589546, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_AnchorMax.y
|
propertyPath: m_AnchorMax.y
|
||||||
value: 1
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6957816333201879133, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
- target: {fileID: 6957816333201879133, guid: b7647c1153b54fe4c95030106c8c8ab3,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
|
|
||||||
|
|
@ -644,7 +644,7 @@ public class Actor : MyCoroutine
|
||||||
protected virtual void Create_LastEffect() { }
|
protected virtual void Create_LastEffect() { }
|
||||||
public virtual void BossRaidCard_AddDmg(double _dmg) { }
|
public virtual void BossRaidCard_AddDmg(double _dmg) { }
|
||||||
public virtual void BossRaidCard_HP() { }
|
public virtual void BossRaidCard_HP() { }
|
||||||
public virtual bool Use_Skill(SkillListTableData skilldata, bool autoskill, int index)
|
public virtual bool Use_Skill(SkillListTableData skilldata, bool autoskill, int index, bool testskill = false)
|
||||||
{
|
{
|
||||||
if (skilldata.e_SkillType == eSkillType.Passive) return false;
|
if (skilldata.e_SkillType == eSkillType.Passive) return false;
|
||||||
|
|
||||||
|
|
@ -663,6 +663,7 @@ public class Actor : MyCoroutine
|
||||||
if (SilenceCurseData.CCTime > 0f) return false;
|
if (SilenceCurseData.CCTime > 0f) return false;
|
||||||
|
|
||||||
m_Magic = dic_MagicData[index];
|
m_Magic = dic_MagicData[index];
|
||||||
|
if (testskill) m_Magic.m_SkillTableData = skilldata;
|
||||||
|
|
||||||
if (IsDead() || IsCC() || CurAnim >= eAnim.Skill)
|
if (IsDead() || IsCC() || CurAnim >= eAnim.Skill)
|
||||||
{
|
{
|
||||||
|
|
@ -700,14 +701,14 @@ public class Actor : MyCoroutine
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Check_MagicCoolTime(index)) return false;
|
if (!Check_MagicCoolTime(index) && !testskill) return false;
|
||||||
|
|
||||||
list_SkillData[index].m_SkillListTableData = m_Magic.m_SkillTableData;
|
list_SkillData[index].m_SkillListTableData = m_Magic.m_SkillTableData;
|
||||||
list_SkillData[index].target = m_Target;
|
list_SkillData[index].target = m_Target;
|
||||||
m_SkillData = list_SkillData[index];
|
m_SkillData = list_SkillData[index];
|
||||||
m_Stat.Set_Stat(false, eStat.MP, skilldata.n_MP);
|
m_Stat.Set_Stat(false, eStat.MP, skilldata.n_MP);
|
||||||
Set_MagicCoolTime(skilldata.Get_CoolTime(m_Stat.Get_Stat(eStat.COOLTIME_Multiplier)), index);
|
Set_MagicCoolTime(skilldata.Get_CoolTime(m_Stat.Get_Stat(eStat.COOLTIME_Multiplier)), index);
|
||||||
if (IsMainPC()) ServerInfo.Ins.m_ServerData.Add_MissionCount(ePurpose.USE_SKILL_ALL);
|
if (IsMainPC() && !testskill) ServerInfo.Ins.m_ServerData.Add_MissionCount(ePurpose.USE_SKILL_ALL);
|
||||||
return Play_Skill(skilldata.s_Animation);
|
return Play_Skill(skilldata.s_Animation);
|
||||||
}
|
}
|
||||||
public virtual void Shoot_Skill()
|
public virtual void Shoot_Skill()
|
||||||
|
|
|
||||||
|
|
@ -347,6 +347,7 @@ public class PCActor : MyActor
|
||||||
|
|
||||||
public void Change_Class(ClassConfigTableData classdata, bool _ui)
|
public void Change_Class(ClassConfigTableData classdata, bool _ui)
|
||||||
{
|
{
|
||||||
|
m_ID = classdata.n_ClassID;
|
||||||
m_ClassData = classdata;
|
m_ClassData = classdata;
|
||||||
m_NavStopDistance = m_ClassData.f_AttackRange;
|
m_NavStopDistance = m_ClassData.f_AttackRange;
|
||||||
Set_Obj();
|
Set_Obj();
|
||||||
|
|
|
||||||
|
|
@ -225,6 +225,12 @@ public class table_skilllist : table_missionbase
|
||||||
if (skillType == eSkillType.JobPassive) return Get_DataList(classid);
|
if (skillType == eSkillType.JobPassive) return Get_DataList(classid);
|
||||||
return dic_skills[skillType];
|
return dic_skills[skillType];
|
||||||
}
|
}
|
||||||
|
public List<SkillListTableData> Get_TestSkillList(int classid)
|
||||||
|
{
|
||||||
|
var lst = Get_DataList(classid);
|
||||||
|
lst.AddRange(Get_DataList(eSkillType.Active));
|
||||||
|
return lst;
|
||||||
|
}
|
||||||
public SkillListTableData Get_Data_orNull(int _skillid)
|
public SkillListTableData Get_Data_orNull(int _skillid)
|
||||||
{
|
{
|
||||||
return dic_Data.ContainsKey(_skillid) ? dic_Data[_skillid] : null;
|
return dic_Data.ContainsKey(_skillid) ? dic_Data[_skillid] : null;
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public enum eUICardType { NoTouch, UI, Use, GetItem, DetailInfo, Inven, DropInfo, Gamble, UIEquip, MakeMaterial, UIPetSkill, }
|
|
||||||
public enum eUICardSprite { Grade, Icon, PetAttackTypeBG, PetAttackType, Back, SubIcon }
|
public enum eUICardSprite { Grade, Icon, PetAttackTypeBG, PetAttackType, Back, SubIcon }
|
||||||
public enum eUICardLabel { MP, Amount, Lv, AmountOnIcon }
|
public enum eUICardLabel { MP, Amount, Lv, AmountOnIcon }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,13 @@ public class SkillCard : CardCoolTimeBase
|
||||||
case eUICardType.Use:
|
case eUICardType.Use:
|
||||||
et.enabled = true;
|
et.enabled = true;
|
||||||
break;
|
break;
|
||||||
|
case eUICardType.SkillTest:
|
||||||
|
DSUtil.InActivateGameObjects(gos);
|
||||||
|
GetComponentInChildren<Button>().onClick.AddListener(() =>
|
||||||
|
{
|
||||||
|
MyValue.MyPC.Use_Skill(m_Data, false, m_Index, true);
|
||||||
|
});
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,5 +18,6 @@ public class TM_ClassChangeCard : CardBase
|
||||||
MyValue.MyPC.Change_Class(m_Data, false);
|
MyValue.MyPC.Change_Class(m_Data, false);
|
||||||
ToastUI.Ins.Set(174, "직업 번경 : " + t_class.text);
|
ToastUI.Ins.Set(174, "직업 번경 : " + t_class.text);
|
||||||
TestMapUIMgr.Ins.m_TM_ClassChange.OnClick_Back();
|
TestMapUIMgr.Ins.m_TM_ClassChange.OnClick_Back();
|
||||||
|
TestMapUIMgr.Ins.m_TM_Skills.Set_UI();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
public class TM_Skills : uScrollViewMgr
|
||||||
|
{
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
Set_UI();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Set_UI()
|
||||||
|
{
|
||||||
|
Set_ScrollView(table_skilllist.Ins.Get_TestSkillList(MyValue.MyPC.Get_ID()));
|
||||||
|
list_CardBase.ForEach(f => f.Set_CardType(eUICardType.UI));
|
||||||
|
list_CardBase.ForEach(f => f.Set_CardType(eUICardType.SkillTest));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 68281030f59fa4d4ca7c92ffd1e29d59
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -3,6 +3,7 @@ using UnityEngine;
|
||||||
public class TestMapUIMgr : MonoBehaviourSingletonTemplate<TestMapUIMgr>
|
public class TestMapUIMgr : MonoBehaviourSingletonTemplate<TestMapUIMgr>
|
||||||
{
|
{
|
||||||
public GameObject[] gos; // 0 캐릭터 설정, 1 몬스터 설정
|
public GameObject[] gos; // 0 캐릭터 설정, 1 몬스터 설정
|
||||||
|
public TM_Skills m_TM_Skills;
|
||||||
public TM_ClassChange m_TM_ClassChange;
|
public TM_ClassChange m_TM_ClassChange;
|
||||||
|
|
||||||
private void Start() { Set_TestBtns(false); }
|
private void Start() { Set_TestBtns(false); }
|
||||||
|
|
|
||||||
|
|
@ -373,4 +373,8 @@ public enum ePurpose
|
||||||
|
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
public enum eTime { LastConnect, DrawlotsAD_Equipment, DrawlotsAD_Party, Free_Gem, Free_Stone, Free_Potion, Free_PartyStone, Free_AvatarStone, Free_Ticket, Buff4_7Days, AD_7Days, SuperCarrot, Free_JPoint, Max }
|
public enum eUICardType { NoTouch, UI, Use, GetItem, DetailInfo, Inven, DropInfo, Gamble, UIEquip, MakeMaterial, UIPetSkill,
|
||||||
|
|
||||||
|
|
||||||
|
SkillTest
|
||||||
|
}
|
||||||
|
|
@ -33,7 +33,6 @@ public class MyEnumToInt : MonoBehaviour
|
||||||
InitializeEnumMapping<eBuff>();
|
InitializeEnumMapping<eBuff>();
|
||||||
InitializeEnumMapping<eAttendance>();
|
InitializeEnumMapping<eAttendance>();
|
||||||
InitializeEnumMapping<ePurpose>();
|
InitializeEnumMapping<ePurpose>();
|
||||||
InitializeEnumMapping<eTime>();
|
|
||||||
InitializeEnumMapping<eBattleType>();
|
InitializeEnumMapping<eBattleType>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue