Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
|
|
Before Width: | Height: | Size: 79 KiB |
Before Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 75 KiB |
After Width: | Height: | Size: 14 KiB |
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 2e03071f3e620d241a3439bde8ba3453
|
guid: 5384b4c5c22fb1a4f846bedd1bf86fde
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
fileIDToRecycleName: {}
|
fileIDToRecycleName: {}
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
@ -97,7 +97,7 @@ TextureImporter:
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: d48395a3effab354a883d2574653e7c9
|
spriteID: b07970a93a837ff4ca176c21cd81eddc
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
After Width: | Height: | Size: 64 KiB |
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 9e60a3548ceca1046a069fcfe47b8673
|
guid: ea0f0fc36e477b44997389385a004711
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
fileIDToRecycleName: {}
|
fileIDToRecycleName: {}
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
@ -97,7 +97,7 @@ TextureImporter:
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 881cccb357080b74380b489197de00f9
|
spriteID: f171e513042b1cd4eb0d41d2ce814153
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
After Width: | Height: | Size: 14 KiB |
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: ceaeea42216fca6409eeb6997b4eadc9
|
guid: 727a2f69bb6279e4c96cb2d0be2e2fa5
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
fileIDToRecycleName: {}
|
fileIDToRecycleName: {}
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
@ -97,7 +97,7 @@ TextureImporter:
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 30eda43a61b31e14dbacef57139f7333
|
spriteID: 999cc615fe8ec4b429efce9e33e3df17
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
Before Width: | Height: | Size: 74 KiB |
After Width: | Height: | Size: 14 KiB |
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 0975df3762e027e468ab30888144247b
|
guid: 3e6289532129ab5448419ce42830dd29
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
fileIDToRecycleName: {}
|
fileIDToRecycleName: {}
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
@ -97,7 +97,7 @@ TextureImporter:
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 8612d9307dcf124419a4f94fcd563283
|
spriteID: 5ac63b6a612d6024da4a677458d54238
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
After Width: | Height: | Size: 14 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: dbfe666fe04b0cb4ebca030cc658e439
|
||||||
|
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: 6db63d1a97ac69b45a53b48340c203af
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: TeHuiShenZhuangAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -94,6 +94,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8541848192336793676}
|
- {fileID: 8541848192336793676}
|
||||||
|
- {fileID: 5912818896432541691}
|
||||||
- {fileID: 1127203027444313718}
|
- {fileID: 1127203027444313718}
|
||||||
m_Father: {fileID: 898193909354494019}
|
m_Father: {fileID: 898193909354494019}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
|
@ -142,7 +143,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 4957794194947264391}
|
m_Father: {fileID: 4957794194947264391}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
@ -401,6 +402,86 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!1 &3133122158697389110
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3383171814414968218}
|
||||||
|
- component: {fileID: 6298772290171829105}
|
||||||
|
- component: {fileID: 4108224001695914233}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &3383171814414968218
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3133122158697389110}
|
||||||
|
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: 1421605945814085954}
|
||||||
|
m_RootOrder: 0
|
||||||
|
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_SizeDelta: {x: 0, y: 0}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6298772290171829105
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3133122158697389110}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4108224001695914233
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3133122158697389110}
|
||||||
|
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.9811321, g: 0.7448591, b: 0.58775365, 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: 30
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: "3\u65E5\u540E\u53EF\u8D2D"
|
||||||
|
LanguageIndex: 0
|
||||||
--- !u!1 &3344270230499337201
|
--- !u!1 &3344270230499337201
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -586,6 +667,81 @@ MonoBehaviour:
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A3\u592908\u65F634\u5206"
|
m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A3\u592908\u65F634\u5206"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
--- !u!1 &3827661607881630473
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1421605945814085954}
|
||||||
|
- component: {fileID: 2568250143643158960}
|
||||||
|
- component: {fileID: 4987627675543419895}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: bugDay
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1421605945814085954
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3827661607881630473}
|
||||||
|
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: 3383171814414968218}
|
||||||
|
m_Father: {fileID: 4957794194947264391}
|
||||||
|
m_RootOrder: 2
|
||||||
|
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: 325, y: -45}
|
||||||
|
m_SizeDelta: {x: 200, y: 50}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &2568250143643158960
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3827661607881630473}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &4987627675543419895
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3827661607881630473}
|
||||||
|
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: ced8e30fcd084ab4bb18323d9b3183de, 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 &4487168350906758530
|
--- !u!1 &4487168350906758530
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -734,6 +890,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6483765514905861047}
|
- {fileID: 6483765514905861047}
|
||||||
- {fileID: 6692387534291180301}
|
- {fileID: 6692387534291180301}
|
||||||
|
- {fileID: 1421605945814085954}
|
||||||
- {fileID: 7053404110353968548}
|
- {fileID: 7053404110353968548}
|
||||||
- {fileID: 311860523735992108}
|
- {fileID: 311860523735992108}
|
||||||
m_Father: {fileID: 898193909354494019}
|
m_Father: {fileID: 898193909354494019}
|
||||||
|
@ -1007,11 +1164,11 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 8788889948934153483}
|
- {fileID: 8788889948934153483}
|
||||||
m_Father: {fileID: 4957794194947264391}
|
m_Father: {fileID: 4957794194947264391}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 330, y: 0}
|
m_AnchoredPosition: {x: 330, y: -10}
|
||||||
m_SizeDelta: {x: 190, y: 70}
|
m_SizeDelta: {x: 190, y: 70}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8407601103703489248
|
--- !u!222 &8407601103703489248
|
||||||
|
@ -1274,12 +1431,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 8445008542788981736}
|
m_Father: {fileID: 8445008542788981736}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 105}
|
m_AnchoredPosition: {x: -140, y: 22}
|
||||||
m_SizeDelta: {x: 605, y: 279}
|
m_SizeDelta: {x: 337, y: 88}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3653481042276158261
|
--- !u!222 &3653481042276158261
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -1309,7 +1466,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: ceaeea42216fca6409eeb6997b4eadc9, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 5384b4c5c22fb1a4f846bedd1bf86fde, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -1578,6 +1735,80 @@ Animator:
|
||||||
m_HasTransformHierarchy: 1
|
m_HasTransformHierarchy: 1
|
||||||
m_AllowConstantClipSamplingOptimization: 1
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
m_KeepAnimatorControllerStateOnDisable: 0
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
|
--- !u!1 &8246592375605331194
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5912818896432541691}
|
||||||
|
- component: {fileID: 853793127770573958}
|
||||||
|
- component: {fileID: 6497572054124041234}
|
||||||
|
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 &5912818896432541691
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8246592375605331194}
|
||||||
|
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: 8445008542788981736}
|
||||||
|
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: 105}
|
||||||
|
m_SizeDelta: {x: 593, y: 279}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &853793127770573958
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8246592375605331194}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &6497572054124041234
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8246592375605331194}
|
||||||
|
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: ea0f0fc36e477b44997389385a004711, 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 &8878934143957947337
|
--- !u!1 &8878934143957947337
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -24845,19 +24845,23 @@ MonoBehaviour:
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 135
|
resPathIndex: 135
|
||||||
resAbNameIndex: 78
|
resAbNameIndex: 78
|
||||||
- resName: t_tehuishenzhuang_fatiaomichengzi_zh
|
- resName: t_tehuishenzhuang_suiwukong_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 136
|
resPathIndex: 136
|
||||||
resAbNameIndex: 78
|
resAbNameIndex: 78
|
||||||
- resName: t_tehuishenzhuang_huangtubazhuzi_zh
|
- resName: t_tehuishenzhuang_thsz_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 136
|
resPathIndex: 136
|
||||||
resAbNameIndex: 78
|
resAbNameIndex: 78
|
||||||
- resName: t_tehuishenzhuang_moxindijunzi_zh
|
- resName: t_tehuishenzhuang_tongtian_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 136
|
resPathIndex: 136
|
||||||
resAbNameIndex: 78
|
resAbNameIndex: 78
|
||||||
- resName: t_tehuishenzhuang_wujixingzhezi_zh
|
- resName: t_tehuishenzhuang_yuhuangdadi_zh
|
||||||
|
extension: .png
|
||||||
|
resPathIndex: 136
|
||||||
|
resAbNameIndex: 78
|
||||||
|
- resName: t_tehuishenzhuang_zhubajie_zh
|
||||||
extension: .png
|
extension: .png
|
||||||
resPathIndex: 136
|
resPathIndex: 136
|
||||||
resAbNameIndex: 78
|
resAbNameIndex: 78
|
||||||
|
@ -57445,14 +57449,6 @@ MonoBehaviour:
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 594
|
resPathIndex: 594
|
||||||
resAbNameIndex: 3834
|
resAbNameIndex: 3834
|
||||||
- resName: "\u7F25\u7F08\u4E4B\u65C5"
|
|
||||||
extension: .jpg
|
|
||||||
resPathIndex: 594
|
|
||||||
resAbNameIndex: 3834
|
|
||||||
- resName: "\u900D\u9065\u6E38\u5165\u53E3"
|
|
||||||
extension: .jpg
|
|
||||||
resPathIndex: 594
|
|
||||||
resAbNameIndex: 3834
|
|
||||||
- resName: JumpView
|
- resName: JumpView
|
||||||
extension: .prefab
|
extension: .prefab
|
||||||
resPathIndex: 595
|
resPathIndex: 595
|
||||||
|
|
|
@ -141,9 +141,9 @@ function this.InitActivityServerData(msg, isUpdate)
|
||||||
this.CheckMoneyProgress(v)
|
this.CheckMoneyProgress(v)
|
||||||
this.mission[v.activityId] = 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
|
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
|
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
||||||
this.onlineOpen = true
|
this.onlineOpen = true
|
||||||
this.onlineGetRewardState[m.missionId] = m.state
|
this.onlineGetRewardState[m.missionId] = m.state
|
||||||
|
@ -1350,7 +1350,7 @@ function this.JourneyWithWindCurDayNoOpen()
|
||||||
for i = 1, #curJourneyWithWindAllDayConFigData do
|
for i = 1, #curJourneyWithWindAllDayConFigData do
|
||||||
if curDay >= curJourneyWithWindAllDayConFigData[i].Values[1][2] then
|
if curDay >= curJourneyWithWindAllDayConFigData[i].Values[1][2] then
|
||||||
local curRedPointState = this.GetJourneyWithWindPlayerPrefs(curJourneyWithWindAllDayConFigData[i].Values[1][2])
|
local curRedPointState = this.GetJourneyWithWindPlayerPrefs(curJourneyWithWindAllDayConFigData[i].Values[1][2])
|
||||||
if curRedPointState == 0 then
|
if tonumber(curRedPointState) == 0 then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -125,7 +125,7 @@ function PatFacePanel:OnShow()
|
||||||
end
|
end
|
||||||
function PatFacePanel:OnShowPatFaceData()
|
function PatFacePanel:OnShowPatFaceData()
|
||||||
if patFaceSingleData then
|
if patFaceSingleData then
|
||||||
LogGreen("patFaceSingleData.Type:"..patFaceSingleData.Type)
|
-- LogGreen("patFaceSingleData.Type:"..patFaceSingleData.Type)
|
||||||
self.obg1:SetActive(patFaceSingleData.Type == FacePanelType.Sbtj)
|
self.obg1:SetActive(patFaceSingleData.Type == FacePanelType.Sbtj)
|
||||||
self.obg2:SetActive(patFaceSingleData.Type == FacePanelType.Tesc)
|
self.obg2:SetActive(patFaceSingleData.Type == FacePanelType.Tesc)
|
||||||
self.obg3:SetActive(patFaceSingleData.Type == FacePanelType.GuildFight or patFaceSingleData.Type == FacePanelType.Championship)
|
self.obg3:SetActive(patFaceSingleData.Type == FacePanelType.GuildFight or patFaceSingleData.Type == FacePanelType.Championship)
|
||||||
|
|
|
@ -124,22 +124,23 @@ function this.SingleDayBtnDataShow(_go,data,index)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if not redState then
|
if not redState and curDay >= data.Values[1][2] then
|
||||||
redState = ActivityGiftManager.GetJourneyWithWindPlayerPrefs(data.Values[1][2]) == 0
|
redState = tonumber(ActivityGiftManager.GetJourneyWithWindPlayerPrefs(data.Values[1][2])) == 0
|
||||||
end
|
end
|
||||||
redPoint:SetActive(redState)
|
redPoint:SetActive(redState)
|
||||||
|
--上方按钮一个高一个低
|
||||||
if index%2 == 0 then
|
if index%2 == 0 then
|
||||||
go.transform.anchoredPosition = Vector3.New(3.05,23,0)
|
go.transform.anchoredPosition = Vector3.New(3.05,23,0)
|
||||||
else
|
else
|
||||||
go.transform.anchoredPosition = Vector3.New(3.05,176.09,0)
|
go.transform.anchoredPosition = Vector3.New(3.05,176.09,0)
|
||||||
end
|
end
|
||||||
if data.Values[1][2] == curDayIndex then
|
if data.Values[1][2] == curDayIndex then--初始化按钮选中状态
|
||||||
this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform)
|
this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform)
|
||||||
this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0)
|
this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0)
|
||||||
|
redPoint:SetActive(false)
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(go, function()
|
Util.AddOnceClick(go, function()
|
||||||
this.ShowDayData(data.Values[1][2])
|
this.ShowDayData(data.Values[1][2])--点击按钮刷新界面
|
||||||
this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform)
|
this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform)
|
||||||
this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0)
|
this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0)
|
||||||
end)
|
end)
|
||||||
|
@ -164,7 +165,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
end
|
end
|
||||||
--组当前所有任务的后端数据
|
--组当前所有任务的后端数据
|
||||||
local AllTaskData = TaskManager.GetTypeTaskList(TaskTypeDef.JourneyWithWind)
|
local AllTaskData = TaskManager.GetTypeTaskList(TaskTypeDef.JourneyWithWind)
|
||||||
for i = 1, #curDayAllTaskGos-2 do
|
for i = 1, #curDayAllTaskGos-2 do--curDayAllTaskGos-2 是因为上方任务至多只有五个 其余两个 一个是活动奖励 一个是礼包
|
||||||
if curDayAllTaskConFigData[i] then
|
if curDayAllTaskConFigData[i] then
|
||||||
curDayAllTaskGos[i]:SetActive(true)
|
curDayAllTaskGos[i]:SetActive(true)
|
||||||
Util.GetGameObject(curDayAllTaskGos[i], "pre1"):SetActive(true)
|
Util.GetGameObject(curDayAllTaskGos[i], "pre1"):SetActive(true)
|
||||||
|
@ -178,7 +179,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
local headName = Util.GetGameObject(curDayAllTaskGos[i], "headImage/name")
|
local headName = Util.GetGameObject(curDayAllTaskGos[i], "headImage/name")
|
||||||
headName:GetComponent("Text").text = curDayAllTaskConFigData[i].HeadName
|
headName:GetComponent("Text").text = curDayAllTaskConFigData[i].HeadName
|
||||||
local size = headName:GetComponent("RectTransform").sizeDelta
|
local size = headName:GetComponent("RectTransform").sizeDelta
|
||||||
if string.len(curDayAllTaskConFigData[i].HeadName) >= 15 then
|
if string.len(curDayAllTaskConFigData[i].HeadName) >= 15 then--每条任务的最前方标题 文字字节长度大于等于15个字节(五个字) text 要变宽否则显示不对
|
||||||
size.x = 130.3
|
size.x = 130.3
|
||||||
headName.transform.sizeDelta = size
|
headName.transform.sizeDelta = size
|
||||||
else
|
else
|
||||||
|
@ -188,7 +189,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
btnFinish:SetActive(false)
|
btnFinish:SetActive(false)
|
||||||
btnJump:SetActive(false)
|
btnJump:SetActive(false)
|
||||||
buyInfo.text = ""
|
buyInfo.text = ""
|
||||||
local curMissionData
|
local curMissionData--获取对应天数的后端活动数据
|
||||||
for j = 1, #AllTaskData do
|
for j = 1, #AllTaskData do
|
||||||
if AllTaskData[j].missionId == curDayAllTaskConFigData[i].Id then
|
if AllTaskData[j].missionId == curDayAllTaskConFigData[i].Id then
|
||||||
curMissionData = AllTaskData[j]
|
curMissionData = AllTaskData[j]
|
||||||
|
@ -196,7 +197,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
end
|
end
|
||||||
if curMissionData then
|
if curMissionData then
|
||||||
local isOpen = false
|
local isOpen = false
|
||||||
if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then
|
if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫 特殊判断 大闹天宫有 休息期 但不能显示关闭
|
||||||
if ActTimeCtrlManager.SingleFuncState(curDayAllTaskConFigData[i].SystemId) then
|
if ActTimeCtrlManager.SingleFuncState(curDayAllTaskConFigData[i].SystemId) then
|
||||||
isOpen = true
|
isOpen = true
|
||||||
else
|
else
|
||||||
|
@ -214,6 +215,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
isOpenLock = curDay >= curDayIndex
|
isOpenLock = curDay >= curDayIndex
|
||||||
Util.SetGray(btnJump,false)
|
Util.SetGray(btnJump,false)
|
||||||
if isOpenLock then--到天数
|
if isOpenLock then--到天数
|
||||||
|
btnJump.transform.anchoredPosition = Vector3.New(262.41,44.5,0)
|
||||||
Util.SetGray(btnJump,false)
|
Util.SetGray(btnJump,false)
|
||||||
btnJumpText.text = "前往"
|
btnJumpText.text = "前往"
|
||||||
btnJump:GetComponent("Button").enabled = true
|
btnJump:GetComponent("Button").enabled = true
|
||||||
|
@ -225,7 +227,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
btnJump:GetComponent("Button").enabled = true
|
btnJump:GetComponent("Button").enabled = true
|
||||||
buyInfo.text = string.format("%s/%s",progress,curDayAllTaskConFigData[i].TaskValue[2][1])
|
buyInfo.text = string.format("%s/%s",progress,curDayAllTaskConFigData[i].TaskValue[2][1])
|
||||||
Util.AddOnceClick(btnJump, function()
|
Util.AddOnceClick(btnJump, function()
|
||||||
if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then
|
if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫点击前往做特殊判断 也许是之前的跳转接口写的不合理 之后优化
|
||||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
|
||||||
if #ExpeditionManager.nodeInfo <= 0 then
|
if #ExpeditionManager.nodeInfo <= 0 then
|
||||||
if ExpeditionManager.expeditionLeve == -1 then
|
if ExpeditionManager.expeditionLeve == -1 then
|
||||||
|
@ -261,11 +263,12 @@ function this.ShowDayData(_curDayIndex)
|
||||||
btnJump:SetActive(true)
|
btnJump:SetActive(true)
|
||||||
Util.SetGray(btnJump,true)
|
Util.SetGray(btnJump,true)
|
||||||
btnJump:GetComponent("Button").enabled = false
|
btnJump:GetComponent("Button").enabled = false
|
||||||
if curDayAllTaskConFigData[i].TaskType ~= 14 then
|
if curDayAllTaskConFigData[i].TaskType ~= 14 then--除了战力 其他任务当对应功能不开启是要显示开启条件
|
||||||
buyInfo.text = string.format(Language[11903],ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,curDayAllTaskConFigData[i].SystemId).OpenRules[2])
|
buyInfo.text = string.format(Language[11903],ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,curDayAllTaskConFigData[i].SystemId).OpenRules[2])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else--未到天数
|
else--未到天数
|
||||||
|
btnJump.transform.anchoredPosition = Vector3.New(262.41,27.2,0)
|
||||||
btnJump:SetActive(true)
|
btnJump:SetActive(true)
|
||||||
Util.SetGray(btnJump,true)
|
Util.SetGray(btnJump,true)
|
||||||
btnJumpText.text = "未开启"
|
btnJumpText.text = "未开启"
|
||||||
|
@ -276,7 +279,7 @@ function this.ShowDayData(_curDayIndex)
|
||||||
curDayAllTaskGos[i]:SetActive(false)
|
curDayAllTaskGos[i]:SetActive(false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.ShowDayDataActivityReward()--位置1 不变
|
this.ShowDayDataActivityReward()--位置1 不变 因为该方法会对界面上的一些数据赋值
|
||||||
this.ShowDayDataGiftBag()--位置2 不变
|
this.ShowDayDataGiftBag()--位置2 不变
|
||||||
CheckRedPointStatus(RedPointType.JourneyWithWind)
|
CheckRedPointStatus(RedPointType.JourneyWithWind)
|
||||||
end
|
end
|
||||||
|
@ -438,7 +441,6 @@ end
|
||||||
|
|
||||||
--活动到期自动关闭
|
--活动到期自动关闭
|
||||||
function this.AutoClose()
|
function this.AutoClose()
|
||||||
LogYellow("sssssssssssssssssssssssssss")
|
|
||||||
if this.timer then
|
if this.timer then
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
this.timer = nil
|
this.timer = nil
|
||||||
|
|
|
@ -1318,6 +1318,7 @@ function this:OnClose()
|
||||||
this.ChatTipView:StopCheck()
|
this.ChatTipView:StopCheck()
|
||||||
PatFaceManager.isLogin = false
|
PatFaceManager.isLogin = false
|
||||||
FixedUpdateBeat:Remove(this.OnUpdate, self)
|
FixedUpdateBeat:Remove(this.OnUpdate, self)
|
||||||
|
PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0)
|
||||||
|
|
||||||
for k,v in ipairs(activitys) do
|
for k,v in ipairs(activitys) do
|
||||||
if v.RpType > 0 then
|
if v.RpType > 0 then
|
||||||
|
|
|
@ -183,6 +183,7 @@ local TypeUpdateFunc = {
|
||||||
curData.rewards[i].otherData.Reward = rechargeConfig[configData[j].PackId].RewardShow
|
curData.rewards[i].otherData.Reward = rechargeConfig[configData[j].PackId].RewardShow
|
||||||
curData.rewards[i].otherData.Price = rechargeConfig[configData[j].PackId].Price
|
curData.rewards[i].otherData.Price = rechargeConfig[configData[j].PackId].Price
|
||||||
curData.rewards[i].otherData.skinArtId = tonumber(configData[1].Warning)
|
curData.rewards[i].otherData.skinArtId = tonumber(configData[1].Warning)
|
||||||
|
curData.rewards[i].otherData.canBuyDay = configData[j].BuyDay - curData.value
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,11 +5,11 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||||
|
|
||||||
local textName = {
|
local textName = {
|
||||||
[1100023] = "t_tehuishenzhuang_wujixingzhezi_zh",
|
[1100023] = "t_tehuishenzhuang_suiwukong_zh",--孙悟空
|
||||||
[1100026] = "t_tehuishenzhuang_wujixingzhezi_zh",
|
[1100026] = "t_tehuishenzhuang_suiwukong_zh",--青阳先知
|
||||||
[1100003] = "t_tehuishenzhuang_huangtubazhuzi_zh",
|
[1100003] = "t_tehuishenzhuang_zhubajie_zh",--猪八戒
|
||||||
[1100041] = "t_tehuishenzhuang_fatiaomichengzi_zh",
|
[1100041] = "t_tehuishenzhuang_tongtian_zh",--通天
|
||||||
[1110026] = "t_tehuishenzhuang_moxindijunzi_zh",
|
[1110026] = "t_tehuishenzhuang_yuhuangdadi_zh",--玉皇大帝
|
||||||
}
|
}
|
||||||
|
|
||||||
function TeHuiShenZhuang:InitComponent()
|
function TeHuiShenZhuang:InitComponent()
|
||||||
|
@ -108,6 +108,8 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index)
|
||||||
local btnGet = Util.GetGameObject(go, "btnGet")
|
local btnGet = Util.GetGameObject(go, "btnGet")
|
||||||
local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text")
|
local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text")
|
||||||
local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image")
|
local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image")
|
||||||
|
local buyDayImg = Util.GetGameObject(go, "bugDay")
|
||||||
|
local buyDayText = Util.GetGameObject(buyDayImg, "Text"):GetComponent("Text")
|
||||||
|
|
||||||
if not self.itemViewList[go] then
|
if not self.itemViewList[go] then
|
||||||
self.itemViewList[go] = {}
|
self.itemViewList[go] = {}
|
||||||
|
@ -124,15 +126,20 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index)
|
||||||
self.itemViewList[go][i].gameObject:SetActive(true)
|
self.itemViewList[go][i].gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- LogBlue("data.progress:"..tostring(data.progress))
|
||||||
Util.SetGray(btnGet,false)
|
Util.SetGray(btnGet,false)
|
||||||
btnText.text = string.format("%s 元",data.otherData.Price)
|
btnText.text = string.format("%s 元",data.otherData.Price)
|
||||||
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuangse")
|
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuangse")
|
||||||
|
buyDayImg:SetActive(false)
|
||||||
if data.progress == 8 then
|
if data.progress == 8 then
|
||||||
-- Util.SetGray(btnGet,true)
|
|
||||||
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise")
|
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise")
|
||||||
btnText.text = Language[10514]
|
btnText.text = Language[10514]
|
||||||
elseif data.progress == 3 then
|
elseif data.progress == 3 then
|
||||||
Util.SetGray(btnGet,true)
|
Util.SetGray(btnGet,true)
|
||||||
|
elseif data.progress == 2 then
|
||||||
|
Util.SetGray(btnGet,true)
|
||||||
|
buyDayImg:SetActive(true)
|
||||||
|
buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- LogYellow("PackId:"..tostring(data.otherData.PackId).." progress:"..tostring(data.progress))
|
-- LogYellow("PackId:"..tostring(data.otherData.PackId).." progress:"..tostring(data.progress))
|
||||||
|
@ -146,6 +153,8 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index)
|
||||||
end)
|
end)
|
||||||
elseif data.progress == 3 then
|
elseif data.progress == 3 then
|
||||||
PopupTipPanel.ShowTip("请先购买上一礼包,即可解锁此礼包")
|
PopupTipPanel.ShowTip("请先购买上一礼包,即可解锁此礼包")
|
||||||
|
elseif data.progress == 2 then
|
||||||
|
PopupTipPanel.ShowTip("礼包尚未开启,请耐心等待")
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|