Parcourir la source

删除账号++

gdl_123 il y a 5 mois
Parent
commit
a58c19a927

+ 2 - 1
Assets/Content/Config/LanguagePackage_cn.csv

@@ -18842,4 +18842,5 @@ CancelBtnTxt,取消删除
 DeleteAccountTimeTxt,距离删除账户还剩:{0}
 DeleteNtfTxt,你确定要删除 你的账户吗?\n 此操作无法撤销。
 DeleteNtfTxt2,这将是最后的确认。\n你绝对确定要删除你的账户吗?
-DeleteEndNtfTxt,感谢游戏!这将花费1-10个工作日来处理。
+DeleteEndNtfTxt,感谢游戏!这将花费1-10个工作日来处理。
+DeleteErrorTxt,删除账户以进行申请,请耐心等待。

+ 3 - 3
Assets/Content/Prefabs/UI/UISettings/UISettings.prefab

@@ -702,7 +702,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 325, y: -20}
-  m_SizeDelta: {x: 91, y: 40}
+  m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5709874480081257101
 CanvasRenderer:
@@ -4735,7 +4735,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u8DDD\u79BB\u5220\u9664\u8D26\u6237\u8FD8\u5269\uFF1A1\u592923\u5C0F\u65F6"
+  m_text: "\u8DDD\u79BB\u5220\u9664\u8D26\u6237\u8FD8\u5269\uFF1A   1\u592923\u5C0F\u65F6"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
   m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
@@ -4823,7 +4823,7 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - TMPro.TextMeshProUGUI
   - UINode
-  values: 00000000
+  values: 00000100
   depObjs: []
   IsNewNode: 0
   activeType: 0

+ 1 - 1
Assets/Lua/Core/Constant.lua

@@ -7,7 +7,7 @@ local Constant = {
 
     OpenPay = true,
 
-    DeleteAccount = true, -- 删除账户
+    DeleteAccount = false, -- 删除账户
 
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",

+ 7 - 2
Assets/Lua/Managers/AccountInfoMgr.lua

@@ -39,10 +39,12 @@ end
 
 --删除或者取消请求
 function AccountInfoMgr:On_SCUserDeleteAck(data)
-    if data.error ~= Enum.NetErrorCode.ERROR_OK then
+    LogError(Inspect(data))
+    if data.error ~= 0 then
         return
     end
     self.CurrentDeleteTime = data.time
+    -- LogError("self.CurrentDeleteTime = "..self.CurrentDeleteTime )
     ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.ACCOUNT_DELETE_CHANGE)
     if data.time ~= 0 then
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.ACCOUNT_DELETE_NTF)
@@ -51,10 +53,12 @@ end
 
 --查询
 function AccountInfoMgr:On_SCUserDeleteInfoAck(data)
-     if data.error ~= Enum.NetErrorCode.ERROR_OK then
+    LogError(Inspect(data))
+     if data.error ~= 0 then
         return
     end
     self.CurrentDeleteTime = data.time
+    --  LogError("self.CurrentDeleteTime = "..self.CurrentDeleteTime )
     ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.ACCOUNT_DELETE_CHANGE)
 end
 
@@ -65,6 +69,7 @@ end
 
 
 function AccountInfoMgr:GetCurDeleteTime()
+    --  LogError("self.CurrentDeleteTime = "..self.CurrentDeleteTime )
     return self.CurrentDeleteTime
 end
 

+ 13 - 5
Assets/Lua/UI/UISettings/UISettingsView.lua

@@ -201,9 +201,10 @@ function UISettingsView:RefreshDeleteAcount()
 		self.accountSetting:SetActive(false)
 		return
 	end
-	
+	self.deleteTimeTxt.text.text= ""
 	self.accountSetting:SetActive(true)
 	self.curEndTime = ManagerContainer.AccountInfoMgr:GetCurDeleteTime()
+	
 	if self.curEndTime == 0 then
 		self.deleteBtn:SetActive(true)
 		self.cancelBtn:SetActive(false)
@@ -211,17 +212,23 @@ function UISettingsView:RefreshDeleteAcount()
 	else
 		--self.deleteBtn:SetActive(false)
 		--self.cancelBtn:SetActive(true)
-		--self.deleteTime:SetActive(true)
-		self.deleteBtn.interactable = false
+		self.deleteTime:SetActive(true)
+		--self.deleteBtn.interactable = false
 		self:RefreshTime()
+		--LogError("aaa"..self.curEndTime)
 	end
 
 end
 
 function UISettingsView:OnClickDeleteAccount()
 	-- ManagerContainer.AccountInfoMgr:SendDeleteReq()
-	local data = {"AccountDelete1", {}, nil, self, self.Delete_Ntf1}
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
+	if self.curEndTime == 0 then
+		local data = {"AccountDelete1", {}, nil, self, self.Delete_Ntf1}
+		ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
+	else
+		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("DeleteErrorTxt")
+	end
+
 end
 
 function UISettingsView:OnCLickCancelDelete()
@@ -236,6 +243,7 @@ function UISettingsView:RefreshTime()
 		timer = Timer.New(function()
 			self:RefreshTimer()
 		end, 1, -1)
+		timer:Start()
 		self.RefreshTxtTimer = timer
 	end
 end

+ 7 - 1
Assets/Lua/UI/UISettings/UISettingsView_Generate.lua

@@ -28,6 +28,10 @@
 ---@field public slider UISettings__Generate_music_slider
 ---@field public toggle UISettings__Generate_music_toggle
 
+---@class UISettings__Generate_deleteTimeTxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text TMPro.TextMeshProUGUI
+
 ---@class UISettings__Generate_cancelBtn
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
@@ -74,7 +78,7 @@
 ---@field private deleteBtn UISettings__Generate_deleteBtn
 ---@field private cancelBtn UISettings__Generate_cancelBtn
 ---@field private deleteTime UnityEngine.GameObject
----@field private deleteTimeTxt UnityEngine.GameObject
+---@field private deleteTimeTxt UISettings__Generate_deleteTimeTxt
 ---@field private music UISettings__Generate_music
 ---@field private sound UISettings__Generate_sound
 ---@field private verText UISettings__Generate_verText
@@ -287,6 +291,8 @@ function UISettingsView:InitGenerate__13(Root, data)
 		tolua.setpeer(tmp, {})
 	end
 	self.deleteTimeTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
 end
 
 ---@private