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

Assets/Lua/Enum/ProtoMsgId.lua

@@ -723,6 +723,7 @@
 	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067,  -- SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
 	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]
 
     }
     return ProtoMsgId

Assets/Lua/Managers/SDKEventReportMgr.lua

@@ -121,12 +121,31 @@ adjus事件上报及对应的token
 },
 }
 
+function SDKEventReportMgr:ctor()
+	self:RegisterNetEvents()
+end
+
+function SDKEventReportMgr:RegisterNetEvents()
+	 ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_DNY_SDK_NTF, self.OnSC_DNY_SDK_NTF, self)
+end
+
+function SDKEventReportMgr:UnRegisterNetEvents()
+	 ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_DNY_SDK_NTF)
+end
+
+function SDKEventReportMgr:Destroy()
+	self:UnRegisterNetEvents()
+end
 
 function SDKEventReportMgr:SendEvent(type)
      if not SDKMgr.Instance:IsReportAction() then
         return
     end
    local curCfg = self:GetCfgByType(type)
+   if curCfg == nil then
+		LogError("没找到对应统计 id ="..type)
+		return
+   end
      local datas = System.Collections.Generic.Dictionary_object_object()
      datas:Add('event', curCfg.event)
      datas:Add('eventToken', curCfg.eventToken)
@@ -156,4 +175,11 @@ function SDKEventReportMgr:GetCfgByType(type)
     return curCfg[type]
 end
 
+
+function SDKEventReportMgr:OnSC_DNY_SDK_NTF(data)
+	if data.error and data.error == 0 then
+		return
+	end
+	self:SendEvent(data.type);
+end
 return SDKEventReportMgr

Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
-ßÛ
+‚Ü
 login.protoserverproto
 user.proto"0
 
@@ -2718,4 +2718,6 @@ rewardList?
 CSPayOrderCompleteReq
 cp_order_id
 
(R	cpOrderId"-
 SCPayOrderCompleteAck
-error
 
(Rerrorbproto3
+error
 
(Rerror"!
+SCDnySdkNtf
+type
 
(Rtypebproto3

Assets/Lua/Pb/protocal.txt

@@ -1,5 +1,5 @@
 
-›—
+Û—
 protocal.protoserverprotocommon.protoerror_code.protologin.proto
 user.proto"�ê

 Request7
@@ -373,7 +373,7 @@ $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.CSPayOrderCompleteReqRCSPAYORDERCOMPLETEREQ"å¬
 Response7
 SC_PING_ACKé 
(2.serverproto.SCPingAckR	SCPINGACK:
 SC_LOGIN_ACKë 
(2.serverproto.SCLoginAckR
@@ -858,4 +858,5 @@ $SC_RUNE_SPECIAL_PRIVILEGE_REWARD_ACK
 SC_CLIMBING_TOWER_WJ_RANK_ACK°/ 
(2%.serverproto.SCClimbingTowerWjRankAckRSCCLIMBINGTOWERWJRANKACKg
 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.SCPayOrderCompleteAckRSCPAYORDERCOMPLETEACKbproto3
+SC_PAY_ORDER_COMPLETE_ACK¹/ 
(2".serverproto.SCPayOrderCompleteAckRSCPAYORDERCOMPLETEACK>
+SC_DNY_SDK_NTF¼/ 
(2.serverproto.SCDnySdkNtfRSCDNYSDKNTFbproto3

ProtocolGen/proto/ProtoMsgId.lua

@@ -723,6 +723,7 @@
 	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067,  -- SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
 	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]
 
     }
     return ProtoMsgId

ProtocolGen/proto/login.proto

@@ -3833,4 +3833,8 @@ message CSPayOrderCompleteReq {   //project game  //RouteRule game
 
 message SCPayOrderCompleteAck {   //project game  //RouteRule game
     int32 error                                         = 1; //错误码,0成功
+}
+
+message SCDnySdkNtf {
+    int32       type =1;//类型
 }

ProtocolGen/proto/messagedefclient.proto

@@ -726,4 +726,5 @@ enum protoMsgId{
 	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067;  // SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
 	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]
 }

ProtocolGen/proto/protocal.proto

@@ -733,4 +733,5 @@ message Response {
      SCClimbingTowerWjBossNtf           	SC_CLIMBING_TOWER_WJ_BOSS_NTF           =  6065;         // SCClimbingTowerWjBossNtf **SCClimbingTowerWjBossNtf **login.proto ** [SCClimbingTowerWjBossNtf]
      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]
 }