车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
parent
30697705be
commit
8232879006
|
@ -1056,7 +1056,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: -0.000022888184, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 66.8, y: 0}
|
m_SizeDelta: {x: 66.8, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5726459732758174366
|
--- !u!222 &5726459732758174366
|
||||||
|
@ -1593,11 +1593,11 @@ RectTransform:
|
||||||
m_Father: {fileID: 426311262980600154}
|
m_Father: {fileID: 426311262980600154}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 1, y: 0}
|
||||||
m_AnchoredPosition: {x: 69.44, y: 50}
|
m_AnchoredPosition: {x: 0.000000018403833, y: 50}
|
||||||
m_SizeDelta: {x: 941.13, y: 100}
|
m_SizeDelta: {x: 119.2, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0, y: 0.5}
|
||||||
--- !u!114 &4153919401695343612
|
--- !u!114 &4153919401695343612
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1611,11 +1611,11 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 0
|
m_Left: 150
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 80
|
m_Bottom: 80
|
||||||
m_ChildAlignment: 5
|
m_ChildAlignment: 3
|
||||||
m_Spacing: 30
|
m_Spacing: 30
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 0
|
m_ChildForceExpandHeight: 0
|
||||||
|
@ -1630,6 +1630,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 426311262980600154}
|
- component: {fileID: 426311262980600154}
|
||||||
|
- component: {fileID: 1079964709111871156}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: TabBox
|
m_Name: TabBox
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -1659,6 +1660,38 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 50}
|
m_AnchoredPosition: {x: 0, y: 50}
|
||||||
m_SizeDelta: {x: 0, y: 100}
|
m_SizeDelta: {x: 0, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1079964709111871156
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6097502257844573580}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Content: {fileID: 7598740983930717330}
|
||||||
|
m_Horizontal: 1
|
||||||
|
m_Vertical: 0
|
||||||
|
m_MovementType: 1
|
||||||
|
m_Elasticity: 0.1
|
||||||
|
m_Inertia: 1
|
||||||
|
m_DecelerationRate: 0.135
|
||||||
|
m_ScrollSensitivity: 1
|
||||||
|
m_Viewport: {fileID: 0}
|
||||||
|
m_HorizontalScrollbar: {fileID: 0}
|
||||||
|
m_VerticalScrollbar: {fileID: 0}
|
||||||
|
m_HorizontalScrollbarVisibility: 0
|
||||||
|
m_VerticalScrollbarVisibility: 0
|
||||||
|
m_HorizontalScrollbarSpacing: 0
|
||||||
|
m_VerticalScrollbarSpacing: 0
|
||||||
|
m_OnValueChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!1 &6123728693806646651
|
--- !u!1 &6123728693806646651
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -1612,7 +1612,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: 0, y: -594}
|
m_AnchoredPosition: {x: 0, y: -559}
|
||||||
m_SizeDelta: {x: 1080, y: 532}
|
m_SizeDelta: {x: 1080, y: 532}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8766085350830876584
|
--- !u!222 &8766085350830876584
|
||||||
|
|
|
@ -1193,7 +1193,7 @@ FUNCTION_OPEN_TYPE = {
|
||||||
GUILD = 4, -- 公会
|
GUILD = 4, -- 公会
|
||||||
ADVENTURE=7, -- 秘境
|
ADVENTURE=7, -- 秘境
|
||||||
ARENA = 8, -- 竞技场
|
ARENA = 8, -- 竞技场
|
||||||
MISSIONDAILY = 12, -- 每日任务
|
MISSIONDAILY = 12, -- 每日任务
|
||||||
CHAT = 14, -- 聊天
|
CHAT = 14, -- 聊天
|
||||||
NORMALCARBON=17, -- 普通副本
|
NORMALCARBON=17, -- 普通副本
|
||||||
SHOP = 20, -- 商店
|
SHOP = 20, -- 商店
|
||||||
|
|
|
@ -17,7 +17,7 @@ function this.Initialize()
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.HERO_RESOLVE, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.HERO_RESOLVE, mainCity)
|
||||||
-- this.Insert(FUNCTION_OPEN_TYPE.HAND_BOOK, mainCity)
|
-- this.Insert(FUNCTION_OPEN_TYPE.HAND_BOOK, mainCity)
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.ARENA, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.ARENA, mainCity)
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.TRIAL, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.ENDLESS, mainCity)
|
||||||
-- this.Insert(FUNCTION_OPEN_TYPE.GUILD, mainCity)
|
-- this.Insert(FUNCTION_OPEN_TYPE.GUILD, mainCity)
|
||||||
-- this.Insert(FUNCTION_OPEN_TYPE.MONSTER_COMING, mainCity)
|
-- this.Insert(FUNCTION_OPEN_TYPE.MONSTER_COMING, mainCity)
|
||||||
this.Insert(FUNCTION_OPEN_TYPE.COMPOUND, mainCity)
|
this.Insert(FUNCTION_OPEN_TYPE.COMPOUND, mainCity)
|
||||||
|
@ -43,7 +43,7 @@ function this.GetModuleOpen(openId)
|
||||||
local saveValue = PlayerPrefs.GetInt(PlayerManager.uid .. FUNC_OPEN_STR[openId])
|
local saveValue = PlayerPrefs.GetInt(PlayerManager.uid .. FUNC_OPEN_STR[openId])
|
||||||
local funcOpen = ActTimeCtrlManager.IsQualifiled(openId)
|
local funcOpen = ActTimeCtrlManager.IsQualifiled(openId)
|
||||||
isOpen = saveValue == 0 and funcOpen
|
isOpen = saveValue == 0 and funcOpen
|
||||||
--Log(string.format("解锁功能ID %s and 状态 %s", openId, tostring(isOpen)))
|
Log(string.format("解锁功能ID %s and 状态 %s", openId, tostring(isOpen)))
|
||||||
return isOpen
|
return isOpen
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -268,7 +268,7 @@ function this:InitComponent()
|
||||||
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:InsertNewText(this.btnFenjie),
|
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:InsertNewText(this.btnFenjie),
|
||||||
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:InsertNewText(this.btnTujian),
|
--[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:InsertNewText(this.btnTujian),
|
||||||
[FUNCTION_OPEN_TYPE.ARENA] = this:InsertNewText(this.btnJingjichang),
|
[FUNCTION_OPEN_TYPE.ARENA] = this:InsertNewText(this.btnJingjichang),
|
||||||
[FUNCTION_OPEN_TYPE.TRIAL] = this:InsertNewText(this.btnColorfulWorld),
|
[FUNCTION_OPEN_TYPE.ENDLESS] = this:InsertNewText(this.btnColorfulWorld),
|
||||||
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:InsertNewText(this.btnMonster),
|
-- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:InsertNewText(this.btnMonster),
|
||||||
--[FUNCTION_OPEN_TYPE.EXPEDITION] = this:InsertNewText(this.btnExpedition),
|
--[FUNCTION_OPEN_TYPE.EXPEDITION] = this:InsertNewText(this.btnExpedition),
|
||||||
[FUNCTION_OPEN_TYPE.COMPOUND] = this:InsertNewText(this.btnEquipCompound),
|
[FUNCTION_OPEN_TYPE.COMPOUND] = this:InsertNewText(this.btnEquipCompound),
|
||||||
|
@ -680,6 +680,7 @@ function this:BindEvent()
|
||||||
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS)
|
||||||
PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2]))
|
PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2]))
|
||||||
end
|
end
|
||||||
|
this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ENDLESS)
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.btnFenjie, function()
|
Util.AddClick(this.btnFenjie, function()
|
||||||
JumpManager.GoJump(24001)
|
JumpManager.GoJump(24001)
|
||||||
|
|
Loading…
Reference in New Issue