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

dev_chengFeng
gaoxin 2021-05-27 16:16:39 +08:00
commit a1ba397b9c
23 changed files with 39 additions and 39 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6b8a26dd8129bc84da65a093413125bb
guid: 8021993d376a45142a42a1092e3ad2f6
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName: lz4/audio/ui/voice/bgm_story_2_1
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 22073f83497e11448a02cfa30f588190
guid: 91e7dc1d7e6cc844492ef0230caa5b0f
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName: lz4/audio/ui/voice/bgm_story_1_1
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: edf73062a0b7a3c4eba2030ab5f8e75f
guid: 31d2a1023547f684ab123fc5e03b586b
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName: lz4/audio/ui/voice/bgm_story_2_2
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d007d7a9d9e962e458695173c7cbb86d
guid: 78f3f89ddf1d6dd4e8e9f50b73f36812
AudioImporter:
externalObjects: {}
serializedVersion: 6
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName: lz4/audio/ui/voice/bgm_story_1_2
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -74,7 +74,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -85,7 +85,7 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -74,7 +74,7 @@ TextureImporter:
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
@ -85,7 +85,7 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0

View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
@ -73,23 +73,23 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android

View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
@ -73,23 +73,23 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android

View File

@ -31,7 +31,7 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
@ -73,23 +73,23 @@ TextureImporter:
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 33
textureFormat: 57
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android

View File

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

View File

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

View File

@ -8448,7 +8448,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.4, y: -37.7}
m_AnchoredPosition: {x: -2.4, y: -59}
m_SizeDelta: {x: 113, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7600987953307217645
@ -8910,7 +8910,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.4, y: -22.9}
m_AnchoredPosition: {x: -2.4, y: -59}
m_SizeDelta: {x: 113, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6652967392251576279

View File

@ -259,7 +259,7 @@ function this.SetComPShowState(type)
this.guildDeathPos:SetActive(type == 4)
this.guildTranscript:SetActive(type == 6)
this.tasuilingxiao:SetActive(type == 7)
this.FightLevel:SetActive(type == 8)
-- this.FightLevel:SetActive(type == 8)
if type == 7 then
this.noRewardText:SetActive(#itemDataList < 1)
end