Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-03-19 10:28:50 +08:00
commit 3a43473a0c
15 changed files with 116 additions and 74 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 629 KiB

After

Width:  |  Height:  |  Size: 589 KiB

View File

@ -81362,7 +81362,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 3
m_Text: 18
--- !u!1 &6530875567309028468
GameObject:
m_ObjectHideFlags: 0

View File

@ -423,10 +423,10 @@ RectTransform:
m_Father: {fileID: 1759585470645775885}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 500, y: -110}
m_SizeDelta: {x: 1000, y: 70}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6247518587750639663
MonoBehaviour:
@ -638,10 +638,10 @@ RectTransform:
m_Father: {fileID: 8126913021008556213}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 185, y: -35}
m_SizeDelta: {x: 130, y: 130}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3499665449579621445
CanvasRenderer:
@ -1386,7 +1386,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3210126133790844263}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -1436,10 +1436,10 @@ RectTransform:
m_Father: {fileID: 8126913021008556213}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 605, y: -35}
m_SizeDelta: {x: 130, y: 130}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1503583757653798130
CanvasRenderer:
@ -1552,10 +1552,10 @@ RectTransform:
m_Father: {fileID: 1759585470645775885}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 500, y: -40}
m_SizeDelta: {x: 1000, y: 70}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4460466962581947724
CanvasRenderer:
@ -2008,10 +2008,10 @@ RectTransform:
m_Father: {fileID: 8126913021008556213}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 815, y: -35}
m_SizeDelta: {x: 130, y: 130}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8854254542223782766
CanvasRenderer:
@ -2494,10 +2494,10 @@ RectTransform:
m_Father: {fileID: 8126913021008556213}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 395, y: -35}
m_SizeDelta: {x: 130, y: 130}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8307884902098969747
CanvasRenderer:

View File

@ -8,6 +8,10 @@ local bgName
local Live
local orginLayer = 0
local specialList = {
[10034] = Vector2.New(0,950),
}
--初始化组件(用于子类重写)
function BattleBossInfoPanel:InitComponent()
self.btnBack = Util.GetGameObject(self.gameObject,"mask")
@ -88,20 +92,20 @@ function BattleBossInfoPanel:OnShow()
Timer.New(function ()
self.mask2:SetActive(false)
end,1):Start()
-- self.timer1 = Timer.New(function ()
-- PlayUIAnim(self.ani1)
-- PlayUIAnim(self.ani2)
-- self.effect:SetActive(false)
-- if self.timer2 then
-- self.timer2:Stop()
-- self.timer2 = nil
-- end
-- self.Img1:DOFade(0,0.7)
-- Timer.New(function ()
-- self:ClosePanel()
-- end,0.7):Start()
-- end,time)
-- self.timer1:Start()
self.timer1 = Timer.New(function ()
PlayUIAnim(self.ani1)
PlayUIAnim(self.ani2)
self.effect:SetActive(false)
if self.timer2 then
self.timer2:Stop()
self.timer2 = nil
end
self.Img1:DOFade(0,0.7)
Timer.New(function ()
self:ClosePanel()
end,0.7):Start()
end,time)
self.timer1:Start()
local thread2=coroutine.start(function()
coroutine.wait(0.5)
@ -143,7 +147,13 @@ function BattleBossInfoPanel:OnShow()
poolManager:UnLoadLive(bgName, Live)
Live = nil
end
Live = poolManager:LoadLive(bgName, self.liveroot.transform, Vector3.one, Vector2.New(pos[1],pos[2]))
for key, value in pairs(specialList) do
if key == data.BossPreview then
Live = poolManager:LoadLive(bgName, self.liveroot.transform, Vector3.one, value)
break
end
Live = poolManager:LoadLive(bgName, self.liveroot.transform, Vector3.one, Vector2.New(pos[1],pos[2]))
end
self.root.transform.localScale = Vector3.one*scale
--Bottom

View File

@ -11,6 +11,7 @@ local monsterData = {}
local rewardData = {}
local curNodeConFig
local type = 1 --1 前往 2 放弃
local ExpeSetting = ConfigManager.GetConfig(ConfigName.ExpeditionSetting)
function this:InitComponent(gameObject)
this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text")
this.power = Util.GetGameObject(gameObject, "Power/Value"):GetComponent("Text")
@ -59,7 +60,7 @@ function this:OnShow(_parent,...)
local Reward = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ExpeditionFloorConfig,"Floor",ExpeditionManager.expeditionLeve,"FloorLay",monsterData.lay - 1)
if Reward and Reward.Reward and #Reward.Reward > 0 then
for i = 1, #Reward.Reward do
local rewardGroupConfig = ConfigManager.TryGetConfigData(ConfigName.RewardGroup,Reward.Reward[i])
local rewardGroupConfig = ConfigManager.TryGetConfigData(ConfigName.RewardGroup,ExpeSetting[1].SpecialReward)--Reward.Reward[i])
if rewardGroupConfig and #rewardGroupConfig.ShowItem > 0 then
for j = 1, #rewardGroupConfig.ShowItem do
local v = rewardGroupConfig.ShowItem[j]
@ -94,22 +95,24 @@ function this:FormationAdapter()
--LogError("monsterData.bossTeaminfo.hero "..#monsterData.bossTeaminfo.hero)
this.power.text = monsterData.bossTeaminfo.totalForce
local monsterCongig = {}
if monsterData.bossTeaminfo.teamInfo and monsterData.bossTeaminfo.teamInfo > 0 then
local monsterGroup = ConfigManager.TryGetConfigData(ConfigName.MonsterGroup,monsterData.bossTeaminfo.teamInfo)
if monsterGroup and monsterGroup.Contents and #monsterGroup.Contents > 0 then
if monsterGroup.Contents[1] and monsterGroup.Contents[1][1] then
monsterCongig = ConfigManager.TryGetConfigData(ConfigName.MonsterConfig,monsterGroup.Contents[1][1])
end
end
if not monsterCongig then return end
if monsterData.bossTeaminfo.hero and #monsterData.bossTeaminfo.hero > 1 then
-- local monsterGroup = ConfigManager.TryGetConfigData(ConfigName.MonsterGroup,monsterData.bossTeaminfo.teamInfo)
-- monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterData.bossTeaminfo.teamInfo)
-- if monsterGroup and monsterGroup.Contents and #monsterGroup.Contents > 0 then
-- if monsterGroup.Contents[1] and monsterGroup.Contents[1][1] then
-- monsterCongig = ConfigManager.TryGetConfigData(ConfigName.MonsterConfig,monsterGroup.Contents[1][1])
-- end
-- end
-- if not monsterCongig then return end
--if not monsterCongig then LogError("无 monsterCongig") return end
--monsterData.bossTeaminfo.hero[i].remainHp monsterCongig.Level
local demonId = monsterCongig.MonsterId
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterData.bossTeaminfo.hero[2].heroTid)--monsterGroup.getHero)
if not monsterCongig then return end
local heroConfig = monsterCongig
this.LiveName = GetResourcePath(heroConfig.Live)
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
Vector3.one * heroConfig.Scale, Vector3.New(heroConfig.Position[1],heroConfig.Position[2],0))
end
end
FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData)
end
function this:OnClose()

View File

@ -157,7 +157,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
live.transform.localPosition = Vector3.zero
local zs = Util.GetGameObject(o, "zs")
local zsName = GetHeroCardStarZs[heroConfig.Star]
local zsName = GetHeroCardStarZs[monsterId.star]
if zsName == "" then
zs:SetActive(false)
else
@ -168,12 +168,12 @@ function this.SetCardSingleData(o,monsterId, _pos)
yuanImage:SetActive(false)
lv.text=monsterId.level
bg.sprite = Util.LoadSprite(GetFormationHeroCardStarBg[heroConfig.Star])
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[heroConfig.Star])
bg.sprite = Util.LoadSprite(GetFormationHeroCardStarBg[monsterId.star])
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[monsterId.star])
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
SetCardStars(starGrid,heroConfig.Star)
if heroConfig.Star > 9 then
SetCardStars(starGrid,monsterId.star)
if monsterId.star > 9 then
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)

View File

@ -1155,13 +1155,13 @@ function this.RefreshActivityBtn(context)
if v.ActiveType > 0 and v.ActiveType == context.type then
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(context.status == 1)
else
activityTabs[k].go.gameObject:SetActive(false)
end
elseif v.FunType > 0 and v.FunType == context.type then
if ActTimeCtrlManager.SingleFuncState(v.FunType) then
activityTabs[k].go.gameObject:SetActive(true)
activityTabs[k].go.gameObject:SetActive(context.status == 1)
else
activityTabs[k].go.gameObject:SetActive(false)
end

View File

@ -268,6 +268,8 @@ function this.GetShowPanelData()
this.hp.text=allAddProVal[HeroProType.Hp]
this.phyDef.text=allAddProVal[HeroProType.PhysicalDefence]
this.magDef.text=allAddProVal[HeroProType.MagicDefence]
breakId = heroBackData.breakId
upStarId = heroBackData.starBreakId
-- this.speed.text= allAddProVal[HeroProType.Speed]
--技能
-- this.selsectSkillImage:SetActive(false)

View File

@ -522,7 +522,7 @@ function this.ResolveBtnClickEvent()
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "isSoulPrintShowSure")
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
if (isPopUp ~= currentTime) then
MsgPanel.ShowTwo(Language[11729], nil, function(isShow)
MsgPanel.ShowTwo("分解的魂印中包含金色或金色以上魂印,确定进行分解?", nil, function(isShow)
if (isShow) then
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .."isSoulPrintShowSure", currentTime)

View File

@ -26,6 +26,7 @@ function RewardBoxPanel:InitComponent()
this.btnBack = Util.GetGameObject(this.gameObject,"bg/btnBack")
this.scroll = Util.GetGameObject(this.gameObject,"bg/scroll")
this.itemPre = Util.GetGameObject(this.gameObject,"bg/scroll/itemPre2")
this.name = Util.GetGameObject(this.gameObject,"bg/bg/name"):GetComponent("Text")
this.tip = Util.GetGameObject(this.gameObject,"bg/topBar/tip")
this.selectBar = Util.GetGameObject(this.gameObject,"bg/topBar/selectBar")
this.selectBtn = Util.GetGameObject(this.gameObject,"bg/di/selectBtn")
@ -117,6 +118,7 @@ end
-- 打开,重新打开时回调
function RewardBoxPanel:OnShow()
this.name.text = itemConfig[this.itemId].Name
itemList={}
curId = nil
tagNum = 1
@ -190,6 +192,10 @@ function RewardBoxPanel:SetTopBar()
this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条
this.di:SetActive(#this.rewardGroup ~= 1)
this.tip:SetActive(BagManager.isBagPanel)
this.di.transform.localPosition = Vector3.New(0, 473, 0)
if #this.rewardGroup ~= 1 and not BagManager.isBagPanel then
this.di.transform.localPosition = Vector3.New(0, 510, 0)
end
end
--设置底部滑动条

View File

@ -53,7 +53,7 @@ end
--绑定事件(用于子类重写)
function StoryDialoguePanel:BindEvent()
Util.AddClick(this.btnNext, function ()
local isEnd = OpConfig[optionID].JumpType == 4
local isEnd = OpConfig[optionID].JumpType == 4
if isEnd and static_callBack then
static_callBack()
static_callBack = nil
@ -126,12 +126,7 @@ function this.RefreshPanel(eventId, isFirstOpen)
this.RoleName.gameObject:SetActive(isRightType)
this.btnNext:SetActive(isRightType)
-- 新手隐藏阶段必须隐藏,其他时候随着面板变化
if GuideManager.IsInMainGuide() then
this.jumpRoot:SetActive(false)
else
this.jumpRoot:SetActive(isRightType)
end
local showValues = GetLanguageStrById(chapterEventPointData[eventId].ShowValues)
local options = chapterEventPointData[eventId].Option
local dir = chapterEventPointData[eventId].ShowDir
@ -140,6 +135,17 @@ function this.RefreshPanel(eventId, isFirstOpen)
local showMask = chapterEventPointData[eventId].Isdark == 1
this.mask:SetActive(showMask)
-- 新手隐藏阶段必须隐藏,其他时候随着面板变化
if GuideManager.IsInMainGuide() then
if options[2] then
this.jumpRoot:SetActive(true)
else
this.jumpRoot:SetActive(false)
end
else
this.jumpRoot:SetActive(isRightType)
end
-- 设置对话背景图
local bgName = chapterEventPointData[eventId].DialogueBg
if not bgName or bgName == "" then
@ -154,7 +160,8 @@ function this.RefreshPanel(eventId, isFirstOpen)
optionID = options[1]
jumpId = chapterEventPointData[eventId].NextOptPanelId
if jumpId and jumpId ~= 0 then
jumpId = chapterEventPointData[jumpId].Option[1]
-- jumpId = chapterEventPointData[jumpId].Option[1]
jumpId = options[2]
else
jumpId = 0
end

View File

@ -37,6 +37,7 @@ function this.EventTrigger(eventId, callBack)
local options = chapterDataConfig[eventId].Option
if showType and showValues and options then
LogError("showtype "..showType.." showvalue "..showValues)
-- 如果是第一次打开,则打开开幕界面
if showType == 11 then -- 对话界面
if callBack then
@ -59,9 +60,9 @@ function this.EventTrigger(eventId, callBack)
}
UIManager.OpenPanel(UIName.GuideBattlePanel, testFightData, function()
StoryManager.EventTrigger(300017, function ()
PatFaceManager.isLogin = true
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
LoadingPanel.End()
-- PatFaceManager.isLogin = true
-- UIManager.OpenPanel(UIName.FightPointPassMainPanel)
-- LoadingPanel.End()
end)
end)
elseif showType == 15 then -- 播放转场特效
@ -107,7 +108,20 @@ function this.StoryJumpType(optionId, panel)
if UIManager.IsOpen(UIName.StoryDialoguePanel) then
UIManager.ClosePanel(UIName.StoryDialoguePanel)
end
elseif jumpType == 5 then
-- 打开主城
PatFaceManager.isLogin = true
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
LoadingPanel.End()
-- 关闭剧情
if panel then
panel:ClosePanel()
end
if UIManager.IsOpen(UIName.StoryDialoguePanel) then
UIManager.ClosePanel(UIName.StoryDialoguePanel)
end
elseif jumpType == 1 then -- 继续对话,往下跳转
local nextEventId = chapterOptionData[optionId].JumpTypeValues
local nextEventShowType = chapterDataConfig[nextEventId].ShowType

View File

@ -33,7 +33,7 @@ function TimeLimitSkin:BindEvent()
}
UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test,function ()
Timer.New(function ()
this:Refresh()
TimeLimitSkin:RefreshData()
end,3):Start()
end)
end)