diff --git a/Assets/ManagedResources/ArtFont_vi/r_zjm_zhanli_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/r_zjm_zhanli_vi.png.meta new file mode 100644 index 0000000000..b99393ffb9 --- /dev/null +++ b/Assets/ManagedResources/ArtFont_vi/r_zjm_zhanli_vi.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: ef48c7bbfaa69a84aaad5774fc75266c +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2f9a3a7da17742f4c83c4d13513dd50a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua index 4848dea910..b0b126d3ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua @@ -93,7 +93,7 @@ function this.OnShowPanelData(isTop, isAni) local missionId = activityData.mission[i].missionId if activityRewardConfig[missionId] and activityRewardConfig[missionId].Values and activityRewardConfig[missionId].Values[1][1] == 1 then first = activityData.mission[i] - this.FirstTip.text = activityRewardConfig[missionId].ContentsShow + this.FirstTip.text = GetLanguageStrById(activityRewardConfig[missionId].ContentsShow) else table.insert(missions, activityData.mission[i]) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index f48011d767..0983f43213 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -224,7 +224,7 @@ function this.PageTabAdapter(tab, index, status) end if actConfig then sprite = (status == "select" and actConfig.Icon[2] or actConfig.Icon[1]) - nameText.text = actConfig.Sesc + nameText.text = GetLanguageStrById(actConfig.Sesc) --LogRed("actConfig.Sesc=============="..actConfig.Sesc) end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 2d16724bb6..d3a3531dcd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1064,7 +1064,7 @@ function this.CreatActivity() else activityTabs[k].timeImg.gameObject:SetActive(true) end - activityTabs[k].nameText.text = v.Sesc + activityTabs[k].nameText.text = GetLanguageStrById(v.Sesc) if v.ActiveType > 0 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then