diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_fabao_icon.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_fabao_icon.png deleted file mode 100644 index 2374911d5e..0000000000 Binary files a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_fabao_icon.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_fabao_icon.png.meta b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_fabao_icon.png.meta deleted file mode 100644 index 9d9b356be5..0000000000 --- a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_fabao_icon.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 33e51ad2f7436e74aa6604bdfef30858 -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: 7f540e200a3b4ff4296efc459dd3513e - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: RoleInfoAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_hunyin_icon.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_hunyin_icon.png deleted file mode 100644 index c2a166ece6..0000000000 Binary files a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_hunyin_icon.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_hunyin_icon.png.meta b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_hunyin_icon.png.meta deleted file mode 100644 index 3b703db728..0000000000 --- a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_hunyin_icon.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 6d0f6667733422b4fa87ec687161863b -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: 145265b71c557d74a82cd0ff55c2a3c4 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: RoleInfoAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_zhuagnbei_icon.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_zhuagnbei_icon.png deleted file mode 100644 index 21e51796ba..0000000000 Binary files a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_zhuagnbei_icon.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_zhuagnbei_icon.png.meta b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_zhuagnbei_icon.png.meta deleted file mode 100644 index baa0aa608b..0000000000 --- a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/new_zhuagnbei_icon.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 72d34df7a5216434ba75241c4c181ece -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: c0b1c2db86d1a1848a553171b8729e0a - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: RoleInfoAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_fabaoanniu_zh.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_fabaoanniu_zh.png index e83a3a5371..2374911d5e 100644 Binary files a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_fabaoanniu_zh.png and b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_fabaoanniu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_hunyinanniu_zh.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_hunyinanniu_zh.png index d108802471..c2a166ece6 100644 Binary files a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_hunyinanniu_zh.png and b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_hunyinanniu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_zhuanbeianniu_zh.png b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_zhuanbeianniu_zh.png index 0e5a1ef5b7..21e51796ba 100644 Binary files a/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_zhuanbeianniu_zh.png and b/Assets/ManagedResources/Atlas/RoleInfoAtlas/ArtFont/r_hero_zhuanbeianniu_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab index 2359e1e67a..75c87cbdbf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab @@ -482,7 +482,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -540, y: 82} + m_AnchoredPosition: {x: -916, y: 82} m_SizeDelta: {x: 0, y: 164} m_Pivot: {x: 0, y: 0.5} --- !u!114 &396553229042369324 @@ -39202,6 +39202,7 @@ GameObject: - component: {fileID: 568030099109615014} - component: {fileID: 7488366477577984130} - component: {fileID: 3085757482771972449} + - component: {fileID: 4402350589834305469} m_Layer: 5 m_Name: TextImage m_TagString: Untagged @@ -39251,7 +39252,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -39266,6 +39267,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4402350589834305469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8100805672640726292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3085757482771972449} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &8261167215478659211 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index baa3e09654..8e25eb96ec 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -616,6 +616,7 @@ SHOP_TYPE = { QIJIE_SHOP = 81,--七界商店 honglushangdian = 87, fangcunxunbao = 89, + GodPrint = 90, --神印/探索商店 } PropertyTypeIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 94467a402c..f082d82633 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -62,6 +62,8 @@ function BagPanel:InitComponent() this.selectImg[1]:SetActive(true) --无信息图片 this.noneImage=Util.GetGameObject(self.gameObject,"NoneImage") + this.noneTxt=Util.GetGameObject(self.gameObject,"NoneImage/TextImage/Text"):GetComponent("Text") + this.noneBtn=Util.GetGameObject(self.gameObject,"NoneImage/TextImage") end @@ -141,6 +143,17 @@ function BagPanel:BindEvent() end UIManager.OpenPanel(UIName.GeneralPopup, GENERAL_POPUP_TYPE.GemOneKey,list,num) end) + Util.AddClick(this.noneBtn, function() + if sortIndex==10 then + local isActive = ShopManager.IsActive(SHOP_TYPE.GodPrint ) + if not isActive then + PopupTipPanel.ShowTip("商店尚未开启") + return + end + UIManager.OpenPanel(UIName.MainShopPanel, SHOP_TYPE.GodPrint ) + end + end) + for i = 1, 5 do Util.AddOnceClick(this.tabsList[i],function () @@ -263,6 +276,11 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop,isNotAni,_tabIndex) itemData = BagManager.GetBagItemDataByItemType(_index) this:SetItemData(itemData, isTop,isNotAni) end + if _index == ItemBaseType.GodPrint then + this.noneTxt.text="空空如也,神印可从挑战商店获取" + else + this.noneTxt.text="空空如也" + end this.noneImage:SetActive(#itemData==0) end diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintHandBook.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintHandBook.lua index 350b412add..dc83c1f60f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintHandBook.lua @@ -19,6 +19,8 @@ local list={} function GodPrintHandBook:InitComponent() this.spLoader = SpriteLoader.New() this.backBtn = Util.GetGameObject(this.gameObject, "BackBtn") + this.Title = Util.GetGameObject(this.gameObject, "Title"):GetComponent("Text") + this.Title.text="神印图鉴" this.mask = Util.GetGameObject(this.gameObject, "mask") for i = 1, 5 do tabs[i] = Util.GetGameObject(this.gameObject, "Tabs/Btn" .. i) @@ -86,7 +88,7 @@ end function GodPrintHandBook:OnShow() this.GetAllData() - curIndex=4 + curIndex=5 this.OnRefresh(curIndex) this.SetBottomBarIsActive() this:SetSelect() diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua index 84d07f2770..33c38744cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintResolvePanel.lua @@ -478,9 +478,9 @@ function this.SendBackResolveReCallBack(drop) end if tabType== 4 then --移除魂印 - SoulPrintManager.RemoveSoulPrint(chooseIdList) - local soulPrint= SoulPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType) - soulPrintData=SoulPrintManager.GetSoulPrintAndSort(soulPrint) + GodPrintManager.RemoveSoulPrint(chooseIdList) + local soulPrint= GodPrintManager.GetSoulPrintQualityDataByType(this.soulPrintChooseType) + soulPrintData=GodPrintManager.GetSoulPrintAndSort(soulPrint) this.selectText.text = Language[11728].."0/"..#soulPrintData end this.CleanSelectList() @@ -526,13 +526,13 @@ function this.ResolveBtnClickEvent() end if isSoulPrintShowSure then if isSoulPrintShowSure then - local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isSoulPrintShowSure") + local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isGodPrintShowSure") local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) if (isPopUp ~= currentTime) then MsgPanel.ShowTwo(Language[12260], nil, function(isShow) if (isShow) then local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) - RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .."isSoulPrintShowSure", currentTime) + RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .."isGodPrintShowSure", currentTime) end if #itemMaxList>0 then--是否分解物品有超过物品上限的 this.GetItemIsBeyondMaxNum(type,curResolveAllItemList)