众志成城
parent
c7bc81f19f
commit
a544abe9cc
|
@ -1041,6 +1041,7 @@ RedPointType = {
|
||||||
HomeLand = 700,--主城家园红点
|
HomeLand = 700,--主城家园红点
|
||||||
|
|
||||||
FestevalRed = 9501,
|
FestevalRed = 9501,
|
||||||
|
zhognzhichengcheng = 9601,
|
||||||
}
|
}
|
||||||
|
|
||||||
RedPointStatus = {
|
RedPointStatus = {
|
||||||
|
@ -1207,6 +1208,8 @@ JumpType = {
|
||||||
|
|
||||||
tehuishangcheng = 18888,--特惠商城
|
tehuishangcheng = 18888,--特惠商城
|
||||||
TreasureStoreSeason2 = 20300,--新百宝商会
|
TreasureStoreSeason2 = 20300,--新百宝商会
|
||||||
|
|
||||||
|
zhongzhichengcheng = 96001, --众志成城
|
||||||
}
|
}
|
||||||
|
|
||||||
NPCPosType={
|
NPCPosType={
|
||||||
|
@ -1420,6 +1423,7 @@ ActivityTypeDef = {
|
||||||
yunmenghaoli = 93, --云梦好礼
|
yunmenghaoli = 93, --云梦好礼
|
||||||
|
|
||||||
qiandaohaoli = 95, --节日签到
|
qiandaohaoli = 95, --节日签到
|
||||||
|
zhongzhichengcheng = 96,
|
||||||
}
|
}
|
||||||
--活动结束需要处理面板关闭类型
|
--活动结束需要处理面板关闭类型
|
||||||
ActivityTypePanel = {
|
ActivityTypePanel = {
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
local this = MyGuildManager
|
local this = MyGuildManager
|
||||||
local guildSacrificeRewardConfig=ConfigManager.GetConfig(ConfigName.GuildSacrificeRewardConfig)
|
local guildSacrificeRewardConfig=ConfigManager.GetConfig(ConfigName.GuildSacrificeRewardConfig)
|
||||||
local guildHelpConfig=ConfigManager.GetConfig(ConfigName.GuildHelpConfig)
|
local guildHelpConfig=ConfigManager.GetConfig(ConfigName.GuildHelpConfig)
|
||||||
|
this.exploreNums = {}
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
this.MyGuildInfo = nil
|
this.MyGuildInfo = nil
|
||||||
this.MyMemInfo = nil
|
this.MyMemInfo = nil
|
||||||
|
@ -46,6 +47,7 @@ end
|
||||||
function MyGuildManager.SetMyGuildInfo(msg)
|
function MyGuildManager.SetMyGuildInfo(msg)
|
||||||
-- 公会信息
|
-- 公会信息
|
||||||
this.MyGuildInfo = msg.familyBaseInfo
|
this.MyGuildInfo = msg.familyBaseInfo
|
||||||
|
MyGuildManager.SetMyGuildExploreNums(this.MyGuildInfo.id,this.MyGuildInfo.exploreTimes)
|
||||||
this.MyFeteInfo.score= this.MyGuildInfo.fete --登录时的奖励进度信息 后续数据刷新由MyGuildManager.MyFeteInfo.score操作
|
this.MyFeteInfo.score= this.MyGuildInfo.fete --登录时的奖励进度信息 后续数据刷新由MyGuildManager.MyFeteInfo.score操作
|
||||||
--Log("我的公会ID:"..this.MyGuildInfo.id)
|
--Log("我的公会ID:"..this.MyGuildInfo.id)
|
||||||
if this.MyGuildInfo.id then
|
if this.MyGuildInfo.id then
|
||||||
|
@ -954,4 +956,14 @@ function MyGuildManager.ShowGuildAidCdTime(_isShowTips)
|
||||||
end
|
end
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- 设置我的公会信息
|
||||||
|
function MyGuildManager.SetMyGuildExploreNums(id,nums)
|
||||||
|
this.exploreNums[id] = nums
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
function MyGuildManager.GetMyGuildExploreNums()
|
||||||
|
return this.exploreNums[this.MyGuildInfo.id] or 0
|
||||||
|
end
|
||||||
return this
|
return this
|
|
@ -1111,6 +1111,8 @@ function this:TabBtnAction(id,actType,data)
|
||||||
CheckRedPointStatus(RedPointType.chaozhifanli)
|
CheckRedPointStatus(RedPointType.chaozhifanli)
|
||||||
elseif id == ActivityTypeDef.yunmenghaoli then
|
elseif id == ActivityTypeDef.yunmenghaoli then
|
||||||
UIManager.OpenPanel(UIName.DailyRechargePanel,id)
|
UIManager.OpenPanel(UIName.DailyRechargePanel,id)
|
||||||
|
elseif id == ActivityTypeDef.zhongzhichengcheng then
|
||||||
|
UIManager.OpenPanel(UIName.ActivityMainPanel,id)
|
||||||
end
|
end
|
||||||
elseif actType == 2 then
|
elseif actType == 2 then
|
||||||
if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then
|
if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then
|
||||||
|
|
|
@ -1108,5 +1108,13 @@ function this.HomeLandIndication(buffer)
|
||||||
-- end
|
-- end
|
||||||
HomeLandManager.GetServerData(msg)
|
HomeLandManager.GetServerData(msg)
|
||||||
end
|
end
|
||||||
|
-- 家园功能解锁
|
||||||
|
function this.HomeLandIndication(buffer)
|
||||||
|
local data = buffer:DataByte()
|
||||||
|
local msg = PlayerInfoProto_pb.ArchitectureUnlockIndication()
|
||||||
|
msg:ParseFromString(data)
|
||||||
|
MyGuildManager.SetMyGuildExploreNums(msg.id,msg.exploreTimes)
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityProgressStateChange)
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
|
@ -118,6 +118,12 @@ function ExpertPage:OnShow(_sortingOrder)
|
||||||
Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder)
|
Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder)
|
||||||
self.sortingOrder = _sortingOrder
|
self.sortingOrder = _sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if self.actType == ActivityTypeDef.zhongzhichengcheng then
|
||||||
|
self.parent.tabbox.gameObject:SetActive(false)
|
||||||
|
else
|
||||||
|
self.parent.tabbox.gameObject:SetActive(true)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function ExpertPage:RefreshBtns()
|
function ExpertPage:RefreshBtns()
|
||||||
|
@ -201,6 +207,7 @@ end
|
||||||
|
|
||||||
function ExpertPage:OnClose()
|
function ExpertPage:OnClose()
|
||||||
self.gameObject:SetActive(false)
|
self.gameObject:SetActive(false)
|
||||||
|
self.parent.tabbox.gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
function ExpertPage:OnDestroy()
|
function ExpertPage:OnDestroy()
|
||||||
|
|
|
@ -883,6 +883,9 @@ local jumpDic = {
|
||||||
PopupTipPanel.ShowTip("活动尚未开启")
|
PopupTipPanel.ShowTip("活动尚未开启")
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
[JumpType.zhongzhichengcheng] = function(data,args)
|
||||||
|
this.JumpActivity(ActivityTypeDef.zhongzhichengcheng,data[1])
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function this.JumpActivity(data,skipfactor)
|
function this.JumpActivity(data,skipfactor)
|
||||||
|
|
Loading…
Reference in New Issue