累计充值修改提交, 灵兽提交

jiaoyangna 2020-10-21 16:05:33 +08:00
parent b26ba765bc
commit d555d983ea
17 changed files with 775 additions and 9 deletions

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &9188052452513793150
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6964671514818798232}
- component: {fileID: 5282556795511818761}
- component: {fileID: 1003294279455986515}
m_Layer: 0
m_Name: live2d_ls_06_baize
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6964671514818798232
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9188052452513793150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5282556795511818761
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9188052452513793150}
m_CullTransparentMesh: 0
--- !u!114 &1003294279455986515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9188052452513793150}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
skeletonDataAsset: {fileID: 11400000, guid: 37d0666295ddcbe4286900935cfbfd1b, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle
startingLoop: 1
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f707f8bf8d8ec04197efb8ad3203899
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c598c3b27e84c0041b8d251becb94efb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,426 @@
ls_06_baize.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
erduo_20
rotate: true
xy: 615, 394
size: 54, 28
orig: 54, 28
offset: 0, 0
index: -1
erduo_21
rotate: true
xy: 307, 17
size: 81, 103
orig: 81, 103
offset: 0, 0
index: -1
erduo_29
rotate: false
xy: 514, 101
size: 41, 37
orig: 41, 37
offset: 0, 0
index: -1
erduo_30
rotate: false
xy: 230, 3
size: 75, 91
orig: 75, 91
offset: 0, 0
index: -1
houtui_35
rotate: false
xy: 850, 583
size: 143, 216
orig: 143, 216
offset: 0, 0
index: -1
houtui_40
rotate: false
xy: 506, 202
size: 61, 188
orig: 61, 188
offset: 0, 0
index: -1
huxu_27
rotate: false
xy: 645, 426
size: 20, 22
orig: 20, 22
offset: 0, 0
index: -1
jiao_10
rotate: false
xy: 750, 477
size: 76, 135
orig: 76, 135
offset: 0, 0
index: -1
jiao_11
rotate: false
xy: 423, 392
size: 190, 99
orig: 190, 99
offset: 0, 0
index: -1
jiao_4
rotate: true
xy: 828, 407
size: 97, 105
orig: 97, 105
offset: 0, 0
index: -1
jiao_7
rotate: true
xy: 412, 18
size: 59, 85
orig: 59, 85
offset: 0, 0
index: -1
jiao_8
rotate: false
xy: 995, 711
size: 27, 88
orig: 27, 88
offset: 0, 0
index: -1
jiao_9
rotate: true
xy: 667, 421
size: 54, 104
orig: 54, 104
offset: 0, 0
index: -1
maomao_28
rotate: false
xy: 667, 477
size: 81, 135
orig: 81, 135
offset: 0, 0
index: -1
piaodai_1
rotate: true
xy: 850, 801
size: 221, 159
orig: 221, 159
offset: 0, 0
index: -1
piaodai_31
rotate: true
xy: 344, 183
size: 179, 84
orig: 179, 84
offset: 0, 0
index: -1
piaodai_37
rotate: false
xy: 2, 187
size: 340, 383
orig: 340, 383
offset: 0, 0
index: -1
qiantui_34
rotate: true
xy: 2, 9
size: 85, 226
orig: 85, 226
offset: 0, 0
index: -1
qiantui_38
rotate: false
xy: 430, 187
size: 74, 203
orig: 74, 203
offset: 0, 0
index: -1
shenti_36
rotate: false
xy: 423, 493
size: 194, 133
orig: 194, 133
offset: 0, 0
index: -1
tou_26
rotate: false
xy: 935, 405
size: 80, 99
orig: 80, 99
offset: 0, 0
index: -1
toushi_2
rotate: false
xy: 773, 446
size: 53, 29
orig: 53, 29
offset: 0, 0
index: -1
toushi_3
rotate: true
xy: 475, 103
size: 82, 37
orig: 82, 37
offset: 0, 0
index: -1
toushi_5
rotate: true
xy: 958, 513
size: 68, 29
orig: 68, 29
offset: 0, 0
index: -1
toushi_6
rotate: false
xy: 411, 595
size: 10, 31
orig: 10, 31
offset: 0, 0
index: -1
weiba_41
rotate: true
xy: 344, 364
size: 206, 77
orig: 206, 77
offset: 0, 0
index: -1
youchibang_42
rotate: false
xy: 673, 660
size: 175, 362
orig: 175, 362
offset: 0, 0
index: -1
youchibang_43
rotate: true
xy: 2, 96
size: 89, 300
orig: 89, 300
offset: 0, 0
index: -1
yuandian_1
rotate: false
xy: 487, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
yuandian_10
rotate: false
xy: 995, 674
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
yuandian_11
rotate: false
xy: 773, 428
size: 16, 16
orig: 16, 16
offset: 0, 0
index: -1
yuandian_12
rotate: false
xy: 444, 6
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
yuandian_13
rotate: false
xy: 791, 432
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
yuandian_14
rotate: false
xy: 645, 409
size: 15, 15
orig: 15, 15
offset: 0, 0
index: -1
yuandian_15
rotate: false
xy: 428, 2
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
yuandian_16
rotate: false
xy: 995, 688
size: 21, 21
orig: 21, 21
offset: 0, 0
index: -1
yuandian_2
rotate: false
xy: 323, 5
size: 10, 10
orig: 10, 10
offset: 0, 0
index: -1
yuandian_3
rotate: false
xy: 501, 92
size: 9, 9
orig: 9, 9
offset: 0, 0
index: -1
yuandian_3s
rotate: false
xy: 645, 395
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
yuandian_4
rotate: false
xy: 412, 2
size: 14, 14
orig: 14, 14
offset: 0, 0
index: -1
yuandian_5
rotate: false
xy: 1011, 1011
size: 11, 11
orig: 11, 11
offset: 0, 0
index: -1
yuandian_6
rotate: true
xy: 307, 2
size: 13, 14
orig: 13, 14
offset: 0, 0
index: -1
yuandian_7
rotate: false
xy: 840, 604
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
yuandian_8
rotate: false
xy: 840, 594
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
yuandian_9
rotate: false
xy: 487, 89
size: 12, 12
orig: 12, 12
offset: 0, 0
index: -1
yuanpian_12
rotate: false
xy: 475, 79
size: 10, 22
orig: 10, 22
offset: 0, 0
index: -1
yuanpian_13
rotate: false
xy: 1011, 994
size: 9, 15
orig: 9, 15
offset: 0, 0
index: -1
yuanpian_14
rotate: false
xy: 411, 581
size: 10, 12
orig: 10, 12
offset: 0, 0
index: -1
yuanpian_15
rotate: false
xy: 828, 589
size: 10, 23
orig: 10, 23
offset: 0, 0
index: -1
yuanpian_16
rotate: false
xy: 842, 644
size: 6, 14
orig: 6, 14
offset: 0, 0
index: -1
yuanpian_17
rotate: false
xy: 506, 192
size: 6, 8
orig: 6, 8
offset: 0, 0
index: -1
zhuangshi_18
rotate: true
xy: 412, 79
size: 102, 61
orig: 102, 61
offset: 0, 0
index: -1
zhuangshi_19
rotate: false
xy: 569, 208
size: 54, 182
orig: 54, 182
offset: 0, 0
index: -1
zhuangshi_22
rotate: true
xy: 828, 506
size: 75, 128
orig: 75, 128
offset: 0, 0
index: -1
zhuangshi_23
rotate: true
xy: 673, 614
size: 44, 167
orig: 44, 167
offset: 0, 0
index: -1
zhuangshi_24
rotate: true
xy: 514, 140
size: 60, 43
orig: 60, 43
offset: 0, 0
index: -1
zhuangshi_25
rotate: false
xy: 619, 450
size: 46, 176
orig: 46, 176
offset: 0, 0
index: -1
zhuangshi_39
rotate: true
xy: 304, 100
size: 81, 106
orig: 81, 106
offset: 0, 0
index: -1
zuochibang_32
rotate: false
xy: 411, 628
size: 260, 394
orig: 260, 394
offset: 0, 0
index: -1
zuochibang_33
rotate: false
xy: 2, 572
size: 407, 450
orig: 407, 450
offset: 0, 0
index: -1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e955653cfe9a01d418eb747463be1626
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: c57d32868b3453d4aa42be3bef4b1d32
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 9efa51570cfb8a648af944e5298eeabe
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 85c624b3c0510594eaf231f6e9804157
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: ls_06_baize_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: e955653cfe9a01d418eb747463be1626, type: 3}
materials:
- {fileID: 2100000, guid: 809d076387073354293574f2bcc392e6, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a1168220b1da81d4a95481d56d38008a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ls_06_baize_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: c57d32868b3453d4aa42be3bef4b1d32, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 809d076387073354293574f2bcc392e6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: ls_06_baize_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: a1168220b1da81d4a95481d56d38008a, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 85c624b3c0510594eaf231f6e9804157, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 37d0666295ddcbe4286900935cfbfd1b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -61,7 +61,7 @@ local tabs = {
},
[14] = { --累计充值
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.AccumulativeRechargeExper
},
[15] = { --限时商市
default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01",
@ -204,6 +204,14 @@ function this.PageTabAdapter(tab, index, status)
if GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then
tab.gameObject:SetActive(GlobalActConfig[id].ShowArt ~= 1)
end
--累计充值特殊处理
if GlobalActConfig[id].Type == ActivityTypeDef.AccumulativeRechargeExper then
if GlobalActConfig[id] and GlobalActConfig[id].ShowArt ~= 1 then
tab.gameObject:SetActive(true)
else
tab.gameObject:SetActive(false)
end
end
else
tab.gameObject:SetActive(false)
end

View File

@ -382,7 +382,18 @@ function ExpertPanel:RefreshActivityBtn(context)
elseif context.type == ActivityTypeDef.GrowthReward then
tabBtns[18]:SetActive(false)
elseif context.type == ActivityTypeDef.AccumulativeRechargeExper then
tabBtns[7]:SetActive(context.status == 1)
local tempId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper)
if tempId then
local config = ConfigManager.GetConfigData(ConfigName.GlobalActivity,tempId)
if config.ShowArt == 1 then
tabBtns[7]:SetActive(context.status == 1)
else
tabBtns[7]:SetActive(false)
end
else
tabBtns[7]:SetActive(false)
end
--elseif context.type == ActivityTypeDef.LuckyTurnTable_One then
-- tabBtns[6]:SetActive(context.status == 1)
-- elseif context.type == ActivityTypeDef.SevenDayRegister then
@ -422,7 +433,17 @@ function ExpertPanel:RefreshActivityShow()
tabBtns[1]:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SevenDayRegister))
tabBtns[5]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyCat))
tabBtns[6]:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One))--探宝长久关闭
tabBtns[7]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper))
local tempId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper)
if tempId then
local config = ConfigManager.GetConfigData(ConfigName.GlobalActivity,tempId)
if config.ShowArt == 1 then
tabBtns[7]:SetActive(context.status == 1)
else
tabBtns[7]:SetActive(false)
end
else
tabBtns[7]:SetActive(false)
end
tabBtns[9]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.UpStarExper))
tabBtns[10]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FastExplore))
tabBtns[11]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AreaExper))
@ -589,13 +610,30 @@ function ExpertPanel:SetOpenActiveBtn()
--所有达人
for i, v in pairs(numExChange) do
local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v)
if curActiveData then
if defaultIndex == 0 or defaultIndex > i then
defaultIndex = i
end
tabBtns[i]:SetActive(true)
if i == ActivityTypeDef.AccumulativeRechargeExper then
local tempId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper)
if tempId and curActiveData then
local config = ConfigManager.GetConfigData(ConfigName.GlobalActivity,tempId)
if config.ShowArt == 1 then
if defaultIndex == 0 or defaultIndex > i then
defaultIndex = i
end
tabBtns[i]:SetActive(true)
else
tabBtns[i]:SetActive(false)
end
else
tabBtns[i]:SetActive(false)
end
else
tabBtns[i]:SetActive(false)
if curActiveData then
if defaultIndex == 0 or defaultIndex > i then
defaultIndex = i
end
tabBtns[i]:SetActive(true)
else
tabBtns[i]:SetActive(false)
end
end
end
--限时兑换