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

dev_chengFeng
gaoxin 2021-09-27 17:15:42 +08:00
commit f929826eba
5 changed files with 98 additions and 40 deletions

View File

@ -764,6 +764,7 @@ RectTransform:
- {fileID: 9169902103495551306}
- {fileID: 4869340032853470271}
- {fileID: 4096853268367997150}
- {fileID: 6474655450653005156}
m_Father: {fileID: 1662743993144903840}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4949,6 +4950,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7160478407521422271
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6474655450653005156}
- component: {fileID: 1834093620742243404}
- component: {fileID: 3510528440869017411}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6474655450653005156
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7160478407521422271}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1662670759670463908}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0, y: -619.6}
m_SizeDelta: {x: 384.31, y: 64.41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1834093620742243404
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7160478407521422271}
m_CullTransparentMesh: 0
--- !u!114 &3510528440869017411
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7160478407521422271}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.052750587, g: 0.9339623, b: 0.030838395, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u56DB\u79CD\u5FC3\u6CD5\u5168\u90E8\u8FDB\u9636\u81F3\u76F8\u540C\u9636\u6570\u65F6\u6FC0\u6D3B\u5FC3\u6CD5\u5171\u9E23"
LanguageIndex: 0
--- !u!1 &7200124988758997953
GameObject:
m_ObjectHideFlags: 0

View File

@ -41,6 +41,7 @@ function HongMengUnLoadPanel:BindEvent()
HarmonyManager:RemoveGongMingList(select)
self:ClosePanel()
HarmonyManager.WarPowerChangeNotify(select)
HeroPropManager.SetHeroDirty(self.heroDid)
end)
end)
Util.AddClick(this.BtnNo, function()
@ -64,6 +65,7 @@ function HongMengUnLoadPanel:OnOpen(equipSId)
--LogGreen("打开面板")
local data = HarmonyManager:GetUnLoadData()
self.heroDid = data
local temp_hero = HeroManager.GetSingleHeroData(data)
dataAdditon = HarmonyManager:GetAdditions()

View File

@ -781,7 +781,16 @@ local jumpDic = {
UIManager.ClosePanel(UIName.GeneralRankRewardPanel)
end
QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.QIJIESHILIAN,3,function ()
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
NetManager.SevenWorldInfoRequest(0,function (msg)
QiJieShiLianManager.IsLock = false
if qiejieConfig[msg.id] then
UIManager.OpenPanel(UIName.QiJieShiLianPanel)
else
LogError("七界试炼不存在该ID"..tostring(msg.id))
PopupTipPanel.ShowTip("无法进入,请联系客服!")
end
end)
end)
end,
[JumpType.linglongBaojing] = function(data)

View File

@ -43,8 +43,6 @@ function RoleChooseListPanel:InitComponent()
--this:InitData()
end
--绑定事件(用于子类重写)
function RoleChooseListPanel:BindEvent()
@ -54,16 +52,12 @@ function RoleChooseListPanel:BindEvent()
end)
Util.AddClick(this.btnYes, function()
if TempData ==nil then
-- body
PopupTipPanel.ShowTip(Language[12218])
return
end
HarmonyManager:SetChooseId(TempData.dynamicId)
HarmonyManager.SetOldPowerNum(TempData.dynamicId)
if self.flag then --判断是否是鸿蒙使者 如果是 那就不懈装备
-- body
local data = {}
data.gridId = HarmonyManager.GongMingBox
data.heroId = TempData.dynamicId
@ -73,9 +67,9 @@ function RoleChooseListPanel:BindEvent()
Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.UpHongMengEnvoy,data)
--UIManager.OpenPanel(UIName.GongMingResultPanel,self.flag)
HarmonyManager.WarPowerChangeNotify(TempData.dynamicId)
HeroPropManager.SetHeroDirty(TempData.dynamicId)
end)
else
HarmonyManager:SetGongMingList(TempData.dynamicId)
if HarmonyManager.equipCount == 24 then
--LogGreen("脱装备")
@ -85,26 +79,16 @@ function RoleChooseListPanel:BindEvent()
end
end
NetManager.SendGongMingBox(TempData.dynamicId,HarmonyManager.GongMingBox,1,function (msg)
-- body
Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.ChooseData,TempData)
UIManager.OpenPanel(UIName.GongMingResultPanel,self.flag)
HarmonyManager.WarPowerChangeNotify(TempData.dynamicId)
HeroPropManager.SetHeroDirty(TempData.dynamicId)
end)
end
self:ClosePanel()
--
end)
Util.AddClick(this.btnAutoSelect, function()
end)
end
--添加事件监听(用于子类重写)
function RoleChooseListPanel:AddListener()
@ -124,10 +108,7 @@ function RoleChooseListPanel:OnOpen(flag)
TempData = nil
--SelectHero = nil
local list = HarmonyManager.ChooseDataList
if #list > 0 then
-- body
this.Empty:SetActive(false)
table.sort(list, function(a, b)
if a.star == b.star then
@ -152,19 +133,14 @@ function RoleChooseListPanel:OnOpen(flag)
end
self.ScrollView.gameObject:SetActive(true)
self.ScrollView:SetData(list,function (index, go)
this.OnShowSingleCardData(go, list[index],index)--
end)
else
list={}
self.ScrollView.gameObject:SetActive(false)
this.Empty:SetActive(true)
end
end
function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没选择
@ -173,8 +149,6 @@ function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没
-- body
choosed:SetActive(false)
end
if curSelectHeroList[heroData.dynamicId] then
curSelectHeroList[heroData.dynamicId]=heroData
choosed:SetActive(true)
@ -198,15 +172,8 @@ function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没
local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask")
GongMingMask:SetActive(false)--最后检测是否共鸣
Util.AddOnceClick(cardBtn, function()
if SelectHero then
--if SelectHero.activeSelf then
-- body
SelectHero:SetActive(false)
--end
--SelectHero = nil
end
TempData = heroData
SelectHero = choosed
@ -232,13 +199,11 @@ end
function RoleChooseListPanel:OnClose()
--destroy(SelectHero)
SelectHero = nil
end
--界面销毁时调用(用于子类重写)
function RoleChooseListPanel:OnDestroy()
this.spLoader:Destroy()
this.ScrollView = nil
end

View File

@ -600,6 +600,7 @@ function this.ShowHeroEquip()
end
local allAddProVal
--计算面板属性
local WarPower = 0
if isUpZhen then
WarPower = HeroPowerManager.GetHeroPower(curHeroData.dynamicId, FormationTypeDef.FORMATION_NORMAL)
else