diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZS63.png b/Assets/ManagedResources/BG/UI/3hengtu/LZS63.png new file mode 100644 index 0000000000..d8b09df38f Binary files /dev/null and b/Assets/ManagedResources/BG/UI/3hengtu/LZS63.png differ diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZS63.png.meta b/Assets/ManagedResources/BG/UI/3hengtu/LZS63.png.meta new file mode 100644 index 0000000000..678e91202e --- /dev/null +++ b/Assets/ManagedResources/BG/UI/3hengtu/LZS63.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9c20e44536ec7464b9e341b71001ec21 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2b85230a40202e540b0bc1009c3b2b42 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index 127921286d..d5235b0e1c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -4707,12 +4707,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 328 + m_Left: 180 m_Right: 80 m_Top: 0 - m_Bottom: 80 + m_Bottom: 100 m_ChildAlignment: 3 - m_Spacing: 30.52 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab index 2de15f0ed1..f9ec1a4c01 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab @@ -328,7 +328,7 @@ RectTransform: m_Children: - {fileID: 753215590663563930} m_Father: {fileID: 5013438516309886473} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -955,7 +955,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -4.9000244, y: -573.6001} + m_AnchoredPosition: {x: -4.8999023, y: -573.59985} m_SizeDelta: {x: -288.4, y: -1477.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3060067227909623060 @@ -1104,7 +1104,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -4.700012, y: 0} + m_AnchoredPosition: {x: -4.700012, y: -2} m_SizeDelta: {x: 197.07, y: 47.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6718712713649209028 @@ -6650,7 +6650,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5013438516309886473} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -17382,8 +17382,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50.75, y: 61.974976} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 75.4, y: 72} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8158777624756261205 CanvasRenderer: @@ -22765,6 +22765,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4621596103083480554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1494057321996042977} + - component: {fileID: 3960555591680789218} + - component: {fileID: 7533187312264197192} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1494057321996042977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4621596103083480554} + 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: 5013438516309886473} + 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: -37.14} + m_SizeDelta: {x: 900, y: 1327.37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3960555591680789218 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4621596103083480554} + m_CullTransparentMesh: 0 +--- !u!114 &7533187312264197192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4621596103083480554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: a8f530feeafc0954db3b66a08004edf3, 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 --- !u!1 &4730744364332779010 GameObject: m_ObjectHideFlags: 0 @@ -32781,7 +32855,7 @@ RectTransform: m_Children: - {fileID: 8737996761919956179} m_Father: {fileID: 5013438516309886473} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -33125,8 +33199,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 56.8, y: 59} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 75.5, y: 73.6} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6430924265943053589 CanvasRenderer: @@ -33490,7 +33564,7 @@ RectTransform: m_GameObject: {fileID: 6848635728893648768} 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_LocalScale: {x: 2, y: 2, z: 1} m_Children: - {fileID: 3440382495508559757} m_Father: {fileID: 4072935318317542415} @@ -33499,7 +33573,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -59.100098, y: -556} - m_SizeDelta: {x: 60, y: 84} + m_SizeDelta: {x: 35, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1620461548971506017 CanvasRenderer: @@ -33529,7 +33603,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3a26a653ede19f547aa35b873069fb87, type: 3} + m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38532,6 +38606,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3457700165247251000} + - {fileID: 1494057321996042977} - {fileID: 5970326685334335517} - {fileID: 8418695024425476745} - {fileID: 923067037759443461} @@ -38683,7 +38758,7 @@ RectTransform: m_GameObject: {fileID: 7440305428974996385} 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_LocalScale: {x: -2, y: 2, z: 1} m_Children: - {fileID: 8494086496681263225} m_Father: {fileID: 4072935318317542415} @@ -38692,7 +38767,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 59, y: -556.59985} - m_SizeDelta: {x: 60, y: 84} + m_SizeDelta: {x: 35, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5071970851670418419 CanvasRenderer: @@ -38722,7 +38797,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 87f02bd2a5259244aa2fe3d12563fcf7, type: 3} + m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -39066,7 +39141,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 280.5, y: 64.08} + m_SizeDelta: {x: 800, y: 64.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3210500947360508384 CanvasRenderer: @@ -39096,7 +39171,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Sprite: {fileID: 21300000, guid: 2dde3887f1866294383f938189ff3ff1, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -44231,7 +44306,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5013438516309886473} - m_RootOrder: 4 + 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} @@ -44277,7 +44352,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5013438516309886473} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -44582,7 +44657,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1201, y: -48} + m_AnchoredPosition: {x: -1681, y: -48} m_SizeDelta: {x: 150.41, y: 179.24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3793840151642261691 diff --git a/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab index 59cd8dea9c..91c1e41737 100644 --- a/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab @@ -9767,8 +9767,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.5, y: -35} - m_SizeDelta: {x: 150, y: 122} + m_AnchoredPosition: {x: 4.5, y: -22.499983} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8509154388862350310 CanvasRenderer: @@ -9798,7 +9798,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f86133dd4c80c3741a9c72a9e74bf5e0, type: 3} + m_Sprite: {fileID: 21300000, guid: 436fb9337203a9449a5ca14d456c4165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15164,7 +15164,7 @@ RectTransform: m_GameObject: {fileID: 3762710182300080828} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_LocalScale: {x: 0.46, y: 0.46, z: 1} m_Children: - {fileID: 3165272004943887600} m_Father: {fileID: 4169215289385710061} @@ -15172,8 +15172,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.5, y: -35.000023} - m_SizeDelta: {x: 150, y: 122} + m_AnchoredPosition: {x: 4.5, y: -22.500006} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5254819230771032607 CanvasRenderer: @@ -15203,7 +15203,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f86133dd4c80c3741a9c72a9e74bf5e0, type: 3} + m_Sprite: {fileID: 21300000, guid: 436fb9337203a9449a5ca14d456c4165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22026,7 +22026,7 @@ RectTransform: m_GameObject: {fileID: 5891029980001539618} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_Children: - {fileID: 7287284731981291025} m_Father: {fileID: 8166616088764353989} @@ -22034,8 +22034,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.5, y: -35.000023} - m_SizeDelta: {x: 150, y: 122} + m_AnchoredPosition: {x: 4.5, y: -22.500006} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4964476029412700070 CanvasRenderer: @@ -22065,7 +22065,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f86133dd4c80c3741a9c72a9e74bf5e0, type: 3} + m_Sprite: {fileID: 21300000, guid: 436fb9337203a9449a5ca14d456c4165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24589,7 +24589,7 @@ RectTransform: m_GameObject: {fileID: 8055122209604945704} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_LocalScale: {x: 0.45, y: 0.45, z: 1} m_Children: - {fileID: 2609458952903943405} m_Father: {fileID: 1216764180244843552} @@ -24597,8 +24597,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.5, y: -35.500023} - m_SizeDelta: {x: 150, y: 122} + m_AnchoredPosition: {x: 4.5, y: -23} + m_SizeDelta: {x: 180, y: 146} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4525574134390351044 CanvasRenderer: @@ -24628,7 +24628,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f86133dd4c80c3741a9c72a9e74bf5e0, type: 3} + m_Sprite: {fileID: 21300000, guid: 436fb9337203a9449a5ca14d456c4165, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 447ec2f3ed..8d9f9adb62 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3121,7 +3121,7 @@ rankKingList = { [16] = { bgImage = "", name = "排行榜", rankType = RANK_TYPE.FIGHTLEVEL_STAR, activiteId = 0, isRankingMainPanelShow = 0, RankingListMainSortId = 19 }, [17] = { bgImage = "", name = "排行榜", rankType = RANK_TYPE.TASUILINGXIAO, activiteId = ActivityTypeDef.TaSuiLingXiao, isRankingMainPanelShow = 0, RankingListMainSortId = 20 }, --跨服(界面中) - [18] = { bgImage = "", name = "鸟笼竞技场排行", rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER, activiteId = 0, isRankingMainPanelShow = 3, RankingListMainSortId = 21 }, --跨服排行版部分 + [18] = { bgImage = "", name = "宇宙武道会排行", rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER, activiteId = 0, isRankingMainPanelShow = 3, RankingListMainSortId = 21 }, --跨服排行版部分 [32] = { bgImage = "", name = "宇宙生存挑战排行", rankType = RANK_TYPE.QIJIESHILIAN_RANK, activiteId = 0, isRankingMainPanelShow = 3, RankingListMainSortId = 0 }, --跨服排行版部分 [33] = { bgImage = "", name = "空岛夺宝排行", rankType = RANK_TYPE.LINGMAIMIJING_RANK, activiteId = 0, isRankingMainPanelShow = 3, RankingListMainSortId = 0 }, --跨服排行版部分 --排行榜按钮中跨服排行 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 8c6f2ab107..d4fb7dd23f 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -282,7 +282,7 @@ Language = { [10281] = GetLanguageStrById("无尽副本轮换前5分钟无法进入"), [10282] = GetLanguageStrById("龙珠残片副本"), [10283] = GetLanguageStrById("龙息副本"), - [10284] = GetLanguageStrById("英雄副本"), + [10284] = GetLanguageStrById("礼物副本"), [10285] = GetLanguageStrById("防御副本"), [10286] = GetLanguageStrById("伤害副本"), [10287] = GetLanguageStrById("挑战"), @@ -684,7 +684,7 @@ Language = { [10683] = GetLanguageStrById("公会战进攻"), [10684] = GetLanguageStrById(" 血战出征"), [10685] = GetLanguageStrById(" 大闹天宫"), - [10686] = GetLanguageStrById("鸟笼竞技场"), + [10686] = GetLanguageStrById("宇宙武道会"), [10687] = GetLanguageStrById("扫荡次数为零"), [10688] = GetLanguageStrById("已阵亡!"), [10689] = GetLanguageStrById("阵容已满!"), @@ -1103,7 +1103,7 @@ Language = { [11102] = GetLanguageStrById("该英雄在公会战进攻阵容中已上阵"), [11103] = GetLanguageStrById("该英雄在血战出征阵容中已上阵"), [11104] = GetLanguageStrById("该英雄在巅峰战阵容中已上阵"), - [11105] = GetLanguageStrById("该英雄在鸟笼竞技场防守阵容中已上阵"), + [11105] = GetLanguageStrById("该英雄在宇宙武道会防守阵容中已上阵"), [11106] = GetLanguageStrById("主线"), [11107] = GetLanguageStrById("竞技场防守"), [11108] = GetLanguageStrById("竞技场进攻"), @@ -1456,9 +1456,9 @@ Language = { [11455] = GetLanguageStrById("瑶池魇妖化作一阵青烟消失~~"), [11456] = GetLanguageStrById("本场战斗失败,是否保留双方当前状态,若不保留可以将双方重置为战斗初始时的状态?"), [11457] = GetLanguageStrById("保留"), - [11458] = GetLanguageStrById("挑战失败,鸟笼竞技场排行无变化!"), + [11458] = GetLanguageStrById("挑战失败,宇宙武道会排行无变化!"), [11459] = GetLanguageStrById("招募成功"), - [11460] = GetLanguageStrById("挑战成功,鸟笼竞技场排行已提升至"), + [11460] = GetLanguageStrById("挑战成功,宇宙武道会排行已提升至"), [11461] = GetLanguageStrById("名!"), [11462] = GetLanguageStrById("挑战成功"), [11463] = GetLanguageStrById("购买次数为0, 不可购买!"), @@ -2134,7 +2134,7 @@ Language = { [12133] = GetLanguageStrById("扫荡后可直接获得挑战奖励并保持当前排名,确定消耗一次挑战次数进行扫荡?"), [12134] = GetLanguageStrById("今日已无购买剩余次数!"), [12135] = GetLanguageStrById("赛季过渡中!"), - [12136] = GetLanguageStrById("鸟笼竞技场防守阵容:"), + [12136] = GetLanguageStrById("宇宙武道会防守阵容:"), [12137] = GetLanguageStrById("已为最强装备"), [12138] = GetLanguageStrById("批量生成道具"), [12139] = GetLanguageStrById("道具ID#道具数量|..."), diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 24fc5332e8..187b1caa1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -6,7 +6,7 @@ end BATTLE_SERVER_TYPE = { - NewArenaFight = 0, --本地测试竞技场值/罗浮争锋 + NewArenaFight = 0, --本地测试竞技场值/宇宙武道会 StoryFight = 1, --故事副本 MapExploreFight = 2, -- 地图探索 ArenaFight = 3, --竞技场 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 0ec90c7dd3..7bf37827f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -634,7 +634,7 @@ function this.ShowBattleResult(result, msg) --公会副本 elseif fightType == BATTLE_TYPE.GuildTranscript then this.ShowBattleResultByGuildTranscript() - --罗浮争锋 + --宇宙武道会 elseif fightType == BATTLE_TYPE.JumpServerhightLadder then this.ShowBattleResultByJumpServerHightLadder(result) --新回放功能(判断上次战斗是什么类型并做什么内容 逻辑和正常战斗处理一样) @@ -721,11 +721,11 @@ function this.ShowBattleResultByCarDeleayType() end, 0.1):Start() end --- 罗浮争锋结算界面特殊显示 +-- 宇宙武道会结算界面特殊显示 function this.ShowBattleResultByJumpServerHightLadder(_result) if _result == 0 then -- 失败 if fightType == BATTLE_TYPE.JumpServerhightLadder then - PopupTipPanel.ShowTip("挑战失败,鸟笼竞技场排行无变化!") + PopupTipPanel.ShowTip("挑战失败,宇宙武道会排行无变化!") if JumpServerManager.curBattleDrop.itemlist ~= nil and #JumpServerManager.curBattleDrop.itemlist > 0 then local content = {} for i = 1, #JumpServerManager.curBattleDrop.itemlist do diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index d3fb53fcd9..062d21716e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -19,7 +19,7 @@ local titleBg={ --经验 [2]={bg="LZH48", titleImg = "r_richang_banner_4_zi_zh",name="龙息副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, --神将 - [3]={bg="r_richang_banner_3_zh", titleImg = "r_richang_banner_3_zi_zh", name="英雄副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, + [3]={bg="LZS63", titleImg = "r_richang_banner_3_zi_zh", name="礼物副本",titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, --法宝 [4]={bg="r_richang_banner_2_zh", titleImg = "r_richang_banner_2_zi_zh",name="意念副本", titleTip = GetLanguageStrById(specialConfig[44].Value),pos = Vector3.New(257.08,651.24,0)}, --魂印 @@ -62,8 +62,7 @@ local TabBox = require("Modules/Common/TabBox") local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10282],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN }, [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10283],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_EXP }, - - --[3] = { default = "r_richang_anniu_lieyaoshi_01_zh", select = "r_richang_anniu_lieyaoshi_zh",lock = "r_richang_anniu_lieyaoshi_zh", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS }, + [3] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82",lock = "UI_hz_gonghui_Lock", name = Language[10284],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_HERODEBRIS }, --[4] = { default = "r_richang_anniu_fabao_01_zh", select = "r_richang_anniu_fabao_zh",lock = "r_richang_anniu_fabao_zh", name = Language[10285],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_TALISMAN }, --[5] = { default = "r_richang_anniu_hunyin_01_zh", select = "r_richang_anniu_hunyin_zh",lock = "r_richang_anniu_hunyin_zh", name = Language[10286],type=FUNCTION_OPEN_TYPE.DAILYCHALLENGE_SOULPRINT } } diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 4ba66d58f3..ed051d3ded 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -79,7 +79,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN, --日常 objName = "daily", nameImg = "f_fuben_fubenming_05", - name="神龙试炼", + name="日常副本", titleBg="UI_hz_fb_07", btnPos = Vector2(13,77), redPointType = RedPointType.HeroExplore, diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 291f867b04..4b91fed166 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -43,7 +43,7 @@ function this.MakeAEmptyTeam(teamId) teamId==FormationTypeDef.LuoFuZhengFeng2 or teamId==FormationTypeDef.LuoFuZhengFeng3 or teamId==FormationTypeDef.LuoFuZhengFeng4 then - oTeam.teamName = "鸟笼竞技场"-- 1601 + oTeam.teamName = "宇宙武道会"-- 1601 elseif teamId == FormationTypeDef.FIGHT_LEVEL then oTeam.teamName = "超越之路"-- 1701 elseif teamId == FormationTypeDef.FIGHT_ASSISTANTLEVEL then @@ -96,14 +96,16 @@ function this.UpdateFormation(msg) or team.teamId == FormationTypeDef.FourElement_MAGIC or team.teamId == FormationTypeDef.FourElement_BUDDHIST or team.teamId == FormationTypeDef.FourElement_TAOIST then - if HeroManager.GetSingleHeroData(teamHeroInfo.heroId) then - table.insert(oTeam.teamHeroInfos, teamHeroInfo) - HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1) - else - isRefresh = true - end + if HeroManager.GetSingleHeroData(teamHeroInfo.heroId) then + table.insert(oTeam.teamHeroInfos, teamHeroInfo) + --LogError("=============设置英雄teamid:"..tostring(team.teamId)) + HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1) + else + isRefresh = true + end else table.insert(oTeam.teamHeroInfos, teamHeroInfo) + --LogError("=============设置英雄teamid:"..tostring(team.teamId)) HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 51f199ab61..82c456cb29 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -202,6 +202,7 @@ function this.UpdateHeroDatas(_msgHeroData, isFindHandBook) heroData.GetStar = function(index) local godSoulLv = GodSoulManager.GetGodSoulLv(heroData.dynamicId) if godSoulLv and godSoulLv > 0 then + LogError("神印等级==============================="..tostring(godSoulLv)) return godSoulLv, 3 elseif heroData.star >= 11 then return heroData.star, 3 @@ -776,15 +777,15 @@ function this.GetHeroFormationStr(teamId) elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then return Language[11104] elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then - return "该神将在罗浮争锋阵容中已上阵" + return "该神将在宇宙武道会阵容中已上阵" elseif teamId == FormationTypeDef.LuoFuZhengFeng1 then - return "该神将在罗浮争锋阵容中已上阵" + return "该神将在宇宙武道会阵容中已上阵" elseif teamId == FormationTypeDef.LuoFuZhengFeng2 then - return "该神将在罗浮争锋阵容中已上阵" + return "该神将在宇宙武道会阵容中已上阵" elseif teamId == FormationTypeDef.LuoFuZhengFeng3 then - return "该神将在罗浮争锋阵容中已上阵" + return "该神将在宇宙武道会阵容中已上阵" elseif teamId == FormationTypeDef.LuoFuZhengFeng4 then - return "该神将在罗浮争锋阵容中已上阵" + return "该神将在宇宙武道会阵容中已上阵" end end return "" @@ -793,33 +794,45 @@ end function this.GetHeroFormationStr2(teamId) if this.heroResolveLicence[teamId] then if teamId < FormationTypeDef.FORMATION_ARENA_DEFEND then + --LogError("ddddddddddddddddd") return Language[11106], FormationTypeDef.FORMATION_NORMAL elseif teamId == FormationTypeDef.FORMATION_ARENA_DEFEND then + --LogError("ddddddddddddddddd") return Language[11107], FormationTypeDef.FORMATION_ARENA_DEFEND elseif teamId == FormationTypeDef.FORMATION_ARENA_ATTACK then + --LogError("ddddddddddddddddd") return Language[11108], FormationTypeDef.FORMATION_ARENA_ATTACK elseif teamId == FormationTypeDef.FORMATION_ENDLESS_MAP then + --LogError("ddddddddddddddddd") return Language[10692], FormationTypeDef.FORMATION_ENDLESS_MAP -- elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND then -- return Language[10682], FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND -- elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK then -- return Language[10683], FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK elseif teamId == FormationTypeDef.BLOODY_BATTLE_ATTACK then + --LogError("ddddddddddddddddd") return Language[11109], FormationTypeDef.BLOODY_BATTLE_ATTACK elseif teamId == FormationTypeDef.EXPEDITION then + --LogError("ddddddddddddddddd") return Language[10697], FormationTypeDef.EXPEDITION elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then + --LogError("ddddddddddddddddd") return Language[11110], FormationTypeDef.ARENA_TOM_MATCH elseif teamId == FormationTypeDef.JUMPSERVER_HIGHTLADDER then - return "罗浮争锋", FormationTypeDef.JUMPSERVER_HIGHTLADDER + --LogError("ddddddddddddddddd") + return "宇宙武道会", FormationTypeDef.JUMPSERVER_HIGHTLADDER elseif teamId == FormationTypeDef.LuoFuZhengFeng1 then - return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng1 + --LogError("ddddddddddddddddd") + return "宇宙武道会", FormationTypeDef.LuoFuZhengFeng1 elseif teamId == FormationTypeDef.LuoFuZhengFeng2 then - return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng2 + --LogError("ddddddddddddddddd") + return "宇宙武道会", FormationTypeDef.LuoFuZhengFeng2 elseif teamId == FormationTypeDef.LuoFuZhengFeng3 then - return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng3 + --LogError("ddddddddddddddddd") + return "宇宙武道会", FormationTypeDef.LuoFuZhengFeng3 elseif teamId == FormationTypeDef.LuoFuZhengFeng4 then - return "罗浮争锋", FormationTypeDef.LuoFuZhengFeng4 + --LogError("ddddddddddddddddd") + return "宇宙武道会", FormationTypeDef.LuoFuZhengFeng4 end end return "" diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 05d5af395f..7cac3ee0bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -7896,7 +7896,7 @@ function NetManager.NewArenaResetRequest(_func) end ---罗浮争锋报名 +--宇宙武道会报名 function NetManager.LuofuRegisterRequest(_type,_func) local data = gtwprotos.WorldProto_pb.LuofuRegisterRequest() data.type = _type diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 3753dd7ec7..7c9ec13587 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -177,9 +177,9 @@ function this.ShowBattleResultByXYY() end end --- 罗浮争锋结算界面特殊显示 +-- 宇宙武道会结算界面特殊显示 function this.ShowBattleResultByJumpServerHightLadder() - PopupTipPanel.ShowTip("挑战失败,鸟笼竞技场排行无变化!") + PopupTipPanel.ShowTip("挑战失败,宇宙武道会排行无变化!") if not isBackBattle and JumpServerManager.curBattleDrop.itemlist ~= nil and #JumpServerManager.curBattleDrop.itemlist > 0 then local content = {} for i = 1, #JumpServerManager.curBattleDrop.itemlist do diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index ffb064244d..88dba13f2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -537,7 +537,7 @@ function this.JumpServerHithtLadder() local MyRank = JumpServerManager.GetHightLadderDataMyRank() local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank() if MyRank ~= OldMyRank then - PopupTipPanel.ShowTip("挑战成功,鸟笼竞技场排行已提升至" .. MyRank .. "名!") + PopupTipPanel.ShowTip("挑战成功,宇宙武道会排行已提升至" .. MyRank .. "名!") elseif MyRank == OldMyRank then PopupTipPanel.ShowTip("挑战成功") end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 03ac60c929..e75bce04d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -53,7 +53,7 @@ local _ViewConfig = { }, [PLAYER_INFO_VIEW_TYPE.JUPMSERVER] = { formationType = FormationTypeDef.JUMPSERVER_HIGHTLADDER, - tip = "鸟笼竞技场阵容:", + tip = "宇宙武道会阵容:", isAddFriend = false, btnType = { -- {name = "挑战", func = 6}, diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index be0af82849..ec36b612d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -399,15 +399,18 @@ function RecruitPanelNew:UpdatePanelData() if not isFree then if BagManager.GetItemCountById(itemId)