diff --git a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab index df6aba619c..de15fbff9b 100644 --- a/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FetterItemView/FetterItem.prefab @@ -520,7 +520,7 @@ MonoBehaviour: m_Top: -21 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: 30 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index 30c89f3e3d..50fca178d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -6,7 +6,7 @@ local liveNodeList = {} local goList = {} local stage = 0 local enterable = false -local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank +--local JoinRank = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).JoinRank local isFirstRefresh = false --初始化组件(用于子类重写) function JumpServerHightLadderPanel:InitComponent() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 47da3a1c09..7145aacacb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -207,7 +207,7 @@ function this:InitComponent() this.btnJumpServer:SetActive(false) this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero") this.btnTianShuMiJuan = Util.GetGameObject(self.gameObject,"RightDown/btnTianShuMiJuan") - this.btnTianShuMiJuan:SetActive(false) + --this.btnTianShuMiJuan:SetActive(false) this.btnXingYunTanBao = Util.GetGameObject(this.gameObject, "bg/btnXingYunTanBao") this.operateIcon = { [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), @@ -327,11 +327,11 @@ function this:InitComponent() this.taiChuMiJuanBtn = Util.GetGameObject(self.gameObject, "taichumijuan") this.taichumijuanRed=Util.GetGameObject(this.taiChuMiJuanBtn, "redPoint") - + this.taiChuMiJuanBtn:SetActive(false) -- 提审服,喜扑,动游关闭太初密卷显示 - if SERVER_VERSION == 1 or LoginRoot_Channel == "XP" or LoginRoot_Channel == "DY" then - this.taiChuMiJuanBtn:SetActive(false) - end + -- if SERVER_VERSION == 1 or LoginRoot_Channel == "XP" or LoginRoot_Channel == "DY" then + -- this.taiChuMiJuanBtn:SetActive(false) + -- end end function this:SetPosFunc(v2) @@ -361,29 +361,31 @@ end function this:BindEvent() Util.AddOnceClick(this.taiChuMiJuanBtn,function() - NetManager.TaiChuSecretvolumeRequest(function(msg) - local data = {} - if not msg or not msg.secretvolume or #msg.secretvolume < 1 then - UIManager.OpenPanel(UIName.taiChuMiJuan,data) - return - end - coroutine.start(function() - for k,v in ipairs(msg.secretvolume) do - local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) - while(not DynamicActivityManager.GetwwwProgress()) do - coroutine.wait(0.01) - end - isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) - table.insert(data,isContinue) - end - table.sort(data,function(a,b) - return a.id < b.id - end) - PlayerPrefs.SetString("TaiChu"..PlayerManager.uid,TimeStampToDateStr2(GetTimeStamp())) - CheckRedPointStatus(RedPointType.TaiChuMiJuan) - UIManager.OpenPanel(UIName.taiChuMiJuan,data) - end) - end) + + UIManager.OpenPanel(UIName.TianShuMiJuan,1) + -- NetManager.TaiChuSecretvolumeRequest(function(msg) + -- local data = {} + -- if not msg or not msg.secretvolume or #msg.secretvolume < 1 then + -- UIManager.OpenPanel(UIName.taiChuMiJuan,data) + -- return + -- end + -- coroutine.start(function() + -- for k,v in ipairs(msg.secretvolume) do + -- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + -- while(not DynamicActivityManager.GetwwwProgress()) do + -- coroutine.wait(0.01) + -- end + -- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v) + -- table.insert(data,isContinue) + -- end + -- table.sort(data,function(a,b) + -- return a.id < b.id + -- end) + -- PlayerPrefs.SetString("TaiChu"..PlayerManager.uid,TimeStampToDateStr2(GetTimeStamp())) + -- CheckRedPointStatus(RedPointType.TaiChuMiJuan) + -- UIManager.OpenPanel(UIName.taiChuMiJuan,data) + -- end) + -- end) ----------------------------------------------------------- 测试数据 -- local data = {} -- local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"}, diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 41209e51ac..2ffd6c12c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -5031,6 +5031,9 @@ function this.PokemonBookEnableRequest(id,func) HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HeroFetter) HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HunYinFetter) HeroPropManager.SetFuncPropDirty(Func_Prop_Type.EquipFetter) + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.TreasureFetter) + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.FaXiangFetter) + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.HuaShenFetter) if func then func(msg) end