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

dev_chengFeng
jiaoyangna 2022-01-14 17:59:05 +08:00
commit ea69ec6643
19 changed files with 559 additions and 132 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e08e760df004e40449bb795636b86a73
guid: 533854eb1b8d3e241beede53b4167593
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -86,7 +86,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: a8c260b32093a8a45a2096049f9b9184
spriteID: a88191cd02eea1f4ea19a0e0eb4b84de
vertices: []
indices:
edges: []

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: da96344839376de469dea909ba9588b4
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 75fedfff795ca884daf5752f955d4deb
vertices: []
indices:
edges: []
weights: []
spritePackingTag: HomeLandAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 2d66149bce2b33545afd47bc0cf5f9ba
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: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b37f578422198264eaa605ad52e0eb63
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: a133061624f7ab041b6c1ca271853319
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: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 4f3fb37d915b9754ba9c5b954aa395a0
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -12745,7 +12745,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u6D6E\u751F\u95E8\u5404\u8D44\u6E90\u5EFA\u7B51\uFF08\u7389\u6E05\u5C45\u3001\u7948\u798F\u658B\u3001\u671B\u6708\u5C45\uFF09\u4EA7\u91CF<color=#00CCFF>\u589E\u52A020%</color>"
m_Text: "\u6D1E\u5E9C\u5404\u8D44\u6E90\u5EFA\u7B51\uFF08\u7389\u6E05\u5C45\u3001\u7948\u798F\u658B\u3001\u671B\u6708\u5C45\uFF09\u4EA7\u91CF<color=#00CCFF>\u589E\u52A020%</color>"
LanguageIndex: 0
--- !u!1 &9055556018580535638
GameObject:

View File

@ -3052,7 +3052,7 @@ 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: e08e760df004e40449bb795636b86a73, type: 3}
m_Sprite: {fileID: 21300000, guid: 533854eb1b8d3e241beede53b4167593, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -8624,7 +8624,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@ -24227,6 +24227,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7126930402637738260}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -24332,11 +24337,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@ -24357,6 +24357,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7328121124282680815}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -24462,11 +24467,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@ -24767,6 +24767,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2929527279963613486}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -24872,11 +24877,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@ -25037,6 +25037,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8115893985862711295}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -25142,11 +25147,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@ -25307,6 +25307,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4567849875460340345}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -25412,11 +25417,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@ -25437,6 +25437,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2787930079669500062}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -25542,11 +25547,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime
@ -25567,6 +25567,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7843093090422364795}
m_Modifications:
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943637, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_LocalPosition.x
@ -25672,11 +25677,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943658, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: m_Name
value: c_shengji
objectReference: {fileID: 0}
- target: {fileID: 3677848703117943659, guid: a6cc70e042b2945428c2e6bb5f80ded1,
type: 3}
propertyPath: delayTime

View File

@ -74,80 +74,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &412219405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 412219406}
- component: {fileID: 412219408}
- component: {fileID: 412219407}
m_Layer: 5
m_Name: di
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &412219406
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 412219405}
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: 6100468993864897443}
m_RootOrder: 1
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 &412219408
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 412219405}
m_CullTransparentMesh: 0
--- !u!114 &412219407
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 412219405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ebe3fcbf206dfdb4591ae523498366cc, 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 &531690776
GameObject:
m_ObjectHideFlags: 0
@ -335,7 +261,7 @@ RectTransform:
- {fileID: 2124249695}
- {fileID: 8162072501622411793}
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -687,7 +613,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -848,7 +774,7 @@ RectTransform:
- {fileID: 6322198127485678409}
- {fileID: 801832922018237753}
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@ -889,7 +815,7 @@ RectTransform:
- {fileID: 753002028}
- {fileID: 1241315938}
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -1771,7 +1697,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1892,7 +1818,7 @@ RectTransform:
m_Children:
- {fileID: 731539000061373980}
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@ -1968,7 +1894,7 @@ RectTransform:
- {fileID: 1289564337433559313}
- {fileID: 2156384405716919073}
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -2117,7 +2043,7 @@ RectTransform:
m_Children:
- {fileID: 7588739653103211287}
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -2462,7 +2388,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1595442151499135104}
- {fileID: 412219406}
- {fileID: 1125464669666314855}
- {fileID: 7687680957590466058}
- {fileID: 5928475536814580870}
@ -2566,7 +2491,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -2700,7 +2625,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -2780,7 +2705,7 @@ 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: ebe3fcbf206dfdb4591ae523498366cc, type: 3}
m_Sprite: {fileID: 21300000, guid: d9eb47e7e33ca8a4aa13a0de17b927ab, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2818,7 +2743,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6100468993864897443}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -635,7 +635,7 @@ 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: 857c2a13063298f42bd9fa82cee9e6bb, type: 3}
m_Sprite: {fileID: 21300000, guid: a133061624f7ab041b6c1ca271853319, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -79253,7 +79253,7 @@ 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: 857c2a13063298f42bd9fa82cee9e6bb, type: 3}
m_Sprite: {fileID: 21300000, guid: a133061624f7ab041b6c1ca271853319, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -79327,7 +79327,7 @@ 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: cf9207026c0e90440a52de012634a6e8, type: 3}
m_Sprite: {fileID: 21300000, guid: 2d66149bce2b33545afd47bc0cf5f9ba, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -334,7 +334,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 361.65, y: -0.00004781601}
m_AnchoredPosition: {x: 361.65, y: -0.000024327841}
m_SizeDelta: {x: 723.3, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &7575507291051525301
@ -1021,6 +1021,114 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u603B\u597D\u611F\u5EA6\u8BE6\u60C5"
--- !u!1 &6373281428889468089
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8863066759887306331}
- component: {fileID: 4076802643779648760}
- component: {fileID: 2063618818738508488}
- component: {fileID: 8628305858574940229}
m_Layer: 5
m_Name: emptyBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8863066759887306331
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6373281428889468089}
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: 7723528773779627565}
m_RootOrder: 4
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: 166.9}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4076802643779648760
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6373281428889468089}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 8628305858574940229}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!222 &2063618818738508488
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6373281428889468089}
m_CullTransparentMesh: 0
--- !u!114 &8628305858574940229
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6373281428889468089}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &6434621879045362286
GameObject:
m_ObjectHideFlags: 0
@ -1227,6 +1335,7 @@ RectTransform:
- {fileID: 9090717114976058863}
- {fileID: 7479768761916316215}
- {fileID: 5601896589029272011}
- {fileID: 8863066759887306331}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -973,6 +973,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4664733373664257448}
- component: {fileID: 1006335373756226833}
- component: {fileID: 5629987156951340734}
- component: {fileID: 3467222186231562738}
m_Layer: 5
m_Name: likeability
m_TagString: Untagged
@ -1004,6 +1007,76 @@ RectTransform:
m_AnchoredPosition: {x: 39.224964, y: -212.9}
m_SizeDelta: {x: 588, y: 185.80005}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1006335373756226833
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4863201152149951662}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!222 &5629987156951340734
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4863201152149951662}
m_CullTransparentMesh: 0
--- !u!114 &3467222186231562738
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4863201152149951662}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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
--- !u!1 &5761760000363587408
GameObject:
m_ObjectHideFlags: 0

View File

@ -50,7 +50,7 @@ end
function this:Refresh()
this.text1.text = "浮生门各资源建筑(玉清居、祈福斋、望月居)产量<color=#00CCFF>增加20%</color>"
this.text1.text = "洞府各资源建筑(玉清居、祈福斋、望月居)产量<color=#00CCFF>增加20%</color>"
this.text2.text = "每日可使用<color=#00CCFF>五次特权加速</color>功能,每次可减少<color=#00CCFF>8小时</color>建筑升级时间"
this.leftTime.text = "购买后持续30天"

View File

@ -460,6 +460,7 @@ function HomeLand:SetTime()
self.timer:Stop()
self.timer = nil
end
Util.SetGray(self.Privi,not HomeLandManager.activePrivilege)
self.timer = Timer.New(function ()
for i = 1, 7 do
local curObj = self.mapData[i]