diff --git a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab index e2142882fd..11a999f550 100644 --- a/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Compound/CompoundPanel.prefab @@ -33228,9 +33228,9 @@ RectTransform: m_Father: {fileID: 6546278396494099841} 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: 197.71, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4051051887205074006 @@ -40021,7 +40021,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &3226999618146576493 GameObject: m_ObjectHideFlags: 0 @@ -51380,7 +51380,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &3673442358847759519 GameObject: m_ObjectHideFlags: 0 @@ -62093,7 +62093,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2739353302180163216 RectTransform: m_ObjectHideFlags: 0 @@ -71819,7 +71819,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &4224995857811459290 GameObject: m_ObjectHideFlags: 0 @@ -72947,9 +72947,9 @@ RectTransform: m_Father: {fileID: 7165972265739076128} m_RootOrder: 1 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 197.71, y: -50} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8672467255566433402 @@ -84861,7 +84861,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8645526209054829605 RectTransform: m_ObjectHideFlags: 0 @@ -94676,7 +94676,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &5430040788655279667 GameObject: m_ObjectHideFlags: 0 @@ -113162,9 +113162,9 @@ RectTransform: m_Father: {fileID: 6546278396494099841} 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: 0, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9059331423863078950 @@ -128703,9 +128703,9 @@ RectTransform: m_Father: {fileID: 7165972265739076128} m_RootOrder: 0 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3620541785695783206 diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 3b68bb6f2d..3b4ce93ec0 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -2474,6 +2474,7 @@ RectTransform: - {fileID: 1079501476154741580} - {fileID: 7264092185449797515} - {fileID: 6126398177057970904} + - {fileID: 7083728924863985117} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4289,6 +4290,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8000810284221144006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7083728924863985117} + - component: {fileID: 2358441647291593940} + - component: {fileID: 5998109077415003210} + - component: {fileID: 5000094693948772365} + m_Layer: 5 + m_Name: btn_shop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7083728924863985117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000810284221144006} + 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: 1553045991312230259} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -88, y: 548} + m_SizeDelta: {x: 126, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2358441647291593940 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000810284221144006} + m_CullTransparentMesh: 0 +--- !u!114 &5998109077415003210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000810284221144006} + 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: 03ba10b8f366e924d8e0a48bbf9fa66e, 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 &5000094693948772365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000810284221144006} + 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: 1 + 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: 5998109077415003210} + 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 &8025299306218942977 GameObject: m_ObjectHideFlags: 0 @@ -5428,6 +5546,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7906550627918467978} m_Modifications: + - target: {fileID: 7146509959216663441, guid: c12e0b5f3ad489e43b829626f88bf311, + type: 3} + propertyPath: m_Name + value: UI_Effect_XiaoYaoYao-ShiJianDian + objectReference: {fileID: 0} - target: {fileID: 7146509959216663441, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_IsActive @@ -5448,98 +5571,59 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 758001312834259415, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: startDelay.scalar - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7027426602217308417, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: startDelay.scalar - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 2567748292958852965, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: startDelay.scalar - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5974426342699473273, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: startDelay.scalar - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 5931916307486660071, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: startDelay.scalar - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 3874060813514782238, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: startDelay.scalar - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 1950745819304833891, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: m_Name - value: UI_Effect_XiaoYaoYao-ShiJianDian - objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1950745819304833890, guid: c12e0b5f3ad489e43b829626f88bf311, + - target: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 758001312834259415, guid: c12e0b5f3ad489e43b829626f88bf311, + type: 3} + propertyPath: CollisionModule.plane0 + value: + objectReference: {fileID: 3786141974992282054} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c12e0b5f3ad489e43b829626f88bf311, type: 3} +--- !u!4 &3786141974992282054 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3100783875005809612, guid: c12e0b5f3ad489e43b829626f88bf311, + type: 3} + m_PrefabInstance: {fileID: 2270701038961385994} + m_PrefabAsset: {fileID: 0} --- !u!4 &3487705115995374364 stripped Transform: m_CorrespondingSourceObject: {fileID: 3451437108392157462, guid: c12e0b5f3ad489e43b829626f88bf311, diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua index 42d0c32df1..df74ab0987 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Gift.lua @@ -93,8 +93,14 @@ function this.OnShowData() table.insert(soulPrintDatas,v) end end + table.sort(soulPrintDatas,function(a,b) + if a.Quality==b.Quality then + return a.Id < b.Id + else + return a.Quality < b.Quality + end + end) curSelectSoulPrint = soulPrintDatas[1] - LogError("#soulPrintDatas============"..#soulPrintDatas) this.ScrollView:SetData(soulPrintDatas, function (index, go) this.SingleItemDataShow(go, soulPrintDatas[index]) end) @@ -104,19 +110,22 @@ function this.ShowGoldNum(equipSign) for i = 1, #needGold do needGold[i]:SetActive(false) end - for i = 1, #equipSign.Resource do - if needGold[i] then - needGold[i]:SetActive(true) - Util.GetGameObject(needGold[i],"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,equipSign.Resource[i][1]).ResourceID)) - if equipSign.Resource[1][2] > BagManager.GetItemCountById(equipSign.Resource[1][1]) then - materidaIsCan = false - needGold[i]:GetComponent("Text").text = PrintWanNum2(equipSign.Resource[i][2])--string.format("%s", equipSign.Resource[i][2]) - else - materidaIsCan = true - needGold[i]:GetComponent("Text").text =PrintWanNum2(equipSign.Resource[i][2])--string.format("%s", equipSign.Resource[i][2]) + if equipSign.Resource then + for i = 1, #equipSign.Resource do + if needGold[i] then + needGold[i]:SetActive(true) + Util.GetGameObject(needGold[i],"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,equipSign.Resource[i][1]).ResourceID)) + if equipSign.Resource[1][2] > BagManager.GetItemCountById(equipSign.Resource[1][1]) then + materidaIsCan = false + needGold[i]:GetComponent("Text").text = PrintWanNum2(equipSign.Resource[i][2])--string.format("%s", equipSign.Resource[i][2]) + else + materidaIsCan = true + needGold[i]:GetComponent("Text").text =PrintWanNum2(equipSign.Resource[i][2])--string.format("%s", equipSign.Resource[i][2]) + end end end end + end function this.ShowTitleEquipData(_go,_id,index) @@ -157,10 +166,12 @@ function this.SingleItemDataShow(_go,_curequipSign) end local curequipSign = _curequipSign Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(curequipSign.Quality)) - --Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) + local icon=Util.GetGameObject(_go.transform,"icon") + icon:SetActive(true) + icon:GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) Util.GetGameObject(_go.transform,"circleFrameBg/Icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) Util.GetGameObject(_go.transform,"circleFrameBg/circleFrame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circle) - Util.GetGameObject(_go.transform,"circleFrameBg"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2) + Util.GetGameObject(_go.transform,"circleFrameBg"):SetActive(false) --:GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2) Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text= SubString2(string.gsub(GetLanguageStrById(curequipSign.Name),Language[11520],""),6);--curequipSign.Name Util.GetGameObject(_go.transform, "UI_effect_WuCai_Kuang"):SetActive(curequipSign.Quality == 7) local choosed =Util.GetGameObject(_go.transform, "choosed") diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_PlayerGift.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_PlayerGift.lua index e188e4b9dc..cc885baa33 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_PlayerGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_PlayerGift.lua @@ -93,8 +93,14 @@ function this.OnShowData() table.insert(soulPrintDatas,v) end end + table.sort(soulPrintDatas,function(a,b) + if a.Quality==b.Quality then + return a.Id < b.Id + else + return a.Quality < b.Quality + end + end) curSelectSoulPrint = soulPrintDatas[1] - LogError("#soulPrintDatas============"..#soulPrintDatas) this.ScrollView:SetData(soulPrintDatas, function (index, go) this.SingleItemDataShow(go, soulPrintDatas[index]) end) @@ -157,10 +163,12 @@ function this.SingleItemDataShow(_go,_curequipSign) end local curequipSign = _curequipSign Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetQuantityImageByquality(curequipSign.Quality)) - --Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) + local icon=Util.GetGameObject(_go.transform,"icon") + icon:SetActive(true) + icon:GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) Util.GetGameObject(_go.transform,"circleFrameBg/Icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID)) Util.GetGameObject(_go.transform,"circleFrameBg/circleFrame"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circle) - Util.GetGameObject(_go.transform,"circleFrameBg"):GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2) + Util.GetGameObject(_go.transform,"circleFrameBg"):SetActive(false) --:GetComponent("Image").sprite=this.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2) Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text= SubString2(string.gsub(GetLanguageStrById(curequipSign.Name),Language[11520],""),6);--curequipSign.Name Util.GetGameObject(_go.transform, "UI_effect_WuCai_Kuang"):SetActive(curequipSign.Quality == 7) local choosed =Util.GetGameObject(_go.transform, "choosed") diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index af016b865d..0d5bb7c1fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -45,6 +45,7 @@ function this:InitComponent() Util.GetGameObject(self.gameObject, "btnGrid/bossBtn/btnName"):GetComponent("Text").text=Language[12003] this.bossRedPoint = Util.GetGameObject(self.gameObject, "btnGrid/bossBtn/redPoint") this.previewBtn=Util.GetGameObject(self.gameObject, "previewBtn") + this.btn_shop=Util.GetGameObject(self.gameObject, "btn_shop") this.autoBtn=Util.GetGameObject(self.gameObject, "auto")--自动游历按钮 this.toggle=Util.GetGameObject(self.gameObject, "auto/toggle")--自动游历开关显示 this.mapParent=Util.GetGameObject(self.gameObject,"mapParent") @@ -87,7 +88,9 @@ function this:BindEvent() Util.AddClick(this.addItmBtn, function () UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.XiaoYaoYouItemExchange,98) end) - + Util.AddClick(this.btn_shop, function () + JumpManager.GoJump(40081) + end) Util.AddClick(this.btnBack, function () if isAutoRun then MsgPanel.ShowTwo(Language[12005], nil, function() diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 6d020a39c0..53c5046686 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -492,7 +492,6 @@ function this:ShopItemAdapter(shopItem, itemData) local lockTip = Util.GetGameObject(shopItem, "lock/tip"):GetComponent("Text") local new = Util.GetGameObject(shopItem, "GameObject/new") -- 计算数据 - LogError("11111111111111") local itemInfo = ShopManager.GetShopItemInfo(itemData.id) local curBuyCount = itemData.buyNum