Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
altair 2020-07-31 16:43:53 +08:00
commit 00d93db9a0
44 changed files with 932 additions and 140 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 5e56034e791ba6845b2953af19a6094e
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: 65
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: 876ec22fc30871a4bb9163a9520136fd
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1023 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: af24995ce8952084689378f0e528a3c1
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: 65
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: a6c38484d4c443c49aca64910c1256ec
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_BaoXiang_KaiQi
m_Name: UI_Effect_BaoXiang_KaiQi_anim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

View File

@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_BaoXiang_KaiQi
m_Name: UI_Effect_BaoXiang_KaiQi_controller
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:

View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_BaoXiang_KeKaiQi
m_Name: UI_Effect_BaoXiang_KeKaiQi_anim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

View File

@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_BaoXiang_KeKaiQi
m_Name: UI_Effect_BaoXiang_KeKaiQi_controller
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:

View File

@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_MuBiaoJiangLi
m_Name: UI_Effect_MuBiaoJiangLi_anim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0

View File

@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_MuBiaoJiangLi
m_Name: UI_Effect_MuBiaoJiangLi_controller
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

@ -5159,7 +5159,7 @@ ParticleSystem:
--- !u!199 &184376518157790514
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -5441,7 +5441,7 @@ GameObject:
m_Component:
- component: {fileID: 4031480724156183028}
m_Layer: 0
m_Name: jinkuang_F
m_Name: UI_Effect_jinkuang_Fang
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -5455,7 +5455,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7411879508304079121}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 13.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8065807428910082887}

View File

@ -318,7 +318,7 @@ GameObject:
m_Component:
- component: {fileID: 5567165471173432844}
m_Layer: 0
m_Name: jinkuang_y
m_Name: UI_Effect_jinkuang_Yuan
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -332,7 +332,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8304511335248722024}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 13.14, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7222181705061978563}
@ -5036,7 +5036,7 @@ ParticleSystem:
--- !u!199 &5105490566854265685
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -32652,6 +32652,8 @@ RectTransform:
m_Children:
- {fileID: 1722228994943412400}
- {fileID: 8932174648870152767}
- {fileID: 7435107096703076180}
- {fileID: 5229327487652136945}
m_Father: {fileID: 476257756925467703}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -33596,3 +33598,163 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &3056895200256708952
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1048911378777473197}
m_Modifications:
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Yuan
objectReference: {fileID: 0}
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &7435107096703076180 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
m_PrefabInstance: {fileID: 3056895200256708952}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9178617512094922245
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1048911378777473197}
m_Modifications:
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Fang
objectReference: {fileID: 0}
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37188270916d7b7408c84c2a0cb12583, type: 3}
--- !u!4 &5229327487652136945 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
m_PrefabInstance: {fileID: 9178617512094922245}
m_PrefabAsset: {fileID: 0}

View File

@ -414,7 +414,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224189031716679638
RectTransform:
m_ObjectHideFlags: 0
@ -671,7 +671,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: c8a7bbe03159b5740b037f865201e8a1, type: 3}
m_Sprite: {fileID: 21300000, guid: 5e56034e791ba6845b2953af19a6094e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -16173,7 +16173,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9635\u8425\u62DB\u52DF"
m_Text: "\u9635\u8425\u53EC\u5524"
LanguageIndex: 11450
--- !u!1 &538543657769229325
GameObject:
@ -18891,7 +18891,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -322, z: 0}
initFloat: 0
@ -20649,7 +20648,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9635\u8425\u62DB\u52DF"
m_Text: "\u9635\u8425\u53EC\u5524"
LanguageIndex: 11450
--- !u!1 &3447059933404493099
GameObject:
@ -21755,7 +21754,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u9053</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u9053\u7CFB</color>\u795E\u5C06\u788E\u7247"
LanguageIndex: 11466
--- !u!1 &3781271057767658244
GameObject:
@ -22080,7 +22079,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u4EBA</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u4EBA\u7CFB</color>\u795E\u5C06\u788E\u7247"
LanguageIndex: 11453
--- !u!1 &4043850152873593602
GameObject:
@ -22891,7 +22890,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -322, z: 0}
initFloat: 0
@ -23651,7 +23649,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: -3.434689, y: 12, z: 0}
initFloat: 0
@ -24426,7 +24423,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9635\u8425\u62DB\u52DF"
m_Text: "\u9635\u8425\u53EC\u5524"
LanguageIndex: 11450
--- !u!1 &5651944146330559363
GameObject:
@ -25086,7 +25083,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -322, z: 0}
initFloat: 0
@ -25870,7 +25866,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -322, z: 0}
initFloat: 0
@ -26706,7 +26701,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u5996</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u5996\u7CFB</color>\u795E\u5C06\u788E\u7247"
LanguageIndex: 11463
--- !u!1 &6650934384093044872
GameObject:
@ -28421,7 +28416,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9635\u8425\u62DB\u52DF"
m_Text: "\u9635\u8425\u53EC\u5524"
LanguageIndex: 11450
--- !u!1 &7754298523838717437
GameObject:
@ -30150,7 +30145,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u4F5B</color>\u795E\u5C06\u788E\u7247"
m_Text: "\u5FC5\u5F97<color=#EDB54B>\u4F5B\u7CFB</color>\u795E\u5C06\u788E\u7247"
LanguageIndex: 11461
--- !u!1 &8802956011602851032
GameObject:
@ -30618,7 +30613,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -322, z: 0}
initFloat: 0

View File

@ -1898,6 +1898,8 @@ RectTransform:
- {fileID: 6573067987443095579}
- {fileID: 3272840524650202765}
- {fileID: 6279721960944316623}
- {fileID: 7533824977119023141}
- {fileID: 6822847915724204026}
m_Father: {fileID: 7067338063007427630}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -11755,3 +11757,153 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1001 &1435851651643453942
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8631541041216753082}
m_Modifications:
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Yuan
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.y
value: 21.87
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &6822847915724204026 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
m_PrefabInstance: {fileID: 1435851651643453942}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6881280042598195665
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8631541041216753082}
m_Modifications:
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Fang
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.y
value: 21.87
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37188270916d7b7408c84c2a0cb12583, type: 3}
--- !u!4 &7533824977119023141 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
m_PrefabInstance: {fileID: 6881280042598195665}
m_PrefabAsset: {fileID: 0}

View File

@ -269,6 +269,8 @@ RectTransform:
- {fileID: 8808130799805535666}
- {fileID: 1979535601783682996}
- {fileID: 1506869744052423658}
- {fileID: 6413746877044610869}
- {fileID: 7959772851805406131}
m_Father: {fileID: 696394995362861503}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -57102,3 +57104,153 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1001 &2536723149168580031
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1580137090183896780}
m_Modifications:
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Yuan
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.y
value: 13.14
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &7959772851805406131 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
m_PrefabInstance: {fileID: 2536723149168580031}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7994037319527704257
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1580137090183896780}
m_Modifications:
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Fang
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.y
value: 13.14
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37188270916d7b7408c84c2a0cb12583, type: 3}
--- !u!4 &6413746877044610869 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
m_PrefabInstance: {fileID: 7994037319527704257}
m_PrefabAsset: {fileID: 0}

View File

@ -39315,6 +39315,8 @@ RectTransform:
- {fileID: 224027329797975584}
- {fileID: 818230658854329258}
- {fileID: 5600153691064848650}
- {fileID: 2199886401291512776}
- {fileID: 7987541132360792074}
m_Father: {fileID: 224797861638971062}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -73197,3 +73199,163 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1001 &2565918367008648710
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4523474928375603261}
m_Modifications:
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Yuan
objectReference: {fileID: 0}
- target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3}
--- !u!4 &7987541132360792074 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c,
type: 3}
m_PrefabInstance: {fileID: 2565918367008648710}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2987332810791492156
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4523474928375603261}
m_Modifications:
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_Name
value: UI_Effect_jinkuang_Fang
objectReference: {fileID: 0}
- target: {fileID: 7411879508304079121, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 37188270916d7b7408c84c2a0cb12583, type: 3}
--- !u!4 &2199886401291512776 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4031480724156183028, guid: 37188270916d7b7408c84c2a0cb12583,
type: 3}
m_PrefabInstance: {fileID: 2987332810791492156}
m_PrefabAsset: {fileID: 0}

View File

@ -1,77 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Default-Diffuse
m_Shader: {fileID: 4800000, guid: 1cf234f48b286c5458c446aca9ea60c7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 5767ccb512d02d54683df9c2a2ca0c8b
timeCreated: 1505447278
licenseType: Free
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,9 +1,9 @@
fileFormatVersion: 2
guid: 1cf234f48b286c5458c446aca9ea60c7
timeCreated: 1505447125
licenseType: Free
guid: e7bf6a1d8e2243541998f5f11ea4284e
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
userData:
assetBundleName:
assetBundleVariant:

View File

@ -642,7 +642,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224780206786005530
RectTransform:
m_ObjectHideFlags: 0
@ -824,7 +824,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: c8a7bbe03159b5740b037f865201e8a1, type: 3}
m_Sprite: {fileID: 21300000, guid: 5e56034e791ba6845b2953af19a6094e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -513,7 +513,7 @@
[10512] = "挑 战",
[10513] = "天 兵",
[10514] = "天 将",
[10515] = "巨灵神",
[10515] = "大罗金仙",
[10516] = "请选择要招募的神将!",
[10517] = "招 募",
[10518] = "确定放弃购买本店商品?",

View File

@ -1453,6 +1453,21 @@ function SetRankNumFrame(rankNum)
return icon
end
function SetSoulEffect(quality,root)
local effect = Util.GetGameObject(root,"UI_Effect_Kuang_JinSe")
local effect1 = Util.GetGameObject(root,"UI_Effect_jinkuang_Fang")
local effect2 = Util.GetGameObject(root,"UI_Effect_jinkuang_Yuan")
if quality >= 7 then
effect1.gameObject:SetActive(true)
effect2.gameObject:SetActive(true)
effect.gameObject:SetActive(false)
else
effect1.gameObject:SetActive(false)
effect2.gameObject:SetActive(false)
effect.gameObject:SetActive(true)
end
end
--- 本方法适用滚动条中 生成item的使用 主要适用每条滚动条item数量不定的滚动条中
--- itemview重设复用 1根节点 2生成到父节点 3item容器 4容器上限 5缩放 6层级 7根据数据类型生成 8不定参数据...
--- type=true 针对表数据为一维数据 type=false 针对表数据为二维数据

View File

@ -257,6 +257,15 @@ function this.SingleItemDataShow(_go, _itemData)
Util.GetGameObject(_go.gameObject, "GameObject/item/circleFrameBg"):SetActive(false)
Util.GetGameObject(_go.gameObject, "GameObject/name"):GetComponent("Text").text = _itemData.itemConfig.Name
local upHeroInage = Util.GetGameObject(_go.transform, "GameObject/item/upHeroInage")
local UI_Effect_jinkuang_Fang = Util.GetGameObject(_go.transform, "GameObject/effects/UI_Effect_jinkuang_Fang")
if(UI_Effect_jinkuang_Fang) then
UI_Effect_jinkuang_Fang:SetActive(false)
end
local UI_Effect_jinkuang_Yuan = Util.GetGameObject(_go.transform, "GameObject/effects/UI_Effect_jinkuang_Yuan")
if(UI_Effect_jinkuang_Yuan) then
UI_Effect_jinkuang_Yuan:SetActive(false)
end
local UI_Effect_Kuang_JinSe = Util.GetGameObject(_go.transform, "GameObject/effects/UI_Effect_Kuang_JinSe")
if(UI_Effect_Kuang_JinSe) then
UI_Effect_Kuang_JinSe:SetActive(false)
@ -338,14 +347,14 @@ function this.SingleItemDataShow(_go, _itemData)
end
Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):SetActive(true)
Util.GetGameObject(_go.transform, "GameObject/item/fragmentIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[_itemData.itemConfig.Id].PropertyName))
elseif _itemData.itemConfig.ItemType == ItemType.HunYin then
elseif _itemData.itemConfig.ItemType == ItemType.HunYin then
SetSoulEffect(itemConfig[_itemData.itemConfig.Id].Quantity,Util.GetGameObject(_go.transform, "GameObject/effects"))
Util.GetGameObject(_go.transform, "GameObject/item/resetLv"):SetActive(false)
Util.GetGameObject(_go.gameObject, "GameObject/item/icon"):SetActive(false)
Util.GetGameObject(_go.gameObject, "GameObject/item/circleFrameBg"):SetActive(true)
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circleBg2)
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/Icon"):GetComponent("Image").sprite=Util.LoadSprite(_itemData.icon)
Util.GetGameObject(_go.gameObject,"GameObject/item/circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[_itemData.itemConfig.Id].Quantity].circle)
UI_Effect_Kuang_JinSe.gameObject:SetActive(true)
num:SetActive(false)
end
end

View File

@ -160,7 +160,7 @@ function CarbonTypePanelV2:BindEvent()
else
data = type[PlayerManager.carbonType][k]
end
if data.redPointType ~= -1 then
if data.redPointType ~= -1 and data.redPointType then
BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
end
end

View File

@ -117,6 +117,7 @@ function this.SingleInfoDataShow(go,data)
heroGo:SetActive(true)
local curHeroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig,data.teamInfo[i].heroTid)
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroConfig.Icon))
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(curHeroConfig.PropertyName))
Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(nil,data.teamInfo[i].star))
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), data.teamInfo[i].star)
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text=data.teamInfo[i].level

View File

@ -70,7 +70,7 @@ end
function SoulPrintHandBook:OnSortingOrderChange()
--特效层级重设
for i=1,#list do
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer)
Util.SetParticleSortLayer(list[i], this.sortingOrder+1)
end
orginLayer = self.sortingOrder
end
@ -115,13 +115,14 @@ function this.OnRefresh(index)
--特效层级重设
for i=1,#list do
Util.AddParticleSortLayer(list[i], this.sortingOrder - orginLayer2)
Util.SetParticleSortLayer(list[i], this.sortingOrder+1)
end
orginLayer2 = this.sortingOrder
orginLayer = this.sortingOrder
end
--设置预设
function this.SetScrollPre(root,data)
SetSoulEffect(data.Quality,root)
local frame=Util.GetGameObject(root,"Frame"):GetComponent("Image")
local icon=Util.GetGameObject(root,"circleFrameBg/Icon"):GetComponent("Image")
local name=Util.GetGameObject(root,"Name"):GetComponent("Text")

View File

@ -7,8 +7,6 @@ local equipConfig=ConfigManager.GetConfig(ConfigName.EquipConfig)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local equipSignSetting = ConfigManager.GetConfig(ConfigName.EquipSignSetting)
local orginLayer=0
--循环布局容器
local loopList={}
--最大槽位数量
@ -32,8 +30,6 @@ local isShow=true--默认显示装备中的魂印
local _specialData={}
local list={}
local orginLayer2 = 0
function SoulPrintPanel:InitComponent()
this.upView = SubUIManager.Open(SubUIConfig.UpView, this.gameObject.transform, { showType = UpViewOpenType.ShowLeft})
this.helpBtn= Util.GetGameObject(this.gameObject, "HelpBtn")
@ -112,13 +108,11 @@ end
function SoulPrintPanel:RemoveListener()
end
local orginLayer = 0
function SoulPrintPanel:OnSortingOrderChange()
--特效层级重设
for i=1,#list do
Util.AddParticleSortLayer(list[i], self.sortingOrder - orginLayer)
Util.SetParticleSortLayer(list[i], self.sortingOrder)
end
orginLayer = self.sortingOrder
end
function SoulPrintPanel:OnOpen(_curHeroData,_heroDatas)
@ -168,8 +162,6 @@ function SoulPrintPanel:OnDestroy()
this.scrollView=nil
loopList={}
list={}
orginLayer2=0
orginLayer=0
end
--点击左
@ -332,15 +324,13 @@ function this.SetScrollData()
end)
--特效层级重设
for i=1,#list do
Util.AddParticleSortLayer(list[i], this.sortingOrder- orginLayer2)
Util.SetParticleSortLayer(list[i], this.sortingOrder)
end
orginLayer2 = this.sortingOrder
orginLayer = this.sortingOrder
this.scrollView:SetIndex(1)
end
--设置魂印列表预设
function this.SetScrollPre(root,data)
local effect = Util.GetGameObject(root,"UI_Effect_Kuang_JinSe")
function this.SetScrollPre(root,data)
SetSoulEffect(equipConfig[data.id].Quality,root)
local frame=Util.GetGameObject(root,"Frame"):GetComponent("Image")
local icon=Util.GetGameObject(root,"Icon"):GetComponent("Image")

View File

@ -49,6 +49,8 @@ function ItemView:InitComponent()
self.itemEffectPartical = Util.GetGameObject(self.itemEffect, "ziti mask"):GetComponent(typeof(UnityEngine.ParticleSystem))
self.UI_Effect_Kuang_JinSe = Util.GetGameObject(self.gameObject, "effects/UI_Effect_Kuang_JinSe")
self.UI_Effect_Kuang_HongSe = Util.GetGameObject(self.gameObject, "effects/UI_Effect_Kuang_HongSe")
self.UI_Effect_jinkuang_Fang = Util.GetGameObject(self.gameObject, "effects/UI_Effect_jinkuang_Fang")
self.UI_Effect_jinkuang_Yuan = Util.GetGameObject(self.gameObject, "effects/UI_Effect_jinkuang_Yuan")
self.UI_effect_ItemView_saoguang = Util.GetGameObject(self.gameObject, "effects/UI_effect_ItemView_saoguang")
self.UI_effect_WuCai_Kuang = Util.GetGameObject(self.gameObject, "effects/UI_effect_WuCai_Kuang")
@ -110,6 +112,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.item:SetActive(true)
self.UI_Effect_Kuang_JinSe:SetActive(false)
self.UI_Effect_Kuang_HongSe:SetActive(false)
self.UI_Effect_jinkuang_Fang:SetActive(false)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_effect_ItemView_saoguang:SetActive(false)
self.UI_effect_WuCai_Kuang:SetActive(false)
self.PreciousShow:SetActive(false)
@ -122,6 +126,8 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
self.name:GetComponent("Text").text = _itemData.configData.Name
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Fang, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Yuan, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_ItemView_saoguang, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_WuCai_Kuang, effectLayer - self.EffectOrginLayerQu)
self.EffectOrginLayerQu = effectLayer
@ -221,6 +227,11 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
end
--魂印
elseif _itemData.configData.ItemType == ItemType.HunYin then
if effectLayer > 0 then
self.UI_Effect_jinkuang_Fang:SetActive(_itemData.configData.Quantity == 7)
self.UI_Effect_jinkuang_Yuan:SetActive(_itemData.configData.Quantity == 7)
self.UI_Effect_Kuang_JinSe:SetActive(not _itemData.configData.Quantity == 7)
end
self.iconGo:SetActive(false)
self.circleFrameBg:SetActive(true)
self.circleFrameBg:GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[_itemData.configData.Quantity].circleBg2)
@ -302,6 +313,8 @@ end
function ItemView:SetEffectLayer(effectLayer)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Yuan, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Fang, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_ItemView_saoguang, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_WuCai_Kuang, effectLayer - self.EffectOrginLayerQu)
@ -327,6 +340,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.innateImage:SetActive(false)
self.UI_Effect_Kuang_JinSe:SetActive(false)
self.UI_Effect_Kuang_HongSe:SetActive(false)
self.UI_Effect_jinkuang_Fang:SetActive(false)
self.UI_Effect_jinkuang_Yuan:SetActive(false)
self.UI_effect_ItemView_saoguang:SetActive(false)
self.UI_effect_WuCai_Kuang:SetActive(false)
self.PreciousShow:SetActive(false)
@ -334,6 +349,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
self.circleFrameBg:SetActive(false)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Fang, effectLayer - self.EffectOrginLayerQu )
Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Yuan, effectLayer - self.EffectOrginLayerQu )
Util.AddParticleSortLayer(self.UI_effect_ItemView_saoguang, effectLayer - self.EffectOrginLayerQu)
Util.AddParticleSortLayer(self.UI_effect_WuCai_Kuang, effectLayer - self.EffectOrginLayerQu)
self.EffectOrginLayerQu = effectLayer
@ -468,6 +485,9 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,"",itemSId,0,0)
end)
elseif itemDataConFig.ItemType == ItemType.HunYin then
self.UI_Effect_jinkuang_Fang:SetActive(itemConfig[itemSId].Quantity>=7)
self.UI_Effect_jinkuang_Yuan:SetActive(itemConfig[itemSId].Quantity>=7)
self.UI_Effect_Kuang_JinSe:SetActive(not itemConfig[itemSId].Quantity>=7)
self.num:SetActive(true)
self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.iconGo:SetActive(false)

View File

@ -512,7 +512,7 @@
10512,挑 战
10513,天 兵
10514,天 将
10515,╬чаИиЯ
10515,大罗金仙
10516,请选择要招募的神将!
10517,招 募
10518,确定放弃购买本店商品?

1 10001 没有ActivityTypeDef为%s任务Id为%s的数据
512 10512 挑 战
513 10513 天 兵
514 10514 天 将
515 10515 巨灵神 大罗金仙
516 10516 请选择要招募的神将!
517 10517 招 募
518 10518 确定放弃购买本店商品?