Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
6d4d1fc49b
Binary file not shown.
After Width: | Height: | Size: 9.9 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e5d62ef53f4e50b4c82c34fb24fff4bd
|
||||
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: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
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
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 885496b284131a6418b5a20738534dc6
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: CommonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fd52b845f4615b2418f482acbcb2d5c6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,5 +1,163 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1220922856
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1220922857}
|
||||
- component: {fileID: 1220922859}
|
||||
- component: {fileID: 1220922858}
|
||||
m_Layer: 5
|
||||
m_Name: Text (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1220922857
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1220922856}
|
||||
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: 9000493086994490238}
|
||||
m_RootOrder: 3
|
||||
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: 54.71997, y: 591.06006}
|
||||
m_SizeDelta: {x: 210.3, y: 59.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1220922859
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1220922856}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1220922858
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1220922856}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.86666673, g: 0.70980394, b: 0.48235297, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 39
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 51
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u4E13\u5C5E\u793C\u5305"
|
||||
--- !u!1 &1914158485
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1914158486}
|
||||
- component: {fileID: 1914158488}
|
||||
- component: {fileID: 1914158487}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1914158486
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1914158485}
|
||||
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: 9000493086994490238}
|
||||
m_RootOrder: 2
|
||||
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: -273.9, y: 591.06}
|
||||
m_SizeDelta: {x: 210.3, y: 59.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1914158488
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1914158485}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1914158487
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1914158485}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.86666673, g: 0.70980394, b: 0.48235297, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 39
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
m_MaxSize: 51
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u514D\u8D39\u9886\u53D6"
|
||||
--- !u!1 &1290591318187227558
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -33,7 +191,7 @@ RectTransform:
|
|||
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: -1086, y: 0}
|
||||
m_AnchoredPosition: {x: -1867, y: 153}
|
||||
m_SizeDelta: {x: 1080, y: 265}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6586228766960284520
|
||||
|
@ -61,7 +219,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &4836386230438267975
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -149,6 +307,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 8454504298841997453}
|
||||
- {fileID: 7598455010127965782}
|
||||
- {fileID: 7105731049622345673}
|
||||
m_Father: {fileID: 2384432804281337260}
|
||||
m_RootOrder: 0
|
||||
|
@ -390,7 +549,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -44}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2384432804281337263
|
||||
|
@ -435,8 +594,8 @@ RectTransform:
|
|||
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.012501}
|
||||
m_SizeDelta: {x: 1080, y: 470.98}
|
||||
m_AnchoredPosition: {x: -180, y: -137}
|
||||
m_SizeDelta: {x: 580, y: 56}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7757572989552689508
|
||||
CanvasRenderer:
|
||||
|
@ -466,7 +625,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Sprite: {fileID: 21300000, guid: e5d62ef53f4e50b4c82c34fb24fff4bd, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -549,6 +708,199 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3624532418286922992
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1510646843561586138}
|
||||
- component: {fileID: 4502545718952029418}
|
||||
- component: {fileID: 8135804685053177851}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1510646843561586138
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3624532418286922992}
|
||||
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: 9000493086994490238}
|
||||
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: -12.1, y: -89.89}
|
||||
m_SizeDelta: {x: 1180.4, y: 1431.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4502545718952029418
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3624532418286922992}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8135804685053177851
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3624532418286922992}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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
|
||||
m_Sprite: {fileID: 21300000, guid: fbf8b38cc4af55146a5f00d2801a1d34, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4078795832570361507
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6529346918078605616}
|
||||
- component: {fileID: 9074871151966575624}
|
||||
- component: {fileID: 6843907404662441728}
|
||||
m_Layer: 5
|
||||
m_Name: time1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6529346918078605616
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4078795832570361507}
|
||||
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:
|
||||
- {fileID: 8077133622727871801}
|
||||
m_Father: {fileID: 7598455010127965782}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 319.8, y: -525.3}
|
||||
m_SizeDelta: {x: 440.5, y: 53.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9074871151966575624
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4078795832570361507}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6843907404662441728
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4078795832570361507}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 36f16563686ad084e8d4c0135d451e47, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &5251055469797052446
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1153060571485398463}
|
||||
- component: {fileID: 3814614978857892476}
|
||||
m_Layer: 5
|
||||
m_Name: ItemPre
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1153060571485398463
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5251055469797052446}
|
||||
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: 7598455010127965782}
|
||||
m_RootOrder: 2
|
||||
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: 178.7}
|
||||
m_SizeDelta: {x: 1080, y: 162.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3814614978857892476
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5251055469797052446}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5759065364542601348
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -568,7 +920,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1192024921614026370
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -686,6 +1038,212 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &6174966080830102196
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2717901501017606085}
|
||||
- component: {fileID: 314091319434520865}
|
||||
- component: {fileID: 804035379455981221}
|
||||
m_Layer: 5
|
||||
m_Name: Image (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2717901501017606085
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6174966080830102196}
|
||||
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: 9000493086994490238}
|
||||
m_RootOrder: 1
|
||||
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: 54.72, y: -174.5}
|
||||
m_SizeDelta: {x: 512.5, y: 1657}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &314091319434520865
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6174966080830102196}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &804035379455981221
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6174966080830102196}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
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
|
||||
m_Sprite: {fileID: 21300000, guid: e8c80b8f927091f4ba5e6443809bda96, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &6648748851088623174
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8077133622727871801}
|
||||
- component: {fileID: 3958742598137882949}
|
||||
- component: {fileID: 7105717870222392174}
|
||||
m_Layer: 5
|
||||
m_Name: timeText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8077133622727871801
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6648748851088623174}
|
||||
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: 6529346918078605616}
|
||||
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.000024319, y: -1.5}
|
||||
m_SizeDelta: {x: 440.5, y: 54.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3958742598137882949
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6648748851088623174}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7105717870222392174
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6648748851088623174}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.84313726, g: 0.84313726, b: 0.7490196, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 38
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 26
|
||||
m_MaxSize: 38
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7836232575941379537
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9000493086994490238}
|
||||
- component: {fileID: 3901837177235078437}
|
||||
m_Layer: 5
|
||||
m_Name: bg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9000493086994490238
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7836232575941379537}
|
||||
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:
|
||||
- {fileID: 1510646843561586138}
|
||||
- {fileID: 2717901501017606085}
|
||||
- {fileID: 1914158486}
|
||||
- {fileID: 1220922857}
|
||||
m_Father: {fileID: 7598455010127965782}
|
||||
m_RootOrder: 1
|
||||
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: -235.2}
|
||||
m_SizeDelta: {x: 1080, y: 1286.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3901837177235078437
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7836232575941379537}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &8369141525297597868
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -716,7 +1274,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8478406734519293774}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
@ -834,6 +1392,53 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8777641042416483474
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7598455010127965782}
|
||||
- component: {fileID: 5083136509133030655}
|
||||
m_Layer: 5
|
||||
m_Name: dasheng
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7598455010127965782
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8777641042416483474}
|
||||
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:
|
||||
- {fileID: 6529346918078605616}
|
||||
- {fileID: 9000493086994490238}
|
||||
- {fileID: 1153060571485398463}
|
||||
m_Father: {fileID: 8478406734519293774}
|
||||
m_RootOrder: 1
|
||||
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: 1080, y: 1920}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5083136509133030655
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8777641042416483474}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &8920601020287104486
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8fa4efa8f60ce9c42918415a6f43e5ca
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1134,6 +1134,7 @@ MonoBehaviour:
|
|||
- Assets/ManagedResources/~Lua/Modules/UIComponent
|
||||
- Assets/ManagedResources/~Lua/Modules/Update
|
||||
- Assets/ManagedResources/~Lua/Modules/UpGradePackage
|
||||
- Assets/ManagedResources/~Lua/Modules/UpStar
|
||||
- Assets/ManagedResources/~Lua/Modules/Vip
|
||||
- Assets/ManagedResources/~Lua/Modules/WarPowerChange
|
||||
- Assets/ManagedResources/~Lua/Modules/WorkShop
|
||||
|
@ -16722,6 +16723,10 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 22
|
||||
resAbNameIndex: 11
|
||||
- resName: d_dengfengzaoji_xiaozidi
|
||||
extension: .png
|
||||
resPathIndex: 23
|
||||
resAbNameIndex: 12
|
||||
- resName: jiantou
|
||||
extension: .png
|
||||
resPathIndex: 23
|
||||
|
@ -57218,6 +57223,10 @@ MonoBehaviour:
|
|||
extension: .prefab
|
||||
resPathIndex: 596
|
||||
resAbNameIndex: 3851
|
||||
- resName: UpStarPre
|
||||
extension: .prefab
|
||||
resPathIndex: 596
|
||||
resAbNameIndex: 3851
|
||||
- resName: NewItem
|
||||
extension: .prefab
|
||||
resPathIndex: 597
|
||||
|
@ -80380,6 +80389,7 @@ MonoBehaviour:
|
|||
- lz4/dynamicatlas/commonatlas/artfont/r_xianshiduihuan_huodongguizezi_zh.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/artfont/r_xianshiduihuan_kehuojianglizi_zh.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/artfont/s_shenyitianjiang_shizhuangyulan_zh.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/artfont/s_slbz_yilingqu_zh.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_lingpaishangdian_zh.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_linpaiicon1_zh.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/artfont/x_xiangjianglaixi_tiaozhanjiangli_zh.unity3d
|
||||
|
@ -80473,7 +80483,6 @@ MonoBehaviour:
|
|||
- lz4/dynamicatlas/r_xianshiduihuan_zidiban.unity3d
|
||||
- lz4/dynamicatlas/r_ymqf_dikuang.unity3d
|
||||
- lz4/dynamicatlas/r_ymqf_tiao_3.unity3d
|
||||
- lz4/dynamicatlas/s_shengxingyouli_banner_zh.unity3d
|
||||
- lz4/dynamicatlas/s_shenyitianjiang_beijin.unity3d
|
||||
- lz4/dynamicatlas/s_shenyitianjiang_kuang.unity3d
|
||||
- lz4/dynamicatlas/s_shenyitianjiang_zi_zh.unity3d
|
||||
|
@ -81855,6 +81864,7 @@ MonoBehaviour:
|
|||
- lz4/publicartres/animations.unity3d
|
||||
- assetBundleName: lz4/prefabs/ui/newactivity.unity3d
|
||||
dependences:
|
||||
- lz4/atlas/battleatlas.unity3d
|
||||
- lz4/atlas/commonatlas.unity3d
|
||||
- lz4/atlas/popupatlas.unity3d
|
||||
- lz4/atlas/publicatlas.unity3d
|
||||
|
@ -81878,12 +81888,14 @@ MonoBehaviour:
|
|||
- lz4/dynamicatlas/commonatlas/l_mrlb_biankuang.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/l_mrlb_biaoqian.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/r_dungeon_menghei_03.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/r_hero_suodi_suo.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/r_jyxz_qizhi_di.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/r_xianshiduihuan_danjuyuan.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/r_xianshiduihuan_xiaanniu.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/r_xianshiduihuan_xiadaojukuang.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/s_slbz_1anniuongse.unity3d
|
||||
- lz4/dynamicatlas/commonatlas/y_yueka_hongxian.unity3d
|
||||
- lz4/dynamicatlas/g_gonghui_shijuezhen_anniudihei.unity3d
|
||||
- lz4/dynamicatlas/l_libao_kuang.unity3d
|
||||
- lz4/dynamicatlas/l_mrlb_tiao.unity3d
|
||||
- lz4/dynamicatlas/l_mrlb_tiao_jpg.unity3d
|
||||
|
@ -81898,6 +81910,9 @@ MonoBehaviour:
|
|||
- lz4/dynamicatlas/r_ymqf_dikuang.unity3d
|
||||
- lz4/dynamicatlas/r_ymqf_tiao_3.unity3d
|
||||
- lz4/dynamicatlas/s_shouchong_anniu.unity3d
|
||||
- lz4/dynamicatlas/s_slbz_kuang1.unity3d
|
||||
- lz4/dynamicatlas/s_slbz_kuang2.unity3d
|
||||
- lz4/dynamicatlas/s_slbz_xian.unity3d
|
||||
- lz4/effectresui/meirilibao.unity3d
|
||||
- lz4/effectresui/tiangongxunbao.unity3d
|
||||
- lz4/fonts/artfont_1.unity3d
|
||||
|
|
|
@ -919,6 +919,7 @@ RedPointType = {
|
|||
wujinMission = 8500,
|
||||
wujinTreasure = 8501,
|
||||
wujinBianDui = 8502,
|
||||
chaofanrushengRed = 8503,
|
||||
}
|
||||
|
||||
RedPointStatus = {
|
||||
|
@ -1210,6 +1211,7 @@ ActivityTypeDef = {
|
|||
YiJingBaoKu = 8000,--易经宝库
|
||||
|
||||
MeiRiLiBao = 10004,
|
||||
ChaoFanRuSheng = 500, --超凡入圣
|
||||
}
|
||||
--活动结束需要处理面板关闭类型
|
||||
ActivityTypePanel = {
|
||||
|
|
|
@ -453,5 +453,6 @@ SubUIConfig = {
|
|||
[25] = { name = "FuXingGaoZhaoPanel", assetName = "FuXingGaoZhaoPanel", script = "Modules/FuXingGaoZhao/FuXingGaoZhaoPanel" },
|
||||
[26] = { name = "NiuQiChongTianPanel", assetName = "NiuQiChongTianPanel", script = "Modules/NiuQiChongTian/NiuQiChongTianPanel" },
|
||||
[27] = {name = "TimeLimitUpHero",assetName = "TimeLimitUpHero",script = "Modules/DynamicActivity/TimeLimitUpHero"}, --限时英雄up界面
|
||||
[30] = {name = "UpStarPre",assetName = "UpStarPre",script = "Modules/UpStar/UpStarPre"}, --限时英雄up界面
|
||||
[29] = {name = "page15",assetName = "page15",script = "Modules/DynamicActivity/ShengXingYouLi"},--升星有礼
|
||||
}
|
|
@ -139,9 +139,9 @@ function this.InitActivityServerData(msg, isUpdate)
|
|||
this.CheckMoneyProgress(v)
|
||||
this.mission[v.activityId] = v
|
||||
|
||||
-- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
--LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
for n, m in ipairs(v.mission) do
|
||||
-- LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
||||
--LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
||||
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
||||
this.onlineOpen = true
|
||||
this.onlineGetRewardState[m.missionId] = m.state
|
||||
|
@ -578,6 +578,7 @@ function this.RefreshActivityRedPoint()
|
|||
CheckRedPointStatus(RedPointType.FindFairy_FourView)
|
||||
CheckRedPointStatus(RedPointType.DynamicActTask)
|
||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasure)
|
||||
CheckRedPointStatus(RedPointType.chaofanrushengRed)
|
||||
end
|
||||
|
||||
function this.GetContinuityRechargeRedPoint()
|
||||
|
@ -1207,4 +1208,20 @@ function this.CheckYunYouManRedPoint()
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function this.CheckRedPointChaofanRuSheng()
|
||||
if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ChaoFanRuSheng) then
|
||||
return false
|
||||
end
|
||||
local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.ChaoFanRuSheng)
|
||||
if data and data.mission and #data.mission > 0 then
|
||||
for i = 1, #data.mission do
|
||||
if data.mission[i].state == 1 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
return this
|
|
@ -96,10 +96,12 @@ function XinJiangLaiXi:BindEvent()
|
|||
end
|
||||
--添加事件监听(用于子类重写)
|
||||
function XinJiangLaiXi:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function XinJiangLaiXi:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
|
|
|
@ -388,16 +388,36 @@ function this.SetPatFaceDaqta(PatFaceDatas)
|
|||
--LogYellow("后端推送礼包拍脸 拍脸ID "..curRechargeCommodityConfig.PosterUiId)
|
||||
local config = ConfigManager.GetConfigData(ConfigName.LoginPosterConfig,curRechargeCommodityConfig.PosterUiId)
|
||||
local isShow = true
|
||||
for k,v in ipairs(this.backPatFaceAllData) do
|
||||
if config.Type == v.Type then
|
||||
isShow = false
|
||||
break
|
||||
if config.Type == FacePanelType.Surprise then
|
||||
if not PlayerPrefs.HasKey(PlayerManager.uid.."Surprise") then
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."Surprise","0#0")
|
||||
end
|
||||
end
|
||||
local str = PlayerPrefs.GetString(PlayerManager.uid.."Surprise")
|
||||
str = string.split(str,"#")
|
||||
local curTimeStemp = math.floor(GetTimeStamp() / (24 * 3600))
|
||||
local times = str[2]
|
||||
if str[1] ~= curTimeStemp then
|
||||
times = 0
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."Surprise",curTimeStemp.."#"..times)
|
||||
end
|
||||
if times >= 2 then
|
||||
isShow = false
|
||||
else
|
||||
for k,v in ipairs(this.backPatFaceAllData) do
|
||||
if config.Type == v.Type then
|
||||
isShow = false
|
||||
break
|
||||
end
|
||||
end
|
||||
if isShow then
|
||||
times = times + 1
|
||||
PlayerPrefs.SetString(PlayerManager.uid.."Surprise",str[1].."#"..times)
|
||||
end
|
||||
end
|
||||
end
|
||||
if isShow then
|
||||
table.insert(this.backPatFaceAllData,config)
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -886,6 +886,8 @@ function this:TabBtnAction(id,actType,data)
|
|||
UIManager.OpenPanel(UIName.TaSuiLingXiaoPanel)
|
||||
elseif id == ActivityTypeDef.SurpriseBox then
|
||||
UIManager.OpenPanel(UIName.SurpriseBoxPanel)
|
||||
elseif id == ActivityTypeDef.ChaoFanRuSheng then
|
||||
UIManager.OpenPanel(UIName.ActivityMainPanel,id)
|
||||
end
|
||||
elseif actType == 2 then
|
||||
if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then
|
||||
|
|
|
@ -926,6 +926,9 @@ function this.GetAllRewardData()
|
|||
end
|
||||
--------------------------------------------------------------红点-----------------------------------------------
|
||||
function this.CheckoutRedPointTreasure()
|
||||
if not this.treasureDataReward then
|
||||
return false
|
||||
end
|
||||
for i = 1,#this.treasureDataReward do
|
||||
if this.treasureDataReward[i].state == 2 or this.treasureDataReward[i].state == 3 then
|
||||
return true
|
||||
|
|
|
@ -43,6 +43,11 @@ function CommonActPage:InitComponent()
|
|||
self.itemPre = Util.GetGameObject(self.gameObject, "ItemPre")
|
||||
self.sortingOrder = 0
|
||||
|
||||
--大圣升星
|
||||
self.dasheng = Util.GetGameObject(self.gameObject, "Bg/dasheng")
|
||||
self.timeDashengkuang = Util.GetGameObject(self.dasheng, "time1")
|
||||
self.timeDasheng = Util.GetGameObject(self.timeDashengkuang, "timeText"):GetComponent("Text")
|
||||
self.itemPreDasheng = Util.GetGameObject(self.dasheng, "ItemPre")
|
||||
self.ItemList = {}
|
||||
end
|
||||
|
||||
|
@ -99,6 +104,12 @@ function CommonActPage:OnShow(_sortingOrder)
|
|||
else
|
||||
self.titleIma.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
if self.actConfig.Icon[5] and self.actConfig.Icon[5] ~= "" then
|
||||
self.titleTipBg.gameObject:SetActive(true)
|
||||
else
|
||||
self.titleTipBg.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
if self.actConfig.TitleText and self.actConfig.TitleText ~= "" then
|
||||
local str = string.split(GetLanguageStrById(self.actConfig.TitleText),"|")
|
||||
|
@ -108,6 +119,16 @@ function CommonActPage:OnShow(_sortingOrder)
|
|||
else
|
||||
self.titleTip.gameObject:SetActive(false)
|
||||
end
|
||||
local space
|
||||
if self.actType == ActivityTypeDef.ChaoFanRuSheng then
|
||||
self.dasheng.gameObject:SetActive(true)
|
||||
space = Vector2.New(0, 10)
|
||||
self.parent.tabbox.gameObject:SetActive(false)
|
||||
else
|
||||
self.dasheng.gameObject:SetActive(false)
|
||||
space = Vector2.New(0, 0)
|
||||
self.parent.tabbox.gameObject:SetActive(true)
|
||||
end
|
||||
|
||||
if not self.scrollView then
|
||||
local rootHight = self.scrollItem.transform.rect.height
|
||||
|
@ -117,12 +138,18 @@ function CommonActPage:OnShow(_sortingOrder)
|
|||
local vec = self.scrollItem.transform.localPosition
|
||||
vec.y = self.scrollItemPos.y - 30
|
||||
self.scrollItem.transform.localPosition = vec
|
||||
elseif self.actType == ActivityTypeDef.ChaoFanRuSheng then
|
||||
self.itemPre:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,162)
|
||||
local vec = self.scrollItem.transform.localPosition
|
||||
vec.y = self.scrollItemPos.y - 100
|
||||
self.scrollItem.transform.localPosition = vec
|
||||
else
|
||||
self.itemPre:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,265)
|
||||
self.scrollItem.transform.localPosition = self.scrollItemPos
|
||||
end
|
||||
|
||||
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform,
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0))
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, space)
|
||||
self.scrollView.moveTween.MomentumAmount = 1
|
||||
self.scrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
@ -171,16 +198,26 @@ function CommonActPage:ShowSingleData(item,sdata,index)
|
|||
end
|
||||
|
||||
function CommonActPage:RefreshTime()
|
||||
self.timeDashengkuang:SetActive(false)
|
||||
self.time:SetActive(false)
|
||||
if self.actConfig.ShowTime == 0 then
|
||||
self.time:SetActive(false)
|
||||
return
|
||||
end
|
||||
|
||||
if self.localTimer then
|
||||
self.localTimer:Stop()
|
||||
self.localTimer = nil
|
||||
end
|
||||
self.time:SetActive(true)
|
||||
local freshTime
|
||||
local time ,timeText
|
||||
if self.actType == ActivityTypeDef.ChaoFanRuSheng then
|
||||
time = self.timeDashengkuang
|
||||
timeText = self.timeDasheng
|
||||
else
|
||||
time = self.time
|
||||
timeText = self.timeText
|
||||
end
|
||||
time:SetActive(true)
|
||||
local freshTime
|
||||
if self.actType == ActivityTypeDef.AccumulativeRechargeExper then
|
||||
freshTime = CalculateSecondsNowTo_N_OClock(24)
|
||||
else
|
||||
|
@ -189,11 +226,11 @@ function CommonActPage:RefreshTime()
|
|||
|
||||
local update = function()
|
||||
if self.actConfig.ShowTime == 1 then
|
||||
self.timeText.text = Language[10023]..TimeToFelaxible(freshTime)
|
||||
timeText.text = Language[10023]..TimeToFelaxible(freshTime)
|
||||
elseif self.actConfig.ShowTime == 2 then
|
||||
self.timeText.text = Language[10023]..TimeToDHMS(freshTime)
|
||||
timeText.text = Language[10023]..TimeToDHMS(freshTime)
|
||||
elseif self.actConfig.ShowTime == 3 then
|
||||
self.timeText.text = Language[10023]..TimeToHMS(freshTime)
|
||||
timeText.text = Language[10023]..TimeToHMS(freshTime)
|
||||
end
|
||||
end
|
||||
update()
|
||||
|
@ -208,6 +245,7 @@ function CommonActPage:RefreshTime()
|
|||
end
|
||||
|
||||
function CommonActPage:OnClose()
|
||||
self.parent.tabbox.gameObject:SetActive(true)
|
||||
self.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
|
|
|
@ -124,6 +124,28 @@ local TypeUpdateFunc = {
|
|||
local curData = dataList[ActivityTypeDef.DynamicAct]
|
||||
this.InitTaskData(curData,TaskTypeDef.DynamicActTask,ConfigName.ThemeActivityTaskConfig)
|
||||
end,
|
||||
[ActivityTypeDef.ChaoFanRuSheng] = function ()--主题活动任务
|
||||
-- singleTypeData = {}
|
||||
-- Log("InitData activityId:"..tostring(data.activityId).." value:"..tostring(data.value).." startTime:"..tostring(data.startTime).." endTime:"..tostring(data.endTime).." mission:"..tostring(#data.mission))
|
||||
-- singleTypeData.activityId = data.activityId
|
||||
-- singleTypeData.value = data.value
|
||||
-- singleTypeData.startTime = data.startTime
|
||||
-- singleTypeData.endTime = data.endTime
|
||||
-- singleTypeData.rewards = {}
|
||||
-- if data.mission and #data.mission > 0 then
|
||||
-- for i = 1, #data.mission do
|
||||
-- local reward = {}
|
||||
-- reward.missionId = data.mission[i].missionId or 0
|
||||
-- reward.progress = data.mission[i].progress or 0
|
||||
-- reward.state = data.mission[i].state or 0
|
||||
-- reward.otherData = {}
|
||||
-- table.insert(singleTypeData.rewards,reward)
|
||||
-- end
|
||||
-- end
|
||||
-- end
|
||||
local curData = dataList[ActivityTypeDef.ChaoFanRuSheng]
|
||||
this.InitMissionDdataUpStar(curData)
|
||||
end,
|
||||
|
||||
[ActivityTypeDef.SurpriseBox] = function ()--惊喜礼盒
|
||||
local curData = dataList[ActivityTypeDef.SurpriseBox]
|
||||
|
@ -150,6 +172,26 @@ local TypeUpdateFunc = {
|
|||
end,
|
||||
}
|
||||
|
||||
function this.InitMissionDdataUpStar(curData)
|
||||
local actRewardConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId", curData.activityId)
|
||||
for i = 1, #curData.rewards do
|
||||
for j = 1, #actRewardConfigs do
|
||||
if curData.rewards[i].missionId == actRewardConfigs[j].Id then
|
||||
curData.rewards[i].state = curData.rewards[i].state
|
||||
curData.rewards[i].targetId = actRewardConfigs[j].Values[1][1]
|
||||
curData.rewards[i].targetStar = actRewardConfigs[j].Values[1][2]
|
||||
curData.rewards[i].targetNum = actRewardConfigs[j].Values[2][1]
|
||||
curData.rewards[i].heroShows = {[1] = {curData.rewards[i].targetId,0,nil,curData.rewards[i].targetStar}}
|
||||
curData.rewards[i].giftId = actRewardConfigs[j].Values[3][1]
|
||||
curData.rewards[i].giftConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,curData.rewards[i].giftId)
|
||||
curData.rewards[i].giftShows = curData.rewards[i].giftConfig.RewardShow
|
||||
curData.rewards[i].giftData = OperatingManager.GetGiftGoodsInfo(curData.rewards[i].giftConfig.Type,curData.rewards[i].giftId)
|
||||
curData.rewards[i].freeShows = actRewardConfigs[j].Reward
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
function this.InitTaskData(curData,taskType,configName)
|
||||
local allListData = ConfigManager.GetAllConfigsDataByKey(configName, "ActivityId", curData.activityId)
|
||||
local allMissionData = TaskManager.GetTypeTaskList(taskType)
|
||||
|
|
|
@ -536,6 +536,7 @@ function this.RegisterRedCheckFunc()
|
|||
--主角修行
|
||||
RPData:AddCheckFunc(RedPointType.Practice_upgrade,PracticeManager.PracticeCheckUpgrade,FUNCTION_OPEN_TYPE.PRACTICE)
|
||||
RPData:AddCheckFunc(RedPointType.Practice_imprint,PracticeManager.PracticeCheckImprint,FUNCTION_OPEN_TYPE.PRACTICE)
|
||||
RPData:AddCheckFunc(RedPointType.chaofanrushengRed,ActivityGiftManager.CheckRedPointChaofanRuSheng)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -214,7 +214,7 @@ function this.UpdatePanelData()
|
|||
local recruitOne = function()
|
||||
RecruitManager.RecruitRequest(m.type, function(msg)
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,1)--记录抽卡次数
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1,{RecruitType.Single,RecruitType.Ten})
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1,{v.btn[bType.Btn1].type,v.btn[bType.Btn10].type})
|
||||
end,v.privilegeId)
|
||||
end
|
||||
if state==0 and d[1] ==16 and not isFree then
|
||||
|
@ -232,7 +232,7 @@ function this.UpdatePanelData()
|
|||
local recruitTen = function()
|
||||
RecruitManager.RecruitRequest(m.type, function(msg)
|
||||
PrivilegeManager.RefreshPrivilegeUsedTimes(maxTimesId,10)--记录抽卡次数
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10,{RecruitType.Ten,RecruitType.Ten})
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero, m.type,bType.Btn10,{v.btn[bType.Btn10].type,v.btn[bType.Btn10].type})
|
||||
if m.type == 11 then
|
||||
RecruitManager.isTenRecruit = 1
|
||||
end
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9f6680e5797aa3a4da004c60b970a6d3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,210 @@
|
|||
UpStarPre = {}
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local parent
|
||||
function UpStarPre:New(gameObject)
|
||||
local b = {}
|
||||
b.gameObject = gameObject
|
||||
b.transform = gameObject.transform
|
||||
setmetatable(b, { __index = UpStarPre })
|
||||
return b
|
||||
end
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function UpStarPre:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.title = Util.GetGameObject(self.gameObject, "title"):GetComponent("Text")
|
||||
self.middleLayout = Util.GetGameObject(self.gameObject, "bg/middleLayout")
|
||||
self.btnBuy = Util.GetGameObject(self.middleLayout, "btnBuy"):GetComponent("Button")
|
||||
self.icon = Util.GetGameObject(self.btnBuy.transform, "icon"):GetComponent("Image")
|
||||
self.price = Util.GetGameObject(self.btnBuy.transform, "price"):GetComponent("Text")
|
||||
self.buyInfo = Util.GetGameObject(self.middleLayout, "buyInfo"):GetComponent("Text")
|
||||
self.redPoint = Util.GetGameObject(self.middleLayout, "scroller2/redPoint")
|
||||
self.grid1 = Util.GetGameObject(self.middleLayout, "grid1")
|
||||
self.grid2 = Util.GetGameObject(self.middleLayout, "scroller2/grid2")
|
||||
self.GetBtn = Util.GetGameObject(self.middleLayout, "scroller2/GetBtn"):GetComponent("Button")
|
||||
self.grid3 = Util.GetGameObject(self.middleLayout, "scroller3/grid3")
|
||||
self.grid3 = Util.GetGameObject(self.middleLayout, "scroller3/grid3")
|
||||
self.itemPre = Util.GetGameObject(self.middleLayout, "itemPre")
|
||||
self.itemList = {}
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function UpStarPre:BindEvent()
|
||||
Util.AddOnceClick(self.btnBuy.gameObject, function()
|
||||
LogGreen("self.data.state:"..self.data.state)
|
||||
if self.data.state == 0 then
|
||||
PopupTipPanel.ShowTip("神将达指定星级后解锁")
|
||||
return
|
||||
end
|
||||
--直购商品
|
||||
PayManager.Pay(self.data.giftId, function(id)
|
||||
self:SetBtn()
|
||||
end)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(self.GetBtn.gameObject, function()
|
||||
NetManager.GetActivityRewardRequest(self.data.missionId,self.actData.activityId,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1)
|
||||
self.data.state = 2
|
||||
self:SetBtn1()
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
--购买点击事件
|
||||
function UpStarPre:BuyAction(costId, costNum, shopType, itemId)
|
||||
local haveNum = BagManager.GetItemCountById(costId)
|
||||
local costName = ConfigManager.GetConfigData(ConfigName.ItemConfig, costId).Name
|
||||
--Log("需要消耗的道具ID" .. costId)
|
||||
if haveNum < costNum then
|
||||
NotEnoughPopup:Show(costId)
|
||||
else
|
||||
local func = function(shopType, itemId)
|
||||
ShopManager.RequestBuyShopItem(shopType, itemId, 1, function()
|
||||
self.parent:RefreshData(nil,false,false)
|
||||
CheckRedPointStatus(RedPointType.DailyGift)
|
||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||
if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1108 )then
|
||||
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666)
|
||||
end
|
||||
end)
|
||||
end
|
||||
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. shopType)
|
||||
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
|
||||
if (isPopUp ~= currentTime and costNum ~= 0) then
|
||||
local str = string.format(Language[11360], costNum, costName)
|
||||
MsgPanel.ShowTwo(str, function()
|
||||
end, function(isShow)
|
||||
if (isShow) then
|
||||
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
|
||||
RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. shopType, currentTime)
|
||||
end
|
||||
func(shopType, itemId)
|
||||
end,
|
||||
Language[10731],
|
||||
Language[10732],
|
||||
nil,
|
||||
true)
|
||||
else
|
||||
func(shopType, itemId)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function UpStarPre:AddListener()
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function UpStarPre:RemoveListener()
|
||||
|
||||
end
|
||||
function UpStarPre:OnOpen()
|
||||
end
|
||||
function UpStarPre:SetData(singleData,_parent,sortingOrder,actData,actConfig)
|
||||
self.data = singleData
|
||||
self.parent = _parent
|
||||
self.actData = actData
|
||||
self.sortingOrder = sortingOrder
|
||||
--设置礼包内容
|
||||
if not self.itemList then
|
||||
self.itemList = {}
|
||||
end
|
||||
self:SetShows(1,self.data.heroShows, self.grid1)
|
||||
self:SetShows(2,self.data.freeShows, self.grid2)
|
||||
self:SetShows(3,self.data.giftShows, self.grid3)
|
||||
self:SetBtn1()
|
||||
self:SetBtn()
|
||||
end
|
||||
|
||||
function UpStarPre:SetShows(key,shows,parent)
|
||||
if not self.itemList[key] then
|
||||
self.itemList[key] = {}
|
||||
end
|
||||
for i = 1, math.max(#shows,#self.itemList[key]) do
|
||||
if not shows[i] then
|
||||
self.itemList[key][i].gameObject:SetActive(false)
|
||||
else
|
||||
if not self.itemList[key][i] then
|
||||
self.itemList[key][i] = {}
|
||||
self.itemList[key][i].go = newObjToParent(self.itemPre,parent)
|
||||
self.itemList[key][i].lock = Util.GetGameObject(self.itemList[key][i].go, "lock")
|
||||
self.itemList[key][i].Get = Util.GetGameObject(self.itemList[key][i].go, "Get")
|
||||
self.itemList[key][i].Get.gameObject:SetActive(false)
|
||||
if self.data.state == 0 then
|
||||
if key == 1 then
|
||||
self.title.text = string.format("%s星解锁",shows[i][4])
|
||||
end
|
||||
self.itemList[key][i].lock.gameObject:SetActive(true)
|
||||
else
|
||||
self.title.text = ""
|
||||
self.itemList[key][i].lock.gameObject:SetActive(false)
|
||||
end
|
||||
self.itemList[key][i].item = SubUIManager.Open(SubUIConfig.ItemView,self.itemList[key][i].go.transform)
|
||||
self.itemList[key][i].item.transform:SetAsFirstSibling()
|
||||
end
|
||||
self.itemList[key][i].go.gameObject:SetActive(true)
|
||||
self.itemList[key][i].item:OnOpen(false, {shows[i][1],shows[i][2],shows[i][3],shows[i][4]}, 0.85,false,false,false,self.sortingOrder)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function UpStarPre:SetBtn1()
|
||||
for i = 1,#self.itemList[2] do
|
||||
if self.data.state == 2 then
|
||||
self.itemList[2][i].Get.gameObject:SetActive(true)
|
||||
else
|
||||
self.itemList[2][i].Get.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
if self.data.state == 1 then
|
||||
self.GetBtn.enabled = true
|
||||
self.redPoint.gameObject:SetActive(true)
|
||||
else
|
||||
self.GetBtn.enabled = false
|
||||
self.redPoint.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
local State = {
|
||||
[0] = {sprte = "l_libao_anniu"},
|
||||
[1] = {sprte = "s_slbz_1anniuongse"},
|
||||
[2] = {sprte = "s_slbz_1anniuhuise"},
|
||||
}
|
||||
|
||||
function UpStarPre:SetBtn()
|
||||
self.btnBuy.gameObject:SetActive(true)
|
||||
self.data.giftData = OperatingManager.GetGiftGoodsInfo(self.data.giftConfig.Type,self.data.giftConfig.Id)
|
||||
self.icon.gameObject:SetActive(false)
|
||||
self.btnBuy.enabled = true
|
||||
|
||||
self.price.text = MoneyUtil.GetMoneyUnitNameWithMoney(self.data.giftConfig.Price)
|
||||
self.buyInfo.text = string.format("限购%s次",self.data.giftConfig.Limit)
|
||||
if self.data.giftData.buyTimes > 0 then
|
||||
self.buyInfo.text = ""
|
||||
self.price.text = "已购买"
|
||||
self.btnBuy.enabled = false
|
||||
self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[2].sprte)
|
||||
else
|
||||
if self.data.state == 0 then
|
||||
self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[0].sprte)
|
||||
else
|
||||
self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[1].sprte)
|
||||
end
|
||||
end
|
||||
ForceRebuildLayout(self.btnBuy.transform)
|
||||
end
|
||||
|
||||
function UpStarPre:OnClose()
|
||||
for k,v in pairs(self.itemList) do
|
||||
for n,m in ipairs(v) do
|
||||
SubUIManager.Close(m.item)
|
||||
end
|
||||
end
|
||||
Util.ClearChild(self.grid1.transform)
|
||||
Util.ClearChild(self.grid2.transform)
|
||||
Util.ClearChild(self.grid3.transform)
|
||||
self.itemList = {}
|
||||
end
|
||||
return UpStarPre
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b96bb51d3d28d0542bde0dbff0bb436f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9f6680e5797aa3a4da004c60b970a6d3
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -310,6 +310,7 @@ function this:SetData(dataList, updateFunc, noTop, noAnim)
|
|||
self.dataCount = #dataList
|
||||
self.isPlayAnim = not noAnim
|
||||
|
||||
--计算grid偏移长度和偏移item个数
|
||||
if self.dragType == 1 then
|
||||
self.itemDis = self.itemHeight * math.ceil(self.dataCount / self.fixedCount) + self.spacing.y - self.rectTransform.sizeDelta.y
|
||||
self.maxOffset = math.max(math.ceil(self.dataCount / self.fixedCount) - self.itemCount, 0)
|
||||
|
|
Loading…
Reference in New Issue