Procházet zdrojové kódy

pb 协议++ 账号删除

gdl_123 před 3 měsíci
rodič
revize
1abd56a175

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 461 - 386
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 365 - 81
Assets/Content/Prefabs/UI/UISettings/UISettings.prefab


+ 5 - 5
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

+ 4 - 0
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

+ 11 - 2
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

binární
Assets/Lua/Pb/messagedefclient.txt


+ 8 - 4
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

+ 114 - 6
Assets/Lua/UI/UISettings/UISettingsView_Generate.lua

@@ -28,6 +28,18 @@
 ---@field public slider UISettings__Generate_music_slider
 ---@field public toggle UISettings__Generate_music_toggle
 
+---@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 +69,11 @@
 ---@field private btnClose UISettings__Generate_btnClose
 ---@field private serverNameTxt UISettings__Generate_serverNameTxt
 ---@field private changeServerButton UISettings__Generate_changeServerButton
+---@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 UnityEngine.GameObject
 ---@field private music UISettings__Generate_music
 ---@field private sound UISettings__Generate_sound
 ---@field private verText UISettings__Generate_verText
@@ -93,6 +110,11 @@ 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)
 
 
 end
@@ -189,6 +211,72 @@ end
 
 ---@private
 function UISettingsView:InitGenerate__8(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__9(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__10(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__11(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__12(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
+end
+
+---@private
+function UISettingsView:InitGenerate__13(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Music
 --]]
@@ -200,7 +288,7 @@ function UISettingsView:InitGenerate__8(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__9(Root, data)
+function UISettingsView:InitGenerate__14(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Music/Slider
 --]]
@@ -214,7 +302,7 @@ function UISettingsView:InitGenerate__9(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__10(Root, data)
+function UISettingsView:InitGenerate__15(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Music/Toggle
 --]]
@@ -228,7 +316,7 @@ function UISettingsView:InitGenerate__10(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__11(Root, data)
+function UISettingsView:InitGenerate__16(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Sound
 --]]
@@ -240,7 +328,7 @@ function UISettingsView:InitGenerate__11(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__12(Root, data)
+function UISettingsView:InitGenerate__17(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Sound/Slider
 --]]
@@ -254,7 +342,7 @@ function UISettingsView:InitGenerate__12(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__13(Root, data)
+function UISettingsView:InitGenerate__18(Root, data)
 --[[
 	UIAnimator/Window/Bg/VolumeSettings/Sound/Toggle
 --]]
@@ -268,7 +356,7 @@ function UISettingsView:InitGenerate__13(Root, data)
 end
 
 ---@private
-function UISettingsView:InitGenerate__14(Root, data)
+function UISettingsView:InitGenerate__19(Root, data)
 --[[
 	UIAnimator/Window/Bg/VerBox/VerText
 --]]
@@ -319,6 +407,26 @@ function UISettingsView:GenerateDestroy()
 		tolua.setpeer(self.changeServerButton, nil)
 	end
 	self.changeServerButton = 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

+ 1 - 1
Build/BuildDependenceResource/CurPackEnv.ini

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

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -17,7 +17,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
-  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashScreen: 0
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 0

+ 4 - 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

+ 17 - 0
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代表无删除
 }

+ 4 - 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]
 }

+ 4 - 0
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]
 }

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů