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

dev_chengFeng
jiaoyangna 2021-05-28 18:53:57 +08:00
commit f6d701fc6a
8 changed files with 1055 additions and 992 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

View File

@ -17048,10 +17048,10 @@ RectTransform:
m_Father: {fileID: 8202835805184689050}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -570.755}
m_SizeDelta: {x: 100, y: 1141.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6789327400057080525
MonoBehaviour:
@ -17111,9 +17111,9 @@ RectTransform:
m_Father: {fileID: 8202835805184689050}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5308692693333480346
@ -17592,7 +17592,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -62.4}
m_SizeDelta: {x: 1080, y: 0}
m_SizeDelta: {x: 1080, y: 1141.51}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7098667520991281316
CanvasRenderer:
@ -23148,9 +23148,9 @@ RectTransform:
m_Father: {fileID: 8202835805184689050}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -1141.51}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8222462628204784580
@ -23162,9 +23162,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2173537723978814295}
- component: {fileID: 6148794539733464427}
- component: {fileID: 3529861103285836059}
- component: {fileID: 6752162993577357639}
- component: {fileID: 5012571843066364017}
m_Layer: 5
m_Name: Viewport
m_TagString: Untagged
@ -23192,19 +23191,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &6148794539733464427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8222462628204784580}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!222 &3529861103285836059
CanvasRenderer:
m_ObjectHideFlags: 0
@ -23213,7 +23199,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8222462628204784580}
m_CullTransparentMesh: 0
--- !u!114 &6752162993577357639
--- !u!114 &5012571843066364017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -23222,26 +23208,9 @@ MonoBehaviour:
m_GameObject: {fileID: 8222462628204784580}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8336883590275774861
GameObject:
m_ObjectHideFlags: 0

View File

@ -112,7 +112,6 @@ end
--界面打开时调用(用于子类重写)
function QianKunBoxBuyOnePanel:OnOpen(...)
SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen)
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
local args = { ... }
this.drop=args[1]
this.recruitType = args[2]
@ -128,14 +127,16 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
local itemId=0
local itemNum=0
local d
local upConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType)
local upConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",this.recruitType)
if upConfig then
local wish=ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
if wish then
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.TimelimitCall })
d = RecruitManager.GetExpendDataByCostItem(wish.CostItemSingle)
isLimitUpHero=true
end
else
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
d = RecruitManager.GetExpendData(this.recruitType)
end

View File

@ -30,6 +30,7 @@ function TimeLimitUpHero:InitComponent()
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
self.btnActivity = Util.GetGameObject(self.gameObject,"btngroup/btnActivity")
self.btnActivity:GetComponent("Image").sprite=self.spLoader:LoadSprite("r_shilian-jiangli_zh")
self.btnRewardBtn = Util.GetGameObject(self.gameObject,"btngroup/btnRewardBtn")
self.btnRewardBtn:SetActive(false)
@ -68,6 +69,10 @@ function TimeLimitUpHero:InitComponent()
self.heroNameTxt=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Name/Text"):GetComponent("Text")
self.heroProImg=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
self.starPar=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
self.gailvImg=Util.GetGameObject(self.gameObject,"btn_hero/InfoImg2"):GetComponent("Image")
self.changeImg=Util.GetGameObject(self.gameObject,"btn_hero/InfoImg"):GetComponent("Image")
self.changeImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_icondi_ghwj_zh")
self.gailvImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_gailv")
Util.AddClick(self.btn_hero.gameObject, function()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChooseUpHero,self.actId,curHeroId)
end)

View File

@ -132,17 +132,14 @@ function this:ShowUpItem(config,actId)
-- end)
local rateList={}
local hero={tag="5星神将UP",name=config.ReadingName,value=num,Color=1}
--local aaa=ConfigManager.GetConfigData(ConfigName.WishActivityPool,2)
--LogError("aaa==="..aaa.GetRate)
for key, value in ConfigPairs(pool) do
local id=value.ItemId[1]
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig,id)
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0}
local data={tag=itemConfig.Name,name=value.ItemId[2],value=value.GetRate,Color=0,sort=value.Sort}
table.insert(rateList,data)
end
table.sort(rateList,function(a,b)
return a.value>b.value
return a.sort<b.sort
end)
table.insert(rateList,1,hero)
for n,m in ipairs(rateList) do
@ -165,7 +162,7 @@ function this:ShowUpItem(config,actId)
this.ratePreList[n].rate.color=Color.New(0.66, 0.62,0.54, 1)
end
this.ratePreList[n].name.text=m.name
this.ratePreList[n].rate.text=string.format("%.2f",(m.value/100000)*100).."%"
this.ratePreList[n].rate.text=string.format((m.value/100000)*100).."%"
end
end

View File

@ -505,11 +505,11 @@ function this.SetInfoShow(go,data,rankType,Value0)
end
elseif rankType == RANK_TYPE.TASUILINGXIAO then--踏碎凌霄排行
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
FightLeveStar:SetActive(true)
fight:SetActive(true)
if Value0 then
Value0:GetComponent("Text").text = "<size=40%>"..data.userName.."</size>"
end
Util.GetGameObject(FightLeveStar,"Text"):GetComponent("Text").text = data.rankInfo.param1
Util.GetGameObject(go,"fight"):GetComponent("Text").text = "伤害:"..PrintWanNum2(data.rankInfo.param1)
end
end
end

View File

@ -111,7 +111,7 @@ function TenRecruitPanel:OnOpen(...)
end
end
local d=nil
local config=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",type)
local config=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",type)
if config then
local Setting= ConfigManager.GetConfigData(ConfigName.WishActivitySetting,1)
d=RecruitManager.GetExpendDataByCostItem(Setting.CostItemMul)