【建木神树】提交
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 27 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 656 KiB After Width: | Height: | Size: 656 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1.0 MiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 1.7 MiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 203 KiB After Width: | Height: | Size: 203 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 610 KiB After Width: | Height: | Size: 610 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
Before Width: | Height: | Size: 802 KiB After Width: | Height: | Size: 802 KiB |
|
@ -80,7 +80,7 @@ TextureImporter:
|
|||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BagAtlas
|
||||
spritePackingTag: ScaredTreeAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1bee9cd9832d3455f8cdd9cecb78dd56
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lzma/luabytes
|
||||
assetBundleVariant: unity3d
|
|
@ -423,7 +423,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -88.5, y: 516}
|
||||
m_AnchoredPosition: {x: -90, y: 516}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222130107731120904
|
||||
|
@ -630,6 +630,7 @@ RectTransform:
|
|||
- {fileID: 224985398190418476}
|
||||
- {fileID: 224552029152224500}
|
||||
- {fileID: 7480433927024809615}
|
||||
- {fileID: 1665889456276032331}
|
||||
- {fileID: 6386129574479226655}
|
||||
- {fileID: 1548973817997558794}
|
||||
- {fileID: 3435540793027833224}
|
||||
|
@ -2331,6 +2332,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &142308318993647248
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7755659692190683072}
|
||||
- component: {fileID: 6505112454196582161}
|
||||
- component: {fileID: 2776300872173589680}
|
||||
m_Layer: 5
|
||||
m_Name: treeBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7755659692190683072
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 142308318993647248}
|
||||
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: 1665889456276032331}
|
||||
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 &6505112454196582161
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 142308318993647248}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2776300872173589680
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 142308318993647248}
|
||||
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: 9ed299d510310514aa0f29b1ecd648fd, 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 &243444614692140601
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3038,7 +3113,7 @@ RectTransform:
|
|||
- {fileID: 6828973900495641293}
|
||||
- {fileID: 7194643044188051177}
|
||||
m_Father: {fileID: 224848180469002964}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -3329,7 +3404,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -91, y: 378}
|
||||
m_AnchoredPosition: {x: -90, y: 378}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3843210920615487987
|
||||
|
@ -3713,7 +3788,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224848180469002964}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -4896,6 +4971,135 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_textSpacing: -31.5
|
||||
--- !u!1 &7890475326333168153
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1665889456276032331}
|
||||
- component: {fileID: 3873964151317668637}
|
||||
- component: {fileID: 3707649134155701896}
|
||||
- component: {fileID: 8422326788500698077}
|
||||
- component: {fileID: 2920653073079804729}
|
||||
m_Layer: 5
|
||||
m_Name: treeBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1665889456276032331
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7890475326333168153}
|
||||
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: 7755659692190683072}
|
||||
m_Father: {fileID: 224848180469002964}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -90, y: 653.9}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3873964151317668637
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7890475326333168153}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3707649134155701896
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7890475326333168153}
|
||||
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 &8422326788500698077
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7890475326333168153}
|
||||
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: 3707649134155701896}
|
||||
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 &2920653073079804729
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7890475326333168153}
|
||||
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 &7958461397493849557
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4926,7 +5130,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224848180469002964}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -9713,7 +9917,7 @@ ParticleSystem:
|
|||
--- !u!199 &499139182461379825
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2411348a09f847c40805682407af31c0
|
||||
guid: 222f8b7a8fc722240acf752d29fcd021
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
|
@ -1299,6 +1299,7 @@ FUNCTION_OPEN_TYPE = {
|
|||
POKEMON=79,--灵兽山
|
||||
XiaoYaoYou = 80, -- 逍遥游
|
||||
RoleAwake = 81, -- 神将觉醒
|
||||
SCAREDTREE = 88,--建木神树
|
||||
}
|
||||
|
||||
TaskGetBtnIconDef = {
|
||||
|
|
|
@ -31,6 +31,7 @@ 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.BtView =SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
|
||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
|
||||
|
@ -115,6 +116,9 @@ function RoleListPanel:BindEvent()
|
|||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(54))
|
||||
end
|
||||
end)
|
||||
Util.AddClick(this.treeBtn, function()
|
||||
UIManager.OpenPanel(UIName.SacredTreePanel)
|
||||
end)
|
||||
|
||||
-- 点击你的猪头
|
||||
Util.AddClick(this.headBox, function ()
|
||||
|
@ -177,11 +181,13 @@ function RoleListPanel:OnShow()
|
|||
--else
|
||||
--Util.SetGray(this.fenJieBtn, true)
|
||||
--end
|
||||
if ActTimeCtrlManager.SingleFuncState(54) then
|
||||
Util.SetGray(this.formationBtn, false)
|
||||
else
|
||||
Util.SetGray(this.formationBtn, true)
|
||||
end
|
||||
-- if ActTimeCtrlManager.SingleFuncState(54) then
|
||||
-- Util.SetGray(this.formationBtn, false)
|
||||
-- else
|
||||
-- Util.SetGray(this.formationBtn, true)
|
||||
-- end
|
||||
Util.SetGray(this.formationBtn, not ActTimeCtrlManager.SingleFuncState(54))
|
||||
this.treeBtn:SetActive(PlayerManager.level>=100)--ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.SCAREDTREE))
|
||||
if this.ScrollView then
|
||||
this.ScrollView:SetIndex(1)
|
||||
end
|
||||
|
|