From fe21c9d17d2f8a88a78afe2eca1bb7a3eaf1ddb4 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Aug 2022 17:14:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=B3=95=E5=AE=9D]=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=B3=95=E5=AE=9D=E5=BD=92=E5=85=83=E6=98=BE=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/View/ItemView.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 3bd967b9ad..c205291eaa 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -682,7 +682,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) elseif itemDataConFig.ItemType == ItemType.Talisman then --法宝 Log("法宝 "..itemSId) - self.num:SetActive(false) + self.num:SetActive(itemNum and itemNum > 1) + --self.num:GetComponent("Text").text = PrintWanNum(itemNum and itemNum or 0) self.frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID)) self.starGrid:SetActive(true) From ceefbf5c42278ce984905eb233e7e50553799516 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Aug 2022 17:25:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E8=83=8C=E5=8C=85]=3D=3D=3D=3D=3D?= =?UTF-8?q?=E7=A2=8E=E7=89=87=E5=90=88=E6=88=90=E6=8C=89=E9=92=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua | 4 +++- .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 055ecaca5d..a4de2f9688 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -784,7 +784,9 @@ function this.DelePokemonItemData(_itemDatas) end return curItemDatas end - +function BagPanel:OnFocus() + BagManager.isBagPanel=true +end function this.ItemsSortDataV2(_itemDatas) table.sort(_itemDatas, function(a, b) if a.itemConfig.Sort == b.itemConfig.Sort then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 38e1f35f50..61547775c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -125,6 +125,7 @@ function RewardItemPopup:OnOpen(...) itemDataList = {} isBackBattle = false isPlayerAniEnd = true + BagManager.isBagPanel=false isOpenGeiSSRAvtivity = 0 local args = {...} local drop = args[1] From bb9f8776522e5ac2b1ccc4ea93bf644c20fe38b5 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Aug 2022 17:45:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E6=98=BE=E7=A4=BA=E6=8B=9B=E5=8B=9F]=3D?= =?UTF-8?q?=3D=3D=3D=E6=B7=BB=E5=8A=A0=E7=8F=8D=E5=A5=87=E5=AE=9D=E9=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DynamicActicity/TimeLimitUpHero.prefab | 462 +++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../DynamicActivity/TimeLimitUpHero.lua | 5 + .../~Lua/Modules/Player/JumpManager.lua | 3 + 4 files changed, 447 insertions(+), 24 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index 3f5756da6c..a807e98989 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -573,10 +573,10 @@ RectTransform: m_Father: {fileID: 8467060635364585861} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 217, y: -37.5} - m_SizeDelta: {x: 100, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8589139664405831713 CanvasRenderer: @@ -848,6 +848,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1189586248723071120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3826093032240713913} + - component: {fileID: 7124087169959168962} + - component: {fileID: 5164279005426237424} + - component: {fileID: 6601673459640582178} + m_Layer: 5 + m_Name: Img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3826093032240713913 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189586248723071120} + 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: 235128951260794024} + 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: 3.6} + m_SizeDelta: {x: 120, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7124087169959168962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189586248723071120} + m_CullTransparentMesh: 0 +--- !u!114 &5164279005426237424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189586248723071120} + 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: f9195d99260587f49a39e815c6ba7bf6, 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!95 &6601673459640582178 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1189586248723071120} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5d9ac99b75d220c43ba06f575523555c, 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 &1203249937110066399 GameObject: m_ObjectHideFlags: 0 @@ -5643,6 +5737,126 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &1648804560656905299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 235128951260794024} + - component: {fileID: 823547411595043859} + - component: {fileID: 8236572379385304605} + - component: {fileID: 9053946922506176346} + m_Layer: 5 + m_Name: zqbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &235128951260794024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648804560656905299} + 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: 3826093032240713913} + - {fileID: 3512704310149506704} + - {fileID: 4708614719849942965} + m_Father: {fileID: 8772735742504336993} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 129, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &823547411595043859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648804560656905299} + m_CullTransparentMesh: 0 +--- !u!114 &8236572379385304605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648804560656905299} + 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: de99e18ee6101e146b6d63540708cc25, 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!114 &9053946922506176346 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648804560656905299} + 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: 8236572379385304605} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &1838210199014983916 GameObject: m_ObjectHideFlags: 0 @@ -6783,6 +6997,7 @@ RectTransform: - {fileID: 6424150738340887453} - {fileID: 6709395645082142174} - {fileID: 2446839573002420404} + - {fileID: 235128951260794024} m_Father: {fileID: 7816124763777208762} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8322,10 +8537,10 @@ RectTransform: m_Father: {fileID: 8467060635364585861} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 129.5, y: -37.5} - m_SizeDelta: {x: 75, y: 75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6088628336122041328 CanvasRenderer: @@ -8384,6 +8599,80 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &6023078457428115407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3512704310149506704} + - component: {fileID: 2173414916254736468} + - component: {fileID: 3250338565790282721} + m_Layer: 5 + m_Name: Img2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3512704310149506704 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6023078457428115407} + 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: 235128951260794024} + 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: 0, y: -38.8} + m_SizeDelta: {x: 117, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2173414916254736468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6023078457428115407} + m_CullTransparentMesh: 0 +--- !u!114 &3250338565790282721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6023078457428115407} + 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: 27d3e3bfba04a224c9694ce5e6e9c79f, 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 &6335045042724259807 GameObject: m_ObjectHideFlags: 0 @@ -8782,10 +9071,10 @@ RectTransform: m_Father: {fileID: 8467060635364585861} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 46, y: -37.5} - m_SizeDelta: {x: 92, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6403265139877489682 CanvasRenderer: @@ -9106,10 +9395,10 @@ RectTransform: m_Father: {fileID: 8707505760031921771} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104.5, y: -37.5} - m_SizeDelta: {x: 75, y: 75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &456025369945251173 CanvasRenderer: @@ -9522,10 +9811,10 @@ RectTransform: m_Father: {fileID: 8707505760031921771} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 179.5, y: -37.5} - m_SizeDelta: {x: 75, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2787941689728704253 CanvasRenderer: @@ -14436,10 +14725,10 @@ RectTransform: m_Father: {fileID: 8707505760031921771} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 33.5, y: -37.5} - m_SizeDelta: {x: 67, y: 53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6789756586190126900 CanvasRenderer: @@ -15063,3 +15352,128 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &5101185469379844930 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 235128951260794024} + m_Modifications: + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} +--- !u!224 &4708614719849942965 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + m_PrefabInstance: {fileID: 5101185469379844930} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 724b664b12..49f858f115 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1224,6 +1224,7 @@ JumpType = { ChaoFanRuSheng = 20061, zhenqibaoge = 20002, + xunxianbaoge = 20013, xianshishangshi = 20001, firstRecharge = 30001, diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 0dbe753739..2ca0d0c702 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -60,6 +60,7 @@ function TimeLimitUpHero:InitComponent() self.heroPar=Util.GetGameObject(self.mask1,"curObj") self.dragView=Util.GetGameObject(self.mask1,"dragView") self.btn_hero=Util.GetGameObject(self.gameObject,"btngroup/btn_hero") + self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg") self.heroIcon=Util.GetGameObject(self.btn_hero,"Icon"):GetComponent("Image") self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image") self.callTimeTxt=Util.GetGameObject(self.gameObject,"callTimeImg/Text"):GetComponent("Text") @@ -112,6 +113,10 @@ function TimeLimitUpHero:BindEvent() Util.AddOnceClick(self.btnStore, function() JumpManager.GoJump(40068) end) + Util.AddOnceClick(self.lsth, function() + LogError("111111111") + JumpManager.GoJump(40071) + end) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 3d843f4b29..f9a2de16cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -731,6 +731,9 @@ local jumpDic = { [JumpType.zhenqibaoge] = function(data) this.JumpActivity(JumpType.zhenqibaoge,data[1]) end, + [JumpType.xunxianbaoge] = function(data) + this.JumpActivity(JumpType.xunxianbaoge,data[1]) + end, [JumpType.LingShouTehui] = function(data)--零售特惠 this.JumpActivity(JumpType.LingShouTehui,data[1]) end,