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

Assets/Lua/Config/ActivitiesTiredChargeCfg.lua

@@ -3,7 +3,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=1,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{153,50},{175,100},{531,1},{2,20000},{131,1},{129,1}},
+    ['Reward']={{175,100},{531,1},{2,20000},{131,1},{129,1}},
     ['Day']=1,
     ['Index']=1,
     },
@@ -11,7 +11,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=2,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{153,100},{175,200},{531,2},{2,40000},{131,1},{130,1}},
+    ['Reward']={{175,200},{531,2},{2,40000},{131,1},{130,1}},
     ['Day']=1,
     ['Index']=2,
     },
@@ -19,7 +19,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=3,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{153,150},{175,300},{513,1},{2,100000},{135,1},{134,1}},
+    ['Reward']={{175,300},{513,1},{2,100000},{135,1},{134,1}},
     ['Day']=1,
     ['Index']=3,
     },
@@ -27,7 +27,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=4,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{153,200},{175,500},{513,1},{607,1},{135,1},{134,1}},
+    ['Reward']={{175,500},{513,1},{607,1},{135,1},{134,1}},
     ['Day']=1,
     ['Index']=4,
     },
@@ -35,7 +35,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=5,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{153,300},{175,1000},{513,1},{687,1},{135,1},{134,1}},
+    ['Reward']={{175,1000},{513,1},{687,1},{135,1},{134,1}},
     ['Day']=1,
     ['Index']=5,
     },
@@ -43,7 +43,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=6,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{153,400},{175,1000},{513,1},{523,1},{141,3},{139,1}},
+    ['Reward']={{175,1000},{513,1},{523,1},{141,3},{139,1}},
     ['Day']=1,
     ['Index']=6,
     },
@@ -51,7 +51,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=7,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{153,500},{175,2000},{520,1},{607,2},{139,1},{138,1}},
+    ['Reward']={{175,2000},{520,1},{607,2},{139,1},{138,1}},
     ['Day']=1,
     ['Index']=7,
     },
@@ -59,7 +59,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=8,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{153,600},{175,3000},{520,2},{523,1},{608,1},{141,3}},
+    ['Reward']={{175,3000},{520,2},{523,1},{608,1},{141,3}},
     ['Day']=1,
     ['Index']=8,
     },
@@ -67,7 +67,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=9,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{153,800},{175,5000},{520,2},{523,1},{688,1},{138,2}},
+    ['Reward']={{175,5000},{520,2},{523,1},{688,1},{138,2}},
     ['Day']=1,
     ['Index']=9,
     },
@@ -75,7 +75,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=10,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{153,50},{531,1},{2,20000},{131,1},{129,1}},
+    ['Reward']={{531,1},{2,20000},{131,1},{129,1}},
     ['Day']=15,
     ['Index']=1,
     },
@@ -83,7 +83,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=11,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{153,100},{531,2},{2,40000},{131,1},{130,1}},
+    ['Reward']={{531,2},{2,40000},{131,1},{130,1}},
     ['Day']=15,
     ['Index']=2,
     },
@@ -91,7 +91,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=12,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{153,150},{513,5},{2,100000},{135,1},{134,1}},
+    ['Reward']={{513,5},{2,100000},{135,1},{134,1}},
     ['Day']=15,
     ['Index']=3,
     },
@@ -99,7 +99,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=13,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{153,200},{513,1},{607,1},{135,1},{134,1}},
+    ['Reward']={{513,1},{607,1},{135,1},{134,1}},
     ['Day']=15,
     ['Index']=4,
     },
@@ -107,7 +107,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=14,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{153,300},{513,1},{687,1},{135,1},{134,1}},
+    ['Reward']={{513,1},{687,1},{135,1},{134,1}},
     ['Day']=15,
     ['Index']=5,
     },
@@ -115,7 +115,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=15,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{153,400},{513,1},{523,1},{141,3},{139,1}},
+    ['Reward']={{513,1},{523,1},{141,3},{139,1}},
     ['Day']=15,
     ['Index']=6,
     },
@@ -123,7 +123,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=16,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{153,500},{520,1},{607,2},{139,1},{138,1}},
+    ['Reward']={{520,1},{607,2},{139,1},{138,1}},
     ['Day']=15,
     ['Index']=7,
     },
@@ -131,7 +131,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=17,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{153,600},{520,2},{523,1},{608,1},{141,3}},
+    ['Reward']={{520,2},{523,1},{608,1},{141,3}},
     ['Day']=15,
     ['Index']=8,
     },
@@ -139,7 +139,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=18,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{153,800},{520,2},{523,1},{688,1},{138,2}},
+    ['Reward']={{520,2},{523,1},{688,1},{138,2}},
     ['Day']=15,
     ['Index']=9,
     },
@@ -147,7 +147,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=19,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{153,50},{528,1},{47,50000},{531,2},{2,20000}},
+    ['Reward']={{528,1},{47,50000},{531,2},{2,20000}},
     ['Day']=29,
     ['Index']=1,
     },
@@ -155,7 +155,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=20,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{153,100},{115,20},{47,100000},{531,2},{2,50000}},
+    ['Reward']={{115,20},{47,100000},{531,2},{2,50000}},
     ['Day']=29,
     ['Index']=2,
     },
@@ -163,7 +163,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=21,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{153,150},{116,20},{47,200000},{531,5},{2,100000}},
+    ['Reward']={{116,20},{47,200000},{531,5},{2,100000}},
     ['Day']=29,
     ['Index']=3,
     },
@@ -171,7 +171,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=22,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{153,200},{45,20000},{47,300000},{531,10},{2,200000}},
+    ['Reward']={{45,20000},{47,300000},{531,10},{2,200000}},
     ['Day']=29,
     ['Index']=4,
     },
@@ -179,7 +179,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=23,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{153,300},{687,2},{47,300000},{531,10},{2,300000}},
+    ['Reward']={{687,2},{47,300000},{531,10},{2,300000}},
     ['Day']=29,
     ['Index']=5,
     },
@@ -187,7 +187,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=24,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{153,400},{687,3},{47,300000},{531,10},{2,500000}},
+    ['Reward']={{687,3},{47,300000},{531,10},{2,500000}},
     ['Day']=29,
     ['Index']=6,
     },
@@ -195,7 +195,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=25,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{153,500},{610,1},{47,300000},{134,2},{2,800000}},
+    ['Reward']={{610,1},{47,300000},{134,2},{2,800000}},
     ['Day']=29,
     ['Index']=7,
     },
@@ -203,7 +203,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=26,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{153,600},{687,3},{47,500000},{531,20},{2,1000000}},
+    ['Reward']={{687,3},{47,500000},{531,20},{2,1000000}},
     ['Day']=29,
     ['Index']=8,
     },
@@ -211,7 +211,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=27,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{153,800},{610,1},{47,500000},{138,3},{2,1000000}},
+    ['Reward']={{610,1},{47,500000},{138,3},{2,1000000}},
     ['Day']=29,
     ['Index']=9,
     },
@@ -219,7 +219,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=28,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{153,50},{528,1},{47,50000},{531,2},{2,20000}},
+    ['Reward']={{528,1},{47,50000},{531,2},{2,20000}},
     ['Day']=43,
     ['Index']=1,
     },
@@ -227,7 +227,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=29,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{153,100},{115,20},{47,100000},{531,2},{2,50000}},
+    ['Reward']={{115,20},{47,100000},{531,2},{2,50000}},
     ['Day']=43,
     ['Index']=2,
     },
@@ -235,7 +235,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=30,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{153,150},{116,20},{47,200000},{531,5},{2,100000}},
+    ['Reward']={{116,20},{47,200000},{531,5},{2,100000}},
     ['Day']=43,
     ['Index']=3,
     },
@@ -243,7 +243,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=31,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{153,200},{45,20000},{47,300000},{531,10},{2,200000}},
+    ['Reward']={{45,20000},{47,300000},{531,10},{2,200000}},
     ['Day']=43,
     ['Index']=4,
     },
@@ -251,7 +251,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=32,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{153,300},{687,2},{47,300000},{531,10},{2,300000}},
+    ['Reward']={{687,2},{47,300000},{531,10},{2,300000}},
     ['Day']=43,
     ['Index']=5,
     },
@@ -259,7 +259,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=33,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{153,400},{687,3},{47,300000},{531,10},{2,500000}},
+    ['Reward']={{687,3},{47,300000},{531,10},{2,500000}},
     ['Day']=43,
     ['Index']=6,
     },
@@ -267,7 +267,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=34,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{153,500},{610,1},{47,300000},{134,2},{2,800000}},
+    ['Reward']={{610,1},{47,300000},{134,2},{2,800000}},
     ['Day']=43,
     ['Index']=7,
     },
@@ -275,7 +275,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=35,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{153,600},{687,3},{47,500000},{531,20},{2,1000000}},
+    ['Reward']={{687,3},{47,500000},{531,20},{2,1000000}},
     ['Day']=43,
     ['Index']=8,
     },
@@ -283,7 +283,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=36,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{153,800},{610,1},{47,500000},{138,3},{2,1000000}},
+    ['Reward']={{610,1},{47,500000},{138,3},{2,1000000}},
     ['Day']=43,
     ['Index']=9,
     },
@@ -291,7 +291,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=37,
     ['Name']='累儲0.99$',
     ['RechargeAmount']=0.99,
-    ['Reward']={{153,50},{528,1},{47,50000},{531,2},{2,20000}},
+    ['Reward']={{528,1},{47,50000},{531,2},{2,20000}},
     ['Day']=57,
     ['Index']=1,
     },
@@ -299,7 +299,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=38,
     ['Name']='累儲4.99$',
     ['RechargeAmount']=4.99,
-    ['Reward']={{153,100},{115,20},{47,100000},{531,2},{2,50000}},
+    ['Reward']={{115,20},{47,100000},{531,2},{2,50000}},
     ['Day']=57,
     ['Index']=2,
     },
@@ -307,7 +307,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=39,
     ['Name']='累儲9.99$',
     ['RechargeAmount']=9.99,
-    ['Reward']={{153,150},{116,20},{47,200000},{531,5},{2,100000}},
+    ['Reward']={{116,20},{47,200000},{531,5},{2,100000}},
     ['Day']=57,
     ['Index']=3,
     },
@@ -315,7 +315,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=40,
     ['Name']='累儲19.99$',
     ['RechargeAmount']=19.99,
-    ['Reward']={{153,200},{45,20000},{47,300000},{531,10},{2,200000}},
+    ['Reward']={{45,20000},{47,300000},{531,10},{2,200000}},
     ['Day']=57,
     ['Index']=4,
     },
@@ -323,7 +323,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=41,
     ['Name']='累儲49.99$',
     ['RechargeAmount']=49.99,
-    ['Reward']={{153,300},{687,2},{47,300000},{531,10},{2,300000}},
+    ['Reward']={{687,2},{47,300000},{531,10},{2,300000}},
     ['Day']=57,
     ['Index']=5,
     },
@@ -331,7 +331,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=42,
     ['Name']='累儲99.99$',
     ['RechargeAmount']=99.99,
-    ['Reward']={{153,400},{687,3},{47,300000},{531,10},{2,500000}},
+    ['Reward']={{687,3},{47,300000},{531,10},{2,500000}},
     ['Day']=57,
     ['Index']=6,
     },
@@ -339,7 +339,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=43,
     ['Name']='累儲119.99$',
     ['RechargeAmount']=119.99,
-    ['Reward']={{153,500},{610,1},{47,300000},{134,2},{2,800000}},
+    ['Reward']={{610,1},{47,300000},{134,2},{2,800000}},
     ['Day']=57,
     ['Index']=7,
     },
@@ -347,7 +347,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=44,
     ['Name']='累儲199.99$',
     ['RechargeAmount']=199.99,
-    ['Reward']={{153,600},{687,3},{47,500000},{531,20},{2,1000000}},
+    ['Reward']={{687,3},{47,500000},{531,20},{2,1000000}},
     ['Day']=57,
     ['Index']=8,
     },
@@ -355,7 +355,7 @@ local ActivitiesTiredChargeCfg = {
     ['Id']=45,
     ['Name']='累儲279.99$',
     ['RechargeAmount']=279.99,
-    ['Reward']={{153,800},{610,1},{47,500000},{138,3},{2,1000000}},
+    ['Reward']={{610,1},{47,500000},{138,3},{2,1000000}},
     ['Day']=57,
     ['Index']=9,
     },

Assets/Lua/Core/Constant.lua

@@ -10,6 +10,7 @@ local Constant = {
     DeleteAccount = false, -- 删除账户
 
     OpenSystemLink = false,
+    OpenSdkGameStartNtf = false,
 
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",

Assets/Lua/Managers/SDKEventReportMgr.lua

@@ -218,4 +218,31 @@ end
 function SDKEventReportMgr:SendClickGoods()
 	self:SendEvent(self.EventType.ClickGoods)
 end
+
+function SDKEventReportMgr:GetSDKNtfAndShow()
+	if not Constant.OpenSdkGameStartNtf then
+		return
+	end
+	local url = PlatformPack.NOTIFY_URL.."SdkGameStartNotice.json"--"http://192.168.0.8:8060/res/Notice/SdkGameStartNotice.json"--
+	local OnRequestHttpCb = function (noticeInfo)
+		local noticesJson
+		local ok, errors = RO_XPCALL(function()  noticesJson = JSON:decode(noticeInfo) end, debug.traceback)
+		if ok then
+			LogError(Inspect(noticesJson))	
+			local copyUrl = noticesJson.url
+			local scb = nil
+			if noticesJson.HasSureCb then
+				scb	 = function ()
+					LogError("url = "..copyUrl)
+					UnityEngine.GUIUtility.systemCopyBuffer = copyUrl
+				 end
+			end
+			 local data = {noticesJson, {}, nil, nil, scb}
+				ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UINoticeTips, data)
+		else
+			LogError(errors)			
+		end
+	end
+	ManagerContainer.LuaGameMgr:RequestHttpServer(url,OnRequestHttpCb)
+end
 return SDKEventReportMgr

Assets/Lua/UI/UICommonTips/UINoticeTipsView.lua

@@ -150,21 +150,26 @@ function UINoticeTipsView:Init()
 	local params1 = data[7]
 	local cost = data[8]
 
-	self.noticeTitle.uILocalizeScript:SetContent(NoticeList[idx].title)
-    self.questionTxt.uILocalizeScript:SetContentAndValues(NoticeList[idx].notice1, params1)
-	self.dscBox.dscTxt.uILocalizeScript:SetContentAndValues(NoticeList[idx].notice, params)
-	self.btnSure.uILocalizeScript:SetContent(NoticeList[idx].btnSure)
-	if NoticeList[idx].btnCancle then
-		self.btnCancleText.uILocalizeScript:SetContent(NoticeList[idx].btnCancle)
+	local curNotice = self:GitCurNotice(idx)
+	if curNotice == nil then
+		return	 
+	end
+
+	self.noticeTitle.uILocalizeScript:SetContent(curNotice.title)
+    self.questionTxt.uILocalizeScript:SetContentAndValues(curNotice.notice1, params1)
+	self.dscBox.dscTxt.uILocalizeScript:SetContentAndValues(curNotice.notice, params)
+	self.btnSure.uILocalizeScript:SetContent(curNotice.btnSure)
+	if curNotice.btnCancle then
+		self.btnCancleText.uILocalizeScript:SetContent(curNotice.btnCancle)
 	else
 		self.btnCancleText.uILocalizeScript:SetContent("BtnCancle")
 	end
 
-	if NoticeList[idx].hideCancel then
+	if curNotice.hideCancel then
 		self.btnClose:SetActive(false)
 		self.btnCancle:SetActive(false)
 	else
-		if NoticeList[idx].hideClose then
+		if curNotice.hideClose then
 			self.btnClose:SetActive(false)
 		else
 			self.btnClose:SetActive(true)
@@ -172,7 +177,7 @@ function UINoticeTipsView:Init()
 		self.btnCancle:SetActive(true)
 	end
 
-	if NoticeList[idx].needCost then
+	if curNotice.needCost then
 		self.btnClose:SetActive(false)
 		self.btnCancle:SetActive(false)
 		self.btnRight:SetActive(false)
@@ -199,7 +204,7 @@ function UINoticeTipsView:Init()
 		self.btnOpen:SetActive(false)
 	end
 
-	self.questionTxt:SetActive(NoticeList[idx].notice1~=nil and NoticeList[idx].notice1~="")
+	self.questionTxt:SetActive(curNotice.notice1~=nil and curNotice.notice1~="")
 end
 
 function UINoticeTipsView:OnBtnSureClick()
@@ -238,7 +243,11 @@ end
 function UINoticeTipsView:OnBtnCloseClick()
 	local data = self.controller:GetData()
 	local idx = data[1]
-	if NoticeList[idx].hideClose then
+	local curNotice = self:GitCurNotice(idx)
+	if curNotice == nil then
+		return
+	end
+	if curNotice.hideClose then
 		return
 	end
 	self:CloseUI()
@@ -280,5 +289,17 @@ function UINoticeTipsView:OnDispose()
 
 end
 
+function UINoticeTipsView:GitCurNotice(idx)
+	local curNotice = nil
+	if type(idx) == "table" then
+		curNotice = idx
+	elseif type(idx) == "number" or type(idx) == "string" then
+		 curNotice = NoticeList[idx]
+	else
+		curNotice = nil	 
+	end
+	return curNotice
+end
+
 return UINoticeTipsView
 

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -207,6 +207,11 @@ function UIMainView:Init()
 	--统一刷新数据
 	self:RefreshData()
 	self:RefreshBoliShopState()
+
+	if ManagerContainer.SDKEventReportMgr ~= nil then
+		ManagerContainer.SDKEventReportMgr:GetSDKNtfAndShow()
+	end
+  
 end
 
 function UIMainView:RefreshBoliShopState()