【命格】提交
parent
9aef11c828
commit
10ad308033
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0ea20985a7dcf6143a3f9c2912a8e79d
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2c50fcb3f8bf2cb42aa2a470b0f3e16f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -6,7 +6,7 @@ AnimatorController:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Effect_c_gg_0005_t3_attack_02
|
||||
m_Name: Effect_c_gg_0005_t3_attack_02_long_ctrl
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers: []
|
||||
|
|
|
@ -696,7 +696,6 @@ MonoBehaviour:
|
|||
- Assets/ManagedResources/Prefabs/UI/EliteMonster
|
||||
- Assets/ManagedResources/Prefabs/UI/Expedition
|
||||
- Assets/ManagedResources/Prefabs/UI/Expert
|
||||
- Assets/ManagedResources/Prefabs/UI/Fate
|
||||
- Assets/ManagedResources/Prefabs/UI/FetterItemView
|
||||
- Assets/ManagedResources/Prefabs/UI/FifteenDayGift
|
||||
- Assets/ManagedResources/Prefabs/UI/Fight
|
||||
|
@ -707,6 +706,7 @@ MonoBehaviour:
|
|||
- Assets/ManagedResources/Prefabs/UI/FloatingView
|
||||
- Assets/ManagedResources/Prefabs/UI/Formation
|
||||
- Assets/ManagedResources/Prefabs/UI/FuXingGaoZhao
|
||||
- Assets/ManagedResources/Prefabs/UI/Gem
|
||||
- Assets/ManagedResources/Prefabs/UI/GeneralPanel
|
||||
- Assets/ManagedResources/Prefabs/UI/GoodFriend
|
||||
- Assets/ManagedResources/Prefabs/UI/GrowthGiftPageView
|
||||
|
@ -1041,7 +1041,6 @@ MonoBehaviour:
|
|||
- Assets/ManagedResources/~Lua/Modules/Expedition
|
||||
- Assets/ManagedResources/~Lua/Modules/Expedition/View
|
||||
- Assets/ManagedResources/~Lua/Modules/Expert
|
||||
- Assets/ManagedResources/~Lua/Modules/Fate
|
||||
- Assets/ManagedResources/~Lua/Modules/FifteenDayGift
|
||||
- Assets/ManagedResources/~Lua/Modules/Fight
|
||||
- Assets/ManagedResources/~Lua/Modules/Fight/View
|
||||
|
@ -1055,6 +1054,7 @@ MonoBehaviour:
|
|||
- Assets/ManagedResources/~Lua/Modules/Formation/View
|
||||
- Assets/ManagedResources/~Lua/Modules/FormFightMatch
|
||||
- Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao
|
||||
- Assets/ManagedResources/~Lua/Modules/Gem
|
||||
- Assets/ManagedResources/~Lua/Modules/GeneralPanel
|
||||
- Assets/ManagedResources/~Lua/Modules/GeneralPanel/View
|
||||
- Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2
|
||||
|
@ -24208,6 +24208,10 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 149
|
||||
resAbNameIndex: 77
|
||||
- resName: fangcunshangdian
|
||||
extension: .png
|
||||
resPathIndex: 149
|
||||
resAbNameIndex: 77
|
||||
- resName: g_gonghui_tiangongshangdian_zh
|
||||
extension: .png
|
||||
resPathIndex: 149
|
||||
|
@ -37104,6 +37108,10 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 261
|
||||
resAbNameIndex: 2509
|
||||
- resName: c_qcdn_000_t9
|
||||
extension: .png
|
||||
resPathIndex: 261
|
||||
resAbNameIndex: 2509
|
||||
- resName: c_rd_00019_t9_zh
|
||||
extension: .png
|
||||
resPathIndex: 261
|
||||
|
@ -58068,131 +58076,131 @@ MonoBehaviour:
|
|||
extension: .prefab
|
||||
resPathIndex: 682
|
||||
resAbNameIndex: 3147
|
||||
- resName: FatePanel
|
||||
extension: .prefab
|
||||
resPathIndex: 683
|
||||
resAbNameIndex: 3147
|
||||
- resName: FetterItem
|
||||
extension: .prefab
|
||||
resPathIndex: 684
|
||||
resPathIndex: 683
|
||||
resAbNameIndex: 3148
|
||||
- resName: FifteenDayGiftPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 685
|
||||
resPathIndex: 684
|
||||
resAbNameIndex: 3149
|
||||
- resName: FightAreaRewardFullPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightAreaRewardPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightEndLvUpPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightLevelSwitchPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightMiddleChoosePanel
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightMopUpEndPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightPointPassMainPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightSelectAreaShowMopUpPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightSmallChoosePanel
|
||||
extension: .prefab
|
||||
resPathIndex: 686
|
||||
resPathIndex: 685
|
||||
resAbNameIndex: 3150
|
||||
- resName: FightLevelChapterPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 687
|
||||
resPathIndex: 686
|
||||
resAbNameIndex: 3151
|
||||
- resName: FightLevelOpenChapterPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 687
|
||||
resPathIndex: 686
|
||||
resAbNameIndex: 3151
|
||||
- resName: FightLevelSingleChapterPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 687
|
||||
resPathIndex: 686
|
||||
resAbNameIndex: 3151
|
||||
- resName: FightLevelSingleLevelInfoPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 687
|
||||
resPathIndex: 686
|
||||
resAbNameIndex: 3151
|
||||
- resName: FightLevelTrialPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 687
|
||||
resPathIndex: 686
|
||||
resAbNameIndex: 3151
|
||||
- resName: FindFairyPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 688
|
||||
resPathIndex: 687
|
||||
resAbNameIndex: 3152
|
||||
- resName: FindFairyPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 688
|
||||
resPathIndex: 687
|
||||
resAbNameIndex: 3152
|
||||
- resName: FindTreasureDispatchPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 689
|
||||
resPathIndex: 688
|
||||
resAbNameIndex: 3153
|
||||
- resName: FindTreasureMainPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 689
|
||||
resPathIndex: 688
|
||||
resAbNameIndex: 3153
|
||||
- resName: FindTreasureVipPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 689
|
||||
resPathIndex: 688
|
||||
resAbNameIndex: 3153
|
||||
- resName: FirstRechargePanel
|
||||
extension: .prefab
|
||||
resPathIndex: 690
|
||||
resPathIndex: 689
|
||||
resAbNameIndex: 3154
|
||||
- resName: BuffFloatingText
|
||||
extension: .prefab
|
||||
resPathIndex: 691
|
||||
resPathIndex: 690
|
||||
resAbNameIndex: 3155
|
||||
- resName: FloatingText
|
||||
extension: .prefab
|
||||
resPathIndex: 691
|
||||
resPathIndex: 690
|
||||
resAbNameIndex: 3155
|
||||
- resName: ElementPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resPathIndex: 691
|
||||
resAbNameIndex: 3156
|
||||
- resName: FormationEditPopup
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resPathIndex: 691
|
||||
resAbNameIndex: 3156
|
||||
- resName: FormationExamplePopup
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resPathIndex: 691
|
||||
resAbNameIndex: 3156
|
||||
- resName: FormationPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resPathIndex: 691
|
||||
resAbNameIndex: 3156
|
||||
- resName: FormationPanelV2
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resPathIndex: 691
|
||||
resAbNameIndex: 3156
|
||||
- resName: FormationSetPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resPathIndex: 691
|
||||
resAbNameIndex: 3156
|
||||
- resName: FuXingGaoZhaoPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 692
|
||||
resAbNameIndex: 3157
|
||||
- resName: GemPanel
|
||||
extension: .prefab
|
||||
resPathIndex: 693
|
||||
resAbNameIndex: 3157
|
||||
|
|
|
@ -434,7 +434,7 @@ UIName = {
|
|||
RewardTailsmanChipShowPopup = 440,
|
||||
ContinueGiftPanel = 441, -- 连续礼包
|
||||
ContinuePackagePanel = 442, -- 连购礼包new
|
||||
FatePanel = 443, --命格界面
|
||||
GemPanel = 443, --命格界面
|
||||
}
|
||||
|
||||
SubUIConfig = {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
FateManager = {}
|
||||
local this = FateManager
|
||||
GemManager = {}
|
||||
local this = GemManager
|
||||
function this.Initialize()
|
||||
end
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 05b496fe956f9dc4fa03576fb4cb8e1b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,12 +1,12 @@
|
|||
local Fate = quick_class("Fate", BasePanel)
|
||||
local Gem = quick_class("Gem", BasePanel)
|
||||
|
||||
function Fate:InitComponent()
|
||||
function Gem:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.BtView = SubUIManager.Open(SubUIConfig.BtView, self.transform)
|
||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
|
||||
if not self.playerInfoView then
|
||||
self.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, self.transform)
|
||||
end
|
||||
self.BtView = SubUIManager.Open(SubUIConfig.BtView, self.transform)
|
||||
self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform)
|
||||
--MidPart
|
||||
self.mid = Util.GetGameObject(self.gameObject, "Mid")
|
||||
self.img = Util.GetGameObject(self.mid, "Man"):GetComponent("Image")
|
||||
|
@ -16,7 +16,7 @@ function Fate:InitComponent()
|
|||
self.btnPractice = Util.GetGameObject(self.gameObject, "Tab/tab1")
|
||||
end
|
||||
|
||||
function Fate:BindEvent()
|
||||
function Gem:BindEvent()
|
||||
--帮助按钮
|
||||
Util.AddClick(self.helpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y)
|
||||
|
@ -28,19 +28,19 @@ function Fate:BindEvent()
|
|||
end)
|
||||
end
|
||||
|
||||
function Fate:AddListener()
|
||||
function Gem:AddListener()
|
||||
end
|
||||
|
||||
function Fate:RemoveListener()
|
||||
function Gem:RemoveListener()
|
||||
end
|
||||
|
||||
--待功能扩展(试图打开某个状态)
|
||||
function Fate:OnOpen()
|
||||
function Gem:OnOpen()
|
||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.XiuXing })
|
||||
self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice })
|
||||
end
|
||||
|
||||
function Fate:OnSortingOrderChange()
|
||||
function Gem:OnSortingOrderChange()
|
||||
self.ManCanvas.sortingOrder = self.sortingOrder + 2
|
||||
-- 头像层级
|
||||
if self.playerInfoView then
|
||||
|
@ -48,22 +48,22 @@ function Fate:OnSortingOrderChange()
|
|||
end
|
||||
end
|
||||
|
||||
function Fate:OnShow()
|
||||
function Gem:OnShow()
|
||||
self.playerInfoView:OnShow()
|
||||
self:RefreshMid()
|
||||
end
|
||||
|
||||
--刷新中部人物
|
||||
function Fate:RefreshMid()
|
||||
function Gem:RefreshMid()
|
||||
local playerImg = NameManager.roleSex == 0 and "x_xiuxing_liangongren_nan" or "x_xiuxing_liangongren_nv"
|
||||
self.img.sprite = self.spLoader:LoadSprite(playerImg)
|
||||
self.ManCanvas.sortingOrder = self.sortingOrder + 2
|
||||
end
|
||||
|
||||
function Fate:OnClose()
|
||||
function Gem:OnClose()
|
||||
end
|
||||
|
||||
function Fate:OnDestroy()
|
||||
function Gem:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
SubUIManager.Close(self.UpView)
|
||||
SubUIManager.Close(self.BtView)
|
||||
|
@ -75,4 +75,4 @@ function Fate:OnDestroy()
|
|||
end
|
||||
end
|
||||
|
||||
return Fate
|
||||
return Gem
|
|
@ -84,7 +84,7 @@ function Practice:InitComponent()
|
|||
BindRedPointObject(5000+i*100,Util.GetGameObject(self.Practice, "SkillObj/skill"..i.."/red"))
|
||||
end
|
||||
--页签
|
||||
self.btnFate = Util.GetGameObject(self.gameObject, "Tab/tab2")
|
||||
self.btnGem = Util.GetGameObject(self.gameObject, "Tab/tab2")
|
||||
|
||||
end
|
||||
|
||||
|
@ -165,8 +165,8 @@ function Practice:BindEvent()
|
|||
Util.AddClick(self.incarnationBtn, function()
|
||||
UIManager.OpenPanel(UIName.IncarnationPanel)
|
||||
end)
|
||||
Util.AddClick(self.btnFate, function()
|
||||
UIManager.OpenPanel(UIName.FatePanel)
|
||||
Util.AddClick(self.btnGem, function()
|
||||
UIManager.OpenPanel(UIName.GemPanel)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
BindRedPointObject(RedPointType.tailsmanSoul,self.talsmanSoulBtnRed)
|
||||
|
|
Loading…
Reference in New Issue