Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
altair
commit
d7fb50a6d6
Binary file not shown.
|
|
@ -1,43 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 263c5ed8ff294014f8bcb6c5772e3fb3
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides:
|
||||
1:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
4:
|
||||
loadType: 2
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
7:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 0
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName: lz4/audio/skill/monster/audio_m_mh_0046__attack_01
|
||||
assetBundleVariant: unity3d
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,22 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 139f29cf9ee4eed468ceb2dbe11b1bb5
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,22 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2530113d163f1be4985362807cb96f15
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,22 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a304c709f92ec07449617872fbef2e0d
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -1,56 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 96c7ea5ce2a2fb748ac03d19fd227d44
|
||||
timeCreated: 1561594742
|
||||
licenseType: Pro
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: .25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 8
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: .5, y: .5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaIsTransparency: 0
|
||||
textureType: -1
|
||||
buildTargetSettings: []
|
||||
spriteSheet:
|
||||
sprites: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 96c7ea5ce2a2fb748ac03d19fd227d44
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
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: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: -1
|
||||
wrapV: -1
|
||||
wrapW: -1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
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: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID:
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1688,9 +1688,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3233073780574710381}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -145, y: -506}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 395, y: 454}
|
||||
m_SizeDelta: {x: 110, y: 110}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5745960901753002478
|
||||
|
|
@ -2014,9 +2014,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3753356304809304800}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 727.30005}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -232.69995}
|
||||
m_SizeDelta: {x: 1080, y: 464}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6616730211952462319
|
||||
|
|
|
|||
|
|
@ -4554,7 +4554,7 @@ ParticleSystem:
|
|||
--- !u!199 &199787422305027156
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -9203,7 +9203,7 @@ ParticleSystem:
|
|||
--- !u!199 &199651780022285358
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -9810,10 +9810,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224946850722905528}
|
||||
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_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1082, y: 1920}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222956124834660840
|
||||
CanvasRenderer:
|
||||
|
|
@ -20763,6 +20763,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
|
|
@ -20773,21 +20778,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!224 &2439878512049275990 stripped
|
||||
|
|
@ -20913,6 +20903,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
|
|
@ -20923,21 +20918,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!224 &3619644963088274231 stripped
|
||||
|
|
@ -21063,6 +21043,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
|
|
@ -21073,21 +21058,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!224 &146967029695260977 stripped
|
||||
|
|
@ -21213,6 +21183,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
|
|
@ -21223,21 +21198,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!224 &214543387327703198 stripped
|
||||
|
|
@ -21363,6 +21323,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
|
|
@ -21373,21 +21338,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!224 &2183158477846000478 stripped
|
||||
|
|
@ -21513,6 +21463,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
|
|
@ -21523,21 +21478,6 @@ PrefabInstance:
|
|||
propertyPath: m_AnchoredPosition.y
|
||||
value: -16.999998
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2320031819088404999, guid: e356d5948e4971f499cfe38db3551f59,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
|
||||
--- !u!224 &7265988832585780969 stripped
|
||||
|
|
|
|||
|
|
@ -3427,9 +3427,9 @@ RectTransform:
|
|||
m_Father: {fileID: 6644219483140430604}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 877}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -83}
|
||||
m_SizeDelta: {x: 1080, y: 88}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7092402891103020477
|
||||
|
|
|
|||
|
|
@ -841,9 +841,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8592434668345412448}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -47.049988}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 508.94995}
|
||||
m_SizeDelta: {x: 912.33, y: 94.19995}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3767449463180278926
|
||||
|
|
@ -2188,10 +2188,10 @@ RectTransform:
|
|||
m_Father: {fileID: 3401751871378385210}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.000017166, y: 15.45}
|
||||
m_SizeDelta: {x: -22.1, y: -242.3}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.000061035156, y: 15.450073}
|
||||
m_SizeDelta: {x: 911.9, y: 1111.7}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6795099458325307553
|
||||
CanvasRenderer:
|
||||
|
|
@ -2310,9 +2310,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8592434668345412448}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 47.099854}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -508.90015}
|
||||
m_SizeDelta: {x: 912.33, y: 94.19995}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1037912112311072140
|
||||
|
|
@ -4070,10 +4070,10 @@ RectTransform:
|
|||
m_Father: {fileID: 8592434668345412448}
|
||||
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.024841}
|
||||
m_SizeDelta: {x: 0, y: -188.35}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0.024902344}
|
||||
m_SizeDelta: {x: 912, y: 923.65}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7846936893575017934
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -341,9 +341,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3437071332606584467}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 32.4, y: 1225}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 32.4, y: 265}
|
||||
m_SizeDelta: {x: 760.3, y: 175.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3218411534631987001
|
||||
|
|
@ -445,10 +445,10 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 1225, z: 0}
|
||||
- initV3: {x: 0, y: 265, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 859, z: 0}
|
||||
changeV3: {x: 0, y: -170, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0
|
||||
delay: 0
|
||||
|
|
|
|||
|
|
@ -1135,7 +1135,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue1:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
|
|
@ -3834,10 +3833,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224557354284231528}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -7.3398438, y: 226.0498}
|
||||
m_SizeDelta: {x: -55, y: 90.1}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -7.3398438, y: -733.9502}
|
||||
m_SizeDelta: {x: 1025, y: 90.099976}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4845597156826803953
|
||||
GameObject:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -12299,7 +12299,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: 13.7, y: -64.1}
|
||||
m_AnchoredPosition: {x: 13.699997, y: -64.1}
|
||||
m_SizeDelta: {x: 116.6, y: 111.86}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5540955272202835278
|
||||
|
|
@ -42970,7 +42970,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: 13.7, y: -64.1}
|
||||
m_AnchoredPosition: {x: 13.699997, y: -64.1}
|
||||
m_SizeDelta: {x: 116.6, y: 111.86}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2691384773931755293
|
||||
|
|
@ -43106,10 +43106,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2689199158799360139}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1082, y: 1920}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2691604319409928151
|
||||
CanvasRenderer:
|
||||
|
|
@ -43482,7 +43482,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -0.000015258789}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2871929161858473383
|
||||
|
|
@ -48803,7 +48803,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: 13.7, y: -64.1}
|
||||
m_AnchoredPosition: {x: 13.699997, y: -64.1}
|
||||
m_SizeDelta: {x: 116.6, y: 111.86}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &322773366483591567
|
||||
|
|
@ -48847,7 +48847,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: 13.7, y: -64.1}
|
||||
m_AnchoredPosition: {x: 13.699997, y: -64.1}
|
||||
m_SizeDelta: {x: 116.6, y: 111.86}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7595774445539253691
|
||||
|
|
@ -49546,9 +49546,9 @@ RectTransform:
|
|||
m_Father: {fileID: 2688693659964828665}
|
||||
m_RootOrder: 8
|
||||
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: 914}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -46}
|
||||
m_SizeDelta: {x: 1082, y: 89}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2336771017392167621
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
|
|
@ -2,7 +2,8 @@ fileFormatVersion: 2
|
|||
guid: 50c51cbce89995f4a80295be1e2456e1
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 4
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
|
|
@ -10,6 +11,8 @@ TextureImporter:
|
|||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
|
|
@ -18,6 +21,8 @@ TextureImporter:
|
|||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
|
|
@ -25,10 +30,13 @@ TextureImporter:
|
|||
textureFormat: -1
|
||||
maxTextureSize: 1024
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
|
|
@ -37,54 +45,77 @@ TextureImporter:
|
|||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
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:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 1024
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
- buildTarget: iPhone
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 256
|
||||
textureFormat: 33
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
- buildTarget: Standalone
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 1024
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 12
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
- buildTarget: Android
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 256
|
||||
textureFormat: 47
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
compressionQuality: 100
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: e4718ba57a0072b47ba64cd3070c6581
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture10
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0cb7686b2cd52b34cafd5cb6cb530285
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture10
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture11
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e6ad25cb53a77df42a5e451bcae4e58b
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture11
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture12
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f0d1cce49f029d540844eca6d903d471
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture12
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture13
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f622d271dc0eac04eb63d0c61f0f1a92
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture13
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture14
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2dea714961236204b9b1cdc84d679e6b
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture14
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture15
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6b0cb3f1e1d33964bbb81ebfd97906e5
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture15
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture16
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f3ec271f44382d645be324be9394a590
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture16
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture17
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5b1f213505e990748a7bcb9cb04fdda1
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture17
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture18
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a90e20355aae16a479c5b4ad46b7ad02
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture18
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture19
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4ddbd1749d6de2f46a8c267c582e874a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture19
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture20
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3a856c9c7c3d07c42ba5a16bd78ba925
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture20
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture7
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 198d3fa5a6361914f929f3bb1091139f
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture7
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture8
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 837aa88fd2584d44698b2eb6bea69247
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture8
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: CardTexture9
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_Width: 640
|
||||
m_Height: 960
|
||||
m_AntiAliasing: 1
|
||||
m_DepthFormat: 2
|
||||
m_ColorFormat: 0
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7a9dc8fe2bfcd2d4d9b8aa9136427896
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName: lz4/rtexture/cardtexture9
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -597,7 +597,7 @@ RedPointType = {
|
|||
ContinuityRecharge = 204,--连续充值
|
||||
VipPrivilege = 205,--特权
|
||||
SevenDayCarnival = 206,--七日狂欢
|
||||
DynamicActivity = 207,--轮转活动 乾坤宝盒 限时召唤
|
||||
DynamicActivity = 208,--轮转活动 乾坤宝盒 限时召唤
|
||||
GiftPage = 2011, -- 礼包
|
||||
DailyGift = 2012, -- 每日礼包
|
||||
HERO_STAR_GIFT = 2013, --- 星级礼包
|
||||
|
|
|
|||
|
|
@ -2244,7 +2244,7 @@
|
|||
[12243] = "不知道",
|
||||
[12244] = "第%s场",
|
||||
[12245] = "历史最高排名：",
|
||||
[12246] = "30级或首充后解锁",
|
||||
[12246] = "30级后解锁",
|
||||
[12247] = "森罗幻境排行",
|
||||
[12248] = "需要上阵%s名%s系神将",
|
||||
[12249] = "今日剩余次数:",
|
||||
|
|
@ -2278,5 +2278,5 @@
|
|||
[12277] = "未查询到符合条件的装备！",
|
||||
[12278] = "%d天%02d时",
|
||||
[12279] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力",
|
||||
[12280] = "该神将在巅峰赛阵容中已上阵",
|
||||
[12280] = "巅峰赛阵容",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ end
|
|||
function PrintWanNum2(num)
|
||||
if num >= 100000000 then
|
||||
return string.format("%.1f", num / 100000000) .. Language[12100]
|
||||
elseif num >= 10000 then
|
||||
elseif num >= 100000 then
|
||||
return tostring(math.floor(num / 10000)) .. Language[10042]
|
||||
--return tostring(math.floor(num / 1000)/10) .. "万"
|
||||
else
|
||||
|
|
@ -185,7 +185,7 @@ end
|
|||
function PrintWanNum3(num)
|
||||
if num >= 100000000 then
|
||||
return string.format("%.2f", num / 100000000) .. Language[12100]
|
||||
elseif num >= 10000 then
|
||||
elseif num >= 100000 then
|
||||
return string.format("%.2f",num / 10000) .. Language[10042]
|
||||
else
|
||||
return tostring(num)
|
||||
|
|
|
|||
|
|
@ -97,6 +97,9 @@ function this.StateChange(isOpen)
|
|||
else
|
||||
this.SetNotJionInfo()
|
||||
end
|
||||
if isOver then
|
||||
this.SetOverInfo()
|
||||
end
|
||||
else
|
||||
if isOver then
|
||||
this.SetOverInfo()
|
||||
|
|
@ -105,12 +108,15 @@ function this.StateChange(isOpen)
|
|||
end
|
||||
end
|
||||
|
||||
this.containPanel:SetActive(not isOpen or not isJoin or baseData.loser)-- or isOver
|
||||
this.containPanel:SetActive(not isOpen or not isJoin or baseData.loser or isOver)-- or isOver
|
||||
this.btnRecord:SetActive(isOpen and isJoin)
|
||||
this.btnTeamRank:SetActive(isOpen and isJoin)
|
||||
this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END)
|
||||
this.orggroup:SetActive(not isOpen and not isOver)
|
||||
this.Demons:SetActive(not isOpen and not isOver)
|
||||
-- this.orggroup:SetActive(not isOpen and not isOver)
|
||||
-- this.Demons:SetActive(not isOpen and not isOver) --not isOpen or (isOpen and isOver)
|
||||
this.orggroup:SetActive(true)
|
||||
this.Demons:SetActive(true)
|
||||
this.FreshTeam()
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ end
|
|||
|
||||
|
||||
|
||||
|
||||
--被动技能表
|
||||
local passivityList = {
|
||||
--发动技能时，[a]的概率将[b]*[c]算作[d]计算
|
||||
|
|
@ -1562,7 +1563,7 @@ local passivityList = {
|
|||
-- buff.cover = true -- 可以叠加
|
||||
-- buff.clear = false -- 不可驱散
|
||||
-- role:AddBuff(buff)
|
||||
if skill and not skill.isAdd and defRole:IsDead() then
|
||||
if skill and not skill.isAdd and defRole:IsDead() and BattleUtil.CheckIsNoDead(defRole) then
|
||||
role:AddRage(i1, CountTypeName.Add)
|
||||
end
|
||||
end
|
||||
|
|
@ -1780,7 +1781,7 @@ local passivityList = {
|
|||
local ct = args[3]
|
||||
-- 释放技能后
|
||||
local onRoleHit = function(defRole)
|
||||
if defRole:IsDead() then
|
||||
if defRole:IsDead() and BattleUtil.CheckIsNoDead(defRole) then
|
||||
local buff = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro], f1, ct)
|
||||
-- buff.cover = true
|
||||
role:AddBuff(buff)
|
||||
|
|
@ -1984,7 +1985,8 @@ local passivityList = {
|
|||
local i1 = args[1]
|
||||
-- 释放技能后
|
||||
local onRoleHit = function(target)
|
||||
if target:IsDead() and BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)==false then
|
||||
LogError("target "..target.roleId .. " ".. target.star)
|
||||
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
for i = 1, i1 do
|
||||
role:AddSkill(BattleSkillType.Normal, false, true, nil)
|
||||
end
|
||||
|
|
@ -2030,7 +2032,7 @@ local passivityList = {
|
|||
local f1 = args[1]
|
||||
-- 释放技能后
|
||||
local onRoleHit = function(target)
|
||||
if target:IsDead() then
|
||||
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
local treat = floor(BattleUtil.FP_Mul(role:GetRoleData(RoleDataName.MaxHp), f1))
|
||||
BattleUtil.CalTreat(role, role, treat)
|
||||
end
|
||||
|
|
@ -2219,7 +2221,7 @@ local passivityList = {
|
|||
local f1 = args[1]
|
||||
-- 释放技能后
|
||||
local onRoleHit = function(target)
|
||||
if target:IsDead() then
|
||||
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
local buff = Buff.Create(role, BuffName.PropertyChange, 1, RoleDataName.Crit, f1, CountTypeName.Add)
|
||||
role:AddBuff(buff)
|
||||
end
|
||||
|
|
@ -2374,7 +2376,7 @@ local passivityList = {
|
|||
|
||||
-- 击杀数量累加
|
||||
local OnRoleHit = function(defRole, damage, bCrit, finalDmg, damageType, skill)
|
||||
if skill and defRole:IsDead() then
|
||||
if skill and defRole:IsDead() and BattleUtil.CheckIsNoDead(defRole) then
|
||||
killNum = killNum + 1
|
||||
end
|
||||
end
|
||||
|
|
@ -2753,7 +2755,7 @@ local passivityList = {
|
|||
local dot = args[1]
|
||||
local f1 = args[2]
|
||||
local function onHit(target)
|
||||
if target:IsDead() then
|
||||
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
local maxHp = role:GetRoleData(RoleDataName.MaxHp)
|
||||
local value = floor(BattleUtil.ErrorCorrection(maxHp* f1))
|
||||
BattleUtil.ApplyTreat(role, role, value)
|
||||
|
|
@ -2888,7 +2890,7 @@ local passivityList = {
|
|||
local i1 = args[1]
|
||||
|
||||
local onHit = function(target, damage, bCrit, finalDmg)
|
||||
if target:IsDead() then
|
||||
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
role:AddRage(i1, CountTypeName.Add)
|
||||
end
|
||||
end
|
||||
|
|
@ -3209,7 +3211,7 @@ local passivityList = {
|
|||
local dt = args[2]
|
||||
-- 直接伤害后
|
||||
local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill)
|
||||
if skill and not skill.isAdd and target:IsDead() then
|
||||
if skill and not skill.isAdd and target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
local list = RoleManager.Query(function(v) return v.camp ~= role.camp end)
|
||||
BattleUtil.SortByHpFactor(list, 1)
|
||||
local index = 0
|
||||
|
|
@ -3483,7 +3485,7 @@ local passivityList = {
|
|||
local f1 = args[1]
|
||||
|
||||
local onRoleHit = function(target)
|
||||
if target:IsDead() then
|
||||
if target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
local target = RoleManager.GetAliveAggro(role)
|
||||
BattleUtil.CalDamage(nil, role, target, 1, f1)
|
||||
end
|
||||
|
|
@ -3767,7 +3769,7 @@ local passivityList = {
|
|||
[197] = function(role, args)
|
||||
local f1 = args[1]
|
||||
local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill)
|
||||
if skill and skill.type == BattleSkillType.Special and target:IsDead() then
|
||||
if skill and skill.type == BattleSkillType.Special and target:IsDead() and BattleUtil.CheckIsNoDead(target) then
|
||||
BattleUtil.RandomAction(f1, function()
|
||||
role:AddRage(target.Rage, CountTypeName.Add)
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -341,6 +341,17 @@ function BattleUtil.ApplyDamage(skill, atkRole, defRole, damage, bCrit, damageTy
|
|||
return BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageType, dotType)
|
||||
end
|
||||
|
||||
|
||||
--检测是否有是金翅大鹏有不灭效果
|
||||
function BattleUtil.CheckIsNoDead(target)
|
||||
if target then
|
||||
return target:IsAssignHeroAndHeroStar(10086,10)==false and BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)==false
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageType, dotType)
|
||||
if damage < 0 then damage = 0 end
|
||||
local finalDmg = defRole.data:SubValue(RoleDataName.Hp, damage)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function RoleLogic:Init(uid, data, position)
|
|||
self.uid = uid
|
||||
self.position = position
|
||||
self.roleData = data
|
||||
|
||||
self.roleId=data.roleId
|
||||
self.data:Init(self, data.property)
|
||||
self.isDead = self:GetRoleData(RoleDataName.Hp) <= 0
|
||||
self.isRealDead = self.isDead
|
||||
|
|
@ -37,7 +37,7 @@ function RoleLogic:Init(uid, data, position)
|
|||
self.element = data.element
|
||||
self.professionId = data.professionId
|
||||
self.star = data.star or 1
|
||||
|
||||
LogError("英雄uid".. self.roleId .." " .. self.star)
|
||||
self.shield:Clear() --护盾列表
|
||||
self.exCalDmgList:Clear() --额外计算伤害列表
|
||||
self.buffFilter:Clear() --buff屏蔽列表
|
||||
|
|
@ -219,8 +219,13 @@ function RoleLogic:RemovePropertyTransfer(index, tran)
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
-- 是否为指定id，指定星级的英雄 by:王振兴 2020/07/29
|
||||
function RoleLogic:IsAssignHeroAndHeroStar(id,star)
|
||||
if self.roleId==id and self.star==star then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
function RoleLogic:AddBuff(buff)
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ function this.RefreshFightData(type)
|
|||
data.element = roleData.PropertyName
|
||||
data.professionId = roleData.Profession
|
||||
data.quality = roleData.Quality
|
||||
data.star = roleData.Star
|
||||
data.star = 10
|
||||
data.type = 1
|
||||
local paskill = string.split(role.passivity, "#")
|
||||
data.passivity = BattleManager.GetPassivityData(paskill) or {}
|
||||
|
|
|
|||
|
|
@ -644,6 +644,7 @@ function RoleView:DoScale(scale, dur, func)
|
|||
end
|
||||
self.dsTween = self.GameObject.transform.parent:DOScale(Vector3.one * scale, dur)
|
||||
:OnComplete(function ()
|
||||
-- Log("DoScale = "..scale)
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
|
|
@ -664,6 +665,7 @@ end
|
|||
function RoleView:SetHighLight(isLight, eScale, dur, func)
|
||||
|
||||
-- 设置变灰
|
||||
-- LogGreen(self.role.camp .."|||"..self.role.position.."|||"..tostring(isLight))
|
||||
if self.isDead then
|
||||
Util.SetGray(self.GameObject, true)
|
||||
Util.SetSpineGray(self.RoleLiveGOGraphic, true)
|
||||
|
|
@ -768,6 +770,8 @@ function RoleView:OnSkillCast(skill)
|
|||
self:ChangeCardSorting(battleSorting + 20)
|
||||
end
|
||||
|
||||
-- LogRed("Cast skill"..self.role.camp..self.role.position)
|
||||
|
||||
-- 高亮
|
||||
BattleManager.PauseBattle()
|
||||
self.RootPanel.SetRoleHighLight(self, skill:GetDirectTargets(), function()
|
||||
|
|
@ -806,7 +810,9 @@ function RoleView:OnSkillCast(skill)
|
|||
BattleManager.ResumeBattle()
|
||||
self:CheckFullSceenSkill(combat, skill)
|
||||
-- 取消高亮
|
||||
self:DelayFunc((combat.KeyFrame + combat.SkillDuration)/1000 + 0.2, function()
|
||||
self:DelayFunc((combat.KeyFrame + combat.SkillDuration)/1000, function()
|
||||
|
||||
-- LogRed("Cast done"..self.role.camp..self.role.position)
|
||||
self.RootPanel.SetRoleHighLight()
|
||||
self:ChangeCardSorting(battleSorting + self.role.position)
|
||||
self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask").transform)
|
||||
|
|
@ -845,8 +851,9 @@ function RoleView:OnSkillCast(skill)
|
|||
BattleManager.ResumeBattle()
|
||||
self:CheckFullSceenSkill(combat, skill)
|
||||
-- 取消高亮
|
||||
self:DelayFunc((combat.KeyFrame + combat.SkillDuration)/1000 + 0.2, function()
|
||||
self:DelayFunc((combat.KeyFrame + combat.SkillDuration)/1000, function()
|
||||
self.RootPanel.SetRoleHighLight()
|
||||
-- LogRed("Cast done"..self.role.camp..self.role.position)
|
||||
end)
|
||||
end)
|
||||
-- 攻击音效
|
||||
|
|
|
|||
|
|
@ -286,7 +286,7 @@ end
|
|||
-- 挑战按钮的文字显示
|
||||
function this.GetBtnText()
|
||||
-- 解锁新章节优先
|
||||
if PlayerPrefs.GetInt(PlayerManager.uid .. CHATER_STATE) < 1 then
|
||||
if this.IsChapterClossState() then
|
||||
-- 先判断等级
|
||||
local limitLevel = mainLevelConfig[this.curOpenFight].LevelLimit
|
||||
if PlayerManager.level < limitLevel then
|
||||
|
|
|
|||
|
|
@ -117,7 +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(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroConfig.Star))
|
||||
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
|
||||
local heroData = {}
|
||||
|
|
|
|||
|
|
@ -1303,8 +1303,9 @@ function this.TimeFormat()
|
|||
end
|
||||
|
||||
--轮转活动，乾坤宝盒
|
||||
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||
if info then
|
||||
local dynamicAct = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||
if dynamicAct then
|
||||
local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||
info = info.endTime - PlayerManager.serverTime
|
||||
info = math.floor(info/86400)
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) then
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ function QianKunBoxBuyOnePanel:InitComponent()
|
|||
this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text")
|
||||
|
||||
-- 关于抽卡的LotterySetting数据
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ function QianKunBoxBuyTenPanel:InitComponent()
|
|||
end
|
||||
|
||||
-- 关于抽卡的LotterySetting数据
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox)
|
||||
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||
drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id
|
||||
end
|
||||
|
|
|
|||
|
|
@ -44,18 +44,15 @@ function this:OnShow(_parent,...)
|
|||
sortingOrder =_parent.sortingOrder
|
||||
local args = {...}
|
||||
s=lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
|
||||
LogBlue(s)
|
||||
b=tonumber(specialConfig[49].Value)
|
||||
this.titleText.text=Language[11638]
|
||||
this.text1.text=string.format(Language[11639],s)
|
||||
this.text2.text=Language[11640] --后续改成读表
|
||||
this.text3.text=string.format(Language[11641],b)
|
||||
this.curNum.text=string.format(Language[11637],BagManager.GetItemCountById(94))
|
||||
LogBlue(Language[11642]..VipManager.GetChargedNum())
|
||||
|
||||
Util.SetGray(this.okBtn,VipManager.GetChargedNum()<b)
|
||||
this.okBtn:GetComponent("Button").interactable=VipManager.GetChargedNum()>=b
|
||||
this.text3.gameObject:SetActive(VipManager.GetChargedNum()<b)
|
||||
this.text3.gameObject:SetActive(VipManager.GetChargedNum()>=0 and VipManager.GetChargedNum()<b)
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
|
|
|
|||
|
|
@ -135,6 +135,8 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ARENA_DEFEND then
|
||||
JumpManager.GoJump(8001)
|
||||
elseif heroData.isFormations[1] == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||
JumpManager.GoJump(57001)
|
||||
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
||||
JumpManager.GoJump(57001)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -219,6 +219,8 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
JumpManager.GoJump(57001)
|
||||
elseif heroData.isFormations[1] == FormationTypeDef.EXPEDITION then
|
||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.SAVE_FORMATION,FormationTypeDef.EXPEDITION)
|
||||
elseif heroData.isFormations[1] == FormationTypeDef.ARENA_TOM_MATCH then
|
||||
JumpManager.GoJump(57001)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -152,6 +152,9 @@ end
|
|||
--界面打开时调用（用于子类重写）
|
||||
function RoleListPanel:OnShow()
|
||||
|
||||
--检测成员红点
|
||||
CheckRedPointStatus(RedPointType.Role)
|
||||
|
||||
tarHero=HeroManager.GetAllHeroDatas()
|
||||
teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL)
|
||||
this.isFirstOpen=true
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@ function SecretBoxBuyOnePanel:InitComponent()
|
|||
|
||||
-- 关于抽卡的LotterySetting数据
|
||||
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
|
||||
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||
if curActivityId then
|
||||
drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id
|
||||
end
|
||||
end
|
||||
|
||||
--绑定事件（用于子类重写）
|
||||
|
|
|
|||
|
|
@ -168,11 +168,11 @@ function this.RefreshPanel(eventId, isFirstOpen)
|
|||
|
||||
|
||||
-- 配音资源名
|
||||
local voice = chapterEventPointData[eventId].VoiceRes
|
||||
if voice then
|
||||
-- 使用相同通道播放，避免跳过剧情导致音效重复
|
||||
SoundManager.PlaySound(voice, nil, nil, 10)
|
||||
end
|
||||
-- local voice = chapterEventPointData[eventId].VoiceRes
|
||||
-- if voice then
|
||||
-- -- 使用相同通道播放，避免跳过剧情导致音效重复
|
||||
-- SoundManager.PlaySound(voice, nil, nil, 10)
|
||||
-- end
|
||||
|
||||
--当前不是选择界面
|
||||
if isRightType then
|
||||
|
|
|
|||
|
|
@ -133,7 +133,8 @@ function this:OnOpen(context)
|
|||
end
|
||||
-- 刷新显示状态
|
||||
self:RefreshBtnState()
|
||||
|
||||
--检测成员红点
|
||||
CheckRedPointStatus(RedPointType.Role)
|
||||
end
|
||||
|
||||
function this:RefreshBtnState()
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ namespace LJ_OptTools
|
|||
return ret;
|
||||
}
|
||||
|
||||
public static bool ExtendTexture( string path)
|
||||
public static bool ExtendTexture(string path)
|
||||
{
|
||||
var tex = AssetDatabase.LoadAssetAtPath<Texture2D>(path);
|
||||
var ti = AssetImporter.GetAtPath(path) as TextureImporter;
|
||||
|
|
@ -199,9 +199,9 @@ namespace LJ_OptTools
|
|||
|
||||
}
|
||||
|
||||
public static void SetTextureFormat( string path, bool useCrunched)
|
||||
public static void SetTextureFormat(string path, bool useCrunched)
|
||||
{
|
||||
if (string.IsNullOrEmpty(path)) return;
|
||||
if (string.IsNullOrEmpty(path)) return;
|
||||
var ti = AssetImporter.GetAtPath(path) as TextureImporter;
|
||||
if (ti == null)
|
||||
{
|
||||
|
|
@ -212,11 +212,24 @@ namespace LJ_OptTools
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (ti.textureType == TextureImporterType.Sprite)
|
||||
{
|
||||
TextureImporterSettings tis = new TextureImporterSettings();
|
||||
ti.ReadTextureSettings(tis);
|
||||
if (tis.spriteMeshType != SpriteMeshType.FullRect)
|
||||
{
|
||||
tis.spriteMeshType = SpriteMeshType.FullRect;
|
||||
ti.SetTextureSettings(tis);
|
||||
AssetDatabase.WriteImportSettingsIfDirty(path);
|
||||
}
|
||||
}
|
||||
|
||||
var pAndSetting = ti.GetPlatformTextureSettings("Android");
|
||||
var piPSetting = ti.GetPlatformTextureSettings("iPhone");
|
||||
var tex = AssetDatabase.LoadAssetAtPath<Texture2D>(path);
|
||||
bool pot = Mathf.IsPowerOfTwo(tex.width) && Mathf.IsPowerOfTwo(tex.height);
|
||||
SettingPlantformTex(ti, pAndSetting, useCrunched,pot);
|
||||
SettingPlantformTex(ti, pAndSetting, useCrunched, pot);
|
||||
ti.SetPlatformTextureSettings(pAndSetting);
|
||||
SettingPlantformTex(ti, piPSetting, useCrunched, pot);
|
||||
ti.SetPlatformTextureSettings(piPSetting);
|
||||
|
|
@ -271,7 +284,7 @@ namespace LJ_OptTools
|
|||
}
|
||||
}
|
||||
|
||||
if (filePaths.Count < 1) return;
|
||||
if (filePaths.Count < 1) return;
|
||||
|
||||
for (int i = 0; i < filePaths.Count; i++)
|
||||
{
|
||||
|
|
@ -281,7 +294,7 @@ namespace LJ_OptTools
|
|||
, path
|
||||
, i * 1f / filePaths.Count
|
||||
);
|
||||
TextureSizeOptUtilities.ExtendTexture( path);
|
||||
TextureSizeOptUtilities.ExtendTexture(path);
|
||||
TextureSizeOptUtilities.SetTextureFormat(path, useCrunched);
|
||||
}
|
||||
AssetDatabase.Refresh();
|
||||
|
|
@ -296,27 +309,29 @@ namespace LJ_OptTools
|
|||
var guid = AssetDatabase.FindAssets("t:Texture", new string[] { "Assets/ManagedResources" });
|
||||
List<string> floders = new List<string>();
|
||||
int errorTexCount = 0;
|
||||
|
||||
for (int i = 0; i < guid.Length; i++)
|
||||
{
|
||||
string id = guid[i];
|
||||
var path = AssetDatabase.GUIDToAssetPath(id);
|
||||
|
||||
if (
|
||||
path.StartsWith("Assets/ManagedResources/Atlas")
|
||||
) continue;
|
||||
|
||||
EditorUtility.DisplayProgressBar(
|
||||
string.Format("Check Texture({0}/{1})", i, guid.Length)
|
||||
, path
|
||||
, i * 1f / guid.Length
|
||||
);
|
||||
var floder = Path.GetDirectoryName(path);
|
||||
string.Format("Check Texture({0}/{1})", i, guid.Length)
|
||||
, path
|
||||
, i * 1f / guid.Length
|
||||
);
|
||||
var ti = AssetImporter.GetAtPath(path) as TextureImporter;
|
||||
if (ti == null)
|
||||
{
|
||||
//Debug.LogError("No TextureImporter:" + path);
|
||||
continue;
|
||||
}
|
||||
if (
|
||||
path.StartsWith("Assets/ManagedResources/Atlas")
|
||||
) continue;
|
||||
|
||||
|
||||
var floder = Path.GetDirectoryName(path);
|
||||
|
||||
var tex = AssetDatabase.LoadAssetAtPath<Texture2D>(path);
|
||||
|
||||
var pAndSetting = ti.GetPlatformTextureSettings("Android");
|
||||
|
|
@ -356,6 +371,46 @@ namespace LJ_OptTools
|
|||
EditorUtility.ClearProgressBar();
|
||||
}
|
||||
|
||||
|
||||
[MenuItem("Tools/图片优化/检查Material引用的图片", priority = 0)]
|
||||
public static void OnMenuItem_CheckMat()
|
||||
{
|
||||
var guid = AssetDatabase.FindAssets("t:Material");
|
||||
StringBuilder info = new StringBuilder();
|
||||
for (int i = 0; i < guid.Length; i++)
|
||||
{
|
||||
var path = AssetDatabase.GUIDToAssetPath(guid[i]);
|
||||
EditorUtility.DisplayProgressBar(
|
||||
string.Format("检查Material引用的图片({0}/{1})", i, guid.Length)
|
||||
, path
|
||||
, i * 1f / guid.Length
|
||||
);
|
||||
|
||||
var mat = AssetDatabase.LoadAssetAtPath<Material>(path);
|
||||
var shader = mat.shader;
|
||||
int pCount = ShaderUtil.GetPropertyCount(shader);
|
||||
for (int j = 0; j < pCount; j++)
|
||||
{
|
||||
if (ShaderUtil.GetPropertyType(shader, j) != ShaderUtil.ShaderPropertyType.TexEnv) continue;
|
||||
var pName = ShaderUtil.GetPropertyName(shader, j);
|
||||
var tex = mat.GetTexture(pName);
|
||||
var texPath = AssetDatabase.GetAssetPath(tex);
|
||||
var ti = AssetImporter.GetAtPath(texPath) as TextureImporter;
|
||||
if (ti == null) continue;
|
||||
if( ti.textureType == TextureImporterType.Sprite)
|
||||
{
|
||||
info.AppendFormat("{0} : {1} ->> {2}\r\n",path,pName,texPath);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if( info.Length > 0)
|
||||
{
|
||||
Debug.Log(info.ToString());
|
||||
}
|
||||
|
||||
EditorUtility.ClearProgressBar();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2243,7 +2243,7 @@
|
|||
12243,不知道
|
||||
12244,第%s场
|
||||
12245,历史最高排名：
|
||||
12246,30级或首充后解锁
|
||||
12246,30级后解锁
|
||||
12247,森罗幻境排行
|
||||
12248,需要上阵%s名%s系神将
|
||||
12249,今日剩余次数:
|
||||
|
|
@ -2277,4 +2277,4 @@
|
|||
12277,未查询到符合条件的装备！
|
||||
12278,%d天%02d时
|
||||
12279,妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力
|
||||
12280,该神将在巅峰赛阵容中已上阵
|
||||
12280,巅峰赛阵容
|
||||
|
|
|
|||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue