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

dev_chengFeng
ZhangBiao 2020-07-28 17:26:50 +08:00
commit 88effd78f1
26 changed files with 1423 additions and 11131 deletions

View File

@ -7,8 +7,8 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: c_jlbuyuan_0008_c_jlbuyuan_0008
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_Name: H_1298
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -20,9 +20,10 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 38fcdd55acaeb104f92074841e4c782b, type: 3}
m_Texture: {fileID: 2800000, guid: 96c7ea5ce2a2fb748ac03d19fd227d44, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []
- _InvFade: 1
m_Colors:
- _TintColor: {r: 1, g: 1, b: 1, a: 1}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 908b0243bc1c53a4d9b6ac268ff779f6
guid: 8398e0a00de65af48a7d506f195c72f8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

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: glow_00119
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
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: 50c51cbce89995f4a80295be1e2456e1, 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: 0.5}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: ec3d9885603c35a4e95d5701400620cd
timeCreated: 1496944588
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -0,0 +1,56 @@
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:

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 7465a82a7e2828f48b218d5c22b3958c
guid: 05f8dee4de693de4988933d77cd8e18b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName: lz4/prefabs/effect/hit/normal_effect
assetBundleVariant: unity3d
assetBundleName:
assetBundleVariant:

View File

@ -4937,7 +4937,7 @@ Transform:
m_GameObject: {fileID: 3296818072287369563}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1.2476789, y: 2.7367935, z: 1.2162287}
m_LocalScale: {x: 2, y: 2.7367935, z: 1.2162287}
m_Children: []
m_Father: {fileID: 3296818072337454894}
m_RootOrder: 2
@ -5144,7 +5144,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3296818072534741029}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:

View File

@ -5366,9 +5366,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 541, y: 961}
m_SizeDelta: {x: 1080, y: 1920}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &921277676
CanvasRenderer:
@ -51126,7 +51126,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_SizeDelta: {x: 100, y: 185}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -61539,7 +61539,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5551596210412472397

View File

@ -1496,7 +1496,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: 0, z: 0}
initFloat: 1
@ -2794,9 +2793,9 @@ RectTransform:
m_Father: {fileID: 7565913136373196857}
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_AnchoredPosition: {x: 37.7, y: 499.8}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 37.7, y: -460.2}
m_SizeDelta: {x: 0, y: 2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1175462737290454025
@ -3527,7 +3526,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: 0, z: 0}
initFloat: 1
@ -4365,7 +4363,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: 0, z: 0}
initFloat: 1
@ -8004,7 +8001,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: 0, z: 0}
initFloat: 1
@ -20840,7 +20836,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: 0, z: 0}
initFloat: 1

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: dfdcc81ace455b048bb572571724313e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: lz4/spine/c_jlbuyuan_0008
assetBundleVariant: unity3d

View File

@ -1,305 +0,0 @@
c_jlbuyuan_0008.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
011_biyan
rotate: true
xy: 935, 94
size: 94, 41
orig: 94, 41
offset: 0, 0
index: -1
011_hudiejie
rotate: true
xy: 625, 10
size: 63, 74
orig: 63, 74
offset: 0, 0
index: -1
011_suizi001
rotate: true
xy: 2, 293
size: 170, 244
orig: 170, 244
offset: 0, 0
index: -1
011_toubu
rotate: true
xy: 620, 75
size: 207, 313
orig: 207, 313
offset: 0, 0
index: -1
011_toufa001
rotate: false
xy: 382, 74
size: 236, 217
orig: 236, 217
offset: 0, 0
index: -1
011_toufa003
rotate: true
xy: 737, 22
size: 51, 139
orig: 51, 139
offset: 0, 0
index: -1
011_toufa004
rotate: true
xy: 248, 293
size: 170, 163
orig: 170, 163
offset: 0, 0
index: -1
011_toufa007
rotate: true
xy: 620, 671
size: 351, 398
orig: 351, 398
offset: 0, 0
index: -1
011_toufa009
rotate: true
xy: 620, 284
size: 385, 391
orig: 385, 391
offset: 0, 0
index: -1
011_wujian003
rotate: false
xy: 878, 29
size: 106, 44
orig: 106, 44
offset: 0, 0
index: -1
011_wujian004
rotate: false
xy: 701, 17
size: 34, 56
orig: 34, 56
offset: 0, 0
index: -1
011_wujian005
rotate: false
xy: 421, 5
size: 108, 67
orig: 108, 67
offset: 0, 0
index: -1
011_xiabai005
rotate: false
xy: 69, 4
size: 311, 287
orig: 311, 287
offset: 0, 0
index: -1
011_xiongbu
rotate: false
xy: 413, 296
size: 188, 167
orig: 188, 167
offset: 0, 0
index: -1
011_youshou
rotate: true
xy: 531, 9
size: 63, 92
orig: 63, 92
offset: 0, 0
index: -1
011_youxiaobi
rotate: true
xy: 382, 2
size: 70, 37
orig: 70, 37
offset: 0, 0
index: -1
011_youxiaotui
rotate: false
xy: 2, 8
size: 65, 274
orig: 65, 274
offset: 0, 0
index: -1
011_zuoshangbi001
rotate: false
xy: 2, 465
size: 616, 557
orig: 616, 557
offset: 0, 0
index: -1
n222
rotate: false
xy: 935, 190
size: 78, 92
orig: 78, 92
offset: 0, 0
index: -1
c_jlbuyuan_00082.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
011_suizi002
rotate: false
xy: 2, 2
size: 267, 164
orig: 267, 164
offset: 0, 0
index: -1
011_toufa002
rotate: true
xy: 871, 381
size: 184, 139
orig: 184, 139
offset: 0, 0
index: -1
011_toufa006
rotate: true
xy: 501, 567
size: 441, 515
orig: 441, 515
offset: 0, 0
index: -1
011_toufa008
rotate: false
xy: 2, 422
size: 497, 586
orig: 497, 586
offset: 0, 0
index: -1
011_xiabai001
rotate: true
xy: 867, 238
size: 141, 92
orig: 141, 92
offset: 0, 0
index: -1
011_xiabai004
rotate: true
xy: 2, 168
size: 252, 550
orig: 252, 550
offset: 0, 0
index: -1
011_youdatui
rotate: false
xy: 776, 225
size: 89, 225
orig: 89, 225
offset: 0, 0
index: -1
011_zuodatui
rotate: true
xy: 271, 72
size: 94, 270
orig: 94, 270
offset: 0, 0
index: -1
011_zuoshangbi002
rotate: true
xy: 554, 31
size: 419, 220
orig: 419, 220
offset: 0, 0
index: -1
011_zuoxiaotui
rotate: true
xy: 501, 452
size: 113, 368
orig: 113, 368
offset: 0, 0
index: -1
n111
rotate: false
xy: 776, 4
size: 106, 219
orig: 106, 219
offset: 0, 0
index: -1
n333
rotate: false
xy: 884, 40
size: 95, 196
orig: 95, 196
offset: 0, 0
index: -1
c_jlbuyuan_00083.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
011_qunbai
rotate: true
xy: 329, 82
size: 345, 184
orig: 345, 184
offset: 0, 0
index: -1
011_shenti
rotate: false
xy: 766, 540
size: 206, 422
orig: 206, 422
offset: 0, 0
index: -1
011_toufa005
rotate: false
xy: 2, 95
size: 325, 332
orig: 325, 332
offset: 0, 0
index: -1
011_wujian001
rotate: false
xy: 2, 5
size: 114, 88
orig: 114, 88
offset: 0, 0
index: -1
011_wujian002
rotate: false
xy: 218, 2
size: 91, 91
orig: 91, 91
offset: 0, 0
index: -1
011_xiabai002
rotate: false
xy: 766, 423
size: 97, 115
orig: 97, 115
offset: 0, 0
index: -1
011_xiabai003
rotate: false
xy: 536, 395
size: 228, 567
orig: 228, 567
offset: 0, 0
index: -1
011_youshangbi
rotate: false
xy: 2, 429
size: 532, 533
orig: 532, 533
offset: 0, 0
index: -1
011_zuoshou
rotate: true
xy: 865, 428
size: 110, 88
orig: 110, 88
offset: 0, 0
index: -1
011_zuoxiaobi
rotate: false
xy: 118, 4
size: 98, 89
orig: 98, 89
offset: 0, 0
index: -1

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 596 KiB

View File

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

View File

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

View File

@ -1,17 +0,0 @@
%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_jlbuyuan_0008_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: 19c1d510266c5d54c996caa5c64f74d1, type: 3}
materials:
- {fileID: 2100000, guid: 908b0243bc1c53a4d9b6ac268ff779f6, type: 2}

View File

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

View File

@ -1,23 +0,0 @@
%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_jlbuyuan_0008_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: 8deac1b26f700fc43b2f4e61ebfd7bfb, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 5b1ef16b20845344fa7d8a4889514c50, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

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

View File

@ -115,6 +115,23 @@ function UIManager.Adapter()
rectTransform.offsetMin = Vector2.New(rectTransform.offsetMin.x, rectTransform.offsetMin.y + UIManager.Offset.Bottom)
rectTransform.offsetMax = Vector2.New(rectTransform.offsetMax.x, rectTransform.offsetMax.y - UIManager.Offset.Top)
rectTransform = this.screenMask1:GetComponent("RectTransform")
rectTransform.anchorMin = Vector2.New(0, 1)
rectTransform.anchorMax = Vector2.New(1, 1)
rectTransform.offsetMin = Vector2.New(0, 0)
rectTransform.offsetMax = Vector2.New(0, 0)
rectTransform.pivot = Vector2.New(0.5, 1)
rectTransform.sizeDelta = Vector2.New(0, UIManager.Offset.Top)
rectTransform = this.screenMask2:GetComponent("RectTransform")
rectTransform.anchorMin = Vector2.New(0, 0)
rectTransform.anchorMax = Vector2.New(1, 0)
rectTransform.offsetMin = Vector2.New(0, 0)
rectTransform.offsetMax = Vector2.New(0, 0)
rectTransform.pivot = Vector2.New(0.5, 0)
rectTransform.sizeDelta = Vector2.New(0, UIManager.Offset.Bottom)
elseif n < standard then
local w = 1920 / Screen.height * Screen.width
local f = (w-1080) / 2

View File

@ -236,7 +236,9 @@ function BattleLogic.TurnRound(debugTurn)
BattleLogic.BuffMgr:TurnUpdate(2) -- 计算持续伤害(除去流血)
-- 如果角色无法释放技能
if not SkillRole:IsAvailable() then
if not SkillRole:IsAvailable() -- 角色不能释放技能
or (SkillRole:IsDead() and not BattleLogic.BuffMgr:HasBuff(SkillRole,BuffName.NoDead)) --将死但没有不死buff
then
BattleLogic.BuffMgr:TurnUpdate(3) -- 计算持续伤害(流血)
BattleLogic.BuffMgr:TurnUpdate(4) -- 计算其他buff
BattleLogic.BuffMgr:PassUpdate() -- 计算buff轮数

View File

@ -120,7 +120,7 @@ function this.ShowGuide(id, ...)
DataCenterManager.CommitClickStatus(Language[10839], tostring(id))
ThinkingAnalyticsManager.Track("guild", {
step_id = id,
guild_start_time = math.floor(GetTimeStamp()).. "#3",
guild_start_time = math.floor(GetTimeStamp()),
})
-- 引导结束回调
local function onGuideClose()

View File

@ -33,6 +33,11 @@ namespace GameEditor
SetAudio(audioImporter);
}
//音频导入后处理
public void OnPostprocessAudio(AudioClip clip)
{
}
void OnPreprocessTexture()
{
@ -79,9 +84,9 @@ namespace GameEditor
public void SetAudio(AudioImporter audioImporter) {
audioImporter.SetAudioSettingExt("Android",AudioClipLoadType.Streaming);
audioImporter.SetAudioSettingExt("iPhone", AudioClipLoadType.Streaming);
audioImporter.SetAudioSettingExt("Standalone", AudioClipLoadType.Streaming);
//audioImporter.SetAudioSettingExt("Android",AudioClipLoadType.Streaming);
//audioImporter.SetAudioSettingExt("iPhone", AudioClipLoadType.Streaming);
//audioImporter.SetAudioSettingExt("Standalone", AudioClipLoadType.Streaming);
}