123 1 жил өмнө
parent
commit
75c27b06f6

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 137 - 111
Assets/Content/Prefabs/UI/UIDojo/UIDojoBuyTimes.prefab


+ 7 - 7
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: 96}
+  m_AnchoredPosition: {x: 0, y: 120}
   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: 96}
+  m_AnchoredPosition: {x: 0, y: 120}
   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: 0}
+  m_AnchoredPosition: {x: 0, y: 25}
   m_SizeDelta: {x: 320, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6284590435731912962
@@ -10857,7 +10857,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -10869,9 +10869,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 48
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0

+ 14 - 0
Assets/Lua/Config/ActivitiesCfg.lua

@@ -2098,6 +2098,20 @@ local ActivitiesCfg = {
 ['RuleKey']='',
 ['ExpiredActivities']=0,
 },
+[18005]={
+['Id']=18005,
+['Type']=12,
+['Name']='植树节储值',
+['Order']=1,
+['BG']='ActivityImg/monthrecharge_cn',
+['ActivityBG']='ActivityImg/monthrecharge_cn',
+['PageId']=335,
+['Entrance']={159},
+['NeedShow']=true,
+['NoPay']=true,
+['RuleKey']='',
+['ExpiredActivities']=0,
+},
 [144]={
 ['Id']=144,
 ['Type']=12,

+ 14 - 14
Assets/Lua/Config/ActivitiesFortnightOnlineCfg.lua

@@ -225,7 +225,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [29]={
 ['Id']=29,
-['Rewards']={{188,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -233,7 +233,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [30]={
 ['Id']=30,
-['Rewards']={{189,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -241,7 +241,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [31]={
 ['Id']=31,
-['Rewards']={{187,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -249,7 +249,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [32]={
 ['Id']=32,
-['Rewards']={{186,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -257,7 +257,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [33]={
 ['Id']=33,
-['Rewards']={{188,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -265,7 +265,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [34]={
 ['Id']=34,
-['Rewards']={{189,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -273,7 +273,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [35]={
 ['Id']=35,
-['Rewards']={{186,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -281,7 +281,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [36]={
 ['Id']=36,
-['Rewards']={{187,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -289,7 +289,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [37]={
 ['Id']=37,
-['Rewards']={{188,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -297,7 +297,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [38]={
 ['Id']=38,
-['Rewards']={{189,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -305,7 +305,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [39]={
 ['Id']=39,
-['Rewards']={{186,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -313,7 +313,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [40]={
 ['Id']=40,
-['Rewards']={{187,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,
@@ -321,7 +321,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [41]={
 ['Id']=41,
-['Rewards']={{188,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg3',
 ['TextColour']='#de53e7',
 ['ActivitiesId']=13,
@@ -329,7 +329,7 @@ local ActivitiesFortnightOnlineCfg = {
 },
 [42]={
 ['Id']=42,
-['Rewards']={{189,1}},
+['Rewards']={{183,20}},
 ['RewardBg']='ContinuousLogin/img_activity_login_bg4',
 ['TextColour']='#ff9600',
 ['ActivitiesId']=13,

+ 130 - 0
Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -8485,5 +8485,135 @@ local ActivitiesTaskCfg = {
     ['ShowState']=1,
     ['Integral']=0,
     },
+    [20120]={
+    ['TaskId']=20120,
+    ['TaskCondition']={{60,1.99}},
+    ['Reward']={{183,10},{2,200000}},
+    ['Title']='活動期間累計儲值1.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20121]={
+    ['TaskId']=20121,
+    ['TaskCondition']={{60,9.99}},
+    ['Reward']={{183,45},{2,500000}},
+    ['Title']='活動期間累計儲值9.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20122]={
+    ['TaskId']=20122,
+    ['TaskCondition']={{60,19.99}},
+    ['Reward']={{183,60},{2,600000}},
+    ['Title']='活動期間累計儲值19.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20123]={
+    ['TaskId']=20123,
+    ['TaskCondition']={{60,39.99}},
+    ['Reward']={{183,120},{2,800000}},
+    ['Title']='活動期間累計儲值39.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20124]={
+    ['TaskId']=20124,
+    ['TaskCondition']={{60,69.99}},
+    ['Reward']={{183,175},{2,1000000}},
+    ['Title']='活動期間累計儲值69.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20125]={
+    ['TaskId']=20125,
+    ['TaskCondition']={{60,99.99}},
+    ['Reward']={{183,200},{2,1500000}},
+    ['Title']='活動期間累計儲值99.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20126]={
+    ['TaskId']=20126,
+    ['TaskCondition']={{60,149.99}},
+    ['Reward']={{183,250},{2,2000000},{50324,1}},
+    ['Title']='活動期間累計儲值149.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20127]={
+    ['TaskId']=20127,
+    ['TaskCondition']={{60,199.99}},
+    ['Reward']={{183,300},{2,2500000}},
+    ['Title']='活動期間累計儲值199.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20128]={
+    ['TaskId']=20128,
+    ['TaskCondition']={{60,249.99}},
+    ['Reward']={{183,360},{2,3000000}},
+    ['Title']='活動期間累計儲值249.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20129]={
+    ['TaskId']=20129,
+    ['TaskCondition']={{60,299.99}},
+    ['Reward']={{183,420},{2,4000000},{50324,1}},
+    ['Title']='活動期間累計儲值299.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20130]={
+    ['TaskId']=20130,
+    ['TaskCondition']={{60,349.99}},
+    ['Reward']={{183,470},{2,5000000}},
+    ['Title']='活動期間累計儲值349.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20131]={
+    ['TaskId']=20131,
+    ['TaskCondition']={{60,399.99}},
+    ['Reward']={{183,510},{2,5000000}},
+    ['Title']='活動期間累計儲值399.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
+    [20132]={
+    ['TaskId']=20132,
+    ['TaskCondition']={{60,499.99}},
+    ['Reward']={{183,600},{2,5000000},{50324,1}},
+    ['Title']='活動期間累計儲值499.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
     }
     return ActivitiesTaskCfg

+ 531 - 18
Assets/Lua/Config/ShopCfg.lua

@@ -518,24 +518,6 @@ local ShopCfg = {
 ['SortId']=53,
 ['GoodsPic']='',
 },
-[10058]={
-    ['GoodsId']=10058,
-    ['GoodsName']='水',
-    ['GoodsDesc']='植樹節活動道具,用於在揹包界面中澆灌種子收穫獎勵。活動結束後水自動消失(獲取途徑:植樹節活動、雜貨店)',
-    ['GoodsItem']=183,
-    ['PayForType']=54,
-    ['SortId']=23,
-    ['GoodsPic']='',
-    },
-    [10059]={
-    ['GoodsId']=10057,
-    ['GoodsName']='水',
-    ['GoodsDesc']='植樹節活動道具,用於在揹包界面中澆灌種子收穫獎勵。活動結束後水自動消失(獲取途徑:植樹節活動、雜貨店)',
-    ['GoodsItem']=183,
-    ['PayForType']=2,
-    ['SortId']=23,
-    ['GoodsPic']='',
-    },
 [10060]={
 ['GoodsId']=10060,
 ['GoodsName']='如意燈',
@@ -4556,6 +4538,537 @@ local ShopCfg = {
 ['SortId']=6,
 ['GoodsPic']='',
 },
+[130001]={
+['GoodsId']=130001,
+['GoodsName']='萌新成長禮包',
+['GoodsDesc']='',
+['GoodsItem']=15067,
+['PayForType']=183,
+['SortId']=10,
+['GoodsPic']='',
+},
+[130002]={
+['GoodsId']=130002,
+['GoodsName']='高手成長禮包',
+['GoodsDesc']='',
+['GoodsItem']=15077,
+['PayForType']=183,
+['SortId']=33,
+['GoodsPic']='',
+},
+[130003]={
+['GoodsId']=130003,
+['GoodsName']='大師成長禮包',
+['GoodsDesc']='',
+['GoodsItem']=15087,
+['PayForType']=183,
+['SortId']=22,
+['GoodsPic']='',
+},
+[130004]={
+['GoodsId']=130004,
+['GoodsName']='紅色1階自選武器箱',
+['GoodsDesc']='',
+['GoodsItem']=693,
+['PayForType']=183,
+['SortId']=46,
+['GoodsPic']='',
+},
+[130005]={
+['GoodsId']=130005,
+['GoodsName']='紅色1階自選防具箱',
+['GoodsDesc']='',
+['GoodsItem']=707,
+['PayForType']=183,
+['SortId']=56,
+['GoodsPic']='',
+},
+[130006]={
+['GoodsId']=130006,
+['GoodsName']='冰之翼圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13183,
+['PayForType']=183,
+['SortId']=57,
+['GoodsPic']='',
+},
+[130007]={
+['GoodsId']=130007,
+['GoodsName']='巴風特布偶圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13148,
+['PayForType']=183,
+['SortId']=58,
+['GoodsPic']='',
+},
+[130008]={
+['GoodsId']=130008,
+['GoodsName']='小南瓜圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13190,
+['PayForType']=183,
+['SortId']=1,
+['GoodsPic']='',
+},
+[130009]={
+['GoodsId']=130009,
+['GoodsName']='奇幻舞會圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13194,
+['PayForType']=183,
+['SortId']=2,
+['GoodsPic']='',
+},
+[130010]={
+['GoodsId']=130010,
+['GoodsName']='奇異舞會圖紙(男)',
+['GoodsDesc']='',
+['GoodsItem']=13195,
+['PayForType']=183,
+['SortId']=6,
+['GoodsPic']='',
+},
+[130011]={
+['GoodsId']=130011,
+['GoodsName']='忍者卷軸圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13120,
+['PayForType']=183,
+['SortId']=7,
+['GoodsPic']='',
+},
+[130012]={
+['GoodsId']=130012,
+['GoodsName']='花葉圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13105,
+['PayForType']=183,
+['SortId']=8,
+['GoodsPic']='',
+},
+[130013]={
+['GoodsId']=130013,
+['GoodsName']='巨人護目鏡圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13110,
+['PayForType']=183,
+['SortId']=9,
+['GoodsPic']='',
+},
+[130014]={
+['GoodsId']=130014,
+['GoodsName']='禮帽圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13009,
+['PayForType']=183,
+['SortId']=3,
+['GoodsPic']='',
+},
+[130015]={
+['GoodsId']=130015,
+['GoodsName']='奇幻雙馬尾圖紙(女)',
+['GoodsDesc']='',
+['GoodsItem']=13192,
+['PayForType']=183,
+['SortId']=4,
+['GoodsPic']='',
+},
+[130016]={
+['GoodsId']=130016,
+['GoodsName']='奇異短髮圖紙',
+['GoodsDesc']='',
+['GoodsItem']=13193,
+['PayForType']=183,
+['SortId']=5,
+['GoodsPic']='',
+},
+[130017]={
+['GoodsId']=130017,
+['GoodsName']='搞怪武器圖紙盒',
+['GoodsDesc']='',
+['GoodsItem']=526,
+['PayForType']=183,
+['SortId']=11,
+['GoodsPic']='',
+},
+[130018]={
+['GoodsId']=130018,
+['GoodsName']='冰封之炎武器自選包',
+['GoodsDesc']='',
+['GoodsItem']=11102,
+['PayForType']=183,
+['SortId']=12,
+['GoodsPic']='',
+},
+[130019]={
+['GoodsId']=130019,
+['GoodsName']='炸彈波利',
+['GoodsDesc']='',
+['GoodsItem']=851,
+['PayForType']=183,
+['SortId']=13,
+['GoodsPic']='',
+},
+[130020]={
+['GoodsId']=130020,
+['GoodsName']='大整蠱箱',
+['GoodsDesc']='',
+['GoodsItem']=15035,
+['PayForType']=183,
+['SortId']=14,
+['GoodsPic']='',
+},
+[130021]={
+['GoodsId']=130021,
+['GoodsName']='銘文自選寶箱',
+['GoodsDesc']='',
+['GoodsItem']=11567,
+['PayForType']=183,
+['SortId']=15,
+['GoodsPic']='',
+},
+[130022]={
+['GoodsId']=130022,
+['GoodsName']='妖君宠物',
+['GoodsDesc']='',
+['GoodsItem']=846,
+['PayForType']=183,
+['SortId']=16,
+['GoodsPic']='',
+},
+[130023]={
+['GoodsId']=130023,
+['GoodsName']='赤炎魔蛙',
+['GoodsDesc']='',
+['GoodsItem']=854,
+['PayForType']=183,
+['SortId']=32,
+['GoodsPic']='',
+},
+[130024]={
+['GoodsId']=130024,
+['GoodsName']='織女',
+['GoodsDesc']='',
+['GoodsItem']=856,
+['PayForType']=183,
+['SortId']=34,
+['GoodsPic']='',
+},
+[130025]={
+['GoodsId']=130025,
+['GoodsName']='達納託斯',
+['GoodsDesc']='',
+['GoodsItem']=857,
+['PayForType']=183,
+['SortId']=35,
+['GoodsPic']='',
+},
+[130026]={
+['GoodsId']=130026,
+['GoodsName']='尼德霍格',
+['GoodsDesc']='',
+['GoodsItem']=858,
+['PayForType']=183,
+['SortId']=36,
+['GoodsPic']='',
+},
+[130027]={
+['GoodsId']=130027,
+['GoodsName']='Mvp自選卡禮包1',
+['GoodsDesc']='',
+['GoodsItem']=20007,
+['PayForType']=183,
+['SortId']=37,
+['GoodsPic']='',
+},
+[130028]={
+['GoodsId']=130028,
+['GoodsName']='Mvp自選卡禮包2',
+['GoodsDesc']='',
+['GoodsItem']=20008,
+['PayForType']=183,
+['SortId']=38,
+['GoodsPic']='',
+},
+[130029]={
+['GoodsId']=130029,
+['GoodsName']='白羊座',
+['GoodsDesc']='',
+['GoodsItem']=332,
+['PayForType']=183,
+['SortId']=39,
+['GoodsPic']='',
+},
+[130030]={
+['GoodsId']=130030,
+['GoodsName']='金牛座',
+['GoodsDesc']='',
+['GoodsItem']=333,
+['PayForType']=183,
+['SortId']=40,
+['GoodsPic']='',
+},
+[130031]={
+['GoodsId']=130031,
+['GoodsName']='雙子座',
+['GoodsDesc']='',
+['GoodsItem']=334,
+['PayForType']=183,
+['SortId']=41,
+['GoodsPic']='',
+},
+[130032]={
+['GoodsId']=130032,
+['GoodsName']='巨蟹座',
+['GoodsDesc']='',
+['GoodsItem']=335,
+['PayForType']=183,
+['SortId']=42,
+['GoodsPic']='',
+},
+[130033]={
+['GoodsId']=130033,
+['GoodsName']='寵物進階水晶',
+['GoodsDesc']='',
+['GoodsItem']=855,
+['PayForType']=183,
+['SortId']=43,
+['GoodsPic']='',
+},
+[130034]={
+['GoodsId']=130034,
+['GoodsName']='达纳托斯卡片',
+['GoodsDesc']='',
+['GoodsItem']=12198,
+['PayForType']=183,
+['SortId']=44,
+['GoodsPic']='',
+},
+[130035]={
+['GoodsId']=130035,
+['GoodsName']='年獸卡片Ⅰ',
+['GoodsDesc']='',
+['GoodsItem']=12191,
+['PayForType']=183,
+['SortId']=45,
+['GoodsPic']='',
+},
+[130036]={
+['GoodsId']=130036,
+['GoodsName']='赤炎魔蛙卡片',
+['GoodsDesc']='',
+['GoodsItem']=12195,
+['PayForType']=183,
+['SortId']=47,
+['GoodsPic']='',
+},
+[130037]={
+['GoodsId']=130037,
+['GoodsName']='尼德霍格卡片',
+['GoodsDesc']='',
+['GoodsItem']=12194,
+['PayForType']=183,
+['SortId']=48,
+['GoodsPic']='',
+},
+[130038]={
+['GoodsId']=130038,
+['GoodsName']='卡噗醬卡片',
+['GoodsDesc']='',
+['GoodsItem']=12193,
+['PayForType']=183,
+['SortId']=49,
+['GoodsPic']='',
+},
+[130039]={
+['GoodsId']=130039,
+['GoodsName']='狂暴大腳熊卡片',
+['GoodsDesc']='',
+['GoodsItem']=12163,
+['PayForType']=183,
+['SortId']=50,
+['GoodsPic']='',
+},
+[130040]={
+['GoodsId']=130040,
+['GoodsName']='九尾狐卡片',
+['GoodsDesc']='',
+['GoodsItem']=12186,
+['PayForType']=183,
+['SortId']=51,
+['GoodsPic']='',
+},
+[130041]={
+['GoodsId']=130041,
+['GoodsName']='愛麗絲卡片',
+['GoodsDesc']='',
+['GoodsItem']=12197,
+['PayForType']=183,
+['SortId']=53,
+['GoodsPic']='',
+},
+[130042]={
+['GoodsId']=130042,
+['GoodsName']='聖誕波利卡片',
+['GoodsDesc']='',
+['GoodsItem']=12196,
+['PayForType']=183,
+['SortId']=54,
+['GoodsPic']='',
+},
+[130043]={
+['GoodsId']=130043,
+['GoodsName']='契约卷轴',
+['GoodsDesc']='',
+['GoodsItem']=264,
+['PayForType']=183,
+['SortId']=55,
+['GoodsPic']='',
+},
+[130044]={
+['GoodsId']=130044,
+['GoodsName']='空间碎片',
+['GoodsDesc']='',
+['GoodsItem']=261,
+['PayForType']=183,
+['SortId']=17,
+['GoodsPic']='',
+},
+[130045]={
+['GoodsId']=130045,
+['GoodsName']='寵物經驗2W',
+['GoodsDesc']='',
+['GoodsItem']=140,
+['PayForType']=183,
+['SortId']=18,
+['GoodsPic']='',
+},
+[130046]={
+['GoodsId']=130046,
+['GoodsName']='神器轉換憑證',
+['GoodsDesc']='',
+['GoodsItem']=237,
+['PayForType']=183,
+['SortId']=19,
+['GoodsPic']='',
+},
+[130047]={
+['GoodsId']=130047,
+['GoodsName']='技能徽章',
+['GoodsDesc']='',
+['GoodsItem']=200,
+['PayForType']=183,
+['SortId']=20,
+['GoodsPic']='',
+},
+[130048]={
+['GoodsId']=130048,
+['GoodsName']='高級潛能果實',
+['GoodsDesc']='',
+['GoodsItem']=529,
+['PayForType']=183,
+['SortId']=21,
+['GoodsPic']='',
+},
+[130049]={
+['GoodsId']=130049,
+['GoodsName']='潛能果實',
+['GoodsDesc']='',
+['GoodsItem']=528,
+['PayForType']=183,
+['SortId']=23,
+['GoodsPic']='',
+},
+[130050]={
+['GoodsId']=130050,
+['GoodsName']='天使之泪',
+['GoodsDesc']='',
+['GoodsItem']=100,
+['PayForType']=183,
+['SortId']=24,
+['GoodsPic']='',
+},
+[130051]={
+['GoodsId']=130051,
+['GoodsName']='命运绳结',
+['GoodsDesc']='',
+['GoodsItem']=110,
+['PayForType']=183,
+['SortId']=25,
+['GoodsPic']='',
+},
+[130052]={
+['GoodsId']=130052,
+['GoodsName']='卡片转换水晶',
+['GoodsDesc']='',
+['GoodsItem']=268,
+['PayForType']=183,
+['SortId']=26,
+['GoodsPic']='',
+},
+[130053]={
+['GoodsId']=130053,
+['GoodsName']='MVP自选卡',
+['GoodsDesc']='',
+['GoodsItem']=520,
+['PayForType']=183,
+['SortId']=27,
+['GoodsPic']='',
+},
+[130054]={
+['GoodsId']=130054,
+['GoodsName']='金色1自选武器',
+['GoodsDesc']='',
+['GoodsItem']=690,
+['PayForType']=183,
+['SortId']=28,
+['GoodsPic']='',
+},
+[130055]={
+['GoodsId']=130055,
+['GoodsName']='金色1自选防具',
+['GoodsDesc']='',
+['GoodsItem']=704,
+['PayForType']=183,
+['SortId']=29,
+['GoodsPic']='',
+},
+[130056]={
+['GoodsId']=130056,
+['GoodsName']='4小时主角经验',
+['GoodsDesc']='',
+['GoodsItem']=128,
+['PayForType']=183,
+['SortId']=30,
+['GoodsPic']='',
+},
+[130057]={
+['GoodsId']=130057,
+['GoodsName']='4小时伙伴经验',
+['GoodsDesc']='',
+['GoodsItem']=130,
+['PayForType']=183,
+['SortId']=30,
+['GoodsPic']='',
+},
+[130058]={
+['GoodsId']=130058,
+['GoodsName']='4小时技能经验',
+['GoodsDesc']='',
+['GoodsItem']=131,
+['PayForType']=183,
+['SortId']=30,
+['GoodsPic']='',
+},
+[130059]={
+['GoodsId']=130059,
+['GoodsName']='MVP卡册',
+['GoodsDesc']='',
+['GoodsItem']=513,
+['PayForType']=183,
+['SortId']=30,
+['GoodsPic']='',
+},
 [500001]={
 ['GoodsId']=500001,
 ['GoodsName']='1圆紅包',

+ 2 - 0
Assets/Lua/Enum/ProtoMsgId.lua

@@ -708,6 +708,8 @@
 	SC_BT_RECHARGE100_REWARD_ACK     = 1751,		--	SCBTRecharge100RewardAck **SCBTRecharge100RewardAck **login.proto ** [SCBTRecharge100RewardAck]
 	CS_MAP_LEVEL_TYPE_CHANGE_REQ     = 1752,		--	CSMapLevelTypeChangeReq **CSMapLevelTypeChangeReq **login.proto **game [CSMapLevelTypeChangeReq]
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753,		--	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
+	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057,		--	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
+	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058,		--	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
 
     }
     return ProtoMsgId

+ 6 - 1
Assets/Lua/Logic/Voyage/VoyageDataMgr.lua

@@ -34,6 +34,7 @@ function VoyageDataMgr:ctor()
     self.keepVoyageing = nil
     self:ClearViewListData()
     self.selfAirShipData = nil
+    self.buyNum = 0
     -- if self.selfAirShipCompleteTimer then
     --     self.selfAirShipCompleteTimer:Stop()
     --     self.selfAirShipCompleteTimer = nil
@@ -158,7 +159,7 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     self.challengeNum = challengeNum
     self.voyageNum = voyageNum
     self.curAirShipId = curAirShipId
-
+    self.buyNum = data.buy_num
     self:RefreshSelfAirShip(data.trial_data)
 
     if changed1 then
@@ -787,4 +788,8 @@ function VoyageDataMgr:ClearLastAttackData()
     end
 end
 
+function  VoyageDataMgr:GetBuyNum()
+    return  self.buyNum
+end
+
 return VoyageDataMgr

+ 6 - 2
Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
Ð
Ñ
 login.protoserverproto
 user.proto"0
 
@@ -2661,4 +2661,8 @@ reward_idx (R	rewardIdx"
 type (Rtype"C
 SCMapLevelTypeChangeAck
 error (Rerror
-type (Rtypebproto3
+type (Rtype"(
+&CSCrossYuanHangTrialBuyChallengeNumReq"T
+&SCCrossYuanHangTrialBuyChallengeNumAck
+error (Rerror
+count (Rcountbproto3

BIN
Assets/Lua/Pb/messagedefclient.txt


+ 6 - 4
Assets/Lua/Pb/protocal.txt

@@ -1,7 +1,7 @@
 
-þŠ
+¬�
 protocal.protoserverprotocommon.protoerror_code.protologin.proto
-user.proto"¶ä
+user.proto"Íå
 Request7
 CS_PING_REQè (2.serverproto.CSPingReqR	CSPINGREQ:
 CS_LOGIN_REQê (2.serverproto.CSLoginReqR
@@ -366,7 +366,8 @@ $CS_RUNE_SPECIAL_PRIVILEGE_REWARD_REQ
 CS_ACTIVITY_SMASH_EGGS_MSG_REQÐ
 (2&.serverproto.CSActivitySmashEggsMsgReqRCSACTIVITYSMASHEGGSMSGREQm
 CS_BT_FIRST_RECHARGE_REWARD_REQÓ
 (2'.serverproto.CSBTFirstRechargeRewardReqRCSBTFIRSTRECHARGEREWARDREQf
 CS_BT_RECHARGE100_REWARD_REQÖ
 (2%.serverproto.CSBTRecharge100RewardReqRCSBTRECHARGE100REWARDREQd
-CS_MAP_LEVEL_TYPE_CHANGE_REQØ
 (2$.serverproto.CSMapLevelTypeChangeReqRCSMAPLEVELTYPECHANGEREQ"â¥
+CS_MAP_LEVEL_TYPE_CHANGE_REQØ
 (2$.serverproto.CSMapLevelTypeChangeReqRCSMAPLEVELTYPECHANGEREQ”
+.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ©/ (23.serverproto.CSCrossYuanHangTrialBuyChallengeNumReqR&CSCROSSYUANHANGTRIALBUYCHALLENGENUMREQ"ù¦
 Response7
 SC_PING_ACKé (2.serverproto.SCPingAckR	SCPINGACK:
 SC_LOGIN_ACKë (2.serverproto.SCLoginAckR
@@ -843,4 +844,5 @@ $SC_RUNE_SPECIAL_PRIVILEGE_REWARD_ACK
 SC_BT_FIRST_RECHARGE_REWARD_ACKÔ
 (2'.serverproto.SCBTFirstRechargeRewardAckRSCBTFIRSTRECHARGEREWARDACKS
 SC_BT_RECHARGE100_NTFÕ
 (2.serverproto.SCBTRecharge100NtfRSCBTRECHARGE100NTFf
 SC_BT_RECHARGE100_REWARD_ACK×
 (2%.serverproto.SCBTRecharge100RewardAckRSCBTRECHARGE100REWARDACKd
-SC_MAP_LEVEL_TYPE_CHANGE_ACKÙ
 (2$.serverproto.SCMapLevelTypeChangeAckRSCMAPLEVELTYPECHANGEACKbproto3
+SC_MAP_LEVEL_TYPE_CHANGE_ACKÙ
 (2$.serverproto.SCMapLevelTypeChangeAckRSCMAPLEVELTYPECHANGEACK”
+.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACKª/ (23.serverproto.SCCrossYuanHangTrialBuyChallengeNumAckR&SCCROSSYUANHANGTRIALBUYCHALLENGENUMACKbproto3

+ 7 - 6
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,
@@ -1465,7 +1465,8 @@ totalScore
 trial_data (2.serverproto.YuanHangTrialDataR	trialData<
 log_list (2!.serverproto.YuanHangTrialLogDataRlogList
 trial_score (R
-trialScore"…
+trialScore
+buy_num (RbuyNum"…
 YuanHangTrialData
 uid (Ruid
 zone (Rzone
@@ -1561,7 +1562,7 @@ BTBaseData.
 first_recharge_reward_state (
RfirstRechargeRewardState)
 recharge100_time (Rrecharge100Time4
 recharge100_reward_day (Rrecharge100RewardDay8
-recharge100_reward_state (Rrecharge100RewardState"¬
+recharge100_reward_state (Rrecharge100RewardState"®
 Role
 id (Rid2
 	role_base (2.serverproto.RoleBaseRroleBase2
@@ -1598,5 +1599,5 @@ role_cross (2.serverproto.RoleCrossR	roleCross2
 role_skill_equip (2.serverproto.RoleSkillEquipRroleSkillEquip2
 	role_head (2.serverproto.RoleHeadRroleHead2
 	role_wish (2.serverproto.RoleWishRroleWish,
-role_bt (2.serverproto.RoleBTRroleBt?
-role_dif_battle  (2.serverproto.RoleBattleR
roleDifBattlebproto3
+role_bt (2.serverproto.RoleBTRroleBtA
+role_hard_battle  (2.serverproto.RoleBattleRroleHardBattlebproto3

+ 7 - 0
Assets/Lua/UI/UIDojo/UIDojoBuyTimesCtr.lua

@@ -53,5 +53,12 @@ function UIDojoBuyTimesCtr:HandleCallback()
 	end
 end
 
+
+function UIDojoBuyTimesCtr:GetCostType()
+	if self.data then
+		return self.data[6]
+	end
+	return nil
+end
 return UIDojoBuyTimesCtr
 

+ 15 - 0
Assets/Lua/UI/UIDojo/UIDojoBuyTimesView.lua

@@ -24,6 +24,7 @@ function UIDojoBuyTimesView:FillContent(data, uiBase)
 end
 
 function UIDojoBuyTimesView:Init()
+	self:ChangeIcon()
 end
 
 function UIDojoBuyTimesView:SetUIData()
@@ -80,5 +81,19 @@ function UIDojoBuyTimesView:OnClickClose()
 	self.delayTimer:Start()
 end
 
+function  UIDojoBuyTimesView:ChangeIcon()
+	local costType = self.controller:GetCostType()
+	if costType and costType == 54 then
+		
+		self.icon_2:SetActive(false)
+		self.icon_54:SetActive(true)
+	else
+		self.icon_2:SetActive(true)
+		self.icon_54:SetActive(false)
+
+	end
+end
+
+
 return UIDojoBuyTimesView
 

+ 39 - 3
Assets/Lua/UI/UIDojo/UIDojoBuyTimesView_Generate.lua

@@ -29,6 +29,8 @@
 ---@field private AnyBtn UIDojoBuyTimes__Generate_AnyBtn
 ---@field private window UnityEngine.GameObject
 ---@field private closeBtn UIDojoBuyTimes__Generate_closeBtn
+---@field private icon_54 UnityEngine.GameObject
+---@field private icon_2 UnityEngine.GameObject
 ---@field private costText UIDojoBuyTimes__Generate_costText
 ---@field private title UnityEngine.GameObject
 ---@field private leftTimesText UIDojoBuyTimes__Generate_leftTimesText
@@ -61,6 +63,8 @@ function UIDojoBuyTimesView:InitGenerate(Root, data)
 	self:InitGenerate__7(Root,data)
 	self:InitGenerate__8(Root,data)
 	self:InitGenerate__9(Root,data)
+	self:InitGenerate__10(Root,data)
+	self:InitGenerate__11(Root,data)
 
 
 end
@@ -129,6 +133,30 @@ end
 
 ---@private
 function UIDojoBuyTimesView:InitGenerate__6(Root, data)
+--[[
+	UIAnimator/Window/Bg/Center/Bg/Text/Icon_54
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/Center/Bg/Text/Icon_54").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.icon_54 = tmp
+end
+
+---@private
+function UIDojoBuyTimesView:InitGenerate__7(Root, data)
+--[[
+	UIAnimator/Window/Bg/Center/Bg/Text/Icon_2
+--]]
+	local tmp = Root:Find("UIAnimator/Window/Bg/Center/Bg/Text/Icon_2").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.icon_2 = tmp
+end
+
+---@private
+function UIDojoBuyTimesView:InitGenerate__8(Root, data)
 --[[
 	UIAnimator/Window/Bg/Center/Bg/Text/Cost
 --]]
@@ -142,7 +170,7 @@ function UIDojoBuyTimesView:InitGenerate__6(Root, data)
 end
 
 ---@private
-function UIDojoBuyTimesView:InitGenerate__7(Root, data)
+function UIDojoBuyTimesView:InitGenerate__9(Root, data)
 --[[
 	UIAnimator/Window/Bg/Bottom/Title
 --]]
@@ -154,7 +182,7 @@ function UIDojoBuyTimesView:InitGenerate__7(Root, data)
 end
 
 ---@private
-function UIDojoBuyTimesView:InitGenerate__8(Root, data)
+function UIDojoBuyTimesView:InitGenerate__10(Root, data)
 --[[
 	UIAnimator/Window/Bg/Bottom/Title/LeftTimes
 --]]
@@ -168,7 +196,7 @@ function UIDojoBuyTimesView:InitGenerate__8(Root, data)
 end
 
 ---@private
-function UIDojoBuyTimesView:InitGenerate__9(Root, data)
+function UIDojoBuyTimesView:InitGenerate__11(Root, data)
 --[[
 	UIAnimator/Window/Bg/Bottom/BuyBtn
 --]]
@@ -199,6 +227,14 @@ function UIDojoBuyTimesView:GenerateDestroy()
 		tolua.setpeer(self.closeBtn, nil)
 	end
 	self.closeBtn = nil
+	if tolua.getpeer(self.icon_54) ~= nil then
+		tolua.setpeer(self.icon_54, nil)
+	end
+	self.icon_54 = nil
+	if tolua.getpeer(self.icon_2) ~= nil then
+		tolua.setpeer(self.icon_2, nil)
+	end
+	self.icon_2 = nil
 	if tolua.getpeer(self.costText) ~= nil then
 		tolua.setpeer(self.costText, nil)
 	end

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

@@ -10,6 +10,8 @@ function UIVoyageView:AddEventListener()
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.VOYAGE_NUM_CHANGED, self, self.OnVoyageNumChanged)
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.VOYAGE_SELF_AIRSHIP_DATA_CHANGED, self, self.OnVoyageAirShipDataChanged)
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name, UIEventNames.VOYAGE_LOCATION_CHANGED, self, self.OnVoyageLocationChanged)
+
+	
 end
 
 function UIVoyageView:FillContent(data, uiBase)
@@ -41,13 +43,16 @@ function UIVoyageView:Init()
 	end
 	ManagerContainer.LuaUIMgr:ClosePage(Enum.UIPageName.UIDojoExit)
 	self.btnLog:SetActive(true)
+	--self.btnAdd:SetActive(true)
 end
 
 function UIVoyageView:RemoveEventListener()
 	ManagerContainer.LuaEventMgr:Unregister(self.uiData.name)
+	ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK )
 end
 
 function UIVoyageView:AddUIEventListener()
+	ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK ,self.OnBuyNumAck,self)
 	self.uiBase:AddButtonUniqueEventListener(self.backBtn.button, self, self.OnClickBackBtn)
 	self.uiBase:AddButtonUniqueEventListener(self.btnInfo.button, self, self.OnClickInfoBtn)
 
@@ -123,7 +128,9 @@ 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})
+	--ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ , {})
 end
 
 function UIVoyageView:OnClickBackBtn()
@@ -491,5 +498,12 @@ function UIVoyageView:DisposeAirShips()
 	end
 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})
+end
 return UIVoyageView
 

+ 7 - 0
Assets/ToLua/Source/Generate--2.21.rar.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 37c2b5928e4776b46b36a1da7a5e7860
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
ProtocolGen/proto/ProtoMsgId.lua

@@ -708,6 +708,8 @@
 	SC_BT_RECHARGE100_REWARD_ACK     = 1751,		--	SCBTRecharge100RewardAck **SCBTRecharge100RewardAck **login.proto ** [SCBTRecharge100RewardAck]
 	CS_MAP_LEVEL_TYPE_CHANGE_REQ     = 1752,		--	CSMapLevelTypeChangeReq **CSMapLevelTypeChangeReq **login.proto **game [CSMapLevelTypeChangeReq]
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753,		--	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
+	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057,		--	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
+	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058,		--	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
 
     }
     return ProtoMsgId

+ 11 - 0
ProtocolGen/proto/login.proto

@@ -3747,4 +3747,15 @@ message CSMapLevelTypeChangeReq {
 message SCMapLevelTypeChangeAck {
    int32 error                      = 1; //错误码
    int32 type                       = 2;
+}
+
+
+//远航试炼挑战购买次数
+message CSCrossYuanHangTrialBuyChallengeNumReq {  //project game   //RouteRule game     = 2;
+}
+
+//响应远航试炼挑战购买次数
+message SCCrossYuanHangTrialBuyChallengeNumAck {
+    int32 error                                     = 1; //错误码
+    uint64 count                            = 2;//可购买次数
 }

+ 3 - 0
ProtocolGen/proto/messagedefclient.proto

@@ -711,4 +711,7 @@ enum protoMsgId{
 	SC_BT_RECHARGE100_REWARD_ACK     = 1751;		//	SCBTRecharge100RewardAck **SCBTRecharge100RewardAck **login.proto ** [SCBTRecharge100RewardAck]
 	CS_MAP_LEVEL_TYPE_CHANGE_REQ     = 1752;		//	CSMapLevelTypeChangeReq **CSMapLevelTypeChangeReq **login.proto **game [CSMapLevelTypeChangeReq]
 	SC_MAP_LEVEL_TYPE_CHANGE_ACK	 = 1753;		//	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
+	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ = 6057;		//	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
+	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK = 6058;		//	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
+
 }

+ 2 - 0
ProtocolGen/proto/protocal.proto

@@ -315,6 +315,7 @@ message Request {
      CSBTFirstRechargeRewardReq         	CS_BT_FIRST_RECHARGE_REWARD_REQ      =  1747;         //	超值首充奖励获取 **CSBTFirstRechargeRewardReq **login.proto **game [CSBTFirstRechargeRewardReq]
      CSBTRecharge100RewardReq         	CS_BT_RECHARGE100_REWARD_REQ         =  1750;         //	CSBTRecharge100RewardReq **CSBTRecharge100RewardReq **login.proto **game [CSBTRecharge100RewardReq]
      CSMapLevelTypeChangeReq         	CS_MAP_LEVEL_TYPE_CHANGE_REQ         =  1752;         //	CSMapLevelTypeChangeReq **CSMapLevelTypeChangeReq **login.proto **game [CSMapLevelTypeChangeReq]
+     CSCrossYuanHangTrialBuyChallengeNumReq         	CS_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_REQ     =  6057;         //	购买飞艇挑战次数 **CSCrossYuanHangTrialBuyChallengeNumReq **login.proto **game [CSCrossYuanHangTrialBuyChallengeNumReq]
 }
 message Response {
      SCPingAck           	SC_PING_ACK                          =  1001;         //	SCPingAck **SCPingAck **login.proto ** [SCPingAck]
@@ -718,4 +719,5 @@ message Response {
      SCBTRecharge100Ntf           	SC_BT_RECHARGE100_NTF                =  1749;         //	百元大礼包领取奖励 **SCBTRecharge100Ntf **login.proto ** [SCBTRecharge100Ntf]
      SCBTRecharge100RewardAck           	SC_BT_RECHARGE100_REWARD_ACK         =  1751;         //	SCBTRecharge100RewardAck **SCBTRecharge100RewardAck **login.proto ** [SCBTRecharge100RewardAck]
      SCMapLevelTypeChangeAck           	SC_MAP_LEVEL_TYPE_CHANGE_ACK	     =  1753;         //	SCMapLevelTypeChangeAck **SCMapLevelTypeChangeAck **login.proto **game [SCMapLevelTypeChangeAck]
+     SCCrossYuanHangTrialBuyChallengeNumAck           	SC_CROSS_YUAN_HANG_TRIAL_BUY_CHALLENGE_NUM_ACK     =  6058;         //	SCCrossYuanHangTrialBuyChallengeNumAck **SCCrossYuanHangTrialBuyChallengeNumAck **login.proto **game [SCCrossYuanHangTrialBuyChallengeNumAck]
 }

+ 1 - 0
ProtocolGen/proto/user.proto

@@ -1811,6 +1811,7 @@ message RoleYuanHangTrial {
     YuanHangTrialData trial_data        = 4; //远航试炼数据(当前或者上一次)
     repeated YuanHangTrialLogData log_list = 5; //挑战被挑战日志记录
     int32 trial_score                      = 6;
+    int32 buy_num                 = 7; //当前玩家购买挑战次数
 }
 message YuanHangTrialData {
     uint64 uid                          = 1;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно