From 7afe25a5d23ae5cba03bc2db914897ecc7fcef58 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 5 Sep 2020 17:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=BC=95=E5=AF=BC=E6=B7=BB=E5=8A=A0=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=BB=B6=E6=97=B6=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/BattleBestPopup.prefab | 8 +- .../Prefabs/UI/Battle/BattlePanel.prefab | 173 ++++++++++-------- .../Prefabs/UI/Popup/RewardItemPopup.prefab | 6 +- .../UI/Story/StoryDialoguePanel.prefab | 15 ++ .../~Lua/Modules/Guide/GuideManager.lua | 7 +- .../~Lua/Modules/Guide/GuidePanel.lua | 13 +- 6 files changed, 130 insertions(+), 92 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab index 9af28fafe9..8cd07cf79a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab @@ -305,9 +305,9 @@ RectTransform: m_Father: {fileID: 8485517753741111699} m_RootOrder: 2 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: -878.9004} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 81.09961} m_SizeDelta: {x: 348, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &624247546002579982 @@ -762,7 +762,7 @@ RectTransform: m_GameObject: {fileID: 8563711495426823861} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.000214, y: 1.000214, z: 1.000214} + m_LocalScale: {x: 1.0002939, y: 1.0002939, z: 1.0002939} m_Children: - {fileID: 8485403251740261867} - {fileID: 954060572830645932} diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 2f7093aec5..01cdeee452 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -30496,7 +30496,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: 1188, y: 2112} + m_SizeDelta: {x: 2000, y: 3000} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &-618232707117076359 CanvasRenderer: @@ -31575,7 +31575,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: 1188, y: 2112} + m_SizeDelta: {x: 2000, y: 3000} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &-8287632971253627053 CanvasRenderer: @@ -56490,6 +56490,7 @@ GameObject: - component: {fileID: 4779808998161001501} - component: {fileID: 8840677247429585536} - component: {fileID: -6487318030585684567} + - component: {fileID: 2566837489994421799} m_Layer: 5 m_Name: BattlePanel m_TagString: Untagged @@ -56621,6 +56622,20 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 +--- !u!114 &2566837489994421799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257868926972537042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} + m_Name: + m_EditorClassIdentifier: + bgList: + - {fileID: 144333933674822358} --- !u!1 &308455831692408764 GameObject: m_ObjectHideFlags: 0 @@ -94077,7 +94092,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: 1188, y: 2112} + m_SizeDelta: {x: 2000, y: 3000} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &102999022 Canvas: @@ -143627,22 +143642,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -143662,6 +143667,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &3299304833170184155 stripped @@ -143792,22 +143807,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -143827,6 +143832,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &3568172007904461191 stripped @@ -143847,6 +143862,16 @@ PrefabInstance: propertyPath: m_Name value: TongYong_Casting_Shang objectReference: {fileID: 0} + - target: {fileID: 6210025963494768122, guid: a6d8e39b4fb07024f9346b5be60e8591, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 6210025963494768122, guid: a6d8e39b4fb07024f9346b5be60e8591, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} - target: {fileID: 6210025964156221442, guid: a6d8e39b4fb07024f9346b5be60e8591, type: 3} propertyPath: m_LocalPosition.x @@ -143952,16 +143977,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6210025963494768122, guid: a6d8e39b4fb07024f9346b5be60e8591, - type: 3} - propertyPath: m_LocalScale.x - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 6210025963494768122, guid: a6d8e39b4fb07024f9346b5be60e8591, - type: 3} - propertyPath: m_LocalScale.y - value: 1.1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6d8e39b4fb07024f9346b5be60e8591, type: 3} --- !u!224 &5043862931366824727 stripped @@ -144092,22 +144107,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -144127,6 +144132,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &4455376260965493203 stripped @@ -144257,22 +144272,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -144292,6 +144297,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2253336046086876964 stripped @@ -144422,22 +144437,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -144457,6 +144462,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2111174513181719573 stripped @@ -144587,22 +144602,12 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -144622,6 +144627,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &6954216252396688781 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab index f04227bbca..e4175f864f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab @@ -651,9 +651,9 @@ RectTransform: m_Father: {fileID: 224749956008792846} 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: -883} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 77} m_SizeDelta: {x: 380, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222893025295993902 diff --git a/Assets/ManagedResources/Prefabs/UI/Story/StoryDialoguePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Story/StoryDialoguePanel.prefab index 04c6aef814..c0c622a706 100644 --- a/Assets/ManagedResources/Prefabs/UI/Story/StoryDialoguePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Story/StoryDialoguePanel.prefab @@ -1190,6 +1190,7 @@ GameObject: - component: {fileID: 223265454327814054} - component: {fileID: 114453428731825386} - component: {fileID: 114465036408270010} + - component: {fileID: 6359248347475167465} m_Layer: 5 m_Name: StoryDialoguePanel m_TagString: Untagged @@ -1314,6 +1315,20 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 0 +--- !u!114 &6359248347475167465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705648980807230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3} + m_Name: + m_EditorClassIdentifier: + bgList: + - {fileID: 1075037688837128} --- !u!1 &1734701181599336 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index a2cdc1e648..f8b49eb7d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -52,7 +52,7 @@ function this.InitData(guideData) for i = 1, #guideData do local guide = guideData[i] openDic[guide.type] = guide.id - if guide.id ~= -1 then + if guide.id ~= -1 and guide.type ~= GuideType.Check then local openType = GuideConfig[guide.id].OpenType local openArgs = GuideConfig[guide.id].OpenArgs this.RefreshTriggerListen(guide.id, openType, openArgs) @@ -172,6 +172,11 @@ function this.SyncServer(id) --同步到后端 end end +-- 检测服务器延迟, +function this.CheckServer(func) + NetManager.SaveGuideDataRequest(GuideType.Check, 0, func) +end + --更新触发监听 function this.RefreshTriggerListen(id, openType, openArgs) if openType == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 0e0fbd81b7..c957560fdb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -135,11 +135,14 @@ function this.ExecuteBehavior(beType, beArgs) -- end local curGuideId = curId btn.onClick:Invoke() --该按钮事件有可能会触发下一步引导,因此需要监听变化 - if curGuideId == curId then - this.NextGuide() - end - this.button:GetComponent("Button").onClick:RemoveAllListeners() - Util.AddClick(this.button, this.NextGuide) + -- 触发按钮事件后,检测服务器延迟,收到服务器回调后继续下一步引导 + GuideManager.CheckServer(function() + if curGuideId == curId then + this.NextGuide() + end + this.button:GetComponent("Button").onClick:RemoveAllListeners() + Util.AddClick(this.button, this.NextGuide) + end) end) if UIManager.IsOpen(UIName.MainPanel) and string.find(btn.transform.parent.name, "layer") ~= nil then --主界面的ui按钮位置可能会超框,所以做位移处理 for k, v in pairs(MainPanel.operateIcon) do