建木神树转移到修行
parent
0654020f6a
commit
1744845cba
|
|
@ -34,7 +34,7 @@ RectTransform:
|
|||
- {fileID: 647030188288427237}
|
||||
- {fileID: 2537661423143505680}
|
||||
m_Father: {fileID: 3759887136319108211}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
@ -139,6 +139,80 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &852322245399015019
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7029056200395171643}
|
||||
- component: {fileID: 5794821513035366378}
|
||||
- component: {fileID: 3218662881752742987}
|
||||
m_Layer: 5
|
||||
m_Name: treebtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7029056200395171643
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 852322245399015019}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 2104297696566059952}
|
||||
m_RootOrder: 0
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 125, y: 123}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5794821513035366378
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 852322245399015019}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3218662881752742987
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 852322245399015019}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: c0e2ff0e5cbd6384ea4afd24a076c9f8, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1252748616081871236
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -796,6 +870,80 @@ MonoBehaviour:
|
|||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 1
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &3122882761126835448
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8687714314605843872}
|
||||
- component: {fileID: 5757095461653507757}
|
||||
- component: {fileID: 517895616713995021}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8687714314605843872
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3122882761126835448}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2104297696566059952}
|
||||
m_RootOrder: 1
|
||||
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: 40.8, y: 46.4}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5757095461653507757
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3122882761126835448}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &517895616713995021
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3122882761126835448}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3245778189758882973
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1438,6 +1586,7 @@ RectTransform:
|
|||
- {fileID: 2460104060231984465}
|
||||
- {fileID: 7028779672763907709}
|
||||
- {fileID: 5425594471415034572}
|
||||
- {fileID: 2104297696566059952}
|
||||
- {fileID: 5901742240670988321}
|
||||
- {fileID: 3359803177079758621}
|
||||
m_Father: {fileID: 8503549196898394800}
|
||||
|
|
@ -2257,6 +2406,136 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6702896178225673027}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &7470631452297282274
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2104297696566059952}
|
||||
- component: {fileID: 4606777694015441894}
|
||||
- component: {fileID: 4132524379273328243}
|
||||
- component: {fileID: 9137671351556889382}
|
||||
- component: {fileID: 2496582195847351234}
|
||||
m_Layer: 5
|
||||
m_Name: treeBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2104297696566059952
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7470631452297282274}
|
||||
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_Children:
|
||||
- {fileID: 7029056200395171643}
|
||||
- {fileID: 8687714314605843872}
|
||||
m_Father: {fileID: 3759887136319108211}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -106, y: 960}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4606777694015441894
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7470631452297282274}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4132524379273328243
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7470631452297282274}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &9137671351556889382
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7470631452297282274}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 4132524379273328243}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!95 &2496582195847351234
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7470631452297282274}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &7649195202929452248
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2428,7 +2707,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 6022124996116502175}
|
||||
m_Father: {fileID: 3759887136319108211}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ function this.InitRedPointAllRelate()
|
|||
--建木神树
|
||||
RPData:SetParent(RedPointType.Sacred,RedPointType.Sacred_roleInfo)
|
||||
RPData:SetParent(RedPointType.Sacred_roleInfo,RedPointType.Sacred_roleList)
|
||||
RPData:SetParent(RedPointType.Sacred_roleInfo,RedPointType.Practice)
|
||||
RPData:SetParent(RedPointType.Hero_Fetter,RedPointType.TianShuMiJuan)
|
||||
RPData:SetParent(RedPointType.SoulPrint_Fetter,RedPointType.TianShuMiJuan)
|
||||
RPData:SetParent(RedPointType.TianShuPokemon_Fetter,RedPointType.TianShuMiJuan)
|
||||
|
|
|
|||
|
|
@ -58,6 +58,9 @@ function Practice:InitComponent()
|
|||
self.lineList = {}
|
||||
self.effectUpgradeList = {}
|
||||
self.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||
|
||||
self.treeBtn = Util.GetGameObject(self.gameObject, "Btns/treeBtn")
|
||||
self.treeRed = Util.GetGameObject(self.treeBtn, "redPoint")
|
||||
end
|
||||
|
||||
function Practice:BindEvent()
|
||||
|
|
@ -117,8 +120,16 @@ function Practice:BindEvent()
|
|||
end
|
||||
|
||||
end)
|
||||
|
||||
Util.AddClick(self.treeBtn, function()
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE) then
|
||||
UIManager.OpenPanel(UIName.SacredTreePanel)
|
||||
end
|
||||
end)
|
||||
|
||||
BindRedPointObject(RedPointType.Practice_upgrade,self.redPoint)
|
||||
BindRedPointObject(RedPointType.Practice_imprint,self.imprintRedPoint)
|
||||
BindRedPointObject(RedPointType.Sacred_roleList,self.treeRed)
|
||||
end
|
||||
function Practice:BtnClickEvent()
|
||||
NetManager.UpPracticeLevelRequest(function ()
|
||||
|
|
@ -198,6 +209,7 @@ function Practice:OnSortingOrderChange()
|
|||
end
|
||||
|
||||
function Practice:OnShow()
|
||||
self.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||
self.playerInfoView:OnShow()
|
||||
CheckRedPointStatus(RedPointType.Practice_imprint)
|
||||
CheckRedPointStatus(RedPointType.Practice_upgrade)
|
||||
|
|
@ -363,6 +375,7 @@ function Practice:OnDestroy()
|
|||
SubUIManager.Close(self.playerInfoView)
|
||||
self.playerInfoView = nil
|
||||
end
|
||||
ClearRedPointObject(RedPointType.Sacred_roleList,self.treeRed)
|
||||
ClearRedPointObject(RedPointType.Practice_upgrade,self.redPoint)
|
||||
ClearRedPointObject(RedPointType.Practice_imprint,self.imprintRedPoint)
|
||||
self.itemList = {}
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@ function RoleListPanel:InitComponent()
|
|||
this.fenJieBtn = Util.GetGameObject(self.gameObject, "fenJieBtn")
|
||||
--this.fenJieBtn:SetActive(false)
|
||||
this.formationBtn = Util.GetGameObject(self.gameObject, "formationBtn")
|
||||
this.treeBtn = Util.GetGameObject(self.gameObject, "treeBtn")
|
||||
this.treeRed = Util.GetGameObject(this.treeBtn, "redPoint")
|
||||
-- this.treeBtn = Util.GetGameObject(self.gameObject, "treeBtn")
|
||||
-- this.treeRed = Util.GetGameObject(this.treeBtn, "redPoint")
|
||||
|
||||
if not this.playerInfoView then
|
||||
this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform)
|
||||
|
|
@ -110,13 +110,13 @@ function RoleListPanel:BindEvent()
|
|||
end
|
||||
end)
|
||||
|
||||
Util.AddClick(this.treeBtn, function()
|
||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE) then
|
||||
UIManager.OpenPanel(UIName.SacredTreePanel)
|
||||
end
|
||||
end)
|
||||
-- Util.AddClick(this.treeBtn, function()
|
||||
-- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE) then
|
||||
-- UIManager.OpenPanel(UIName.SacredTreePanel)
|
||||
-- end
|
||||
-- end)
|
||||
|
||||
BindRedPointObject(RedPointType.Sacred_roleList,this.treeRed)
|
||||
--BindRedPointObject(RedPointType.Sacred_roleList,this.treeRed)
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -176,7 +176,7 @@ function RoleListPanel:OnShow()
|
|||
-- 刷新一次编队战斗力
|
||||
FormationManager.RefreshMainFormationPower()
|
||||
|
||||
this.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||
--this.treeBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SACREDTREE))
|
||||
end
|
||||
|
||||
--组合当前选项数据
|
||||
|
|
@ -352,7 +352,7 @@ end
|
|||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function RoleListPanel:OnDestroy()
|
||||
ClearRedPointObject(RedPointType.Sacred_roleList,this.treeRed)
|
||||
-- ClearRedPointObject(RedPointType.Sacred_roleList,this.treeRed)
|
||||
this.spLoader:Destroy()
|
||||
|
||||
SubUIManager.Close(this.UpView)
|
||||
|
|
|
|||
Loading…
Reference in New Issue