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

dev_chengFeng
JieLing 2020-08-25 15:01:25 +08:00
commit 34b2d555b6
61 changed files with 31236 additions and 14697 deletions

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,121 @@
fileFormatVersion: 2
guid: bb880b14f2456f347836e48a5ae490de
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: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
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: []
outline: []
physicsShape: []
bones: []
spriteID: bddba14340984f545b482c1c31e0943e
vertices: []
indices:
edges: []
weights: []
spritePackingTag: FirstRechargeAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 6b75ea0f599324047abb2eb0062a5646
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: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 8
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: 6470252f48d39b74ba335bf6da5a4de7
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GuildAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -42,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f8caebb1f24cd114ebc6fd41468c2df2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: lz4/atlas/treasureofheaven
assetBundleVariant: unity3d

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 326 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: e49470d63bf2a714a8e88b1b0edcbadf
TextureImporter:
fileIDToRecycleName:
21300000: s_shouchong_huoyantexiao
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,17 +69,6 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -103,29 +91,20 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: s_shouchong_huoyantexiao
rect:
serializedVersion: 2
x: 0
y: 0
width: 535
height: 877
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: ef6a0d2bbce50ee4f938afe843f07e0f
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 KiB

After

Width:  |  Height:  |  Size: 424 KiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: d532afd6d7de70f4d9a2d1127da3d376
TextureImporter:
fileIDToRecycleName:
21300000: s_shouchong_piaodai
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,17 +69,6 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -103,29 +91,20 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: s_shouchong_piaodai
rect:
serializedVersion: 2
x: 0
y: 0
width: 1020
height: 550
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: a39cd85a6126456428b5421b00b021d6
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: e962b373e873c3244ae73444564b85e6
TextureImporter:
fileIDToRecycleName:
21300000: s_shouchong_shongwukong
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,17 +69,6 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -103,29 +91,20 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: s_shouchong_shongwukong
rect:
serializedVersion: 2
x: 0
y: 0
width: 1082
height: 1642
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: fad6de25a9c1dbd4b80795404fde734e
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: b9cab930c05fd414f9ce263ded0ec1a0
TextureImporter:
fileIDToRecycleName:
21300000: s_shouchong_yueliang
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
@ -43,7 +42,7 @@ TextureImporter:
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
@ -70,17 +69,6 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
@ -103,29 +91,20 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: s_shouchong_yueliang
rect:
serializedVersion: 2
x: 0
y: 0
width: 1082
height: 1140
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 571b2033782798e4798e770071853069
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []

View File

@ -1,10 +1,7 @@
fileFormatVersion: 2
guid: 84c207e449fc9c640a4038e1b450f55a
timeCreated: 1559530938
licenseType: Pro
NativeFormatImporter:
guid: 3c60d5f5a552dea4f865ae2602186bfc
PrefabImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 366892647d3e4c142a5413ca42646269
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FirstRechargePanel_EFFECT
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107608326603894312}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1102439748192567278
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FirstRechargePanel_EFFECT
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 366892647d3e4c142a5413ca42646269, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107608326603894312
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102439748192567278}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102439748192567278}

View File

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

View File

@ -74,7 +74,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _IsMask: 0
- _IsMask: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1

View File

@ -50,8 +50,8 @@ end
-- 获取货币单位名称
local _t2n = {
[1] = "",
[2] = "美元",
[1] = "%s",
[2] = "$%s",
}
function this.GetMoneyUnitName(mt)
if not mt then

View File

@ -109,7 +109,7 @@ function this.SingleDataShow(pre,value)
local shows = shopItemData.RewardShow
buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")"
if shopItemData.Limit - boughtNum > 0 then
price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName()
price.text = string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price)--shopItemData.Price..MoneyUtil.GetMoneyUnitName()
btnBuy:GetComponent("Button").enabled = true
Util.SetGray(btnBuy, false)
else

View File

@ -108,7 +108,7 @@ function this.SingleDataShow(pre,value)
local shows = shopItemData.RewardShow
buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")"
if shopItemData.Limit - boughtNum > 0 then
price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName()
price.text = string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price)--shopItemData.Price..MoneyUtil.GetMoneyUnitName()
btnBuy:GetComponent("Button").enabled = true
Util.SetGray(btnBuy, false)
else

View File

@ -35,6 +35,8 @@ function EightDayGiftPanel:InitComponent()
this.show = Util.GetGameObject(this.gameObject,"panel/show")--根节点
this.itemPre = Util.GetGameObject(this.gameObject,"panel/show/itemPre")--预设
this.effect = Util.GetGameObject(this.gameObject,"panel/effect")
this.badeffect = Util.GetGameObject(this.effect,"Partical/uv_zi")
this.badeffect:SetActive(false)
end

View File

@ -87,13 +87,13 @@ function this.SingleDataShow(go, data)
LimitText.text = shopItemData.Limit
buyInfo:SetActive( shopItemData.IsDiscount ~= 0 )
if shopItemData.IsDiscount and shopItemData.IsDiscount > 0 then
buyInfo:GetComponent("Text").text = Language[10537]..shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName()
buyInfo:GetComponent("Text").text = Language[10537]..string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price / (shopItemData.IsDiscount/10))--shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName()
end
if goodData then
endTime = goodData.endTime
end
if shopItemData.Limit - boughtNum > 0 then
price.text = shopItemData.Price..MoneyUtil.GetMoneyUnitName()
price.text = string.format(MoneyUtil.GetMoneyUnitName(), shopItemData.Price)--..MoneyUtil.GetMoneyUnitName()
btnBuy:GetComponent("Button").enabled = true
Util.SetGray(btnBuy, false)
else

View File

@ -198,7 +198,7 @@ function HeroStarFeedPage:SetGfitShow()
_ItemViewList[i].gameObject:SetActive(true)
end
self.times.text = Language[10535]..curGiftList[curIndex].dynamicBuyTimes..Language[10054]
self.price.text = RechargeConfig[curGiftId].Price..MoneyUtil.GetMoneyUnitName()
self.price.text = string.format(MoneyUtil.GetMoneyUnitName(), RechargeConfig[curGiftId].Price)--..MoneyUtil.GetMoneyUnitName()
end

View File

@ -82,7 +82,7 @@ function this.SetShow(root,data)
stateBtn:GetComponent("Button").interactable=data.server.buyTimes< data.native.Limit
if data.server.buyTimes< data.native.Limit then--未购买
stateBtnImage.sprite=Util.LoadSprite(StateImageName[1])
stateBtnText.text=data.native.Price..MoneyUtil.GetMoneyUnitName()
stateBtnText.text=string.format(MoneyUtil.GetMoneyUnitName(), data.native.Price)--..MoneyUtil.GetMoneyUnitName()
else
Util.SetGray(stateBtn,true)
stateBtnText.text=Language[10638]

View File

@ -48,8 +48,8 @@ function this.OnShowPanelData()
conFigData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,ids[1] )
shopItemData = OperatingManager.GetGiftGoodsInfo(conFigData.Type,conFigData.Id)
if shopItemData == nil then return end
this.oldPurchaseText.text = Language[10537]..conFigData.Price/(conFigData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName()
this.curPurchaseText.text = Language[10640]..conFigData.Price..MoneyUtil.GetMoneyUnitName()
this.oldPurchaseText.text = Language[10537]..string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price/(conFigData.IsDiscount/10))--..MoneyUtil.GetMoneyUnitName()
this.curPurchaseText.text = Language[10640]..string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price)--..MoneyUtil.GetMoneyUnitName()
this.buyNumText.text = Language[10556]..shopItemData.buyTimes.."/"..conFigData.Limit
if shopItemData.buyTimes <= 0 then
this.buyText.text = Language[10641]

View File

@ -60,11 +60,11 @@ function this.OnShowPanelData(i)
local itemRewardParent=Util.GetGameObject(preGrid[i],"itemRewardParent")
local buyBtn=Util.GetGameObject(preGrid[i],"BuyBtn")
local buyNumText=Util.GetGameObject(preGrid[i],"buyNumText"):GetComponent("Text")
oldPurchaseText.text = Language[10643]..conFigData.Price/(conFigData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName()
oldPurchaseText.text = Language[10643]..string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price/(conFigData.IsDiscount/10))--..MoneyUtil.GetMoneyUnitName()
buyNumText.text = Language[10556]..shopItemData.buyTimes.."/"..conFigData.Limit
-- Log("购买次数 "..shopItemData.buyTimes)
if shopItemData.buyTimes <= 0 then
curPurchaseText.text = conFigData.Price..MoneyUtil.GetMoneyUnitName()
curPurchaseText.text = string.format(MoneyUtil.GetMoneyUnitName(), conFigData.Price)--..MoneyUtil.GetMoneyUnitName()
buyBtn:GetComponent("Button").enabled = true
Util.SetGray(buyBtn, false)
else

View File

@ -14,7 +14,7 @@ local kRewardCount = 2
function DayRewardItem:ctor(mainPanel,transform)
self.mainPanel = mainPanel
self.transform = transform
self.title = Util.GetGameObject(self.transform, "title"):GetComponent("Text")
-- self.title = Util.GetGameObject(self.transform, "title"):GetComponent("Text")
self.rewardContent = Util.GetGameObject(self.transform, "rewardList")
self.rewardList = {}
for i = 1, kRewardCount do

View File

@ -20,6 +20,7 @@ local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardCo
function FirstRechargePanel:InitComponent()
orginLayer = 0
self.frame = Util.GetGameObject(self.transform, "frame")
self.closeBtn = Util.GetGameObject(self.transform, "closeBtn")
self.heroPreviewBtn = Util.GetGameObject(self.transform, "frame/heroPreviewBtn")
self.tenProBtn = Util.GetGameObject(self.transform, "frame/tenProBtn")
@ -45,7 +46,7 @@ function FirstRechargePanel:InitComponent()
self.dayRewardList = {}
for i = 1, kMaxDay do
self.dayRewardList[i] = DayRewardItem.new(self,self.transform:Find("frame/rewardBg/rewardDay" .. i))
self.dayRewardList[i] = DayRewardItem.new(self,self.transform:Find("frame/rewardBg/rewardBg/rewardDay" .. i.."/rewardDay" .. i))
end
--bottomPart
@ -53,7 +54,9 @@ function FirstRechargePanel:InitComponent()
self.reChargeTips = Util.GetGameObject(self.transform, "frame/tips"):GetComponent("Text")
self.effect = Util.GetGameObject(self.transform, "frame/effect")
effectAdapte(Util.GetGameObject(self.effect, "Partical/ziti mask (1)"))
self.qianyao = Util.GetGameObject(self.transform, "qianyao")
self.ani = self.transform:GetComponent("Animator")
-- effectAdapte(Util.GetGameObject(self.effect, "Partical/ziti mask (1)"))
end
function FirstRechargePanel:BindEvent()
@ -92,6 +95,7 @@ end
function FirstRechargePanel:OnSortingOrderChange()
Util.AddParticleSortLayer(self.effect, self.sortingOrder - orginLayer)
Util.AddParticleSortLayer(self.qianyao, self.sortingOrder - orginLayer)
orginLayer = self.sortingOrder
--特效穿透特殊处理
-- if self.itemInfo then
@ -107,6 +111,17 @@ function FirstRechargePanel:OnOpen(context,_fun)
self.selectTabIndex = context.tabIndex and context.tabIndex or 1
-- self:SetOncePart()
fun = _fun
self.qianyao:SetActive(false)
self.qianyao:SetActive(true)
self.frame:SetActive(false)
self.effect:SetActive(false)
self.ani.enabled = false
Timer.New(function ()
self.frame:SetActive(true)
self.effect:SetActive(true)
self.ani.enabled = true
end, 1.5):Start()
end
function FirstRechargePanel:OnShow()
@ -119,7 +134,7 @@ function FirstRechargePanel:OnShow()
AccumRecharge = missInfo.progress
end
end
self.reChargeTips.text = string.format(Language[10663], AccumRecharge)
self.reChargeTips.text = Language[11642]..string.format(MoneyUtil.GetMoneyUnitName(),AccumRecharge)--string.format(Language[10663], AccumRecharge)
for i = 1, kMaxTab do
self:SetTabRedPointStatus(i)
end

View File

@ -172,7 +172,7 @@ function this.SetInfo(id)
this.sendBtn:GetComponent("Button").interactable=surplusNum>0
Util.SetGray(this.sendBtn,surplusNum<1)
this.sendBtnText.text=recharge.Price..Language[11077]
this.sendBtnText.text=string.format(MoneyUtil.GetMoneyUnitName(),recharge.Price)..Language[11062]
--发红包按钮
Util.AddOnceClick(this.sendBtn,function()

View File

@ -180,7 +180,7 @@ function LuckyCatPanel:OnRefresh()
end
end
end
this.rechargeNumberText.text = string.format("<color=#FDC257>%s</color>", againRechargeMoney) .. Language[11136] .. string.format(Language[11137], canGetTime)
this.rechargeNumberText.text = "$"..string.format("<color=#FDC257>%s</color>", againRechargeMoney) .. "即可再抽取" .. string.format(Language[11137], canGetTime)
if (this.isEnter == false) then
this.rechargeNumberText.text = ""
this.textShow.text = ""

View File

@ -455,7 +455,7 @@ function GiftPackPage:RefreshShowData(item, data, type, DataTypeIndex)
else
str=" "
end
price.text = finalNum..str
price.text = string.format(MoneyUtil.GetMoneyUnitName(),finalNum)..str
else
local str=""
local index= string.len(tostring(finalNum))
@ -467,7 +467,7 @@ function GiftPackPage:RefreshShowData(item, data, type, DataTypeIndex)
str=" "
end
icon:SetActive(false)
price.text = finalNum..Language[11453]..str
price.text = string.format(MoneyUtil.GetMoneyUnitName(),finalNum)..str--..Language[11453]
end
buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum
else

View File

@ -226,7 +226,7 @@ function GrowthGiftPage:SetBtnInvestState()
local packageInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward)--packageInfo:当前成长基金礼包IDID101、102、103、104、105
if packageInfo and packageInfo.buyTimes == 0 then
self.btnInvest:GetComponent("Button").enabled = true
self.btnInvestText.text = Language[11471]
self.btnInvestText.text = "$98"
Util.SetGray(self.btnInvest, false)
curGiftsId = packageInfo.goodsId
else

View File

@ -47,7 +47,7 @@ function MonthCardPage:RefreshStoneShow()
local curAllMonthCardData = OperatingManager.GetMonthCardData()
--月卡
local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0
self.smallDay1.text = Language[11476].. monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].Price ..Language[11477]
self.smallDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].Price) .."即可<color=#C94943>激活30天月卡</color>"--Language[11477]
self.smallDay2.text = Language[11478]..monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][2] .."</color>"
self.smallDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.MONTHCARD].BaseReward[1][1]).ResourceID))
self.smallProgress:SetActive(not curMonthCardOpenState)
@ -101,7 +101,7 @@ function MonthCardPage:RefreshStoneShow()
self.bigProgress:GetComponent("Text").text = "("..OperatingManager.GetsmonthSaveAmt().."/"..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price..")"
self.bigDayRightUpText = monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].ContiueDays * monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2]
self.bigDayRightUpIcon = SetIcon(monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1])
self.bigDay1.text = Language[11476].. monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price ..Language[11477]
self.bigDay1.text = Language[11476].. string.format(MoneyUtil.GetMoneyUnitName(),monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].Price) .."即可<color=#C94943>激活30天月卡</color>"--Language[11477]
self.bigDay2.text = Language[11478]..monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][2] .."</color>"
self.bigDayIcon.sprite = Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[MONTH_CARD_TYPE.LUXURYMONTHCARD].BaseReward[1][1]).ResourceID))
self.bigMonthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(MONTH_CARD_TYPE.LUXURYMONTHCARD))

View File

@ -218,7 +218,8 @@ function UpperMonthCard:SetBuyState()
self.boughtPanel:SetActive(isBought)
self.buyPanel:SetActive(not isBought)
Util.SetGray(self.btnBuy, not isActive)
self.textBuy.text = isActive and self.panelType .. MoneyUtil.GetMoneyUnitName() or self.panelType .. MoneyUtil.GetMoneyUnitName()
-- self.textBuy.text = isActive and (self.panelType .. MoneyUtil.GetMoneyUnitName()) or (self.panelType .. MoneyUtil.GetMoneyUnitName())
self.textBuy.text = isActive and (string.format(MoneyUtil.GetMoneyUnitName(),self.panelType)) or (string.format(MoneyUtil.GetMoneyUnitName(),self.panelType))-- .. MoneyUtil.GetMoneyUnitName())
if not isBought then
self:SetBuyPanelInfo()

View File

@ -146,7 +146,7 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
Util.SetGray(btnBuy,not isCanBuy)
icon:GetComponent("Image").enabled=isCanBuy
if isCanBuy then
price.text = finalNum..MoneyUtil.GetMoneyUnitName()
price.text = string.format(MoneyUtil.GetMoneyUnitName(), finalNum)--..MoneyUtil.GetMoneyUnitName()
buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum
else
price.alignment="MiddleCenter"

View File

@ -48,7 +48,7 @@ function this:OnShow(_parent,...)
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.text3.text="需要充值"..string.format(MoneyUtil.GetMoneyUnitName(),b).."以上才可打开"
this.curNum.text=string.format(Language[11637],BagManager.GetItemCountById(94))
Util.SetGray(this.okBtn,VipManager.GetChargedNum()<b)
this.okBtn:GetComponent("Button").interactable=VipManager.GetChargedNum()>=b

View File

@ -505,7 +505,7 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
-- end
price.alignment = "MiddleCenter"
icon:SetActive(false)
price.text = finalNum..MoneyUtil.GetMoneyUnitName()--..str
price.text = string.format(MoneyUtil.GetMoneyUnitName(), finalNum)
end
buyInfo.text = Language[11454]..limitNum - boughtNum .. "/" .. limitNum..Language[11455] --limitNum == -1 and "" or limitNum - boughtNum .. "/" .. limitNum
else

View File

@ -280,7 +280,7 @@ function TreasureOfSomebodyRewardPageV2:InitUnlockCost()
if not TreasureOfSomebodyManagerV2.hadBuyTreasure then
local gameSettingConfig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
-- self.unlockCostIcon.sprite = SetIcon(gameSettingConfig.TreasurePrice[1])
self.unlockCostValue.text = gameSettingConfig.TreasurePrice[2]..MoneyUtil.GetMoneyUnitName()
self.unlockCostValue.text = string.format(MoneyUtil.GetMoneyUnitName(), gameSettingConfig.TreasurePrice[2])--..MoneyUtil.GetMoneyUnitName()
end
end

View File

@ -140,7 +140,7 @@ function UnlockExtraRewardPanel:SetCostValues()
local gameSettingConfig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
local propId = gameSettingConfig.TreasurePrice[1]
-- self.costIcon.sprite = SetIcon(propId)
self.costValue.text = gameSettingConfig.TreasurePrice[2]..MoneyUtil.GetMoneyUnitName()
self.costValue.text = string.format(MoneyUtil.GetMoneyUnitName(), gameSettingConfig.TreasurePrice[2])--..MoneyUtil.GetMoneyUnitName()
self.enoughStatus = BagManager.GetItemCountById(propId) >= gameSettingConfig.TreasurePrice[2]
end

View File

@ -200,7 +200,7 @@ function this:SetGfitShow(rechargeData)
_ItemViewList[i].gameObject:SetActive(true)
end
this.times.text = Language[10535]..rechargeData.dynamicBuyTimes..Language[10054]
this.price.text = RechargeConfig[curGiftId].Price..MoneyUtil.GetMoneyUnitName()
this.price.text = string.format(MoneyUtil.GetMoneyUnitName(), RechargeConfig[curGiftId].Price)--..MoneyUtil.GetMoneyUnitName()
--this.oriPrice.gameObject:SetActive(activityType[curType].price)
end