[bt]========主城鸿蒙镇修改提交

2022-12-01 14:24:05 +08:00 · 2022-12-01 14:24:05 +08:00 · 214b316ac9
parent 1eba8d64f8
commit 214b316ac9
8 changed files with 136 additions and 16 deletions
--- a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_guoqi_zh.png
+++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_guoqi_zh.png
--- a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_maincity_hongmengzhen_hui_zh.png
+++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_maincity_hongmengzhen_hui_zh.png
--- a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_maincity_hongmengzhen_hui_zh.png.meta
+++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_maincity_hongmengzhen_hui_zh.png.meta
@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 021bfc839dbe31749b885fdfffa7252e
+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: 5c30fa269a3129b41b1dee46a3647ef1
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: GMAltas
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_maincity_hongmengzhen_zh.png
+++ b/Assets/ManagedResources/Atlas/GMAltas/ArtFront/gm_maincity_hongmengzhen_zh.png
--- a/Assets/ManagedResources/Atlas/HotRankAtlas/ArtFont/hotRank_btn_zh.png
+++ b/Assets/ManagedResources/Atlas/HotRankAtlas/ArtFont/hotRank_btn_zh.png
--- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
@ -50653,7 +50653,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: 4a65cf25620b755458a89499d5e05d3b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 48cc2612d548b2b438abfc37742dda47, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -81575,7 +81575,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: bddaf413d083a5b45a9172b36095490a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 021bfc839dbe31749b885fdfffa7252e, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -93876,12 +93876,12 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
+    - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
        type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
+    - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
        type: 3}
      propertyPath: m_IsActive
      value: 0
@ -93966,12 +93966,12 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
+    - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
        type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
+    - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
        type: 3}
      propertyPath: m_IsActive
      value: 0
@ -94056,12 +94056,12 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
+    - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
        type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c,
+    - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c,
        type: 3}
      propertyPath: m_IsActive
      value: 0
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@ -2271,6 +2271,7 @@ FUNC_OPNE_STATE = {
    LUCKYTURN = "LUCKYTURN",
    JUMPSERVER = "JUMPSERVER",
    HOMELAND = "HOMELAND",
+    HONGMENG="HONGMENG",
 }

 -- 开放功能ID作为索引键值，索引对应的字符串
@ -2303,6 +2304,7 @@ FUNC_OPEN_STR = {
    [FUNCTION_OPEN_TYPE.LUCKYTURN] = FUNC_OPNE_STATE.LUCKYTURN,
    [FUNCTION_OPEN_TYPE.JumpServer] = FUNC_OPNE_STATE.JUMPSERVER,
    [FUNCTION_OPEN_TYPE.HOMELAND] = FUNC_OPNE_STATE.HOMELAND,
+    [FUNCTION_OPEN_TYPE.HongMengZhen] = FUNC_OPNE_STATE.HONGMENG,
 }

 -- 地图中图标对应的ID
--- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
@ -135,6 +135,7 @@ function this:InitComponent()

    --鸿蒙
    this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng")
+    this.btnHongMeng:SetActive(false)
    this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint")

    --新神尊特权
@ -205,7 +206,7 @@ function this:InitComponent()
        [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:AddFuncItem(this.btnCompoundHero, 0),--神将合成、置换
        [FUNCTION_OPEN_TYPE.POKEMON] = this:AddFuncItem(this.btnPokemon, -1200),--神将合成、置换
        --[FUNCTION_OPEN_TYPE.tianshumijuan] = this:AddFuncItem(this.btnTianShuMiJuan, -600),
-        [FUNCTION_OPEN_TYPE.LUCKYTURN] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
+        [FUNCTION_OPEN_TYPE.HongMengZhen] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
        [FUNCTION_OPEN_TYPE.JumpServer] = this:AddFuncItem(this.btnJumpServer, 0),--跨服
        [FUNCTION_OPEN_TYPE.Explore] = this:AddFuncItem(this.btnExplore, 0),--探索
    }
@ -221,7 +222,7 @@ function this:InitComponent()
        [FUNCTION_OPEN_TYPE.COMPOUND_HERO] = this:InsertNewText(this.btnCompoundHero),--神将合成、置换
        [FUNCTION_OPEN_TYPE.POKEMON] = this:InsertNewText(this.btnPokemon),--神将合成、置换
        --[FUNCTION_OPEN_TYPE.tianshumijuan] = this:InsertNewText(this.btnTianShuMiJuan),
-        [FUNCTION_OPEN_TYPE.LUCKYTURN] = this:InsertNewText(this.btnXingYunTanBao),--幸运探宝
+        [FUNCTION_OPEN_TYPE.HongMengZhen] = this:InsertNewText(this.btnXingYunTanBao),--幸运探宝
        [FUNCTION_OPEN_TYPE.JumpServer] = this:InsertNewText(this.btnJumpServer),--跨服
    }

@ -285,7 +286,7 @@ function this:InitComponent()
    -- this.btnFunHide[FUNCTION_OPEN_TYPE.NewShenzun] = this.btnShenzun
    this.btnFunHide[FUNCTION_OPEN_TYPE.POKEMON] = this.btnPokemon
    --this.btnFunHide[FUNCTION_OPEN_TYPE.tianshumijuan] = this.btnTianShuMiJuan
-    this.btnFunHide[FUNCTION_OPEN_TYPE.LUCKYTURN] = this.btnXingYunTanBao
+    this.btnFunHide[FUNCTION_OPEN_TYPE.HongMengZhen] = this.btnXingYunTanBao

    this.animRoot = Util.GetGameObject(self.gameObject, "scene")
    --挑战关卡快速升级提示
@ -721,7 +722,14 @@ function this:BindEvent()
        -- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
        -- JumpManager.GoJump(1027)
        -- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.LUCKYTURN)
-        UIManager.OpenPanel(UIName.ActivityMainPanel,40,5)
+        --UIManager.OpenPanel(UIName.ActivityMainPanel,40,5)
+        NetManager.HongMengInfoResponse(function ()
+            if  HarmonyManager:HongMengTowerUpLimit() > 0 then
+                UIManager.OpenPanel(UIName.HongMengEnvoyPanel)
+            else
+                UIManager.OpenPanel(UIName.HongMengPanel)
+            end
+        end)
    end)

    Util.AddClick(this.btnExplore,function()
@ -783,9 +791,9 @@ function this.BindRedPoint()
    -- BindRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
    BindRedPointObject(RedPointType.HomeLand, this.rpbtnHomeLand)
    BindRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
-    BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
+    --BindRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
    BindRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
-    BindRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao)
+    BindRedPointObject(RedPointType.HongMeng,this.rpbtnXingYunTanBao)
    BindRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
    BindRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
    BindRedPointObject(RedPointType.RightUp2,this.rpRightUp2)
@ -812,9 +820,9 @@ function this.ClearRedPoint()
    -- ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld)
    ClearRedPointObject(RedPointType.HomeLand, this.rpbtnHomeLand)
    ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon)
-    ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
+    --ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint)
    ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan)
-    ClearRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao)
+    ClearRedPointObject(RedPointType.HongMeng,this.rpbtnXingYunTanBao)
    ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)
    ClearRedPointObject(RedPointType.Huaxutan,this.rpCompoundHero)
    ClearRedPointObject(RedPointType.RightUp2,this.rpRightUp2)