diff --git a/Assets/Prefabs/UI.prefab b/Assets/Prefabs/UI.prefab index 8a875ee..3d6e73c 100644 --- a/Assets/Prefabs/UI.prefab +++ b/Assets/Prefabs/UI.prefab @@ -363,8 +363,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b6a11c113c248ba40878092360565936, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -740,7 +740,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: b6a11c113c248ba40878092360565936, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1059,7 +1059,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 64.16286, y: 0} + m_AnchoredPosition: {x: 66.396866, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!224 &224218339018349506 @@ -1078,8 +1078,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -219} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: -235.94} + m_SizeDelta: {x: 160, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224484966753135898 RectTransform: @@ -1155,8 +1155,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161.7} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: -167.24} + m_SizeDelta: {x: 160, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224833383346886274 RectTransform: diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 04663e7..0bda971 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -849,8 +849,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5d9a051e822e2cf4ea3ca01c5a4df37c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: followSpeed: 0.05 minZoom: 5 zoomFactor: 4 @@ -866,8 +866,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e40ea81463f7264a8ce9334d6bf62ac, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: mixer: {fileID: 24100000, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} maintheme: {fileID: 1600556435} menutheme: {fileID: 30160411} @@ -1153,7 +1153,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.x - value: 65.89836 + value: 66.396866 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -1930,8 +1930,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 87d25c2cd3eb97749b79f2cb5f7c5cea, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: scorpion: {fileID: 1303102899095328, guid: 4c5ecfd27b4038941a6e493a8117ea0a, type: 2} bug: {fileID: 1887677565572348, guid: dd625f75dbf83194392a299951cf04fb, type: 2} BorderOuter: {fileID: 1062532744197412, guid: bc306521f11be424f9833117977b4319, diff --git a/Assets/Scenes/CodeDEVUI.unity b/Assets/Scenes/CodeDEVUI.unity index 81d307a..16d3c92 100644 --- a/Assets/Scenes/CodeDEVUI.unity +++ b/Assets/Scenes/CodeDEVUI.unity @@ -218,17 +218,17 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -238,7 +238,7 @@ Prefab: - target: {fileID: 224150154901314796, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 224035875368067210, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2} @@ -387,6 +387,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5d9a051e822e2cf4ea3ca01c5a4df37c, type: 3} m_Name: m_EditorClassIdentifier: + followSpeed: 0.05 + minZoom: 5 + zoomFactor: 4 + zoomSpeed: 0.05 + startingDist: 5 followThis: {fileID: 0} --- !u!1 &1624368723 GameObject: @@ -461,14 +466,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87d25c2cd3eb97749b79f2cb5f7c5cea, type: 3} m_Name: m_EditorClassIdentifier: + scorpion: {fileID: 0} BorderOuter: {fileID: 1062532744197412, guid: bc306521f11be424f9833117977b4319, type: 2} BorderInner: {fileID: 1893245914782828, guid: 7326753bf2b213d4e8c2ee93d78ba7d9, type: 2} BorderSingle: {fileID: 1277252496101342, guid: ed9537580662f6046a1514a4c5bfdd98, type: 2} - Ground: {fileID: 1487413182883822, guid: bc8a58beb0459094483211a5c7933959, type: 2} - Door: {fileID: 1065161683117842, guid: 06aa81f4fbf9a3a4a8f9fdadafcbf7fa, type: 2} + Ground0: {fileID: 0} + Ground1: {fileID: 0} + Ground2: {fileID: 0} + Ground3: {fileID: 0} + DoorInner: {fileID: 0} + DoorOuter: {fileID: 0} Rock: {fileID: 1373919933116942, guid: 5f26192f79d542e49ad24fadc39f5654, type: 2} RockL: {fileID: 1411303269485816, guid: 92068b1ee4568d045b60c249ba57c186, type: 2} RockU: {fileID: 1990883489100502, guid: c44f475306efef3438b85a84f91fcf81, type: 2} @@ -485,6 +495,7 @@ MonoBehaviour: RockLUR: {fileID: 1938166751346222, guid: 6b83a6a46c57a634fa5085684bad0085, type: 2} RockURD: {fileID: 1437035058628240, guid: 30338afac8ce7054fbff8de89db815e8, type: 2} RockLRD: {fileID: 1251219893662246, guid: e37e0c5d4b013304cbcb32b223264452, type: 2} + Flag: {fileID: 0} playerPrefab: {fileID: 1679161327080020, guid: 3d1911457c1e44f53b6b4044334db52f, type: 2} ui: {fileID: 1723675411} diff --git a/Assets/graphics/textures/UI/singleButton.png.meta b/Assets/graphics/textures/UI/singleButton.png.meta index 633ae5b..6a3f4c8 100644 --- a/Assets/graphics/textures/UI/singleButton.png.meta +++ b/Assets/graphics/textures/UI/singleButton.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: b6a11c113c248ba40878092360565936 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: singleButton_0 externalObjects: {} serializedVersion: 5 mipmaps: @@ -29,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -1 wrapU: 1 @@ -67,9 +68,40 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: singleButton_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 919 + height: 248 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 200, y: 51, z: 191, w: 46} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 596e38377176b48daaee1cf6414d8beb + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: []