李桃 il y a 3 mois
Parent
commit
a8bebba761

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/all.txt


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


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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Di4XsnusAnORyHUEKZRM0sq8qO9n5hfRUpzt/WNQuhcQATpdo7WXmW4=
+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_Title_Ribbon04_Red.png


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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: Cn8asHykBigdawz3cCngoZivoOz+j3+wYEZ/4W3K21EI1u1+8ZLtmkY=
+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: 

Fichier diff supprimé car celui-ci est trop grand
+ 182 - 384
Assets/Art/test01.scene


+ 390 - 22
Assets/Res/UI/CombatHeroDiePanel.prefab

@@ -1,5 +1,174 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1117323783222959899
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4063936517042944838}
+  - component: {fileID: 853163553696558237}
+  - component: {fileID: 5840918934024475326}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image_lineR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4063936517042944838
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1117323783222959899}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 185075131536662509}
+  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: 120, y: -286}
+  m_SizeDelta: {x: 193.5, y: 42}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &853163553696558237
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1117323783222959899}
+  m_CullTransparentMesh: 1
+--- !u!114 &5840918934024475326
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1117323783222959899}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Divider_Right
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7b4b6ed3ba462076c90dfcf7f26605a7
+--- !u!1 &4852793363086498152
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1649649878049910674}
+  - component: {fileID: 8043359735957273106}
+  - component: {fileID: 4999177172740063463}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage_title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1649649878049910674
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4852793363086498152}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3811247603473634563}
+  m_Father: {fileID: 185075131536662509}
+  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: 255}
+  m_SizeDelta: {x: 540, y: 143}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8043359735957273106
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4852793363086498152}
+  m_CullTransparentMesh: 1
+--- !u!114 &4999177172740063463
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4852793363086498152}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Title_Ribbon04_Red
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7b4b6ed3ba462076c90dfcf7f26605a7
 --- !u!1 &5139397811277715345
 GameObject:
   m_ObjectHideFlags: 0
@@ -30,7 +199,7 @@ RectTransform:
   m_GameObject: {fileID: 5139397811277715345}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1386739977556444607}
@@ -38,8 +207,8 @@ RectTransform:
   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: 31.13, y: -145}
-  m_SizeDelta: {x: 242.93, y: 100}
+  m_AnchoredPosition: {x: 0, y: -493}
+  m_SizeDelta: {x: 300, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3113999078506722049
 CanvasRenderer:
@@ -123,7 +292,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Green
+  _icon_name: btn_l_Sky
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -146,6 +315,90 @@ MonoBehaviour:
   duration: 0.07
   ease: 5
   animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
+--- !u!1 &5231647881832212843
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3654265162214717518}
+  - component: {fileID: 5765433673536423931}
+  - component: {fileID: 2445706621112749966}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image_lineL
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3654265162214717518
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5231647881832212843}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 185075131536662509}
+  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: -120, y: -286}
+  m_SizeDelta: {x: 193.5, y: 42}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &5765433673536423931
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5231647881832212843}
+  m_CullTransparentMesh: 1
+--- !u!114 &2445706621112749966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5231647881832212843}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Divider_Left
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7b4b6ed3ba462076c90dfcf7f26605a7
 --- !u!1 &5614495180248260428
 GameObject:
   m_ObjectHideFlags: 0
@@ -181,7 +434,7 @@ RectTransform:
   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: -14.9}
+  m_AnchoredPosition: {x: 0, y: -96}
   m_SizeDelta: {x: 601.6, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2086373568043157529
@@ -225,7 +478,119 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4F60\u592A\u5F31\u4E86\uFF0C\u8BF7\u63D0\u5347\u52BF\u529B\u518D\u6765\u6311\u6218"
+  m_Text: "\u4F60\u592A\u5F31\u4E86\uFF0C\u8BF7\u63D0\u5347\u5B9E\u529B\u518D\u6765\u6311\u6218"
+--- !u!1 &5723808475305056174
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3811247603473634563}
+  - component: {fileID: 1380652552858744066}
+  - component: {fileID: 2143477766085887442}
+  - component: {fileID: 3750531416279218773}
+  - component: {fileID: 6257030161071468826}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_shibai
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3811247603473634563
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5723808475305056174}
+  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_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 1649649878049910674}
+  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: 9}
+  m_SizeDelta: {x: 228.6, y: 98.86}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1380652552858744066
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5723808475305056174}
+  m_CullTransparentMesh: 1
+--- !u!114 &2143477766085887442
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5723808475305056174}
+  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: 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 63
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 79
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5931 \u8D25"
+--- !u!114 &3750531416279218773
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5723808475305056174}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.8901961}
+  m_EffectDistance: {x: 2, y: -2}
+  m_UseGraphicAlpha: 1
+--- !u!114 &6257030161071468826
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5723808475305056174}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.6784314}
+  m_EffectDistance: {x: 2.73, y: -3.39}
+  m_UseGraphicAlpha: 1
 --- !u!1 &6238981342543973910
 GameObject:
   m_ObjectHideFlags: 0
@@ -261,8 +626,8 @@ RectTransform:
   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: 31.13001, y: -69.9711}
-  m_SizeDelta: {x: 50.14, y: 50}
+  m_AnchoredPosition: {x: 0, y: -288}
+  m_SizeDelta: {x: 77.9, y: 67.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2373806058026606910
 CanvasRenderer:
@@ -319,8 +684,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 43
+  m_fontSizeBase: 43
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -393,9 +758,12 @@ RectTransform:
   m_Children:
   - {fileID: 2367201786333787622}
   - {fileID: 5875803508465983850}
+  - {fileID: 3654265162214717518}
+  - {fileID: 4063936517042944838}
   - {fileID: 6048544409263046555}
   - {fileID: 4732789714552782586}
   - {fileID: 8026503739820710212}
+  - {fileID: 1649649878049910674}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -463,7 +831,7 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 6}
   m_SizeDelta: {x: 160, y: 59.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1885857017647533627
@@ -496,11 +864,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
-    m_FontStyle: 0
+    m_FontSize: 35
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 55
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -520,8 +888,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.13207549, g: 0.085500926, b: 0.016820936, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
+  m_EffectColor: {r: 0.08, g: 0.0517647, b: 0.009411764, a: 0.56078434}
+  m_EffectDistance: {x: 1.65, y: -1.39}
   m_UseGraphicAlpha: 1
 --- !u!1 &7363585873547743305
 GameObject:
@@ -536,7 +904,7 @@ GameObject:
   - component: {fileID: 4439915125391523846}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: myImage_badge
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -558,9 +926,9 @@ RectTransform:
   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: 95}
-  m_SizeDelta: {x: 121, y: 124}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 317.4995}
+  m_SizeDelta: {x: 562, y: 329}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7762547830626643641
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -599,7 +967,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_ku
+  _icon_name: dec_Image_Badge_Skull
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -666,7 +1034,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0.7019608}
+  m_Color: {r: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0.69803923}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

+ 77 - 75
Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,94 +11,96 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 1e57f4f2deb7646f38356896a394b27c, type: 3}
-    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
-    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
-    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
-    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
-    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
-    - {fileID: 2800000, guid: 066cdce1ecfa6a14dbec09075860d79a, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
+    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
+    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
+    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
     - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
-    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, type: 3}
+    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
     - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
-    - {fileID: 2800000, guid: ce32dcb975473404e93ec07abe82cf10, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
+    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, type: 3}
+    - {fileID: 2800000, guid: 1e57f4f2deb7646f38356896a394b27c, type: 3}
+    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
     - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: c4a220291754e4cdcb56015d594b6049, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
     - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
-    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: 066cdce1ecfa6a14dbec09075860d79a, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
+    - {fileID: 2800000, guid: c4a220291754e4cdcb56015d594b6049, type: 3}
     - {fileID: 2800000, guid: 54f226abc196547a9b4749d64512ffcb, type: 3}
+    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
+    - {fileID: 2800000, guid: 1d87a1a810baddc4d82d37c6d78eb3c4, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
     - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
-    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
     - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
     - {fileID: 2800000, guid: 694e03b969504324081225f1921465de, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: ce32dcb975473404e93ec07abe82cf10, type: 3}
+    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: 5555f9ec76d49734ea1437158ef8e663, type: 3}
+    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
+    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
     - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
     - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
-    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
-    - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
     - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
-    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
+    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
-    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
-    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
+    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
+    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

+ 2 - 2
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset

@@ -32,7 +32,7 @@ Material:
     m_Floats:
     - _ColorMask: 15
     - _CullMode: 0
-    - _FaceDilate: 0
+    - _FaceDilate: 0.35
     - _GradientScale: 10
     - _MaskSoftnessX: 0
     - _MaskSoftnessY: 0
@@ -41,7 +41,7 @@ Material:
     - _PerspectiveFilter: 0.875
     - _ScaleRatioA: 0.9
     - _ScaleRatioB: 1
-    - _ScaleRatioC: 0.73125
+    - _ScaleRatioC: 0.41625
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0

+ 1 - 1
UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"7f6af24b7e68d556cab4cc7ac439f1bb"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"","lasetJsonGUID":""}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"e8ac4a11df23a3327a9a6fed106efb0a"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""}],"isJiaoYan":true}

BIN
美术/art_use_ui/all/dec_Image_Badge_Skull.png


BIN
美术/art_use_ui/all/dec_Title_Ribbon04_Red.png


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
美术/unity_use_ui/TextrueJson/all.txt


BIN
美术/unity_use_ui/decorate/dec_Image_Badge_Skull.png


BIN
美术/unity_use_ui/decorate/dec_Title_Ribbon04_Red.png


+ 5 - 5
美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=715,100
+Size=900,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1115,0
+Pos=1300,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=715,70
+Size=900,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=715,130
+Size=900,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=715,420
+Size=900,420
 Collapsed=0
 
 [Docking][Data]

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff