diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index 8d0ed2692..483544b8d 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -85,9 +85,9 @@ MonoBehaviour: - {fileID: 21300000, guid: 4fc5b24e0e84c994dbcd31f6a6d800b7, type: 3} - {fileID: 21300000, guid: 6c58f023cd741bb40a1c6c7e3337991e, type: 3} - {fileID: 21300000, guid: 301967b6e52e1234cb623a81d9ff2e09, type: 3} - - {fileID: 21300000, guid: 23ec06e4c0f1dc7498a431977c394573, type: 3} - {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3} - {fileID: 21300000, guid: edbdb7f49131aa446bab8b42c0971df2, type: 3} + - {fileID: 21300000, guid: 23ec06e4c0f1dc7498a431977c394573, type: 3} - {fileID: 21300000, guid: d3c97c92da583664a87485c06eb51849, type: 3} - {fileID: 21300000, guid: 8b3ecfd5255c1854f8c5c2895e82fe5c, type: 3} - {fileID: 21300000, guid: aeb11f14603e1574e94acc9a24d3bf43, type: 3} @@ -99,4 +99,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3} - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3} - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3} - spriteNameList: 310000001f0600006000170061001700620017006300170064001700650017006600170067001700680017007e0017007f00170080001700810017008200170083001700840017008500170086001700870017009d0017009e0017009f001700a0001700a1001700a2001700a3001700a4001700a5001700a6001700bc001700200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f0600008006000081060000820600008306000084060000350000009c06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 + spriteNameList: 310000001f0600006000170061001700620017006300170064001700650017006600170067001700680017007e0017007f00170080001700810017008200170083001700840017008500170086001700870017009d0017009e0017009f001700a0001700a1001700a2001700a3001700a4001700a5001700a6001700bc001700200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f06000080060000810600008206000083060000350000009c0600009d06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 diff --git a/Assets/arts/atlas/icon/item.spriteatlas b/Assets/arts/atlas/icon/item.spriteatlas index ff2a751b7..f283bc15c 100644 --- a/Assets/arts/atlas/icon/item.spriteatlas +++ b/Assets/arts/atlas/icon/item.spriteatlas @@ -173,7 +173,7 @@ SpriteAtlas: - 8 - 27 - 1008 - - 48 + - 52 - 51 - 14 - 28 diff --git a/Assets/arts/textures/background/battle/boss_rush.png b/Assets/arts/textures/background/battle/boss_rush.png new file mode 100644 index 000000000..1e1e5dd82 Binary files /dev/null and b/Assets/arts/textures/background/battle/boss_rush.png differ diff --git a/Assets/arts/textures/background/battle/boss_rush.png.meta b/Assets/arts/textures/background/battle/boss_rush.png.meta new file mode 100644 index 000000000..efbe287d9 --- /dev/null +++ b/Assets/arts/textures/background/battle/boss_rush.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: fec8ac91b09904f4fade154ba8a5c422 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 45 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/item/48.png b/Assets/arts/textures/icon/item/52.png similarity index 100% rename from Assets/arts/textures/icon/item/48.png rename to Assets/arts/textures/icon/item/52.png diff --git a/Assets/arts/textures/icon/item/48.png.meta b/Assets/arts/textures/icon/item/52.png.meta similarity index 100% rename from Assets/arts/textures/icon/item/48.png.meta rename to Assets/arts/textures/icon/item/52.png.meta diff --git a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab index e034ffb63..f486af44f 100644 --- a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab +++ b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab @@ -580,6 +580,7 @@ RectTransform: - {fileID: 3967537185672400108} - {fileID: 8620813408290376085} - {fileID: 1836563334693926470} + - {fileID: 6877192690319600495} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -645,6 +646,10 @@ MonoBehaviour: hashName: 416788971 objectType: 0 gameObject: {fileID: 2850987162099960331} + - name: act_boss_rush_pop_ui.pop_check_bar + hashName: 1400852292 + objectType: 1 + gameObject: {fileID: 3553439400657213559} --- !u!223 &2459416726653635175 Canvas: m_ObjectHideFlags: 0 @@ -1199,3 +1204,110 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 2303760374464046962} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5846545797893902692 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8461932745927490369} + m_Modifications: + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_SizeDelta.y + value: 43.6354 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_AnchoredPosition.x + value: -156.73999 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_AnchoredPosition.y + value: -88.81763 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6949969171472451859, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + propertyPath: m_Name + value: pop_check_bar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} +--- !u!1 &3553439400657213559 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6949969171472451859, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + m_PrefabInstance: {fileID: 5846545797893902692} + m_PrefabAsset: {fileID: 0} +--- !u!224 &6877192690319600495 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1032353723183888907, guid: 87b2f6e74d358f941b5e39ab3e4df412, type: 3} + m_PrefabInstance: {fileID: 5846545797893902692} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_rank_ui.prefab b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_rank_ui.prefab index 06eb7d1e0..7d8d18a4b 100644 --- a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_rank_ui.prefab +++ b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_rank_ui.prefab @@ -1082,8 +1082,8 @@ MonoBehaviour: downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 590 - cellHeight: 120 + cellWidth: 548 + cellHeight: 144 perLineNum: 1 --- !u!1 &1578762696431715672 GameObject: @@ -2417,6 +2417,7 @@ GameObject: - component: {fileID: 27648235668091818} - component: {fileID: 9037265049815301898} - component: {fileID: 8824740618196422353} + - component: {fileID: 2057234378659242907} m_Layer: 5 m_Name: scrollrect m_TagString: Untagged @@ -2504,6 +2505,26 @@ MonoBehaviour: cellWidth: 548 cellHeight: 137 perLineNum: 1 +--- !u!114 &2057234378659242907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3430073042800902170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3459891711635564131 GameObject: m_ObjectHideFlags: 0 @@ -5146,6 +5167,10 @@ MonoBehaviour: hashName: 1115797994 objectType: 0 gameObject: {fileID: 3430073042800902170} + - name: act_boss_rush_rank_ui.bg.title + hashName: 498519032 + objectType: 0 + gameObject: {fileID: 3317607067236810184} --- !u!223 &2459416726653635175 Canvas: m_ObjectHideFlags: 0 @@ -5322,7 +5347,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -6361,13 +6386,17 @@ PrefabInstance: propertyPath: m_Name value: player_head_cell objectReference: {fileID: 0} + - target: {fileID: 4473470165577477407, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_RaycastTarget + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_RootOrder @@ -6439,7 +6468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.y - value: 71 + value: 25.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6455,16 +6484,29 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!224 &5122788997353853008 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 266310196820162542} - m_PrefabAsset: {fileID: 0} --- !u!1 &4585240505230664045 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 266310196820162542} m_PrefabAsset: {fileID: 0} +--- !u!224 &5122788997353853008 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 266310196820162542} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4804674245245520200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4585240505230664045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1001 &457335404319531174 PrefabInstance: m_ObjectHideFlags: 0 @@ -6710,13 +6752,17 @@ PrefabInstance: propertyPath: m_Name value: player_head_cell objectReference: {fileID: 0} + - target: {fileID: 4473470165577477407, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_RaycastTarget + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_RootOrder @@ -6788,7 +6834,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.y - value: 71 + value: 25.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6804,16 +6850,29 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!1 &1915368905934055724 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 2775578134639099823} - m_PrefabAsset: {fileID: 0} --- !u!224 &7070940992916477969 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 2775578134639099823} m_PrefabAsset: {fileID: 0} +--- !u!1 &1915368905934055724 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 2775578134639099823} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6239429919703271363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1915368905934055724} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1001 &4539976569426428468 PrefabInstance: m_ObjectHideFlags: 0 @@ -6923,16 +6982,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &2064854580354626144 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 4539976569426428468} - m_PrefabAsset: {fileID: 0} --- !u!1 &7078291136006363070 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 4539976569426428468} m_PrefabAsset: {fileID: 0} +--- !u!224 &2064854580354626144 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 4539976569426428468} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6832982185332228905 PrefabInstance: m_ObjectHideFlags: 0 @@ -7266,16 +7325,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &5442246081013469406 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 7503092739197870218} - m_PrefabAsset: {fileID: 0} --- !u!1 &3826458777750959360 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 7503092739197870218} m_PrefabAsset: {fileID: 0} +--- !u!224 &5442246081013469406 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7503092739197870218} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7946259584742811726 PrefabInstance: m_ObjectHideFlags: 0 @@ -7287,13 +7346,17 @@ PrefabInstance: propertyPath: m_Name value: player_head_cell objectReference: {fileID: 0} + - target: {fileID: 4473470165577477407, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_RaycastTarget + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_RootOrder @@ -7365,7 +7428,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_AnchoredPosition.y - value: 71 + value: 25.5 objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7381,13 +7444,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} ---- !u!224 &3090342600459849712 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} - m_PrefabInstance: {fileID: 7946259584742811726} - m_PrefabAsset: {fileID: 0} --- !u!1 &5933172248048664269 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 7946259584742811726} m_PrefabAsset: {fileID: 0} +--- !u!224 &3090342600459849712 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + m_PrefabInstance: {fileID: 7946259584742811726} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8135566216025743902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5933172248048664269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 diff --git a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_shop_ui.prefab b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_shop_ui.prefab index 98085ad21..29b3fe6bf 100644 --- a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_shop_ui.prefab +++ b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_shop_ui.prefab @@ -336,7 +336,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 + IsShowClickAnimation: 0 --- !u!1 &1307564746847574849 GameObject: m_ObjectHideFlags: 0 @@ -996,11 +996,11 @@ RectTransform: m_Father: {fileID: 2765727128621893746} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -24, y: -11} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 155, y: 11} m_SizeDelta: {x: 194, y: 82} - m_Pivot: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5263905771007676392 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1064,6 +1064,7 @@ GameObject: - component: {fileID: 27648235668091818} - component: {fileID: 9037265049815301898} - component: {fileID: 8824740618196422353} + - component: {fileID: 7549257266765553127} m_Layer: 5 m_Name: scrollrect m_TagString: Untagged @@ -1144,13 +1145,33 @@ MonoBehaviour: isDrag: 0 contentTrans: {fileID: 7955369474207028639} bfCell: {fileID: 7415994793770204428} - topRecoveryOffset: 15 + topRecoveryOffset: 0 downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 590 - cellHeight: 120 + cellWidth: 552 + cellHeight: 132 perLineNum: 1 +--- !u!114 &7549257266765553127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3430073042800902170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5102539967445665239 GameObject: m_ObjectHideFlags: 0 @@ -1250,7 +1271,6 @@ GameObject: m_Component: - component: {fileID: 4412000624834818031} - component: {fileID: 8423204439961451282} - - component: {fileID: 8278805824888950264} - component: {fileID: 3591876387260850266} m_Layer: 5 m_Name: bg @@ -1291,63 +1311,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5390457402351964377} m_CullTransparentMesh: 1 ---- !u!114 &8278805824888950264 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5390457402351964377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabList: - - name: bounty_panel.title.free.tx_free - hashName: 1340770009 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.title.buy1.tx_buyed - hashName: 220950969 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.title.buy2.tx_buyed - hashName: 24437464 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty - hashName: 551682030 - objectType: 0 - gameObject: {fileID: 3430073042800902170} - - name: bounty_panel.list_bounty.viewport.content.prog - hashName: 856178167 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty.viewport.content.prog.img_prog - hashName: 1672061037 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty.viewport.content.mask_img - hashName: 612727821 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty.viewport.content.line - hashName: 856050321 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty.viewport.content.line.btn_buy_level - hashName: 2847369675 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty.viewport.content.line.btn_buy_level.tx_num - hashName: 1400355022 - objectType: 0 - gameObject: {fileID: 0} - - name: bounty_panel.list_bounty.viewport.content.line.btn_buy_level.icon - hashName: 1520661180 - objectType: 0 - gameObject: {fileID: 0} --- !u!114 &3591876387260850266 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1588,6 +1551,26 @@ MonoBehaviour: hashName: 784356041 objectType: 0 gameObject: {fileID: 979992885755077724} + - name: act_boss_rush_shop_ui.bg.desc_bg.desc + hashName: 1859497538 + objectType: 0 + gameObject: {fileID: 7815488132785961829} + - name: act_boss_rush_shop_ui.bg.score + hashName: 4272199676 + objectType: 0 + gameObject: {fileID: 1243452690117410473} + - name: act_boss_rush_shop_ui.bg.scrollrect + hashName: 2360412935 + objectType: 0 + gameObject: {fileID: 3430073042800902170} + - name: act_boss_rush_shop_ui.bg.countdown.tx_countdown + hashName: 1381080745 + objectType: 0 + gameObject: {fileID: 1307564746847574849} + - name: act_boss_rush_shop_ui.bg.close_btn + hashName: 3471139839 + objectType: 0 + gameObject: {fileID: 5102539967445665239} --- !u!1 &6403078599521314771 GameObject: m_ObjectHideFlags: 0 @@ -2097,6 +2080,7 @@ GameObject: - component: {fileID: 6986091995792665702} - component: {fileID: 8277174569845984948} - component: {fileID: 5130605732787736295} + - component: {fileID: 1885379939778115640} m_Layer: 5 m_Name: countdown m_TagString: Untagged @@ -2163,6 +2147,27 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!223 &1885379939778115640 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8944690804392300797} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1001 &3786549724142463620 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab index 74f4210f8..bba3c048e 100644 --- a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab +++ b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab @@ -738,7 +738,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 53, y: 18} + m_SizeDelta: {x: 100, y: 18} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6313014532243390772 CanvasRenderer: @@ -994,8 +994,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2293,7 +2293,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 53, y: 18} + m_SizeDelta: {x: 100, y: 18} m_Pivot: {x: 0.5, y: 1} --- !u!222 &9105662472528508284 CanvasRenderer: @@ -2404,6 +2404,7 @@ GameObject: - component: {fileID: 8185758678648318718} - component: {fileID: 6583487442867717825} - component: {fileID: 8287827866821747596} + - component: {fileID: 1117777599440037397} m_Layer: 0 m_Name: btn_help m_TagString: Untagged @@ -2469,6 +2470,19 @@ MonoBehaviour: m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 --- !u!114 &8287827866821747596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5330591426040881882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!114 &1117777599440037397 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2666,7 +2680,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 53, y: 18} + m_SizeDelta: {x: 100, y: 18} m_Pivot: {x: 0.5, y: 1} --- !u!222 &200322692063926607 CanvasRenderer: @@ -3106,15 +3120,15 @@ RectTransform: m_GameObject: {fileID: 7448532732365749927} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 802557950483036959} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 6.63, y: 0} - m_SizeDelta: {x: 178, y: 188} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -49.37, y: 0} + m_SizeDelta: {x: 53.4, y: 56.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8004823165811499393 CanvasRenderer: @@ -3327,6 +3341,7 @@ GameObject: - component: {fileID: 7887192291697496745} - component: {fileID: 387608147073846595} - component: {fileID: 1948101238780396081} + - component: {fileID: 2791362710142091617} m_Layer: 5 m_Name: time_bg m_TagString: Untagged @@ -3385,6 +3400,23 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &2791362710142091617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697326955085415035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1001 &1534691829317955259 PrefabInstance: m_ObjectHideFlags: 0 @@ -3392,22 +3424,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7140604088457579291} m_Modifications: - - target: {fileID: 4811286785217053851, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} - propertyPath: prefabList.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 4811286785217053851, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} - propertyPath: prefabList.Array.data[6].name - value: act_rank_cell_1.bg - objectReference: {fileID: 0} - - target: {fileID: 4811286785217053851, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} - propertyPath: prefabList.Array.data[6].hashName - value: 3256761049 - objectReference: {fileID: 0} - - target: {fileID: 4811286785217053851, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} - propertyPath: prefabList.Array.data[6].gameObject - value: - objectReference: {fileID: 7880627118144326850} - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3452,6 +3468,10 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.850365 objectReference: {fileID: 0} + - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} + propertyPath: m_LocalScale.z + value: 0.850365 + objectReference: {fileID: 0} - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3506,11 +3526,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} ---- !u!1 &7880627118144326850 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8651923452304646777, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} - m_PrefabInstance: {fileID: 1534691829317955259} - m_PrefabAsset: {fileID: 0} --- !u!224 &8196981469095916280 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} @@ -3572,6 +3587,10 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.850365 objectReference: {fileID: 0} + - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} + propertyPath: m_LocalScale.z + value: 0.850365 + objectReference: {fileID: 0} - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3814,6 +3833,10 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.850365 objectReference: {fileID: 0} + - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} + propertyPath: m_LocalScale.z + value: 0.850365 + objectReference: {fileID: 0} - target: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3868,13 +3891,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} ---- !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} +--- !u!224 &6589539316976043218 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7245681713653423171, guid: 216bbf0b495202b46bf6fdb41b49a1fe, type: 3} + m_PrefabInstance: {fileID: 4611521338979965073} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/activity/act_boss_rush/cell/act_rank_cell.prefab b/Assets/prefabs/ui/activity/act_boss_rush/cell/act_rank_cell.prefab index c63f7abba..968437dde 100644 --- a/Assets/prefabs/ui/activity/act_boss_rush/cell/act_rank_cell.prefab +++ b/Assets/prefabs/ui/activity/act_boss_rush/cell/act_rank_cell.prefab @@ -955,6 +955,10 @@ PrefabInstance: propertyPath: m_Name value: player_head_cell objectReference: {fileID: 0} + - target: {fileID: 4473470165577477407, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} + propertyPath: m_RaycastTarget + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1059,3 +1063,16 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3} m_PrefabInstance: {fileID: 8113837066023243833} m_PrefabAsset: {fileID: 0} +--- !u!114 &2862758780580901958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5515281811995920058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 diff --git a/Assets/prefabs/ui/activity/pop_check_bar.prefab b/Assets/prefabs/ui/activity/pop_check_bar.prefab new file mode 100644 index 000000000..54ba22ecb --- /dev/null +++ b/Assets/prefabs/ui/activity/pop_check_bar.prefab @@ -0,0 +1,408 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4697711348280848986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2575840508759395099} + - component: {fileID: 663413584358010053} + - component: {fileID: 6837205800735270815} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2575840508759395099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4697711348280848986} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1032353723183888907} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0.4509735, y: -0.000049591064} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &663413584358010053 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4697711348280848986} + m_CullTransparentMesh: 1 +--- !u!114 &6837205800735270815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4697711348280848986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5100734266599592802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5617692048401912684} + - component: {fileID: 3009636088361997874} + - component: {fileID: 4431452038510720622} + - component: {fileID: 7244806547023743522} + m_Layer: 0 + m_Name: desc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5617692048401912684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5100734266599592802} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1032353723183888907} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.00007247925} + m_SizeDelta: {x: 160, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &3009636088361997874 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5100734266599592802} + m_CullTransparentMesh: 1 +--- !u!114 &4431452038510720622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5100734266599592802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u4ECA\u65E5\u4E0D\u518D\u63D0\u793A" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7244806547023743522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5100734266599592802} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!1 &6949969171472451859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1032353723183888907} + - component: {fileID: 8969774816062237470} + - component: {fileID: 2994848077211828126} + - component: {fileID: 4680075484804378168} + - component: {fileID: 8348235530518595566} + m_Layer: 0 + m_Name: pop_check_bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1032353723183888907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949969171472451859} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2575840508759395099} + - {fileID: 5119207851301718154} + - {fileID: 5617692048401912684} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -156.73999, y: -88.81763} + m_SizeDelta: {x: 200, y: 43.6354} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8969774816062237470 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949969171472451859} + m_CullTransparentMesh: 1 +--- !u!114 &2994848077211828126 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949969171472451859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4680075484804378168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949969171472451859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!114 &8348235530518595566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6949969171472451859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: pop_check_bar.bg + hashName: 3774612037 + objectType: 0 + gameObject: {fileID: 4697711348280848986} + - name: pop_check_bar.check + hashName: 2929471240 + objectType: 0 + gameObject: {fileID: 7248215539771968648} + - name: pop_check_bar.desc + hashName: 2449831057 + objectType: 0 + gameObject: {fileID: 5100734266599592802} +--- !u!1 &7248215539771968648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5119207851301718154} + - component: {fileID: 598257159706110658} + - component: {fileID: 5851404278552370876} + m_Layer: 0 + m_Name: check + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5119207851301718154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248215539771968648} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1032353723183888907} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 3.9509735, y: -0.000049591064} + m_SizeDelta: {x: 33, y: 26.5} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &598257159706110658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248215539771968648} + m_CullTransparentMesh: 1 +--- !u!114 &5851404278552370876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7248215539771968648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/prefabs/ui/activity/pop_check_bar.prefab.meta b/Assets/prefabs/ui/activity/pop_check_bar.prefab.meta new file mode 100644 index 000000000..6cba60b4c --- /dev/null +++ b/Assets/prefabs/ui/activity/pop_check_bar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 87b2f6e74d358f941b5e39ab3e4df412 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/battle/battle_boss_rush_result_ui.prefab b/Assets/prefabs/ui/battle/battle_boss_rush_result_ui.prefab index 78e0761f8..d232e7c0d 100644 --- a/Assets/prefabs/ui/battle/battle_boss_rush_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_boss_rush_result_ui.prefab @@ -99,7 +99,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 7 + 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} @@ -156,7 +156,7 @@ GameObject: - component: {fileID: 1618187034406966015} - component: {fileID: 4151980301432038167} m_Layer: 5 - m_Name: icon + m_Name: icon_wave m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -174,7 +174,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 10 + 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} @@ -253,19 +253,17 @@ RectTransform: - {fileID: 7156597497233077380} - {fileID: 7856976683170364790} - {fileID: 1395054053664364182} - - {fileID: 7834038970147409906} - {fileID: 6892244337032643932} - {fileID: 3293924455771396052} - - {fileID: 8466010852119111069} - {fileID: 6915708539382868494} - {fileID: 4537460506209909950} - {fileID: 4256631273791126118} - - {fileID: 5313457591195514166} - {fileID: 7302131717894960629} + - {fileID: 5313457591195514166} - {fileID: 7156562611230512950} - {fileID: 288113726972361144} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -645,81 +643,6 @@ MonoBehaviour: m_FillDirection: 0 m_Value: 1 m_FillCenter: 1 ---- !u!1 &1679293735050717821 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8466010852119111069} - - component: {fileID: 497178807793055902} - - component: {fileID: 5456629223891813945} - m_Layer: 5 - m_Name: report_img_round - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8466010852119111069 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679293735050717821} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4567631707956313030} - 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: 142.46918, y: 116} - m_SizeDelta: {x: 260, y: 74} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &497178807793055902 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679293735050717821} - m_CullTransparentMesh: 1 ---- !u!114 &5456629223891813945 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1679293735050717821} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &2006587770909143906 GameObject: m_ObjectHideFlags: 0 @@ -1028,7 +951,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1451,7 +1374,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4165930251451731960} - m_RootOrder: 4 + 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} @@ -1809,7 +1732,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 13 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2167,7 +2090,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2301,7 +2224,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 6 + 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} @@ -2346,45 +2269,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4959634630195587793 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 445959573539459069} - m_Layer: 5 - m_Name: defeat_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &445959573539459069 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4959634630195587793} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6494950659398821500} - - {fileID: 1903267056959353055} - - {fileID: 7770004333418327666} - - {fileID: 4710100049825492546} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 0 - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5046246927649095494 GameObject: m_ObjectHideFlags: 0 @@ -2594,92 +2478,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5180813019365726818 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6494950659398821500} - - component: {fileID: 8044983079248073376} - - component: {fileID: 5325711373223895297} - - component: {fileID: 2583487577270495895} - m_Layer: 5 - m_Name: mask_d - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6494950659398821500 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5180813019365726818} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 445959573539459069} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 1800} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8044983079248073376 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5180813019365726818} - m_CullTransparentMesh: 1 ---- !u!114 &5325711373223895297 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5180813019365726818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2e20a9c179d4bc14e888f80bd408c56b, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &2583487577270495895 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5180813019365726818} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 0 --- !u!1 &5287820198550774767 GameObject: m_ObjectHideFlags: 0 @@ -2787,7 +2585,7 @@ RectTransform: - {fileID: 7849578282925658152} - {fileID: 6871590302672264796} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2824,7 +2622,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -3317,7 +3115,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 9 + 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} @@ -3437,139 +3235,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6606104105387947548 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1903267056959353055} - - component: {fileID: 6745387017925834104} - - component: {fileID: 4658955252556872413} - - component: {fileID: 2244352369522363938} - m_Layer: 5 - m_Name: unit_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1903267056959353055 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6606104105387947548} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 445959573539459069} - m_RootOrder: 1 - 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: 16} - m_SizeDelta: {x: 584, y: 368} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6745387017925834104 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6606104105387947548} - m_CullTransparentMesh: 1 ---- !u!114 &4658955252556872413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6606104105387947548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25abc92244e96c1499c3f11397048a47, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!225 &2244352369522363938 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6606104105387947548} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!1 &6684480207332659927 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4710100049825492546} - - component: {fileID: 4181552087915593989} - m_Layer: 5 - m_Name: title_bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4710100049825492546 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6684480207332659927} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6949807007303294206} - m_Father: {fileID: 445959573539459069} - 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: 0, y: 270} - m_SizeDelta: {x: 500, y: 84} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &4181552087915593989 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6684480207332659927} - m_CullTransparentMesh: 1 --- !u!1 &6744923874523475039 GameObject: m_ObjectHideFlags: 0 @@ -4390,7 +4055,7 @@ RectTransform: - {fileID: 1062877572076605182} - {fileID: 4958566666409478410} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4853,140 +4518,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7936986928946906401 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6949807007303294206} - - component: {fileID: 507906359981443689} - - component: {fileID: 4627897115549761981} - m_Layer: 5 - m_Name: desc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6949807007303294206 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7936986928946906401} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4710100049825492546} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -16} - m_SizeDelta: {x: 78, y: 38} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &507906359981443689 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7936986928946906401} - m_CullTransparentMesh: 1 ---- !u!114 &4627897115549761981 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7936986928946906401} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7980948363060613729 GameObject: m_ObjectHideFlags: 0 @@ -5074,7 +4605,7 @@ GameObject: - component: {fileID: 8665334937928820573} - component: {fileID: 4325395755803822377} m_Layer: 5 - m_Name: desc_2 + m_Name: desc_wave m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5092,7 +4623,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4567631707956313030} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5538,81 +5069,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8531577034970334290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7834038970147409906} - - component: {fileID: 1159346813050732172} - - component: {fileID: 2237646251123437796} - m_Layer: 5 - m_Name: report_img_d - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7834038970147409906 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8531577034970334290} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4567631707956313030} - 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: -136.53082, y: 116} - m_SizeDelta: {x: 260, y: 74} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1159346813050732172 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8531577034970334290} - m_CullTransparentMesh: 1 ---- !u!114 &2237646251123437796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8531577034970334290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8788661847062199307 GameObject: m_ObjectHideFlags: 0 @@ -5712,7 +5168,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 445959573539459069} - {fileID: 595361820078002785} - {fileID: 4567631707956313030} - {fileID: 4577988863392537264} @@ -5780,18 +5235,6 @@ MonoBehaviour: hashName: 2208794126 objectType: 0 gameObject: {fileID: 7494958053207302107} - - name: battle_boss_rush_result_ui.defeat_node.mask_d - hashName: 3889856325 - objectType: 0 - gameObject: {fileID: 5180813019365726818} - - name: battle_boss_rush_result_ui.defeat_node - hashName: 1930887418 - objectType: 0 - gameObject: {fileID: 4959634630195587793} - - name: battle_boss_rush_result_ui.defeat_node.title_bg.desc - hashName: 3573284287 - objectType: 0 - gameObject: {fileID: 7936986928946906401} - name: battle_boss_rush_result_ui.victory_node hashName: 286132771 objectType: 0 @@ -5820,14 +5263,46 @@ MonoBehaviour: hashName: 3173598679 objectType: 1 gameObject: {fileID: 3577224878034465176} - - name: battle_boss_rush_result_ui.unit_node.icon - hashName: 1269601534 + - name: battle_boss_rush_result_ui.continue + hashName: 3361286331 + objectType: 0 + gameObject: {fileID: 3741600256466645460} + - name: battle_boss_rush_result_ui.victory_node.ui_spine_obj + hashName: 3134182683 + objectType: 6 + gameObject: {fileID: 4437137689668192280} + - name: battle_boss_rush_result_ui.unit_node + hashName: 1051616841 + objectType: 0 + gameObject: {fileID: 544577213108926206} + - name: battle_boss_rush_result_ui.victory_node.unit_node + hashName: 2866228690 + objectType: 0 + gameObject: {fileID: 8283736472652806603} + - name: battle_boss_rush_result_ui.unit_node.icon_round + hashName: 435385101 + objectType: 0 + gameObject: {fileID: 6156344666926065504} + - name: battle_boss_rush_result_ui.unit_node.icon_wave + hashName: 1676748186 objectType: 0 gameObject: {fileID: 325589638008138562} - - name: battle_boss_rush_result_ui.unit_node.desc_2 - hashName: 175174985 + - name: battle_boss_rush_result_ui.unit_node.desc_wave + hashName: 254866050 objectType: 0 gameObject: {fileID: 8019260360389798227} + - name: battle_boss_rush_result_ui.unit_node.desc_round + hashName: 3601679141 + objectType: 0 + gameObject: {fileID: 3941004158152902485} + - name: battle_boss_rush_result_ui.unit_node.desc_new_1 + hashName: 3597688553 + objectType: 0 + gameObject: {fileID: 2933674038501096460} + - name: battle_boss_rush_result_ui.unit_node.desc_new_2 + hashName: 3597688554 + objectType: 0 + gameObject: {fileID: 5493340317263414539} - name: battle_boss_rush_result_ui.unit_node.desc_3 hashName: 175174986 objectType: 0 @@ -5836,66 +5311,34 @@ MonoBehaviour: hashName: 2154103992 objectType: 0 gameObject: {fileID: 8897498284405031625} - - name: battle_boss_rush_result_ui.continue - hashName: 3361286331 + - name: battle_boss_rush_result_ui.reward_node.score.tx_score + hashName: 1064708195 objectType: 0 - gameObject: {fileID: 3741600256466645460} - - name: battle_boss_rush_result_ui.defeat_node.ui_spine_obj - hashName: 3066753956 - objectType: 6 - gameObject: {fileID: 6379174579643197588} - - name: battle_boss_rush_result_ui.victory_node.ui_spine_obj - hashName: 3134182683 - objectType: 6 - gameObject: {fileID: 4437137689668192280} - - name: battle_boss_rush_result_ui.unit_node.report_img_v - hashName: 1711588276 + gameObject: {fileID: 6744923874523475039} + - name: battle_boss_rush_result_ui.reward_node.tx_last + hashName: 2582526465 objectType: 0 - gameObject: {fileID: 4913348932269187955} - - name: battle_boss_rush_result_ui.unit_node.report_img_d - hashName: 1711588258 + gameObject: {fileID: 8224990002058719549} + - name: battle_boss_rush_result_ui.reward_node.tx_next + hashName: 2582590046 objectType: 0 - gameObject: {fileID: 8531577034970334290} - - name: battle_boss_rush_result_ui.reward_node.wave_tx - hashName: 312630298 - objectType: 0 - gameObject: {fileID: 0} - - name: battle_boss_rush_result_ui.reward_node.slider - hashName: 1567906897 - objectType: 0 - gameObject: {fileID: 2947994907393242160} + gameObject: {fileID: 1200743464997464586} - name: battle_boss_rush_result_ui.reward_node.text hashName: 1623999645 objectType: 0 gameObject: {fileID: 2006587770909143906} - - name: battle_boss_rush_result_ui.reward_node.wave_img - hashName: 1101593837 + - name: battle_boss_rush_result_ui.reward_node.slider + hashName: 1567906897 objectType: 0 - gameObject: {fileID: 0} - - name: battle_boss_rush_result_ui.reward_node - hashName: 949737598 + gameObject: {fileID: 2947994907393242160} + - name: battle_boss_rush_result_ui.reward_node.wave_next + hashName: 4084779785 objectType: 0 - gameObject: {fileID: 5449702802643703036} - - name: battle_boss_rush_result_ui.unit_node - hashName: 1051616841 + gameObject: {fileID: 7004159022001507068} + - name: battle_boss_rush_result_ui.reward_node.wave_last + hashName: 4084716204 objectType: 0 - gameObject: {fileID: 544577213108926206} - - name: battle_boss_rush_result_ui.defeat_node.unit_node - hashName: 4072063977 - objectType: 0 - gameObject: {fileID: 6606104105387947548} - - name: battle_boss_rush_result_ui.victory_node.unit_node - hashName: 2866228690 - objectType: 0 - gameObject: {fileID: 8283736472652806603} - - name: battle_boss_rush_result_ui.reward_node.spine_pig - hashName: 412167746 - objectType: 6 - gameObject: {fileID: 0} - - name: battle_boss_rush_result_ui.reward_node.score_bg - hashName: 12097666 - objectType: 0 - gameObject: {fileID: 0} + gameObject: {fileID: 5068351270173217864} --- !u!1 &8897498284405031625 GameObject: m_ObjectHideFlags: 0 @@ -6277,128 +5720,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &4437137689668192280 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 2753676652289451360} - m_PrefabAsset: {fileID: 0} --- !u!224 &1062877572076605182 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 2753676652289451360} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4837857829111055852 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 445959573539459069} - m_Modifications: - - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Name - value: ui_spine_obj - objectReference: {fileID: 0} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: skeletonDataAsset - value: - objectReference: {fileID: 11400000, guid: 5fde34e198c5e4e4ba018e8ca68cb7b2, type: 2} - - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: startingAnimation - value: - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_AnchoredPosition.y - value: 450 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &6379174579643197588 stripped +--- !u!1 &4437137689668192280 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 4837857829111055852} - m_PrefabAsset: {fileID: 0} ---- !u!224 &7770004333418327666 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 4837857829111055852} + m_PrefabInstance: {fileID: 2753676652289451360} m_PrefabAsset: {fileID: 0} diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index 4383af2c4..3ee474bc9 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ - + pb/proto/protocol.protocspb" Gift act_type (RactType @@ -49,7 +49,50 @@ rechargeId ActArenaGift& current_gift_id (R currentGiftId$ gift_expire_at (R giftExpireAt# -gift_cd_end_at (R giftCdEndAt" +gift_cd_end_at (R giftCdEndAt"X +FourteenBountyData! + free_awarded (R freeAwarded + pay_awarded (R +payAwarded"D + FourteenTask +progress (Rprogress +claimed (Rclaimed" +FourteenBounty +open_at (RopenAt. +funds ( 2.cspb.FourteenBountyDataRfunds + active_days (R +activeDays5 +tasks ( 2.cspb.FourteenBounty.TasksEntryRtasksK + exchange_info ( 2&.cspb.FourteenBounty.ExchangeInfoEntryR exchangeInfoL + +TasksEntry +key (Rkey( +value ( 2.cspb.FourteenTaskRvalue:8? +ExchangeInfoEntry +key (Rkey +value (Rvalue:8"> +FourteenBountyIdWithLv +id (Rid +grade (Rgrade"T +FourteenBountyAwardReq: + +id_with_lv ( 2.cspb.FourteenBountyIdWithLvRidWithLv" +FourteenBountyAwardRsp( +err_code (2 .cspb.ErrCodeRerrCode: + +id_with_lv ( 2.cspb.FourteenBountyIdWithLvRidWithLv& +rewards ( 2 .cspb.RewardRrewards", +FourteenBountyTaskAwardReq +id (Rid"n +FourteenBountyTaskAwardRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards"0 +FourteenBountyExchangeAwardReq +id (Rid" +FourteenBountyExchangeAwardRsp( +err_code (2 .cspb.ErrCodeRerrCode" +costs ( 2 .cspb.RewardRcosts& +rewards ( 2 .cspb.RewardRrewards" FundData! free_awarded (R freeAwarded& pay_low_awarded (R payLowAwarded( @@ -319,7 +362,112 @@ proClaimed: rewards ( 2 .cspb.RewardRrewards"D ArenaBountyBoughtNtf season (Rseason -level (Rlevel" +level (Rlevel"f + BossRushGrade +normal (Rnormal +superior (Rsuperior! + superior_max (R superiorMax" +BossRush + activity_id (R +activityId +heroes (Rheroes + fight_count (R +fightCount +max_wave (RmaxWave + min_round (RminRound# + rank_rewarded (R rankRewarded + +accum_wave (R accumWave; + collected ( 2.cspb.BossRush.CollectedEntryR collected; + exchanged ( 2.cspb.BossRush.ExchangedEntryR exchanged* +total_fight_count + (RtotalFightCount +bought (Rbought + +bought_max (R boughtMaxQ +CollectedEntry +key (Rkey) +value ( 2.cspb.BossRushGradeRvalue:8< +ExchangedEntry +key (Rkey +value (Rvalue:8" +BossRushInfoReq"h +BossRushInfoRsp( +err_code (2 .cspb.ErrCodeRerrCode+ + boss_rush ( 2.cspb.BossRushRbossRush"> +BossRushBountyClaimReq +id (Rid +grade (Rgrade"j +BossRushBountyClaimRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards" +BossRushBountyUnlockReq" +BossRushBountyUnlockRsp( +err_code (2 .cspb.ErrCodeRerrCode" +costs ( 2 .cspb.RewardRcosts + +accum_wave (R accumWave"; +BossRushExchangeReq +id (Rid +count (Rcount" +BossRushExchangeRsp( +err_code (2 .cspb.ErrCodeRerrCode" +costs ( 2 .cspb.RewardRcosts& +rewards ( 2 .cspb.RewardRrewards". +BossRushFormationReq +heroes (Rheroes"@ +BossRushFormationRsp( +err_code (2 .cspb.ErrCodeRerrCode" +BossRushStartReq"t +BossRushStartRsp( +err_code (2 .cspb.ErrCodeRerrCode" +costs ( 2 .cspb.RewardRcosts +seed (Rseed"D +BossRushSettlementReq+ + task_stat ( 2.cspb.TaskStatRtaskStat"A +BossRushSettlementRsp( +err_code (2 .cspb.ErrCodeRerrCode" +BossRushTopReq"f +BossRushTopRsp( +err_code (2 .cspb.ErrCodeRerrCode* +top3 ( 2.cspb.BossRushRankInfoRtop3" +BossRushRankInfo +rank (Rrank +id ( Rid +name ( Rname +level (Rlevel +avatar (Ravatar! + avatar_frame (R avatarFrame +wave (Rwave +round (Rround" +BossRushRankReq" +BossRushRankRsp( +err_code (2 .cspb.ErrCodeRerrCode7 + today_top50 ( 2.cspb.BossRushRankInfoR +todayTop505 + +today_self ( 2.cspb.BossRushRankInfoR todaySelf? +yesterday_top50 ( 2.cspb.BossRushRankInfoRyesterdayTop50= +yesterday_self ( 2.cspb.BossRushRankInfoR yesterdaySelf" +BossRushRankRewardReq"i +BossRushRankRewardRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards"' +BossRushPlayerInfoReq +id ( Rid" +BossRushPlayerInfoRsp( +err_code (2 .cspb.ErrCodeRerrCode- + array_heroes ( 2 +.cspb.HeroR arrayHeroesR + heroes_equips ( 2-.cspb.BossRushPlayerInfoRsp.HeroesEquipsEntryR heroesEquips +skins (RskinsQ +HeroesEquipsEntry +key (Rkey& +value ( 2.cspb.HeroEquipsRvalue:8"J +BossRushBoughtNtf +bought (Rbought + +bought_max (R boughtMax" Bounty season (Rseason level (Rlevel @@ -982,7 +1130,7 @@ facebookId client_info ( 2.cspb.ClientInfoR clientInfo -skip_guide (R skipGuide" +skip_guide (R skipGuide" LoginRsp( err_code (2 .cspb.ErrCodeRerrCode* today_first_login (RtodayFirstLogin @@ -1031,7 +1179,11 @@ collection$ ( 2.cspb.CollectionR collection! game_version% ( R gameVersion+ hero_fund& ( 2.cspb.HeroFundRheroFundK -act_weapon_armor_gift' ( 2.cspb.ActWeaponArmorGiftRactWeaponArmorGift"U +act_weapon_armor_gift' ( 2.cspb.ActWeaponArmorGiftRactWeaponArmorGift= +fourteen_bounty( ( 2.cspb.FourteenBountyRfourteenBounty. + +activities) ( 2.cspb.ActivityR +activities"U PipedReq id ( Rid ts (Rts @@ -1070,7 +1222,12 @@ LevelUpRsp( err_code (2 .cspb.ErrCodeRerrCode"3 RecoveryNtf id (Rid -count (Rcount"^ +count (Rcount"` +Activity +id (Rid +type (Rtype +start_at (RstartAt +end_at (RendAt"^ Grade normal (Rnormal superior (Rsuperior! @@ -1229,7 +1386,7 @@ skill_cast (R skillCast (R killsBossTurn spare_hp (RspareHp -total_turn (R totalTurn* +total_turn (R totalTurn* ErrCode SUCCESS @@ -1252,7 +1409,8 @@ total_turn (R totalTurn* PLAYER_LEVEL_NOT_ENOUGHl REWARD_CLAIMEDm TIME_OUTn - FUNC_NOT_OPENo + FUNC_NOT_OPENo +FIGHT_STAT_NOT_MATCHEDp SIGN_IS_FINISHED ACCELERATION_TIME_ERROR# DUNGEON_FARM_EXCEED_MAX_FAILED$ @@ -1350,9 +1508,10 @@ total_turn (R totalTurn* ARENA_TICKET_Buy_LIMIT ARENA_TOO_MANY_MATCHES ARENA_AD_BOX_LIMIT -ARENA_STAGE_GIFT_LIMIT +ARENA_STAGE_GIFT_LIMIT SUMMER_TASK_UNMET_CONDITION -SUMMER_TASK_HAS_CLAIMED*L +SUMMER_TASK_HAS_CLAIMED +BOSS_RUSH_FIGHT_NOT_TODAY*L KickOutReason MAINTAIN FLOW_CTRL