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

dev_chengFeng
lihaiyang 2022-01-13 13:36:50 +08:00
commit be545631ad
8 changed files with 267 additions and 59 deletions

View File

@ -1893,32 +1893,32 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 0, y: -182, z: 0}
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: -1.58, y: -16, z: 0}
changeV3: {x: 0.95, y: 0.95, z: 0.95}
changeFloat: 0
duration: 0.8
duration: 0.2
delay: 0
curveType: 10
changeType: 0
sequeueType: 1
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 1749343158}
- initV3: {x: 0, y: 0, z: 0}
targetObj: {fileID: 0}
- initV3: {x: 0.95, y: 0.95, z: 0.95}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 1
duration: 1
isInit: 0
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.1
delay: 0
curveType: 7
changeType: 8
sequeueType: 1
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 1749343158}
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
@ -17872,7 +17872,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: 0}
m_AnchoredPosition: {x: 0.000000060634875, y: 0}
m_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0, y: 1}
--- !u!114 &9124142079699260777

View File

@ -2351,6 +2351,7 @@ GameObject:
m_Component:
- component: {fileID: 3401751871378385210}
- component: {fileID: 2077485594265078656}
- component: {fileID: 6746445292052274791}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@ -2390,6 +2391,48 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5769642898174042025}
m_CullTransparentMesh: 0
--- !u!114 &6746445292052274791
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5769642898174042025}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: 0.95, y: 0.95, z: 0.95}
changeFloat: 0
duration: 0.2
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
- initV3: {x: 0.95, y: 0.95, z: 0.95}
initFloat: 0
isInit: 0
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.1
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &6612251421837391838
GameObject:
m_ObjectHideFlags: 0

View File

@ -567,6 +567,7 @@ GameObject:
- component: {fileID: 8510080390074448186}
- component: {fileID: 576436720797261142}
- component: {fileID: 3454768900339695438}
- component: {fileID: 8394798130360974924}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -636,6 +637,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8394798130360974924
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1666056707232141115}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: 0.95, y: 0.95, z: 0.95}
changeFloat: 0
duration: 0.2
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
- initV3: {x: 0.95, y: 0.95, z: 0.95}
initFloat: 0
isInit: 0
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.1
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &2023465797228292676
GameObject:
m_ObjectHideFlags: 0
@ -1002,6 +1045,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1493789284434423553}
- component: {fileID: 8345976921329614603}
m_Layer: 5
m_Name: scroll
m_TagString: Untagged
@ -1029,6 +1073,48 @@ RectTransform:
m_AnchoredPosition: {x: -2.3, y: -46.175}
m_SizeDelta: {x: 858.4, y: 1028.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8345976921329614603
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3205216122775585289}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: 0.95, y: 0.95, z: 0.95}
changeFloat: 0
duration: 0.2
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
- initV3: {x: 0.95, y: 0.95, z: 0.95}
initFloat: 0
isInit: 0
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.1
delay: 0
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &3744597273517501067
GameObject:
m_ObjectHideFlags: 0

View File

@ -2929,6 +2929,7 @@ GameObject:
- component: {fileID: 5833685402853382538}
- component: {fileID: 2383357295960407526}
- component: {fileID: 656759131260248062}
- component: {fileID: 8048889876096211871}
m_Layer: 5
m_Name: bg
m_TagString: Untagged
@ -2996,6 +2997,35 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8048889876096211871
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3599375895462686603}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 0, y: -300, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.8
delay: 0
curveType: 10
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &3770032720140774719
GameObject:
m_ObjectHideFlags: 0

View File

@ -5024,7 +5024,7 @@ ParticleSystem:
--- !u!199 &5040103470708412571
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -11204,7 +11204,7 @@ ParticleSystem:
--- !u!199 &7022009138468795937
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15916,7 +15916,7 @@ ParticleSystem:
--- !u!199 &21284196286945555
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21231,7 +21231,7 @@ ParticleSystem:
--- !u!199 &7662304376647596786
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -27835,7 +27835,7 @@ ParticleSystem:
--- !u!199 &6866467361509154070
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33072,7 +33072,7 @@ ParticleSystem:
--- !u!199 &1327544058612887100
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -33368,6 +33368,7 @@ GameObject:
m_Component:
- component: {fileID: 182146550924450489}
- component: {fileID: 4418650615390458020}
- component: {fileID: 6200012128066425501}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@ -33411,6 +33412,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4532427157487531891}
m_CullTransparentMesh: 0
--- !u!114 &6200012128066425501
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4532427157487531891}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 0, y: -300, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.8
delay: 0
curveType: 10
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1
--- !u!1 &4579790377340978839
GameObject:
m_ObjectHideFlags: 0
@ -38871,7 +38901,7 @@ ParticleSystem:
--- !u!199 &5724314893189987714
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -43667,7 +43697,7 @@ ParticleSystem:
--- !u!199 &6600377722598462734
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -48524,7 +48554,7 @@ ParticleSystem:
--- !u!199 &4723643438741483705
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -54001,7 +54031,7 @@ ParticleSystem:
--- !u!199 &1522648081567467163
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -59378,7 +59408,7 @@ ParticleSystem:
--- !u!199 &557479208284238603
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -64346,7 +64376,7 @@ ParticleSystem:
--- !u!199 &2718336770233971512
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -69319,7 +69349,7 @@ ParticleSystem:
--- !u!199 &4783855359569395394
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -74327,7 +74357,7 @@ ParticleSystem:
--- !u!199 &1454716228256041344
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -78958,7 +78988,7 @@ ParticleSystem:
--- !u!199 &1406671002734066039
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -3283,32 +3283,32 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 0, y: -300, z: 0}
- initV3: {x: 1.3, y: 1.3, z: 1.3}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeV3: {x: 0.95, y: 0.95, z: 0.95}
changeFloat: 0
duration: 0.8
duration: 0.2
delay: 0
curveType: 10
changeType: 0
sequeueType: 1
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 2678681961408120951}
- initV3: {x: 0, y: 0, z: 0}
targetObj: {fileID: 0}
- initV3: {x: 0.95, y: 0.95, z: 0.95}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 1
duration: 1
isInit: 0
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.1
delay: 0
curveType: 7
changeType: 8
sequeueType: 1
curveType: 1
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 2678681961408120951}
targetObj: {fileID: 0}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 1

View File

@ -126,7 +126,9 @@ function DailyCarbonPanel:OnShow()
if carbonIndex==0 then carbonIndex=1 end
this.TabCtrl:SetTabAdapter(this.TabAdapter)
this.TabCtrl:SetTabIsLockCheck(this.TabIsLockCheck)
this.TabCtrl:SetChangeTabCallBack(this.RefreshShow,true,true)
this.TabCtrl:SetChangeTabCallBack(function(index)
this.RefreshShow(index, true,true)
end)
this.TabCtrl:Init(this.tabBox, _TabData,carbonIndex)
-- 音效
SoundManager.PlayMusic(SoundConfig.BGM_Carbon)

View File

@ -77,7 +77,7 @@ end
--添加事件监听(用于子类重写)
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Explore.UpdateFormation,this.OnShow)
Game.GlobalEvent:AddEvent(GameEvent.Explore.UpdateFormation,this.Init)
end
--移除事件监听(用于子类重写)
@ -100,10 +100,11 @@ function this:OnOpen(_parent,...)
this.mapTimeTipLayer.overrideSorting = true
this.mapTimeTipLayer.sortingOrder = sortingOrder + 1
this.mask.sortingOrder = sortingOrder + 1
this:Init()
end
--界面打开时调用(用于子类重写)
function this:OnShow()
function this:Init()
this.icon.sprite = this.spLoader:LoadSprite(GetSpriteNameByItemId(Explore[1].Cost[1]))
--队伍
for i = 1,math.max(#this.itemList,#this.data) do
@ -191,6 +192,10 @@ function this:OnShow()
this:TimeCountDown()
end
function this:OnShow()
this.RefreshFormations()
end
function this.RefreshMapNameColor()
--红 fe5757 黄 f3e168 绿 58f567
for k,v in pairs(this.mapDatas) do
@ -204,7 +209,7 @@ function this.RefreshMapNameColor()
end
end
function this.SetMapName(id)
function this.SetMapName(id)
local forId = id or this.formationId
if FormationManager.GetFormationPower(forId)/Explore[this.formationList[forId].mapId].Force < 0.8 then
this.itemList[this.formationList[forId].index].targgetBtnText.text = string.format("<color=#%s>%s</color>","fe5757", Explore[this.formationList[forId].mapId].Name)
@ -273,11 +278,14 @@ function this.SetPos(gobj,pos,formationId)
end
end
function this:Refresh(_data,_item,index)
_item.data = _data
_item.go.gameObject:SetActive(true)
_item.formation.gameObject:SetActive(true)
_item.name.text = string.format("队伍%s",_data.index)
function this.RefreshFormations()
--队伍
for i = 1,#this.itemList do
this.RefreshFormation(this.itemList[i],this.itemList[i].data)
end
end
function this.RefreshFormation(_item,_data)
for j, demon in ipairs(_item.heroList) do
_item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(1))
_item.heroList[j].hero:SetActive(false)
@ -322,7 +330,15 @@ function this:Refresh(_data,_item,index)
_item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
_item.heroList[pos].heroData = heroData
end
this.SetMapName(_data.formationId)
end
function this:Refresh(_data,_item,index)
_item.data = _data
_item.go.gameObject:SetActive(true)
_item.formation.gameObject:SetActive(true)
_item.name.text = string.format("队伍%s",_data.index)
local formation = FormationManager.GetFormationByID(_data.formationId)
this.formationList[_data.formationId] = {} --formationId 为索引 预设index,mapId,exploreTime,formationId
this.formationList[_data.formationId].index = index
this.formationList[_data.formationId].formationId = _data.formationId
@ -347,7 +363,7 @@ function this:Refresh(_data,_item,index)
this.formationList[_data.formationId].exploreTime = this.mapDatas[1].exploreTime
_item.targgetTimeBtn.gameObject:SetActive(false)
end
this.SetMapName(_data.formationId)
this.RefreshFormation(_item,_data)
this.SetExploreTime(_data.formationId)
_item.selectIma.gameObject:SetActive(this.formationList[_data.formationId].select == 1)
Util.AddOnceClick(_item.select,function()
@ -418,7 +434,7 @@ function this:OnClose()
end
this.SetPos(this.mapTip,nil,this.formationId)
this.SetPos(this.mapTimeTip,nil,this.formationId)
Game.GlobalEvent:RemoveEvent(GameEvent.Explore.UpdateFormation,this.OnShow)
Game.GlobalEvent:RemoveEvent(GameEvent.Explore.UpdateFormation,this.Init)
end
--界面销毁时调用(用于子类重写)
@ -427,6 +443,7 @@ function this:OnDestroy()
this.itemList = {}
this.mapTipPreList = {}
this.mapTimeTipPreList = {}
this.formationList = {}
end
return this