图集，资源修改

Assets/arts/atlas/icon/item.asset

@@ -88,6 +88,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3}
   - {fileID: 21300000, guid: edbdb7f49131aa446bab8b42c0971df2, type: 3}
   - {fileID: 21300000, guid: 23ec06e4c0f1dc7498a431977c394573, type: 3}
+  - {fileID: 21300000, guid: c74479259ceb9f5468c6f7787f4d2b72, type: 3}
+  - {fileID: 21300000, guid: ad5313adf39f71241b1d922afb85c2be, type: 3}
   - {fileID: 21300000, guid: d3c97c92da583664a87485c06eb51849, type: 3}
   - {fileID: 21300000, guid: 8b3ecfd5255c1854f8c5c2895e82fe5c, type: 3}
   - {fileID: 21300000, guid: aeb11f14603e1574e94acc9a24d3bf43, type: 3}
@@ -99,4 +101,4 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3}
   - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3}
   - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3}
-  spriteNameList: 310000001f0600006000170061001700620017006300170064001700650017006600170067001700680017007e0017007f00170080001700810017008200170083001700840017008500170086001700870017009d0017009e0017009f001700a0001700a1001700a2001700a3001700a4001700a5001700a6001700bc001700200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f06000080060000810600008206000083060000350000009c0600009d06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76
+  spriteNameList: 310000001f0600006000170061001700620017006300170064001700650017006600170067001700680017007e0017007f00170080001700810017008200170083001700840017008500170086001700870017009d0017009e0017009f001700a0001700a1001700a2001700a3001700a4001700a5001700a6001700bc001700200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f06000080060000810600008206000083060000350000009c0600009d0600009e0600009f06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76

Assets/arts/atlas/icon/item.spriteatlas

@@ -137,7 +137,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: b0e700cd6e64cde43aed559a98e029dc, type: 3}
   - {fileID: 21300000, guid: 858bbfdd8f069f64d82dfd600c5e7c19, type: 3}
   - {fileID: 21300000, guid: 5fd8973e1ff854f44bba6685ddadd684, type: 3}
-  - {fileID: 21300000, guid: 7085da3e541afc546bdb4ad077565a13, type: 3}
   - {fileID: 21300000, guid: 4fc5b24e0e84c994dbcd31f6a6d800b7, type: 3}
   - {fileID: 21300000, guid: 754bc25e6afb7b84f8187052b40b5240, type: 3}
   - {fileID: 21300000, guid: 67a67c8e30e1f4a41aecf613705881ca, type: 3}
@@ -227,7 +226,6 @@ SpriteAtlas:
   - 1013
   - 1005
   - 24
-  - 51
   - 45
   - 11
   - 1030

Assets/arts/atlas/ui/act_fourteen.spriteatlas

@@ -54,54 +54,13 @@ SpriteAtlas:
       enableTightPacking: 0
     secondaryTextureSettings: {}
     variantMultiplier: 1
-    packables:
-    - {fileID: 102900000, guid: c5dec2b95754a3448a2d3a88a6ef52a1, type: 3}
+    packables: []
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
   m_MasterAtlas: {fileID: 0}
-  m_PackedSprites:
-  - {fileID: 21300000, guid: 0dc151d0800d1f440aa6c71937f9d7dd, type: 3}
-  - {fileID: 21300000, guid: b891ad51339e69c4ba6aad56af2870d6, type: 3}
-  - {fileID: 21300000, guid: 73ccad727b742ed4b86b955a7d491912, type: 3}
-  - {fileID: 21300000, guid: 72617b669098e4e47834cb0373466739, type: 3}
-  - {fileID: 21300000, guid: f443a476a4ad5d24e8bd01dd45b9169a, type: 3}
-  - {fileID: 21300000, guid: 2cd6933793de3a94694a324de42380b6, type: 3}
-  - {fileID: 21300000, guid: cda0277792202fc4695c774048dcdc60, type: 3}
-  - {fileID: 21300000, guid: 7e0bdf78cc817e9478bb1c8a47a2a33f, type: 3}
-  - {fileID: 21300000, guid: aafa9cc8dcbedd44989d2dde510195ab, type: 3}
-  - {fileID: 21300000, guid: 137bc629a9ac106448b5ecfb7165702c, type: 3}
-  - {fileID: 21300000, guid: bf3961c9c3757954a8a2d63cd1805ffc, type: 3}
-  - {fileID: 21300000, guid: 4917e5e99bf49c34995c6848081d67cc, type: 3}
-  - {fileID: 21300000, guid: 75c3651a2d561304ca84bc36033a3a78, type: 3}
-  - {fileID: 21300000, guid: 17aa3f3a6a584ae4b9ac1cdc03b31d7b, type: 3}
-  - {fileID: 21300000, guid: 12827eea681397a48b4ae248f91095b4, type: 3}
-  - {fileID: 21300000, guid: 894606cc9de03f9438dec35789cb06e8, type: 3}
-  - {fileID: 21300000, guid: fc032d1d4f6bb5849869a8559dcbc395, type: 3}
-  - {fileID: 21300000, guid: e2a55d1e178ac0d4c938e49e8cfd9615, type: 3}
-  - {fileID: 21300000, guid: 2497b40f8fdf10e489ac1f2be8daee9f, type: 3}
-  - {fileID: 21300000, guid: 04b9cc1f3bf43c74d9a66002d006c613, type: 3}
-  m_PackedSpriteNamesToIndex:
-  - act_common_line_2
-  - act_common_board_2
-  - act_common_bg_6
-  - act_common_bg_4
-  - act_common_board_5
-  - act_common_bg_3
-  - act_common_progress_bg
-  - act_common_bg_2
-  - act_common_dec_1
-  - act_common_bg_1
-  - act_common_board_3
-  - act_common_line_1
-  - act_fourteen_dec_1
-  - act_common_bg_5
-  - act_common_select
-  - act_common_board_4
-  - act_fourteen_dec_2
-  - act_common_board_1
-  - act_common_3
-  - act_common_progress_1
+  m_PackedSprites: []
+  m_PackedSpriteNamesToIndex: []
   m_RenderDataMap: {}
   m_Tag: act_fourteen
   m_IsVariant: 0

Assets/arts/atlas/ui/common.spriteatlas

@@ -65,7 +65,6 @@ SpriteAtlas:
   - {fileID: 21300000, guid: bd8ab060d4c962f45b3af7dea9c8ee79, type: 3}
   - {fileID: 21300000, guid: fab2da6010f11704a98a2f788ba73a34, type: 3}
   - {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3}
-  - {fileID: 21300000, guid: d4d67da097d40b74d871e747de2200f9, type: 3}
   - {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3}
   - {fileID: 21300000, guid: a5649cd0bacb4934bbe6a22dca87cf40, type: 3}
   - {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3}
@@ -237,7 +236,6 @@ SpriteAtlas:
   - common_circle_1
   - common_title_12
   - common_title_2
-  - common_board_126
   - common_title_1
   - common_board_19
   - common_ad_3

Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab

@@ -165,6 +165,13 @@ RectTransform:
   m_Children:
   - {fileID: 3032866614547631344}
   - {fileID: 4608395162647623937}
+  - {fileID: 7466131106039494145}
+  - {fileID: 3948592039148056872}
+  - {fileID: 802557950483036959}
+  - {fileID: 2550418228025460676}
+  - {fileID: 5330751673859728803}
+  - {fileID: 1045458192161645731}
+  - {fileID: 4337017773926182326}
   m_Father: {fileID: 8515822730150599069}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -242,12 +249,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1023928932327357194}
-  m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 14
+  m_Father: {fileID: 5549995152151798572}
+  m_RootOrder: 8
   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: -56, y: -202}
+  m_AnchoredPosition: {x: -56, y: 354.5}
   m_SizeDelta: {x: 92, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6502580565970624889
@@ -464,12 +471,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 7
+  m_Father: {fileID: 5549995152151798572}
+  m_RootOrder: 3
   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: 161.5, y: -135}
+  m_AnchoredPosition: {x: 161.5, y: 421.5}
   m_SizeDelta: {x: 111, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4609113816403613592
@@ -868,12 +875,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4147322966158370557}
-  m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 13
+  m_Father: {fileID: 5549995152151798572}
+  m_RootOrder: 7
   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: -152, y: -202}
+  m_AnchoredPosition: {x: -152, y: 354.5}
   m_SizeDelta: {x: 92, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4663368883347013607
@@ -1382,12 +1389,12 @@ RectTransform:
   - {fileID: 7497009897814581287}
   - {fileID: 4356822342620188821}
   - {fileID: 1820636120108644874}
-  m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 9
+  m_Father: {fileID: 5549995152151798572}
+  m_RootOrder: 4
   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: 161.5, y: -135}
+  m_AnchoredPosition: {x: 161.5, y: 421.5}
   m_SizeDelta: {x: 111, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1401268681271967637
@@ -2213,7 +2220,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2810,12 +2817,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7494825451856947044}
-  m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 12
+  m_Father: {fileID: 5549995152151798572}
+  m_RootOrder: 6
   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: -248, y: -202}
+  m_AnchoredPosition: {x: -248, y: 354.5}
   m_SizeDelta: {x: 92, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2049383473186769210
@@ -3034,12 +3041,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7698491840271436400}
-  m_Father: {fileID: 1164488007620484532}
-  m_RootOrder: 10
+  m_Father: {fileID: 5549995152151798572}
+  m_RootOrder: 5
   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: 161.5, y: -205.5}
+  m_AnchoredPosition: {x: 161.5, y: 351}
   m_SizeDelta: {x: 265, y: 111}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3874625450004387249
@@ -3279,22 +3286,15 @@ RectTransform:
   - {fileID: 5331464451294703184}
   - {fileID: 9212238363066804532}
   - {fileID: 4786905482103920709}
-  - {fileID: 3948592039148056872}
   - {fileID: 3152023950581842376}
-  - {fileID: 802557950483036959}
-  - {fileID: 2550418228025460676}
-  - {fileID: 7466131106039494145}
-  - {fileID: 5330751673859728803}
-  - {fileID: 1045458192161645731}
-  - {fileID: 4337017773926182326}
   m_Father: {fileID: 8515822730150599069}
   m_RootOrder: 1
   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: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -30.5}
   m_SizeDelta: {x: 720, y: 1219}
-  m_Pivot: {x: 0.5, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2324714848820164852
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3660,7 +3660,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 1164488007620484532}
+    m_TransformParent: {fileID: 5549995152151798572}
     m_Modifications:
     - target: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
       propertyPath: m_Name
@@ -3680,7 +3680,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
       propertyPath: m_AnchorMax.x
@@ -3740,7 +3740,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -390
+      value: 166.5
       objectReference: {fileID: 0}
     - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -3772,16 +3772,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
---- !u!224 &7466131106039494145 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
-  m_PrefabInstance: {fileID: 3816542384659183299}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4226237696773862998 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
   m_PrefabInstance: {fileID: 3816542384659183299}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &7466131106039494145 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3}
+  m_PrefabInstance: {fileID: 3816542384659183299}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4611521338979965073
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3891,13 +3891,13 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3}
---- !u!1 &5812021869403537074 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8022908892261492259, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3}
-  m_PrefabInstance: {fileID: 4611521338979965073}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6589539316976043218 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3}
   m_PrefabInstance: {fileID: 4611521338979965073}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5812021869403537074 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8022908892261492259, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3}
+  m_PrefabInstance: {fileID: 4611521338979965073}
+  m_PrefabAsset: {fileID: 0}

Assets/prefabs/ui/activity/fourteen_day/fourteen_day_entrance_ui.prefab

@@ -2117,9 +2117,9 @@ RectTransform:
   m_Father: {fileID: 8515822730150599069}
   m_RootOrder: 0
   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: 100}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -540}
   m_SizeDelta: {x: 92, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3206310922040769958