diff --git a/Assets/Prefab/PlayerControlView.prefab b/Assets/Prefab/PlayerControlView.prefab index 2090d72e..ebb15cf0 100644 --- a/Assets/Prefab/PlayerControlView.prefab +++ b/Assets/Prefab/PlayerControlView.prefab @@ -29,8 +29,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1663236856136613725} - - {fileID: 5903238893920995269} - - {fileID: 5909765210375931188} + - {fileID: 2767337011590577117} + - {fileID: 2425635720154983188} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52,348 +52,340 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: moveJoystick: {fileID: 1663236856136613724} - attackJoystick: {fileID: 5903238893920995264} - placeJoystick: {fileID: 5909765210375931185} ---- !u!1001 &2346010270301780417 + attackJoystick: {fileID: 2767337011590577116} + placeJoystick: {fileID: 2425635720154983189} +--- !u!1001 &5855224151298771282 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 2346010271288414180} m_Modifications: - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: deadZone - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: timeToFade - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: transparency - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: isToTranparency - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Pivot.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.x - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.y - value: -600 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchoredPosition.x - value: -400 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchoredPosition.y - value: 400 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_Name - value: AttackJoystick - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: d291abfba78d1da41807b9080554b675, type: 3} - - target: {fileID: 8170153792821263252, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 4db2952f6e3f0bc43889874a9299ff0e, type: 3} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.y - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchoredPosition.x - value: 222 - objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_AnchoredPosition.y - value: 140 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} ---- !u!224 &5903238893920995269 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - m_PrefabInstance: {fileID: 2346010270301780417} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5903238893920995264 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - m_PrefabInstance: {fileID: 2346010270301780417} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a47f546fc70ec8428172694e78e4288, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &2549463672493996848 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2346010271288414180} - m_Modifications: - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: deadZone - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: timeToFade - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: transparency - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: isToTranparency - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.x value: 400 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.y value: -600 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchoredPosition.x value: -400 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchoredPosition.y value: 400 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: timeToFade + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: transparency + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: isToTranparency + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738825, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Name value: PlaceJoystic objectReference: {fileID: 0} - - target: {fileID: 8170153791668043269, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886326569738825, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 271a63d73be51f64dbf31b6b20b0fcb2, type: 3} - - target: {fileID: 8170153792821263252, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886327475159576, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 2f51e0c9d4b837c419aab13bd3a5a8c9, type: 3} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.x value: 300 objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.y value: 300 objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchoredPosition.x - value: 222 + value: -200 objectReference: {fileID: 0} - - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchoredPosition.y - value: 140 + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 8135886327784587630, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 271a63d73be51f64dbf31b6b20b0fcb2, type: 3} + - target: {fileID: 8135886327784587633, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8135886327784587633, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.y + value: 100 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} ---- !u!224 &5909765210375931188 stripped + m_SourcePrefab: {fileID: 100100000, guid: 56fae09712773584fb63896d473a98ee, type: 3} +--- !u!224 &2425635720154983188 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - m_PrefabInstance: {fileID: 2549463672493996848} + m_CorrespondingSourceObject: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + m_PrefabInstance: {fileID: 5855224151298771282} m_PrefabAsset: {fileID: 0} ---- !u!114 &5909765210375931185 stripped +--- !u!114 &2425635720154983189 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} - m_PrefabInstance: {fileID: 2549463672493996848} + m_CorrespondingSourceObject: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + m_PrefabInstance: {fileID: 5855224151298771282} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a47f546fc70ec8428172694e78e4288, type: 3} + m_Script: {fileID: 11500000, guid: ba0d0e7a039f526499c356a3c5cd6d3f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &6237476531073980827 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2346010271288414180} + m_Modifications: + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.y + value: -600 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchoredPosition.x + value: -400 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchoredPosition.y + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: timeToFade + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: transparency + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: isToTranparency + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738825, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_Name + value: AttackJoystic + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159576, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4db2952f6e3f0bc43889874a9299ff0e, type: 3} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.y + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchoredPosition.x + value: -200 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchoredPosition.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 8135886327784587630, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d291abfba78d1da41807b9080554b675, type: 3} + - target: {fileID: 8135886327784587633, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8135886327784587633, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56fae09712773584fb63896d473a98ee, type: 3} +--- !u!224 &2767337011590577117 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8135886326569738822, guid: 56fae09712773584fb63896d473a98ee, type: 3} + m_PrefabInstance: {fileID: 6237476531073980827} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2767337011590577116 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + m_PrefabInstance: {fileID: 6237476531073980827} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba0d0e7a039f526499c356a3c5cd6d3f, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1001 &7493277957288992027 @@ -517,11 +509,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchoredPosition.x - value: 162.04314 + value: 200 objectReference: {fileID: 0} - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_AnchoredPosition.y - value: 162.04315 + value: 200 objectReference: {fileID: 0} - target: {fileID: 8135886327784587630, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Sprite diff --git a/Assets/Scenes/FieldData.asset b/Assets/Scenes/FieldData.asset new file mode 100644 index 00000000..ec7f5b4d --- /dev/null +++ b/Assets/Scenes/FieldData.asset @@ -0,0 +1,23 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1700d9ee2ab4d8e8ac1b551b7c93ce8, type: 3} + m_Name: FieldData + m_EditorClassIdentifier: + width: 6 + height: 6 + hexCaptureManaCost: 0 + hexHardCaptureManaCost: 0 + hexHardCaptureTime: 0 + cellPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688, type: 3} + cellLabelPrefab: {fileID: 0} + CoordinatesCanvas: {fileID: 0} + colors: [] diff --git a/Assets/Scenes/FieldData.asset.meta b/Assets/Scenes/FieldData.asset.meta new file mode 100644 index 00000000..bd8d5f56 --- /dev/null +++ b/Assets/Scenes/FieldData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 503471ee54dd6d047b2708ff2454c38f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/HexTest.meta b/Assets/Scenes/HexTest.meta new file mode 100644 index 00000000..cd2708c8 --- /dev/null +++ b/Assets/Scenes/HexTest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cde640b28d28d9d44884fde46fe58fbf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/HexTest/New Palette.prefab b/Assets/Scenes/HexTest/New Palette.prefab new file mode 100644 index 00000000..59729cdc --- /dev/null +++ b/Assets/Scenes/HexTest/New Palette.prefab @@ -0,0 +1,179 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &573487771985128269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7336257010221584373} + - component: {fileID: 2261832089206299311} + - component: {fileID: 3682028664096015806} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7336257010221584373 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573487771985128269} + 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_Children: [] + m_Father: {fileID: 6325281106960576957} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &2261832089206299311 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573487771985128269} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0, y: 0, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &3682028664096015806 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573487771985128269} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1 &5709523213856216068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6325281106960576957} + - component: {fileID: 4694445811689797251} + m_Layer: 31 + m_Name: New Palette + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6325281106960576957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5709523213856216068} + 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_Children: + - {fileID: 7336257010221584373} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &4694445811689797251 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5709523213856216068} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 1 + m_CellSwizzle: 0 +--- !u!114 &1048497982843186255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 + m_TransparencySortMode: 2 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Scenes/HexTest/New Palette.prefab.meta b/Assets/Scenes/HexTest/New Palette.prefab.meta new file mode 100644 index 00000000..93835020 --- /dev/null +++ b/Assets/Scenes/HexTest/New Palette.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6129d4bf5c9ee654394c0733076e9b2e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 7159ad7a..8d072227 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -587,7 +587,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1475618469 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LevelEditor.unity b/Assets/Scenes/LevelEditor.unity new file mode 100644 index 00000000..0cb0cf77 --- /dev/null +++ b/Assets/Scenes/LevelEditor.unity @@ -0,0 +1,367 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &345157413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 345157415} + - component: {fileID: 345157414} + m_Layer: 0 + m_Name: Editor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &345157414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345157413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72e29f1d38b64a76b778e76173bdd3eb, type: 3} + m_Name: + m_EditorClassIdentifier: + cellColors: + - _unitColor: 0 + _texture: {fileID: 2800000, guid: 0298dfcb0756f534a9a125d510461c7a, type: 3} + _vfxCellCapturePrefab: {fileID: 8021195855904498788, guid: 2f6d0540c8fd7bb46b356ff86962379c, type: 3} + _vfxDeathPrefab: {fileID: 8483527721606052447, guid: fd7fc481b936cf84a90d2d01d83e9b06, type: 3} + - _unitColor: 1 + _texture: {fileID: 2800000, guid: 3b75368df991b164583e8cede390e24e, type: 3} + _vfxCellCapturePrefab: {fileID: 442387583353148024, guid: 53959bc898e9a644daad0282881d596a, type: 3} + _vfxDeathPrefab: {fileID: 730781534364879866, guid: 15620662117187f419d41032a4267445, type: 3} + - _unitColor: 2 + _texture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3} + _vfxCellCapturePrefab: {fileID: 0} + _vfxDeathPrefab: {fileID: 0} + - _unitColor: 3 + _texture: {fileID: 2800000, guid: 1a76a79d5a83143479c76f4f37c4b896, type: 3} + _vfxCellCapturePrefab: {fileID: 5732852186060375560, guid: 54d847a18c62f57479c53469d4398ceb, type: 3} + _vfxDeathPrefab: {fileID: 7140011676602114744, guid: 6d9f179a27798c248b3c35df9139eb85, type: 3} + - _unitColor: 4 + _texture: {fileID: 2800000, guid: 779719648deedb4478ddebb3b81751ef, type: 3} + _vfxCellCapturePrefab: {fileID: 1651852338557341938, guid: fa6c1fc3da7c8d24c85a88b00cf598d4, type: 3} + _vfxDeathPrefab: {fileID: 4578021055421768374, guid: b2b879dd7ca552a408d4349691d2c8df, type: 3} + hexPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688, type: 3} + labelPrefab: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19, type: 3} +--- !u!4 &345157415 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345157413} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 714.3687, y: -350.19104, z: 3476.9753} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1585217268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1585217271} + - component: {fileID: 1585217270} + - component: {fileID: 1585217269} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1585217269 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585217268} + m_Enabled: 1 +--- !u!20 &1585217270 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585217268} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1585217271 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585217268} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1815399425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815399427} + - component: {fileID: 1815399426} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1815399426 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815399425} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1815399427 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815399425} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} diff --git a/Assets/Scenes/LevelEditor.unity.meta b/Assets/Scenes/LevelEditor.unity.meta new file mode 100644 index 00000000..8468efad --- /dev/null +++ b/Assets/Scenes/LevelEditor.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f3c2ad9ccead4d45b23681899371bff +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ADs/AdsMob.cs b/Assets/Scripts/ADs/AdsMob.cs index 37cc4dd9..73340fa8 100644 --- a/Assets/Scripts/ADs/AdsMob.cs +++ b/Assets/Scripts/ADs/AdsMob.cs @@ -58,7 +58,7 @@ public class AdsMob : MonoBehaviour canvas.SetActive(false); Time.timeScale = 1f; - buttonContinue.onClick.RemoveAllListeners(); + } // public void ShowAd() diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index e92a186e..5734057b 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -39,7 +39,6 @@ namespace Controller hexGrid.OnGridLoaded += () => unitFactory.SpawnList(data.UnitData.Units); hexGrid.OnHexPainted += paintedController.SetHexColors; - hexGrid.OnHexPainted += itemFabric.UpdateCellToOpenList; hexGrid.OnHexPainted += paintedController.CheckDeathOrDestroy; hexGrid.SpawnField(); } diff --git a/Assets/Scripts/HexFiled/HexCell.cs b/Assets/Scripts/HexFiled/HexCell.cs index f15864a6..e167fd88 100644 --- a/Assets/Scripts/HexFiled/HexCell.cs +++ b/Assets/Scripts/HexFiled/HexCell.cs @@ -4,8 +4,6 @@ using System.Linq; using DefaultNamespace; using Items; using UnityEngine; -using UnityEngine.UI; -using Random = UnityEngine.Random; namespace HexFiled { @@ -24,16 +22,16 @@ namespace HexFiled public UnitColor Color => _color; public Item Item => _item; - private GameObject _towerView; + private GameObject _building; public GameObject Building { - get => _towerView; + get => _building; set { - if (_towerView != null) + if (_building == null) { - _towerView = value; + _building = value; } } } diff --git a/Assets/Scripts/HexFiled/HexGrid.cs b/Assets/Scripts/HexFiled/HexGrid.cs index b8e0bb40..2a210e25 100644 --- a/Assets/Scripts/HexFiled/HexGrid.cs +++ b/Assets/Scripts/HexFiled/HexGrid.cs @@ -9,6 +9,7 @@ using Object = UnityEngine.Object; namespace HexFiled { + [Serializable] public class HexGrid { @@ -35,7 +36,6 @@ namespace HexFiled public HexGrid(FieldData fieldData) { _fieldData = fieldData; - _baseGameObject = new GameObject("HexGrid"); _colors = new Dictionary(fieldData.colors.Count); foreach (var color in fieldData.colors) @@ -49,11 +49,31 @@ namespace HexFiled _cells = new HexCell[_fieldData.height * _fieldData.width]; } + public HexGrid(int x, int y, GameObject hexPrefab, List cellColors, GameObject lablePrefab) + { + _colors = new Dictionary(cellColors.Count); + + _baseGameObject = new GameObject("HexGrid"); + _fieldData = ScriptableObject.CreateInstance(); + _fieldData.height = y; + _fieldData.width = x; + _fieldData.cellPrefab = hexPrefab; + _fieldData.CoordinatesCanvas = lablePrefab; + + foreach (var color in cellColors) + { + _colors.Add(color.UnitColor, color); + } + + _gridCanvas = Object.Instantiate(_fieldData.CoordinatesCanvas, _baseGameObject.transform) + .GetComponent(); + HexManager.CellByColor = new Dictionary>(); + _cells = new HexCell[_fieldData.height * _fieldData.width]; + } + public HexCell GetCellFromCoord(HexCoordinates coordinates) { - return _cells.First(cell => cell.coordinates.Equals(coordinates)); - } @@ -103,16 +123,16 @@ namespace HexFiled } -#if UNITY_EDITOR - TMP_Text label = Object.Instantiate(_fieldData.cellLabelPrefab, _gridCanvas.transform, false); - label.rectTransform.anchoredPosition = - new Vector2(position.x, position.z); - label.text = cell.coordinates.ToStringOnSeparateLines(); -#endif +// #if UNITY_EDITOR +// TMP_Text label = Object.Instantiate(_fieldData.cellLabelPrefab, _gridCanvas.transform, false); +// label.rectTransform.anchoredPosition = +// new Vector2(position.x, position.z); +// label.text = cell.coordinates.ToStringOnSeparateLines(); +// #endif } - public void SpawnField() + public GameObject SpawnField() { for (int z = 0, i = 0; z < _fieldData.height; z++) @@ -124,6 +144,7 @@ namespace HexFiled } OnGridLoaded?.Invoke(); + return _baseGameObject; } } } \ No newline at end of file diff --git a/Assets/Scripts/HexFiled/PaintedController.cs b/Assets/Scripts/HexFiled/PaintedController.cs index 17ef502d..14d6b9a3 100644 --- a/Assets/Scripts/HexFiled/PaintedController.cs +++ b/Assets/Scripts/HexFiled/PaintedController.cs @@ -33,7 +33,7 @@ namespace HexFiled { HexManager.UnitCurrentCell .Where(cells - => HexManager.CellByColor[cells.Key].Count < 2 + => HexManager.CellByColor[cells.Key].Count < 3 || (cells.Value.cell == cell && cells.Value.unit.Color != cell.Color)) .Select(cells => cells.Value.unit) .ToList().ForEach(x => x.Death()); @@ -42,6 +42,11 @@ namespace HexFiled { Object.Destroy(cell.Building); } + + if (cell.Item != null) + { + cell.Item.Despawn(); + } } public void SetHexColors(HexCell cell) { diff --git a/Assets/Scripts/HexMapEditor.cs b/Assets/Scripts/HexMapEditor.cs new file mode 100644 index 00000000..1cdab22b --- /dev/null +++ b/Assets/Scripts/HexMapEditor.cs @@ -0,0 +1,82 @@ +using System.Collections.Generic; +using System.IO; +using HexFiled; +using UnityEngine; +using UnityEngine.Purchasing.MiniJSON; + +namespace DefaultNamespace +{ + public class HexMapEditor : MonoBehaviour + { + [SerializeField] private List cellColors; + [SerializeField] private GameObject hexPrefab; + [SerializeField] private GameObject labelPrefab; + + private HexGrid hexGrid; + + private Color activeColor; + private GameObject fieldBaseGameObject; + + + [EditorButton] + private void DrawMap(int x, int y) + { + if (hexGrid != null) + { + Destroy(fieldBaseGameObject); + } + + hexGrid = new HexGrid(x, y, hexPrefab, cellColors, labelPrefab); + WriteToBinaryFile("HexField", hexGrid); + fieldBaseGameObject = hexGrid.SpawnField(); + } + + [EditorButton] + private void LoadMap(string name) + { + if (File.Exists(name)) + { + hexGrid = ReadFromBinaryFile("HexField"); + hexGrid.SpawnField(); + } + } + + public static void WriteToBinaryFile(string filePath, T objectToWrite, bool append = false) + { + using (Stream stream = File.Open(filePath, append ? FileMode.Append : FileMode.Create)) + { + var binaryFormatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter(); + binaryFormatter.Serialize(stream, objectToWrite); + } + } + + + public static T ReadFromBinaryFile(string filePath) + { + using (Stream stream = File.Open(filePath, FileMode.Open)) + { + var binaryFormatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter(); + return (T)binaryFormatter.Deserialize(stream); + } + } + + void Update() + { + if (Input.GetMouseButton(0)) + { + HandleInput(); + } + } + + void HandleInput() + { + Ray inputRay = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit hit; + if (Physics.Raycast(inputRay, out hit)) + { + var coord = HexCoordinates.FromPosition(hit.point); + hexGrid.GetCellFromCoord(coord).PaintHex(UnitColor.Green); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/HexMapEditor.cs.meta b/Assets/Scripts/HexMapEditor.cs.meta new file mode 100644 index 00000000..c4fbd9a1 --- /dev/null +++ b/Assets/Scripts/HexMapEditor.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 72e29f1d38b64a76b778e76173bdd3eb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - hexPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688, type: 3} + - labelPrefab: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19, type: 3} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Items/Building.cs b/Assets/Scripts/Items/Building.cs index beae8d43..1733c57a 100644 --- a/Assets/Scripts/Items/Building.cs +++ b/Assets/Scripts/Items/Building.cs @@ -8,23 +8,23 @@ namespace Items [CreateAssetMenu(fileName = "BuildingItem", menuName = "Item/Building")] public class Building : Item { - [SerializeField] private GameObject buildingPrefab; - - + + public void Invoke(Action action) { OnItemUsed += action; } - + public void PlaceItem(HexCell cell) { Unit.UseItem(this); - var obj = SpawnHelper.Spawn(buildingPrefab, cell.transform.position + buildingPrefab.transform.position); + var obj = GameObject.Instantiate(buildingPrefab, + cell.transform.position + buildingPrefab.transform.position, Quaternion.identity); obj.GetComponent()?.SetUp(Unit.Color); obj.GetComponent()?.SetUp(Unit); - cell.Building = obj; + cell.Building = obj; OnItemUsed.Invoke(); OnItemUsed = null; } diff --git a/Assets/Scripts/Items/CaptureAbility.cs b/Assets/Scripts/Items/CaptureAbility.cs index 2b60e6c9..3b4c084d 100644 --- a/Assets/Scripts/Items/CaptureAbility.cs +++ b/Assets/Scripts/Items/CaptureAbility.cs @@ -52,6 +52,7 @@ namespace Items var cell = HexManager.UnitCurrentCell[Unit.Color].cell.GetNeighbor(_direction); cell.PaintHex(Unit.Color); bool keepGoing = true; + var moveDir = _direction; itterationMove.ForEach(dir => { if (!keepGoing) return; @@ -76,6 +77,7 @@ namespace Items }); OnItemUsed?.Invoke(); + Unit.Move(moveDir); Unit.UnitView.AnimActionDic[animName] -= DoPaint; OnItemUsed = null; } diff --git a/Assets/Scripts/Items/Item.cs b/Assets/Scripts/Items/Item.cs index c2cff74d..800bde5c 100644 --- a/Assets/Scripts/Items/Item.cs +++ b/Assets/Scripts/Items/Item.cs @@ -3,6 +3,7 @@ using DefaultNamespace; using HexFiled; using Units; using UnityEngine; +using Object = UnityEngine.Object; namespace Items { @@ -43,7 +44,7 @@ namespace Items public GameObject Spawn(HexCell cell, GameObject parent, GameObject iconPrefab) { - _instance = SpawnHelper.Spawn(iconPrefab, cell.transform.position + new Vector3(0, 1, 0), parent); + _instance = GameObject.Instantiate(iconPrefab, cell.transform.position + new Vector3(0, 1, 0),Quaternion.identity, parent.transform); _instance.AddComponent().SetUp(this); _instance.AddComponent().isTrigger = true; return _instance; @@ -55,6 +56,11 @@ namespace Items Unit = value.unit; } + public void Despawn() + { + Object.Destroy(_instance); + } + public void Dispose() { OnItemUsed = null; diff --git a/Assets/Scripts/Items/ItemFabric.cs b/Assets/Scripts/Items/ItemFabric.cs index 107cc6b5..dfbb23aa 100644 --- a/Assets/Scripts/Items/ItemFabric.cs +++ b/Assets/Scripts/Items/ItemFabric.cs @@ -15,7 +15,6 @@ namespace Items public static Dictionary Items; public static Dictionary itemIcon; private ItemsData _data; - private List _openList; private List _itemTypes; private GameObject _itemParrant; private float _spawnTime; @@ -27,7 +26,6 @@ namespace Items _itemParrant = new GameObject("Items"); Items = new Dictionary(); _data = data; - _openList = new List(); _spawnTime = Random.Range(data.SpawnTime.from, data.SpawnTime.to); data.Icons.ForEach(icon => { @@ -35,30 +33,44 @@ namespace Items }); } - public void UpdateCellToOpenList(HexCell cell) - { - if (cell.Color != UnitColor.Grey) - { - _openList.Add(cell); - } - else if (_openList.Contains(cell)) - { - _openList.Remove(cell); - } - } + public void Execute() { if (Time.time - time >= _spawnTime) { - List closedList = HexManager.UnitCurrentCell.Select(unitCells => unitCells.Value.cell) - .ToList(); + List closedList = HexManager.UnitCurrentCell + .Select(unitCells => unitCells.Value.cell) + .ToList(); + + foreach (var cellByColor + in HexManager.CellByColor + .Where(cellByColor => cellByColor.Key != UnitColor.Grey)) + { + cellByColor.Value.ForEach(x => + { + if (x.Building != null) + { + closedList.Add(x); + } + }); + } + + List openList = new List(); time = Time.time; - if (_openList.Count == 0) + foreach (var cellByColor + in HexManager.CellByColor + .Where(cellByColor => cellByColor.Key != UnitColor.Grey)) + { + openList.AddRange(cellByColor.Value); + } + + + if (HexManager.CellByColor.Count == 0) { return; } - var cell = _openList[Random.Range(0, _openList.Count - 1)]; + var cell = openList[Random.Range(0, openList.Count - 1)]; if (closedList.Contains(cell) || cell.Item != null) { diff --git a/Assets/Scripts/SpawnHelper.cs b/Assets/Scripts/SpawnHelper.cs deleted file mode 100644 index 9877a77b..00000000 --- a/Assets/Scripts/SpawnHelper.cs +++ /dev/null @@ -1,25 +0,0 @@ -using UnityEngine; - -namespace DefaultNamespace -{ - public static class SpawnHelper - { - public static GameObject Spawn(GameObject gameObject, Vector3 pos) - { - return Object.Instantiate(gameObject, pos, Quaternion.identity); - } - - public static GameObject Spawn(GameObject gameObject, Vector3 pos, GameObject parrant) - { - return Object.Instantiate(gameObject, pos, Quaternion.identity, parrant.transform); - } - - public static GameObject Spawn(GameObject gameObject, GameObject parrant) - { - return Object.Instantiate(gameObject, parrant.transform); - } - public static void Destroy(GameObject obj){ - Object.Destroy(obj); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/SpawnHelper.cs.meta b/Assets/Scripts/SpawnHelper.cs.meta deleted file mode 100644 index 0c0cb88f..00000000 --- a/Assets/Scripts/SpawnHelper.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 6ec94f8447ef4582be47e726718b30b5 -timeCreated: 1641866607 \ No newline at end of file diff --git a/Assets/Scripts/Units/Unit.cs b/Assets/Scripts/Units/Unit.cs index eba32461..340aa648 100644 --- a/Assets/Scripts/Units/Unit.cs +++ b/Assets/Scripts/Units/Unit.cs @@ -254,7 +254,12 @@ namespace Units public void UseItem(Item item) { - _inventory.Remove(item); + if(_inventory.Contains(item)) + _inventory.Remove(item); + else + { + _inventoryDefence.Remove(item); + } } private void MoveEnd() diff --git a/Assets/Scripts/Units/UnitFactory.cs b/Assets/Scripts/Units/UnitFactory.cs index 46a30aad..98f01505 100644 --- a/Assets/Scripts/Units/UnitFactory.cs +++ b/Assets/Scripts/Units/UnitFactory.cs @@ -73,7 +73,7 @@ namespace Chars AIAgent agent = new AIAgent(unitInfo, enemy); - enemy.OnPlayerSpawned += x => _controllers.Add(agent); + //enemy.OnPlayerSpawned += x => _controllers.Add(agent); enemy.OnDeath += x => { _controllers.Remove(agent); }; enemy.OnDeath += _paintedController.PaintOnDeath; enemy.Spawn(unitInfo.spawnPos); diff --git a/HexField b/HexField new file mode 100644 index 00000000..f1e5e4cf Binary files /dev/null and b/HexField differ diff --git a/HexFiled b/HexFiled new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/HexFiled @@ -0,0 +1 @@ +{} \ No newline at end of file