Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-04-27 23:37:20 +08:00
commit 3c9ff8f73d
20 changed files with 853 additions and 1 deletions

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7828148715101896788
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3507485201607961427}
- component: {fileID: 7872510531549052290}
- component: {fileID: 7191141913071140065}
m_Layer: 0
m_Name: live2d_c_0035
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3507485201607961427
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7828148715101896788}
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 &7872510531549052290
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7828148715101896788}
m_CullTransparentMesh: 0
--- !u!114 &7191141913071140065
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7828148715101896788}
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: c6c1a23e16965d5429fd2161d1e9baf2, 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: aed7e77f3baca1f4599fce0d02fbe606
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,29 @@
%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: Aglow_z_02
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
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: aafc591dfc81eaf49b57d99a01ee05fc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
m_Colors:
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 49ed73d967eca2a4aaec01be6852a0de
timeCreated: 1535969269
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@ -0,0 +1,496 @@
c_0035.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
biyan_19
rotate: false
xy: 570, 874
size: 8, 5
orig: 8, 5
offset: 0, 0
index: -1
biyan_20
rotate: true
xy: 587, 415
size: 11, 7
orig: 11, 7
offset: 0, 0
index: -1
bozi_49
rotate: false
xy: 232, 565
size: 22, 26
orig: 22, 26
offset: 0, 0
index: -1
daizi_40
rotate: true
xy: 580, 955
size: 67, 380
orig: 67, 380
offset: 0, 0
index: -1
daizi_44
rotate: false
xy: 422, 143
size: 32, 85
orig: 32, 85
offset: 0, 0
index: -1
daizi_45
rotate: true
xy: 367, 576
size: 15, 7
orig: 15, 7
offset: 0, 0
index: -1
daizi_64
rotate: true
xy: 580, 923
size: 30, 361
orig: 30, 361
offset: 0, 0
index: -1
daizi_82
rotate: false
xy: 460, 285
size: 33, 92
orig: 33, 92
offset: 0, 0
index: -1
daizihou_83
rotate: true
xy: 232, 548
size: 15, 19
orig: 15, 19
offset: 0, 0
index: -1
guajian_34
rotate: false
xy: 820, 441
size: 37, 55
orig: 37, 55
offset: 0, 0
index: -1
guajian_36
rotate: false
xy: 832, 567
size: 16, 30
orig: 16, 30
offset: 0, 0
index: -1
houyiling_48
rotate: false
xy: 895, 703
size: 35, 38
orig: 35, 38
offset: 0, 0
index: -1
jianjia_27
rotate: false
xy: 581, 287
size: 74, 74
orig: 74, 74
offset: 0, 0
index: -1
jianjia_33
rotate: true
xy: 152, 4
size: 55, 74
orig: 55, 74
offset: 0, 0
index: -1
jianjia_81
rotate: true
xy: 262, 134
size: 24, 46
orig: 24, 46
offset: 0, 0
index: -1
lian_23
rotate: true
xy: 256, 308
size: 84, 72
orig: 84, 72
offset: 0, 0
index: -1
lingzi_37
rotate: false
xy: 811, 498
size: 39, 67
orig: 39, 67
offset: 0, 0
index: -1
lingzi_39
rotate: false
xy: 274, 78
size: 25, 54
orig: 25, 54
offset: 0, 0
index: -1
meimao_17
rotate: true
xy: 570, 895
size: 12, 8
orig: 12, 8
offset: 0, 0
index: -1
meimao_18
rotate: false
xy: 2, 2
size: 7, 2
orig: 7, 2
offset: 0, 0
index: -1
peishi_43
rotate: false
xy: 820, 420
size: 18, 19
orig: 18, 19
offset: 0, 0
index: -1
piaodai_53
rotate: false
xy: 224, 133
size: 36, 167
orig: 36, 167
offset: 0, 0
index: -1
piaodai_54
rotate: false
xy: 217, 302
size: 37, 243
orig: 37, 243
offset: 0, 0
index: -1
piaodai_57
rotate: true
xy: 602, 497
size: 68, 207
orig: 68, 207
offset: 0, 0
index: -1
pijianmao_80
rotate: false
xy: 330, 281
size: 128, 96
orig: 128, 96
offset: 0, 0
index: -1
sha_55
rotate: true
xy: 2, 6
size: 287, 148
orig: 287, 148
offset: 0, 0
index: -1
sha_58
rotate: true
xy: 596, 414
size: 81, 142
orig: 81, 142
offset: 0, 0
index: -1
sha_59
rotate: false
xy: 570, 680
size: 216, 161
orig: 216, 161
offset: 0, 0
index: -1
sha_65
rotate: true
xy: 376, 540
size: 132, 224
orig: 132, 224
offset: 0, 0
index: -1
shangyi_47
rotate: false
xy: 505, 428
size: 89, 110
orig: 89, 110
offset: 0, 0
index: -1
shou_28
rotate: false
xy: 495, 303
size: 84, 67
orig: 84, 67
offset: 0, 0
index: -1
shou_86
rotate: false
xy: 850, 567
size: 36, 28
orig: 36, 28
offset: 0, 0
index: -1
suizi_15
rotate: false
xy: 311, 282
size: 13, 24
orig: 13, 24
offset: 0, 0
index: -1
suizi_38
rotate: false
xy: 929, 822
size: 10, 20
orig: 10, 20
offset: 0, 0
index: -1
suizi_4
rotate: true
xy: 224, 62
size: 69, 48
orig: 69, 48
offset: 0, 0
index: -1
touda_16
rotate: true
xy: 962, 955
size: 67, 40
orig: 67, 40
offset: 0, 0
index: -1
toudai_3
rotate: true
xy: 499, 372
size: 54, 86
orig: 54, 86
offset: 0, 0
index: -1
toudai_46
rotate: true
xy: 866, 597
size: 15, 40
orig: 15, 40
offset: 0, 0
index: -1
toudai_90
rotate: false
xy: 657, 297
size: 14, 64
orig: 14, 64
offset: 0, 0
index: -1
toufa_25
rotate: true
xy: 858, 689
size: 152, 35
orig: 152, 35
offset: 0, 0
index: -1
toufa_51
rotate: true
xy: 587, 363
size: 49, 86
orig: 49, 86
offset: 0, 0
index: -1
toufa_68
rotate: true
xy: 895, 743
size: 99, 32
orig: 99, 32
offset: 0, 0
index: -1
toufa_69
rotate: true
xy: 882, 844
size: 77, 58
orig: 77, 58
offset: 0, 0
index: -1
toufa_70
rotate: false
xy: 740, 414
size: 78, 81
orig: 78, 81
offset: 0, 0
index: -1
toufa_71
rotate: true
xy: 152, 61
size: 232, 70
orig: 232, 70
offset: 0, 0
index: -1
toufa_72
rotate: true
xy: 262, 160
size: 146, 47
orig: 146, 47
offset: 0, 0
index: -1
toufa_73
rotate: false
xy: 495, 284
size: 73, 17
orig: 73, 17
offset: 0, 0
index: -1
toufa_74
rotate: true
xy: 256, 394
size: 197, 72
orig: 197, 72
offset: 0, 0
index: -1
toufa_75
rotate: true
xy: 788, 681
size: 160, 68
orig: 160, 68
offset: 0, 0
index: -1
toufa_77
rotate: true
xy: 2, 295
size: 250, 213
orig: 250, 213
offset: 0, 0
index: -1
toufa_78
rotate: true
xy: 943, 770
size: 183, 79
orig: 183, 79
offset: 0, 0
index: -1
toufa_79
rotate: false
xy: 311, 230
size: 143, 49
orig: 143, 49
offset: 0, 0
index: -1
toufa_89
rotate: false
xy: 232, 593
size: 142, 314
orig: 142, 314
offset: 0, 0
index: -1
touguan_24
rotate: false
xy: 311, 146
size: 109, 82
orig: 109, 82
offset: 0, 0
index: -1
wuqi_1
rotate: false
xy: 2, 909
size: 576, 113
orig: 576, 113
offset: 0, 0
index: -1
wuqi_2
rotate: false
xy: 675, 365
size: 76, 47
orig: 76, 47
offset: 0, 0
index: -1
wuqi_91
rotate: true
xy: 330, 379
size: 68, 167
orig: 68, 167
offset: 0, 0
index: -1
xiao_93
rotate: true
xy: 228, 5
size: 55, 63
orig: 55, 63
offset: 0, 0
index: -1
xiezi_67
rotate: true
xy: 330, 544
size: 47, 35
orig: 47, 35
offset: 0, 0
index: -1
xiuzi_29
rotate: false
xy: 376, 674
size: 192, 233
orig: 192, 233
offset: 0, 0
index: -1
xiuzi_31
rotate: true
xy: 330, 449
size: 89, 173
orig: 89, 173
offset: 0, 0
index: -1
xiuzi_66
rotate: false
xy: 832, 599
size: 32, 80
orig: 32, 80
offset: 0, 0
index: -1
yaodai_41
rotate: true
xy: 866, 614
size: 73, 49
orig: 73, 49
offset: 0, 0
index: -1
yaodai_41a
rotate: false
xy: 753, 354
size: 73, 58
orig: 73, 58
offset: 0, 0
index: -1
yaodai_50
rotate: true
xy: 1004, 966
size: 56, 18
orig: 56, 18
offset: 0, 0
index: -1
yibai_52
rotate: true
xy: 580, 843
size: 78, 300
orig: 78, 300
offset: 0, 0
index: -1
yibai_56
rotate: false
xy: 2, 547
size: 228, 360
orig: 228, 360
offset: 0, 0
index: -1
yixiu_84
rotate: true
xy: 602, 567
size: 111, 228
orig: 111, 228
offset: 0, 0
index: -1
zhengyan_21
rotate: true
xy: 570, 881
size: 12, 8
orig: 12, 8
offset: 0, 0
index: -1
zhengyan_22
rotate: false
xy: 570, 867
size: 8, 5
orig: 8, 5
offset: 0, 0
index: -1

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 598 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 911b414d705dc8e4682dad2e8361e652
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: 7c5ee25b3c367f948a59d4bf2d02381a
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9d479c25c80f0394891f3e0ca80bdf40
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: c_0035_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: e86714746e9ea124cae2eb6050b6941a, type: 3}
materials:
- {fileID: 2100000, guid: 5bf92353ddd9dd646bc036acf29323eb, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c63c76b84d81c904c94471256c3a1fa3
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: c_0035_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: 911b414d705dc8e4682dad2e8361e652, 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: 5bf92353ddd9dd646bc036acf29323eb
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: c_0035_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: c63c76b84d81c904c94471256c3a1fa3, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 9d479c25c80f0394891f3e0ca80bdf40, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

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

View File

@ -635,6 +635,16 @@ function this.ExpterActivityIsShowRedPoint(activeIndex)
if expertRewardTabs.value >= value then if expertRewardTabs.value >= value then
return true return true
end end
elseif activeType == ActivityTypeDef.AccumulativeRechargeExper then
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper)
if id and id > 0 then
local curActiveConfig = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity,id)
if curActiveConfig and curActiveConfig.ShowArt == 1 then--1类型的活动是限时活动里的累计充值
if expertRewardTabs.value >= value then
return true
end
end
end
else else
if expertRewardTabs.value >= value then if expertRewardTabs.value >= value then
--Log("限时红点 --------------- true") --Log("限时红点 --------------- true")

View File

@ -91,6 +91,20 @@ function ActivityMainPanel:OnOpen(_activityType,_index)
this.activityType = _activityType this.activityType = _activityType
DynamicActivityManager.curActivityType = this.activityType DynamicActivityManager.curActivityType = this.activityType
tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType)
--累计充值特殊判断
for i = 1, #tabs do
if tabs[i] and tabs[i].ActiveType > 0 then
local id = ActivityGiftManager.IsActivityTypeOpen(tabs[i].ActiveType)
if id and id > 0 then
local curActiveConfig = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity,id)
if curActiveConfig and curActiveConfig.ShowArt == 3 then--3类型的活动不是限时活动里的累计充值
table.remove(tabs,i)
break
end
end
end
end
--累计充值特殊判断结束
_CurPageIndex = 0 _CurPageIndex = 0
if _index and _index > 0 then if _index and _index > 0 then
self:CheckActOpen(_index) self:CheckActOpen(_index)

View File

@ -681,7 +681,7 @@ function this.CreatActivity()
end end
activityTabs[k].go.gameObject.name = "tab"..v.Id activityTabs[k].go.gameObject.name = "tab"..v.Id
activityTabs[k].go.gameObject:SetActive(false) activityTabs[k].go.gameObject:SetActive(false)
if v.ShowTime == 0 then if v.ShowTime == 0 or v.FunType == 94 then--特殊判断FunType == 94 超值基金
activityTabs[k].timeImg.gameObject:SetActive(false) activityTabs[k].timeImg.gameObject:SetActive(false)
else else
activityTabs[k].timeImg.gameObject:SetActive(true) activityTabs[k].timeImg.gameObject:SetActive(true)