Merge branch 'china/dev-c' into china/dev
commit
8a4ff04f33
File diff suppressed because it is too large
Load Diff
|
|
@ -561,7 +561,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 9.8, y: 170.9}
|
m_AnchoredPosition: {x: 9.8, y: 163.1}
|
||||||
m_SizeDelta: {x: 134.96, y: 46.09}
|
m_SizeDelta: {x: 134.96, y: 46.09}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4689002940137547210
|
--- !u!222 &4689002940137547210
|
||||||
|
|
@ -689,7 +689,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8941761319558283001}
|
m_Father: {fileID: 8941761319558283001}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
|
@ -761,7 +761,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8941761319558283001}
|
m_Father: {fileID: 8941761319558283001}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
@ -2921,8 +2921,8 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5808250650198748761}
|
|
||||||
- {fileID: 48599094699552339}
|
- {fileID: 48599094699552339}
|
||||||
|
- {fileID: 5808250650198748761}
|
||||||
- {fileID: 7022385492430396558}
|
- {fileID: 7022385492430396558}
|
||||||
- {fileID: 313504663380212267}
|
- {fileID: 313504663380212267}
|
||||||
m_Father: {fileID: 8156779004366035923}
|
m_Father: {fileID: 8156779004366035923}
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &17924168240009186
|
--- !u!224 &17924168240009186
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -28,6 +28,7 @@ function ExChange:InitComponent(gameObject)
|
||||||
exChangeInfoGrid[i] = Util.GetGameObject(gameObject, "downbg1/info/infoTextGrid/infoText ("..i..")")
|
exChangeInfoGrid[i] = Util.GetGameObject(gameObject, "downbg1/info/infoTextGrid/infoText ("..i..")")
|
||||||
end
|
end
|
||||||
this.exChangeGoBtn = Util.GetGameObject(gameObject, "downbg2/goBtn")
|
this.exChangeGoBtn = Util.GetGameObject(gameObject, "downbg2/goBtn")
|
||||||
|
this.goBtnRedpot = Util.GetGameObject(gameObject, "downbg2/goBtn/redpot")
|
||||||
this.click = Util.GetGameObject(gameObject, "leftUpGO/click")
|
this.click = Util.GetGameObject(gameObject, "leftUpGO/click")
|
||||||
|
|
||||||
this.live2dRoot = Util.GetGameObject(gameObject, "bg/live")
|
this.live2dRoot = Util.GetGameObject(gameObject, "bg/live")
|
||||||
|
|
@ -43,6 +44,8 @@ function ExChange:BindEvent()
|
||||||
Util.AddClick(this.click, function()
|
Util.AddClick(this.click, function()
|
||||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfig.Id, heroConfig.Star)
|
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfig.Id, heroConfig.Star)
|
||||||
end)
|
end)
|
||||||
|
-- 前往兑换红点
|
||||||
|
BindRedPointObject(RedPointType.LimitExchange_GoExchange, this.goBtnRedpot)
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
|
@ -159,6 +162,7 @@ end
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function ExChange:OnDestroy()
|
function ExChange:OnDestroy()
|
||||||
itemList = {}
|
itemList = {}
|
||||||
|
ClearRedPointObject(RedPointType.LimitExchange_GoExchange, this.goBtnRedpot)
|
||||||
end
|
end
|
||||||
|
|
||||||
return ExChange
|
return ExChange
|
||||||
|
|
@ -478,7 +478,7 @@ function this.ShowStory(nextId,OnFocus)
|
||||||
StoryMapManager.isShowStory = false
|
StoryMapManager.isShowStory = false
|
||||||
local isShowStory = 1
|
local isShowStory = 1
|
||||||
if PlayerPrefs.HasKey("StoryMapPanel1"..PlayerManager.uid) then
|
if PlayerPrefs.HasKey("StoryMapPanel1"..PlayerManager.uid) then
|
||||||
isShowStory = PlayerPrefs.GetInt("StoryMapPanel"..PlayerManager.uid)
|
isShowStory = PlayerPrefs.GetInt("StoryMapPanel1"..PlayerManager.uid)
|
||||||
end
|
end
|
||||||
if isShowStory == 1 then
|
if isShowStory == 1 then
|
||||||
LogGreen("this.gameObject:"..this.gameObject.name)
|
LogGreen("this.gameObject:"..this.gameObject.name)
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ function this:InitComponent()
|
||||||
|
|
||||||
-- 无尽
|
-- 无尽
|
||||||
this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess")
|
this.btnEndLess = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnEndLess")
|
||||||
this.btnEndLess:SetActive(true)
|
this.btnEndLess:SetActive(false)
|
||||||
|
|
||||||
--鸿蒙
|
--鸿蒙
|
||||||
this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng")
|
this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng")
|
||||||
|
|
|
||||||
|
|
@ -181,18 +181,34 @@ function SupremeHeroPopup:OnOpen(_fun)
|
||||||
fun = _fun
|
fun = _fun
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.ShowStory()
|
||||||
|
local isShowStory = 1
|
||||||
|
if PlayerPrefs.HasKey("StoryMapPanel2"..PlayerManager.uid) then
|
||||||
|
isShowStory = PlayerPrefs.GetInt("StoryMapPanel2"..PlayerManager.uid)
|
||||||
|
end
|
||||||
|
if isShowStory == 1 then
|
||||||
|
Game.GlobalEvent:AddEvent(GameEvent.GuaJi.CloseStoryMapPanel,this.InitShowPanel)
|
||||||
|
PlayerPrefs.SetInt("StoryMapPanel2"..PlayerManager.uid,0)
|
||||||
|
StoryMapManager.InitData(3)
|
||||||
|
else
|
||||||
|
this.InitShowPanel()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function SupremeHeroPopup:OnShow()
|
function SupremeHeroPopup:OnShow()
|
||||||
actIsDone = false
|
actIsDone = false
|
||||||
|
this.ShowStory()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.InitShowPanel()
|
||||||
--初始化静态显示数据
|
--初始化静态显示数据
|
||||||
this.InitShow()
|
this.InitShow()
|
||||||
|
|
||||||
canClose = false
|
canClose = false
|
||||||
this.effectTime = nil
|
this.effectTime = nil
|
||||||
this.effectTime = Timer.New(function ()
|
this.effectTime = Timer.New(function ()
|
||||||
canClose = true
|
canClose = true
|
||||||
end, 1.2)
|
end, 1.2)
|
||||||
this.effectTime:Start()
|
this.effectTime:Start()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.InitShow()
|
function this.InitShow()
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ function TaSuiLingXiao:Refresh()
|
||||||
self.actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao)
|
self.actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao)
|
||||||
CommonActPageManager.TaSuiLingXiaoHistoryDmg = self.actData.value
|
CommonActPageManager.TaSuiLingXiaoHistoryDmg = self.actData.value
|
||||||
self.configData = ConfigManager.GetConfigData(ConfigName.NewHeroConfig,self.actData.activityId)
|
self.configData = ConfigManager.GetConfigData(ConfigName.NewHeroConfig,self.actData.activityId)
|
||||||
-- TaSuiLingXiao:ShowLive()
|
TaSuiLingXiao:ShowLive()
|
||||||
TaSuiLingXiao:SetTime()
|
TaSuiLingXiao:SetTime()
|
||||||
TaSuiLingXiao:ShowSkillList()
|
TaSuiLingXiao:ShowSkillList()
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue