Merge branch 'china/dev' into 0功能/修行玩法
commit
5fe75af0bf
Binary file not shown.
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
Binary file not shown.
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
@ -496,7 +496,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9650\u8D2D\uFF1A0/1"
|
||||
m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A1"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &2969215487700477814
|
||||
GameObject:
|
||||
|
|
|
@ -1323,7 +1323,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9650\u8D2D\uFF1A0/1"
|
||||
m_Text: "\u5269\u4F59\u6B21\u6570\uFF1A1"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7024708985962774764
|
||||
GameObject:
|
||||
|
|
|
@ -562,8 +562,10 @@ function this.ShowBattleResultByCarDeleayType()
|
|||
Timer.New(function()
|
||||
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
if bestData then
|
||||
--车迟挑战cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Challenge)
|
||||
if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then
|
||||
--车迟挑战cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Challenge)
|
||||
end
|
||||
-- 胜利显示本场比赛的表现最好的英雄
|
||||
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||
-- 打开关卡奖励界面
|
||||
|
|
|
@ -43,12 +43,16 @@ end
|
|||
|
||||
--添加事件监听(用于子类重写)
|
||||
function ActivityMainPanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, this.OnShow)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, function()
|
||||
this:OnOpen(this.activityType,_CurPageIndex)
|
||||
end)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function ActivityMainPanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, this.OnShow)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, function()
|
||||
this:OnOpen(this.activityType,_CurPageIndex)
|
||||
end)
|
||||
end
|
||||
|
||||
function ActivityMainPanel:CheckActOpen(_index)
|
||||
|
@ -88,27 +92,14 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function ActivityMainPanel:OnOpen(_activityType,_index)
|
||||
LogGreen("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index))
|
||||
this.activityType = _activityType
|
||||
DynamicActivityManager.curActivityType = this.activityType
|
||||
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
|
||||
-- _CurPageIndex = 0
|
||||
-- if _index and _index > 0 then
|
||||
-- self:CheckActOpen(_index)
|
||||
-- end
|
||||
-- for index = 1, #tabs do
|
||||
-- if _CurPageIndex < 1 then
|
||||
-- self:CheckActOpen(index)
|
||||
-- else
|
||||
-- break
|
||||
-- end
|
||||
-- end
|
||||
_CurPageIndex = _index or 0
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
function ActivityMainPanel:OnShow()
|
||||
if _CurPageIndex and _CurPageIndex > 0 then
|
||||
self:CheckActOpen(_CurPageIndex)
|
||||
_CurPageIndex = 0
|
||||
LogGreen("_index:"..tostring(_index))
|
||||
if _index and _index > 0 then
|
||||
self:CheckActOpen(_index)
|
||||
end
|
||||
for index = 1, #tabs do
|
||||
if _CurPageIndex < 1 then
|
||||
|
@ -117,7 +108,7 @@ function ActivityMainPanel:OnShow()
|
|||
break
|
||||
end
|
||||
end
|
||||
if _CurPageIndex == 0 then
|
||||
if _CurPageIndex < 1 then
|
||||
DynamicActivityManager.RemoveUIList()
|
||||
if #DynamicActivityManager.OpenUIList > 0 then
|
||||
JumpManager.GoJump(DynamicActivityManager.OpenUIList[#DynamicActivityManager.OpenUIList],function()
|
||||
|
@ -127,6 +118,11 @@ function ActivityMainPanel:OnShow()
|
|||
this:ClosePanel()
|
||||
end
|
||||
end
|
||||
LogGreen("_CurPageIndex:".._CurPageIndex)
|
||||
end
|
||||
|
||||
-- 打开,重新打开时回调
|
||||
function ActivityMainPanel:OnShow()
|
||||
orginLayer = self.sortingOrder
|
||||
if _CurPageIndex and (_CurPageIndex > #tabs or _CurPageIndex < 1) then
|
||||
_CurPageIndex = #tabs
|
||||
|
|
|
@ -170,7 +170,7 @@ function QianKunBox:refreshBtnShow()
|
|||
local recrutId = n == 1 and self.singleRecruit.Id or self.tenRecruit.Id
|
||||
local recrutNum = n == 1 and 1 or 10
|
||||
local uiName = n == 1 and UIName.QianKunBoxBuyOnePanel or UIName.QianKunBoxBuyTenPanel
|
||||
if state==0 and d[1] == 16 and not isFree then
|
||||
if state==0 and itemId == 16 and not isFree then
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,recrutId,function()
|
||||
self:Recruit(recrutNum,recrutId,uiName)
|
||||
end)
|
||||
|
|
|
@ -348,14 +348,20 @@ function this.RefreshBaseInfoShow()
|
|||
local curGuildlv = guildData.levle
|
||||
local curGuildLevelInfo = ConfigManager.GetConfigData(ConfigName.GuildLevelConfig, curGuildlv)
|
||||
local masterInfo = MyGuildManager.GetMyGuildMasterInfo()
|
||||
|
||||
-- 判断是否满级
|
||||
local expTxt = "已满级"
|
||||
local expVal = 1
|
||||
if ConfigManager.TryGetConfigData(ConfigName.GuildLevelConfig, curGuildlv+1) then
|
||||
expTxt = string.format("%s/%s", guildData.exp, curGuildLevelInfo.Exp)
|
||||
expVal = guildData.exp/curGuildLevelInfo.Exp
|
||||
end
|
||||
this.guildName.text = guildData.name
|
||||
this.guildAnnounce.text = GetLanguageStrById(guildData.annouce)
|
||||
this.guildLevel.text = curGuildlv..Language[10065]
|
||||
this.guildMaster.text = masterInfo.userName
|
||||
this.guildMember.text = string.format("(%s/%s)", guildData.totalNum, curGuildLevelInfo.Num)
|
||||
this.expText.text = string.format("%s/%s", guildData.exp, curGuildLevelInfo.Exp)
|
||||
this.expSlider.value = guildData.exp/curGuildLevelInfo.Exp
|
||||
this.expText.text = expTxt
|
||||
this.expSlider.value = expVal
|
||||
|
||||
local pos = MyGuildManager.GetMyPositionInGuild()
|
||||
this.guildCharge:SetActive(pos ~= GUILD_GRANT.MEMBER)
|
||||
|
|
|
@ -258,7 +258,7 @@ function this.RechargeSuccessFunc(id)
|
|||
OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.DirectPurchaseGift, id)
|
||||
local redpack=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,curIndex)
|
||||
this.SetInfo(curIndex)
|
||||
PopupTipPanel.ShowTip(string.format( Language[11051],GetLanguageStrById(redpack.Name)))
|
||||
PopupTipPanel.ShowTip(string.format("成功发送%s",GetLanguageStrById(redpack.Name)))
|
||||
ChatManager.RequestSendRedPacket(curIndex)
|
||||
end
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ function GMPanel:InitComponent()
|
|||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "跳转测试", inputTip = {"输入跳转ID"}, callBack = this.TestJump},
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil},
|
||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = "逍遥游", inputTip = {"类型#mapId#bossId"}, callBack = nil},
|
||||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "功能引导测试", inputTip = {"请输入引导ID"}, callBack = this.TestFuncGuide},
|
||||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "功能引导测试", inputTip = {"请输入功能ID", "1去主界面2去挂机界面"}, callBack = this.TestFuncGuide},
|
||||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "红点Debug", inputTip = {""}, callBack = this.OpenRedDebug},
|
||||
|
||||
|
||||
|
@ -319,9 +319,20 @@ function this.TestJump(text)
|
|||
JumpManager.GoJump(tonumber(text))
|
||||
end
|
||||
-- 测试功能引导
|
||||
function this.TestFuncGuide(text)
|
||||
function this.TestFuncGuide(text, goType)
|
||||
|
||||
local gid = tonumber(text)
|
||||
GuideManager.AddFuncGuide(gid)
|
||||
-- 判断要前往的界面
|
||||
if goType == "1" then
|
||||
GuideManager.AddFuncGuide(gid)
|
||||
this:ClosePanel()
|
||||
elseif goType == "2" then
|
||||
GuideManager.AddFuncGuide(gid)
|
||||
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip("请输入要前往的界面")
|
||||
end
|
||||
|
||||
end
|
||||
-- 红点Debug
|
||||
function this.OpenRedDebug()
|
||||
|
|
|
@ -99,6 +99,10 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType)
|
|||
else
|
||||
this.btnBattleBack:SetActive(true)
|
||||
end
|
||||
if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟
|
||||
--车迟抢夺cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
@ -119,9 +123,6 @@ function this.ClosePanelRefreshData()
|
|||
if fightType then
|
||||
if fightType == BATTLE_TYPE.EXECUTE_FIGHT then--远征
|
||||
this.ShowBattleResultByExpedition()
|
||||
elseif fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟
|
||||
--车迟抢夺cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
elseif fightType == BATTLE_TYPE.XIAOYAOYOU then--逍遥游
|
||||
this.ShowBattleResultByXYY()
|
||||
--新回放功能
|
||||
|
|
|
@ -152,8 +152,10 @@ end
|
|||
function this.ShowBattleResultByCarDeleayType(drop)
|
||||
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
if bestData then
|
||||
--车迟抢夺cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
if m_fightType == BATTLE_TYPE.GUILD_CAR_DELAY then
|
||||
--车迟抢夺cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
end
|
||||
-- 胜利显示本场比赛的表现最好的英雄
|
||||
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||
-- 打开关卡奖励界面
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
local this = StoryMapManager
|
||||
this.groupConfigs = {}
|
||||
this.isShowStory = 0
|
||||
--local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig)
|
||||
local storyMapConfig = ConfigManager.GetConfig(ConfigName.StoryMapConfig)
|
||||
--初始化
|
||||
function this.Initialize()
|
||||
|
||||
|
|
Loading…
Reference in New Issue