Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-03-30 18:42:38 +08:00
commit 8161aca202
5 changed files with 85 additions and 9 deletions

View File

@ -21557,6 +21557,7 @@ RectTransform:
- {fileID: 687320386229130930}
- {fileID: 6744555661118315554}
- {fileID: 743071135}
- {fileID: 3578757564134258929}
m_Father: {fileID: 1473827928010218247}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -49478,7 +49479,6 @@ RectTransform:
- {fileID: 1586863079}
- {fileID: 1741493654907866535}
- {fileID: 6762574921092838611}
- {fileID: 3578757564134258929}
m_Father: {fileID: 1473827928010218247}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -66830,12 +66830,12 @@ RectTransform:
- {fileID: 707361313758567888}
- {fileID: 4727042863211309282}
- {fileID: 8730123036785111556}
m_Father: {fileID: 7682634954648963246}
m_RootOrder: 13
m_Father: {fileID: 3124962570895569612}
m_RootOrder: 10
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: 1250, y: -24}
m_AnchoredPosition: {x: -135, y: -12}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6609285755703667079

View File

@ -523,7 +523,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -0.000020082896, y: 50}
m_AnchoredPosition: {x: -0.000023068309, y: 50}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &455843809901100221
@ -1567,8 +1567,8 @@ RectTransform:
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: 1.4, y: 22.8}
m_SizeDelta: {x: 770.4, y: 1690.8}
m_AnchoredPosition: {x: 1.4, y: 29.35}
m_SizeDelta: {x: 770.4, y: 1677.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5714166555136849712
GameObject:
@ -1789,6 +1789,7 @@ RectTransform:
- {fileID: 8396209728857207438}
- {fileID: 755367653517614665}
- {fileID: 6156001182195207221}
- {fileID: 7644560317432511499}
m_Father: {fileID: 6860202946281388347}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2045,6 +2046,80 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7113916807625438323
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7644560317432511499}
- component: {fileID: 551462396334624459}
- component: {fileID: 7868212924542620862}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7644560317432511499
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7113916807625438323}
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: 6861030463589856289}
m_RootOrder: 9
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: 1.2, y: -776.8}
m_SizeDelta: {x: 749.9, y: 83.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &551462396334624459
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7113916807625438323}
m_CullTransparentMesh: 0
--- !u!114 &7868212924542620862
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7113916807625438323}
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: 1
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: f3efca0b27d32994690f0ed37669a3c6, 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 &7552524817855075317
GameObject:
m_ObjectHideFlags: 0

View File

@ -132,7 +132,7 @@ function this:InitComponent()
this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld")
this.btnWaiDi:SetActive(false)
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianShuMiJuan")
this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer7/btnTianShuMiJuan")
this.operateIcon = {
[FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50),
[FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200),

View File

@ -28,6 +28,7 @@ function RoleTalismanPanelV2:InitComponent()
this.advanceBtn=Util.GetGameObject(this.gameObject,"AdvanceBtn")--进阶按钮
this.advanceBtnRedPot=Util.GetGameObject(this.gameObject,"AdvanceBtn/redPoint")
this.RecallBtn=Util.GetGameObject(this.gameObject,"RecallBtn")--归元按钮
this.RecallBtn:GetComponent("Image").sprite = Util.LoadSprite("r_fabao_guiyuan_zh")
this.leftBtn = Util.GetGameObject(this.gameObject, "LeftBtn")
this.rightBtn = Util.GetGameObject(this.gameObject, "RightBtn")
this.helpBtn= Util.GetGameObject(this.transform, "HelpBtn")

View File

@ -42,7 +42,7 @@ function TianShuMiJuanMainPanel:InitComponent()
self.fetterItem = Util.GetGameObject(self.gameObject,"fetterItem")
local grid = Util.GetGameObject(self.gameObject,"bg/fetterGrid")
local v21 = grid.transform.rect
self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 1, Vector2.New(0,0))
self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 1, Vector2.New(0,25))
self.empty = Util.GetGameObject(self.gameObject,"bg/NoneImage")
end