Jelajahi Sumber

Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

DESKTOP-FB72PO8\Administrator 5 bulan lalu
induk
melakukan
4197ee7f87
30 mengubah file dengan 21016 tambahan dan 1435 penghapusan
  1. TEMPAT SAMPAH
      Assets/Art/UIAssets/Button/btn_Arrow_Down.png
  2. 133 0
      Assets/Art/UIAssets/Button/btn_Arrow_Down.png.meta
  3. 0 0
      Assets/Art/UIAssets/TextrueJson/all.txt
  4. 1 1
      Assets/Art/UIAssets/TextrueJson/heroIcon.txt
  5. 1 1
      Assets/Art/UIAssets/TextrueJson/skillIcon.txt
  6. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_PanelFrame03_Bg.png
  7. 133 0
      Assets/Art/UIAssets/decorate/dec_PanelFrame03_Bg.png.meta
  8. TEMPAT SAMPAH
      Assets/Art/UIAssets/decorate/dec_PanelFrame03_Oblique.png
  9. 133 0
      Assets/Art/UIAssets/decorate/dec_PanelFrame03_Oblique.png.meta
  10. 52 151
      Assets/Res/UI/HeroDetailPanel.prefab
  11. 62 59
      Assets/Res/UIAtlas/all.spriteatlasv2
  12. 20234 1050
      Assets/Scenes/UIBuild.scene
  13. 116 0
      Assets/Scripts/Core/Utility/Helper/SimpleLayout.cs
  14. 3 0
      Assets/Scripts/Core/Utility/Helper/SimpleLayout.cs.meta
  15. 28 54
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs
  16. 5 5
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs
  17. 10 10
      Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPreData.cs
  18. 2 1
      Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs
  19. 1 1
      UGUIPack/uguiconfig.db
  20. 3 3
      UserSettings/EditorUserSettings.asset
  21. 97 97
      UserSettings/Layouts/CurrentMaximizeLayout.dwlt
  22. TEMPAT SAMPAH
      美术/art_use_ui/all/btn_Arrow_Down.png
  23. TEMPAT SAMPAH
      美术/art_use_ui/all/dec_PanelFrame03_Bg.png
  24. TEMPAT SAMPAH
      美术/art_use_ui/all/dec_PanelFrame03_Oblique.png
  25. TEMPAT SAMPAH
      美术/unity_use_ui/Button/btn_Arrow_Down.png
  26. 0 0
      美术/unity_use_ui/TextrueJson/all.txt
  27. 1 1
      美术/unity_use_ui/TextrueJson/heroIcon.txt
  28. 1 1
      美术/unity_use_ui/TextrueJson/skillIcon.txt
  29. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_PanelFrame03_Bg.png
  30. TEMPAT SAMPAH
      美术/unity_use_ui/decorate/dec_PanelFrame03_Oblique.png

TEMPAT SAMPAH
Assets/Art/UIAssets/Button/btn_Arrow_Down.png


+ 133 - 0
Assets/Art/UIAssets/Button/btn_Arrow_Down.png.meta

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

File diff ditekan karena terlalu besar
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/all.txt


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

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

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

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}

TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_PanelFrame03_Bg.png


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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: BilMsCz5AS2pVitSJaWtM961FURDTw3LadHVRVdCUtuBiofzrA1aMc0=
+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: 2, y: 13, z: 2, w: 6}
+  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: 

TEMPAT SAMPAH
Assets/Art/UIAssets/decorate/dec_PanelFrame03_Oblique.png


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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: XHMasSmrU3gWqvr/TBlK18CBMT0dZtPCyr8H/F6cKevdkRznaUTWX/8=
+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: 31, y: 0, z: 1, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 52 - 151
Assets/Res/UI/HeroDetailPanel.prefab

@@ -125,9 +125,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.44999695, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1078011943520483168
@@ -379,7 +379,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5091166044801204644}
-  - component: {fileID: 148200880756156862}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: StarsObj
@@ -412,32 +411,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 37}
   m_SizeDelta: {x: 750, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &148200880756156862
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 207711551128351574}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &208069830876522060
 GameObject:
   m_ObjectHideFlags: 0
@@ -1880,9 +1853,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 466.40002, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 91.400024, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1969311041310409060
@@ -3535,9 +3508,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 250.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 67.95001, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8046685421020806195
@@ -6095,9 +6068,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 375, y: -40}
+  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: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2732630439701141293
@@ -6365,9 +6338,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -44.550003, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6870054070481677623
@@ -9411,8 +9384,8 @@ MonoBehaviour:
     - gameObject: {fileID: 79095900304602252}
     - gameObject: {fileID: 8504566407075160577}
     - gameObject: {fileID: 8929665916662750425}
-  - key: Stars1Layout
-    gameObject: {fileID: 7906698109012939668}
+  - key: Stars2Obj
+    gameObject: {fileID: 5692980826226210461}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -9421,8 +9394,8 @@ MonoBehaviour:
     - gameObject: {fileID: 79095900304602252}
     - gameObject: {fileID: 8504566407075160577}
     - gameObject: {fileID: 8929665916662750425}
-  - key: Stars2Layout
-    gameObject: {fileID: 3168672394615115645}
+  - key: Stars1Obj
+    gameObject: {fileID: 8191368305320982722}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -11091,9 +11064,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 160.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -22.049988, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &372935494571646065
@@ -11715,7 +11688,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 2241270421792290432}
-  - component: {fileID: 3168672394615115645}
   - component: {fileID: 5450255457165283008}
   - component: {fileID: 3515673915611034184}
   m_Layer: 0
@@ -11750,32 +11722,6 @@ RectTransform:
   m_AnchoredPosition: {x: 149, y: 132}
   m_SizeDelta: {x: 366.9, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3168672394615115645
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5692980826226210461}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!320 &5450255457165283008
 PlayableDirector:
   m_ObjectHideFlags: 0
@@ -13004,26 +12950,8 @@ MonoBehaviour:
     - gameObject: {fileID: 386705721927191908}
     - gameObject: {fileID: 3414719560540881468}
     - gameObject: {fileID: 6905440077724744462}
-  - key: StarsLayout
-    gameObject: {fileID: 148200880756156862}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas:
-    - gameObject: {fileID: 2431497390631250942}
-    - gameObject: {fileID: 386705721927191908}
-    - gameObject: {fileID: 3414719560540881468}
-    - gameObject: {fileID: 6905440077724744462}
-  - key: Star (2)
-    gameObject: {fileID: 2983232722897563720}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas:
-    - gameObject: {fileID: 2431497390631250942}
-    - gameObject: {fileID: 386705721927191908}
-    - gameObject: {fileID: 3414719560540881468}
-    - gameObject: {fileID: 6905440077724744462}
-  - key: Star
-    gameObject: {fileID: 9043530873077291103}
+  - key: StarsObj
+    gameObject: {fileID: 207711551128351574}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -13043,7 +12971,7 @@ PlayableDirector:
   serializedVersion: 3
   m_PlayableAsset: {fileID: 11400000, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
   m_InitialState: 1
-  m_WrapMode: 0
+  m_WrapMode: 2
   m_DirectorUpdateMode: 1
   m_InitialTime: 0
   m_SceneBindings:
@@ -14683,9 +14611,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -89.55, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7561109794277708299
@@ -16258,9 +16186,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 205.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 22.950012, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5490923062748187026
@@ -16658,9 +16586,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 329.3, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -45.700012, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2451370377385730876
@@ -16915,9 +16843,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 420.7, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 45.700012, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3596508466326571759
@@ -17590,7 +17518,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 3725798218940426506}
-  - component: {fileID: 7906698109012939668}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Stars_1
@@ -17623,32 +17550,6 @@ RectTransform:
   m_AnchoredPosition: {x: -144, y: 132.8}
   m_SizeDelta: {x: 366.90002, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7906698109012939668
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8191368305320982722}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &8226637605373966731
 GameObject:
   m_ObjectHideFlags: 0
@@ -18204,9 +18105,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 273.45, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 90.45001, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4157655848032495787
@@ -18288,9 +18189,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 115.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -67.04999, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &270976551773092808
@@ -18521,9 +18422,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 45.449997, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7072959453483645448
@@ -19454,9 +19355,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 90.45001, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1474425373263466003
@@ -19614,9 +19515,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 283.59998, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -91.400024, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4300090933347681505

+ 62 - 59
Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,77 +11,80 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, 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: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, 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: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
+    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
     - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, 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: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, 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: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
     - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
     - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, 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: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
     - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, 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: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, 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: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, 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: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

File diff ditekan karena terlalu besar
+ 20234 - 1050
Assets/Scenes/UIBuild.scene


+ 116 - 0
Assets/Scripts/Core/Utility/Helper/SimpleLayout.cs

@@ -0,0 +1,116 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace Fort23.Core
+{
+
+public enum LayoutType
+{
+    Horizontal,
+    Vertical
+}
+
+public class SimpleLayout
+{
+    /// <summary>
+    /// 根据传入的布局类型,排列 GameObject 列表,水平排列并居中
+    /// </summary>
+    /// <param name="list">需要排列的 GameObject 列表</param>
+    /// <param name="type">布局类型,支持 Horizontal 或 Vertical</param>
+    /// <param name="spacing">元素之间的间距</param>
+    public static void Layout(List<object> list, LayoutType type, float spacing = 0f)
+    {
+        // 获取父节点的 RectTransform
+        if (list.Count == 0)
+            return;
+
+        if (type == LayoutType.Horizontal)
+        {
+            List<GameObject> activeElements = new List<GameObject>();
+
+            // 筛选 active 为 true 的元素
+            foreach (object item in list)
+            {
+                GameObject g = item as GameObject;
+                if (g != null && g.activeSelf)
+                {
+                    activeElements.Add(g);
+                }
+            }
+
+            int count = activeElements.Count;
+
+            // 如果没有 active 的元素,直接返回
+            if (count == 0) return;
+
+            // 计算起始位置,使中心点的元素对齐父节点中心
+            float totalWidth = 0f;
+
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+                totalWidth += rt.rect.width + (i < count - 1 ? spacing : 0);
+            }
+
+            // 起始位置的计算:最左侧元素的中心点相对于父节点
+            float startX = -totalWidth / 2 + activeElements[0].GetComponent<RectTransform>().rect.width / 2;
+
+            // 设置每个元素的位置
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+
+                // 更新位置
+                rt.anchoredPosition = new Vector2(startX, 0);
+
+                // 移动到下一个元素位置
+                startX += rt.rect.width + spacing;
+            }
+        }
+        else if (type == LayoutType.Vertical)
+        {
+            List<GameObject> activeElements = new List<GameObject>();
+
+            // 筛选 active 为 true 的元素
+            foreach (object item in list)
+            {
+                GameObject g = item as GameObject;
+                if (g != null && g.activeSelf)
+                {
+                    activeElements.Add(g);
+                }
+            }
+
+            int count = activeElements.Count;
+
+            // 如果没有 active 的元素,直接返回
+            if (count == 0) return;
+
+            // 计算起始位置,使中心点的元素对齐父节点中心
+            float totalHeight = 0f;
+
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+                totalHeight += rt.rect.height + (i < count - 1 ? spacing : 0);
+            }
+
+            // 起始位置的计算:最顶部元素的中心点相对于父节点
+            float startY = totalHeight / 2 - activeElements[0].GetComponent<RectTransform>().rect.height / 2;
+
+            // 设置每个元素的位置
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+
+                // 更新位置
+                rt.anchoredPosition = new Vector2(0, startY);
+
+                // 移动到下一个元素位置
+                startY -= rt.rect.height + spacing;
+            }
+        }
+    }
+}
+
+}

+ 3 - 0
Assets/Scripts/Core/Utility/Helper/SimpleLayout.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 596bf238533a485cb685af4995528336
+timeCreated: 1733823970

+ 28 - 54
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -59,40 +59,29 @@ namespace Fort23.Mono
 
             if (isOpenPre)
             {
-                if (BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount))
+                //if (BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount))
                 {
                     heroInfo.Promote();
                     PlayerManager.Instance.SaveHeroData(heroInfo);
                     UpdateAttributeUI();
                     HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-                    LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
+                    // LayoutRebuilder.ForceRebuildLayoutImmediate(StarsLayout.GetComponent<RectTransform>());
                     SendEvent(HeroUpType.Promote);
+                    
+                    // FlyOutEft(upPre.Stars2);
+                    ExitPowerUpPre(curPreTyp, upPre.Stars2);
                 }
             }
             else
             {
                 await UIManager.Instance.CreateGComponentForObject<HeroPowerUpPre>(objHeroPowerUpPre, Callback, root: rtBottom);    
             }
-            
-
-
-            
-            // heroInfo.modelConfig.itemID
-
- 
         }
 
         private async void Callback(HeroPowerUpPre pre)
         {
             upPre = pre;
             pre.OpenPromotePre(heroInfo);
-            
-            // upPre.Stars1Layout.enabled = true;
-            // upPre.Stars2Layout.enabled = true;
-            await TimerComponent.Instance.WaitAsync(1);
-            upPre.Stars1Layout.enabled = false;
-            upPre.Stars2Layout.enabled = false;
-            
             EnterPowerUpPre(2);
         }
 
@@ -131,15 +120,11 @@ namespace Fort23.Mono
         private async void FlyInEft()
         {
             simpleMoves.Clear();
-            upPre.Stars1Layout.gameObject.SetActive(false);
-            upPre.Stars2Layout.gameObject.SetActive(false);
-            
-            // LayoutRebuilder.MarkLayoutForRebuild (upPre.Stars1Layout.GetComponent<RectTransform>());
-            
-            
+            upPre.Stars1Obj.SetActive(false);
+            upPre.Stars2Obj.SetActive(false);
             
             await TimerComponent.Instance.WaitAsync(200);
-            for (int i = 0; i < heroInfo.star; i++)
+            for (int i = 0; i < stars.Count; i++)
             {
                 GameObject targetGo = upPre.Stars1[i] as GameObject;
                 GameObject startGo = stars[i] as GameObject;
@@ -149,18 +134,9 @@ namespace Fort23.Mono
                 simpleMoves.Add(sm);
             }
             //把现在的星星隐藏了.
-            StarsLayout.gameObject.SetActive(false);
+            StarsObj.SetActive(false);
             
-     
-            
-           
-            // await TimerComponent.Instance.WaitAsync(1);
-            // upPre.Stars1Layout.enabled = true;
-            // upPre.Stars1Layout.SetLayoutHorizontal();
-            // await TimerComponent.Instance.WaitAsync(1);
-            // upPre.Stars1Layout.enabled = false;
-            
-            upPre.Stars1Layout.gameObject.SetActive(true);
+            upPre.Stars1Obj.SetActive(true);
             
             int j = 0;
             float delayTime = 0;
@@ -171,40 +147,40 @@ namespace Fort23.Mono
             }
             
             await TimerComponent.Instance.WaitAsync(Mathf.RoundToInt((delayTime + 0.3f) * 1000));
-            upPre.Stars2Layout.gameObject.SetActive(true);
+            upPre.Stars2Obj.SetActive(true);
             
         }
 
-        private async void FlyOutEft()
+        private async void FlyOutEft(List<object> startList)
         {
             int i = 0;
             
             // LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
-            
+            // LayoutUtility.Layout(stars, LayoutType.Horizontal);
             simpleMoves.Clear();
             foreach (var star in stars)
             {
                 GameObject targetGo = star as GameObject;
-                GameObject startGo = upPre.Stars1[i] as GameObject;
-                
+                GameObject startGo = startList[i++] as GameObject;
+                //目标
                 RectTransform targetRT = targetGo.GetComponent<RectTransform>();
+                //起始
                 RectTransform startRT = startGo.GetComponent<RectTransform>();
                 
                 SimpleMove sm = new SimpleMove(targetRT, startRT.position, targetRT.position);
                 simpleMoves.Add(sm);
             }
-            StarsLayout.gameObject.SetActive(true);
+            StarsObj.SetActive(true);
             
             int j = 0;
+            float delayTime = 0f;
             foreach (SimpleMove move in simpleMoves)
             {
-                var delayTime = (j++ * 0.05f);
+                delayTime = (j++ * 0.05f);
                 move.Start(delayTime);
             }
 
-            
-            
-            //await TimerComponent.Instance.WaitAsync(Mathf.RoundToInt((delayTime + 0.3f) * 1000));
+            await TimerComponent.Instance.WaitAsync(Mathf.RoundToInt((delayTime + 0.3f) * 1000));
             // upPre.Stars2Layout.gameObject.SetActive(false);
             
         }
@@ -257,7 +233,7 @@ namespace Fort23.Mono
         /// 离开 升级/升星预览界面
         /// </summary>
         /// <param name="preTyp">1升级;2 升星</param>
-        private void ExitPowerUpPre(byte preTyp)
+        private void ExitPowerUpPre(byte preTyp, List<object> list = null)
         {
             isOpenPre = false;
             btns1.SetActive(true);
@@ -274,7 +250,7 @@ namespace Fort23.Mono
             }
             else
             {
-                FlyOutEft();
+                FlyOutEft(list);
                 
                 btnUpgrade.gameObject.SetActive(true);
                 RectTransform rt = btnPromote.GetComponent<RectTransform>();
@@ -314,15 +290,13 @@ namespace Fort23.Mono
         {
             if (isOpenPre)
             {
-                ExitPowerUpPre(curPreTyp);
+                ExitPowerUpPre(curPreTyp, upPre.Stars1);
             }
             else
             {
                 UIManager.Instance.HideUIUIPanel(this);
                 GObjectPool.Instance.Recycle(modelObj);
             }
-            
-           
         }
 
         private GameObjectPool modelObj;
@@ -340,10 +314,10 @@ namespace Fort23.Mono
             // StarsLayout.gameObject.SetActive(true);
             
             HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-            StarsLayout.enabled = true;
-            StarsLayout.SetLayoutHorizontal();
-            await TimerComponent.Instance.WaitAsync(1);
-            StarsLayout.enabled = false;
+            // StarsLayout.enabled = true;
+            // StarsLayout.SetLayoutHorizontal();
+            // await TimerComponent.Instance.WaitAsync(1);
+            // StarsLayout.enabled = false;
             
             // await TimerComponent.Instance.WaitAsync(50);
             // StarsLayout.GetComponent<LayoutGroup>().s
@@ -408,7 +382,7 @@ namespace Fort23.Mono
         private long costHeroCount;
         public async void UpdateAttributeUI(bool isInit = false)
         {
-            StarsLayout.gameObject.SetActive(true);
+            StarsObj.SetActive(true);
             if (txtHP.text != heroInfo.hp.Value.ToStringEx())
             {
                 long old = long.Parse(txtHP.text);

+ 5 - 5
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

@@ -318,15 +318,15 @@ namespace Fort23.Mono
 	      return _eftNumPos;
 	     }
 	   }
-	  private HorizontalLayoutGroup _StarsLayout;
-	  public HorizontalLayoutGroup StarsLayout
+	  private GameObject _StarsObj;
+	  public GameObject StarsObj
 	   {
 	   get{
-	      if (_StarsLayout == null)
+	      if (_StarsObj == null)
 	       {
-	         _StarsLayout  = GetUIUnit<HorizontalLayoutGroup>("StarsLayout"); 
+	         _StarsObj  = GetUIUnit<GameObject>("StarsObj"); 
 	       }
-	      return _StarsLayout;
+	      return _StarsObj;
 	     }
 	   }
 	  #endregion 自定义数据结束 

+ 10 - 10
Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPreData.cs

@@ -329,26 +329,26 @@ namespace Fort23.Mono
 	      return _objUpLvTips;
 	     }
 	   }
-	  private HorizontalLayoutGroup _Stars1Layout;
-	  public HorizontalLayoutGroup Stars1Layout
+	  private GameObject _Stars2Obj;
+	  public GameObject Stars2Obj
 	   {
 	   get{
-	      if (_Stars1Layout == null)
+	      if (_Stars2Obj == null)
 	       {
-	         _Stars1Layout  = GetUIUnit<HorizontalLayoutGroup>("Stars1Layout"); 
+	         _Stars2Obj  = GetUIUnit<GameObject>("Stars2Obj"); 
 	       }
-	      return _Stars1Layout;
+	      return _Stars2Obj;
 	     }
 	   }
-	  private HorizontalLayoutGroup _Stars2Layout;
-	  public HorizontalLayoutGroup Stars2Layout
+	  private GameObject _Stars1Obj;
+	  public GameObject Stars1Obj
 	   {
 	   get{
-	      if (_Stars2Layout == null)
+	      if (_Stars1Obj == null)
 	       {
-	         _Stars2Layout  = GetUIUnit<HorizontalLayoutGroup>("Stars2Layout"); 
+	         _Stars1Obj  = GetUIUnit<GameObject>("Stars1Obj"); 
 	       }
-	      return _Stars2Layout;
+	      return _Stars1Obj;
 	     }
 	   }
 	  #endregion 自定义数据结束 

+ 2 - 1
Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Fort23.Core;
 using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.UI;
@@ -40,7 +41,7 @@ namespace Fort23.Mono
                 i++;
             }
             
-            
+            SimpleLayout.Layout(stars, LayoutType.Horizontal);
         }
         
         private static void SetStarImg(int group, GameObject starObj)

+ 1 - 1
UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"5f0e1efcfcd57f7a4342d694b44736e1"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"94128d0dbe9cd8207418b750524ba469"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"55e8a40523c8eed12497fdfd32533577"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"94128d0dbe9cd8207418b750524ba469"}],"isJiaoYan":true}

+ 3 - 3
UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

+ 97 - 97
UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -21,12 +21,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1511
-    height: 932
+    width: 1407
+    height: 931
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 886
+  controlID: 19
   draggingID: 0
 --- !u!114 &2
 MonoBehaviour:
@@ -48,10 +48,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 217
+    x: 321
     y: 96
-    width: 437.5
-    height: 652.5
+    width: 498.5
+    height: 683.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -68,7 +68,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1334}
+  m_TargetSize: {x: 750, y: 1624}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -77,7 +77,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -85,8 +85,8 @@ MonoBehaviour:
     vZoomLockedByDefault: 0
     m_HBaseRangeMin: -187.5
     m_HBaseRangeMax: 187.5
-    m_VBaseRangeMin: -333.5
-    m_VBaseRangeMax: 333.5
+    m_VBaseRangeMin: -406
+    m_VBaseRangeMax: 406
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -95,7 +95,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -104,23 +104,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 437.5
-      height: 631.5
-    m_Scale: {x: 0.9467766, y: 0.9467766}
-    m_Translation: {x: 218.75, y: 315.75}
+      width: 498.5
+      height: 662.5
+    m_Scale: {x: 0.8158867, y: 0.8158867}
+    m_Translation: {x: 249.25, y: 331.25}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -231.0471
-      y: -333.5
-      width: 462.0942
-      height: 667
+      x: -305.49585
+      y: -406
+      width: 610.9917
+      height: 812
     m_MinimalGUI: 1
-  m_defaultScale: 0.9467766
-  m_LastWindowPixelSize: {x: 875, y: 1305}
+  m_defaultScale: 0.8158867
+  m_LastWindowPixelSize: {x: 997, y: 1367}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -145,12 +145,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 438.5
-    height: 932
+    width: 499.5
+    height: 931
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 887
+  controlID: 20
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -169,18 +169,18 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 438.5
-    height: 673.5
+    width: 499.5
+    height: 704.5
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 5}
-  - {fileID: 2}
   - {fileID: 6}
+  - {fileID: 2}
   - {fileID: 7}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 2
+  m_LastSelected: 1
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -201,10 +201,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 217
+    x: 321
     y: 96
-    width: 437.5
-    height: 652.5
+    width: 498.5
+    height: 683.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -219,7 +219,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -156, y: -26}
+      snapOffset: {x: -166, y: -26}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
@@ -271,7 +271,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -576,9 +576,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1.3068287, y: -0.72265536, z: 0.08071033}
+    m_Target: {x: 0.28188542, y: 0.94536877, z: 0.028892737}
     speed: 2
-    m_Value: {x: 1.3068287, y: -0.72265536, z: 0.08071033}
+    m_Value: {x: 0.28188542, y: 0.94536877, z: 0.028892737}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -628,9 +628,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.9289328
+    m_Target: 3.1845348
     speed: 2
-    m_Value: 1.9289328
+    m_Value: 3.1845348
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -650,7 +650,7 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0.21580243, y: -0.7561753, z: 0.30317518, w: 0.53825194}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -677,10 +677,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 1209
-    height: 436
+    x: 321
+    y: 96
+    width: 498.5
+    height: 683.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -941,11 +941,11 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 673.5
-    width: 438.5
-    height: 258.5
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+    y: 704.5
+    width: 499.5
+    height: 226.5
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 9}
   m_Panes:
   - {fileID: 9}
@@ -971,10 +971,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 217
-    y: 769.5
-    width: 437.5
-    height: 237.5
+    x: 321
+    y: 800.5
+    width: 498.5
+    height: 205.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1000,12 +1000,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 438.5
+    x: 499.5
     y: 0
-    width: 286.5
-    height: 932
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 289.5
+    height: 931
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 11}
   m_Panes:
   - {fileID: 11}
@@ -1031,10 +1031,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 655.5
+    x: 820.5
     y: 96
-    width: 284.5
-    height: 911
+    width: 287.5
+    height: 910
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1047,10 +1047,10 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_SceneHierarchy:
     m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: d8d3fdff
-      m_LastClickedID: -142376
-      m_ExpandedIDs: bed0fdff88d2fdff8cd2fdff94d2fdfff8d3fdff06d4fdffeea6fffff0a6fffff2a6fffffca6ffffa8adffff5aaeffff08afffff62b7ffff6eb7ffff84b7ffff88b7ffff94b7ffff32b8ffffb8b8ffffa0bbffffeabbffff9ebdffffa0bdffff04f6ffff16f6ffff84faffff
+      scrollPos: {x: 0, y: 135}
+      m_SelectedIDs: a43affff
+      m_LastClickedID: -50524
+      m_ExpandedIDs: a43affffa63affffaa3affff5c3effff603effff6a3effff9e53ffffc253ffff2454ffff3054ffff765fffff0460ffff9260ffffb260ffffb460ffffb084ffff72afffffa0ccffffb6ccffffbeccffff58ceffff82ceffff84ceffff90ceffff20d4ffff24d4ffff2ed4ffff26d9ffff9eddffffa8ddffff50deffff12f2ffffa0f2ffff94f5ffffb8f7ffffec86010032b90100f0d4010008ed010048000200a401020020040200
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1089,10 +1089,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 725
+    x: 789
     y: 0
-    width: 406.5
-    height: 932
+    width: 325
+    height: 931
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 13}
@@ -1120,10 +1120,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 942
+    x: 1110
     y: 96
-    width: 404.5
-    height: 911
+    width: 323
+    height: 910
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1135,7 +1135,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: herode
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1145,24 +1145,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Art/UIAssets/decorate
     m_Globs: []
-    m_OriginalText: herode
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Art/UIAssets/decorate
   m_LastFoldersGridSize: 16
   m_LastProjectPath: /Users/lcn/0Fort23Projects/XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: b8a10000
-    m_LastClickedID: 41400
-    m_ExpandedIDs: 00000000b8a10000baa10000bca10000bea10000c0a10000c2a10000c4a10000c6a10000c8a10000caa10000cca10000cea10000d0a1000000ca9a3b
+    m_SelectedIDs: f04c0200
+    m_LastClickedID: 150768
+    m_ExpandedIDs: 00000000aeab0000b0ab0000b2ab0000b4ab0000b6ab0000b8ab0000baab0000bcab0000beab0000c0ab0000c2ab0000c4ab0000c6ab000096ad0000baad0000f24c020000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1190,7 +1190,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b8a10000baa10000bca10000bea10000c0a10000c2a10000c4a10000c6a10000c8a10000caa10000cca10000cea10000d0a1000000ca9a3b
+    m_ExpandedIDs: 00000000aeab0000b0ab0000b2ab0000b4ab0000b6ab0000b8ab0000baab0000bcab0000beab0000c0ab0000c2ab0000c4ab0000c6ab0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1215,24 +1215,24 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: d8d3fdff
-    m_LastClickedInstanceID: -142376
+    m_SelectedInstanceIDs: a43affff
+    m_LastClickedInstanceID: -50524
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e0100
+    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e0100dacf0000eacd0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: PanelFrame03_Oblique
+      m_OriginalName: PanelFrame03_Oblique
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 53210
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
@@ -1245,7 +1245,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 227
+  m_DirectoriesAreaWidth: 159.5
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -1261,12 +1261,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1131.5
+    x: 1114
     y: 0
-    width: 379.5
-    height: 932
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 293
+    height: 931
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -1292,13 +1292,13 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1348.5
+    x: 1435
     y: 96
-    width: 378.5
-    height: 911
+    width: 292
+    height: 910
   m_SerializedDataModeController:
-    m_DataMode: 3
-    m_PreferredDataMode: 3
+    m_DataMode: 1
+    m_PreferredDataMode: 1
     m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
@@ -1309,7 +1309,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: -315
+    m_CachedPref: 321
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1

TEMPAT SAMPAH
美术/art_use_ui/all/btn_Arrow_Down.png


TEMPAT SAMPAH
美术/art_use_ui/all/dec_PanelFrame03_Bg.png


TEMPAT SAMPAH
美术/art_use_ui/all/dec_PanelFrame03_Oblique.png


TEMPAT SAMPAH
美术/unity_use_ui/Button/btn_Arrow_Down.png


File diff ditekan karena terlalu besar
+ 0 - 0
美术/unity_use_ui/TextrueJson/all.txt


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

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

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

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}

TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_PanelFrame03_Bg.png


TEMPAT SAMPAH
美术/unity_use_ui/decorate/dec_PanelFrame03_Oblique.png


Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini