From 2238dc5db499604976af423d8c59656de6a4e40d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 29 Oct 2020 15:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8A=BD=E5=8D=A1=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PokemonSummonOneResultPanel.prefab | 674 +----------------- .../PokemonSummonTenResultPanel.prefab | 54 +- .../Pokemon/PokemonSingleResultPanel.lua | 1 - .../Pokemon/PokemonSummonOneResultPanel.lua | 125 ++-- .../Modules/Pokemon/PokemonSummonPanel.lua | 17 +- .../Pokemon/PokemonSummonTenResultPanel.lua | 84 ++- 6 files changed, 145 insertions(+), 810 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab index 71c8adcef0..c0c4df81e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab @@ -126,7 +126,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224115785939912884 RectTransform: m_ObjectHideFlags: 0 @@ -4828,7 +4828,7 @@ ParticleSystem: --- !u!199 &199130457302089272 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4887,81 +4887,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &1179070599225864 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224373443571192660} - - component: {fileID: 222677805473648860} - - component: {fileID: 114544635340943090} - m_Layer: 5 - m_Name: Tip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &224373443571192660 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179070599225864} - 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: 224810340878879106} - m_Father: {fileID: 8131768283132569870} - 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: -79} - m_SizeDelta: {x: 378, y: 38} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222677805473648860 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179070599225864} - m_CullTransparentMesh: 0 ---- !u!114 &114544635340943090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179070599225864} - 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: 32b75fe2f69cff94990b60f7da6d84c0, 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 &1185667271424312 GameObject: m_ObjectHideFlags: 0 @@ -5137,102 +5062,6 @@ RectTransform: m_AnchoredPosition: {x: -1, y: 121} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1240808608951552 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224810340878879106} - - component: {fileID: 222113410454061376} - - component: {fileID: 114821219936429948} - - component: {fileID: 1937597109888991931} - m_Layer: 5 - m_Name: contentDetailText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224810340878879106 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1240808608951552} - 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: 224373443571192660} - 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.000011126, y: 0.0000097752} - m_SizeDelta: {x: 378, y: 38} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222113410454061376 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1240808608951552} - m_CullTransparentMesh: 0 ---- !u!114 &114821219936429948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1240808608951552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &1937597109888991931 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1240808608951552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9647059, g: 0.91764706, b: 0.85882354, 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 43 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u989D\u5916\u8D60\u90011\u4E2A\u5996\u7075\u7389" - LanguageIndex: 11602 --- !u!1 &1248689654753806 GameObject: m_ObjectHideFlags: 0 @@ -5264,8 +5093,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8131768283132569870} - - {fileID: 5516413843649955285} - {fileID: 3569102849833951929} m_Father: {fileID: 224361279008326358} m_RootOrder: 1 @@ -5373,80 +5200,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1283128537326878 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224659400319415462} - - component: {fileID: 222186566149293910} - - component: {fileID: 114442461379642620} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224659400319415462 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283128537326878} - 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: 8131768283132569870} - 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: 55.5, y: 5.3999996} - m_SizeDelta: {x: 68, y: 68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222186566149293910 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283128537326878} - m_CullTransparentMesh: 0 ---- !u!114 &114442461379642620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283128537326878} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 736a9af00badfd1499b4e4fa4a93ef05, 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 &1312687109414036 GameObject: m_ObjectHideFlags: 0 @@ -10144,7 +9897,7 @@ ParticleSystem: --- !u!199 &199762737609823424 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14791,7 +14544,7 @@ ParticleSystem: --- !u!199 &199080318784643404 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19667,7 +19420,7 @@ ParticleSystem: --- !u!199 &199703938132574080 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19726,86 +19479,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &1473816691117252 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224210131279108994} - - component: {fileID: 222504921213422130} - - component: {fileID: 4571533530401051956} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224210131279108994 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1473816691117252} - m_LocalRotation: {x: -0, y: -0, z: 0.0031373338, w: 0.9999951} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8131768283132569870} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20.342, y: 5} - m_SizeDelta: {x: 313.53, y: 79.56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222504921213422130 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1473816691117252} - m_CullTransparentMesh: 0 ---- !u!114 &4571533530401051956 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1473816691117252} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09803922, g: 0.14901961, b: 0.18431373, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 44 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 45 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u518D\u67651\u6B21 \xD71" - LanguageIndex: 11601 --- !u!1 &1531464004696380 GameObject: m_ObjectHideFlags: 0 @@ -24561,7 +24234,7 @@ ParticleSystem: --- !u!199 &199260698072189912 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29687,7 +29360,7 @@ ParticleSystem: --- !u!199 &199218959580742590 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34601,7 +34274,7 @@ ParticleSystem: --- !u!199 &199817266957694956 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34677,7 +34350,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224227489829804688 RectTransform: m_ObjectHideFlags: 0 @@ -35064,160 +34737,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 200 LanguageIndex: 0 ---- !u!1 &1213226352793152472 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3573447878097280744} - - component: {fileID: 2656016630952951909} - - component: {fileID: 705114386340367348} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3573447878097280744 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1213226352793152472} - m_LocalRotation: {x: -0, y: -0, z: 0.0031373338, w: 0.9999951} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5516413843649955285} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 6.6} - m_SizeDelta: {x: 313.53, y: 79.56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2656016630952951909 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1213226352793152472} - m_CullTransparentMesh: 0 ---- !u!114 &705114386340367348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1213226352793152472} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09803922, g: 0.14901961, b: 0.18431373, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 44 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u518D\u67651\u6B21" - LanguageIndex: 11603 ---- !u!1 &1316049997361237626 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1044537617359068752} - - component: {fileID: 5446561674145966314} - - component: {fileID: 3726250720651595697} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1044537617359068752 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316049997361237626} - 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: 5516413843649955285} - 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: -113.2, y: -78.3} - m_SizeDelta: {x: 68, y: 68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5446561674145966314 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316049997361237626} - m_CullTransparentMesh: 0 ---- !u!114 &3726250720651595697 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1316049997361237626} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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: 736a9af00badfd1499b4e4fa4a93ef05, 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 &1562574766218989162 GameObject: m_ObjectHideFlags: 0 @@ -35544,85 +35063,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5729047327699052114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6141473391524331091} - - component: {fileID: 8773244221746884607} - - component: {fileID: 1651781025042680383} - m_Layer: 5 - m_Name: Num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6141473391524331091 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5729047327699052114} - m_LocalRotation: {x: -0, y: -0, z: 0.0031373338, w: 0.9999951} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5516413843649955285} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0000095367, y: -78.300026} - m_SizeDelta: {x: 178.02, y: 79.56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8773244221746884607 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5729047327699052114} - m_CullTransparentMesh: 0 ---- !u!114 &1651781025042680383 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5729047327699052114} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.09803922, g: 0.14901961, b: 0.18431373, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 44 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 45 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 100000 --- !u!1 &6974725393944192383 GameObject: m_ObjectHideFlags: 0 @@ -35655,7 +35095,7 @@ RectTransform: - {fileID: 3374717592909965527} - {fileID: 4119839416818919956} m_Father: {fileID: 224969362660561018} - m_RootOrder: 2 + 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} @@ -35685,97 +35125,3 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 ---- !u!1 &7172853520220986490 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8131768283132569870} - - component: {fileID: 6635452099903538739} - m_Layer: 5 - m_Name: Content1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8131768283132569870 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7172853520220986490} - 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: 224210131279108994} - - {fileID: 224659400319415462} - - {fileID: 224373443571192660} - m_Father: {fileID: 224969362660561018} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6635452099903538739 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7172853520220986490} - m_CullTransparentMesh: 0 ---- !u!1 &7275659495065071499 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5516413843649955285} - - component: {fileID: 5061344776500776057} - m_Layer: 5 - m_Name: Content2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5516413843649955285 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7275659495065071499} - 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: 3573447878097280744} - - {fileID: 1044537617359068752} - - {fileID: 6141473391524331091} - m_Father: {fileID: 224969362660561018} - 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: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5061344776500776057 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7275659495065071499} - m_CullTransparentMesh: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab index da25f45f36..87efb4e543 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonTenResultPanel.prefab @@ -4968,7 +4968,7 @@ ParticleSystem: --- !u!199 &199244119203112348 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10461,7 +10461,7 @@ ParticleSystem: --- !u!199 &199792808770953112 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15340,7 +15340,7 @@ ParticleSystem: --- !u!199 &199794337862796524 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20257,7 +20257,7 @@ ParticleSystem: --- !u!199 &199523818938226048 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25165,7 +25165,7 @@ ParticleSystem: --- !u!199 &199911596257148998 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30281,7 +30281,7 @@ ParticleSystem: --- !u!199 &199985042618264852 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35120,7 +35120,7 @@ ParticleSystem: --- !u!199 &199432607171239872 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39885,7 +39885,7 @@ ParticleSystem: --- !u!199 &199533659340483552 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44805,7 +44805,7 @@ ParticleSystem: --- !u!199 &199621787209501796 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49645,7 +49645,7 @@ ParticleSystem: --- !u!199 &199833373325779906 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54410,7 +54410,7 @@ ParticleSystem: --- !u!199 &199105369059012342 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59368,7 +59368,7 @@ ParticleSystem: --- !u!199 &199307337939030274 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64568,7 +64568,7 @@ ParticleSystem: --- !u!199 &199630142152782450 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69709,7 +69709,7 @@ ParticleSystem: --- !u!199 &199908372348331668 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74592,7 +74592,7 @@ ParticleSystem: --- !u!199 &199168215033545836 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79164,7 +79164,7 @@ ParticleSystem: --- !u!199 &199843962628019544 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84097,7 +84097,7 @@ ParticleSystem: --- !u!199 &199509460733080424 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -89002,7 +89002,7 @@ ParticleSystem: --- !u!199 &199860908945259958 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93842,7 +93842,7 @@ ParticleSystem: --- !u!199 &199711737729748198 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98731,7 +98731,7 @@ ParticleSystem: --- !u!199 &199211786817537030 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -103570,7 +103570,7 @@ ParticleSystem: --- !u!199 &199370084343575042 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -108335,7 +108335,7 @@ ParticleSystem: --- !u!199 &199279108654796608 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -113323,7 +113323,7 @@ ParticleSystem: --- !u!199 &199618116003462224 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -118384,7 +118384,7 @@ ParticleSystem: --- !u!199 &199156070400067654 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -123226,7 +123226,7 @@ ParticleSystem: --- !u!199 &199370675453577378 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -128342,7 +128342,7 @@ ParticleSystem: --- !u!199 &199859284564772838 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -134139,7 +134139,7 @@ ParticleSystem: --- !u!199 &199831199738470310 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua index 7b3f3e006d..a4bcea1897 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSingleResultPanel.lua @@ -156,7 +156,6 @@ function PokemonSingleResultPanel:UpdataPanelData(_heroData) this.icon.sprite=Util.LoadSprite(artResourcesConfig[heroStaticData.Icon].Name) this.content.text = passiveSkillConfig[heroStaticData.SkillArray[1][2]].Desc - this.rolePanel:SetActive(true) this.goBtn:SetActive(true) PlayUIAnim(self.transform) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua index acfc9e45c1..f8bbfaf3bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua @@ -2,16 +2,12 @@ PokemonSummonOneResultPanel = Inherit(BasePanel) local this=PokemonSummonOneResultPanel local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) -local gameSetting=ConfigManager.GetConfig(ConfigName.GameSetting) local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) -local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",4401) -local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local itemNum=0 --抽卡小号道具数量 local isFree=false -local itemid = 0 -local itemnum = 0 +local itemId = 0 local RecruitMaxtimesId = 0 local freeTimesId = 0 --活动抽卡类型(动态的数据) @@ -19,7 +15,9 @@ local drawtType={ FindFairySingle=0, } +local YaojingCallPrivilegeId = 2006 local orginLayer +local itemViewList = {} --初始化组件(用于子类重写) function PokemonSummonOneResultPanel:InitComponent() orginLayer = 10 @@ -27,24 +25,16 @@ function PokemonSummonOneResultPanel:InitComponent() this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) screenAdapte(self.bg) this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton") - this.content=Util.GetGameObject(self.gameObject, "content") this.openOneAgainButton=Util.GetGameObject(self.gameObject, "bottom/openOneAgainButton") - this.detailImage=Util.GetGameObject(self.gameObject, "Tip") - this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text") - this.content1=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content1") - this.itemIcon1=Util.GetGameObject(this.content1, "Icon"):GetComponent("Image") - this.detailImage1=Util.GetGameObject(this.content1, "Tip") - this.detailText1 = Util.GetGameObject(this.detailImage1, "contentDetailText"):GetComponent("Text") + this.content3=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content3") this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image") this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text") this.itemInfo3=Util.GetGameObject(this.content3, "info"):GetComponent("Text") - this.content2=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content2") - this.itemIcon2=Util.GetGameObject(this.content2, "Icon"):GetComponent("Image") - this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text") - -- 关于抽卡的LotterySetting数据 - local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) - drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id + + this.content=Util.GetGameObject(self.gameObject, "content") + this.detailImage=Util.GetGameObject(self.gameObject, "Tip") + this.detailText = Util.GetGameObject(this.detailImage, "Text"):GetComponent("Text") end --绑定事件(用于子类重写) @@ -55,31 +45,31 @@ function PokemonSummonOneResultPanel:BindEvent() end) Util.AddClick(this.openOneAgainButton, function () --是否超过每日最大上限 - if PrivilegeManager.GetPrivilegeUsedTimes(RecruitMaxtimesId) + 1 > privilegeConfig[RecruitMaxtimesId].Condition[1][2] then + if PrivilegeManager.GetPrivilegeUsedTimes(RecruitMaxtimesId) < 1 then PopupTipPanel.ShowTip(Language[11760]) return end --是否妖晶,是否超过每日妖晶最大上限 - if itemid == 16 then - if PrivilegeManager.GetPrivilegeUsedTimes(2006) + 1 > privilegeConfig[2006].Condition[1][2] then + if itemId == 16 then + if PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId) < 1 then PopupTipPanel.ShowTip("今日妖晶召唤次数不足!") return end end if not isFree then - if BagManager.GetItemCountById(itemid) < itemNum then - PopupTipPanel.ShowTip(ItemConfig[itemid].Name..Language[10492]) + if BagManager.GetItemCountById(itemId) < itemNum then + PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492]) return end end RecruitManager.RecruitRequest(this.recruitType, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,1)--记录抽卡次数 - if itemid == 16 then - PrivilegeManager.RefreshPrivilegeUsedTimes(2006,1)--记录妖晶抽卡次数 + if itemId == 16 then + PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,1)--记录妖晶抽卡次数 end UIManager.OpenPanel(UIName.PokemonSingleResultPanel,this.recruitType,msg.drop) --CheckRedPointStatus(RedPointType.QianKunBox) - end,freeTimesId,itemid,itemNum) + end,freeTimesId,itemId,itemNum) end) end @@ -107,31 +97,15 @@ function PokemonSummonOneResultPanel:OnOpen(...) this.drop=args[1] this.recruitType = args[2] this.detailImage:SetActive(true) - this.content1:SetActive(false) - this.content2:SetActive(false) this.content3:SetActive(true) - local itemId=0 - local d - - d = RecruitManager.GetExpendData(this.recruitType) - itemId=d[1] - itemNum=d[2] - this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) - --是否激活特权 - local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(3004) - local currPrivilege=privilegeConfig[3004] - if itemId == 16 and isActive then - itemNum=itemNum*(1+currPrivilege.Condition[1][2]/10000) - end - --获取免费次数 - local currLottery= ConfigManager.GetConfigData(ConfigName.LotterySetting,42) + local currLottery= ConfigManager.GetConfigData(ConfigName.LotterySetting,RecruitType.LingShowSingle) freeTimesId=currLottery.FreeTimes RecruitMaxtimesId = currLottery.MaxTimes local freeTime=0 if freeTimesId>0 then freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) - RecruitManager.freeUseTimeList[freeTimesId]=freeTime + RecruitManager.freeUseTimeList[freeTimesId] = freeTime end isFree=freeTime and freeTime >= 1 if isFree then @@ -142,42 +116,51 @@ function PokemonSummonOneResultPanel:OnOpen(...) this.itemNum3.gameObject:SetActive(true) this.itemIcon3.gameObject:SetActive(true) this.itemInfo3.text=Language[12418] + itemId=0 + local d = RecruitManager.GetExpendData(this.recruitType) + itemId = d[1] + itemNum = d[2] + --是否激活特权 + local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(3004) + if itemId == 16 and isActive then + local currPrivilege = privilegeConfig[3004] + itemNum = itemNum * (1+currPrivilege.Condition[1][2]/10000) + end + this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) + this.itemNum3.text= tostring(itemNum) end - this.itemNum3.text= tostring(itemNum) - Util.ClearChild(Util.GetTransform(this.content, "itemContent1")) - this.itemDataList={} - this.itemDataList=BagManager.GetTableByBackDropData(this.drop) + this.itemDataList = {} + this.itemDataList = BagManager.GetTableByBackDropData(this.drop) --抽奖赠送物品 - local tenConfig=lotterySetting[RecruitType.LingShowSingle] - itemid=0 - itemnum=0 - local ishave=false + local tenConfig = lotterySetting[RecruitType.LingShowSingle] + local itemid = 0 + local itemnum = 0 + local ishave = false if tenConfig then - itemid=tenConfig.TenTimesMustGetItem[1][1] - itemnum=tenConfig.TenTimesMustGetItem[1][2] + itemid = tenConfig.TenTimesMustGetItem[1][1] + itemnum = tenConfig.TenTimesMustGetItem[1][2] end for key, value in pairs(this.itemDataList) do - if ishave==false and value.sId==itemid and value.num==itemnum then + if ishave == false and value.sId == itemid and value.num == itemnum then table.removebyvalue(this.itemDataList,value) - ishave=true + ishave = true end end this.detailText.text = string.format("赠送%s个%s",itemnum,ItemConfig[itemid].Name) - this.view = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(this.content, "itemContent1")) - this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder) - this.openOneAgainButton:GetComponent("Button").enabled=false - local time = Timer.New(function () - this.openOneAgainButton:GetComponent("Button").enabled=true - local itemDataList=BagManager.GetTableByBackDropData(this.drop) - if itemDataList and #itemDataList>0 then - local singleItemConfigData=itemDataList[1].configData - if singleItemConfigData and singleItemConfigData.ItemType==4 and singleItemConfigData.Quantity>=gameSetting[1].IfVersion then - UIManager.OpenPanel(UIName.SecretBoxShowPokemonPanel,singleItemConfigData.Id) - end - end - end, 0.5) - time:Start() - + if not itemViewList then + itemViewList = {} + end + for k,v in pairs(itemViewList) do + v.gameObject:SetActive(false) + end + for i = 1, #this.itemDataList do + if not itemViewList[i] then + Util.GetTransform(this.content, "itemContent"..i).gameObject:SetActive(true) + itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(this.content, "itemContent"..i)) + end + itemViewList[i].gameObject:SetActive(true) + itemViewList[i]:OnOpen(true,this.itemDataList[i],1.4,true,false,false,self.sortingOrder) + end end --界面关闭时调用(用于子类重写) function PokemonSummonOneResultPanel:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index 38be21fa5b..a7a5fbacbf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -9,15 +9,16 @@ local bType={ local btns={ [bType.Btn1]={name="Btn1",isInfo=Language[10644]}, [bType.Btn10]={name="Btn10",isInfo=Language[12182]}} local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) -local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) -local lotterySpecialConfig = ConfigManager.GetConfig(ConfigName.LotterySpecialConfig) local freeTime= 0 --免费抽取次数 local isActive=false --是否激活特权 local leftTime=0 --特权剩余时间 + +local YaojingCallPrivilegeId = 2006 + function PokemonSummonPanel:InitComponent(gameObject) self.btn_back=Util.GetGameObject(self.transform, "btn_back") @@ -92,8 +93,8 @@ function PokemonSummonPanel:refreshBtnShow() local freeTimesId = currLottery.FreeTimes local maxtimesId = currLottery.MaxTimes --lotterySetting表中的MaxTimes对应privilegeConfig表中的id local curTimes = PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId) - self.tenHintTxt.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeUsedTimes(2006), privilegeConfig[2006].Condition[1][2]) - self.limitTxt.text = Language[12225]..curTimes.."/"..privilegeConfig[maxtimesId].Condition[1][2] + self.tenHintTxt.text=string.format("妖晶召唤次数:%s/%s",PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId), PrivilegeManager.GetPrivilegeNumber(YaojingCallPrivilegeId)) + self.limitTxt.text = Language[12225]..curTimes.."/"..PrivilegeManager.GetPrivilegeNumber(maxtimesId) if freeTimesId > 0 then freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) RecruitManager.freeUseTimeList[freeTimesId] = freeTime @@ -163,13 +164,13 @@ function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,fr end --是否超过每日最大上限 - if PrivilegeManager.GetPrivilegeUsedTimes(RecruitMaxtimesId) + num > privilegeConfig[RecruitMaxtimesId].Condition[1][2] then + if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < num then PopupTipPanel.ShowTip(Language[11760]) return end --是否妖晶,是否超过每日妖晶最大上限 if itemId == 16 then - if PrivilegeManager.GetPrivilegeUsedTimes(2006) + num > privilegeConfig[2006].Condition[1][2] then + if PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId) < num then PopupTipPanel.ShowTip("今日妖晶召唤次数不足!") return end @@ -186,7 +187,7 @@ function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,fr RecruitManager.RecruitRequest(id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)--记录抽卡次数 - PrivilegeManager.RefreshPrivilegeUsedTimes(2006,num)--记录妖晶抽卡次数 + PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,num)--记录妖晶抽卡次数 UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop) --CheckRedPointStatus(RedPointType.QianKunBox) end, @@ -197,7 +198,7 @@ function PokemonSummonPanel:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,fr RecruitManager.RecruitRequest(id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num)--记录抽卡次数 if itemId == 16 then - PrivilegeManager.RefreshPrivilegeUsedTimes(2006,num)--记录妖晶抽卡次数 + PrivilegeManager.RefreshPrivilegeUsedTimes(YaojingCallPrivilegeId,num)--记录妖晶抽卡次数 end UIManager.OpenPanel(UIName.PokemonSingleResultPanel,id,msg.drop) --CheckRedPointStatus(RedPointType.QianKunBox) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua index 3631d78428..9983d1dd1e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua @@ -14,10 +14,11 @@ local drawtType={ FindFairyTen=0, } local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) -local callList = Stack.New() +--local callList = Stack.New() this.contentList={} this.contentListParent={} this.isElementDrawPanel=false +local YaojingCallPrivilegeId = 2006 local orginLayer --初始化组件(用于子类重写) function PokemonSummonTenResultPanel:InitComponent() @@ -57,20 +58,20 @@ function PokemonSummonTenResultPanel:BindEvent() self:ClosePanel() end) Util.AddClick(this.openTenAgainButton, function () - local maxTimesId = lotterySetting[this.recruitType].maxTimesId - local freeTimesId = lotterySetting[this.recruitType].FreeTimesId + local maxTimesId = lotterySetting[RecruitType.LingShowSingle].maxTimesId + local freeTimesId = lotterySetting[RecruitType.LingShowSingle].FreeTimesId --是否超过每日最大上限 - if PrivilegeManager.GetPrivilegeUsedTimes(maxTimesId) + 10 > privilegeConfig[maxTimesId].Condition[1][2] then + if PrivilegeManager.GetPrivilegeUsedTimes(maxTimesId) < 1 then PopupTipPanel.ShowTip(Language[11760]) return end --是否妖晶,是否超过每日妖晶最大上限 if itemId == 16 then - if PrivilegeManager.GetPrivilegeUsedTimes(2006) + 10 > privilegeConfig[2006].Condition[1][2] then + if PrivilegeManager.GetPrivilegeRemainValue(YaojingCallPrivilegeId) < 1 then PopupTipPanel.ShowTip("今日妖晶召唤次数不足!") return end - end + end if BagManager.GetItemCountById(itemId) < itemNum then PopupTipPanel.ShowTip(ItemConfig[itemId].Name..Language[10492]) return @@ -122,15 +123,17 @@ function PokemonSummonTenResultPanel:OnOpen(...) this.content3:SetActive(true) local d - d=RecruitManager.GetExpendData(this.recruitType) - itemId=d[1] - itemNum=d[2] + d = RecruitManager.GetExpendData(this.recruitType) + itemId = d[1] + itemNum = d[2] this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(3004) - if itemNum>10 and isActive then - itemNum=itemNum*(1+currPrivilege.Condition[1][2]/10000) + if itemId == 16 and isActive then + local currPrivilege = privilegeConfig[3004] + itemNum = itemNum*(1+currPrivilege.Condition[1][2]/10000) end this.itemNum3.text= tostring(itemNum) + local itemDataList={} itemDataList=BagManager.GetTableByBackDropData(this.drop) local tenConfig=lotterySetting[43] @@ -141,6 +144,7 @@ function PokemonSummonTenResultPanel:OnOpen(...) id=tenConfig.TenTimesMustGetItem[1][1] num=tenConfig.TenTimesMustGetItem[1][2] end + for key, value in pairs(itemDataList) do if ishave==false and value.sId==id and value.num==num then table.removebyvalue(itemDataList,value) @@ -148,40 +152,42 @@ function PokemonSummonTenResultPanel:OnOpen(...) end end this.detailText.text = string.format("赠送%s个%s",num,ItemConfig[id].Name) - this.openTenAgainButton:GetComponent("Button").enabled=false - this.btnBack:GetComponent("Button").enabled=false - callList:Clear() - callList:Push(function () - this.openTenAgainButton:GetComponent("Button").enabled=true - this.btnBack:GetComponent("Button").enabled=true - end) - this.views = {} + if not this.views then + this.views = {} + end + for k,v in pairs(this.views) do + v.gameObject:SetActive(false) + end + this.itemDataList = itemDataList local dataNum = #itemDataList > 10 and 10 or #itemDataList for i = dataNum, 1, -1 do - Util.ClearChild(this.contentList[i].transform) - this.views[i] = SubUIManager.Open(SubUIConfig.ItemView,this.contentList[i].transform) - local curItemData=itemDataList[i] + if not this.views[i] then + this.views[i] = SubUIManager.Open(SubUIConfig.ItemView,this.contentList[i].transform) + end + this.views[i].gameObject:SetActive(true) + local curItemData = itemDataList[i] local contentGO = this.contentListParent[i] this.views[i]:OnOpen(true,curItemData,1.4,true,false,false,self.sortingOrder) - contentGO:SetActive(false) - callList:Push(function () - if curItemData.configData and curItemData.configData.ItemType==4 and curItemData.configData.Quantity>=gameSetting[1].IfVersion then - UIManager.OpenPanel(UIName.SecretBoxShowPokemonPanel,curItemData.configData.Id, function () - Timer.New(function () - contentGO:SetActive(true) - callList:Pop()() - end, 0.2):Start() - end) - else - Timer.New(function () - contentGO:SetActive(true) - callList:Pop()() - end, 0.2):Start() - end - end) + contentGO:SetActive(true) + + -- callList:Push(function () + -- if curItemData.configData and curItemData.configData.ItemType==4 and curItemData.configData.Quantity>=gameSetting[1].IfVersion then + -- UIManager.OpenPanel(UIName.SecretBoxShowPokemonPanel,curItemData.configData.Id, function () + -- Timer.New(function () + -- contentGO:SetActive(true) + -- callList:Pop()() + -- end, 0.2):Start() + -- end) + -- else + -- Timer.New(function () + -- contentGO:SetActive(true) + -- callList:Pop()() + -- end, 0.2):Start() + -- end + -- end) end - callList:Pop()() + --callList:Pop()() end --界面关闭时调用(用于子类重写)