Merge branch 'china/dev' into china/test
commit
f0eadfcc1f
Binary file not shown.
After Width: | Height: | Size: 6.6 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 909d86c5b4ed8474488ce2fc5988098d
|
||||
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: d2fa80adef9bb3242b546da2ca520a98
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ContinuePackageAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 33 KiB |
Binary file not shown.
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 37 KiB |
|
@ -877,6 +877,7 @@ GameObject:
|
|||
- component: {fileID: 2807132439773654813}
|
||||
- component: {fileID: 2752680468297073756}
|
||||
- component: {fileID: 2373637757759864707}
|
||||
- component: {fileID: 5860914955678384178}
|
||||
m_Layer: 5
|
||||
m_Name: PremiumRebatePanel
|
||||
m_TagString: Untagged
|
||||
|
@ -952,6 +953,35 @@ MonoBehaviour:
|
|||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &5860914955678384178
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3344270230499337201}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 1
|
||||
duration: 0.5
|
||||
delay: 0
|
||||
curveType: 1
|
||||
changeType: 6
|
||||
sequeueType: 1
|
||||
loop: 999999999
|
||||
loopType: 1
|
||||
targetObj: {fileID: 1645606937427718578}
|
||||
isPlayAudio: 0
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 1
|
||||
--- !u!1 &3531134784355024491
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1918,6 +1948,7 @@ RectTransform:
|
|||
- {fileID: 8892065666247826579}
|
||||
- {fileID: 6793231540162019059}
|
||||
- {fileID: 5560347858770598648}
|
||||
- {fileID: 1645606937427718578}
|
||||
m_Father: {fileID: 898193909354494019}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -2321,3 +2352,77 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &8376498154863378935
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1645606937427718578}
|
||||
- component: {fileID: 9158256653194201226}
|
||||
- component: {fileID: 7781005891451146957}
|
||||
m_Layer: 0
|
||||
m_Name: jiantou
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1645606937427718578
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8376498154863378935}
|
||||
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: 2750471745573935426}
|
||||
m_RootOrder: 5
|
||||
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: -576}
|
||||
m_SizeDelta: {x: 130, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9158256653194201226
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8376498154863378935}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7781005891451146957
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8376498154863378935}
|
||||
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: 304cd1273b4e17b44818e6d598d13b88, 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
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,5 +1,238 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &165871465322044537
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 579990698813903240}
|
||||
- component: {fileID: 6893279032159293529}
|
||||
- component: {fileID: 2140233659468740611}
|
||||
m_Layer: 5
|
||||
m_Name: biao
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &579990698813903240
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 165871465322044537}
|
||||
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: 7374145610324046197}
|
||||
m_Father: {fileID: 3791396217607456270}
|
||||
m_RootOrder: 11
|
||||
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: 34.5, y: 54.9}
|
||||
m_SizeDelta: {x: 86, y: 81}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6893279032159293529
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 165871465322044537}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2140233659468740611
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 165871465322044537}
|
||||
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: 747d14fdddeabe849a23bdcd1f842a36, 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 &270656210758368113
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7532368488307755623}
|
||||
- component: {fileID: 5882769089582098663}
|
||||
- component: {fileID: 3664728721786942037}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7532368488307755623
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 270656210758368113}
|
||||
m_LocalRotation: {x: 0, y: 0, z: -0.42261827, w: 0.9063079}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 0}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1406645877631359141}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -50}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 14, y: 10}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5882769089582098663
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 270656210758368113}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3664728721786942037
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 270656210758368113}
|
||||
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.9811321, g: 0.9765041, b: 0.9765041, 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: 28
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6BCF\u65E5"
|
||||
--- !u!1 &1227608086361689964
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7374145610324046197}
|
||||
- component: {fileID: 194899867183076464}
|
||||
- component: {fileID: 5901010946991524896}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7374145610324046197
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1227608086361689964}
|
||||
m_LocalRotation: {x: 0, y: 0, z: -0.42261827, w: 0.9063079}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 0}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 579990698813903240}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -50}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 14, y: 10}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &194899867183076464
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1227608086361689964}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5901010946991524896
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1227608086361689964}
|
||||
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.9811321, g: 0.9765041, b: 0.9765041, 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: 28
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 2
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6BCF\u65E5"
|
||||
--- !u!1 &3791396216791875709
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5371,6 +5604,7 @@ RectTransform:
|
|||
- {fileID: 3791396217285779111}
|
||||
- {fileID: 3791396218904049447}
|
||||
- {fileID: 3791396218334099713}
|
||||
- {fileID: 579990698813903240}
|
||||
m_Father: {fileID: 3791396217625106201}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -10609,6 +10843,7 @@ RectTransform:
|
|||
- {fileID: 3791396218347241701}
|
||||
- {fileID: 3791396217156366685}
|
||||
- {fileID: 3791396216811415863}
|
||||
- {fileID: 1406645877631359141}
|
||||
m_Father: {fileID: 3791396217625106201}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -12141,3 +12376,78 @@ MonoBehaviour:
|
|||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 100
|
||||
--- !u!1 &6839139221153078043
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1406645877631359141}
|
||||
- component: {fileID: 468484622902192640}
|
||||
- component: {fileID: 8226670258982094547}
|
||||
m_Layer: 5
|
||||
m_Name: biao
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1406645877631359141
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6839139221153078043}
|
||||
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: 7532368488307755623}
|
||||
m_Father: {fileID: 3791396218678684741}
|
||||
m_RootOrder: 11
|
||||
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: 37, y: 54.9}
|
||||
m_SizeDelta: {x: 86, y: 81}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &468484622902192640
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6839139221153078043}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8226670258982094547
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6839139221153078043}
|
||||
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: 747d14fdddeabe849a23bdcd1f842a36, 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
|
||||
|
|
|
@ -45909,10 +45909,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8745500966058890751}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 288.1, y: -36}
|
||||
m_SizeDelta: {x: 576.2, y: 52}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 576.2, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2191657263790240596
|
||||
CanvasRenderer:
|
||||
|
@ -56799,7 +56799,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.000061035156, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3258353433143064439
|
||||
|
@ -118686,10 +118686,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8745500966058890751}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 447.65, y: -76}
|
||||
m_SizeDelta: {x: 895.3, y: 8}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 895.3, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &363556481547668153
|
||||
CanvasRenderer:
|
||||
|
@ -128971,7 +128971,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 445.6, y: 0}
|
||||
m_SizeDelta: {x: 895.3, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &8905667472897453265
|
||||
|
@ -145420,7 +145420,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1549860457780133200}
|
||||
- component: {fileID: 7597314396372242402}
|
||||
- component: {fileID: 8507986511942172936}
|
||||
- component: {fileID: 6187611945246833468}
|
||||
- component: {fileID: 1436966084049090}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -145455,7 +145456,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4464243573478910246}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8507986511942172936
|
||||
--- !u!114 &6187611945246833468
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -145464,26 +145465,46 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 4464243573478910246}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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: 84339bb0a60d75c4ab0fd48b2d1560d1, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u653B\u51FB"
|
||||
--- !u!114 &1436966084049090
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4464243573478910246}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &4495502587210141345
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -156947,7 +156968,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 6848636282436687757}
|
||||
- component: {fileID: 5461549979047203409}
|
||||
- component: {fileID: 9104030264580846323}
|
||||
- component: {fileID: 2923840273986290607}
|
||||
- component: {fileID: 2202434730088966459}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -156982,7 +157004,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4983378044185300859}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &9104030264580846323
|
||||
--- !u!114 &2923840273986290607
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -156991,26 +157013,46 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 4983378044185300859}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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: ad0f5f9498990d742b3bc9841bcb43c6, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u751F\u547D"
|
||||
--- !u!114 &2202434730088966459
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4983378044185300859}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &4988248785908532981
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -157081,10 +157123,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2560409808489270275}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 315, y: -125}
|
||||
m_SizeDelta: {x: 200, y: 250}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4373769112107159852
|
||||
CanvasRenderer:
|
||||
|
@ -172770,7 +172812,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 5676896853051129791}
|
||||
- component: {fileID: 5733108088040500839}
|
||||
- component: {fileID: 5461724688297916331}
|
||||
- component: {fileID: 566918965348543126}
|
||||
- component: {fileID: 3647118176439368625}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -172805,7 +172848,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5523773103749311440}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5461724688297916331
|
||||
--- !u!114 &566918965348543126
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -172814,26 +172857,46 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 5523773103749311440}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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: 608b48fcb94423f44b8bf7ba29659fb8, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9B54\u6297"
|
||||
--- !u!114 &3647118176439368625
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5523773103749311440}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &5537776251280413905
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -182925,7 +182988,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: -0.0000183825, y: 10}
|
||||
m_AnchoredPosition: {x: 0.000012053106, y: 10}
|
||||
m_SizeDelta: {x: 0, y: 180}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &3119795391630397554
|
||||
|
@ -193811,7 +193874,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 3846547498436558656}
|
||||
- component: {fileID: 87159593669816329}
|
||||
- component: {fileID: 8347926382364175252}
|
||||
- component: {fileID: 1596339625947520978}
|
||||
- component: {fileID: 5643332513455270830}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -193846,7 +193910,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6144737153897026771}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8347926382364175252
|
||||
--- !u!114 &1596339625947520978
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -193855,7 +193919,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 6144737153897026771}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
@ -193866,15 +193930,35 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: c6d4acc2dd00be940a4e1b5a3c4b1c4e, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u653B\u51FB"
|
||||
--- !u!114 &5643332513455270830
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6144737153897026771}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &6148334638258334628
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -199137,7 +199221,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: -0.0000183825, y: 0}
|
||||
m_AnchoredPosition: {x: 0.000012132633, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 180}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &905777280683595193
|
||||
|
@ -200751,10 +200835,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2560409808489270275}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -105, y: -125}
|
||||
m_SizeDelta: {x: 200, y: 250}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9045290434950231555
|
||||
CanvasRenderer:
|
||||
|
@ -202152,10 +202236,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8745500966058890751}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 447.63, y: -67}
|
||||
m_SizeDelta: {x: 895.26, y: 10}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 895.26, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1711501408100857050
|
||||
MonoBehaviour:
|
||||
|
@ -231543,7 +231627,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 4270187346290888718}
|
||||
- component: {fileID: 6002550861153438278}
|
||||
- component: {fileID: 4336329045105050337}
|
||||
- component: {fileID: 3099854187024009264}
|
||||
- component: {fileID: 7463925271551437861}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -231578,7 +231663,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7623698013413168008}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4336329045105050337
|
||||
--- !u!114 &3099854187024009264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -231587,26 +231672,46 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 7623698013413168008}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, 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: a728a087b58b3d049b0d8a65a0c54c94, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u62A4\u7532"
|
||||
--- !u!114 &7463925271551437861
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7623698013413168008}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &7644969809898739546
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -236494,7 +236599,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7594127661663802055}
|
||||
- component: {fileID: 7538254221350378265}
|
||||
- component: {fileID: 1526677091595015857}
|
||||
- component: {fileID: 1847445907904473962}
|
||||
- component: {fileID: 2800972785953879558}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -236529,7 +236635,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7750395755466817058}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1526677091595015857
|
||||
--- !u!114 &1847445907904473962
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -236538,7 +236644,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 7750395755466817058}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
@ -236549,15 +236655,35 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: dceb25c7707aa4544a7e681fcfac512a, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u62A4\u7532"
|
||||
--- !u!114 &2800972785953879558
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7750395755466817058}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &7757017560230756298
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -237239,7 +237365,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 2890166414308552210}
|
||||
- component: {fileID: 4862278969668264828}
|
||||
- component: {fileID: 6267106279205527431}
|
||||
- component: {fileID: 6096856796735590617}
|
||||
- component: {fileID: 6983163904135063638}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -237274,7 +237401,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7869343109820239539}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6267106279205527431
|
||||
--- !u!114 &6096856796735590617
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -237283,7 +237410,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 7869343109820239539}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
@ -237294,15 +237421,35 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 7930ab6e95d086f4f93dc7f49975c7d2, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9B54\u6297"
|
||||
--- !u!114 &6983163904135063638
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7869343109820239539}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &7870501342288973738
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -237411,10 +237558,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2560409808489270275}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -315, y: -125}
|
||||
m_SizeDelta: {x: 200, y: 250}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3788160343196487560
|
||||
CanvasRenderer:
|
||||
|
@ -253593,7 +253740,8 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 7354994372704771431}
|
||||
- component: {fileID: 3233937543709471850}
|
||||
- component: {fileID: 2449051823820873045}
|
||||
- component: {fileID: 7934249041357686456}
|
||||
- component: {fileID: 3385097034529863116}
|
||||
m_Layer: 0
|
||||
m_Name: Name
|
||||
m_TagString: Untagged
|
||||
|
@ -253628,7 +253776,7 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8620088074397397256}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2449051823820873045
|
||||
--- !u!114 &7934249041357686456
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -253637,7 +253785,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 8620088074397397256}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
|
@ -253648,15 +253796,35 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: a52140f4aa4bf704cb4764724506e8aa, 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
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 5
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u751F\u547D"
|
||||
--- !u!114 &3385097034529863116
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8620088074397397256}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &8641417644596351732
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -254585,10 +254753,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2560409808489270275}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 105, y: -125}
|
||||
m_SizeDelta: {x: 200, y: 250}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6719372695838501122
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -724,7 +724,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1361326202683029318}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
@ -3853,7 +3853,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.8470589, b: 0.48627454, a: 1}
|
||||
m_Color: {r: 0.45882353, g: 0.09411765, b: 0, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -3862,7 +3862,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontSize: 35
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
|
@ -3882,7 +3882,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8151681951545308250}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
|
@ -2860,7 +2860,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "星
|
|||
[35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0},
|
||||
[36] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0},
|
||||
[37] = { bgImage = "", name = "探索排行" ,rankType = RANK_TYPE.ExploreRank,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[38] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1},
|
||||
[38] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 1},
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -8,10 +8,11 @@ local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardCo
|
|||
local TabBox = require("Modules/Common/TabBox")
|
||||
local BTNS = {
|
||||
[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli6,price = 6},
|
||||
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_30yuan",text2 = "c_czfl_30yuan2",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30},
|
||||
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 18},
|
||||
}
|
||||
local curPage = 1
|
||||
local redList = {}
|
||||
local gridPar
|
||||
function PremiumRebatePanel:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.backBtn = Util.GetGameObject(self.gameObject, "closeBtn")
|
||||
|
@ -19,7 +20,8 @@ function PremiumRebatePanel:InitComponent()
|
|||
this.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll")
|
||||
this.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text")
|
||||
this.tabbox = Util.GetGameObject(self.gameObject, "Bg/tabbox")
|
||||
|
||||
Util.GetGameObject(self.gameObject, "Bg/NameBg/Image"):GetComponent("Text").text="超值连充"
|
||||
this.jiantou=Util.GetGameObject(self.gameObject, "Bg/jiantou")
|
||||
local rootHight = this.scrollItem.transform.rect.height
|
||||
local width = this.scrollItem.transform.rect.width
|
||||
this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform,
|
||||
|
@ -27,8 +29,8 @@ function PremiumRebatePanel:InitComponent()
|
|||
this.scrollView.moveTween.MomentumAmount = 1
|
||||
this.scrollView.moveTween.Strength = 2
|
||||
this.scrollView.elastic = false
|
||||
|
||||
this.itemViewList = {}
|
||||
grid=Util.GetGameObject(self.gameObject, "Bg/scroll/ScrollCycleView/grid"):GetComponent("RectTransform")
|
||||
this.sortingOrder = 0
|
||||
end
|
||||
|
||||
|
@ -92,6 +94,8 @@ end
|
|||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function PremiumRebatePanel:OnShow()
|
||||
this:Refresh(true,true)
|
||||
|
||||
FixedUpdateBeat:Add(this.OnUpdate,self)
|
||||
this.PageTabCtrl:Init(this.tabbox.gameObject, BTNS,curPage)
|
||||
end
|
||||
|
||||
|
@ -115,6 +119,18 @@ function PremiumRebatePanel:Refresh(isTop,isAni)
|
|||
this:SetTime()
|
||||
end
|
||||
|
||||
function this.OnUpdate()
|
||||
|
||||
if gridPar~=nil then
|
||||
if gridPar.localPosition and gridPar.localPosition.y>2140 then
|
||||
this.jiantou:SetActive(false)
|
||||
else
|
||||
this.jiantou:SetActive(true)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function PremiumRebatePanel:SetRewardShow(isTop,isAni)
|
||||
-- 显示
|
||||
this.scrollView:SetData(this.actData.mission, function (index, item)
|
||||
|
@ -214,11 +230,13 @@ function PremiumRebatePanel:SetTime()
|
|||
end
|
||||
|
||||
function PremiumRebatePanel:OnClose()
|
||||
--FixedUpdateBeat:Remove(this.OnUpdate,self)
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function PremiumRebatePanel:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
FixedUpdateBeat:Remove(this.OnUpdate,self)
|
||||
this.itemViewList = {}
|
||||
for k,v in pairs(redList) do
|
||||
ClearRedPointObject(k,v)
|
||||
|
|
|
@ -872,11 +872,14 @@ function this.CheckRedPointPremiumSingle(activityType)
|
|||
actType = ActivityTypeDef.chaozhifanli30
|
||||
end
|
||||
local actdata = ActivityGiftManager.GetActivityTypeInfo(actType)
|
||||
for i = 1,#actdata.mission do
|
||||
if actdata.mission[i].state == 0 and actdata.mission[i].progress >= actRewardConfig[actdata.mission[i].missionId].Values[1][1] then
|
||||
return true
|
||||
if actdata then
|
||||
for i = 1,#actdata.mission do
|
||||
if actdata.mission[i].state == 0 and actdata.mission[i].progress >= actRewardConfig[actdata.mission[i].missionId].Values[1][1] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ local sortingOrder = 0
|
|||
local trigger = true
|
||||
local BlessingConfig = ConfigManager.GetConfig(ConfigName.BlessingRewardPoolNew)
|
||||
local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
|
||||
local gridList={}
|
||||
function YiJingBaoKu:New(gameObject)
|
||||
local b = {}
|
||||
b.gameObject = gameObject
|
||||
|
@ -27,6 +27,7 @@ function YiJingBaoKu:InitComponent()
|
|||
self.leftTime = Util.GetGameObject(self.gameObject, "leftUp/time"):GetComponent("Text")
|
||||
--rightUp
|
||||
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
|
||||
self.onekeyBtn=Util.GetGameObject(self.gameObject, "btn_oneKey")
|
||||
self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition
|
||||
self.rewardPre = Util.GetGameObject(self.gameObject, "rightUp/rewardPre")
|
||||
self.zhenqibaogeBtn = Util.GetGameObject(self.gameObject,"rightUp/zqbg")
|
||||
|
@ -46,6 +47,35 @@ end
|
|||
|
||||
--绑定事件(用于子类重写)
|
||||
function YiJingBaoKu:BindEvent()
|
||||
Util.AddOnceClick(self.onekeyBtn, function()
|
||||
if self.ActData.selectId == 0 then
|
||||
PopupTipPanel.ShowTip(Language[10522])
|
||||
return
|
||||
end
|
||||
NetManager.GetActivityRewardRequest(-1,self.ActData.activityId,function (drop)
|
||||
local tempData = self:RebuildAllDrop(drop)
|
||||
--self:SetSingleCardData(index,value,tempData)
|
||||
local thread=coroutine.start(function()
|
||||
coroutine.wait(0.5)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function ()
|
||||
trigger = true
|
||||
local len=#tempData
|
||||
for key, value in pairs(tempData) do
|
||||
if value.sId==BlessingConfig[self.ActData.selectId].Reward[1] then
|
||||
self.finalReward.gameObject:SetActive(false)
|
||||
if self.itemViewList[18] then
|
||||
self.itemViewList[18].gameObject:SetActive(false)
|
||||
else
|
||||
Util.GetGameObject(self._itemsList[18],"front"):GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 0, 0))
|
||||
end
|
||||
end
|
||||
end
|
||||
self:Refresh()
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(self.zhenqibaogeBtn, function()
|
||||
JumpManager.GoJump(40050,nil,self.actId)
|
||||
end)
|
||||
|
@ -99,7 +129,7 @@ function YiJingBaoKu:OnShow(_sortingOrder)
|
|||
sortingOrder = _sortingOrder
|
||||
Util.AddParticleSortLayer(self.effect, sortingOrder + 1)
|
||||
Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder + 1)
|
||||
|
||||
Util.SetParticleSortLayer(self.onekeyBtn, sortingOrder + 1)
|
||||
self.actId = self.actConfig.ActId
|
||||
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
||||
if self.actConfig.IfBack == 1 then
|
||||
|
@ -139,6 +169,7 @@ function YiJingBaoKu:Refresh()
|
|||
else--选择了最终奖励
|
||||
self:ResetCardToBack()--把卡片全部翻到背面
|
||||
self:SetFinalReward()--设置最终奖励
|
||||
gridList={}
|
||||
self:SetCardData()--把抽取过的卡翻过来
|
||||
end
|
||||
self:TimeCountDown()--时间
|
||||
|
@ -161,9 +192,11 @@ end
|
|||
function YiJingBaoKu:SetCardData()
|
||||
for i = 1, #self.ActData.finalCardDatas do
|
||||
local v = self.ActData.finalCardDatas[i]
|
||||
--LogError("v.Id=="..v.Id)
|
||||
if v.rewardId ~= 0 then
|
||||
local item = self._itemsList[i]
|
||||
local cFront = Util.GetGameObject(item, "front")
|
||||
cFront:SetActive(true)
|
||||
local cBack = Util.GetGameObject(item, "back")
|
||||
if not self.itemViewList[i] then
|
||||
self.itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,cFront.transform)
|
||||
|
@ -173,6 +206,8 @@ function YiJingBaoKu:SetCardData()
|
|||
cFront:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 0, 0))
|
||||
cBack:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 90, 0))
|
||||
self.itemViewList[i].gameObject:SetActive(true)
|
||||
else
|
||||
table.insert(gridList,v.Id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -213,7 +248,7 @@ function YiJingBaoKu:AddBackToFrontClick()
|
|||
return
|
||||
end
|
||||
trigger = false
|
||||
-- LogYellow("请求的MissionId:"..self.ActData.finalCardDatas[index].Id)
|
||||
LogYellow("请求的MissionId:"..self.ActData.finalCardDatas[index].Id)
|
||||
NetManager.GetActivityRewardRequest(self.ActData.finalCardDatas[index].Id,self.ActData.activityId,function (drop)
|
||||
local tempData = self:RebuildDrop(drop)
|
||||
self:SetSingleCardData(index,value,tempData)
|
||||
|
@ -250,6 +285,12 @@ function YiJingBaoKu:RebuildDrop(drop)
|
|||
local reward = {tempTable[1].sId,tempTable[1].num}
|
||||
return reward
|
||||
end
|
||||
function YiJingBaoKu:RebuildAllDrop(drop)
|
||||
local tempTable = BagManager.GetTableByBackDropData(drop)
|
||||
return tempTable
|
||||
end
|
||||
|
||||
|
||||
|
||||
--单个翻卡赋值
|
||||
function YiJingBaoKu:SetSingleCardData(index,item,reward)
|
||||
|
|
|
@ -47,7 +47,7 @@ end
|
|||
-- 请求创建公会
|
||||
function GuildManager.RequestCreateGuild(name, announce, func)
|
||||
if not NameManager.CheckStringRight(name) then
|
||||
PopupTipPanel.ShowTip("名字不合法")
|
||||
PopupTipPanel.ShowTip("名称含有敏感字符")
|
||||
return
|
||||
end
|
||||
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD) then
|
||||
|
|
|
@ -371,7 +371,7 @@ end
|
|||
-- 请求修改公会名称
|
||||
function MyGuildManager.RequestChangeGuildName(name, func)
|
||||
if not NameManager.CheckStringRight(name) then
|
||||
PopupTipPanel.ShowTip("名字不合法")
|
||||
PopupTipPanel.ShowTip("名称含有敏感字符")
|
||||
return
|
||||
end
|
||||
local pos = this.GetMyPositionInGuild()
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
local RandomName = ConfigManager.GetConfig(ConfigName.RandomName)
|
||||
local RandomName = ConfigManager.GetConfig(ConfigName.RandomName)
|
||||
local this = {
|
||||
roleName = "",
|
||||
roleSex = ROLE_SEX.BOY
|
||||
|
@ -67,7 +67,7 @@ end
|
|||
--更改玩家姓名
|
||||
function this.ChangeUserName(type, name, teamPosId, sex, callBack)
|
||||
if not this.CheckStringRight(name) then
|
||||
PopupTipPanel.ShowTip("名字不合法")
|
||||
PopupTipPanel.ShowTip("名称含有敏感字符")
|
||||
return
|
||||
end
|
||||
NetManager.ChangeUserNameRequest(type, name, teamPosId, sex, function()
|
||||
|
|
|
@ -189,6 +189,7 @@ function this.SingleRankKingListShow(indexm,id)
|
|||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function RankingListMainPanel:OnClose()
|
||||
CheckRedPointStatus(RedPointType.RankingSort)
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
|
@ -162,7 +162,7 @@ function this.RefreshRedPoint1()
|
|||
--i 是编队类型
|
||||
for i, v in pairs(proud) do
|
||||
if v == 0 and allFirstRankProud[i].uid > 0 and
|
||||
(i == RANK_TYPE.FIGHT_LEVEL_RANK or i == RANK_TYPE.FORCE_CURR_RANK or i == RANK_TYPE.GUILD_FORCE_RANK or i == RANK_TYPE.MONSTER_RANK) then--没有膜拜过 --i <= 4 前四个本服
|
||||
(i == RANK_TYPE.IGHTLEVEL_STAR or i == RANK_TYPE.FORCE_CURR_RANK or i == RANK_TYPE.GUILD_FORCE_RANK or i == RANK_TYPE.MONSTER_RANK) then--没有膜拜过 --i <= 4 前四个本服
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
@ -178,7 +178,7 @@ function this.RefreshRedPoint2()
|
|||
if GetTimeStamp() - PlayerManager.GetServerOpenTime() < 7*24*60*60 or PlayerManager.isCross == 0 then
|
||||
return false
|
||||
end
|
||||
if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ALLRANKING)) then
|
||||
if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.CROSS_RANK)) then
|
||||
local proud = RankingManager.GetRankProud()
|
||||
local allFirstRankProud = RankingManager.GetAllFirstRankProud()
|
||||
if proud and PlayerManager.isCross == 1 then
|
||||
|
|
Loading…
Reference in New Issue