【神将来袭】基本完事儿

dev_chengFeng
ZhangBiao 2020-12-03 18:36:01 +08:00
parent b2e53f8ae5
commit b3e374e336
7 changed files with 43925 additions and 21773 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1956,7 +1956,7 @@ RectTransform:
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: -237.05199, y: -0.000030517578}
m_AnchoredPosition: {x: -292.21924, y: -0.000030517578}
m_SizeDelta: {x: 0, y: 178.2}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1008845928870155705
@ -2799,7 +2799,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -421}
m_SizeDelta: {x: 700, y: 178.2}
m_SizeDelta: {x: 800, y: 178.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3544800768705243807
MonoBehaviour:

View File

@ -471,6 +471,7 @@ PanelType = {
Celebration = {14,16,50003},--社稷大典
YiJingBaoKu = {14,16,1004},--易经宝库
LingShouBaoGe = {14,16,1204},--灵兽宝阁
XinJiangLaiXi = {14,16,1210},--新将来袭
}

View File

@ -53,9 +53,13 @@ function this:InitComponent()
for i = 1, 5 do
boxList[i] = Util.GetGameObject(this.dmg2, "box"..i)
boxList[i]:SetActive(false)
local effect = Util.GetGameObject(boxList[i], "effect")
effect:SetActive(false)
end
boxList[1]:SetActive(true)
this.dmg2Progress = Util.GetGameObject(this.dmg2, "progress/Fill"):GetComponent("Image")
this.dmg2Text = Util.GetGameObject(this.dmg2, "progress/Text"):GetComponent("Text")
this.bar = Util.GetGameObject(this.dmg2, "bar")
end
--绑定事件(用于子类重写)
@ -281,6 +285,7 @@ function this.InitPanelData()
end)
end
elseif fightType == BATTLE_TYPE.XINJIANG then
boxList[1]:SetActive(true)
this.myDamage = 0
this.myDamageLevel = 0
this.dmg2Text.text = "0%"
@ -397,7 +402,14 @@ function this.BattleEnd(result)
elseif fightType == BATTLE_TYPE.XINJIANG then--新将来袭
Timer.New(function ()
this:ClosePanel()
for i = 1, #boxList do
boxList[i].transform:SetParent(this.dmg2.transform)
boxList[i].transform:DOLocalMove(Vector3.New(414,16,0), 0)
boxList[i]:SetActive(false)
Util.GetGameObject(boxList[i], "effect"):SetActive(false)
end
end,1.3):Start()
else
-- 判断是否需要进行结果检测
if this.fightResult then
@ -585,6 +597,7 @@ function this.RefreshMyDamageShow(data)
elseif fightType == BATTLE_TYPE.XINJIANG and data then
local myDamage = this.myDamage-- *10
local curLevel = 0
local boxs={}
local newHeroConfig = ConfigManager.GetConfig(ConfigName.NewHeroConfig)
local bossData = data
@ -600,12 +613,21 @@ function this.RefreshMyDamageShow(data)
local ex = boxs[i-1] and boxs[i-1][1] or 0
if (boxs[i][1]/boxs[#boxs][1])*100 > curPercent and (ex/boxs[#boxs][1])*100 < curPercent then
num = (curPercent*100-ex)/(boxs[i][1]-ex)
curLevel = i
break
end
end
this.dmg2Progress.fillAmount = num
for i = 1, #boxs do
if curPercent >= (boxs[i][1]/boxs[#boxs][1])*100 then
boxList[i+1]:SetActive(true)
boxList[i].transform:SetParent(this.bar.transform)
boxList[i].transform:DOLocalMove(Vector3.New(0,-329+(i-1)*118,0), 1.5)
Util.GetGameObject(boxList[i], "effect"):SetActive(true)
end
end
end
end

View File

@ -194,7 +194,7 @@ function DynamicActivityPanel:InitComponent()
this.content = Util.GetGameObject(self.gameObject, "bg/pageContent")
this.PageList = {}
for i=1,#curActivityCount do
this.PageList[i] = curActivityCount[i].new(self, Util.GetGameObject(self.transform, "bg/pageContent/page"..i))
this.PageList[i] = curActivityCount[i].new(self, Util.GetGameObject(self.transform, "bg/pageContent/page"..i),this.UpView)
end
-- 上部货币显示

View File

@ -104,6 +104,7 @@ function XinJiangLaiXi:BindEvent()
this.btnBack:SetActive(true)
this.tabList:SetActive(true)
this.bottomBar:SetActive(true)
parent.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
end)
end
@ -191,6 +192,7 @@ function XinJiangLaiXi:StoreShow()
this.shopView = SubUIManager.Open(SubUIConfig.ShopView, this.content.transform)
end
this.shopView:ShowShop(SHOP_TYPE.XINJIANG_SHOP,sortingOrder)
parent.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.XinJiangLaiXi })
end
function XinJiangLaiXi:OnClose()

View File

@ -51,7 +51,7 @@ local this = GMPanel
-- "4#10003#5", "4#10006#5", "4#10008#5", "4#10009#5", "4#10013#5", "4#10014#5",
-- "4#10003#4", "4#10006#4", "4#10008#4", "4#10009#4", "4#10013#4", "4#10014#4"}
local heroList = {
"4#10023#10", "4#10022#10", "4#10034#10", "4#10002#10", "4#10014#10","4#10002#10","4#10003#10"
"4#10033#11", "4#10026#11", "4#10008#11", "4#10012#11", "4#10015#11","4#10014#11","4#10033#10","4#10026#10","4#10008#10","4#10012#10","4#10015#10","4#10014#10"
}
local moneyList = {"1#3#999999999", "1#4#999999999", "1#5#999999999", "1#14#999999999", "1#15#999999999", "1#16#999999999"}
--初始化组件(用于子类重写)