diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index 579de11457..5247aa8d19 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -257,7 +257,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -815,7 +815,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1563,7 +1563,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6558190934920654365} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -2164,7 +2164,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2406,8 +2406,6 @@ GameObject: m_Component: - component: {fileID: 8463856118875763708} - component: {fileID: 4256548705947837650} - - component: {fileID: 6793975481586817352} - - component: {fileID: 4218889913923796855} m_Layer: 5 m_Name: fetterItem m_TagString: Untagged @@ -2432,7 +2430,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -3.4, y: -896} + m_AnchoredPosition: {x: -2110, y: -960} m_SizeDelta: {x: 916, y: 420} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4256548705947837650 @@ -2443,68 +2441,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5002673472146461038} m_CullTransparentMesh: 0 ---- !u!114 &6793975481586817352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5002673472146461038} - 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: 0} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &4218889913923796855 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5002673472146461038} - 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!1 &5124062953930767245 GameObject: m_ObjectHideFlags: 0 @@ -2587,7 +2523,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 3583962606904359054} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -2695,7 +2631,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 4698143225037359874} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -2780,7 +2716,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2854,7 +2790,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -3515,7 +3451,7 @@ 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: -308, y: -0.66001} + m_AnchoredPosition: {x: -308, y: -0.66000366} m_SizeDelta: {x: 223.2, y: 340.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1445560160816747504 @@ -3941,7 +3877,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4234,7 +4170,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.4117647} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4331,7 +4267,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 555710348116302688} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -4416,7 +4352,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4490,7 +4426,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4676,7 +4612,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.000061035, y: 81.975} + m_AnchoredPosition: {x: -0.000061035156, y: 81.975006} m_SizeDelta: {x: -0, y: 164.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &551462396334624459 @@ -4701,7 +4637,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4775,7 +4711,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5326,7 +5262,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 1262460212892928999} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -5758,7 +5694,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00009397587} + m_AnchoredPosition: {x: 0, y: -0.000030994765} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1537562228229781123 @@ -6113,6 +6049,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.0000095367 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -9.5 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 584.9 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 877.1 + objectReference: {fileID: 0} - target: {fileID: 7990096374097274949, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -6305,6 +6261,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.0000095367 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -9.5 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 584.9 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 877.1 + objectReference: {fileID: 0} - target: {fileID: 7990096374097274949, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -6477,6 +6453,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.00000026822 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 511.3 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 766.8 + objectReference: {fileID: 0} - target: {fileID: 7990096374097274949, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -6669,6 +6665,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.0000095367 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -9.5 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 584.9 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 877.1 + objectReference: {fileID: 0} - target: {fileID: 7990096374097274949, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -6911,6 +6927,26 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 2.1 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.2 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 507.1 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 760.4 + objectReference: {fileID: 0} - target: {fileID: 7990096374097274949, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua index 99a47ecddc..0485e44c26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua @@ -60,7 +60,7 @@ function this.CreatEmptyItemData(id) str = this.GetproDesStr(str,this.itemDataList[id].proDatas) table.insert(this.itemDataList[id].proDesList,str) this.itemDataList[id].skillDatas = ChangingCard[id].Skill - this.itemDataList[id].skillDes = PassiveSkillConfig[ChangingCard[id].Skill].desc2 + this.itemDataList[id].skillDes = PassiveSkillConfig[ChangingCard[id].Skill].Desc table.insert(this.itemDataList[id].proDesList,this.itemDataList[id].skillDes) end diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index 8c9994adae..99bf973860 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -66,6 +66,7 @@ function IncarnationPanel:BindEvent() end for i = 1,3 do Util.AddClick(self.upLayoutItemList[i].getBtn, function() + LogGreen("sdfsfdsfad") if self.upLayoutData[i] and self.upLayoutData[i].id then local pos = self:FindDatasIndexById(self.upLayoutData[i].id) if pos > 0 then @@ -192,7 +193,7 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index) if not isJump then self.cardList[cardPre].icon.texture = CardRendererManager.GetSpineTexture(index, liveName, Vector3.one * scale, livePos, true) else - self.cardList[cardPre].icon.texture = CardRendererManager.GetSpineTexture((index%3 == 0 and 6 or index%3 + 3), liveName, Vector3.one * scale, livePos, true) + self.cardList[cardPre].icon.texture = CardRendererManager.GetSpineTexture((index%4 == 0 and 7 or index%4 + 3), liveName, Vector3.one * scale, livePos, true) end self.cardList[cardPre].icon.transform.localScale = Vector3.one self.cardList[cardPre].icon.transform.localPosition = Vector3.zero @@ -234,6 +235,7 @@ function IncarnationPanel:SetSingleData(go,data,index) self.itemPreList[go].bg = Util.GetGameObject(self.itemPreList[go].obj,"bgdi"):GetComponent("Image") self.itemPreList[go].cardPre = Util.GetGameObject(self.itemPreList[go].obj,"cardPre") self.itemPreList[go].nameText = Util.GetGameObject(self.itemPreList[go].obj,"nameDi/nameText"):GetComponent("Text") + self.itemPreList[go].nameText1 = Util.GetGameObject(self.itemPreList[go].obj,"nameDi/nameText1"):GetComponent("Text") self.itemPreList[go].skillLayout = Util.GetGameObject(self.itemPreList[go].obj,"skillLayout") self.itemPreList[go].proGrid = Util.GetGameObject(self.itemPreList[go].skillLayout,"proScrolllRect/proScroll") self.itemPreList[go].pro = Util.GetGameObject(self.itemPreList[go].skillLayout,"pro") @@ -256,6 +258,7 @@ function IncarnationPanel:SetSingleData(go,data,index) go.gameObject:SetActive(true) self.itemPreList[go].bg.sprite = self.spLoader:LoadSprite(GetIncarnationDiImage[data.quality]) self.itemPreList[go].nameText.text = data.name + self.itemPreList[go].nameText1.text = data.name self.itemPreList[go].red.gameObject:SetActive(data.state == 0) self:RefreshSingleCardPre(self.itemPreList[go].cardPre,data,true,index) self:SetProList(data.proDesList,self.itemPreList[go].preList,self.itemPreList[go].proGrid,self.itemPreList[go].pro.gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 73f027c43c..487f73d02c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -257,6 +257,17 @@ function this.GetManyItems(text) end) return end + if text == "一键变身卡" then + local config = (ConfigManager.TryGetAllConfigsDataByKey(ConfigName.ItemConfig,"ItemType",ItemType.Incarnation)) + local cor = coroutine.start(function() + for k,v in ipairs(config) do + local str = "1#" .. v.Id .."#" .. 1 + NetManager.GMEvent(str) + coroutine.wait(0.1) + end + end) + return + end if text and text ~= "" then local list = string.split(text, "|") local cor = coroutine.start(function()