Merge branch 'dev_hero_2' of https://git.wdd817.link/puxuan/c1_unity into dev_hero_2

Assets/arts/atlas/ui/common.spriteatlas

@@ -363,6 +363,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 2bf6cb4eb06aaee409099e3faaab97de, type: 3}
   - {fileID: 21300000, guid: a6132c5e3e7a04518a1870bc230ee156, type: 3}
   - {fileID: 21300000, guid: 09f9c16e1cfc25c49a29ff0c74978b2e, type: 3}
+  - {fileID: 21300000, guid: 1382fc8e2fd70419eb51aaad5a5ec6d9, type: 3}
   - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3}
   - {fileID: 21300000, guid: 3758089ee0e9980469310bc78ea54659, type: 3}
   - {fileID: 21300000, guid: f49d6fae72acf1c45869f9ba7ae26afb, type: 3}
@@ -686,6 +687,7 @@ SpriteAtlas:
   - common_dec_22
   - common_btn_option
   - common_board_6
+  - common_bg_48
   - common_board_9
   - common_icon_1
   - common_board_127

Assets/arts/textures/ui/common/common_bg_48.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 1382fc8e2fd70419eb51aaad5a5ec6d9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 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: 44, y: 36, z: 44, w: 36}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/prefabs/ui/fund/fund_chapter_comp.prefab

@@ -40,7 +40,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &8338697449865155893
 MonoBehaviour:
@@ -287,7 +287,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &5969264501015305569
 MonoBehaviour:
@@ -471,8 +471,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 5}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -20, y: -10}
+  m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &841438555916687438
 CanvasRenderer:
@@ -607,9 +607,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: 57}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 640, y: 114}
+  m_SizeDelta: {x: 670, y: 78}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &284067057054194576
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1431,7 +1431,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -183, y: 0}
-  m_SizeDelta: {x: 156, y: 68}
+  m_SizeDelta: {x: 218, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1068612609602852098
 CanvasRenderer:
@@ -1461,7 +1461,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2220,7 +2220,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &8000978665149459321
 MonoBehaviour:
@@ -2731,7 +2731,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1251929623466344435
 MonoBehaviour:
@@ -3113,7 +3113,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &370211848011111632
 MonoBehaviour:
@@ -3301,7 +3301,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &7123438965500919881
 MonoBehaviour:
@@ -3760,7 +3760,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6742246514053733519
 MonoBehaviour:
@@ -4315,7 +4315,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 265}
+  m_AnchoredPosition: {x: 0, y: 285}
   m_SizeDelta: {x: 720, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3681515880697298299
@@ -4355,8 +4355,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 170}
+  m_AnchoredPosition: {x: 0, y: 190}
-  m_SizeDelta: {x: 660, y: 81}
+  m_SizeDelta: {x: 680, y: 78}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2984890822378149392
 CanvasRenderer:
@@ -4409,14 +4409,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.8}
   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: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1382fc8e2fd70419eb51aaad5a5ec6d9, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4662,7 +4662,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &3878158398468686152
 MonoBehaviour:
@@ -5219,7 +5219,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6791221973480126462
 MonoBehaviour:
@@ -5562,7 +5562,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &3553889088576063702
 MonoBehaviour:
@@ -6246,7 +6246,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1019300372637152270
 MonoBehaviour:
@@ -6628,7 +6628,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &4351635026422531156
 MonoBehaviour:
@@ -6887,7 +6887,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6428886131296738088
 MonoBehaviour:
@@ -7153,7 +7153,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &8704902083498350244
 MonoBehaviour:
@@ -7260,8 +7260,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 5}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -10}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &672370060303272663
 CanvasRenderer:
@@ -7882,7 +7882,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &7781701753737885243
 MonoBehaviour:
@@ -7994,7 +7994,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &2550052910487733801
 MonoBehaviour:
@@ -8450,7 +8450,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 183, y: 0}
-  m_SizeDelta: {x: 156, y: 68}
+  m_SizeDelta: {x: 218, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1578853590489959477
 CanvasRenderer:
@@ -8480,7 +8480,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8831,7 +8831,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1603349737044167074
 MonoBehaviour:
@@ -9173,7 +9173,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &5276039493664359322
 MonoBehaviour:
@@ -9649,7 +9649,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 264}
-  m_SizeDelta: {x: 680, y: 582}
+  m_SizeDelta: {x: 680, y: 558}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8578553726053284260
 CanvasRenderer:
@@ -9781,7 +9781,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &8348044604269526353
 MonoBehaviour:
@@ -10116,7 +10116,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 178, y: 70}
+  m_SizeDelta: {x: 180, y: 66}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &3758120349047859522
 MonoBehaviour: