diff --git a/Assets/ManagedResources/Icon/Hero/c_ttjz_00041_s1_t1.png b/Assets/ManagedResources/Icon/Hero/c_ttjz_00041_s1_t1.png new file mode 100644 index 0000000000..0344781c39 Binary files /dev/null and b/Assets/ManagedResources/Icon/Hero/c_ttjz_00041_s1_t1.png differ diff --git a/Assets/ManagedResources/Icon/Hero/c_ttjz_00041_s1_t3.png b/Assets/ManagedResources/Icon/Hero/c_ttjz_00041_s1_t3.png new file mode 100644 index 0000000000..0bf6db738f Binary files /dev/null and b/Assets/ManagedResources/Icon/Hero/c_ttjz_00041_s1_t3.png differ diff --git a/Assets/ManagedResources/Icon/Item/hongmengzhen.png b/Assets/ManagedResources/Icon/Item/hongmengzhen.png new file mode 100644 index 0000000000..abefd5c235 Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/hongmengzhen.png differ diff --git a/Assets/ManagedResources/Icon/Item/hongmengzhen.png.meta b/Assets/ManagedResources/Icon/Item/hongmengzhen.png.meta new file mode 100644 index 0000000000..7da2cfbfd6 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/hongmengzhen.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5bc0648cc5e80db45bf3d13f1f73f0b2 +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: -1 + 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: 3a4da7e3728448c40a296982a35a7481 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/jianmushenshu.png b/Assets/ManagedResources/Icon/Item/jianmushenshu.png new file mode 100644 index 0000000000..825de4d36f Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/jianmushenshu.png differ diff --git a/Assets/ManagedResources/Icon/Item/jianmushenshu.png.meta b/Assets/ManagedResources/Icon/Item/jianmushenshu.png.meta new file mode 100644 index 0000000000..411070bc20 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/jianmushenshu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 58fc3854e4559414195982307f5a8753 +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: -1 + 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: dff086bc46c5eec4ca92a249e6e349fd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/silingshilian.png b/Assets/ManagedResources/Icon/Item/silingshilian.png new file mode 100644 index 0000000000..4887780f47 Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/silingshilian.png differ diff --git a/Assets/ManagedResources/Icon/Item/silingshilian.png.meta b/Assets/ManagedResources/Icon/Item/silingshilian.png.meta new file mode 100644 index 0000000000..a81b6385df --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/silingshilian.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a179c2082e8e82140a62c3a0f3fb6b1b +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: -1 + 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: a9f1013700a6e064cb8695064f775610 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 0a70542370..82d7bd391b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -89,7 +89,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) FightPointPassManager.FightBattleEnd() Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord) Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募 - if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide then--地图 + if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() then--地图 this.btnBattleBack:SetActive(false) else this.btnBattleBack:SetActive(true) @@ -143,7 +143,10 @@ function this.ShowBattleResultByExpedition() if not isBackBattle then local GetCurNodeInfo = ExpeditionManager.curAttackNodeInfo if GetCurNodeInfo.type == ExpeditionNodeType.Greed then--贪婪节点 - Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面 + Timer.New(function () + Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshPlayAniMainPanel) + -- Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面 + end,0.3):Start() PopupTipPanel.ShowTip( Language[12194]) else MsgPanel.ShowTwo(Language[11540], function() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua index fb22c50651..97663d7b93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua @@ -220,6 +220,7 @@ function this.ShowBattleResultByExpedition(drop) m_battlePanel:ClosePanel() end PopupTipPanel.ShowTip(Language[12192]) + Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshPlayAniMainPanel) else UIManager.OpenPanel(UIName.RewardItemPopup,drop, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调 LogPink("isBackBattle "..tostring(isBackBattle)) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 3adcffac9d..e97278b890 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -145,7 +145,7 @@ function RewardItemPopup:OnOpen(...) end local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) - this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide) + this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide()) this.btnResultMax:SetActive(haveRecord and args[5]) -- 设置背景遮罩的显隐 local isHideBG = args[6]