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

dev_chengFeng
gaoxin 2021-04-01 15:43:00 +08:00
commit 335d2cb7ec
11 changed files with 9799 additions and 213 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -883,7 +883,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4545051522184859460}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:

View File

@ -45,7 +45,7 @@ local activityType = {
[4303] = {
bg = "Bg2",
hero = {
[1]={name="Bg2/hero1",id=10041,hero="y_yunchouweiwo_shenjiang2"},
[1]={name="Bg2/hero1",id=10041,hero="x_xuanjimiaosuan_shenjiang3"},
[2]={name="Bg2/hero3",id=10024,hero="d_danxinbixue_shenjiang3"},
[3]={name="Bg2/hero2",id=10003,hero="s_suoxiangpimi_shenjiang2"},
},

View File

@ -745,6 +745,7 @@ function ExpeditionMainPanel:HeroResurgence()
local roleDidDatas = {}
local roleHurtDatas = {}
local _roleDatas = HeroManager.GetAllHeroDatas(1)
_roleDatas = ExpeditionManager.GetAllHeroDatas(_roleDatas,1)
for i = 1, #_roleDatas do
local heroHp = 0
if ExpeditionManager.heroInfo[_roleDatas[i].dynamicId] then

View File

@ -33,7 +33,8 @@ end
-- 扫荡按钮
--- btn1点击回调事件
function this.On_Btn1_Click()
this.root.SetOneKeyGo()
-- this.root.SetOneKeyGo()
this.root.SetOneKeyGoExpedition()
--以前的换成的一键上阵
-- if CarbonManager.difficulty == CARBON_TYPE.ENDLESS and MapManager.Mapping then

View File

@ -273,7 +273,10 @@ function this.MissionBoxClick(btn,_singleData)
Util.GetGameObject(btn, "UI_Effect_BaoXiang_KaiQi"):SetActive(true)
Util.GetGameObject(btn, "UI_Effect_BaoXiang_KaiQi"):GetComponent("Animator").enabled = true
Util.GetGameObject(btn, "UI_Effect_BaoXiang_KaiQi/MeiKaiQi"):SetActive(true)
btn:GetComponent("Button").enabled = false
-- btn:GetComponent("Button").enabled = false
for i = 1, #boxList do
boxList[i]:GetComponent("Button").enabled = false
end
this.timer = Timer.New(function()
NetManager.TakeMissionRewardRequest(TaskTypeDef.DayTask,_singleData.missionId,function (msg)
TaskManager.SetTypeTaskState(TaskTypeDef.DayTask, _singleData.missionId, SingleDailyMissionState.GetFinish)
@ -282,7 +285,9 @@ function this.MissionBoxClick(btn,_singleData)
end)
this.timer:Stop()
this.timer = nil
btn:GetComponent("Button").enabled = true
for i = 1, #boxList do
boxList[i]:GetComponent("Button").enabled = true
end
end, 1, 1, true)
this.timer:Start()
end

View File

@ -116,8 +116,8 @@ function this.InitRedPointAllRelate()
--24暂时关闭放开这里就行
-- RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge)
RPData:SetParent(RedPointType.VIP_SHOP_DETAIL, RedPointType.Shop_Page_Recharge)
RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge)
RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包
-- RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge)
-- RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包
-- 主界面商店
RPData:SetParent(RedPointType.Shop_Page_General, RedPointType.Shop)
RPData:SetParent(RedPointType.Shop_Page_Coin, RedPointType.Shop)
@ -183,12 +183,12 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Recruit_Red, RedPointType.Recruit)
--普通召唤红点
RPData:SetParent(RedPointType.Recruit_Normal, RedPointType.Recruit)
--运营红点
RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating)
RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating)
RPData:SetParent(RedPointType.WeekGiftPage, RedPointType.Operating)
RPData:SetParent(RedPointType.MonthGiftPage, RedPointType.Operating)
--RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
-- --运营红点
-- RPData:SetParent(RedPointType.GrowthGift, RedPointType.Operating)
-- RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating)
-- RPData:SetParent(RedPointType.WeekGiftPage, RedPointType.Operating)
-- RPData:SetParent(RedPointType.MonthGiftPage, RedPointType.Operating)
-- --RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
--主题活动
RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity)
@ -287,6 +287,12 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.NiuQiChongTian_4,RedPointType.NiuQiChongTian)
RPData:SetParent(RedPointType.LimitExchange_GoExchange,RedPointType.Expert_LimitExchange)
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
if v.RpType > 0 and v.RpTypeParent > 0 then
RPData:SetParent(v.RpType,v.RpTypeParent)
end
end
end
-- 注册红点检测方法

View File

@ -42,6 +42,7 @@ function PokemonSummonPanel:InitComponent(gameObject)
self.changZhuEffect = Util.GetGameObject(self.transform,"effect/Effect_Dan_changzhu")
self.Effect_Dan_posui = Util.GetGameObject(self.transform,"effect/Effect_Dan_posui")
self.mask = Util.GetGameObject(self.transform,"mask")
self.btnEffect = Util.GetGameObject(self.btn_activate, "UI_Effect_MianBan_GuaJi_Ani")
end
function PokemonSummonPanel:BindEvent()
@ -292,6 +293,7 @@ local orginLayer = 0
function PokemonSummonPanel:OnSortingOrderChange()
Util.AddParticleSortLayer(self.changZhuEffect, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(self.Effect_Dan_posui, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(self.btnEffect, self.sortingOrder - orginLayer)
orginLayer = self.sortingOrder
end

View File

@ -154,12 +154,15 @@ function this.ShowBattleResultByExpedition()
end,0.3):Start()
PopupTipPanel.ShowTip( Language[11455])
else
MsgPanel.ShowTwo(Language[11456], function()
Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面
end, function()
NetManager.EndConfirmExpeditionBattleRequest(GetCurNodeInfo.sortId, function (msg)
Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面
end)
end,Language[10731],Language[11457])
Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面
-- Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面
end
end
end