李桃 2 dias atrás
pai
commit
dd6a99f724

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/mainUI.txt

@@ -1 +1 @@
-{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}
+{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_fengling","filePath":"/decorate/dec_fengling.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_guajijiangli","filePath":"/decorate/dec_guajijiangli.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}

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


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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: C3JNsS+qBXMPlqqMYQkxbZyk6ClMKGrVEZrmnCZiZ76XR8c4R3A6BLawjTZP
+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: 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
+  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: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Cn4YtnmqWi1o901KVK0KDL3TEcDsa/pluVqKbjjIR7gQhJr2kwAPcp9xRrab
+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: 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
+  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: 0
+    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
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.23306364
+    - _MainTexOffsetV: 0.47736904
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Diferenças do arquivo suprimidas por serem muito extensas
+ 674 - 426
Assets/Art/cs3.scene


Diferenças do arquivo suprimidas por serem muito extensas
+ 425 - 334
Assets/Res/UI/MainPanel/MainPanel.prefab


+ 34 - 31
Assets/Res/UI/RewardsPanel/RewardsPanel.prefab

@@ -26,17 +26,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1627275322588555021}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7599982387852363157}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 170, y: 42}
+  m_SizeDelta: {x: 196, y: 18}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6721900962482972644
 CanvasRenderer:
@@ -67,7 +67,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -76,14 +76,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Divider_Right
+  _icon_name: dec_tupoZhuangshixian
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 42
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -243,7 +244,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.99215686}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -260,14 +261,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dim_Black
+  _icon_name: dec_juxing
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: a390acfcad8b75dd7afc70ae71517080
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -309,7 +311,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 373.6, y: 42}
+  m_SizeDelta: {x: 373.6, y: 64.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &107777712894178491
 CanvasRenderer:
@@ -332,7 +334,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.8943182, b: 0.68867916, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 1, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -340,8 +342,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
-    m_FontSize: 38
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 37
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0
@@ -404,7 +406,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 349}
-  m_SizeDelta: {x: 628.12, y: 46}
+  m_SizeDelta: {x: 628.12, y: 73.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3351630389936616225
 MonoBehaviour:
@@ -583,7 +585,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 170, y: 42}
+  m_SizeDelta: {x: 196, y: 18}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4898960602705745530
 CanvasRenderer:
@@ -606,7 +608,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980392, g: 0.92941177, b: 0.9490196, a: 1}
+  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
@@ -614,7 +616,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -623,14 +625,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Divider_Left
+  _icon_name: dec_tupoZhuangshixian
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 42
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 2 - 0
Assets/Res/UIAtlas/mainUI.spriteatlasv2

@@ -17,9 +17,11 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: d735f8b29f2b06b4fb594575b21fa9ef, type: 3}
     - {fileID: 2800000, guid: 8da129d26a92b6748827d26230e51210, type: 3}
     - {fileID: 2800000, guid: bbbfe50204b23584da4116b3d3633643, type: 3}
+    - {fileID: 2800000, guid: 48b457f80f7d99b44ab2af30ae3946a6, type: 3}
     - {fileID: 2800000, guid: ed5c755d642c4154ebee5e36e03b7842, type: 3}
     - {fileID: 2800000, guid: b8fa6983179b3be4783331e63c25e825, type: 3}
     - {fileID: 2800000, guid: a12eb982dbdc0894586e7d39acac50e7, type: 3}
+    - {fileID: 2800000, guid: 5473c79ffd6b84e4c9de2b607f6fbb01, type: 3}
     - {fileID: 2800000, guid: e9c501f96c7be424c883cfdf777dcc15, type: 3}
     - {fileID: 2800000, guid: caf59be6b62f1ff40b2937ade714bf4d, type: 3}
     - {fileID: 2800000, guid: 0b973e74b13091140a3e9ee1c6e106ea, type: 3}

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
UGUIPack/uguiconfig.db


+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -42,10 +42,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 0607575451070d595c5a542141725a44124e1b292f2923697a7b1c37bab2673e
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68

Diferenças do arquivo suprimidas por serem muito extensas
+ 267 - 242
UserSettings/Layouts/CurrentMaximizeLayout.dwlt


+ 1 - 1
美术/unity_use_ui/TextrueJson/mainUI.txt

@@ -1 +1 @@
-{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}
+{"packName":"mainUI","isTyPack":false,"newTextureJson":[{"textrueName":"dec_cangbaoge","filePath":"/decorate/dec_cangbaoge.png"},{"textrueName":"dec_cangbaoge2","filePath":"/decorate/dec_cangbaoge2.png"},{"textrueName":"dec_dise","filePath":"/decorate/dec_dise.png"},{"textrueName":"dec_ditu","filePath":"/decorate/dec_ditu.png"},{"textrueName":"dec_dongfu","filePath":"/decorate/dec_dongfu.png"},{"textrueName":"dec_dongfu2","filePath":"/decorate/dec_dongfu2.png"},{"textrueName":"dec_fengling","filePath":"/decorate/dec_fengling.png"},{"textrueName":"dec_gongfa","filePath":"/decorate/dec_gongfa.png"},{"textrueName":"dec_gongfa2","filePath":"/decorate/dec_gongfa2.png"},{"textrueName":"dec_gongneng","filePath":"/decorate/dec_gongneng.png"},{"textrueName":"dec_guajijiangli","filePath":"/decorate/dec_guajijiangli.png"},{"textrueName":"dec_huodong","filePath":"/decorate/dec_huodong.png"},{"textrueName":"dec_map_di","filePath":"/decorate/dec_map_di.png"},{"textrueName":"dec_renwu","filePath":"/decorate/dec_renwu.png"},{"textrueName":"dec_renwu_diban","filePath":"/decorate/dec_renwu_diban.png"},{"textrueName":"dec_renwu_dise","filePath":"/decorate/dec_renwu_dise.png"},{"textrueName":"dec_renwu_ditiaomu","filePath":"/decorate/dec_renwu_ditiaomu.png"},{"textrueName":"dec_shenshi","filePath":"/decorate/dec_shenshi.png"},{"textrueName":"dec_shuxing_diban","filePath":"/decorate/dec_shuxing_diban.png"},{"textrueName":"dec_shuxing_ditiao","filePath":"/decorate/dec_shuxing_ditiao.png"},{"textrueName":"dec_touxiang","filePath":"/decorate/dec_touxiang.png"},{"textrueName":"dec_xinjing","filePath":"/decorate/dec_xinjing.png"},{"textrueName":"dec_xinjing_text_di","filePath":"/decorate/dec_xinjing_text_di.png"},{"textrueName":"dec_zhujiao","filePath":"/decorate/dec_zhujiao.png"},{"textrueName":"dec_zhujiao2","filePath":"/decorate/dec_zhujiao2.png"}],"keyToValue":{}}

BIN
美术/unity_use_ui/decorate/dec_fengling.png


BIN
美术/unity_use_ui/decorate/dec_guajijiangli.png


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff