竞技场宝箱弹出优化、bugfix

2023-08-11 15:50:26 +08:00 · 2023-08-11 15:50:26 +08:00 · 302452e76d
commit 302452e76d
parent 22baebeab0
10 changed files with 367 additions and 16 deletions
--- a/Assets/arts/textures/ui/common/common_bg_6.png
+++ b/Assets/arts/textures/ui/common/common_bg_6.png
--- a/Assets/arts/textures/ui/common/common_bg_6.png.meta
+++ b/Assets/arts/textures/ui/common/common_bg_6.png.meta
@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: b143f69564fbebd479463ddf96a9685a
+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: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  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: 47
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/lua/app/config/hero.lua.bytes
+++ b/Assets/lua/app/config/hero.lua.bytes
--- a/Assets/lua/app/config/localization/localization_global_const.lua.bytes
+++ b/Assets/lua/app/config/localization/localization_global_const.lua.bytes
--- a/Assets/lua/app/config/strings/cn/global.lua.bytes
+++ b/Assets/lua/app/config/strings/cn/global.lua.bytes
--- a/Assets/lua/app/module/arena/arena_manager.lua.bytes
+++ b/Assets/lua/app/module/arena/arena_manager.lua.bytes
--- a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
+++ b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
--- a/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes
+++ b/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes
--- a/Assets/lua/app/userdata/activity/activity_data.lua.bytes
+++ b/Assets/lua/app/userdata/activity/activity_data.lua.bytes
--- a/Assets/prefabs/ui/shop/box_hero_ui.prefab
+++ b/Assets/prefabs/ui/shop/box_hero_ui.prefab
@ -38,7 +38,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: -294}
-  m_SizeDelta: {x: 246, y: 98}
+  m_SizeDelta: {x: 365, y: 98}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7309468434370995818
 CanvasRenderer:
@ -225,6 +225,82 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &799005872125384121
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6099234610221942179}
+  - component: {fileID: 2790111095513444337}
+  - component: {fileID: 5300232404241678533}
+  m_Layer: 5
+  m_Name: tag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6099234610221942179
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 799005872125384121}
+  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: 8412545852012739227}
+  m_Father: {fileID: 1981152942187469396}
+  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: -10, y: 120}
+  m_SizeDelta: {x: 216, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2790111095513444337
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 799005872125384121}
+  m_CullTransparentMesh: 1
+--- !u!114 &5300232404241678533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 799005872125384121}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, 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
 --- !u!1 &877826505866688877
 GameObject:
  m_ObjectHideFlags: 0
@ -1952,6 +2028,14 @@ MonoBehaviour:
    hashName: 56921648
    objectType: 0
    gameObject: {fileID: 1627947748808497081}
+  - name: box_hero_ui.bg.item_node.item_4.tag
+    hashName: 938170004
+    objectType: 0
+    gameObject: {fileID: 799005872125384121}
+  - name: box_hero_ui.bg.item_node.item_4.tag.tx_tag
+    hashName: 453942265
+    objectType: 0
+    gameObject: {fileID: 6102487286474278234}
 --- !u!114 &960821287463814128
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -2100,6 +2184,140 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6102487286474278234
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8412545852012739227}
+  - component: {fileID: 7513656479484298717}
+  - component: {fileID: 593813489429570450}
+  m_Layer: 5
+  m_Name: tx_tag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8412545852012739227
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6102487286474278234}
+  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: 6099234610221942179}
+  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: 10.000008}
+  m_SizeDelta: {x: 0, y: -19.999987}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7513656479484298717
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6102487286474278234}
+  m_CullTransparentMesh: 1
+--- !u!114 &593813489429570450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6102487286474278234}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: aaaaaaaaaa
+  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: 22
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 18
+  m_fontSizeMax: 22
+  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: 1
+  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 &6112589953650552666
 GameObject:
  m_ObjectHideFlags: 0
@ -2344,6 +2562,7 @@ RectTransform:
  - {fileID: 996302764616250464}
  - {fileID: 1664298413477479032}
  - {fileID: 2412084218387525634}
+  - {fileID: 6099234610221942179}
  m_Father: {fileID: 5194395687368136688}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2633,16 +2852,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
--- !u!1 &7616571034101794421 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
-  m_PrefabInstance: {fileID: 1016936809038690242}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &3216659999434841662 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
  m_PrefabInstance: {fileID: 1016936809038690242}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7616571034101794421 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
+  m_PrefabInstance: {fileID: 1016936809038690242}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3417292636798606748
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2752,16 +2971,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
--- !u!224 &996302764616250464 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
-  m_PrefabInstance: {fileID: 3417292636798606748}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5243091770578807851 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
  m_PrefabInstance: {fileID: 3417292636798606748}
  m_PrefabAsset: {fileID: 0}
+--- !u!224 &996302764616250464 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
+  m_PrefabInstance: {fileID: 3417292636798606748}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4712911085462097955
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2871,16 +3090,16 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
--- !u!1 &2794485810774663572 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
-  m_PrefabInstance: {fileID: 4712911085462097955}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &7194678733288552927 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
  m_PrefabInstance: {fileID: 4712911085462097955}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2794485810774663572 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3}
+  m_PrefabInstance: {fileID: 4712911085462097955}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6109609341856978588
 PrefabInstance:
  m_ObjectHideFlags: 0