diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_mczy_t9_zh.png b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_mczy_t9_zh.png new file mode 100644 index 0000000000..65a24d2a6f Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_mczy_t9_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_mczy_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_mczy_t9_zh.png.meta new file mode 100644 index 0000000000..aca270cf3b --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_mczy_t9_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9d34a8f08e372f74389c3af71976778b +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: 65 + 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: 48d25078efc463741bbe624f0c0b9a2d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_myxs_t9_zh.png b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_myxs_t9_zh.png new file mode 100644 index 0000000000..a396edde03 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_myxs_t9_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_myxs_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_myxs_t9_zh.png.meta new file mode 100644 index 0000000000..67fd47391c --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_myxs_t9_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2678058277a606646bb05744b268c9cd +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: 65 + 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: 53c20a2c2c8e0fa4c88fb027d9eee9bb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_nlkt_t9_zh.png b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_nlkt_t9_zh.png new file mode 100644 index 0000000000..d88b567638 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_nlkt_t9_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_nlkt_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_nlkt_t9_zh.png.meta new file mode 100644 index 0000000000..d0cfd0aa4d --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_nlkt_t9_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: fad49c678e0b0844e9bd336c79babc96 +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: 65 + 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: 776c7d5fa6e6a6d46ab1d68f773b8f93 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_ssbx_t9_zh.png b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_ssbx_t9_zh.png new file mode 100644 index 0000000000..a9c7360889 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_ssbx_t9_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_ssbx_t9_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_ssbx_t9_zh.png.meta new file mode 100644 index 0000000000..f8714eab27 --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/Skill/ArtFont/zj_ssbx_t9_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ddffb407d03880d40a90f68e611d2f1d +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: 65 + 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: 1463c74f7b97b3743bf90fa9af00f8e4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab index 24f6b6c270..8c28cb6622 100644 --- a/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStoreSeason2.prefab @@ -595,6 +595,7 @@ RectTransform: - {fileID: 5508053166187048960} - {fileID: 568736400138835213} - {fileID: 6942748679297584665} + - {fileID: 3593815883549836158} m_Father: {fileID: 8164929861946433763} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1608,7 +1609,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: 299, y: -33} + m_AnchoredPosition: {x: 300, y: 9} m_SizeDelta: {x: 190, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1484522529259693895 @@ -2130,3 +2131,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8673036166994295521} m_CullTransparentMesh: 0 +--- !u!1 &8702325810990083504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3593815883549836158} + - component: {fileID: 704342520481547311} + - component: {fileID: 3059624038972538649} + m_Layer: 5 + m_Name: buyInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3593815883549836158 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702325810990083504} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 0.00375} + m_Children: [] + m_Father: {fileID: 6982842394998516994} + 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: 300, y: -53} + m_SizeDelta: {x: 200, y: 49.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &704342520481547311 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702325810990083504} + m_CullTransparentMesh: 0 +--- !u!114 &3059624038972538649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702325810990083504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.9490197, b: 0.79215693, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 20 + m_MaxSize: 30 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59\uFF1A1\u6B21" + LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index f491fe167b..1bf0a6b9a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -240,6 +240,7 @@ local TypeUpdateFunc = { tempData.Reward = rechargeConfig[configData[j].PackId].RewardShow tempData.Price = rechargeConfig[configData[j].PackId].Price tempData.progress = curData.rewards[i].progress + tempData.canBuy = OperatingManager.GetLeftBuyTime(5,tempData.PackId) --插入数据2维 [天数][第几个] table.insert(curData.FreelyData[configData[j].Sort],tempData) end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua index 528398006d..6c1aff9aa5 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStoreSeason2.lua @@ -112,12 +112,21 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index) local buyBtn = Util.GetGameObject(_go,"buy") local price = Util.GetGameObject(buyBtn,"Text"):GetComponent("Text") local redPoint = Util.GetGameObject(buyBtn,"redPoint") + local times = Util.GetGameObject(_go,"buyInfo"):GetComponent("Text") title.text = _data.Name price.text = _data.Price.."元" Util.SetGray(buyBtn,_data.progress == 8) Util.SetGray(redPoint,false) redPoint:SetActive(_data.progress == 1 and _data.Price == 0) + times.gameObject:SetActive(_data.progress == 1) + if _data.progress == 1 then + times.gameObject:SetActive(true) + times.text = string.format( "剩余:%s次",_data.canBuy) + else + times.gameObject:SetActive(false) + times.text = "" + end if not self.itemViewList[_go] then self.itemViewList[_go] = {} @@ -138,8 +147,6 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index) if _data.progress == 1 then PayManager.Pay(_data.PackId, function(id) FirstRechargeManager.RefreshAccumRechargeValue(_data.PackId) - OperatingManager.SetHadBuyGoodsId({_data.PackId}) - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, _data.PackId) self:OnShow() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua index 245d2574ee..afe094b7c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingManager.lua @@ -136,7 +136,7 @@ end function this.CheckRedPoint() local state1 = false local state2 = false - if (configData.JoinCount - this.joinCount > 0) and (#this.curBetList < 2) then + if (configData.JoinCount - this.joinCount > 0) and (#this.curBetList < 2) and (YuJianXingManager.curState == 1) then state1 = true end for i = 1, #this.curRecordList do diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index 83d87407a3..d39c2d859a 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -54,6 +54,10 @@ function YuJianXingPanel:BindEvent() PopupTipPanel.ShowTip("比赛进行中,不可竞猜!") return end + if YuJianXingManager.curState == 3 then + PopupTipPanel.ShowTip("赛季已结束!") + return + end UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.YuJianBet) end) @@ -190,11 +194,11 @@ function YuJianXingPanel:SetTime() end self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount) self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) - self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2)) + self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2) and (YuJianXingManager.curState == 1) ) self.waitTime.text = string.format("倒计时:%s",TimeToMS(roundEnd)) self.timer = Timer.New(function () self.redPoint:SetActive(YuJianXingManager.CheckRecordList()) - self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2)) + self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2) and (YuJianXingManager.curState == 1) ) --设置人物上下飘动2s重置一次 if self.count % 2 == 0 then YuJianXingManager.ResetPlayerPosVertical()