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

# Conflicts:
#	Assets/Lua/Managers/SDKEventReportMgr.lua

Assets/Content/Prefabs/UI/GridViewItem/InfoItem.prefab

@@ -82,6 +82,7 @@ MonoBehaviour:
   - UIGridViewMark
   values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &4063971680048436010
 MonoBehaviour:
@@ -110,6 +111,8 @@ GameObject:
   - component: {fileID: 6285432569513671018}
   - component: {fileID: 9201816108417941459}
   - component: {fileID: 3556529249824137744}
+  - component: {fileID: 2952485476119495085}
+  - component: {fileID: 1394388865031768022}
   m_Layer: 5
   m_Name: BG
   m_TagString: Untagged
@@ -209,6 +212,52 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!114 &2952485476119495085
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6987667674959175723}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 50
+    m_Right: 50
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &1394388865031768022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6987667674959175723}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 1080
+  m_PreferredHeight: 164
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &8602467799689982016
 GameObject:
   m_ObjectHideFlags: 0
@@ -245,10 +294,10 @@ RectTransform:
   m_Father: {fileID: 4306233818714344306}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.011486, y: 0}
-  m_SizeDelta: {x: 1080, y: 50}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 540, y: -82}
+  m_SizeDelta: {x: 980, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &902780401758550308
 CanvasRenderer:
@@ -282,14 +331,14 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 36
     m_FontStyle: 0
-    m_BestFit: 1
+    m_BestFit: 0
     m_MinSize: 12
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u4FDD\u5B58\u6210\u529F\uFF01"
 --- !u!114 &5395258476212613380
@@ -314,6 +363,7 @@ MonoBehaviour:
   - UnityEngine.UI.ContentSizeFitter
   values: 000001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6416533097283194972
 MonoBehaviour:
@@ -337,10 +387,10 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8602467799689982016}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
+  m_HorizontalFit: 0
+  m_VerticalFit: 2

Assets/Content/Prefabs/UI/UIRoleMessage/UIRoleMessage.prefab

@@ -1562,7 +1562,7 @@ RectTransform:
   - {fileID: 1029947528906300051}
   - {fileID: 916218362501169040}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -10443,7 +10443,7 @@ RectTransform:
   - {fileID: 8041195238660960075}
   - {fileID: 2798881452540532547}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 9
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -10914,7 +10914,7 @@ RectTransform:
   - {fileID: 6667425262857259280}
   - {fileID: 6285983970634261908}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -11022,7 +11022,7 @@ RectTransform:
   - {fileID: 878967767349127146}
   - {fileID: 9155867645935141185}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -12121,7 +12121,7 @@ RectTransform:
   - {fileID: 1195736184721452375}
   - {fileID: 8689242455400030297}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -18206,13 +18206,13 @@ RectTransform:
   - {fileID: 2458532920963426169}
   - {fileID: 1214391448431730003}
   - {fileID: 6809832191178612015}
+  - {fileID: 5119510253035444366}
   - {fileID: 9054107389942907229}
   - {fileID: 120791349556429950}
   - {fileID: 795751942586452833}
   - {fileID: 8294743162493022464}
   - {fileID: 3002946349750704383}
   - {fileID: 1622690878384656972}
-  - {fileID: 5119510253035444366}
   m_Father: {fileID: 2322137626752623503}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18333,7 +18333,7 @@ RectTransform:
   m_Children:
   - {fileID: 7765473145818416483}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -18671,7 +18671,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 40
+  m_fontSize: 37.5
   m_fontSizeBase: 42
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -27300,7 +27300,7 @@ PrefabInstance:
     - target: {fileID: 70813078944487029, guid: 02c411c1c49913e42982900775435a4b,
         type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 70813078944487029, guid: 02c411c1c49913e42982900775435a4b,
         type: 3}

Assets/Editor/AssetBundle/CheckHotUpdateRes.cs

@@ -36,6 +36,15 @@ public class CheckHotUpdateRes : EditorWindow
         }
     }
 
+    [MenuItem("AssetBundle/创建最大Version")]
+    public static void CreateVersion()
+    {
+#if UNITY_IOS
+        FileHelper.WirteStringToFile(Application.dataPath+ "/StreamingAssets/unityRes/afivs", "99.99.99.99");
+#else
+        FileHelper.WirteStringToFile(Application.dataPath + "/StreamingAssets/AssetsAndroid/Version", "99.99.99.99");
+#endif
+    }
 
     [MenuItem("AssetBundle/热更相关")]
     public static void OpenCheckHotUpdateWindow()

Assets/Lua/Core/PlatformPack.lua

@@ -1,10 +1,9 @@
 local PlatformPack = {
-	URL_KEY = 'http://43.156.13.116:81//',
-	SERVERLIST_URL = 'http://43.156.13.116:81//serverlist',
-	NOTIFY_URL = 'http://43.156.13.116:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://43.156.13.116:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://43.156.13.116:81//vipService',
-	SpecialFuncShield = true,
+	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',
 }
 
 return PlatformPack

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/PayMgr.lua

@@ -134,7 +134,8 @@ function PayMgr:OnGetPayInfoAck(data)
         end
 
         payType = ManagerContainer.OpenPayMgr:GetCurPayMode()
-
+        --ManagerContainer.SDKEventReportMgr:SendEvent(26)
+        ManagerContainer.SDKEventReportMgr:SendEvent(27)
     --ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), cbUrl,"ex")
     -- and ManagerContainer.OpenPayMgr.platform == "SDKYOUYI_IOS"
         if payType >=1 and UseOpenPay then
@@ -146,11 +147,12 @@ function PayMgr:OnGetPayInfoAck(data)
     
     local dbCount = CommonUtil.GetOwnResCountByItemId(40001)
 
-    local dbCb = function ()
+    local dbCb = function ()     
         LogError("============代币流程==============")
         local iszg = dbCount >= math.floor(data.amount *100+0.0005)
         local cpid = data.cp_order_id
         if iszg then
+            ManagerContainer.SDKEventReportMgr:SendEvent(27)
              ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_PAY_ORDER_COMPLETE_REQ, {cp_order_id = cpid})
         else
             ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("dbPayError")

Assets/Lua/Managers/SDKEventReportMgr.lua

@@ -33,6 +33,8 @@ Receive_2days_bonus			=22,		--领取2日签到奖励		Receive_2days_bonus
 Receive_3days_bonus			=23,		--领取3日签到奖励		Receive_3days_bonus
 Receive_8days_bonus			=24,		--领取8日签到奖励		Receive_8days_bonus
 Receive_30days_bonus		=25,		--领取30日签到奖励		Receive_30days_bonus
+ClickGoods					=26,		--点击礼包
+OpenPayPanel				=27,		--打开支付界面
 }
 
 --[[
@@ -78,6 +80,16 @@ SDKEventReportMgr.SDKEventCfg =
 	[SDKEventReportMgr.EventType.Receive_3days_bonus		]={event="Receive_3days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_8days_bonus		]={event="Receive_8days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_30days_bonus		]={event="Receive_30days_bonus"			,	eventToken=""					,					},
+	[SDKEventReportMgr.EventType.ClickGoods					]={event=""								,	eventToken="bhz9ec"					,
+	other={
+		name = "加入购入车",
+		unique= "FALSE",
+	}				},
+	[SDKEventReportMgr.EventType.OpenPayPanel				]={event=""								,	eventToken="6snb8x"					,
+	other={
+		name = "发起结账",
+		unique= "FALSE",
+	}				},
 },
 --[[
 adjust_token：zg6ixp19pdz4
@@ -118,18 +130,56 @@ adjus事件上报及对应的token
 	[SDKEventReportMgr.EventType.Receive_3days_bonus		]={event="Receive_3days_bonus"			,	eventToken="null"				,					},
 	[SDKEventReportMgr.EventType.Receive_8days_bonus		]={event="Receive_8days_bonus"			,	eventToken="null"				,					},
 	[SDKEventReportMgr.EventType.Receive_30days_bonus		]={event="Receive_30days_bonus"			,	eventToken="null"				,					},
-},
+	[SDKEventReportMgr.EventType.ClickGoods					]={event="null"								,	eventToken="bhz9ec"					,
+	other={
+		name = "加入购入车",
+		unique= "FALSE",
+	}				},
+	[SDKEventReportMgr.EventType.OpenPayPanel				]={event="null"								,	eventToken="6snb8x"					,
+	other={
+		name = "发起结账",
+		unique= "FALSE",
+	}				},},
 }
 
+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
+		LogError("=====统计发起没开======")
         return
     end
    local curCfg = self:GetCfgByType(type)
+   if curCfg == nil then
+		LogError("没找到对应统计 id ="..type)
+		return
+   end
+   --LogError("=====统计发起======")
      local datas = System.Collections.Generic.Dictionary_object_object()
      datas:Add('event', curCfg.event)
      datas:Add('eventToken', curCfg.eventToken)
+
+	 if curCfg.other ~= nil then	
+		for key, value in pairs(curCfg.other) do
+			--LogError(tostring(key))
+			 datas:Add(tostring(key), value)
+		end
+	 end
+
      SDKMgr.Instance:ReportAction(datas)
 
 end
@@ -156,4 +206,16 @@ 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
+
+
+function SDKEventReportMgr:SendClickGoods()
+	self:SendEvent(self.EventType.ClickGoods)
+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

Assets/Lua/UI/UIActivity/UIActivityHundredRechargeBTView.lua

@@ -93,6 +93,7 @@ function UIActivityHundredRechargeBTView:OnClickDayToggle(tog, params, b)
 end
 
 function UIActivityHundredRechargeBTView:OnClickRechargeBtn()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCode = ManagerContainer.PayMgr:BTHundredRechargePay(2)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	if not errorCodeKey then

Assets/Lua/UI/UIActivity/UIActivityLimitedGiftView.lua

@@ -226,6 +226,7 @@ end
 function UIActivityLimitedGiftView:OnItemClick(button, params)
 	local data = params[0]
 	ManagerContainer.LuaUIMgr:OpenTips(data)
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 end
 
 function UIActivityLimitedGiftView:Update()
@@ -313,6 +314,7 @@ end
 
 function UIActivityLimitedGiftView:OnPayClick()
 	local id = self.controller:GetLimitRechargeId()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCode = ManagerContainer.PayMgr:LimitedGiftPay(id)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	if not errorCodeKey then

Assets/Lua/UI/UIActivity/UIActivityTowerView.lua

@@ -712,10 +712,12 @@ end
 function UIActivityTowerView:OnItemClick(button, params)
 	local data = params[0]
 	ManagerContainer.LuaUIMgr:OpenTips(data)
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 end
 
 function UIActivityTowerView:OnPay(button, params)
 	local data = params[0]
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCode = ManagerContainer.PayMgr:RankActivityPay(self.controller:GetType(), data.id)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	if not errorCodeKey then

Assets/Lua/UI/UIExpedition/UIExpeditionHelpView.lua

@@ -34,6 +34,10 @@ function UIExpeditionHelpView:Init()
 	end
 	self:RefreshLeftTimes()
 	
+	self:InitFmt()
+end
+
+function UIExpeditionHelpView:InitFmt()
 	self.HFmt =  "%02d"..I18N.T("HRS").."%02d" ..I18N.T("MINS").."%02d" ..I18N.T("S")
 	self.MFmt =  "%02d"..I18N.T("MINS").."%02d" ..I18N.T("S")
 	self.SFmt =  "%02d" ..I18N.T("S")
@@ -56,7 +60,7 @@ end
 
 function UIExpeditionHelpView:OnShow(data)
 	self.controller:SetData(data)
-
+	self:InitFmt()
 end
 
 function UIExpeditionHelpView:OnClose()
@@ -129,6 +133,11 @@ function UIExpeditionHelpView:UpdateLeftTime()
 	else
 		local day,hour,minute,second = ConvertTimeForm(leftTime)
 		local timeStr = ""
+
+		if  self.HFmt == nil or self.MFmt == nil or self.SFmt == nil  then
+			self:InitFmt()
+		end
+		
 		if hour > 0 then
 			timeStr = string.format(self.HFmt , hour,minute, second)
 		else

Assets/Lua/UI/UIRuneShop/UIRewardsBuyTipsCtr.lua

@@ -78,6 +78,7 @@ function UIRewardsBuyTipsCtr:GetExpUp()
 end 
 
 function UIRewardsBuyTipsCtr:SendPay()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local round = ManagerContainer.DataMgr.RuneShopDataMgr:GetRewardsData():GetShowRewardsRoundData()
 	local errorCode = ManagerContainer.PayMgr:AirShipPay(round)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)

Assets/Lua/UI/UIRuneShop/UIRuneShopBTView.lua

@@ -173,6 +173,7 @@ function UIRuneShopBTView:OnClickGiftItem(button, params)
 	local id = params[0]
 	local runeShopType = self.controller:GetShopType()
 	local runeShopSubType = self.controller:GetShopSubType()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	if runeShopType == Enum.RuneShopType.Gifts then
 		if runeShopSubType == Enum.RuneShopSubType.Gold then
 			ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopGoldBuyTips, {runeShopType, runeShopSubType, id})
@@ -184,6 +185,7 @@ end
 
 function UIRuneShopBTView:OnClickGiftPrice(button, params)
 	-- 直接发起支付
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local id = params[0]
 	local errorCodeKey = self.controller:SendPay(id)
 	if not errorCodeKey then
@@ -196,6 +198,7 @@ function UIRuneShopBTView:OnClickLimitedItem(button, params)
 	local itemIdx = params[1]
 	local runeShopType = self.controller:GetShopType()
 	local runeShopSubType = self.controller:GetShopSubType()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	if runeShopType == Enum.RuneShopType.Gifts then
 		if runeShopSubType == Enum.RuneShopSubType.Gold then
 			ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopGoldBuyTips, {runeShopType, runeShopSubType, id})
@@ -211,6 +214,7 @@ function UIRuneShopBTView:OnClickLimitedPrice(button, params)
 	-- 直接发起支付
 	local id = params[0]
 	local itemIdx = params[1]
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCodeKey = self.controller:SendPay(id)
 	if not errorCodeKey then
 		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay(errorCodeKey)

Assets/Plugins/SDK/NULL/NULLSDKAndroid.cs

@@ -107,4 +107,12 @@ public class NULLSDKAndroid : SDKBase
 	{
 		throw new System.NotImplementedException();
 	}
+
+    public override bool IsReportAction() { return true; }
+
+    public override void ReportAction(Dictionary<object, object> datas)
+    {
+        base.ReportAction(datas);
+        Debug.LogWarning("[NULLSDK][ReportAction] current platform is not SDK !!!");
+    }
 }

Build/BuildDependenceResource/CurPackEnv.ini

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

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: mianywl
-  productName: 'The King of Poring: Origin'
+  productName: "\u4E1C\u5357\u4E9A\u6D4B\u8BD5\u670D"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 1.0.0.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -845,10 +845,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU
+    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU;FPS_DISABLE
+    iPhone: USE_LUA;VUPLEX_CCU
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1

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

UserSettings/Layouts/default-2021.dwlt

@@ -43,7 +43,7 @@ MonoBehaviour:
     width: 1304
     height: 903
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Inspector
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 20
+  controlID: 43
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 67
+  controlID: 35
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -218,7 +218,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 48
+  controlID: 72
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -243,7 +243,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 49
+  controlID: 17
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -263,8 +263,8 @@ MonoBehaviour:
     y: 0
     width: 464
     height: 541
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -289,8 +289,8 @@ MonoBehaviour:
     y: 0
     width: 462
     height: 541
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -316,8 +316,8 @@ MonoBehaviour:
     y: 541
     width: 926
     height: 312
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 16}
@@ -343,8 +343,8 @@ MonoBehaviour:
     y: 0
     width: 378
     height: 853
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -485,23 +485,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Content/Prefabs/UI
+    - Assets/Editor/CsvToLua
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Content/Prefabs/UI/PaySelect
+  - Assets/Editor/CsvToLua
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 881}
-    m_SelectedIDs: 3e620000
-    m_LastClickedID: 25150
-    m_ExpandedIDs: 000000003c6200003e6200004262000046620000486200004a6200004c6200004e620000506200006462000096620000a662000000ca9a3b
+    scrollPos: {x: 0, y: 53}
+    m_SelectedIDs: 827c0300
+    m_LastClickedID: 228482
+    m_ExpandedIDs: 00000000e2b20200e4b20200e6b20200e8b20200eab20200ecb20200eeb20200787b030000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -529,7 +529,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000003c6200003e62000040620000426200004462000046620000486200004a6200004c6200004e62000050620000
+    m_ExpandedIDs: 00000000e2b20200e4b20200e6b20200e8b20200eab20200ecb20200eeb20200
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -556,7 +556,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c62300002cdf01008cb00c0000cf0c0076280d007e660c0098660c0060940c0008a10c00e6950c008ec90c00c2f8010000000000084604006c410400a2010500b6610000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -620,21 +620,21 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: b858f8ff108cf8ff148cf8ff168cf8ff1e8cf8ff2a8cf8ff488cf8ff94f7faff0a03fbff5c03fbff9206fbffa006fbffcc06fbff1a0afbff5a11fbfff812fbff2833fbffe837fbff2439fbff163dfbff1c40fbff5243fbff7846fbff2a4ffbff6451fbff8c53fbff7057fbffc25afbffb669fbffdc6cfbff046ffbff3e71fbffce72fbffb276fbff867efbff7a89fbff62e5fbff88e7fbff8eebfbffe820fcffae39fcffc046fcffa649fcffd665fcffc869fcfff06cfcff966efcff2e70fcff4271fcffa072fcfff475fcff1a78fcfff679fcff6080fcffdc82fcff2a86fcffd288fcff708afcff9a8cfcffd08ffcff2a93fcff3096fcff4298fcff689bfcffe09cfcff5aa0fcff7aa4fcffb4a6fcff98aafcff72abfcff64affcff88b0fcff26bffcffacccfcffc8d2fcffb6defcffa4e0fcff34e2fcff08eafcff92eefcff86fdfcff3806fdff6609fdff0e34fdfff43afdff723cfdff783cfdff40d8fdff98f8fffff4fffffff6610000ccce1d0028cf1d00d8d21d00
+      m_ExpandedIDs: bab0fbffe61afefff4ffffff9cb20200
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: CanvasWebViewPrefabView
-        m_OriginalName: CanvasWebViewPrefabView
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 1953534
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 11}
       m_SearchString: 
@@ -937,9 +937,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.8499879, y: 1.1609719, z: 1.2630944}
+    m_Target: {x: -1.1684126, y: 1.6461904, z: 1.2718133}
     speed: 2
-    m_Value: {x: -0.8499879, y: 1.1609719, z: 1.2630944}
+    m_Value: {x: -1.1684126, y: 1.6461904, z: 1.2718133}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -990,9 +990,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 5.1832547
+    m_Target: 4.3113775
     speed: 2
-    m_Value: 5.1832547
+    m_Value: 4.3113775
   m_Ortho:
     m_Target: 1
     speed: 2