fatiao/ro-webgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UIMain：在主界面添加角色快捷入口

Browse Source
This commit is contained in:
fatiao 2026-01-20 10:53:39 +08:00
parent 7555588763
commit 7d8cfcd7d1
11 changed files with 2989 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/AddressableAssetsData/AssetGroups/IconDir.asset
View File

@ -292,6 +292,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6119ecd54bad4c340b476f9670cc39a8
m_Address: Assets/Content/Icons/LiveRoomQuestion
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: 8b54c61ef06dca34e89fcf16d0b8c4b3, type: 2}
m_SchemaSet:

BIN
Assets/Content/Icons/FrameNew/img_head_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

153
Assets/Content/Icons/FrameNew/img_head_bg.png.meta Normal file
View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: dcab52b063c99014499f599fcdfbd9b1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Content/Icons/FrameNew/img_head_mask.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

153
Assets/Content/Icons/FrameNew/img_head_mask.png.meta Normal file
View File

@ -0,0 +1,153 @@
fileFormatVersion: 2
guid: f233df8ad97099c46b3dcaa523e7afc9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

2170
Assets/Content/Prefabs/UI/UIMain/UIMain.prefab
View File

File diff suppressed because it is too large Load Diff

48
Assets/Lua/UI/UIMain/UIMainView.lua
View File

@ -319,6 +319,7 @@ function UIMainView:OnDanmuInputNtf(uiName, danmuStr)
end
function UIMainView:OnRedPointMgrNotice(rpType, result, param)
self:RefreshSystemPad()
end
-- TODO: 快速到达UI
@ -465,6 +466,7 @@ function UIMainView:OnUIReturnHome(result)
if result then
self:CheckPlayStoryAndForceGuide()
end
self:RefreshSystemPad()
end
function UIMainView:RefreshSystemPad()
@ -490,6 +492,52 @@ function UIMainView:RefreshSystemPad()
else
self.systemPad.momoTip:SetActive(false)
end
for i=1, 4 do
self.systemPad.fastOpenUI["role"..i]:SetActive(false)
end
local teams = ManagerContainer.DataMgr.UserData:GetTeamData(true)
for i=1, #teams do
local roleData = teams[i]
self.systemPad.fastOpenUI["role"..i]:SetActive(true)
CommonUtil.LoadIcon(self, "HeroDraw/Role_"..roleData.uid, function(sprite)
self.systemPad.fastOpenUI["role"..i].head.image.sprite = sprite
end)
self.uiBase:AddButtonUniqueEventListener(self.systemPad.fastOpenUI["role"..i].button, self, function()
ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRoleInfo, i)
end)
local rpState = Enum.RedPointEnum.None
if roleData.uid == 1 then
rpState = ManagerContainer.RedPointMgr.HeroRPCtr:GetHeroRPStatus()
else
rpState = ManagerContainer.RedPointMgr.HeroRPCtr:GetPartnerRPStatus(roleData.uid)
end
if rpState ~= Enum.RedPointEnum.None then
local redPointParent = self.systemPad.fastOpenUI["role"..i].redPoint.transform
redPointParent.gameObject:SetActive(true)
if redPointParent then
if redPointParent.childCount == 0 then
self:CreateNormalRedPoint(redPointParent)
end
end
else
self.systemPad.fastOpenUI["role"..i].redPoint:SetActive(false)
end
end
end
function UIMainView:CreateNormalRedPoint(parent)
AW.async(function()
local UIRedPointRP = "UIRedPointRP"
local redPoint = AW.await(ManagerContainer.ResMgr:LuaGetGoFromPoolAsync(Constants.UICommonPath, UIRedPointRP))
if redPoint then
redPoint.transform:SetParent(parent)
redPoint.transform.localPosition = Vector3.zero
redPoint.transform.localRotation = Quaternion.identity
redPoint.transform.localScale = Vector3.one
redPoint:SetActive(true)
end
end)
end
function UIMainView:CheckPlayStoryAndForceGuide()

268
Assets/Lua/UI/UIMain/UIMainView_Generate.lua
View File

@ -10,6 +10,50 @@
---@field public gameObject UnityEngine.GameObject
---@field public rectTransform UnityEngine.RectTransform
---@class UIMain__Generate_systemPad_fastOpenUI_role4_head
---@field public gameObject UnityEngine.GameObject
---@field public image UnityEngine.UI.Image
---@field public button UnityEngine.UI.Button
---@class UIMain__Generate_systemPad_fastOpenUI_role4
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@field public head UIMain__Generate_systemPad_fastOpenUI_role4_head
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_systemPad_fastOpenUI_role3_head
---@field public gameObject UnityEngine.GameObject
---@field public image UnityEngine.UI.Image
---@field public button UnityEngine.UI.Button
---@class UIMain__Generate_systemPad_fastOpenUI_role3
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@field public head UIMain__Generate_systemPad_fastOpenUI_role3_head
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_systemPad_fastOpenUI_role2_head
---@field public gameObject UnityEngine.GameObject
---@field public image UnityEngine.UI.Image
---@field public button UnityEngine.UI.Button
---@class UIMain__Generate_systemPad_fastOpenUI_role2
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@field public head UIMain__Generate_systemPad_fastOpenUI_role2_head
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_systemPad_fastOpenUI_role1_head
---@field public gameObject UnityEngine.GameObject
---@field public image UnityEngine.UI.Image
---@field public button UnityEngine.UI.Button
---@class UIMain__Generate_systemPad_fastOpenUI_role1
---@field public gameObject UnityEngine.GameObject
---@field public button UnityEngine.UI.Button
---@field public head UIMain__Generate_systemPad_fastOpenUI_role1_head
---@field public redPoint UnityEngine.GameObject
---@class UIMain__Generate_systemPad_fastOpenUI_roleLevelUp3_txt
---@field public gameObject UnityEngine.GameObject
---@field public text TMPro.TextMeshProUGUI
@ -61,6 +105,10 @@
---@field public roleLevelUp UIMain__Generate_systemPad_fastOpenUI_roleLevelUp
---@field public roleLevelUp2 UIMain__Generate_systemPad_fastOpenUI_roleLevelUp2
---@field public roleLevelUp3 UIMain__Generate_systemPad_fastOpenUI_roleLevelUp3
---@field public role1 UIMain__Generate_systemPad_fastOpenUI_role1
---@field public role2 UIMain__Generate_systemPad_fastOpenUI_role2
---@field public role3 UIMain__Generate_systemPad_fastOpenUI_role3
---@field public role4 UIMain__Generate_systemPad_fastOpenUI_role4
---@class UIMain__Generate_feiGeBtn_icon
---@field public gameObject UnityEngine.GameObject
@ -772,6 +820,18 @@ function UIMainView:InitGenerate(Root, data)
self:InitGenerate__142(Root,data)
self:InitGenerate__143(Root,data)
self:InitGenerate__144(Root,data)
self:InitGenerate__145(Root,data)
self:InitGenerate__146(Root,data)
self:InitGenerate__147(Root,data)
self:InitGenerate__148(Root,data)
self:InitGenerate__149(Root,data)
self:InitGenerate__150(Root,data)
self:InitGenerate__151(Root,data)
self:InitGenerate__152(Root,data)
self:InitGenerate__153(Root,data)
self:InitGenerate__154(Root,data)
self:InitGenerate__155(Root,data)
self:InitGenerate__156(Root,data)
end
@ -2727,6 +2787,174 @@ end
---@private
function UIMainView:InitGenerate__142(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role1
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role1").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role1 = tmp
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__143(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role1/HeadMask/Head
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role1/HeadMask/Head").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role1.head = tmp
tmp.image = tmp:GetComponent(Enum.TypeInfo.Image)
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__144(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role1/RedPoint
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role1/RedPoint").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role1.redPoint = tmp
end
---@private
function UIMainView:InitGenerate__145(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role2
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role2").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role2 = tmp
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__146(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role2/HeadMask/Head
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role2/HeadMask/Head").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role2.head = tmp
tmp.image = tmp:GetComponent(Enum.TypeInfo.Image)
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__147(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role2/RedPoint
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role2/RedPoint").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role2.redPoint = tmp
end
---@private
function UIMainView:InitGenerate__148(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role3
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role3").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role3 = tmp
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__149(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role3/HeadMask/Head
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role3/HeadMask/Head").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role3.head = tmp
tmp.image = tmp:GetComponent(Enum.TypeInfo.Image)
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__150(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role3/RedPoint
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role3/RedPoint").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role3.redPoint = tmp
end
---@private
function UIMainView:InitGenerate__151(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role4
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role4").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role4 = tmp
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__152(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role4/HeadMask/Head
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role4/HeadMask/Head").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role4.head = tmp
tmp.image = tmp:GetComponent(Enum.TypeInfo.Image)
tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
end
---@private
function UIMainView:InitGenerate__153(Root, data)
--[[
BottomView/MainRoot/SystemPad/FastOpenUI/Role4/RedPoint
--]]
local tmp = Root:Find("BottomView/MainRoot/SystemPad/FastOpenUI/Role4/RedPoint").gameObject
if tolua.getpeer(tmp) == nil then
tolua.setpeer(tmp, {})
end
self.systemPad.fastOpenUI.role4.redPoint = tmp
end
---@private
function UIMainView:InitGenerate__154(Root, data)
--[[
BottomView/MainRoot/SystemPad/FigherTap
--]]
@ -2740,7 +2968,7 @@ function UIMainView:InitGenerate__142(Root, data)
end
---@private
function UIMainView:InitGenerate__143(Root, data)
function UIMainView:InitGenerate__155(Root, data)
--[[
BtnGM
--]]
@ -2754,7 +2982,7 @@ function UIMainView:InitGenerate__143(Root, data)
end
---@private
function UIMainView:InitGenerate__144(Root, data)
function UIMainView:InitGenerate__156(Root, data)
--[[
BtnBack2
--]]
@ -2769,6 +2997,42 @@ end
---@private
function UIMainView:GenerateDestroy()
if tolua.getpeer(self.systemPad.fastOpenUI.role4.redPoint) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role4.redPoint, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role4.head) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role4.head, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role4) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role4, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role3.redPoint) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role3.redPoint, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role3.head) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role3.head, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role3) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role3, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role2.redPoint) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role2.redPoint, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role2.head) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role2.head, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role2) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role2, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role1.redPoint) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role1.redPoint, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role1.head) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role1.head, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.role1) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.role1, nil)
end
if tolua.getpeer(self.systemPad.fastOpenUI.roleLevelUp3.txt) ~= nil then
tolua.setpeer(self.systemPad.fastOpenUI.roleLevelUp3.txt, nil)
end

2
Assets/Lua/UI/UITeam/UITeamView.lua
View File

@ -220,7 +220,7 @@ function UITeamView:OnClickBackBtn()
if AvatarRTMgr.Instance.IsLoading or self.isLoading then
return
end
ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_UI_RETURN_HOME, true)
AvatarRTMgr.Instance:Hide()
ManagerContainer.LuaGameMgr:EnterBattle(false)
ManagerContainer.LuaUIMgr:OpenSourceUI(self)

2
Assets/Scenes/Scene_5v5/Scene_5v5_my.unity
View File

@ -1554,7 +1554,7 @@ Camera:
m_GameObject: {fileID: 1228784542756426141}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2

373
Assets/TestScene/Test.unity
View File

@ -123,99 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &906294642
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 906294645}
- component: {fileID: 906294644}
- component: {fileID: 906294643}
m_Layer: 0
m_Name: Terrain
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 1
--- !u!154 &906294643
TerrainCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906294642}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 2
m_TerrainData: {fileID: 15600000, guid: f1fdaa513d135164fa14aa18b4b4d857, type: 2}
m_EnableTreeColliders: 1
--- !u!218 &906294644
Terrain:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906294642}
m_Enabled: 1
serializedVersion: 6
m_TerrainData: {fileID: 15600000, guid: f1fdaa513d135164fa14aa18b4b4d857, type: 2}
m_TreeDistance: 5000
m_TreeBillboardDistance: 50
m_TreeCrossFadeLength: 5
m_TreeMaximumFullLODCount: 50
m_DetailObjectDistance: 80
m_DetailObjectDensity: 1
m_HeightmapPixelError: 5
m_SplatMapDistance: 1000
m_HeightmapMinimumLODSimplification: 0
m_HeightmapMaximumLOD: 0
m_ShadowCastingMode: 2
m_DrawHeightmap: 1
m_DrawInstanced: 0
m_DrawTreesAndFoliage: 1
m_StaticShadowCaster: 0
m_IgnoreQualitySettings: 0
m_ReflectionProbeUsage: 1
m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0}
m_BakeLightProbesForTrees: 1
m_PreserveTreePrototypeLayers: 0
m_DeringLightProbesForTrees: 1
m_ReceiveGI: 1
m_ScaleInLightmap: 0.0256
m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
m_GroupingID: 0
m_RenderingLayerMask: 1
m_AllowAutoConnect: 1
m_EnableHeightmapRayTracing: 1
m_EnableTreesAndDetailsRayTracing: 0
m_TreeMotionVectorModeOverride: 3
--- !u!4 &906294645
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906294642}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1061005015
GameObject:
m_ObjectHideFlags: 0
@ -308,6 +215,283 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1365069911
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1365069912}
- component: {fileID: 1365069915}
- component: {fileID: 1365069914}
- component: {fileID: 1365069913}
m_Layer: 5
m_Name: RawImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1365069912
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1365069911}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1691981337}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &1365069913
VideoPlayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1365069911}
m_Enabled: 1
m_VideoClip: {fileID: 0}
m_TargetCameraAlpha: 1
m_TargetCamera3DLayout: 0
m_TargetCamera: {fileID: 0}
m_TargetTexture: {fileID: 8600000, guid: 0f860e00544f4024ab043c085a446beb, type: 2}
m_TimeReference: 0
m_TargetMaterialRenderer: {fileID: 0}
m_TargetMaterialProperty: <noninit>
m_RenderMode: 2
m_AspectRatio: 2
m_DataSource: 1
m_TimeUpdateMode: 2
m_PlaybackSpeed: 1
m_AudioOutputMode: 0
m_TargetAudioSources: []
m_DirectAudioVolumes: []
m_Url: http://vjs.zencdn.net/v/oceans.mp4
m_EnabledAudioTracks:
m_DirectAudioMutes:
m_ControlledAudioTrackCount: 0
m_PlayOnAwake: 1
m_SkipOnDrop: 1
m_Looping: 0
m_WaitForFirstFrame: 1
m_FrameReadyEventEnabled: 0
m_VideoShaders: []
--- !u!114 &1365069914
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1365069911}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 8600000, guid: 0f860e00544f4024ab043c085a446beb, type: 2}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &1365069915
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1365069911}
m_CullTransparentMesh: 1
--- !u!1 &1691981333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1691981337}
- component: {fileID: 1691981336}
- component: {fileID: 1691981335}
- component: {fileID: 1691981334}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1691981334
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1691981333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &1691981335
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1691981333}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1691981336
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1691981333}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &1691981337
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1691981333}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1365069912}
m_Father: {fileID: 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_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1870437964
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1870437967}
- component: {fileID: 1870437966}
- component: {fileID: 1870437965}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1870437965
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1870437964}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1870437966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1870437964}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1870437967
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1870437964}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1949876587
GameObject:
m_ObjectHideFlags: 0
@ -408,4 +592,5 @@ SceneRoots:
m_Roots:
- {fileID: 1061005018}
- {fileID: 1949876589}
- {fileID: 906294645}
- {fileID: 1691981337}
- {fileID: 1870437967}