From bd2d5ccd502fe211d5b859ccca05acbc5e60af7c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 30 Dec 2021 20:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=B6=E5=9B=AD=E3=80=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont}/f_fushengmeni_zhuchegnbiao2.png | Bin .../f_fushengmeni_zhuchegnbiao2.png.meta | 15 ++- .../ArtFont}/f_fushengmeni_zhuchengbiao.png | Bin .../f_fushengmeni_zhuchengbiao.png.meta | 15 ++- .../Icon/Item/icon_laohu.png.meta | 88 ++++++++++++++++++ .../Icon/Item/r_Resource_laohu.png.meta | 88 ++++++++++++++++++ .../Prefabs/UI/Main/MainPanel.prefab | 36 +++---- .../~Lua/Common/GlobalDefine.lua | 3 + .../~Lua/Modules/Main/MainPanel.lua | 32 +++---- 9 files changed, 239 insertions(+), 38 deletions(-) rename Assets/ManagedResources/{Atlas/HomeLandAtlas => DynamicAtlas/CommonAtlas/ArtFont}/f_fushengmeni_zhuchegnbiao2.png (100%) rename Assets/ManagedResources/{Atlas/HomeLandAtlas => DynamicAtlas/CommonAtlas/ArtFont}/f_fushengmeni_zhuchegnbiao2.png.meta (87%) rename Assets/ManagedResources/{Atlas/HomeLandAtlas => DynamicAtlas/CommonAtlas/ArtFont}/f_fushengmeni_zhuchengbiao.png (100%) rename Assets/ManagedResources/{Atlas/HomeLandAtlas => DynamicAtlas/CommonAtlas/ArtFont}/f_fushengmeni_zhuchengbiao.png.meta (87%) create mode 100644 Assets/ManagedResources/Icon/Item/icon_laohu.png.meta create mode 100644 Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchegnbiao2.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchegnbiao2.png similarity index 100% rename from Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchegnbiao2.png rename to Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchegnbiao2.png diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchegnbiao2.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchegnbiao2.png.meta similarity index 87% rename from Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchegnbiao2.png.meta rename to Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchegnbiao2.png.meta index 7ca5022098..36f1325cfd 100644 --- a/Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchegnbiao2.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchegnbiao2.png.meta @@ -73,7 +73,18 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 56 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -91,7 +102,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: HomeLandAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchengbiao.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchengbiao.png similarity index 100% rename from Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchengbiao.png rename to Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchengbiao.png diff --git a/Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchengbiao.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchengbiao.png.meta similarity index 87% rename from Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchengbiao.png.meta rename to Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchengbiao.png.meta index c166588125..491171b43e 100644 --- a/Assets/ManagedResources/Atlas/HomeLandAtlas/f_fushengmeni_zhuchengbiao.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/f_fushengmeni_zhuchengbiao.png.meta @@ -73,7 +73,18 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 56 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -91,7 +102,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: HomeLandAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Icon/Item/icon_laohu.png.meta b/Assets/ManagedResources/Icon/Item/icon_laohu.png.meta new file mode 100644 index 0000000000..acd4ede779 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/icon_laohu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5fe1ce44b1a2ac04c9f4b12c242a426d +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: 66b45b32eaa8500458f5b7d09f927fe1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta b/Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta new file mode 100644 index 0000000000..3a4453f706 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 345a23a3ffb056c49b708dcaaf9abb43 +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: 4ac8b28ca2d52444ca6709da06eaeff5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 3212d5a121..ce7ef1c8c6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -578,7 +578,7 @@ GameObject: - component: {fileID: 1586863081} - component: {fileID: 1586863080} m_Layer: 5 - m_Name: btnColorfulWorld + m_Name: btnHomeLand m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -635,7 +635,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: aef0ea96669dc3540874d1daae3b0e24, type: 3} + m_Sprite: {fileID: 21300000, guid: 857c2a13063298f42bd9fa82cee9e6bb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6776,7 +6776,7 @@ ParticleSystem: --- !u!199 &3612650515471756776 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -13620,7 +13620,7 @@ ParticleSystem: --- !u!199 &2077135144819501974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19380,7 +19380,7 @@ ParticleSystem: --- !u!199 &5382233283546536858 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28481,7 +28481,7 @@ ParticleSystem: --- !u!199 &4678487443364567018 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33433,7 +33433,7 @@ ParticleSystem: --- !u!199 &3301434479282110283 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39390,7 +39390,7 @@ ParticleSystem: --- !u!199 &8426323061574149814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44382,7 +44382,7 @@ ParticleSystem: --- !u!199 &3988090302360095373 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50009,7 +50009,7 @@ ParticleSystem: --- !u!199 &5461926455895321923 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55223,7 +55223,7 @@ ParticleSystem: --- !u!199 &6960492284779320589 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61073,7 +61073,7 @@ ParticleSystem: --- !u!199 &4261467272199160834 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66285,7 +66285,7 @@ ParticleSystem: --- !u!199 &166348205603765908 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -77284,7 +77284,7 @@ ParticleSystem: --- !u!199 &1706209193022837301 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79314,7 +79314,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fc19307778f19af4a871ba48ee401a87, type: 3} + m_Sprite: {fileID: 21300000, guid: 857c2a13063298f42bd9fa82cee9e6bb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -79388,7 +79388,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: aef0ea96669dc3540874d1daae3b0e24, type: 3} + m_Sprite: {fileID: 21300000, guid: cf9207026c0e90440a52de012634a6e8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -85790,7 +85790,7 @@ ParticleSystem: --- !u!199 &8234207848460451360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90871,7 +90871,7 @@ ParticleSystem: --- !u!199 &3615746855071839570 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c14b09f2a9..b6fecf4783 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1629,6 +1629,7 @@ FUNCTION_OPEN_TYPE = { Incarnation = 120, ChouJiangRukou = 121,--限时招募,乾坤宝盒、灵兽宝阁入口 Gem = 122,--命格 + HOMELAND = 124,--家园 浮生们 } TaskGetBtnIconDef = { @@ -2137,6 +2138,7 @@ FUNC_OPNE_STATE = { TianShuMiJuan = "TianShuMiJuan", LUCKYTURN = "LUCKYTURN", JUMPSERVER = "JUMPSERVER", + HOMELAND = "HOMELAND", } -- 开放功能ID作为索引键值,索引对应的字符串 @@ -2168,6 +2170,7 @@ FUNC_OPEN_STR = { [FUNCTION_OPEN_TYPE.tianshumijuan] = FUNC_OPNE_STATE.TianShuMiJuan, [FUNCTION_OPEN_TYPE.LUCKYTURN] = FUNC_OPNE_STATE.LUCKYTURN, [FUNCTION_OPEN_TYPE.JumpServer] = FUNC_OPNE_STATE.JUMPSERVER, + [FUNCTION_OPEN_TYPE.HOMELAND] = FUNC_OPNE_STATE.HOMELAND, } -- 地图中图标对应的ID diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a7ab47fd5b..b8aee87e17 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -152,10 +152,10 @@ function this:InitComponent() this.btnPokemon = Util.GetGameObject(this.gameObject, "scene/layer6/btnPokemon") -- this.btnTianFu = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianFu") this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi") - this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld") + this.btnHomeLand = Util.GetGameObject(this.gameObject, "scene/layer6/btnHomeLand") this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")--跨服 this.btnWaiDi:SetActive(false) - this.btnColorfulWorld:SetActive(true) + this.btnHomeLand:SetActive(true) this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero") this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianShuMiJuan") this.btnXingYunTanBao = Util.GetGameObject(this.gameObject, "bg/btnXingYunTanBao") @@ -163,7 +163,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -1100), [FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200), - -- [FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500), + [FUNCTION_OPEN_TYPE.HOMELAND] = this:AddFuncItem(this.btnHomeLand, -1500), [FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200), [FUNCTION_OPEN_TYPE.RECURITY] = this:AddFuncItem(this.btnRecruit, -56), --[FUNCTION_OPEN_TYPE.ELEMENT_RECURITY] = this:AddFuncItem(this.btnElementDrawCard, 0), @@ -178,7 +178,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.SHOP] = this:InsertNewText(this.btnShangdian), [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:InsertNewText(this.btnFenjie), [FUNCTION_OPEN_TYPE.ARENA] = this:InsertNewText(this.btnJingjichang), - -- [FUNCTION_OPEN_TYPE.ENDLESS] = this:InsertNewText(this.btnColorfulWorld), + [FUNCTION_OPEN_TYPE.HOMELAND] = this:InsertNewText(this.btnHomeLand), [FUNCTION_OPEN_TYPE.COMPOUND] = this:InsertNewText(this.btnEquipCompound), [FUNCTION_OPEN_TYPE.RECURITY] = this:InsertNewText(this.btnRecruit), --[FUNCTION_OPEN_TYPE.ELEMENT_RECURITY] = this:InsertNewText(this.btnElementDrawCard), @@ -198,7 +198,7 @@ function this:InitComponent() this.rpSecretBox = Util.GetGameObject(this.btnSecretBox, "redPoint") this.rpYiYao = Util.GetGameObject(this.btnYiYao, "redPoint") this.rpAlien = Util.GetGameObject(this.btnWaiDi, "redPoint") - -- this.rpColorfulWorld = Util.GetGameObject(this.btnColorfulWorld, "redPoint") + this.rpbtnHomeLand = Util.GetGameObject(this.btnHomeLand, "redPoint") this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换 this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽 this.rpbtnTianShuMiJuan = Util.GetGameObject(this.btnTianShuMiJuan, "redPoint")--灵兽 @@ -528,7 +528,7 @@ function this:BindEvent() end this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA) end) - Util.AddClick(this.btnColorfulWorld, function() + Util.AddClick(this.btnHomeLand, function() UIManager.OpenPanel(UIName.HomeLandPanel) -- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then -- PlayerManager.carbonType = 2 @@ -1223,24 +1223,24 @@ function this.CheckScreenRightRedPoint() if not this.btnPokemon then return end - -- if not this.btnColorfulWorld then - -- return - -- end + if not this.btnHomeLand then + return + end if not this.btnPokemon.gameObject then return end - -- if not this.btnColorfulWorld.gameObject then - -- return - -- end + if not this.btnHomeLand.gameObject then + return + end if not this.btnPokemon.gameObject.transform then return end - -- if not this.btnColorfulWorld.gameObject.transform then - -- return - -- end + if not this.btnHomeLand.gameObject.transform then + return + end pos1=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnPokemon.transform.position) - -- pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnColorfulWorld.transform.position) + pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnHomeLand.transform.position) if (pos1.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.PokemonMainCity)==RedPointStatus.Show) then--or (pos2.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.Vientiane)==RedPointStatus.Show) then this.jiantouObj:SetActive(true) else