Merge branch 'hy_dny' of ssh://192.168.0.8:29418/xianjing into hy_dny_rgres

Assets/Content/Config/LanguagePackage_cn.csv

@@ -19207,4 +19207,13 @@ signinTxt,Sign-in Day <color=#FF9600>{0}</color>, Reward: <color=#FF9600>{1}</co
 dbPayError,Insufficient vouchers
 selectPayType,Please select a payment method
 ICfg_Name_40001,Payment Voucher
-ICfg_Describe_40001,Can offset charges incurred during top-up
+ICfg_Describe_40001,Can offset charges incurred during top-up
+AccountDeletetxt,Delete Account
+AccountDeleteBtn,Delete
+AccountSetting,Account Settings
+CancelBtnTxt,Cancel Deletion
+DeleteAccountTimeTxt,Time remaining until account deletion: {0}
+DeleteNtfTxt,Are you sure you want to delete your account?\nThis action cannot be undone.
+DeleteNtfTxt2,This is the final confirmation.\nAre you absolutely sure you want to delete your account?
+DeleteEndNtfTxt,Thank you for playing! This process will take 1-10 business days.
+DeleteErrorTxt,Account deletion has been applied for, please wait patiently.

Assets/Lua/Core/Constant.lua

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

Assets/Lua/Core/PlatformPack.lua

@@ -1,9 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://110.40.223.119:81//',
-	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
-	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
+	URL_KEY = 'http://43.226.57.217:81//',
+	SERVERLIST_URL = 'http://43.226.57.217:81//serverlist',
+	NOTIFY_URL = 'http://43.226.57.217:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://43.226.57.217:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://43.226.57.217:81//vipService',
 }
 
 return PlatformPack

Assets/Lua/Enum/ProtoMsgId.lua

@@ -724,6 +724,10 @@
 	CS_PAY_ORDER_COMPLETE_REQ         = 6072,		--	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
 	SC_PAY_ORDER_COMPLETE_ACK         = 6073,		--	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 	SC_DNY_SDK_NTF       = 6076,		--	SCDnySdkNtf **SCDnySdkNtf **login.proto ** [SCDnySdkNtf]
+	CS_USER_DELETE_REQ         = 6077,		--	CSUserDeleteReq **CSUserDeleteReq **login.proto **game [CSUserDeleteReq]
+	SC_USER_DELETE_ACK         = 6078,		--	SCUserDeleteAck **SCUserDeleteAck **login.proto **game [SCUserDeleteAck]
+	CS_USER_DELETE_INFO_REQ         = 6079,		--	CSUserDeleteInfoReq **CSUserDeleteInfoReq **login.proto **game [CSUserDeleteInfoReq]
+	SC_USER_DELETE_INFO_ACK         = 6080,		--	SCUserDeleteInfoAck **SCUserDeleteInfoAck **login.proto **game [SCUserDeleteInfoAck]
 
     }
     return ProtoMsgId

Assets/Lua/Enum/UIEventNames.lua

@@ -615,6 +615,11 @@ local UIEventNames = {
     -- 无尽
     WJ_ON_BATTLE_CHANGE = id(), -- 鼓舞buff 发生变化
     WJ_ON_BOSS_CHANGE = id(), -- boss 变化
+
+
+    --账户删除
+    ACCOUNT_DELETE_CHANGE = id(),
+    ACCOUNT_DELETE_NTF = id(),
 }
 
 return UIEventNames

Assets/Lua/Managers/AccountInfoMgr.lua

@@ -0,0 +1,79 @@
+local AccountInfoMgr = class("AccountInfoMgr")
+function AccountInfoMgr:ctor()
+   self.CurrentDeleteTime = 0  -- 0 表示没有删除操作
+   self:RegisterNetEvents()
+end
+
+function AccountInfoMgr:RegisterNetEvents()
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_USER_DELETE_ACK,self.On_SCUserDeleteAck,self)
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_USER_DELETE_INFO_ACK,self.On_SCUserDeleteInfoAck,self)
+end
+
+function AccountInfoMgr:UnRegisterNetEvents()
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_USER_DELETE_ACK)
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_USER_DELETE_INFO_ACK)
+end
+function AccountInfoMgr:RegisterAllDataEvents()
+ 
+end
+
+function AccountInfoMgr:ResetAllData()
+
+end
+
+function AccountInfoMgr:Destroy()
+    self:UnRegisterNetEvents()
+end
+
+function AccountInfoMgr:SendDeleteReq()
+    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_USER_DELETE_REQ,{status = 0})
+end
+
+function AccountInfoMgr:SendCancelDeleteReq()
+    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_USER_DELETE_REQ,{status = 1})
+end
+
+function AccountInfoMgr:SendGetDeleteInfoReq()
+    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_USER_DELETE_INFO_REQ,{})
+end
+
+--删除或者取消请求
+function AccountInfoMgr:On_SCUserDeleteAck(data)
+    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)
+    end
+end
+
+--查询
+function AccountInfoMgr:On_SCUserDeleteInfoAck(data)
+    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
+
+
+function AccountInfoMgr:IsDeleteAccount()
+    return self.CurrentDeleteTime ~= 0
+end
+
+
+function AccountInfoMgr:GetCurDeleteTime()
+    --  LogError("self.CurrentDeleteTime = "..self.CurrentDeleteTime )
+    return self.CurrentDeleteTime
+end
+
+
+
+
+return AccountInfoMgr

Assets/Lua/Managers/AccountInfoMgr.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 95349236e14cb0d43baf0655d8c14263
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Managers/ManagerContainer.lua

@@ -48,6 +48,7 @@ function ManagerContainer:InitMgr()
     self.LoginMgr = require('LoginMgr'):new()
     self.OpenPayMgr = require('OpenPayMgr'):new()
     self.SDKEventReportMgr = require('SDKEventReportMgr'):new()
+    self.AccountInfoMgr = require('AccountInfoMgr'):new()
 end
 
 function ManagerContainer:Update()
@@ -133,7 +134,7 @@ function ManagerContainer:Destroy()
     self:FieldDestroy(self.UIStoryMgr)
     self:FieldDestroy(self.ActivityMgr)
     self:FieldDestroy(self.BattleFailedTipsMgr)
-
+    self:FieldDestroy(self.AccountInfoMgr)
     self.LuaActorAttributeMgr = nil
     self.NewGotTipsMgr = nil
     self.PopGotMgr = nil
@@ -168,6 +169,7 @@ function ManagerContainer:Destroy()
     self.VipChangeMgr = nil
     self.PayMgr = nil
     self.LoginMgr = nil
+    self.AccountInfoMgr = nil
 end
 
 return ManagerContainer

Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
-‚Ü
+ÂÝ
 login.protoserverproto
 user.proto"0
 
@@ -2720,4 +2720,13 @@ rewardList?
 SCPayOrderCompleteAck
 error
 
(Rerror"!
 SCDnySdkNtf
-type
 
(Rtypebproto3
+type
 
(Rtype")
+CSUserDeleteReq
+status
 
(Rstatus";
+SCUserDeleteAck
+error
 
(Rerror
+time 
(Rtime"
+CSUserDeleteInfoReq"?
+SCUserDeleteInfoAck
+error
 
(Rerror
+time 
(Rtimebproto3

Assets/Lua/Pb/protocal.txt

@@ -1,7 +1,7 @@
 
-Û—
+¥š
 protocal.protoserverprotocommon.protoerror_code.protologin.proto
-user.proto"�ê

+user.proto"µë

 Request7
 CS_PING_REQè 
(2.serverproto.CSPingReqR	CSPINGREQ:
 CS_LOGIN_REQê 
(2.serverproto.CSLoginReqR
@@ -373,7 +373,9 @@ $CS_RUNE_SPECIAL_PRIVILEGE_REWARD_REQ
 CS_CLIMBING_TOWER_WJ_END_REQ­/ 
(2$.serverproto.CSClimbingTowerWjEndReqRCSCLIMBINGTOWERWJENDREQg
 CS_CLIMBING_TOWER_WJ_RANK_REQ¯/ 
(2%.serverproto.CSClimbingTowerWjRankReqRCSCLIMBINGTOWERWJRANKREQg
 CS_CLIMBING_TOWER_WJ_BUFF_REQ²/ 
(2%.serverproto.CSClimbingTowerWjBuffReqRCSCLIMBINGTOWERWJBUFFREQ]
-CS_PAY_ORDER_COMPLETE_REQ¸/ 
(2".serverproto.CSPayOrderCompleteReqRCSPAYORDERCOMPLETEREQ"å¬
+CS_PAY_ORDER_COMPLETE_REQ¸/ 
(2".serverproto.CSPayOrderCompleteReqRCSPAYORDERCOMPLETEREQJ
+CS_USER_DELETE_REQ½/ 
(2.serverproto.CSUserDeleteReqRCSUSERDELETEREQW
+CS_USER_DELETE_INFO_REQ¿/ 
(2 .serverproto.CSUserDeleteInfoReqRCSUSERDELETEINFOREQ"Š®
 Response7
 SC_PING_ACKé 
(2.serverproto.SCPingAckR	SCPINGACK:
 SC_LOGIN_ACKë 
(2.serverproto.SCLoginAckR
@@ -859,4 +861,6 @@ $SC_RUNE_SPECIAL_PRIVILEGE_REWARD_ACK
 SC_CLIMBING_TOWER_WJ_BOSS_NTF±/ 
(2%.serverproto.SCClimbingTowerWjBossNtfRSCCLIMBINGTOWERWJBOSSNTFg
 SC_CLIMBING_TOWER_WJ_BUFF_ACK³/ 
(2%.serverproto.SCClimbingTowerWjBuffAckRSCCLIMBINGTOWERWJBUFFACK]
 SC_PAY_ORDER_COMPLETE_ACK¹/ 
(2".serverproto.SCPayOrderCompleteAckRSCPAYORDERCOMPLETEACK>
-SC_DNY_SDK_NTF¼/ 
(2.serverproto.SCDnySdkNtfRSCDNYSDKNTFbproto3
+SC_DNY_SDK_NTF¼/ 
(2.serverproto.SCDnySdkNtfRSCDNYSDKNTFJ
+SC_USER_DELETE_ACK¾/ 
(2.serverproto.SCUserDeleteAckRSCUSERDELETEACKW
+SC_USER_DELETE_INFO_ACKÀ/ 
(2 .serverproto.SCUserDeleteInfoAckRSCUSERDELETEINFOACKbproto3

Assets/Lua/UI/UICommonTips/UINoticeTipsView.lua

@@ -113,7 +113,11 @@ local NoticeList = {
 	--许愿钱包
 	["Insufficient"] = {title = "InsufficientTitle", notice = "InsufficientLimit",notice1 = "GoTo2", btnSure = "BtnGoto"},
 	-- 无尽鼓舞购买
-	['WjBattleBuffBuy']={title = 'WjBattleBuffTxt',notice = 'WjBattleBuff_Dec4' , notice1 = '', btnSure = "BtnConfirm"}
+	['WjBattleBuffBuy']={title = 'WjBattleBuffTxt',notice = 'WjBattleBuff_Dec4' , notice1 = '', btnSure = "BtnConfirm"},
+	--账号删除
+	['AccountDelete1']={title = 'BtnConfirm',notice = 'DeleteNtfTxt',notice1 = '', btnSure = "BtnConfirm" ,btnCancle = "BtnCancle", hideClose=true},
+	['AccountDelete2']={title = 'BtnConfirm',notice = 'DeleteNtfTxt2',notice1 = '', btnSure = "BtnConfirm", btnCancle = "BtnCancle", hideClose=true},
+	['AccountDelete3']={title = 'BtnConfirm',notice = 'DeleteEndNtfTxt',notice1 = '', btnSure = "BtnConfirm",},
 }
 
 function UINoticeTipsView:OnAwake(data)

Assets/Lua/UI/UIRoleMessage/UIRoleMessageView.lua

@@ -70,6 +70,7 @@ function UIRoleMessageView:Init()
 	self.titleScroll.loopGridView:InitGridView(0, function(gridView, itemIndex, row, column)
 		return self:GetTitleItemByRowColumn(gridView, itemIndex, row, column)
 	end, nil)
+	ManagerContainer.AccountInfoMgr:SendGetDeleteInfoReq()
 end
 
 function UIRoleMessageView:InitRoleSystems()

Assets/Lua/UI/UISettings/UISettingsView.lua

@@ -10,6 +10,8 @@ function UISettingsView:OnAwake(data)
 end
 
 function UISettingsView:AddEventListener()
+	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.ACCOUNT_DELETE_CHANGE,self,self.RefreshDeleteAcount);
+	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.ACCOUNT_DELETE_NTF,self,self.OnDeleteSuc);
 end
 
 function UISettingsView:FillContent(data, uiBase)
@@ -29,6 +31,7 @@ function UISettingsView:Init()
 	self:RefreshServerInfo()
 	self:RefreshMusic()
 	self:RefreshSound()
+	self:RefreshDeleteAcount()
 end
 
 function UISettingsView:RemoveEventListener()
@@ -51,6 +54,9 @@ function UISettingsView:AddUIEventListener()
 	self.uiBase:AddSliderEventListener(self.music.slider.slider, self, self.OnValueChangeMusic, nil)
 	self.uiBase:AddToggleEventListener(self.sound.toggle.toggle, self, self.OnClickToggleSound, nil)
 	self.uiBase:AddSliderEventListener(self.sound.slider.slider, self, self.OnValueChangeSound, nil)
+
+	self.uiBase:AddButtonEventListener(self.deleteBtn.button, self, self.OnClickDeleteAccount)
+	self.uiBase:AddButtonEventListener(self.cancelBtn.button, self, self.OnCLickCancelDelete)
 end
 
 function UISettingsView:OnHide()
@@ -65,11 +71,11 @@ end
 
 function UISettingsView:OnClose()
 	ManagerContainer.DataMgr.HeadProtraitData:SetVaild()
+	self:DisposeRefreshTimer()
 end
 
 function UISettingsView:OnDispose()
 	self.dots = nil
-
 end
 
 
@@ -100,6 +106,7 @@ end
 
 function UISettingsView:OnClickClose()
 	self:UIClose()
+	self:DisposeRefreshTimer()
 end
 
 --点击了切换服务器的按钮
@@ -189,5 +196,94 @@ function UISettingsView:IsSomeFrameCount(keyName)
 end
 
 
+function UISettingsView:RefreshDeleteAcount()
+	if not Constant.DeleteAccount then
+		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)
+		self.deleteTime:SetActive(false)
+	else
+		--self.deleteBtn:SetActive(false)
+		--self.cancelBtn:SetActive(true)
+		self.deleteTime:SetActive(true)
+		--self.deleteBtn.interactable = false
+		self:RefreshTime()
+		--LogError("aaa"..self.curEndTime)
+	end
+
+end
+
+function UISettingsView:OnClickDeleteAccount()
+	-- ManagerContainer.AccountInfoMgr:SendDeleteReq()
+	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()
+	 ManagerContainer.AccountInfoMgr:SendCancelDeleteReq()
+end
+
+
+function UISettingsView:RefreshTime()
+    local timer = self.RefreshTxtTimer
+	
+	if not timer then
+		timer = Timer.New(function()
+			self:RefreshTimer()
+		end, 1, -1)
+		timer:Start()
+		self.RefreshTxtTimer = timer
+	end
+end
+
+function UISettingsView:RefreshTimer()
+     local time = ManagerContainer.LuaTimerMgr:GetRemainSeconds(self.curEndTime)
+    local timerStr, outTime = CommonUtil.FormatTimeDMS(time)
+	self.deleteTimeTxt.text.text = I18N.SetLanguageValue("DeleteAccountTimeTxt",timerStr)
+end
+
+function UISettingsView:DisposeRefreshTimer()
+	if self.RefreshTxtTimer then
+		self.RefreshTxtTimer:Stop()
+		self.RefreshTxtTimer.updateItemMap = nil
+		self.RefreshTxtTimer = nil
+	end
+end
+
+
+function UISettingsView:Delete_Ntf1()
+	 ManagerContainer.LuaTimerMgr:AddLuaTimer(200, 1, function ()
+                local data = {"AccountDelete2", {}, nil, self, self.Delete_Ntf2}
+				ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
+            end, nil)
+
+end
+
+function UISettingsView:Delete_Ntf2()
+	ManagerContainer.AccountInfoMgr:SendDeleteReq()
+end
+
+function UISettingsView:Delete_Ntf3()
+	
+end
+
+function UISettingsView:OnDeleteSuc()
+	 ManagerContainer.LuaTimerMgr:AddLuaTimer(200, 1, function ()
+                local data = {"AccountDelete3", {}, nil, self, self.Delete_Ntf3}
+				ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
+            end, nil)
+end
 return UISettingsView
 

Assets/Lua/UI/UISettings/UISettingsView_Generate.lua

@@ -28,6 +28,22 @@
 ---@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
+
+---@class UISettings__Generate_deleteBtn
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
+---@class UISettings__Generate_deleteTxt
+---@field public gameObject UnityEngine.GameObject
+---@field public text UnityEngine.UI.Text
+
 ---@class UISettings__Generate_changeServerButton
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
@@ -57,6 +73,12 @@
 ---@field private btnClose UISettings__Generate_btnClose
 ---@field private serverNameTxt UISettings__Generate_serverNameTxt
 ---@field private changeServerButton UISettings__Generate_changeServerButton
+---@field private accountSetting UnityEngine.GameObject
+---@field private deleteTxt UISettings__Generate_deleteTxt
+---@field private deleteBtn UISettings__Generate_deleteBtn
+---@field private cancelBtn UISettings__Generate_cancelBtn
+---@field private deleteTime 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
@@ -93,6 +115,12 @@ function UISettingsView:InitGenerate(Root, data)
 	self:InitGenerate__12(Root,data)
 	self:InitGenerate__13(Root,data)
 	self:InitGenerate__14(Root,data)
+	self:InitGenerate__15(Root,data)
+	self:InitGenerate__16(Root,data)
+	self:InitGenerate__17(Root,data)
+	self:InitGenerate__18(Root,data)
+	self:InitGenerate__19(Root,data)
+	self:InitGenerate__20(Root,data)
 
 
 end
@@ -189,6 +217,86 @@ end
 
 ---@private
 function UISettingsView:InitGenerate__8(Root, data)
+--[[
+	UIAnimator/Window/Bg/AccountSetting
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/AccountSetting").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.accountSetting = tmp
+end
+
+---@private
+function UISettingsView:InitGenerate__9(Root, data)
+--[[
+	UIAnimator/Window/Bg/AccountSetting/DeleteTxt
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/AccountSetting/DeleteTxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.deleteTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+end
+
+---@private
+function UISettingsView:InitGenerate__10(Root, data)
+--[[
+	UIAnimator/Window/Bg/AccountSetting/DeleteBtn
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/AccountSetting/DeleteBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.deleteBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
+---@private
+function UISettingsView:InitGenerate__11(Root, data)
+--[[
+	UIAnimator/Window/Bg/AccountSetting/CancelBtn
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/AccountSetting/CancelBtn").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.cancelBtn = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
+---@private
+function UISettingsView:InitGenerate__12(Root, data)
+--[[
+	UIAnimator/Window/Bg/AccountSetting/DeleteTime
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/AccountSetting/DeleteTime").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.deleteTime = tmp
+end
+
+---@private
+function UISettingsView:InitGenerate__13(Root, data)
+--[[
+	UIAnimator/Window/Bg/AccountSetting/DeleteTime/DeleteTimeTxt
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/AccountSetting/DeleteTime/DeleteTimeTxt").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.deleteTimeTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI)
+end
+
+---@private
+function UISettingsView:InitGenerate__14(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Music
 --]]
@@ -200,7 +308,7 @@ function UISettingsView:InitGenerate__8(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__9(Root, data)
+function UISettingsView:InitGenerate__15(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Music/Slider
 --]]
@@ -214,7 +322,7 @@ function UISettingsView:InitGenerate__9(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__10(Root, data)
+function UISettingsView:InitGenerate__16(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Music/Toggle
 --]]
@@ -228,7 +336,7 @@ function UISettingsView:InitGenerate__10(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__11(Root, data)
+function UISettingsView:InitGenerate__17(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Sound
 --]]
@@ -240,7 +348,7 @@ function UISettingsView:InitGenerate__11(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__12(Root, data)
+function UISettingsView:InitGenerate__18(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Sound/Slider
 --]]
@@ -254,7 +362,7 @@ function UISettingsView:InitGenerate__12(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__13(Root, data)
+function UISettingsView:InitGenerate__19(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Sound/Toggle
 --]]
@@ -268,7 +376,7 @@ function UISettingsView:InitGenerate__13(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__14(Root, data)
+function UISettingsView:InitGenerate__20(Root, data)
 --[[
 	UIAnimator/Window/Bg/VerBox/VerText
 --]]
@@ -319,6 +427,30 @@ function UISettingsView:GenerateDestroy()
 		tolua.setpeer(self.changeServerButton, nil)
 	end
 	self.changeServerButton = nil
+	if tolua.getpeer(self.accountSetting) ~= nil then
+		tolua.setpeer(self.accountSetting, nil)
+	end
+	self.accountSetting = nil
+	if tolua.getpeer(self.deleteTxt) ~= nil then
+		tolua.setpeer(self.deleteTxt, nil)
+	end
+	self.deleteTxt = nil
+	if tolua.getpeer(self.deleteBtn) ~= nil then
+		tolua.setpeer(self.deleteBtn, nil)
+	end
+	self.deleteBtn = nil
+	if tolua.getpeer(self.cancelBtn) ~= nil then
+		tolua.setpeer(self.cancelBtn, nil)
+	end
+	self.cancelBtn = nil
+	if tolua.getpeer(self.deleteTime) ~= nil then
+		tolua.setpeer(self.deleteTime, nil)
+	end
+	self.deleteTime = nil
+	if tolua.getpeer(self.deleteTimeTxt) ~= nil then
+		tolua.setpeer(self.deleteTimeTxt, nil)
+	end
+	self.deleteTimeTxt = nil
 	if tolua.getpeer(self.music) ~= nil then
 		tolua.setpeer(self.music, nil)
 	end

Build/BuildDependenceResource/CurPackEnv.ini

@@ -1 +1 @@
-{"m_ChannelUniqueId":"12002025","m_BuildClassName":"Pack.PackPlatformAndroid"}
+{"m_ChannelUniqueId":"12002007","m_BuildClassName":"Pack.PackPlatformAndroid"}

Build/BuildDependenceResource/PackConfig.json

@@ -763,7 +763,7 @@
             ],
             "sdkVerifyUrl": "http://43.156.13.116:81//",
             "serverListUrl": "http://43.156.13.116:81//serverlist",
-            "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
+            "notifyUrl": "http://cxzdncdn.4onegame.com/res/NoticeNew/",
             "specialInfoUrl": "http://43.156.13.116:81//channel",
             "customerServiceInfoUrl": "http://43.156.13.116:81//vipService",
             "leBian_MainChId": "69423",
@@ -918,7 +918,7 @@
             "obscureOffsetValues": [],
             "sdkVerifyUrl": "http://43.156.13.116:81//",
             "serverListUrl": "http://43.156.13.116:81//serverlist",
-            "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
+            "notifyUrl": "http://cxzdncdn.4onegame.com/res/NoticeNew/",
             "specialInfoUrl": "http://43.156.13.116:81//channel",
             "customerServiceInfoUrl": "http://43.156.13.116:81//vipService",
             "leBian_MainChId": "69423",
@@ -1166,7 +1166,7 @@
             "logo1RelativePath": "ntquick.png",
             "loginRelativePath": "Default",
             "gameAssetsPath": "Default",
-            "specialFuncShield": true,
+            "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
             "obscureKey": "c685bfa79e3210cda0ae126c9fffabf5",
             "obscureOffsetMin": 0,
@@ -1428,7 +1428,7 @@
             "logo1RelativePath": "ntquick.png",
             "loginRelativePath": "Default",
             "gameAssetsPath": "Default",
-            "specialFuncShield": true,
+            "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
             "obscureKey": "",
             "obscureOffsetMin": 0,
@@ -1476,7 +1476,7 @@
             "logo1RelativePath": "ntquick.png",
             "loginRelativePath": "Default",
             "gameAssetsPath": "Default",
-            "specialFuncShield": true,
+            "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
             "obscureKey": "c0f0a92eecc1ab6e757ec2b856b05799",
             "obscureOffsetMin": 0,
@@ -1487,7 +1487,7 @@
             ],
             "sdkVerifyUrl": "http://43.156.13.116:81//",
             "serverListUrl": "http://43.156.13.116:81//serverlist",
-            "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
+            "notifyUrl": "http://cxzdncdn.4onegame.com/res/NoticeNew/",
             "specialInfoUrl": "http://43.156.13.116:81//channel",
             "customerServiceInfoUrl": "http://43.156.13.116:81//vipService",
             "leBian_MainChId": "69031",
@@ -1528,7 +1528,7 @@
             "logo1RelativePath": "ntquick.png",
             "loginRelativePath": "Default",
             "gameAssetsPath": "Default",
-            "specialFuncShield": true,
+            "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
             "obscureKey": "fa0574eb0381d1b043c62fbd46f10bcb",
             "obscureOffsetMin": 0,
@@ -1539,7 +1539,7 @@
             ],
             "sdkVerifyUrl": "http://43.156.13.116:81//",
             "serverListUrl": "http://43.156.13.116:81//serverlist",
-            "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
+            "notifyUrl": "http://cxzdncdn.4onegame.com/res/NoticeNew/",
             "specialInfoUrl": "http://43.156.13.116:81//channel",
             "customerServiceInfoUrl": "http://43.156.13.116:81//vipService",
             "leBian_MainChId": "69031",
@@ -1580,7 +1580,7 @@
             "logo1RelativePath": "ntquick.png",
             "loginRelativePath": "Default",
             "gameAssetsPath": "Default",
-            "specialFuncShield": true,
+            "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
             "obscureKey": "acbd2331ffcd5987addc754a87f",
             "obscureOffsetMin": 0,

ProtocolGen/proto/ProtoMsgId.lua

@@ -724,6 +724,10 @@
 	CS_PAY_ORDER_COMPLETE_REQ         = 6072,		--	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
 	SC_PAY_ORDER_COMPLETE_ACK         = 6073,		--	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 	SC_DNY_SDK_NTF       = 6076,		--	SCDnySdkNtf **SCDnySdkNtf **login.proto ** [SCDnySdkNtf]
+	CS_USER_DELETE_REQ         = 6077,		--	CSUserDeleteReq **CSUserDeleteReq **login.proto **game [CSUserDeleteReq]
+	SC_USER_DELETE_ACK         = 6078,		--	SCUserDeleteAck **SCUserDeleteAck **login.proto **game [SCUserDeleteAck]
+	CS_USER_DELETE_INFO_REQ         = 6079,		--	CSUserDeleteInfoReq **CSUserDeleteInfoReq **login.proto **game [CSUserDeleteInfoReq]
+	SC_USER_DELETE_INFO_ACK         = 6080,		--	SCUserDeleteInfoAck **SCUserDeleteInfoAck **login.proto **game [SCUserDeleteInfoAck]
 
     }
     return ProtoMsgId

ProtocolGen/proto/login.proto

@@ -3837,4 +3837,21 @@ message SCPayOrderCompleteAck {   //project game  //RouteRule game
 
 message SCDnySdkNtf {
     int32       type =1;//类型
+}
+
+message CSUserDeleteReq{
+    int32      status         = 1;//0表示删除(默认)。1表示取消删除
+}
+
+message SCUserDeleteAck{
+    int32       error                   = 1; //错误码，OK表示重连成功
+    int64 time=2;//角色删除剩余时间
+}
+
+message CSUserDeleteInfoReq{
+}
+
+message SCUserDeleteInfoAck{
+    int32       error                   = 1; //错误码，OK表示重连成功
+    int64 time=2;//角色删除剩余时间，为0代表无删除
 }

ProtocolGen/proto/messagedefclient.proto

@@ -727,4 +727,8 @@ enum protoMsgId{
 	CS_PAY_ORDER_COMPLETE_REQ         = 6072;		//	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
 	SC_PAY_ORDER_COMPLETE_ACK         = 6073;		//	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 	SC_DNY_SDK_NTF       = 6076;		//	SCDnySdkNtf **SCDnySdkNtf **login.proto ** [SCDnySdkNtf]
+	CS_USER_DELETE_REQ         = 6077;		//	CSUserDeleteReq **CSUserDeleteReq **login.proto **game [CSUserDeleteReq]
+	SC_USER_DELETE_ACK         = 6078;		//	SCUserDeleteAck **SCUserDeleteAck **login.proto **game [SCUserDeleteAck]
+	CS_USER_DELETE_INFO_REQ         = 6079;		//	CSUserDeleteInfoReq **CSUserDeleteInfoReq **login.proto **game [CSUserDeleteInfoReq]
+	SC_USER_DELETE_INFO_ACK         = 6080;		//	SCUserDeleteInfoAck **SCUserDeleteInfoAck **login.proto **game [SCUserDeleteInfoAck]
 }

ProtocolGen/proto/protocal.proto

@@ -322,6 +322,8 @@ message Request {
      CSClimbingTowerWjRankReq         	CS_CLIMBING_TOWER_WJ_RANK_REQ           =  6063;         // CSClimbingTowerWjRankReq **CSClimbingTowerWjRankReq **login.proto **game [CSClimbingTowerWjRankReq]
      CSClimbingTowerWjBuffReq         	CS_CLIMBING_TOWER_WJ_BUFF_REQ           =  6066;         // CSClimbingTowerWjBuffReq **CSClimbingTowerWjBuffReq **login.proto **game [CSClimbingTowerWjBuffReq]
      CSPayOrderCompleteReq         	CS_PAY_ORDER_COMPLETE_REQ             =  6072;         //	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
+     CSUserDeleteReq         	CS_USER_DELETE_REQ             =  6077;         //	CSUserDeleteReq **CSUserDeleteReq **login.proto **game [CSUserDeleteReq]
+     CSUserDeleteInfoReq         	CS_USER_DELETE_INFO_REQ             =  6079;         //	CSUserDeleteInfoReq **CSUserDeleteInfoReq **login.proto **game [CSUserDeleteInfoReq]
 }
 message Response {
      SCPingAck           	SC_PING_ACK                          =  1001;         //	SCPingAck **SCPingAck **login.proto ** [SCPingAck]
@@ -734,4 +736,6 @@ message Response {
      SCClimbingTowerWjBuffAck           	SC_CLIMBING_TOWER_WJ_BUFF_ACK           =  6067;         // SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
      SCPayOrderCompleteAck           	SC_PAY_ORDER_COMPLETE_ACK             =  6073;         //	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
      SCDnySdkNtf           	SC_DNY_SDK_NTF           =  6076;         //	SCDnySdkNtf **SCDnySdkNtf **login.proto ** [SCDnySdkNtf]
+     SCUserDeleteAck           	SC_USER_DELETE_ACK             =  6078;         //	SCUserDeleteAck **SCUserDeleteAck **login.proto **game [SCUserDeleteAck]
+     SCUserDeleteInfoAck           	SC_USER_DELETE_INFO_ACK             =  6080;         //	SCUserDeleteInfoAck **SCUserDeleteInfoAck **login.proto **game [SCUserDeleteInfoAck]
 }