From 46eeceb79d6c3411bdedeac18a2a0ae7f4c6d938 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 13 Nov 2020 18:00:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E3=80=91bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page12.prefab | 2 +- .../Prefabs/UI/DynamicActicity/page3.prefab | 4 ++-- .../Prefabs/UI/DynamicActicity/page4.prefab | 14 +++++++------- .../Modules/DynamicActivity/ActivityDetail.lua | 2 +- .../DynamicActivity/DynamicActivityManager.lua | 1 + .../DynamicActivity/DynamicActivityPanel.lua | 1 + .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 8 +++++++- .../~Lua/Modules/DynamicActivity/SheJiDaDian.lua | 2 +- .../GeneralPanel/GeneralRankRewardPanel.lua | 2 +- 9 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab index 09cd6f5dbc..79622ec740 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab @@ -3789,7 +3789,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u83B7\u53D6\u9014\u5F84" + m_Text: "\u672C\u671FUP\u5185\u5BB9" --- !u!1 &3439750458242139417 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab index 71e3b76e28..407b88120d 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab @@ -16694,7 +16694,7 @@ GameObject: - component: {fileID: 7816124763777208762} - component: {fileID: 837186586659951150} m_Layer: 5 - m_Name: page_1 + m_Name: page3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -21967,7 +21967,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u83B7\u53D6\u9014\u5F84" + m_Text: "\u672C\u671FUP\u5185\u5BB9" --- !u!1 &8166231329145986132 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index 5dc7329e4c..cd40a7fc24 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -9204,7 +9204,7 @@ GameObject: - component: {fileID: 9092643564979373074} - component: {fileID: 9088744695994303588} m_Layer: 5 - m_Name: page_2 + m_Name: page4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9325,7 +9325,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u83B7\u53D6\u9014\u5F84" + m_Text: "\u672C\u671FUP\u5185\u5BB9" --- !u!1 &9182117690183553055 GameObject: m_ObjectHideFlags: 0 @@ -9429,11 +9429,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9092643564979373074} m_Modifications: - - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, - type: 3} - propertyPath: m_Name - value: Effect_UI_changjing_qiankuanbaoguo - objectReference: {fileID: 0} - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} propertyPath: m_LocalPosition.x @@ -9489,6 +9484,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_Name + value: Effect_UI_changjing_qiankuanbaoguo + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} --- !u!4 &582742966390753427 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua index 5aade0509f..e5308e0b53 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityDetail.lua @@ -123,7 +123,7 @@ function ActivityDetail:RefreshMonsterRate() table.insert(list4,v)--其他 end end - table.insert(monsterRateList,{tag=Language[10192],name="金色奖励",value=self:ReculateRate(list1)-mainMonsterRate}) + table.insert(monsterRateList,{tag=Language[10192],name="其他金色奖励",value=self:ReculateRate(list1)-mainMonsterRate}) table.insert(monsterRateList,{tag=Language[10195],name="紫色奖励",value=self:ReculateRate(list2)}) table.insert(monsterRateList,{tag=Language[10196],name="蓝色奖励",value=self:ReculateRate(list3)}) table.insert(monsterRateList,{tag=Language[11766],name=Language[11766],value=self:ReculateRate(list4)}) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 088a88e93f..ebb1e819dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -1,5 +1,6 @@ DynamicActivityManager = {} local this = DynamicActivityManager +this.ZhenQiBaoGeIndex = 0 local SpiritAnimalSummonConfig = ConfigManager.GetConfig(ConfigName.SpiritAnimalSummon) this.curLevel = 0--社稷大典的等级 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 8bb5361ee7..727f1dab70 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -148,6 +148,7 @@ function DynamicActivityPanel:InitComponent() -- 上部货币显示 this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft}) + DynamicActivityManager.ZhenQiBaoGeIndex = #tabs - 4 end --绑定事件(用于子类重写) function DynamicActivityPanel:BindEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index fc7f28f915..8d1bd7bba2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -125,7 +125,9 @@ function LingShouBaoGe:SetData() if Live then poolManager:UnLoadLive(bgName, Live) end - Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale, Vector2.New(pos[1],pos[2])) + Live = poolManager:LoadLive(bgName, this.grid.transform, Vector3.one*scale*0.8, Vector2.New(pos[1],pos[2]+176)) + local RoleLiveGOGraphic = Live:GetComponent("SkeletonGraphic") + RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true) local leftTime = lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value this.tip2.text = Language[11480]..""..leftTime.."次必出灵兽·"..SpiritAnimalConfig[showData.monsterId].Name @@ -267,10 +269,14 @@ function LingShouBaoGe:TimeCountDown() this.timer:Stop() this.timer = nil end + local timeDown=CalculateSecondsNowTo_N_OClock(5) this.tip1.text = TimeToHMS(timeDown)..Language[12200] local timeDown2 = ActData.endTime - GetTimeStamp() this.leftTime.text = Language[10028]..TimeToFelaxible(timeDown2) + + this.tip1.gameObject:SetActive(timeDown < timeDown2) + this.timer = Timer.New(function() if timeDown < 1 then this.timer:Stop() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua index 000344cdb5..6ec91b2ba4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua @@ -151,7 +151,7 @@ function SheJiDaDian:BindEvent() end) Util.AddOnceClick(this.btnAdd,function () - UIManager.OpenPanel(UIName.DynamicActivityPanel,14) + UIManager.OpenPanel(UIName.DynamicActivityPanel,DynamicActivityManager.ZhenQiBaoGeIndex) end) Util.AddOnceClick(this.btnBox,function () diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 7f343e16d6..402f699b04 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -263,7 +263,7 @@ function this.ShowRewardInfo() elseif curRankType == 2 then--设计大典 local configList = {} - configList = ConfigManager.GetAllConfigsDataByKey(ConfigName.GodSacrificeConfig,"RewardType",tabNum) + configList = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.GodSacrificeConfig,"ActivityId",ActivityId,"RewardType",tabNum) this.ScrollView:SetData(configList, function (index, go) this.ActivityRewardSingleShow(go, configList[index],index) end)