diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjia_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjia_zh.png new file mode 100644 index 0000000000..13151d7dec Binary files /dev/null and b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjia_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjia_zh.png.meta b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjia_zh.png.meta new file mode 100644 index 0000000000..a68cf95abd --- /dev/null +++ b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjia_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 4ed52d03d7da888488e8060c5a413314 +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 + - 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: 2c20a2a1ca4988f4cbe236800b3dd178 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FloatingViewAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjian_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjian_zh.png new file mode 100644 index 0000000000..29c8240bd0 Binary files /dev/null and b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjian_zh.png differ diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjian_zh.png.meta b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjian_zh.png.meta new file mode 100644 index 0000000000..c5a5cead65 --- /dev/null +++ b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_kangbaolvjian_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e1ddcd46aec19094eb4e502ecee56f27 +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 + - 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: 113817cc9f71d19478abdd5bc74319c7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: FloatingViewAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_nmw02.mp3 b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_nmw02.mp3 new file mode 100644 index 0000000000..e7865f0396 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_nmw02.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_nmw02.mp3.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_nmw02.mp3.meta new file mode 100644 index 0000000000..53261a5087 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_nmw02.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d1fe64721cef74b4ca24ebba34abf71b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab index d9182108a5..f66e9c2b03 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/ContinuePackagePanel.prefab @@ -2804,8 +2804,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.7, y: -147.59998} - m_SizeDelta: {x: 745.3, y: 828.3} + m_AnchoredPosition: {x: 4.7, y: -156.5} + m_SizeDelta: {x: 745.3, y: 868.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6588532141008816022 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index c6523f8111..0713851417 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -9881,7 +9881,7 @@ local passivityList = { local type=args[1] local num=args[2] local time=args[3] - local triggerNum=0 + local timeList={} local onBuffImmune=function(buff,target,immCaster) if immCaster~=role then return @@ -9889,16 +9889,20 @@ local passivityList = { if buff.type~=type then return end - if triggerNum==time then + if timeList[target.position] and timeList[target.position]==time then return end BattleUtil.CalRage(role,target,num,CountTypeName.Add) - triggerNum=triggerNum+1 + if timeList[target.position] then + timeList[target.position]=timeList[target.position]+1 + else + timeList[target.position]=1 + end end BattleLogic.Event:AddEvent(BattleEventName.ImmuneDebuffSuccess,onBuffImmune,nil,nil,role) local onRoundChange=function() - triggerNum=0 + timeList={} end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) end, diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index 860fdc2682..2ae5f68c5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -30,7 +30,7 @@ function ContinuePackagePanel:InitComponent() local rootHight = self.scrollItem.transform.rect.height local width = self.scrollItem.transform.rect.width self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform, - self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) + self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, -5)) self.scrollView.moveTween.MomentumAmount = 1 self.scrollView.moveTween.Strength = 2 self.scrollView.elastic = false @@ -187,7 +187,7 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) PayManager.Pay(data.otherData.GoodId, function(id) FirstRechargeManager.RefreshAccumRechargeValue(data.otherData.GoodId) OperatingManager.SetHadBuyGoodsId({data.otherData.GoodId}) - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId) + -- OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId) self:Refresh(false,false) end) elseif data.otherData.GoodType == 2 then--商品 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index c63930c77f..210042b60b 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -336,13 +336,14 @@ local TypeUpdateFunc = { tempData.otherData.Name = rechargeConfig[configData[j].GoodId].Name tempData.otherData.Reward = rechargeConfig[configData[j].GoodId].RewardShow tempData.otherData.Price = rechargeConfig[configData[j].GoodId].Price - tempData.progress = OperatingManager.GetLeftBuyTime(5,configData[j].GoodId) + tempData.progress = rechargeConfig[configData[j].GoodId].Limit - OperatingManager.GetGoodsBuyTime(5,configData[j].GoodId) elseif configData[j].GoodType == 2 then tempData.otherData.Name = goodsConfig[configData[j].GoodId].GoodsName tempData.otherData.Reward = goodsConfig[configData[j].GoodId].Goods tempData.otherData.Price = goodsConfig[configData[j].GoodId].Price tempData.progress = goodsConfig[configData[j].GoodId].Limit - curData.rewards[i].progress end + -- LogPink("missionId:"..tostring(tempData.missionId).." progress:"..tostring(tempData.progress)) if not tempDataList[configData[j].Type] then tempDataList[configData[j].Type] = {} end