购买次数远航

Assets/Content/Config/GlobalCfg.csv

@@ -348,3 +348,4 @@ int,string,int,string,float
 361,儲值錢包返回後的關卡及引導id,,10001:20,
 362,挑戰者大廳購買次數消耗,,2:50000;2:60000;2:80000;2:100000;2:120000;2:150000,
 363,最大關卡ID,580100,,
+364,远航可购买次数,5,,

Assets/Content/Prefabs/UI/UIVoyage/UIVoyage.prefab

@@ -346,7 +346,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 120}
+  m_AnchoredPosition: {x: 0, y: 96}
   m_SizeDelta: {x: 288, y: 128}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2770302725636082681
@@ -4956,7 +4956,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 120}
+  m_AnchoredPosition: {x: 0, y: 96}
   m_SizeDelta: {x: 288, y: 128}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7773365081545737163
@@ -7021,7 +7021,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 25}
+  m_AnchoredPosition: {x: 0, y: 194}
   m_SizeDelta: {x: 320, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6284590435731912962

Assets/Lua/Config/ActivitiesCfg.lua

@@ -2101,7 +2101,7 @@ local ActivitiesCfg = {
 [18005]={
 ['Id']=18005,
 ['Type']=12,
-['Name']='植树节储值',
+['Name']='植树节儲值',
 ['Order']=1,
 ['BG']='ActivityImg/monthrecharge_cn',
 ['ActivityBG']='ActivityImg/monthrecharge_cn',
@@ -2268,6 +2268,21 @@ local ActivitiesCfg = {
 ['RuleKey']='',
 ['ExpiredActivities']=0,
 },
+[15001]={
+['Id']=15001,
+['Type']=7,
+['Name']='植樹節兑換',
+['Order']=1,
+['BG']='ActivityImg/duihuanhaoli_cn',
+['ActivityBG']='ActivityImg/duihuanhaoli_cn',
+['PageId']=365,
+['Entrance']={159},
+['HdDrop']={178,179,180,181,182,184,185,186,187,188,189,183},
+['NeedShow']=true,
+['NoPay']=false,
+['RuleKey']='SetsWordActivityText',
+['ExpiredActivities']=0,
+},
 [20001]={
 ['Id']=20001,
 ['Type']=7,

Assets/Lua/Config/ActivitiesCollectionCfg.lua

@@ -1433,5 +1433,595 @@ local ActivitiesCollectionCfg = {
 ['Reward']={{513,1}},
 ['ActivitiesId']=10,
 },
+[154]={
+['Id']=154,
+['Name']='植树节兑换',
+['Order']=1,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15067,1}},
+['ActivitiesId']=15001,
+},
+[155]={
+['Id']=155,
+['Name']='植树节兑换',
+['Order']=2,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15077,1}},
+['ActivitiesId']=15001,
+},
+[156]={
+['Id']=156,
+['Name']='植树节兑换',
+['Order']=3,
+['ExchangeCondition']={{183,688}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15087,1}},
+['ActivitiesId']=15001,
+},
+[157]={
+['Id']=157,
+['Name']='植树节兑换',
+['Order']=4,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{693,1}},
+['ActivitiesId']=15001,
+},
+[158]={
+['Id']=158,
+['Name']='植树节兑换',
+['Order']=5,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{707,1}},
+['ActivitiesId']=15001,
+},
+[159]={
+['Id']=159,
+['Name']='植树节兑换',
+['Order']=6,
+['ExchangeCondition']={{183,688}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13183,1}},
+['ActivitiesId']=15001,
+},
+[160]={
+['Id']=160,
+['Name']='植树节兑换',
+['Order']=7,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13148,1}},
+['ActivitiesId']=15001,
+},
+[161]={
+['Id']=161,
+['Name']='植树节兑换',
+['Order']=8,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13190,1}},
+['ActivitiesId']=15001,
+},
+[162]={
+['Id']=162,
+['Name']='植树节兑换',
+['Order']=9,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13194,1}},
+['ActivitiesId']=15001,
+},
+[163]={
+['Id']=163,
+['Name']='植树节兑换',
+['Order']=10,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13195,1}},
+['ActivitiesId']=15001,
+},
+[164]={
+['Id']=164,
+['Name']='植树节兑换',
+['Order']=11,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13120,1}},
+['ActivitiesId']=15001,
+},
+[165]={
+['Id']=165,
+['Name']='植树节兑换',
+['Order']=12,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13105,1}},
+['ActivitiesId']=15001,
+},
+[166]={
+['Id']=166,
+['Name']='植树节兑换',
+['Order']=13,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13110,1}},
+['ActivitiesId']=15001,
+},
+[167]={
+['Id']=167,
+['Name']='植树节兑换',
+['Order']=14,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13009,1}},
+['ActivitiesId']=15001,
+},
+[168]={
+['Id']=168,
+['Name']='植树节兑换',
+['Order']=15,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13192,1}},
+['ActivitiesId']=15001,
+},
+[169]={
+['Id']=169,
+['Name']='植树节兑换',
+['Order']=16,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{13193,1}},
+['ActivitiesId']=15001,
+},
+[170]={
+['Id']=170,
+['Name']='植树节兑换',
+['Order']=17,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{526,1}},
+['ActivitiesId']=15001,
+},
+[171]={
+['Id']=171,
+['Name']='植树节兑换',
+['Order']=18,
+['ExchangeCondition']={{183,488}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{11102,1}},
+['ActivitiesId']=15001,
+},
+[172]={
+['Id']=172,
+['Name']='植树节兑换',
+['Order']=19,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{851,1}},
+['ActivitiesId']=15001,
+},
+[173]={
+['Id']=173,
+['Name']='植树节兑换',
+['Order']=20,
+['ExchangeCondition']={{183,250}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{15035,1}},
+['ActivitiesId']=15001,
+},
+[174]={
+['Id']=174,
+['Name']='植树节兑换',
+['Order']=21,
+['ExchangeCondition']={{183,250}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{11567,1}},
+['ActivitiesId']=15001,
+},
+[175]={
+['Id']=175,
+['Name']='植树节兑换',
+['Order']=22,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{846,1}},
+['ActivitiesId']=15001,
+},
+[176]={
+['Id']=176,
+['Name']='植树节兑换',
+['Order']=23,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{854,1}},
+['ActivitiesId']=15001,
+},
+[177]={
+['Id']=177,
+['Name']='植树节兑换',
+['Order']=24,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{856,1}},
+['ActivitiesId']=15001,
+},
+[178]={
+['Id']=178,
+['Name']='植树节兑换',
+['Order']=25,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{857,1}},
+['ActivitiesId']=15001,
+},
+[179]={
+['Id']=179,
+['Name']='植树节兑换',
+['Order']=26,
+['ExchangeCondition']={{183,288}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{858,1}},
+['ActivitiesId']=15001,
+},
+[180]={
+['Id']=180,
+['Name']='植树节兑换',
+['Order']=27,
+['ExchangeCondition']={{183,120}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{20007,1}},
+['ActivitiesId']=15001,
+},
+[181]={
+['Id']=181,
+['Name']='植树节兑换',
+['Order']=28,
+['ExchangeCondition']={{183,120}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{20008,1}},
+['ActivitiesId']=15001,
+},
+[182]={
+['Id']=182,
+['Name']='植树节兑换',
+['Order']=29,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{332,1}},
+['ActivitiesId']=15001,
+},
+[183]={
+['Id']=183,
+['Name']='植树节兑换',
+['Order']=30,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{333,1}},
+['ActivitiesId']=15001,
+},
+[184]={
+['Id']=184,
+['Name']='植树节兑换',
+['Order']=31,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{334,1}},
+['ActivitiesId']=15001,
+},
+[185]={
+['Id']=185,
+['Name']='植树节兑换',
+['Order']=32,
+['ExchangeCondition']={{183,388}},
+['ServersReward']=0,
+['Number']=1,
+['Reward']={{335,1}},
+['ActivitiesId']=15001,
+},
+[186]={
+['Id']=186,
+['Name']='植树节兑换',
+['Order']=33,
+['ExchangeCondition']={{183,188}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{855,1}},
+['ActivitiesId']=15001,
+},
+[187]={
+['Id']=187,
+['Name']='植树节兑换',
+['Order']=34,
+['ExchangeCondition']={{183,150}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12198,1}},
+['ActivitiesId']=15001,
+},
+[188]={
+['Id']=188,
+['Name']='植树节兑换',
+['Order']=35,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12191,1}},
+['ActivitiesId']=15001,
+},
+[189]={
+['Id']=189,
+['Name']='植树节兑换',
+['Order']=36,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12195,1}},
+['ActivitiesId']=15001,
+},
+[190]={
+['Id']=190,
+['Name']='植树节兑换',
+['Order']=37,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12194,1}},
+['ActivitiesId']=15001,
+},
+[191]={
+['Id']=191,
+['Name']='植树节兑换',
+['Order']=38,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12193,1}},
+['ActivitiesId']=15001,
+},
+[192]={
+['Id']=192,
+['Name']='植树节兑换',
+['Order']=39,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12163,1}},
+['ActivitiesId']=15001,
+},
+[193]={
+['Id']=193,
+['Name']='植树节兑换',
+['Order']=40,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12186,1}},
+['ActivitiesId']=15001,
+},
+[194]={
+['Id']=194,
+['Name']='植树节兑换',
+['Order']=41,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12197,1}},
+['ActivitiesId']=15001,
+},
+[195]={
+['Id']=195,
+['Name']='植树节兑换',
+['Order']=42,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{12196,1}},
+['ActivitiesId']=15001,
+},
+[196]={
+['Id']=196,
+['Name']='植树节兑换',
+['Order']=43,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{264,1}},
+['ActivitiesId']=15001,
+},
+[197]={
+['Id']=197,
+['Name']='植树节兑换',
+['Order']=44,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{261,1}},
+['ActivitiesId']=15001,
+},
+[198]={
+['Id']=198,
+['Name']='植树节兑换',
+['Order']=45,
+['ExchangeCondition']={{183,1}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{140,1}},
+['ActivitiesId']=15001,
+},
+[199]={
+['Id']=199,
+['Name']='植树节兑换',
+['Order']=46,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{237,1}},
+['ActivitiesId']=15001,
+},
+[200]={
+['Id']=200,
+['Name']='植树节兑换',
+['Order']=47,
+['ExchangeCondition']={{183,15}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{200,1}},
+['ActivitiesId']=15001,
+},
+[201]={
+['Id']=201,
+['Name']='植树节兑换',
+['Order']=48,
+['ExchangeCondition']={{183,88}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{529,1}},
+['ActivitiesId']=15001,
+},
+[202]={
+['Id']=202,
+['Name']='植树节兑换',
+['Order']=49,
+['ExchangeCondition']={{183,10}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{528,1}},
+['ActivitiesId']=15001,
+},
+[203]={
+['Id']=203,
+['Name']='植树节兑换',
+['Order']=50,
+['ExchangeCondition']={{183,1}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{100,1}},
+['ActivitiesId']=15001,
+},
+[204]={
+['Id']=204,
+['Name']='植树节兑换',
+['Order']=51,
+['ExchangeCondition']={{183,2}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{110,1}},
+['ActivitiesId']=15001,
+},
+[205]={
+['Id']=205,
+['Name']='植树节兑换',
+['Order']=52,
+['ExchangeCondition']={{183,15}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{268,1}},
+['ActivitiesId']=15001,
+},
+[206]={
+['Id']=206,
+['Name']='植树节兑换',
+['Order']=53,
+['ExchangeCondition']={{183,40}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{520,1}},
+['ActivitiesId']=15001,
+},
+[207]={
+['Id']=207,
+['Name']='植树节兑换',
+['Order']=54,
+['ExchangeCondition']={{183,55}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{690,1}},
+['ActivitiesId']=15001,
+},
+[208]={
+['Id']=208,
+['Name']='植树节兑换',
+['Order']=55,
+['ExchangeCondition']={{183,45}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{704,1}},
+['ActivitiesId']=15001,
+},
+[209]={
+['Id']=209,
+['Name']='植树节兑换',
+['Order']=56,
+['ExchangeCondition']={{183,8}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{128,1}},
+['ActivitiesId']=15001,
+},
+[210]={
+['Id']=210,
+['Name']='植树节兑换',
+['Order']=57,
+['ExchangeCondition']={{183,5}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{130,1}},
+['ActivitiesId']=15001,
+},
+[211]={
+['Id']=211,
+['Name']='植树节兑换',
+['Order']=58,
+['ExchangeCondition']={{183,5}},
+['ServersReward']=0,
+['Number']=999,
+['Reward']={{131,1}},
+['ActivitiesId']=15001,
+},
+[212]={
+['Id']=212,
+['Name']='植树节兑换',
+['Order']=59,
+['ExchangeCondition']={{183,30}},
+['ServersReward']=0,
+['Number']=20,
+['Reward']={{513,1}},
+['ActivitiesId']=15001,
+},
 }
 return ActivitiesCollectionCfg

Assets/Lua/Logic/Activities/ActivityChipRewardItem.lua

@@ -5,7 +5,8 @@ function ActivityChipRewardItem:ctor(actId)
     self.data = {}
     self.map = {}
     self.globalMap = {}
-
+   
+    self.actID = actId
     self:InitData(actId)
 end
 
@@ -29,6 +30,10 @@ end
 
 function ActivityChipRewardItem:SyncSrvData(serverData)
     local collectionRewardData = serverData[3]
+    if collectionRewardData == nil then
+        LogError("actID = "..self.actID)
+        return
+    end 
     for i = 1, #collectionRewardData do
         local data = self.map[collectionRewardData[i].id]
         if data then

Assets/Lua/Logic/Voyage/VoyageDataMgr.lua

@@ -35,6 +35,9 @@ function VoyageDataMgr:ctor()
     self:ClearViewListData()
     self.selfAirShipData = nil
     self.buyNum = 0
+    self.buyNumCost = 0
+    self.buyType = 2
+    self.numLimit = 0
     -- if self.selfAirShipCompleteTimer then
     --     self.selfAirShipCompleteTimer:Stop()
     --     self.selfAirShipCompleteTimer = nil
@@ -150,6 +153,7 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     if not data then
         return
     end
+    LogError("[wboy] RefreshSelfVoyageData " .. Inspect(data))
     local challengeNum = data.challenge_num or 0
     local voyageNum = data.trial_num or 0
     local curAirShipId = data.refresh_trial_type or 1
@@ -160,8 +164,10 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     self.voyageNum = voyageNum
     self.curAirShipId = curAirShipId
     self.buyNum = data.buy_num
+    self.buyNumCost = data.buy_consume
+    self.buyType = data.buy_type
     self:RefreshSelfAirShip(data.trial_data)
-
+    self:RefNumimit()
     if changed1 then
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_CHALLENGE_NUM_CHANGED)
     end
@@ -172,7 +178,7 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
         ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.VOYAGE_AIRSHIP_CHANGED)
     end
     if self.rpStatus == nil or self.rpStatus then
-        local rpStatus = (self.voyageNum < GlobalConfig.Instance:GetConfigIntValue(323))
+        local rpStatus = (self.voyageNum <self:GetNumLimit())
         self:SetRpStatus(rpStatus)
     end
 end
@@ -792,4 +798,24 @@ function  VoyageDataMgr:GetBuyNum()
     return  self.buyNum
 end
 
+function  VoyageDataMgr:GetBuyCost()
+    return  self.buyNumCost
+end
+function  VoyageDataMgr:GetBuyType()
+    return  self.buyType
+end
+
+function VoyageDataMgr:GetBuyNumLimit()
+    return GlobalConfig.Instance:GetConfigIntValue(364)
+end
+
+
+function VoyageDataMgr:RefNumimit()
+	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(323) + self.buyNum
+end
+
+
+function  VoyageDataMgr:GetNumLimit()
+    return self.numLimit
+end
 return VoyageDataMgr

Assets/Lua/Pb/user.txt

@@ -1,5 +1,5 @@
 
-�è
+Ìè
 
 user.protoserverproto"¸

 AccountRole
@@ -1456,7 +1456,7 @@ totalScore
 pet_info 
(2.serverproto.RushPetInfoRpetInfo"—

 	RoleCrossD
 
yuanhangtrial
 
(2.serverproto.RoleYuanHangTrialR
yuanhangtrialD
-
crosstoptower 
(2.serverproto.RoleCrossTopTowerR
crosstoptower"º
+
crosstoptower 
(2.serverproto.RoleCrossTopTowerR
crosstoptower"ö
 RoleYuanHangTrial#
 
challenge_num
 
(RchallengeNum
 	trial_num 
(RtrialNum,
@@ -1466,7 +1466,10 @@ trial_data 
(2.serverproto.YuanHangTrialDataR	trialData<
 log_list (2!.serverproto.YuanHangTrialLogDataRlogList
 trial_score 
(R
 trialScore
-buy_num 
(RbuyNum"…
+buy_num 
(RbuyNum
+buy_consume 
(
R
+buyConsume
+buy_type	 
(RbuyType"…
 YuanHangTrialData
 uid
 
(Ruid
 zone 
(Rzone

Assets/Lua/UI/UIVoyage/UIVoyageCtr.lua

@@ -29,11 +29,15 @@ end
 function UIVoyageCtr:InitData()
 	ManagerContainer.DataMgr.VoyageDataMgr:SetKeepVoyageState(true)
 	ManagerContainer.DataMgr.VoyageDataMgr:SetRpStatus(false)
-	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(323)
+	self:RefNumimit()
 	self.lastAttackUid = ManagerContainer.DataMgr.VoyageDataMgr:GetLastAttackUid()
 	ManagerContainer.DataMgr.VoyageDataMgr:ClearLastAttackData()
 end
 
+function UIVoyageCtr:RefNumimit()
+	self.numLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetNumLimit()
+end
+
 function UIVoyageCtr:GetUserId()
 	return ManagerContainer.DataMgr.UserData:GetUserId()
 end

Assets/Lua/UI/UIVoyage/UIVoyagePrepareCtr.lua

@@ -27,7 +27,7 @@ function UIVoyagePrepareCtr:OnDispose()
 end
 
 function UIVoyagePrepareCtr:InitData()
-	self.numLimit = GlobalConfig.Instance:GetConfigIntValue(323)
+	self.numLimit =  ManagerContainer.DataMgr.VoyageDataMgr:GetNumLimit()
 	self.lastSelectId = nil
 	self.curSelectId = nil
 	self:RefreshSelectId()

Assets/Lua/UI/UIVoyage/UIVoyageView.lua

@@ -43,7 +43,7 @@ function UIVoyageView:Init()
 	end
 	ManagerContainer.LuaUIMgr:ClosePage(Enum.UIPageName.UIDojoExit)
 	self.btnLog:SetActive(true)
-	--self.btnAdd:SetActive(true)
+	self.btnAdd:SetActive(true)
 end
 
 function UIVoyageView:RemoveEventListener()
@@ -129,10 +129,29 @@ end
 
 function UIVoyageView:OnClickAddBtn()
 	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {costNum, nil, self.SureBuyChallengeNumBtn, self})
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {200, nil, nil, nil,nil,54})
+	
+	local buyNum = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNum()
+	
+	local buyNumLimit = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyNumLimit()
+
+	if (buyNumLimit - buyNum) <= 0 then
+		LogError("购买次数达到上限")
+		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("312")
+		return
+	end
+
+
+	local buyType = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyType()
+	local cost = ManagerContainer.DataMgr.VoyageDataMgr:GetBuyCost()
+	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {cost, nil, self.SureBuyChallengeNumBtn, self,nil,buyType})
 	--ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ , {})
 end
 
+
+function UIVoyageView:SureBuyChallengeNumBtn()
+	ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ , {})
+end
+
 function UIVoyageView:OnClickBackBtn()
 	ManagerContainer.LuaUIMgr:OpenSourceUI(self)
 end
@@ -502,8 +521,8 @@ end
 function UIVoyageView:OnBuyNumAck(data)
 	LogError(" SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK  = " .. Inspect(data))
 	if ManagerContainer.NetManager:IsErrorData(data) then return end
-	
-	ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {200, nil, nil, nil,nil,54})
+	self.controller:RefNumimit()
+	self:RefreshRemindNum()
 end
 return UIVoyageView
 

ProtocolGen/proto/user.proto

@@ -1812,6 +1812,8 @@ message RoleYuanHangTrial {
     repeated YuanHangTrialLogData log_list = 5; //挑战被挑战日志记录
     int32 trial_score                      = 6;
     int32 buy_num                 = 7; //当前玩家购买挑战次数
+    double buy_consume          = 8 ;//价格
+    int32 buy_type   = 9 ;//货币类型
 }
 message YuanHangTrialData {
     uint64 uid                          = 1;