diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity7.meta b/Assets/ManagedResources/Atlas/DyAct_Activity7.meta new file mode 100644 index 0000000000..787e7f15df --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity7.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 689880f5820a8724297a8fbe84c16371 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta b/Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta new file mode 100644 index 0000000000..8f105b72f6 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b2898d01b2094945954df645ff9121a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity7/t_tianxiangjiren_shenjiang33.png b/Assets/ManagedResources/Atlas/DyAct_Activity7/t_tianxiangjiren_shenjiang33.png new file mode 100644 index 0000000000..6067b85c01 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_Activity7/t_tianxiangjiren_shenjiang33.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_Activity7/t_tianxiangjiren_shenjiang33.png.meta b/Assets/ManagedResources/Atlas/DyAct_Activity7/t_tianxiangjiren_shenjiang33.png.meta new file mode 100644 index 0000000000..6799e063ec --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_Activity7/t_tianxiangjiren_shenjiang33.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 82208bf4b613b0948a9a4a6bf4f937b3 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 771409af836c4a545af324cffcade166 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_Activity7 + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png new file mode 100644 index 0000000000..2028f0291e Binary files /dev/null and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta new file mode 100644 index 0000000000..c86c8a7c64 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/l_lingshou_jukun_zh.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 72188a62ffaa78e499bce62be1ba7c62 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 36b3901578ddbd448be7d909547e59b9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DyAct_XiangYaoDuoBao + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index bdf75583dc..6c860f7bf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -126,7 +126,7 @@ local PositionList = { [20006] = {pos = 70,title = "l_lingshou_baize_zh"}, [20005] = {pos = 70,title = "l_lingshou_pixiu_zh"}, [20008] = {pos = 70,title = "l_lingshou_jinwu_zh"}, - [20009] = {pos = 70,title = "l_lingshou_jinwu_zh"}, + [20009] = {pos = 70,title = "l_lingshou_jukun_zh"}, } function LingShouBaoGe:SetData() rewardData={} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index eeaead3ba3..2fadb46ecc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -34,8 +34,8 @@ local activityType = { [4302] = { bg = "Bg2", hero = { - [1]={name="Bg2/hero1",id=10009,hero="c_ygsj_kuang02"}, - [2]={name="Bg2/hero3",id=10040,hero="d_danxinbixue_shenjiang11"}, + [1]={name="Bg2/hero1",id=10009,hero="t_tianxiangjiren_shenjiang33"}, + [2]={name="Bg2/hero3",id=10014,hero="s_shibukedang_shenjiang1"}, [3]={name="Bg2/hero2",id=10026,hero="s_yongwangzhiqian_shenjiang2"}, }, title = "c_ydsj_slogan_zh",