diff --git a/Assets/ResWork/Prefab/Play_Ingame.prefab b/Assets/ResWork/Prefab/Play_Ingame.prefab index 4f8b15a..63064c5 100644 --- a/Assets/ResWork/Prefab/Play_Ingame.prefab +++ b/Assets/ResWork/Prefab/Play_Ingame.prefab @@ -156,9 +156,9 @@ RectTransform: - {fileID: 351787397619305960} m_Father: {fileID: 351787397931536801} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 84, y: -28} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 168, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &351787396953488285 @@ -630,9 +630,9 @@ RectTransform: - {fileID: 351787398816937879} m_Father: {fileID: 351787397931536801} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 84, y: -124} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 168, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &351787397989201314 @@ -1066,9 +1066,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 582.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7163430304694369180 @@ -1484,9 +1484,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 171.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7823538357930750549 @@ -1557,9 +1557,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 574, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1167237153372624789 @@ -1669,9 +1669,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 239.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &435610639417173863 @@ -1742,9 +1742,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 174, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1751807646433481151 @@ -1883,9 +1883,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 376.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7600085844187918154 @@ -1956,9 +1956,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 474, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2741785787345250520 @@ -2143,9 +2143,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1061.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &169289265744140556 @@ -2291,9 +2291,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 374, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3012097178321555086 @@ -2326,9 +2326,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3205156981863902613 @@ -2408,9 +2408,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 774, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3310522054914711900 @@ -2703,9 +2703,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 874, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3575237912658796926 @@ -2738,9 +2738,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 674, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3772368741423675718 @@ -2775,9 +2775,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 34.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7400539125868673273 @@ -2850,9 +2850,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 924.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6648869032753469536 @@ -3213,9 +3213,9 @@ RectTransform: - {fileID: 4111377605186515536} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -738} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377604873454818 @@ -3440,9 +3440,9 @@ RectTransform: - {fileID: 4111377606575878288} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -246} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377605057742994 @@ -3668,9 +3668,9 @@ RectTransform: - {fileID: 4111377605378486164} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377605223402643 @@ -4091,9 +4091,9 @@ RectTransform: - {fileID: 4111377606218893651} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -574} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377605604120004 @@ -5247,7 +5247,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4111377606588400904 RectTransform: m_ObjectHideFlags: 0 @@ -5492,7 +5492,7 @@ RectTransform: m_Father: {fileID: 4111377606625657608} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.426, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5604,9 +5604,9 @@ RectTransform: - {fileID: 4111377606184979533} m_Father: {fileID: 4111377605869284182} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74.985, y: -410} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.03, y: 149.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4111377606646784703 @@ -6178,7 +6178,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6303,9 +6303,9 @@ RectTransform: m_Father: {fileID: 4111377606588400904} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 369.05} - m_SizeDelta: {x: 0, y: 738.1} + 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!222 &6270432914261063945 CanvasRenderer: @@ -6328,7 +6328,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.019607844} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6402,9 +6402,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 974, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5407196538856758320 @@ -6589,9 +6589,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6536984518647531088 @@ -6814,9 +6814,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 308.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2756278015230701219 @@ -6889,9 +6889,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 513.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4086053485889352588 @@ -7082,9 +7082,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 102.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7747941206271507375 @@ -7230,9 +7230,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 4565446678480095036} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 274, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7756595007517502617 @@ -7267,9 +7267,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 719.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &210884713592062119 @@ -7342,9 +7342,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 993.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1975886415892911861 @@ -7512,9 +7512,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 856.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2085836979284517684 @@ -7703,7 +7703,7 @@ RectTransform: m_Father: {fileID: 8995922341521496394} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.426, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -7872,9 +7872,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 650.75, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8157428590540182390 @@ -7982,9 +7982,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 6552677842084449146} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 445.25, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 68.5, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7304670376984328887 diff --git a/Assets/ResWork/Table/Export/Projectile.json b/Assets/ResWork/Table/Export/Projectile.json index 64a6d45..46e67b7 100644 --- a/Assets/ResWork/Table/Export/Projectile.json +++ b/Assets/ResWork/Table/Export/Projectile.json @@ -1 +1 @@ -[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"Effect/ArrowHit","f_ProjectileSpeed":"2.6","f_AttackBounceLimit":"1","f_ProjectileDistance":"-1","n_ProjectileLife":"2","f_KnockbackDistance":"0.5"},{"n_ProjectileID":"3002","s_ProjectilePrefabs":"Explosion","s_HitEffect":"","f_ProjectileSpeed":"0","f_AttackBounceLimit":"0","f_ProjectileDistance":"0","n_ProjectileLife":"1","f_KnockbackDistance":"1"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3102","s_ProjectilePrefabs":"Projectile_MobRange","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"}] \ No newline at end of file +[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"Effect/ArrowHit","f_ProjectileSpeed":"2.6","f_AttackBounceLimit":"1","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0.5"},{"n_ProjectileID":"3002","s_ProjectilePrefabs":"Explosion","s_HitEffect":"","f_ProjectileSpeed":"0","f_AttackBounceLimit":"0","f_ProjectileDistance":"0","n_ProjectileLife":"1","f_KnockbackDistance":"1"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"},{"n_ProjectileID":"3102","s_ProjectilePrefabs":"Projectile_MobRange","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/OneShotOneKill.xlsm b/Assets/ResWork/Table/OneShotOneKill.xlsm index 2ac0946..b5f3b8d 100644 Binary files a/Assets/ResWork/Table/OneShotOneKill.xlsm and b/Assets/ResWork/Table/OneShotOneKill.xlsm differ diff --git a/Assets/SampleScene.unity b/Assets/SampleScene.unity index 4cf50db..88b8b12 100644 --- a/Assets/SampleScene.unity +++ b/Assets/SampleScene.unity @@ -17445,6 +17445,222 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 901909686} m_Modifications: + - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 84 + objectReference: {fileID: 0} + - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -28 + objectReference: {fileID: 0} + - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 84 + objectReference: {fileID: 0} + - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -124 + objectReference: {fileID: 0} + - target: {fileID: 1298365646144552531, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1298365646144552531, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1298365646144552531, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 874 + objectReference: {fileID: 0} + - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 719.25 + objectReference: {fileID: 0} + - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 171.25 + objectReference: {fileID: 0} + - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 2066876199044934063, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2066876199044934063, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2066876199044934063, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 774 + objectReference: {fileID: 0} + - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 376.75 + objectReference: {fileID: 0} + - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 993.25 + objectReference: {fileID: 0} + - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 1061.75 + objectReference: {fileID: 0} + - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 924.75 + objectReference: {fileID: 0} + - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74.985 + objectReference: {fileID: 0} + - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -738 + objectReference: {fileID: 0} + - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74.985 + objectReference: {fileID: 0} + - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -246 + objectReference: {fileID: 0} + - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74.985 + objectReference: {fileID: 0} + - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -82 + objectReference: {fileID: 0} + - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74.985 + objectReference: {fileID: 0} + - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -574 + objectReference: {fileID: 0} - target: {fileID: 4111377606588400904, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -17529,10 +17745,302 @@ PrefabInstance: propertyPath: m_Name value: Play_Ingame objectReference: {fileID: 0} + - target: {fileID: 4111377606588400911, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.x + value: 0.426 + objectReference: {fileID: 0} + - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74.985 + objectReference: {fileID: 0} + - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -410 + objectReference: {fileID: 0} + - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 445.25 + objectReference: {fileID: 0} + - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 513.75 + objectReference: {fileID: 0} + - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 5132647679849202458, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5132647679849202458, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5132647679849202458, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 674 + objectReference: {fileID: 0} + - target: {fileID: 5574374908717722177, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5574374908717722177, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5574374908717722177, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 574 + objectReference: {fileID: 0} + - target: {fileID: 5678767516249178587, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5678767516249178587, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5678767516249178587, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 974 + objectReference: {fileID: 0} + - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 34.25 + objectReference: {fileID: 0} + - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 582.25 + objectReference: {fileID: 0} + - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 5997388744017587345, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5997388744017587345, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5997388744017587345, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 174 + objectReference: {fileID: 0} + - target: {fileID: 6081102423751470287, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6081102423751470287, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6081102423751470287, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 474 + objectReference: {fileID: 0} + - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 308.25 + objectReference: {fileID: 0} + - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 6400410528953139288, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6400410528953139288, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6400410528953139288, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 274 + objectReference: {fileID: 0} + - target: {fileID: 6515384493741739115, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6515384493741739115, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6515384493741739115, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 74 + objectReference: {fileID: 0} + - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 787.75 + objectReference: {fileID: 0} + - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 102.75 + objectReference: {fileID: 0} + - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 7296985114498065767, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.x + value: 0.426 + objectReference: {fileID: 0} + - target: {fileID: 7296985114498065767, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7344498057576682711, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1571370886} + - target: {fileID: 8201494079889326027, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8201494079889326027, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8201494079889326027, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 374 + objectReference: {fileID: 0} + - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 856.25 + objectReference: {fileID: 0} + - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 650.75 + objectReference: {fileID: 0} + - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.x + value: 239.75 + objectReference: {fileID: 0} + - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Script/InGame/Actor/AimArrowController.cs b/Assets/Script/InGame/Actor/AimArrowController.cs index 1d51880..c091da5 100644 --- a/Assets/Script/InGame/Actor/AimArrowController.cs +++ b/Assets/Script/InGame/Actor/AimArrowController.cs @@ -11,7 +11,7 @@ public class AimArrowController : MonoBehaviour void Start() { - //arrow.enabled = false; + arrow.enabled = false; } private void OnEnable() @@ -56,6 +56,11 @@ public class AimArrowController : MonoBehaviour UpdateArrow(screenPos); } + public void OnAimEnd() + { + arrow.enabled = false; + } + void Shoot() { var unit = IngameMgr.Ins.Get_CurUnitTData(); @@ -106,6 +111,8 @@ public class AimArrowController : MonoBehaviour void UpdateArrow(Vector2 currentPos) { + arrow.enabled = true; + Vector2 dir = currentPos - (Vector2)arrow.transform.position; float angle = (Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg - 45f) * 7.5f; diff --git a/Assets/Script/InGame/Actor/AimInputArea.cs b/Assets/Script/InGame/Actor/AimInputArea.cs index bfffc52..9a4463f 100644 --- a/Assets/Script/InGame/Actor/AimInputArea.cs +++ b/Assets/Script/InGame/Actor/AimInputArea.cs @@ -17,6 +17,6 @@ public class AimInputArea : MonoBehaviour, IPointerDownHandler, IPointerUpHandle public void OnPointerUp(PointerEventData eventData) { - //aim.OnAimEnd(); + aim.OnAimEnd(); } } \ No newline at end of file diff --git a/Assets/Script/InGame/Projectile/Projectile.cs b/Assets/Script/InGame/Projectile/Projectile.cs index 7076310..4ba6773 100644 --- a/Assets/Script/InGame/Projectile/Projectile.cs +++ b/Assets/Script/InGame/Projectile/Projectile.cs @@ -9,7 +9,7 @@ public class Projectile : MonoBehaviour Vector2 dir; Vector2 prevPos; - ObscuredInt m_bounceCount; + ObscuredInt m_ReflectCount; float m_LifeTime; ProjectileData m_ProjectileData; @@ -36,8 +36,8 @@ public class Projectile : MonoBehaviour public void Set(ProjectileData pd) { m_ProjectileData = pd; - m_LifeTime = m_ProjectileData.m_Data.n_ProjectileLife; + Vector3 pos = pd.tf_Start.position; Quaternion rot = pd.tf_Start.rotation; @@ -79,9 +79,9 @@ public class Projectile : MonoBehaviour dir = transform.up.normalized; - m_bounceCount = m_ProjectileData.m_Data.n_AttackBounceLimit; + m_ReflectCount = m_ProjectileData.m_Data.n_AttackBounceLimit; if (pd.IsPC) - m_bounceCount += (int)IngameMgr.Ins.Get_SkillValue(eSkillType.Reflect); + m_ReflectCount += (int)IngameMgr.Ins.Get_SkillValue(eSkillType.Reflect); if (m_ProjectileData.m_Data.n_ProjectileID == 3002) { @@ -90,9 +90,9 @@ public class Projectile : MonoBehaviour var skillTdata = table_skill.Ins.Get_Data(eSkillType.Explosion); var scale = skillTdata.f_ExplosionScale + (skillTdata.f_ExplosionScalePerLv * (lv - 1)); transform.localScale = Vector3.one * scale; - m_bounceCount = 0; + m_ReflectCount = 0; } - m_bounceCount.RandomizeCryptoKey(); + m_ReflectCount.RandomizeCryptoKey(); } void Update() @@ -129,7 +129,7 @@ public class Projectile : MonoBehaviour return; } - if (m_bounceCount <= 0) + if (m_ReflectCount <= 0) { Kill(); return; @@ -180,8 +180,8 @@ public class Projectile : MonoBehaviour // 반사 dir = Vector2.Reflect(dir, normal).normalized; - m_bounceCount--; - m_bounceCount.RandomizeCryptoKey(); + m_ReflectCount--; + m_ReflectCount.RandomizeCryptoKey(); // 회전 float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg - 90f; @@ -189,8 +189,6 @@ public class Projectile : MonoBehaviour // 위치 보정 transform.position = targetPos; - - } void Check_Hit(Collider2D collision) @@ -307,10 +305,8 @@ public class Projectile : MonoBehaviour return; } - Vector3 dir = (target.transform.position - mob.transform.position).normalized; - - SetDirection(dir); --m_ProjectileData.Bounce; + SpawnExtra(mob.transform.position, target.transform.position - mob.transform.position); } }