Browse Source

主界面语言切换UI修改

DESKTOP-5BUCSUT\LSR 1 year ago
parent
commit
f8e64f5079

BIN
SFGgouhuo/Assets/Bundles/UI/Image/lan/Return.png


+ 133 - 0
SFGgouhuo/Assets/Bundles/UI/Image/lan/Return.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: ac001bcba37c5c940ab83977976352d9
+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: 

BIN
SFGgouhuo/Assets/Bundles/UI/Image/lan/返回.png


+ 133 - 0
SFGgouhuo/Assets/Bundles/UI/Image/lan/返回.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: f46b1b0ae88358344bd7c9467a17cbd8
+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: 

+ 151 - 82
SFGgouhuo/Assets/Bundles/UI/Prefab/GuidePanel.prefab

@@ -305,6 +305,140 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5255154003034208708
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2291522616154247326}
+  - component: {fileID: 1334922245118025336}
+  - component: {fileID: 8665356977182119668}
+  m_Layer: 5
+  m_Name: lan_Return
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2291522616154247326
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5255154003034208708}
+  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: 2134290623103035163}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1334922245118025336
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5255154003034208708}
+  m_CullTransparentMesh: 1
+--- !u!114 &8665356977182119668
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5255154003034208708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\u8FD4\u56DE"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 18cb8b8d5310b5d49ae0ec1b446a2110, type: 2}
+  m_sharedMaterial: {fileID: -8851797225679313563, guid: 18cb8b8d5310b5d49ae0ec1b446a2110, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6419792447571137576
 GameObject:
   m_ObjectHideFlags: 0
@@ -538,85 +672,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &7530907924932058601
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8904941370285500391}
-  - component: {fileID: 51805678819592598}
-  - component: {fileID: 6129028833471174937}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &8904941370285500391
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7530907924932058601}
-  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: 2134290623103035163}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &51805678819592598
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7530907924932058601}
-  m_CullTransparentMesh: 1
---- !u!114 &6129028833471174937
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7530907924932058601}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Button
 --- !u!1 &8281299553909788914
 GameObject:
   m_ObjectHideFlags: 0
@@ -705,8 +760,9 @@ GameObject:
   - component: {fileID: 6608411914787077114}
   - component: {fileID: 5697229097443922283}
   - component: {fileID: 4050656233812997877}
+  - component: {fileID: 7169642517515147969}
   m_Layer: 5
-  m_Name: ReturnButton
+  m_Name: lan_ReturnImg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -723,7 +779,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 8904941370285500391}
+  - {fileID: 2291522616154247326}
   m_Father: {fileID: 592131115250203524}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -760,7 +816,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 87f844d08b5cdae4ca5b7197961f562f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: f46b1b0ae88358344bd7c9467a17cbd8, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -814,6 +870,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7169642517515147969
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8688798155438611575}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: be71fff96e530c74b8d5582f4db61eed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  configName: ReturnImg
 --- !u!1001 &3260549996402413372
 PrefabInstance:
   m_ObjectHideFlags: 0

BIN
SFGgouhuo/Assets/Config/Lan/localLanguage.xlsx


+ 21 - 21
SFGgouhuo/Assets/GameResources/Player/PlayerArmature.prefab

@@ -152,7 +152,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900362077118}
-  m_LocalRotation: {x: 0.5874555, y: 0.053672105, z: 0.009525301, w: 0.8074185}
+  m_LocalRotation: {x: 0.5888149, y: 0.053610746, z: 0.009317557, w: 0.8064343}
   m_LocalPosition: {x: 0.000004911422, y: 0.3789641, z: 0.0000036811825}
   m_LocalScale: {x: 0.9999998, y: 1.0000001, z: 0.99999994}
   m_Children:
@@ -463,7 +463,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900711909222}
-  m_LocalRotation: {x: -0.0030741394, y: 0.109599285, z: -0.78327847, w: 0.6119261}
+  m_LocalRotation: {x: -0.0030739326, y: 0.10959926, z: -0.7832783, w: 0.6119262}
   m_LocalPosition: {x: 0.048186224, y: 0.14500271, z: 0.00531524}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -494,8 +494,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900721381661}
-  m_LocalRotation: {x: -0.0023055444, y: 0.07747121, z: 0.9964479, w: 0.032930717}
-  m_LocalPosition: {x: -0.068759926, y: -0.042314716, z: 0.022964101}
+  m_LocalRotation: {x: -0.0021221614, y: 0.07969714, z: 0.9962602, w: 0.033309963}
+  m_LocalPosition: {x: -0.068759926, y: -0.04231472, z: 0.022964103}
   m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001}
   m_Children:
   - {fileID: 8762427901331142558}
@@ -526,8 +526,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900724448093}
-  m_LocalRotation: {x: 0.0016757905, y: 0.077459455, z: 0.9964492, w: -0.03295893}
-  m_LocalPosition: {x: 0.06875991, y: -0.04231474, z: 0.022964088}
+  m_LocalRotation: {x: 0.0014883762, y: 0.07975738, z: 0.99625516, w: -0.03334898}
+  m_LocalPosition: {x: 0.06875991, y: -0.042314738, z: 0.022964088}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001}
   m_Children:
   - {fileID: 8762427902295418897}
@@ -1014,7 +1014,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427900818529073}
-  m_LocalRotation: {x: 0.5874679, y: -0.05418871, z: -0.009168824, w: 0.80737907}
+  m_LocalRotation: {x: 0.58887047, y: -0.054124285, z: -0.008956343, w: 0.80636334}
   m_LocalPosition: {x: -0.000004854202, y: 0.37896448, z: 0.0000036954875}
   m_LocalScale: {x: 0.99999976, y: 1, z: 0.9999999}
   m_Children:
@@ -1939,7 +1939,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901331142559}
-  m_LocalRotation: {x: -0.02929435, y: -0.0011588583, z: 0.0048430245, w: 0.9995584}
+  m_LocalRotation: {x: -0.03319545, y: -0.001158823, z: 0.005484158, w: 0.99943316}
   m_LocalPosition: {x: -0.000014133454, y: 0.28059646, z: -0.0000091815}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1.0000001}
   m_Children:
@@ -3062,8 +3062,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901536452329}
-  m_LocalRotation: {x: -0.08538224, y: 0.000000017017445, z: -0.00000012552374, w: 0.9963483}
-  m_LocalPosition: {x: 0.000000023190237, y: 0.065579034, z: 0.000023071188}
+  m_LocalRotation: {x: -0.08538224, y: 2.6951136e-10, z: -0.00000010821897, w: 0.9963483}
+  m_LocalPosition: {x: 0.000000018335035, y: 0.06557713, z: 0.000023198314}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001}
   m_Children:
   - {fileID: 8762427900504199576}
@@ -3247,7 +3247,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901671856371}
-  m_LocalRotation: {x: 0.0054036267, y: -0.007985974, z: 0.0059338026, w: 0.999936}
+  m_LocalRotation: {x: 0.0054036267, y: -0.007986106, z: 0.0059332103, w: 0.9999359}
   m_LocalPosition: {x: -0.000016029475, y: 0.18602979, z: -0.000017094611}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000002}
   m_Children:
@@ -3705,7 +3705,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901885600985}
-  m_LocalRotation: {x: 0.005431939, y: 0.007986724, z: -0.005968741, w: 0.9999356}
+  m_LocalRotation: {x: 0.005432236, y: 0.007986603, z: -0.0059682634, w: 0.9999356}
   m_LocalPosition: {x: 0.000016171934, y: 0.18602999, z: -0.000017125609}
   m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1.0000001}
   m_Children:
@@ -3976,8 +3976,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427901997230135}
-  m_LocalRotation: {x: 0.064136356, y: 0.011688723, z: 0.1181622, w: 0.99085194}
-  m_LocalPosition: {x: -0.0000074040145, y: 0.08570124, z: -0.0000024570618}
+  m_LocalRotation: {x: 0.06413615, y: 0.011688773, z: 0.11816212, w: 0.99085206}
+  m_LocalPosition: {x: -0.0000073462725, y: 0.08570123, z: -0.0000024363399}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1}
   m_Children:
   - {fileID: 8762427901671856370}
@@ -4069,8 +4069,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902022659837}
-  m_LocalRotation: {x: 0.064419076, y: -0.009316855, z: -0.117978156, w: 0.9908807}
-  m_LocalPosition: {x: 0.0000075884163, y: 0.085701205, z: -0.000002420042}
+  m_LocalRotation: {x: 0.06441915, y: -0.009316551, z: -0.11797831, w: 0.9908807}
+  m_LocalPosition: {x: 0.000007584691, y: 0.08570121, z: -0.0000024284238}
   m_LocalScale: {x: 1.0000002, y: 1.0000001, z: 1.0000002}
   m_Children:
   - {fileID: 8762427901885600984}
@@ -4226,7 +4226,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902163220829}
-  m_LocalRotation: {x: -0.0030745156, y: -0.10959879, z: 0.7832789, w: 0.6119255}
+  m_LocalRotation: {x: -0.003074497, y: -0.10959879, z: 0.7832789, w: 0.61192554}
   m_LocalPosition: {x: -0.048186224, y: 0.14500263, z: 0.0053152055}
   m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994}
   m_Children:
@@ -4319,8 +4319,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902218368406}
-  m_LocalRotation: {x: 0.69834155, y: -0.000000046538045, z: -0.000000036281193, w: 0.7157648}
-  m_LocalPosition: {x: 0, y: 0.0000038146973, z: -25.025873}
+  m_LocalRotation: {x: 0.69834155, y: -0.000000022462789, z: -0.00000003685403, w: 0.7157648}
+  m_LocalPosition: {x: 0, y: 0.0000038146973, z: -28.026031}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8762427901970835926}
@@ -4412,7 +4412,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902295418926}
-  m_LocalRotation: {x: -0.029302185, y: 0.0011569125, z: -0.0048442697, w: 0.9995582}
+  m_LocalRotation: {x: -0.03332881, y: 0.0011568225, z: -0.0055062594, w: 0.9994287}
   m_LocalPosition: {x: 0.000014123917, y: 0.28059638, z: -0.000009194316}
   m_LocalScale: {x: 1, y: 0.9999998, z: 1.0000001}
   m_Children:
@@ -4445,7 +4445,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8762427902300486212}
-  m_LocalRotation: {x: 0.045167997, y: -9.947595e-14, z: 0.00000014893556, w: 0.99897945}
+  m_LocalRotation: {x: 0.045167997, y: -9.769959e-14, z: 0.00000014893548, w: 0.99897945}
   m_LocalPosition: {x: 2.025893e-15, y: 0.058465876, z: 0.011619233}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:

+ 1 - 1
SFGgouhuo/Assets/GameResources/Player/animation/player_dress.controller

@@ -20,7 +20,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 8488d340d1ad8a74995948fe5ad021a6, type: 2}
+  m_Motion: {fileID: -510298072284558265, guid: 54dbc079cd6560446a77f3093bdbd2ce, type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 

+ 1 - 1
SFGgouhuo/Assets/GameResources/Street/FX/VFXAssets/Billboard/Art/VFX/Materials/LogoHologram_Mat 1.mat

@@ -107,7 +107,7 @@ Material:
     m_Floats:
     - Vector1_31bf5f9759414b42b89dab8de92cb72b: 0
     - Vector1_9e6b166160454e0391447db18ada4ad6: 0
-    - _Alpha: 1
+    - _Alpha: 0
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1

+ 1 - 1
SFGgouhuo/Assets/GameResources/Street/FX/VFXAssets/Billboard/Art/VFX/Materials/LogoHologram_Mat 3.mat

@@ -107,7 +107,7 @@ Material:
     m_Floats:
     - Vector1_31bf5f9759414b42b89dab8de92cb72b: 0
     - Vector1_9e6b166160454e0391447db18ada4ad6: 0
-    - _Alpha: 0
+    - _Alpha: 1
     - _AlphaClip: 0
     - _Blend: 0
     - _BumpScale: 1

+ 0 - 0
SFGgouhuo/Assets/GameResources/UI/Image/返回.png → SFGgouhuo/Assets/GameResources/UI/Image/返回3.png


+ 0 - 0
SFGgouhuo/Assets/GameResources/UI/Image/返回.png.meta → SFGgouhuo/Assets/GameResources/UI/Image/返回3.png.meta


+ 3 - 3
SFGgouhuo/Assets/Resources/localLanguage.asset

@@ -121,7 +121,7 @@ MonoBehaviour:
       languageType: 4
     - content: 
       languageType: 5
-  - name: Return
+  - name: ReturnImg
     content:
     - content: Return
       languageType: 1
@@ -159,7 +159,7 @@ MonoBehaviour:
       languageType: 5
   - name: Ebody
     content:
-    - content: Ebody
+    - content: Body
       languageType: 1
     - content: "\u8EAB\u9AD4\u7279\u5F81"
       languageType: 2
@@ -171,7 +171,7 @@ MonoBehaviour:
       languageType: 5
   - name: Edress
     content:
-    - content: Edress
+    - content: Dress
       languageType: 1
     - content: "\u670D\u88DD\u914D\u98FE"
       languageType: 2

+ 3 - 1
SFGgouhuo/Assets/Scripts/Manager/UIManager.cs

@@ -91,9 +91,11 @@ public class UIManager : MonoBehaviour
         {
            go = await CreateAndShowUI(uiName);
         }
+
         if (m_ShowList == null)
             m_ShowList = new Dictionary<string, GameObject>();
-        m_ShowList.Add(uiName, go);
+        if(!m_ShowList.ContainsKey(uiName))
+            m_ShowList.Add(uiName, go);
     }
 
     /// <summary>

File diff suppressed because it is too large
+ 76 - 24
SFGgouhuo/Assets/TextMesh Pro/Fonts/SOURCEHANSANSCN-BOLD SDF.asset


Some files were not shown because too many files changed in this diff