UI边框

SFGgouhuo/Assets/Bundles/UI/Image/Texture/Frame 36.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: 7e8150abf3513ed47bafe9e79073c821
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SFGgouhuo/Assets/Bundles/UI/Image/Texture/yellowsmall_1.png.meta

@@ -24,7 +24,6 @@ TextureImporter:
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -42,7 +41,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 2
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -159,8 +158,6 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-    nameFileIdTable:
-      yellowsmall_1_0: 461171193
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0

SFGgouhuo/Assets/Bundles/UI/Prefab/FaceBuildPanel.prefab

@@ -475,8 +475,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 423.28897, y: -68.118805}
-  m_SizeDelta: {x: 385.8748, y: 56.2376}
+  m_AnchoredPosition: {x: 434.3, y: -68.118805}
+  m_SizeDelta: {x: 412, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1179904542601660722
 CanvasRenderer:
@@ -506,8 +506,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 3703238767005721515, guid: 43f8ee9fe488eb84594e321c7bf0f20d, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 43f8ee9fe488eb84594e321c7bf0f20d, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1955,7 +1955,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 111.108, y: 47.52}
+  m_SizeDelta: {x: 148, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7528984830664888681
 CanvasRenderer:
@@ -1985,8 +1985,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 3703238767005721515, guid: 43f8ee9fe488eb84594e321c7bf0f20d, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 7e8150abf3513ed47bafe9e79073c821, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

SFGgouhuo/Assets/Bundles/UI/Prefab/LoadingPanel.prefab

@@ -193,7 +193,7 @@ RectTransform:
   m_GameObject: {fileID: 1767289066465777943}
   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_LocalScale: {x: 1, y: 0.94, z: 1}
   m_Children: []
   m_Father: {fileID: 1767289064986538629}
   m_RootOrder: 0

SFGgouhuo/Assets/Scripts/Manager/UIManager.cs

@@ -180,7 +180,6 @@ public class UIManager : MonoBehaviour
         {
             GameObject ui = Instantiate(go);
             ui.GetComponent<BasePanel>()?.OnInitWindow();
-            ui.GetComponent<BasePanel>()?.OnShowWindow();
             ui.transform.SetParent(m_UIRoot.transform);
             RectTransform rect = ui.GetComponent<RectTransform>();
             rect.localPosition = Vector3.zero;

SFGgouhuo/Assets/Scripts/MoveController.cs

@@ -69,15 +69,20 @@ public class MoveController : MonoBehaviour
             // °´Ï¿ոñ¼ü´¥·¢ÌøÔ¾
             if (playerInput.JumpInput)
             {
-                state = PlayerState.JumpUp;
-                Jump();
-                controller.jump = true;
-                jumpTime = 0;
-                hasLand = false;
-                //if (jumpTime >= jumpInterval)
-                //{
-                   
-                //}
+                //state = PlayerState.JumpUp;
+                //Jump();
+                //controller.jump = true;
+                //jumpTime = 0;
+                //hasLand = false;
+
+                if (jumpTime >= jumpInterval)
+                {
+                    state = PlayerState.JumpUp;
+                    Jump();
+                    controller.jump = true;
+                    jumpTime = 0;
+                    hasLand = false;
+                }
             }
 
         }

SFGgouhuo/Assets/Scripts/UI/Component/MainPanel.cs

@@ -64,7 +64,7 @@ public class MainPanel : BasePanel
 
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-
+            await UIManager.Instance.ShowUI(WindowID.DlgExitPop);
         }
     }
     public override void OnCloseWindow() { }

SFGgouhuo/Assets/Scripts/UI/DlgExitPop.cs

@@ -9,6 +9,7 @@ public class DlgExitPop : BasePanel
     public Button returnBtn;
     public override void OnCloseWindow()
     {
+        StepManager.isFaceBuidling = false;
     }
 
     public override void OnDestroyWindow()
@@ -25,6 +26,7 @@ public class DlgExitPop : BasePanel
         {
             Application.Quit();
         });
+        OnShowWindow();
     }
 
     public override void OnShowWindow()