Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
ZhangBiao 2021-01-11 17:24:45 +08:00
commit 05efc38052
41 changed files with 528477 additions and 3 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 48fd34e964ba438468cbb687f48fa46f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4ca35d66f140b4b409cdaaf95faf05b2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: keji_08_lz_01
m_Shader: {fileID: 4800000, guid: cd73b754ea97c04468b1349981704714, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 0251f380b38ea324aa47de61e0593392, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
m_Colors:
- _TintColor: {r: 0.8745099, g: 0.8745099, b: 0.8745099, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7f85921078a45b541b425d0422b5bb12
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: keji_08_lz_02
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 452c01822e3587b42b780958a58a00dd, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
m_Colors:
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 984ba54512070ea46ab6dca1978774d9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: keji_10_mat
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 38e421d81d57a8444ac0aee029167eeb, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- _Stencil: 0
m_Colors:
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 16a4003f6d85c7a449b9cd75a578fd22
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dd22eb9157d32c741a15f52f75d939b7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: df4aea16c45a8b34b91286121ccf41cb
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4d1239a7b343f1549833fca4adc3cca1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 97bbd7eb18771fe4c824c395eea731c1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dc52af1637c576442bd2632c7faf8db6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

View File

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

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &267634281074791533
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8053226258357826105}
- component: {fileID: 925603656320452373}
- component: {fileID: 7532012644116080452}
m_Layer: 0
m_Name: c_ttjz_00048_S1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8053226258357826105
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 267634281074791533}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &925603656320452373
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 267634281074791533}
m_CullTransparentMesh: 0
--- !u!114 &7532012644116080452
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 267634281074791533}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
skeletonDataAsset: {fileID: 11400000, guid: 982ec598143b76746afbd2a13b0a1da8, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle
startingLoop: 0
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a0940223841f495409b2d0651f847eab
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 90ab7d510a60636479b6d7a800bb1440
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,566 @@
c_ttjz_00048_S1.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
biyan_6
rotate: false
xy: 920, 770
size: 31, 9
orig: 31, 9
offset: 0, 0
index: -1
bozi_28
rotate: false
xy: 790, 218
size: 32, 45
orig: 32, 45
offset: 0, 0
index: -1
chongwu_75
rotate: false
xy: 290, 2
size: 108, 99
orig: 108, 99
offset: 0, 0
index: -1
chongwu_77
rotate: false
xy: 2, 342
size: 355, 680
orig: 355, 680
offset: 0, 0
index: -1
chongwumaozi_64
rotate: false
xy: 461, 6
size: 78, 120
orig: 78, 120
offset: 0, 0
index: -1
chongwumaozi_65
rotate: true
xy: 919, 607
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
chongwumaozi_66
rotate: false
xy: 352, 128
size: 114, 187
orig: 114, 187
offset: 0, 0
index: -1
chongwumaozi_67
rotate: false
xy: 601, 511
size: 122, 138
orig: 122, 138
offset: 0, 0
index: -1
chongwumaozi_68
rotate: true
xy: 713, 771
size: 91, 120
orig: 91, 120
offset: 0, 0
index: -1
chongwumeimao_63
rotate: true
xy: 824, 675
size: 41, 82
orig: 41, 82
offset: 0, 0
index: -1
chongwuqi_69
rotate: false
xy: 725, 520
size: 71, 82
orig: 71, 82
offset: 0, 0
index: -1
chongwuqi_70
rotate: false
xy: 400, 2
size: 59, 124
orig: 59, 124
offset: 0, 0
index: -1
chongwuqi_72
rotate: false
xy: 920, 874
size: 78, 148
orig: 78, 148
offset: 0, 0
index: -1
chongwuqi_73
rotate: true
xy: 690, 210
size: 45, 52
orig: 45, 52
offset: 0, 0
index: -1
chongwuqi_74
rotate: false
xy: 158, 35
size: 130, 305
orig: 130, 305
offset: 0, 0
index: -1
chongwuqi_78
rotate: false
xy: 566, 187
size: 64, 146
orig: 64, 146
offset: 0, 0
index: -1
chongwuqi_79
rotate: true
xy: 786, 416
size: 18, 25
orig: 18, 25
offset: 0, 0
index: -1
chongwuqi_80
rotate: true
xy: 158, 2
size: 31, 82
orig: 31, 82
offset: 0, 0
index: -1
chongwutou_71
rotate: true
xy: 472, 700
size: 158, 236
orig: 158, 236
offset: 0, 0
index: -1
chongwuweiba_76
rotate: false
xy: 472, 860
size: 239, 162
orig: 239, 162
offset: 0, 0
index: -1
chongwuyanjing_62
rotate: false
xy: 876, 612
size: 41, 61
orig: 41, 61
offset: 0, 0
index: -1
jianbang_14
rotate: false
xy: 541, 22
size: 17, 18
orig: 17, 18
offset: 0, 0
index: -1
jianbang_15
rotate: false
xy: 845, 441
size: 19, 15
orig: 19, 15
offset: 0, 0
index: -1
jianbang_16
rotate: true
xy: 788, 265
size: 47, 28
orig: 47, 28
offset: 0, 0
index: -1
jianbang_34
rotate: false
xy: 242, 2
size: 30, 31
orig: 30, 31
offset: 0, 0
index: -1
jianbang_35
rotate: false
xy: 1014, 964
size: 8, 21
orig: 8, 21
offset: 0, 0
index: -1
jianbang_36
rotate: false
xy: 513, 148
size: 8, 19
orig: 8, 19
offset: 0, 0
index: -1
lingjin_10
rotate: false
xy: 1014, 952
size: 8, 10
orig: 8, 10
offset: 0, 0
index: -1
lingjin_11
rotate: false
xy: 541, 42
size: 24, 18
orig: 24, 18
offset: 0, 0
index: -1
lingjin_12
rotate: false
xy: 487, 462
size: 30, 25
orig: 30, 25
offset: 0, 0
index: -1
maozi_1
rotate: true
xy: 845, 458
size: 57, 26
orig: 57, 26
offset: 0, 0
index: -1
maozi_2
rotate: false
xy: 908, 682
size: 32, 40
orig: 32, 40
offset: 0, 0
index: -1
maozi_3
rotate: false
xy: 725, 604
size: 88, 75
orig: 88, 75
offset: 0, 0
index: -1
pidai_18
rotate: false
xy: 710, 718
size: 107, 51
orig: 107, 51
offset: 0, 0
index: -1
pidai_19
rotate: true
xy: 468, 128
size: 17, 53
orig: 17, 53
offset: 0, 0
index: -1
pidai_20
rotate: false
xy: 726, 436
size: 70, 82
orig: 70, 82
offset: 0, 0
index: -1
pifeng_30
rotate: true
xy: 744, 214
size: 48, 44
orig: 48, 44
offset: 0, 0
index: -1
pifeng_55
rotate: false
xy: 359, 648
size: 111, 374
orig: 111, 374
offset: 0, 0
index: -1
quanzhang_51
rotate: false
xy: 359, 317
size: 70, 329
orig: 70, 329
offset: 0, 0
index: -1
shenti_33
rotate: false
xy: 431, 326
size: 90, 134
orig: 90, 134
offset: 0, 0
index: -1
shenti_38
rotate: false
xy: 835, 770
size: 83, 92
orig: 83, 92
offset: 0, 0
index: -1
tou_7
rotate: true
xy: 756, 314
size: 41, 52
orig: 41, 52
offset: 0, 0
index: -1
toufa_4
rotate: false
xy: 523, 128
size: 29, 39
orig: 29, 39
offset: 0, 0
index: -1
toufa_5
rotate: true
xy: 632, 192
size: 16, 72
orig: 16, 72
offset: 0, 0
index: -1
toufa_56
rotate: false
xy: 601, 416
size: 123, 93
orig: 123, 93
offset: 0, 0
index: -1
toufa_57
rotate: true
xy: 713, 864
size: 158, 205
orig: 158, 205
offset: 0, 0
index: -1
toufa_58
rotate: false
xy: 487, 489
size: 112, 160
orig: 112, 160
offset: 0, 0
index: -1
toufa_59
rotate: false
xy: 632, 210
size: 56, 123
orig: 56, 123
offset: 0, 0
index: -1
toufa_60
rotate: false
xy: 2, 3
size: 154, 337
orig: 154, 337
offset: 0, 0
index: -1
toufa_61
rotate: false
xy: 798, 509
size: 36, 93
orig: 36, 93
offset: 0, 0
index: -1
toufa_8
rotate: false
xy: 1000, 987
size: 19, 35
orig: 19, 35
offset: 0, 0
index: -1
toufa_9
rotate: true
xy: 726, 416
size: 18, 58
orig: 18, 58
offset: 0, 0
index: -1
yifu_31
rotate: false
xy: 290, 103
size: 60, 237
orig: 60, 237
offset: 0, 0
index: -1
yifu_32
rotate: true
xy: 472, 651
size: 47, 231
orig: 47, 231
offset: 0, 0
index: -1
yifu_47
rotate: false
xy: 920, 781
size: 88, 91
orig: 88, 91
offset: 0, 0
index: -1
yiling_13
rotate: false
xy: 919, 637
size: 29, 43
orig: 29, 43
offset: 0, 0
index: -1
yiling_27
rotate: false
xy: 541, 62
size: 25, 26
orig: 25, 26
offset: 0, 0
index: -1
yiling_29
rotate: false
xy: 352, 105
size: 45, 21
orig: 45, 21
offset: 0, 0
index: -1
youshou_48
rotate: false
xy: 680, 340
size: 74, 74
orig: 74, 74
offset: 0, 0
index: -1
youshou_49
rotate: true
xy: 566, 133
size: 52, 56
orig: 52, 56
offset: 0, 0
index: -1
youshou_50
rotate: true
xy: 756, 357
size: 57, 56
orig: 57, 56
offset: 0, 0
index: -1
youshou_52
rotate: false
xy: 274, 5
size: 12, 28
orig: 12, 28
offset: 0, 0
index: -1
youshou_53
rotate: false
xy: 741, 264
size: 45, 48
orig: 45, 48
offset: 0, 0
index: -1
youshou_54
rotate: false
xy: 815, 604
size: 59, 69
orig: 59, 69
offset: 0, 0
index: -1
youtui_43
rotate: true
xy: 706, 181
size: 27, 38
orig: 27, 38
offset: 0, 0
index: -1
youtui_44
rotate: false
xy: 819, 718
size: 81, 50
orig: 81, 50
offset: 0, 0
index: -1
youtui_45
rotate: false
xy: 468, 147
size: 43, 177
orig: 43, 177
offset: 0, 0
index: -1
youtui_46
rotate: false
xy: 513, 169
size: 51, 155
orig: 51, 155
offset: 0, 0
index: -1
zhuangshi_17
rotate: false
xy: 705, 653
size: 18, 26
orig: 18, 26
offset: 0, 0
index: -1
zhuangshi_37
rotate: true
xy: 589, 335
size: 79, 89
orig: 79, 89
offset: 0, 0
index: -1
zuoshou_21
rotate: false
xy: 690, 257
size: 49, 81
orig: 49, 81
offset: 0, 0
index: -1
zuoshou_22
rotate: false
xy: 746, 178
size: 38, 34
orig: 38, 34
offset: 0, 0
index: -1
zuoshou_23
rotate: false
xy: 1000, 943
size: 12, 42
orig: 12, 42
offset: 0, 0
index: -1
zuoshou_24
rotate: false
xy: 836, 517
size: 35, 85
orig: 35, 85
offset: 0, 0
index: -1
zuoshou_25
rotate: false
xy: 541, 90
size: 36, 36
orig: 36, 36
offset: 0, 0
index: -1
zuoshou_26
rotate: true
xy: 710, 681
size: 35, 112
orig: 35, 112
offset: 0, 0
index: -1
zuotui_39
rotate: false
xy: 902, 724
size: 40, 44
orig: 40, 44
offset: 0, 0
index: -1
zuotui_40
rotate: false
xy: 798, 441
size: 45, 66
orig: 45, 66
offset: 0, 0
index: -1
zuotui_41
rotate: false
xy: 431, 462
size: 54, 184
orig: 54, 184
offset: 0, 0
index: -1
zuotui_42
rotate: false
xy: 523, 335
size: 64, 152
orig: 64, 152
offset: 0, 0
index: -1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 908126bfddb76c8459b4e5a3ae16001c
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 852 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 3e71db5c9c18d874da884d649021e8a7
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
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: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: ea5656632aac46d419012a790d7c2253
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7806dcb2ca6f04d44b4c14923f757b5e
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: c_ttjz_00048_S1_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: 908126bfddb76c8459b4e5a3ae16001c, type: 3}
materials:
- {fileID: 2100000, guid: a8dbac510138a7341bf5683092939e1c, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 30bfbbe5ff8e2ad408149338b54f3c52
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: c_ttjz_00048_S1_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 3e71db5c9c18d874da884d649021e8a7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a8dbac510138a7341bf5683092939e1c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: c_ttjz_00048_S1_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: 30bfbbe5ff8e2ad408149338b54f3c52, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 7806dcb2ca6f04d44b4c14923f757b5e, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 982ec598143b76746afbd2a13b0a1da8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2269,9 +2269,11 @@ local effectList = {
-- a[属性],b[float]
[118] = function(caster, target, args, interval, skill)
local pro = args[1]
local f1 = args[2]
local f1 = args[2]
BattleLogic.WaitForTrigger(interval, function ()
if (pro==12 or pro==13) and BattleUtil.CheckIsBoss(target) then
return
end
local damage = floor(BattleUtil.ErrorCorrection(f1 * caster:GetRoleData(BattlePropList[pro])))
BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true)
end)
@ -2333,8 +2335,10 @@ local effectList = {
[124] = function(caster, target, args, interval, skill)
local pro = args[1]
local f1 = args[2]
BattleLogic.WaitForTrigger(interval, function ()
if (pro==12 or pro==13) and BattleUtil.CheckIsBoss(target) then
return
end
local damage = floor(BattleUtil.ErrorCorrection(f1 * target:GetRoleData(BattlePropList[pro])))
BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true)
end)

View File

@ -173,6 +173,7 @@ function RewardBoxPanel:SetTopBar()
for n = 0, this.selectBar.transform.childCount-1 do--设置当前页签
Util.AddClick(this.selectBar.transform:GetChild(n).gameObject,function()
curId = 0
RewardBoxPanel:SetGiftData(n+1)
this.selectBtn.transform.parent = this.selectBar.transform:GetChild(n).transform
this.selectBtn.transform.localPosition = Vector3.zero