diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMEspecially.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMEspecially.lua index 06df4de774..8cea60f4d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMEspecially.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/GMEspecially.lua @@ -1,4 +1,4 @@ -local DailyRecharge = quick_class("DailyRecharge", BasePanel) +local GMEspecially = quick_class("GMEspecially", BasePanel) local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local gameSetting=ConfigManager.GetConfigData(ConfigName.GameSetting,1) local kMaxReward = 5 @@ -8,7 +8,7 @@ local cursortingOrder local isFirstOpen = false -function DailyRecharge:InitComponent() +function GMEspecially:InitComponent() self.spLoader = SpriteLoader.New() cursortingOrder = 0 self.backBtnNew = Util.GetGameObject(self.transform, "BG") @@ -35,7 +35,7 @@ function DailyRecharge:InitComponent() end -function DailyRecharge:BindEvent() +function GMEspecially:BindEvent() Util.AddClick(self.dealBtn, function() self:ClosePanel() @@ -51,40 +51,41 @@ function DailyRecharge:BindEvent() end end local func=nil -function DailyRecharge:OnOpen(_func) +function GMEspecially:OnOpen(_func) func=_func + GMEspecially:SetSortingOrder(6300) self.UI_effect_DailyRechargePanel_particle:SetActive(true) end -function DailyRecharge:AddListener() +function GMEspecially:AddListener() end -function DailyRecharge:RemoveListener() +function GMEspecially:RemoveListener() end -function DailyRecharge:OnSortingOrderChange() +function GMEspecially:OnSortingOrderChange() Util.AddParticleSortLayer( self.UI_effect_DailyRechargePanel_particle, self.sortingOrder - cursortingOrder) for i = 1, #self.rewardContentEffect do Util.AddParticleSortLayer( self.rewardContentEffect[i], self.sortingOrder - cursortingOrder) end cursortingOrder = self.sortingOrder end -function DailyRecharge:OnShow() +function GMEspecially:OnShow() self.title.sprite = self.spLoader:LoadSprite("gm_GMEspecially_text_zh") self.title:SetNativeSize() self:RefreshPanel() end -function DailyRecharge:OnClose() +function GMEspecially:OnClose() if func then func() end end -function DailyRecharge:OnDestroy() +function GMEspecially:OnDestroy() self.spLoader:Destroy() end -function DailyRecharge:RefreshPanel() +function GMEspecially:RefreshPanel() table.walk(self.rewardList, function(rewardPosItem) rewardPosItem.gameObject:SetActive(false) @@ -110,6 +111,7 @@ function DailyRecharge:RefreshPanel() if self.rewardList[i] then self.rewardList[i]:OnOpen(false, rewardInfo, 1.1,true) self.rewardList[i]:ResetNameColor(Vector4.New(0.298,0.133,0.102,1)) + self.rewardList[i]:ResetBtnInteractable(false) self.rewardList[i].gameObject:SetActive(true) self.rewardContentbg[i].gameObject:SetActive(true) end @@ -119,10 +121,10 @@ function DailyRecharge:RefreshPanel() end -function DailyRecharge:OnDealBtnClicked() +function GMEspecially:OnDealBtnClicked() end -return DailyRecharge \ No newline at end of file +return GMEspecially \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 408aedac1f..da89a4c08b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -657,6 +657,10 @@ function this:OnOpen(id, func, ...) --if curId == 706 then -- Game.GlobalEvent:DispatchEvent(GameEvent.Guide.GuidePanelScrollViewPos) --end + LogError("id========================"..id) + if id==1 then + UIManager.OpenPanel(UIName.GMEspecially) + end this.gameObject:GetComponent("Image").raycastTarget = true local delay = GuideConfig[id].DelayShow if nextDelayChange then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua index d2ec451d4c..f3873a89e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/CreateNamePopup.lua @@ -185,6 +185,7 @@ function CreateNamePopup:BindEvent() if this.options then self:ClosePanel() StoryManager.StoryJumpType(this.options[1], nil, this.callBackFunc) + --UIManager.OpenPanel(UIName.GMEspecially) -- 发送创建角色事件 CustomEventManager.SendCustomEvents(FBSDKCustomEventType.CreateCharacter) CustomEventManager.SendCustomEvents(FBSDKCustomEventType.RoleLv,1) @@ -193,8 +194,8 @@ function CreateNamePopup:BindEvent() -- 类型3 为修改名称 类型1 为创建角色 local type = this.showType == nil and 3 or 1 - NameManager.ChangeUserName(type, this.curName, nil, curSex) - UIManager.OpenPanel(UIName.GMEspecially,callBack) + NameManager.ChangeUserName(type, this.curName, nil, curSex,callBack) + end) -- 随机名称 @@ -311,6 +312,7 @@ function CreateNamePopup:OnOpen(...) local view = SubUIManager.Open(SubUIConfig.ItemView,this.rewardGrid.transform) view:OnOpen(false,gameSetting.BTBornItemShow[i],0.75,true) view:ResetNameColor(Vector4.New(0.298,0.133,0.10,1)) + view:ResetBtnInteractable(false) end end diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 0f77856c09..7b9be35789 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -980,6 +980,10 @@ function ItemView:ResetNameColor(v4) self.name:GetComponent("Text").color=v4 end +function ItemView:ResetBtnInteractable(isOpen) + self.frameBtn:GetComponent("Button").enabled=isOpen +end + function ItemView:ResetNameSize(v2,v3) self.name:GetComponent("RectTransform").anchoredPosition3D = v2 self.name:GetComponent("RectTransform").localScale = v3