Răsfoiți Sursa

icon 图片

123 1 an în urmă
părinte
comite
c1e29d82f5

BIN
Assets/Content/Icons/Common/ic_res_daijinquan.png


+ 147 - 0
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: 

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


+ 147 - 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: 

+ 3 - 3
Assets/Lua/Config/ActivitiesTaskCfg.lua

@@ -8548,7 +8548,7 @@ local ActivitiesTaskCfg = {
     [20126]={
     ['TaskId']=20126,
     ['TaskCondition']={{60,149.99}},
-    ['Reward']={{183,250},{2,2000000},{50324,1}},
+    ['Reward']={{183,250},{2,2000000},{852,1}},
     ['Title']='活動期間累計儲值149.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -8578,7 +8578,7 @@ local ActivitiesTaskCfg = {
     [20129]={
     ['TaskId']=20129,
     ['TaskCondition']={{60,299.99}},
-    ['Reward']={{183,420},{2,4000000},{50324,1}},
+    ['Reward']={{183,420},{2,4000000},{852,1}},
     ['Title']='活動期間累計儲值299.99$',
     ['Desc']='',
     ['GoPageId']=117,
@@ -8608,7 +8608,7 @@ local ActivitiesTaskCfg = {
     [20132]={
     ['TaskId']=20132,
     ['TaskCondition']={{60,499.99}},
-    ['Reward']={{183,600},{2,5000000},{50324,1}},
+    ['Reward']={{183,600},{2,5000000},{852,1}},
     ['Title']='活動期間累計儲值499.99$',
     ['Desc']='',
     ['GoPageId']=117,

+ 21 - 0
Assets/Lua/Config/ItemCfg1.lua

@@ -108,6 +108,27 @@ local ItemCfg1 = {
 ['ActivationItem']=0,
 ['ItemTimeCd']=0,
 },
+[8]={
+['Id']=8,
+['Name']='代金券',
+['ResType']=8,
+['Quality']=3,
+['Composition']=9999,
+['AutoUse']=0,
+['NeedLevel']=0,
+['Bang']=1,
+['Icon']='Items/item_daijinquan',
+['MiniIcon']='Common/ic_res_daijinquan',
+['Job']=0,
+['Describe']='可在累计储值,每日储值中使用,不可购买礼包时使用',
+['ItemTime']=0,
+['SkipInterface']=0,
+['DebrisShow']=0,
+['NeedRP']=false,
+['NatureType']=0,
+['ActivationItem']=0,
+['ItemTimeCd']=0,
+},
 [11]={
 ['Id']=11,
 ['Name']='技能經驗',

+ 24 - 0
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

+ 7 - 7
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()