From 791af67033d5671d285956b7da946d8db28e0234 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Mon, 13 Jul 2020 20:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E7=A5=AD=E7=A5=80?= =?UTF-8?q?=E3=80=91=E7=A5=AD=E7=A5=80=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=86=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Guild/GuildFetePopup.prefab | 47 +++++++++---------- .../~Lua/Modules/Guild/GuildFetePopup.lua | 5 +- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index 361458e02d..20f8f00e3c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -5024,7 +5024,7 @@ ParticleSystem: --- !u!199 &5040103470708412571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -6349,7 +6349,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 3, y: 3, z: 3} initFloat: 0 @@ -11205,7 +11204,7 @@ ParticleSystem: --- !u!199 &7022009138468795937 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15917,7 +15916,7 @@ ParticleSystem: --- !u!199 &21284196286945555 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16165,8 +16164,8 @@ 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: 0, y: 0} - m_SizeDelta: {x: 720, y: 56.9} + m_AnchoredPosition: {x: 6.09, y: 0} + m_SizeDelta: {x: 774.32, y: 56.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &982280049108042693 MonoBehaviour: @@ -16209,7 +16208,7 @@ MonoBehaviour: m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 - m_MaxValue: 5000 + m_MaxValue: 1 m_WholeNumbers: 0 m_Value: 0 m_OnValueChanged: @@ -16325,8 +16324,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -2.542511, y: 0} - m_SizeDelta: {x: -5.085, y: 21.07} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.000061035, y: 21.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4638421448233966365 CanvasRenderer: @@ -16548,7 +16547,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 9.899994, y: 0} + m_AnchoredPosition: {x: -2.1099854, y: 0} m_SizeDelta: {x: 0, y: -37.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7588336350730211665 @@ -21232,7 +21231,7 @@ ParticleSystem: --- !u!199 &7662304376647596786 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21566,8 +21565,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 3.149994, y: 0} - m_SizeDelta: {x: 19.35, y: 56.9} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: 0, y: 56.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1945985251062723354 CanvasRenderer: @@ -27836,7 +27835,7 @@ ParticleSystem: --- !u!199 &6866467361509154070 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33073,7 +33072,7 @@ ParticleSystem: --- !u!199 &1327544058612887100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38872,7 +38871,7 @@ ParticleSystem: --- !u!199 &5724314893189987714 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43668,7 +43667,7 @@ ParticleSystem: --- !u!199 &6600377722598462734 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48525,7 +48524,7 @@ ParticleSystem: --- !u!199 &4723643438741483705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54002,7 +54001,7 @@ ParticleSystem: --- !u!199 &1522648081567467163 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59379,7 +59378,7 @@ ParticleSystem: --- !u!199 &557479208284238603 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64347,7 +64346,7 @@ ParticleSystem: --- !u!199 &2718336770233971512 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69320,7 +69319,7 @@ ParticleSystem: --- !u!199 &4783855359569395394 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74328,7 +74327,7 @@ ParticleSystem: --- !u!199 &1454716228256041344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -78959,7 +78958,7 @@ ParticleSystem: --- !u!199 &1406671002734066039 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/Guild/GuildFetePopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua index d8086ae1be..0d39053bea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua @@ -104,10 +104,7 @@ end --刷新进度条 function this.RefreshSlider() local maxValue=guildSacrificeRewardConfig[3].Score --最大进度 - - this.slider.minValue=0 - this.slider.maxValue=maxValue - this.slider.value=curValue + this.slider.value = curValue/maxValue this.sliderValueNum.text=curValue this.rewardBox:GetComponent("Canvas").sortingOrder = sortingOrder + 1