From d939e6b32b6948d63501ab9b79ff9627cbc28d9e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 17 Dec 2021 14:00:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E6=96=B0=E4=BA=BA=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/NewActivity/EveryDayGift.prefab | 39 +++++++++++++++++++ .../UI/RechargeView/RechargeView.prefab | 39 +++++++++++++++++++ .../Modules/Recharge/View/EveryDayGiftNew.lua | 2 +- .../Modules/Recharge/View/RechargeViewNew.lua | 2 +- .../ManagedResources/~Lua/View/ItemView.lua | 5 +-- 5 files changed, 82 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index 162b8c5d39..a991837e7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -4933,6 +4933,8 @@ GameObject: m_Component: - component: {fileID: 3375099720580535572} - component: {fileID: 6449646568492193447} + - component: {fileID: 8168218552008252908} + - component: {fileID: 4394463078046876473} m_Layer: 5 m_Name: Reward m_TagString: Untagged @@ -4983,6 +4985,43 @@ MonoBehaviour: m_Spacing: {x: 10, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!222 &8168218552008252908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316539571695134266} + m_CullTransparentMesh: 0 +--- !u!114 &4394463078046876473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316539571695134266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + 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 &460685693485688084 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab index e00cb38584..36f8c11491 100644 --- a/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RechargeView/RechargeView.prefab @@ -895,6 +895,8 @@ GameObject: m_Component: - component: {fileID: 5470173983883150034} - component: {fileID: 1801400158785066317} + - component: {fileID: 5377911845628719103} + - component: {fileID: 5030811962132307092} m_Layer: 5 m_Name: Reward m_TagString: Untagged @@ -945,6 +947,43 @@ MonoBehaviour: m_Spacing: {x: 10, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!222 &5377911845628719103 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153490993416923019} + m_CullTransparentMesh: 0 +--- !u!114 &5030811962132307092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153490993416923019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + 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 &2547803359770233581 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 2bf4cd77c7..2b92d5477d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -171,7 +171,7 @@ function EveryDayGiftNew:SetGrowGift() -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 - local data = not not growData[DynamicActivityManager.curLevel] and growData[DynamicActivityManager.curLevel] or growData[DynamicActivityManager.curLevel-1] + local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) Util.AddOnceClick(self.btnLeft,function () diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index a2c1eba540..c2b1a478be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -95,7 +95,7 @@ function RechargeViewNew:SetGrowGift() -- Log("当前声望Level:"..tostring(DynamicActivityManager.curLevel).." Index:"..tostring(DynamicActivityManager.Index)) --如果有当前声望数据,就显示,没有就显示上一档位 - local data = not not growData[DynamicActivityManager.curLevel] and growData[DynamicActivityManager.curLevel] or growData[DynamicActivityManager.curLevel-1] + local data = not not growData[DynamicActivityManager.Index] and growData[DynamicActivityManager.Index] or growData[DynamicActivityManager.Index-1] self:RefreshReward(data) Util.AddOnceClick(self.btnLeft,function () diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 7baad5deca..200f51fb61 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -417,7 +417,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.isRewardItemPop=false local itemSId = tonumber(_reward[1]) local itemNum = tonumber(_reward[2]) or 0 - self.Double:SetActive((_reward[3] and _reward[3] > 1) and true or false) + self.Double:SetActive((_reward[3] and _reward[3] == 2) and true or false) local itemDataConFig = ConfigManager.GetConfigData(ConfigName.ItemConfig, itemSId) self.fragmentIcon:SetActive(false) self.heroShowGo:SetActive(false) @@ -454,11 +454,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.EffectOrginScale = self.scale -- 卸载头像框特效 self:UnLoadFrameEffect() - if effectLayer > 0 and itemDataConFig.Quantity1 then self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity1 == 5) self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity1 == 6) - self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity1 == 7) + self.UI_effect_WuCai_Kuang:SetActive((itemDataConFig.Quantity1 == 7) or (_reward[3] and _reward[3] == 999)) end if itemDataConFig.ItemType == ItemType.NoType then --0无特殊分类 From d1ee1455eb21cb9bf23930c4d91946f10be967ec Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 27 Dec 2021 13:41:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=BD=97=E6=B5=AE=E8=B4=A7?= =?UTF-8?q?=E5=B8=81=E3=80=91=E8=B7=A8=E6=9C=8D=E5=A4=A9=E6=A2=AF=20?= =?UTF-8?q?=E7=BD=97=E6=B5=AE=E6=99=B6=E7=9F=B31207->=E9=80=90=E8=83=9C?= =?UTF-8?q?=E5=BE=BD=E7=AB=A024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a079f8d9d4..0c5474dda5 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -469,7 +469,7 @@ PanelType = { YiJingBaoKu = {14,16,1004},--易经宝库 LingShouBaoGe = {14,16,1204},--灵兽宝阁 SacredTree = {14,16,1211},--建木神树 - JumpServerHightLadder = {16,1207},--跨服天梯 + JumpServerHightLadder = {16,24},--跨服天梯 罗浮晶石1207->逐胜徽章24 HongMengProp = {100,16}, -- 鸿蒙阵 HongMengTower = {100,16,14,3},-- 鸿蒙碑 XinJiangLaiXi = {14,16,1210},--新将来袭 From 1c9d3caa75ea50223f32cf0fd6d574ec3a7e3e3b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 27 Dec 2021 14:00:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E7=BD=97=E6=B5=AE=E3=80=91?= =?UTF-8?q?=E5=8E=9F=E7=BD=97=E6=B5=AE=E5=95=86=E5=BA=97=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E9=80=90=E8=83=9C=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index 87bd5d9851..1a6abc6bec 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -64,7 +64,7 @@ function JumpServerHightLadderPanel:BindEvent() UIManager.OpenPanel(UIName.JumpServerHightLadderRecordPopup) end) Util.AddClick(this.shopBtn,function() - JumpManager.GoJump(3005) + JumpManager.GoJump(20002) end) Util.AddClick(this.formationBtn,function() -- if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then