123 1 год назад
Родитель
Сommit
06d9d17611

+ 84 - 0
Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -192,6 +192,90 @@ local RuneShopGiftsCfg = {
 ['SortId']=1,
 ['RmbTotalPay']=0,
 },
+[17]={
+['Id']=17,
+['Name']='周直購禮包17',
+['Pic']='ShopIcons/bt_market_giftbox1',
+['Type']=2,
+['RMB']=19.99,
+['Reward']={{54,6666},{2,666666}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[18]={
+['Id']=18,
+['Name']='日直购武器精炼包1',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=9.99,
+['Reward']={{102,999},{1,5000000 }},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[19]={
+['Id']=19,
+['Name']='日直购防具精炼包1',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=9.99,
+['Reward']={{101,1999},{1,5000000 }},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[20]={
+['Id']=20,
+['Name']='日直購禮包13',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=0.99,
+['Reward']={{102,200},{1,50000 }},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[21]={
+['Id']=21,
+['Name']='日直購禮包14',
+['Pic']='ShopIcons/ic_club_gold_30',
+['Type']=1,
+['RMB']=0.99,
+['Reward']={{101,300},{1,50000 }},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[22]={
+['Id']=22,
+['Name']='周直购武器精炼包1',
+['Pic']='ShopIcons/bt_market_giftbox1',
+['Type']=2,
+['RMB']=49.99,
+['Reward']={{102,6666},{2,1000000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
+[23]={
+['Id']=23,
+['Name']='周直购防具精炼包1',
+['Pic']='ShopIcons/bt_market_giftbox1',
+['Type']=2,
+['RMB']=49.99,
+['Reward']={{101,12888},{2,1000000}},
+['FirstBuyPic']='',
+['ExtraBuyPic']='',
+['SortId']=1,
+['RmbTotalPay']=0,
+},
 [30]={
 ['Id']=30,
 ['Name']='周直購禮包1',

+ 3 - 3
Assets/Lua/UI/UIVoyage/UIVoyageRobberyView.lua

@@ -36,9 +36,9 @@ function UIVoyageRobberyView:Init()
 	self.controller:InitData()
 	self:RefreshView()
 	self:RefreshRobNum()
-	self.box:SetActive(false)
+	self.box:SetActive(true)
 	--self.robNum:SetActive(false)
-	self.transform:Find("UIAnimator/Window/BG/Title").gameObject:SetActive(false)
+	self.transform:Find("UIAnimator/Window/BG/Title").gameObject:SetActive(true)
 end
 
 function UIVoyageRobberyView:RemoveEventListener()
@@ -58,7 +58,7 @@ end
 
 function UIVoyageRobberyView:OnShow(data)
 	self.controller:SetData(data)
-	self.box:SetActive(false)
+	self.box:SetActive(true)
 	self.robNum:SetActive(false)
 end
 

+ 1 - 1
Assets/Lua/UI/UIVoyage/UIVoyageView.lua

@@ -40,7 +40,7 @@ function UIVoyageView:Init()
 		self.airShipTimer:Start()
 	end
 	ManagerContainer.LuaUIMgr:ClosePage(Enum.UIPageName.UIDojoExit)
-	self.btnLog:SetActive(false)
+	self.btnLog:SetActive(true)
 end
 
 function UIVoyageView:RemoveEventListener()