Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
d552721b88
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.1 KiB |
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.1 KiB |
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -80,6 +80,17 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
|
@ -41,7 +41,7 @@ TextureImporter:
|
|||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1367,7 +1367,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8786720165915251360
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -1385,7 +1385,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -72.90001, y: 151.90001}
|
||||
m_SizeDelta: {x: 32, y: 23}
|
||||
m_SizeDelta: {x: 25, y: 18}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2257608186104114668
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -554,7 +554,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: -145.6, y: -455}
|
||||
m_AnchoredPosition: {x: -145.59998, y: -455}
|
||||
m_SizeDelta: {x: 140, y: 140}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &946938106494648161
|
||||
|
@ -5134,8 +5134,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 69.1, y: -74.3}
|
||||
m_SizeDelta: {x: 178.5, y: 95.9}
|
||||
m_AnchoredPosition: {x: 79.24, y: -79.74}
|
||||
m_SizeDelta: {x: 158.25, y: 85}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5255812259255272687
|
||||
CanvasRenderer:
|
||||
|
@ -5209,7 +5209,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: -400.9, y: -424}
|
||||
m_AnchoredPosition: {x: -400.90002, y: -424}
|
||||
m_SizeDelta: {x: 70, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5255812259326478420
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
%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: 0
|
||||
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
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 57be99f3f07019c4b98f41d9c46911ca
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,34 @@
|
|||
%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: 0
|
||||
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
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 68e7a555dfdec234c98e993a848f7be6
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,34 @@
|
|||
%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: 0
|
||||
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
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0ba7bc807256bee4ba91353d18870bb2
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,34 @@
|
|||
%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: 0
|
||||
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
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 61e496820e6aaf1419d52f938e527e02
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,34 @@
|
|||
%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: 0
|
||||
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
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a68b3b0fa7aef854c876ebfe7ccd4027
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,34 @@
|
|||
%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: 0
|
||||
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
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e99aae4bb13cb284c9d60c282f8b5644
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -10,7 +10,7 @@ function CardRendererManager.Initialize()
|
|||
GameObject.DontDestroyOnLoad(this.root)
|
||||
this.renderList = {}
|
||||
this.textureList = {}
|
||||
for i = 1, 6 do
|
||||
for i = 1, 12 do
|
||||
this.renderList[i] = Util.GetGameObject(this.root, "CardRenderer"..i.."/Canvas")
|
||||
this.textureList[i] = resMgr:LoadAsset("CardTexture"..i)
|
||||
end
|
||||
|
|
|
@ -244,22 +244,22 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
|||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
elseif v.Type == 12 then--福星高照活动
|
||||
local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao)
|
||||
local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#")
|
||||
local time = 0--ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
if ActData.value == 0 then
|
||||
time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
elseif ActData.value == 1 then
|
||||
time = ActData.mission[1].progress + #ActData.mission*86400 - GetTimeStamp()
|
||||
elseif ActData.value == 2 then
|
||||
time = 0
|
||||
end
|
||||
if time >0 then
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
end
|
||||
end
|
||||
-- elseif v.Type == 12 then--福星高照活动
|
||||
-- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao)
|
||||
-- local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#")
|
||||
-- local time = 0--ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
-- if ActData.value == 0 then
|
||||
-- time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp()
|
||||
-- elseif ActData.value == 1 then
|
||||
-- time = ActData.mission[1].progress + #ActData.mission*86400 - GetTimeStamp()
|
||||
-- elseif ActData.value == 2 then
|
||||
-- time = 0
|
||||
-- end
|
||||
-- if time >0 then
|
||||
-- if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
-- table.insert(patFaceAllData,v)
|
||||
-- end
|
||||
-- end
|
||||
else
|
||||
if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then
|
||||
table.insert(patFaceAllData,v)
|
||||
|
|
|
@ -75,8 +75,8 @@ function PatFacePanel:InitComponent()
|
|||
self.obg7 = Util.GetGameObject(self.transform, "frame/obg7")
|
||||
--限时神装礼包
|
||||
self.obg8 = Util.GetGameObject(self.transform, "frame/obg8")
|
||||
--福星高照活动
|
||||
self.obg9 = Util.GetGameObject(self.transform, "frame/obg9")
|
||||
-- --福星高照活动
|
||||
-- self.obg9 = Util.GetGameObject(self.transform, "frame/obg9")
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -135,7 +135,7 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
patFaceSingleData.Type == FacePanelType.MainLevel or
|
||||
patFaceSingleData.Type == FacePanelType.Pokemon)
|
||||
self.obg8:SetActive(patFaceSingleData.Type == FacePanelType.TimeLimitSkin)
|
||||
self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao)
|
||||
-- self.obg9:SetActive(patFaceSingleData.Type == FacePanelType.FuXingGaoZhao)
|
||||
if patFaceSingleData.Type == FacePanelType.Sbtj then
|
||||
self:OnShowOb1Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.Tesc then
|
||||
|
@ -158,9 +158,9 @@ function PatFacePanel:OnShowPatFaceData()
|
|||
self:OnShowOb7Data(patFaceSingleData.Type)
|
||||
elseif patFaceSingleData.Type == FacePanelType.TimeLimitSkin then
|
||||
self:OnShowOb8Data()
|
||||
elseif patFaceSingleData.Type == FacePanelType.FuXingGaoZhao then
|
||||
LogRed("patFaceSingleData.Type == FacePanelType.FuXingGaoZhao")
|
||||
self:OnShowOb9Data()
|
||||
-- elseif patFaceSingleData.Type == FacePanelType.FuXingGaoZhao then
|
||||
-- LogRed("patFaceSingleData.Type == FacePanelType.FuXingGaoZhao")
|
||||
-- self:OnShowOb9Data()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -363,10 +363,10 @@ function PatFacePanel:OnShowOb8Data()
|
|||
end
|
||||
|
||||
--第九种 --福星高照活动
|
||||
function PatFacePanel:OnShowOb9Data()
|
||||
LogRed("function PatFacePanel:OnShowOb9Data()")
|
||||
UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel,function() self:ClosePanel() end)
|
||||
end
|
||||
-- function PatFacePanel:OnShowOb9Data()
|
||||
-- LogRed("function PatFacePanel:OnShowOb9Data()")
|
||||
-- UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel,function() self:ClosePanel() end)
|
||||
-- end
|
||||
|
||||
function PatFacePanel:JumpBtnClickEvent()
|
||||
if openPanle then
|
||||
|
|
|
@ -61,7 +61,6 @@ function FightLevelSingleLevelInfoPopup:RemoveListener()
|
|||
contentScripts[i].view:RemoveListener()
|
||||
end
|
||||
end
|
||||
local args
|
||||
--界面打开时调用(用于子类重写)
|
||||
function FightLevelSingleLevelInfoPopup:OnOpen(popupType,...)
|
||||
-- local args={...}
|
||||
|
@ -76,7 +75,6 @@ function FightLevelSingleLevelInfoPopup:OnOpen(popupType,...)
|
|||
for i=1,#contentPrefabs do
|
||||
contentPrefabs[i].gameObject:SetActive(false)
|
||||
end
|
||||
args = ...
|
||||
this.BGImage1:SetActive(index == 1 )
|
||||
this.BGImage2:SetActive(index == 2 or index == 3 or index == 4)
|
||||
contentPrefabs[index].gameObject:SetActive(true)
|
||||
|
@ -87,7 +85,6 @@ end
|
|||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function FightLevelSingleLevelInfoPopup:OnShow()
|
||||
contentScripts[index].view:OnShow(this,args)
|
||||
end
|
||||
|
||||
|
||||
|
|
|
@ -178,7 +178,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
|
||||
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
|
||||
live.texture = CardRendererManager.GetSpineTexture(_pos + 6, liveName, Vector3.one * scale, livePos, true)
|
||||
live.transform.localScale = Vector3.one
|
||||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
|
@ -192,7 +192,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
end
|
||||
|
||||
yuanImage:SetActive(false)
|
||||
lv.text=curMonsterConfig.level
|
||||
lv.text=curMonsterConfig.Level
|
||||
|
||||
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star])
|
||||
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star])
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
FuXingGaoZhaoManager = {}
|
||||
local this = FuXingGaoZhaoManager
|
||||
local Data = {}
|
||||
local timeData = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#")
|
||||
|
||||
function this.Initialize()
|
||||
end
|
||||
|
@ -55,15 +56,22 @@ end
|
|||
|
||||
function this.CheckRedPoint()
|
||||
this.InitRewardData()
|
||||
if Data.ActState == 1 then
|
||||
if Data.ActState == 0 then
|
||||
local time = Data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp()
|
||||
local curDay = math.ceil(time/86400)
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."FuXingGaoZhao"..curDay)
|
||||
if str == 0 then
|
||||
return true
|
||||
end
|
||||
elseif Data.ActState == 1 then
|
||||
for i = 1, #Data.rewards do
|
||||
if Data.rewards[i].State == 0 and Data.rewards[i].Progress <= GetTimeStamp() then
|
||||
-- LogBlue("Return true")
|
||||
LogBlue("Return true")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
-- LogBlue("Return false")
|
||||
LogBlue("Return false")
|
||||
return false
|
||||
end
|
||||
|
||||
|
|
|
@ -66,10 +66,12 @@ end
|
|||
|
||||
--添加事件监听(用于子类重写)
|
||||
function FuXingGaoZhaoPanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function FuXingGaoZhaoPanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, self.Refresh,self)
|
||||
end
|
||||
|
||||
function FuXingGaoZhaoPanel:OnSortingOrderChange()
|
||||
|
@ -110,6 +112,7 @@ end
|
|||
|
||||
function FuXingGaoZhaoPanel:Refresh()
|
||||
self.data = FuXingGaoZhaoManager.GetData()
|
||||
LogYellow("self.data.ActState:"..tostring(self.data.ActState))
|
||||
self:SetBtn()
|
||||
if self.data.ActState == 0 then
|
||||
self:SetTime()
|
||||
|
@ -144,6 +147,9 @@ function FuXingGaoZhaoPanel:SetTime()
|
|||
self.timer = nil
|
||||
end
|
||||
local time = self.data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp()
|
||||
local curDay = math.ceil(time/86400)
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."FuXingGaoZhao"..curDay,1)
|
||||
CheckRedPointStatus(RedPointType.FuXingGaoZhao)
|
||||
self.time.text = string.format(Language[12246],TimeToFelaxible(time))
|
||||
self.timer = Timer.New(function()
|
||||
time = time - 1
|
||||
|
|
|
@ -134,13 +134,13 @@ end
|
|||
--添加事件监听(用于子类重写)
|
||||
function MonsterCampNewPanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.MonsterCamp.UpdatePri, self.UpdatePrivilage,self)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.MonsterCamp.UpdatePanel, this.OnShowPanel)
|
||||
-- Game.GlobalEvent:AddEvent(GameEvent.MonsterCamp.UpdatePanel, this.OnShowPanel)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function MonsterCampNewPanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.MonsterCamp.UpdatePri, self.UpdatePrivilage,self)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.MonsterCamp.UpdatePanel, this.OnShowPanel)
|
||||
-- Game.GlobalEvent:RemoveEvent(GameEvent.MonsterCamp.UpdatePanel, this.OnShowPanel)
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
|
|
|
@ -188,7 +188,7 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
|
|||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.Id)
|
||||
local scale = roleConfig.play_liveScale
|
||||
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
|
||||
self.icon.texture = CardRendererManager.GetSpineTexture((self.data.Id%6 == 0 and 6 or (self.data.Id%6)), liveName, Vector3.one * scale, livePos, true)
|
||||
self.icon.texture = CardRendererManager.GetSpineTexture((self.data.Id%6 == 0 and 12 or (self.data.Id%6) + 6), liveName, Vector3.one * scale, livePos, true)
|
||||
self.icon.transform.localScale = Vector3.one
|
||||
self.icon.transform.localPosition = Vector3.zero
|
||||
self.lv.text = monConfig.Level
|
||||
|
|
Loading…
Reference in New Issue