diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua index e486932cec..0ccb396304 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua @@ -273,7 +273,10 @@ function this.MissionBoxClick(btn,_singleData) Util.GetGameObject(btn, "UI_Effect_BaoXiang_KaiQi"):SetActive(true) Util.GetGameObject(btn, "UI_Effect_BaoXiang_KaiQi"):GetComponent("Animator").enabled = true Util.GetGameObject(btn, "UI_Effect_BaoXiang_KaiQi/MeiKaiQi"):SetActive(true) - btn:GetComponent("Button").enabled = false + -- btn:GetComponent("Button").enabled = false + for i = 1, #boxList do + boxList[i]:GetComponent("Button").enabled = false + end this.timer = Timer.New(function() NetManager.TakeMissionRewardRequest(TaskTypeDef.DayTask,_singleData.missionId,function (msg) TaskManager.SetTypeTaskState(TaskTypeDef.DayTask, _singleData.missionId, SingleDailyMissionState.GetFinish) @@ -282,7 +285,9 @@ function this.MissionBoxClick(btn,_singleData) end) this.timer:Stop() this.timer = nil - btn:GetComponent("Button").enabled = true + for i = 1, #boxList do + boxList[i]:GetComponent("Button").enabled = true + end end, 1, 1, true) this.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 3c55599aae..bb5936b7c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -491,7 +491,7 @@ function this.RegisterRedCheckFunc() --福星高照 RPData:AddCheckFunc(RedPointType.FuXingGaoZhao,FuXingGaoZhaoManager.CheckRedPoint) - RPData:AddCheckFunc(RedPointType.LimitExchange_GoExchange,ActivityGiftManager.isExchangeRedShow) + RPData:AddCheckFunc(RedPointType.LimitExchange_GoExchange,ActivityGiftManager.IsExchangeRedShow) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index ac02c8cff6..b3e9ccda4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -154,12 +154,15 @@ function this.ShowBattleResultByExpedition() end,0.3):Start() PopupTipPanel.ShowTip( Language[11455]) else + MsgPanel.ShowTwo(Language[11456], function() + Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面 end, function() NetManager.EndConfirmExpeditionBattleRequest(GetCurNodeInfo.sortId, function (msg) + Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面 end) end,Language[10731],Language[11457]) - Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面 + -- Game.GlobalEvent:DispatchEvent(GameEvent.Expedition.RefreshMainPanel)--刷新界面 end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua index 91cf2651cf..d4ee095bda 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua @@ -7,10 +7,10 @@ local girl = 2 local boyBigLive = "live2d_npc_boy" local girlBigLive = "live2d_npc_girl" -local boyLiveRes = "live2d_npc_map" +local boyLiveRes = "live2d_npc_map_boy" local girlLiveRes = "live2d_npc_map_nv" local smallInfo = {[1] = {Pos = Vector3.New(-1, -81, 0), Scale = Vector3.New(0.25, 0.25, 0.25)}, - [2] = {Pos = Vector3.New(-1, -81, 0), Scale = Vector3.New(0.15, 0.15, 0.15)},} + [2] = {Pos = Vector3.New(-1, -81, 0), Scale = Vector3.New(0.25, 0.25, 0.25)},} local bigInfo = {[1] = {Pos = Vector3.New(0, -359, 0), Scale = Vector3.New(0.5, 0.5, 0.5)}, [2] = {Pos = Vector3.New(-33, -382, 0), Scale = Vector3.New(0.45, 0.45, 0.45)},}