Merge branch 'new' into hy_ios

# Conflicts:
#	ProjectSettings/ProjectSettings.asset

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/Icons/Common/ic_res_daijinquan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 0566a97d858c7a74586a131fd7d8e915
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Content/Icons/Items/item_daijinquan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: cd85f16e400f9d24f8cbbbc2776822c4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -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: 194}
   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

Assets/Content/Raw_Art/UI/Items/item_daijinquan.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: a9c2cf97975da7c459914189fc05b5a7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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,
@@ -2254,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},
+['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/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,

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},{852,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},{852,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},{852,1}},
+    ['Title']='活動期間累計儲值499.99$',
+    ['Desc']='',
+    ['GoPageId']=117,
+    ['ShowState']=1,
+    ['Integral']=0,
+    },
     }
     return ActivitiesTaskCfg

Assets/Lua/Config/ItemCfg1.lua

@@ -108,6 +108,28 @@ local ItemCfg1 = {
 ['ActivationItem']=0,
 ['ItemTimeCd']=0,
 },
+[8]={
+['Id']=8,
+['Name']='代金券',
+['ResType']=27,
+['Quality']=4,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=1,
+['Icon']='Items/item_daijinquan',
+['MiniIcon']='Common/ic_res_daijinquan',
+['Job']=0,
+['ComposeItem']={{600,1}},
+['Describe']='使用後可增加每日儲值，累計儲值進度條，增加神域經驗，RO幣，無法適用於禮包購買。',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},
 [11]={
 ['Id']=11,
 ['Name']='技能經驗',
@@ -9653,12 +9675,12 @@ local ItemCfg1 = {
 ['Name']='累儲補償道具',
 ['ResType']=43,
 ['Quality']=2,
-['Composition']=1,
+['Composition']=9999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=0,
 ['Icon']='Items/item_expjob',
-['MiniIcon']='',
+['MiniIcon']='Items/item_expjob',
 ['Job']=0,
 ['Describe']='累儲補償道具，領取後增加對應儲值金額',
 ['ItemTime']=0,

Assets/Lua/Config/RuneShopExploreRewardCfg.lua

@@ -3,8 +3,8 @@ local RuneShopExploreRewardCfg = {
 ['ID']=101,
 ['Lv']=1,
 ['Exp']=0,
-['Reward']={{1,10000}},
-['CashReward']={{531,2}},
+['Reward']={{1,100000}},
+['CashReward']={{531,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -14,7 +14,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=2,
 ['Exp']=20000,
 ['Reward']={{511,3}},
-['CashReward']={{110,1}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -34,7 +34,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=4,
 ['Exp']=100000,
 ['Reward']={{20,50}},
-['CashReward']={{131,1}},
+['CashReward']={{135,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -54,7 +54,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=6,
 ['Exp']=300000,
 ['Reward']={{115,2}},
-['CashReward']={{130,1}},
+['CashReward']={{134,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -64,7 +64,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=7,
 ['Exp']=400000,
 ['Reward']={{100,5}},
-['CashReward']={{110,2}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -74,7 +74,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=8,
 ['Exp']=500000,
 ['Reward']={{512,2}},
-['CashReward']={{531,3}},
+['CashReward']={{531,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -84,7 +84,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=9,
 ['Exp']=600000,
 ['Reward']={{20,100}},
-['CashReward']={{131,1}},
+['CashReward']={{135,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -104,7 +104,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=11,
 ['Exp']=800000,
 ['Reward']={{1,50000}},
-['CashReward']={{130,1}},
+['CashReward']={{134,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -114,7 +114,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=12,
 ['Exp']=900000,
 ['Reward']={{511,4}},
-['CashReward']={{110,2}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -134,7 +134,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=14,
 ['Exp']=1100000,
 ['Reward']={{115,3}},
-['CashReward']={{131,1}},
+['CashReward']={{135,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -154,7 +154,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=16,
 ['Exp']=1300000,
 ['Reward']={{20,200}},
-['CashReward']={{130,1}},
+['CashReward']={{134,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -164,7 +164,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=17,
 ['Exp']=1400000,
 ['Reward']={{100,5}},
-['CashReward']={{110,3}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -174,7 +174,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=18,
 ['Exp']=1500000,
 ['Reward']={{607,1}},
-['CashReward']={{531,4}},
+['CashReward']={{531,10}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -184,7 +184,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=19,
 ['Exp']=1600000,
 ['Reward']={{115,5}},
-['CashReward']={{131,1}},
+['CashReward']={{135,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -204,7 +204,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=21,
 ['Exp']=1800000,
 ['Reward']={{1,100000}},
-['CashReward']={{134,1}},
+['CashReward']={{138,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -214,7 +214,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=22,
 ['Exp']=2000000,
 ['Reward']={{511,5}},
-['CashReward']={{110,3}},
+['CashReward']={{110,5}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -234,7 +234,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=24,
 ['Exp']=2400000,
 ['Reward']={{494,50}},
-['CashReward']={{135,1}},
+['CashReward']={{139,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -254,7 +254,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=26,
 ['Exp']=3000000,
 ['Reward']={{20,300}},
-['CashReward']={{134,1}},
+['CashReward']={{138,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -274,7 +274,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=28,
 ['Exp']=4000000,
 ['Reward']={{607,1}},
-['CashReward']={{531,5}},
+['CashReward']={{531,10}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,
@@ -284,7 +284,7 @@ local RuneShopExploreRewardCfg = {
 ['Lv']=29,
 ['Exp']=4500000,
 ['Reward']={{110,3}},
-['CashReward']={{135,1}},
+['CashReward']={{139,1}},
 ['MaxRewardConsumen']=0,
 ['RewardSign']=0,
 ['ActiveRound']=1,

Assets/Lua/Config/RuneShopGiftsCfg.lua

@@ -180,21 +180,9 @@ local RuneShopGiftsCfg = {
     ['SortId']=15,
     ['RmbTotalPay']=0,
     },
- [16]={
-['Id']=16,
-['Name']='日直購禮包12',
-['Pic']='ShopIcons/ic_club_gold_30',
-['Type']=1,
-['RMB']=0.99,
-['Reward']={{54,500},{2,100000 }},
-['FirstBuyPic']='',
-['ExtraBuyPic']='',
-['SortId']=1,
-['RmbTotalPay']=0,
-},
 [17]={
 ['Id']=17,
-['Name']='周直購禮包11',
+['Name']='周直購禮包17',
 ['Pic']='ShopIcons/bt_market_giftbox1',
 ['Type']=2,
 ['RMB']=19.99,
@@ -210,7 +198,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/ic_club_gold_30',
 ['Type']=1,
 ['RMB']=9.99,
-['Reward']={{102,999},{1,5000000 }},
+['Reward']={{102,500},{1,500000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -222,7 +210,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/ic_club_gold_30',
 ['Type']=1,
 ['RMB']=9.99,
-['Reward']={{101,1999},{1,5000000 }},
+['Reward']={{101,500},{1,500000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -234,7 +222,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/ic_club_gold_30',
 ['Type']=1,
 ['RMB']=0.99,
-['Reward']={{102,200},{1,50000 }},
+['Reward']={{102,55},{1,50000 }},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -246,7 +234,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/ic_club_gold_30',
 ['Type']=1,
 ['RMB']=0.99,
-['Reward']={{101,300},{1,50000 }},
+['Reward']={{101,55},{1,50000 }},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -258,7 +246,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/bt_market_giftbox1',
 ['Type']=2,
 ['RMB']=49.99,
-['Reward']={{102,6666},{2,1000000}},
+['Reward']={{102,2500},{2,1000000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -270,7 +258,7 @@ local RuneShopGiftsCfg = {
 ['Pic']='ShopIcons/bt_market_giftbox1',
 ['Type']=2,
 ['RMB']=49.99,
-['Reward']={{101,12888},{2,1000000}},
+['Reward']={{101,2500},{2,1000000}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
 ['SortId']=1,
@@ -293,7 +281,7 @@ local RuneShopGiftsCfg = {
 ['Name']='周直購禮包2',
 ['Pic']='ShopIcons/bt_market_giftbox7',
 ['Type']=2,
-['RMB']=4.99,
+['RMB']=19.99,
 ['Reward']={{529,5},{531,5},{514,10}},
 ['FirstBuyPic']='',
 ['ExtraBuyPic']='',
@@ -397,17 +385,17 @@ local RuneShopGiftsCfg = {
 ['RmbTotalPay']=0,
 },
 [40]={
-['Id']=40,
-['Name']='神器材料包(周)',
-['Pic']='ShopIcons/market_giftbox20',
-['Type']=2,
-['RMB']=49.99,
-['Reward']={{117,200},{48,10000},{2,500000}},
-['FirstBuyPic']='',
-['ExtraBuyPic']='',
-['SortId']=11,
-['RmbTotalPay']=99,
-},
+    ['Id']=40,
+    ['Name']='神器材料包(周)',
+    ['Pic']='ShopIcons/market_giftbox20',
+    ['Type']=2,
+    ['RMB']=49.99,
+    ['Reward']={{117,200},{48,10000},{2,500000}},
+    ['FirstBuyPic']='',
+    ['ExtraBuyPic']='',
+    ['SortId']=11,
+    ['RmbTotalPay']=99,
+    },
 [50]={
 ['Id']=50,
 ['Name']='月直購禮包1',

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圆紅包',

Assets/Lua/Config/UIFuncUnLockCfg.lua

@@ -1672,5 +1672,29 @@ local UIFuncUnLockCfg = {
 ['DscLayout']=0,
 ['LuaCondition']='',
 },
+[82]={
+['Id']=82,
+['UIId']=2,
+['FuncEnterPath']='topView.topRoot.BtnBoliShop',
+['UnlockCond']={{1000,20}},
+['LockNotice']='FunUnLock',
+['FunIcon']='',
+['FunName']='Fun80',
+['FunDsc']='波利商城',
+['LockDsc']='波利商城',
+['NeedLock']=false,
+['NeedMask']=false,
+['NeedNotify']=false,
+['NeedGuide']=false,
+['NeedDisplay']=false,
+['IsOperations']=false,
+['PrePose']=0,
+['PostPose']=0,
+['ForceGuideGroup']=0,
+['Special']=false,
+['ArrowDir']=0,
+['DscLayout']=0,
+['LuaCondition']='',
+},
 }
 return UIFuncUnLockCfg

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

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/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -285,7 +285,7 @@ function ClimbingTowerDataMgr:OnClimbingTowerEndAck(data)
         else
             ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIClimbingTowerBattleWin,{Enum.UIPageName.UIClimbingTower,nil})
         end
-
+        
         self.curChallengeLevel = data.tower_level + 1
         if data.pass_time ~= nil then
             self.lastPassedTime = data.pass_time

Assets/Lua/Logic/Voyage/VoyageDataMgr.lua

@@ -34,6 +34,10 @@ function VoyageDataMgr:ctor()
     self.keepVoyageing = nil
     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
@@ -149,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
@@ -158,9 +163,11 @@ function VoyageDataMgr:RefreshSelfVoyageData(data)
     self.challengeNum = challengeNum
     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
@@ -171,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
@@ -787,4 +794,28 @@ function VoyageDataMgr:ClearLastAttackData()
     end
 end
 
+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/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

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

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,11 @@ totalScore
 trial_data 
(2.serverproto.YuanHangTrialDataR	trialData<
 log_list (2!.serverproto.YuanHangTrialLogDataRlogList
 trial_score 
(R
-trialScore"…
+trialScore
+buy_num 
(RbuyNum
+buy_consume 
(
R
+buyConsume
+buy_type	 
(RbuyType"…
 YuanHangTrialData
 uid
 
(Ruid
 zone 
(Rzone
@@ -1561,7 +1565,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 +1602,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

Assets/Lua/UI/UIActivity/UIActivityFortnightLoginView.lua

@@ -20,7 +20,7 @@ function UIActivityFortnightLoginView:FillContent(data, uiBase)
 		self.transform = gameObject.transform
 	end
 	self:InitGenerate(self.transform, data)
-
+	self.curRewardName.text.text =""
 	self:Init()
 end
 
@@ -32,6 +32,7 @@ function UIActivityFortnightLoginView:Init()
 	self.templateItem:SetActive(false)
 	self:InitUIComs()
 	self:RefreshActData()
+
 end
 
 function UIActivityFortnightLoginView:InitUIComs()
@@ -71,11 +72,25 @@ function UIActivityFortnightLoginView:RefreshActData()
 	if activityItem ~= nil then
 		self.curDayTxt.text.text = activityItem.curDay .. I18N.T("Day")
 		local data = activityItem:GetActivityData()
+		local maxDayData = 0
+		
+		local maxItemCfg = nil
 		if data ~= nil then
 			for i = 1, #data do
-				self:RefreshItemData(self.subActItemLuaList[i],data[i],activityItem.curDay)
+				local itemcfg = self:RefreshItemData(self.subActItemLuaList[i],data[i],activityItem.curDay)
+				if data[i].day > maxDayData then
+					maxDayData = data[i].day
+				
+					maxItemCfg = itemcfg
+				end
 			end
 		end
+
+		if activityItem.curDay > maxDayData  and maxItemCfg then
+			self.curRewardName.text.text = maxItemCfg.Name
+			self.curDayTxt.text.text = maxDayData .. I18N.T("Day")
+		end 
+
 	end
 end
 
@@ -103,12 +118,13 @@ end
 
 function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,curDay)
 	local rewardData = {cfgId = itemData.rewards[1][1], num = itemData.rewards[1][2] }
+	local itemCfg = nil
 	if itemData.isGotReward then
 		rewardItemLua.gotRewardNode:SetActive(true)
 		rewardItemLua.MakeUpNode:SetActive(false)
 		rewardItemLua.shad:SetActive(true)
 		rewardItemLua.iconItem.bg.button.interactable = false
-		local itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData)
+		itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData)
 		if itemData.day == curDay then
 			self.curRewardName.text.text = itemCfg.Name
 		end
@@ -125,7 +141,7 @@ function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,cur
 
 		if itemData.day <= curDay then
 			rewardItemLua.shad:SetActive(false)
-			local itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData, nil, self, self.OnClickGetReward,itemData.day)
+			itemCfg = IconItemCtr:SetData(self, rewardItemLua.iconItem, rewardData, nil, self, self.OnClickGetReward,itemData.day)
 			if itemData.day == curDay then
 				self.curRewardName.text.text = itemCfg.Name
 			end
@@ -136,8 +152,10 @@ function UIActivityFortnightLoginView:RefreshItemData(rewardItemLua,itemData,cur
 	end
 
 	rewardItemLua.iconItem.redPoint:SetActive(itemData.isFinished and (not itemData.isOutdate) and (not itemData.isGotReward))
+	return itemCfg
 end
 
+
 function UIActivityFortnightLoginView:OnClickGetReward(btn,params)
 	local day = params and params[2] or self.makeUpDay
 	local activityItem = self.controller:GetActivityData()

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
 

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
 

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

Assets/Lua/UI/UIMain/UIMainView.lua

@@ -210,13 +210,13 @@ function UIMainView:Init()
 end
 
 function UIMainView:RefreshBoliShopState()
-    if Constant.OpenPay then
-        local curVal = ManagerContainer.PayMgr:GetTotalRecharge()
-        local openCon = GlobalConfig.Instance:GetConfigIntValue(360) or 50
-        self.topView.topRoot.BtnBoliShop:SetActive(curVal >= openCon)
-    else
-        self.topView.topRoot.BtnBoliShop:SetActive(false)
-    end
+    -- if Constant.OpenPay then
+    --     local curVal = ManagerContainer.PayMgr:GetTotalRecharge()
+    --     local openCon = GlobalConfig.Instance:GetConfigIntValue(360) or 50
+    --     self.topView.topRoot.BtnBoliShop:SetActive(curVal >= openCon)
+    -- else
+    --     self.topView.topRoot.BtnBoliShop:SetActive(false)
+    -- end
 end
 
 function UIMainView:DailySignTrigger()

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

@@ -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,28 @@ end
 
 
 function UIVoyageView:OnClickAddBtn()
+	--ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIDojoBuyTimes, {costNum, nil, self.SureBuyChallengeNumBtn, self})
 	
+	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()
@@ -491,5 +517,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
+	self.controller:RefNumimit()
+	self:RefreshRemindNum()
+end
 return UIVoyageView
 

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

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;//可购买次数
 }

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

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

ProtocolGen/proto/user.proto

@@ -1811,6 +1811,9 @@ message RoleYuanHangTrial {
     YuanHangTrialData trial_data        = 4; //远航试炼数据(当前或者上一次)
     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;