diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab index 1569153fb8..361564cd02 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponMainPanel.prefab @@ -16249,7 +16249,7 @@ RectTransform: 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: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8025611292293059572 CanvasRenderer: @@ -16279,7 +16279,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19061,7 +19061,7 @@ RectTransform: 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: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6586996501492647001 CanvasRenderer: @@ -19091,7 +19091,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -54608,7 +54608,7 @@ RectTransform: 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: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &425139529622223132 CanvasRenderer: @@ -54638,7 +54638,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -61520,7 +61520,7 @@ RectTransform: 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: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4058198815973208457 CanvasRenderer: @@ -61550,7 +61550,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -61882,7 +61882,7 @@ RectTransform: 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: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3949911101863499354 CanvasRenderer: @@ -61912,7 +61912,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -73380,7 +73380,7 @@ RectTransform: 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: 92, y: 52} + m_SizeDelta: {x: 40, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &379271115833237106 CanvasRenderer: @@ -73410,7 +73410,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 1452a95854211f24794bca0e225ee5f9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua index fbb61f1c24..0a5f82491c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua @@ -53,13 +53,14 @@ function GodWeaponMainPanel:InitComponent() end dragViewListGo[i].gameObject.name="DragView"..i dragViewListGo[i].gameObject:SetActive(false) - dragViewListGo[i]:SetScrollMouse(false) + dragViewListGo[i]:SetScrollMouse(false) this.trigger[i]=Util.GetEventTriggerListener(dragViewListGo[i].gameObject) this.trigger[i].onPointerDown= this.trigger[i].onPointerDown+this.OnPointerDown this.trigger[i].onPointerUp= this.trigger[i].onPointerUp+this.OnPointerUp this.trigger[i].onEndDrag= this.trigger[i].onEndDrag+this.OnEndDrag this.trigger[i].onDrag=this.trigger[i].onDrag+this.OnDrag dragViewListGo[i]:SetDragGO(PokemonGoList[i]) + dragViewListGo[i].transform.localScale=Vector3.New(0.5,0.5,1) end this.gongTxt=Util.GetGameObject(this.gameObject,"prolist/gong/Text"):GetComponent("Text") this.huTxt=Util.GetGameObject(this.gameObject,"prolist/hu/Text"):GetComponent("Text")