李桃 3 days ago
parent
commit
4eefde6e45

File diff suppressed because it is too large
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


+ 2 - 2
Assets/Art/UIAssets/decorate/dec_juxing16_miaobian2.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 16, y: 18, z: 19, w: 18}
   spriteGenerateFallbackPhysicsShape: 1
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaUsage: 1
   alphaIsTransparency: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     physicsShape: []
     bones: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     vertices: []
     indices: 
     indices: 
     edges: []
     edges: []

BIN
Assets/Art/UIAssets/decorate/dec_juxing_miaobian3.png


+ 133 - 0
Assets/Art/UIAssets/decorate/dec_juxing_miaobian3.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Wnsas3ytUC6zTn+dM0KflRTwrNeC2W+lexAN+/AMdNBbAIQqQ4AMSf2E/OaI
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 1
+  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: 3, y: 3, z: 3, w: 3}
+  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
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: 0.1276061
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5
     - _MaskSpeedU: 0.5

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.42118084
+    - _Alpha: 0.7652023
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.118317604
+    - _Alpha: 0.57886076
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _ColorMask: 0
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.17946792
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.64
+    - _MainTexOffsetU: 0.2375313
     - _MainTexOffsetV: 0
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingU: 0.8
     - _MainTilingV: 1
     - _MainTilingV: 1

+ 5 - 5
Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab

@@ -106,7 +106,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.35488594, g: 0.56374943, b: 0.6839621, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -123,7 +123,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_shengji
+  _icon_name: dec_juxing
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -204,10 +204,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 39
-    m_FontStyle: 1
+    m_FontSize: 36
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 4
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0

+ 6 - 6
Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -281,7 +281,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980392, g: 0.8745098, b: 0.81960785, a: 1}
+  m_Color: {r: 0.8254715, g: 0.78102595, b: 0.6852971, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -298,7 +298,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -387,7 +387,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43921572, g: 0.42352945, b: 0.36862746, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 0
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -397,7 +397,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
@@ -407,7 +407,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
-  m_Text: "\u4F60"
+  m_Text: "\u4F60\u8BF4\u4EC0\u4E48\u624B\u673A\u5C31\u662F\u4EC0\u4E48"
 --- !u!114 &6543867474228140514
 --- !u!114 &6543867474228140514
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2834,7 +2834,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5518757894177767966
 --- !u!224 &5518757894177767966
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 1 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -76,6 +76,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 8858058a836c6694a8c89b729ced8ac4, type: 3}
     - {fileID: 2800000, guid: 8858058a836c6694a8c89b729ced8ac4, type: 3}
     - {fileID: 2800000, guid: 4d8e93c4b2e2c9e419e1b179a90007ae, type: 3}
     - {fileID: 2800000, guid: 4d8e93c4b2e2c9e419e1b179a90007ae, type: 3}
     - {fileID: 2800000, guid: 89ccfa926f8b59447b9f0dc1d73e5544, type: 3}
     - {fileID: 2800000, guid: 89ccfa926f8b59447b9f0dc1d73e5544, type: 3}
+    - {fileID: 2800000, guid: e156f03efc10122489ec6605806cfbfd, type: 3}
     - {fileID: 2800000, guid: 56fa5ad2eb0770747a94b9281ce1d73e, type: 3}
     - {fileID: 2800000, guid: 56fa5ad2eb0770747a94b9281ce1d73e, type: 3}
     - {fileID: 2800000, guid: d51eb6e6d30732e42b4d39217df82220, type: 3}
     - {fileID: 2800000, guid: d51eb6e6d30732e42b4d39217df82220, type: 3}
     - {fileID: 2800000, guid: e1e3be226b84b7d4eb369470fdca7ca3, type: 3}
     - {fileID: 2800000, guid: e1e3be226b84b7d4eb369470fdca7ca3, type: 3}

File diff suppressed because it is too large
+ 0 - 0
UGUIPack/uguiconfig.db


BIN
美术/art_use_ui/tongyong/dec_juxing_miaobian3.png


File diff suppressed because it is too large
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


BIN
美术/unity_use_ui/decorate/dec_juxing_miaobian3.png


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