Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.3 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_00_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 85
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 3.4 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_010_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 100
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_011_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 96
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 3.5 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_012_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 99
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 3.5 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_013_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 102
|
||||||
|
height: 32
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 2.7 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_01_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 80
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.0 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_02_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 84
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 3.1 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_03_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 84
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.0 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_04_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 85
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.1 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_05_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 84
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.2 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_06_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 85
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 2.9 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_07_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 84
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.3 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_08_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 85
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 3.2 KiB |
|
@ -82,7 +82,27 @@ TextureImporter:
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
spriteSheet:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: r_zjm_tequanpaizi_09_vi
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 85
|
||||||
|
height: 33
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
|
|
|
@ -32,10 +32,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 224098953711374262}
|
m_Father: {fileID: 224098953711374262}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 1.3999023, y: 134.2002}
|
m_AnchoredPosition: {x: 1.3999023, y: 134.2002}
|
||||||
m_SizeDelta: {x: -806.3, y: -1654.2}
|
m_SizeDelta: {x: 306, y: 306}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &222819546245374906
|
--- !u!222 &222819546245374906
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -4828,7 +4828,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199130457302089272
|
--- !u!199 &199130457302089272
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -9886,7 +9886,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199080318784643404
|
--- !u!199 &199080318784643404
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -14700,7 +14700,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199260698072189912
|
--- !u!199 &199260698072189912
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -19717,7 +19717,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199218959580742590
|
--- !u!199 &199218959580742590
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -24557,7 +24557,7 @@ ParticleSystem:
|
||||||
--- !u!199 &199817266957694956
|
--- !u!199 &199817266957694956
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -29557,7 +29557,7 @@ ParticleSystem:
|
||||||
--- !u!199 &623019758797236710
|
--- !u!199 &623019758797236710
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
@ -34513,7 +34513,7 @@ ParticleSystem:
|
||||||
--- !u!199 &623088436632093350
|
--- !u!199 &623088436632093350
|
||||||
ParticleSystemRenderer:
|
ParticleSystemRenderer:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 2
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
-- 启用功能引导
|
-- 启用功能引导
|
||||||
ENABLE_FUNC_GUIDE = 1 --0关闭1开启
|
ENABLE_FUNC_GUIDE = 1 --0关闭1开启
|
||||||
RECHARGEABLE = true --false不可充值 true可充值
|
RECHARGEABLE = true --false不可充值 true可充值
|
||||||
IS_PLAY_VOICE = false -- 是否开启游戏内的语音
|
|
||||||
|
|
||||||
-- 引导类型
|
-- 引导类型
|
||||||
GuideType = {
|
GuideType = {
|
||||||
|
|
|
@ -5,14 +5,17 @@ local _ActiveCode = 26 -- 激活版本
|
||||||
ServerConfigManager.SettingConfig = {
|
ServerConfigManager.SettingConfig = {
|
||||||
ServerVersion = "ServerVersion", -- 用于切换正式服和提审服
|
ServerVersion = "ServerVersion", -- 用于切换正式服和提审服
|
||||||
ThinkAnalysis_GetDeviceID = "ThinkAnalysis_GetDeviceID", -- 数数获取DeviceID方法
|
ThinkAnalysis_GetDeviceID = "ThinkAnalysis_GetDeviceID", -- 数数获取DeviceID方法
|
||||||
LayoutBuilderWrap = "LayoutBuilderWrap", -- 强制刷新layout组件大小的方法修改到lua中调用
|
LayoutBuilderWrap = "LayoutBuilderWrap", -- 强制刷新layout组件大小的方法修改到lua中调用
|
||||||
LanguagePackager = "LanguagePackager", -- 本地化处理
|
LanguagePackager = "LanguagePackager", -- 本地化处理
|
||||||
UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 本地化处理
|
UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 屏幕适配
|
||||||
|
IS_PLAY_VOICE = "IS_PLAY_VOICE", -- 是否播放游戏内语音
|
||||||
|
IS_SHOW_HEALTH_TIP = "IS_SHOW_HEALTH_TIP", -- 是否显示健康提示
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function ServerConfigManager.Initialize()
|
function ServerConfigManager.Initialize()
|
||||||
|
IS_PLAY_VOICE = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_PLAY_VOICE) -- 是否开启游戏内的语音
|
||||||
|
IS_SHOW_HEALTH_TIP = ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_SHOW_HEALTH_TIP) -- 是否开启游戏内的语音
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 判断设置是否激活
|
-- 判断设置是否激活
|
||||||
|
|
|
@ -23,26 +23,7 @@ local function createPanel(uiConfig, parent)
|
||||||
recTransform.anchoredPosition3D = Vector3.New(0, 0, 0)
|
recTransform.anchoredPosition3D = Vector3.New(0, 0, 0)
|
||||||
recTransform.sizeDelta = Vector2.New(0, 0)
|
recTransform.sizeDelta = Vector2.New(0, 0)
|
||||||
transform.localRotation = Quaternion.identity
|
transform.localRotation = Quaternion.identity
|
||||||
if GetCurLanguage()~=0 then
|
UIManager.DoLanguageCheck(gameObject)
|
||||||
local textArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Text),true);
|
|
||||||
for i = 0, textArr.Length-1 do
|
|
||||||
local textStr=textArr[i].text
|
|
||||||
textArr[i].text=GetLanguageStrById(textStr)
|
|
||||||
if GetCurLanguage() == 2 and textArr[i].font and (string.find(textArr[i].font.name,"kaiu",1) or string.find(textArr[i].font.name,"FZJinLS",1)) then
|
|
||||||
textArr[i].font = Util.LoadFont()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
|
|
||||||
for i = 0, imageArr.Length-1 do
|
|
||||||
if imageArr[i].sprite then
|
|
||||||
local imgStr=imageArr[i].sprite.name
|
|
||||||
if string.sub(imgStr,-3)=="_zh" then
|
|
||||||
imageArr[i].sprite=Util.LoadSprite(imgStr)
|
|
||||||
Log("资源名称:"..imgStr)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
return gameObject
|
return gameObject
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -612,27 +612,8 @@ function UIManager.CreatePanel(uiConfig, parent)
|
||||||
recTransform.anchoredPosition3D = Vector3.New(0, 0, 0)
|
recTransform.anchoredPosition3D = Vector3.New(0, 0, 0)
|
||||||
recTransform.sizeDelta = Vector2.New(0, 0)
|
recTransform.sizeDelta = Vector2.New(0, 0)
|
||||||
transform.localRotation = Quaternion.identity
|
transform.localRotation = Quaternion.identity
|
||||||
if GetCurLanguage()~=0 then
|
-- 多语言处理
|
||||||
local textArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Text),true);
|
this.DoLanguageCheck(gameObject)
|
||||||
for i = 0, textArr.Length-1 do
|
|
||||||
local textStr=textArr[i].text
|
|
||||||
textArr[i].text=GetLanguageStrById(textStr)
|
|
||||||
if GetCurLanguage() == 2 and textArr[i].font and (string.find(textArr[i].font.name,"kaiu",1) or string.find(textArr[i].font.name,"FZJinLS",1)) then
|
|
||||||
textArr[i].font = Util.LoadFont()
|
|
||||||
end
|
|
||||||
end
|
|
||||||
local imageArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Image),true);
|
|
||||||
for i = 0, imageArr.Length-1 do
|
|
||||||
if imageArr[i].sprite then
|
|
||||||
local imgStr=imageArr[i].sprite.name
|
|
||||||
if string.sub(imgStr,-3)=="_zh" then
|
|
||||||
imageArr[i].sprite=Util.LoadSprite(imgStr)
|
|
||||||
Log("资源名称:"..imgStr)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return gameObject
|
return gameObject
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -664,10 +645,19 @@ function UIManager.CreatePanelAsync(uiConfig, parent, func)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- 不翻译的界面
|
||||||
|
local ExceptPrefabList = {
|
||||||
|
"GMPanel"
|
||||||
|
}
|
||||||
-- 根据语言对界面显示进行修改
|
-- 根据语言对界面显示进行修改
|
||||||
function UIManager.DoLanguageCheck(gameObject)
|
function UIManager.DoLanguageCheck(gameObject)
|
||||||
|
-- 判断是否需要翻译
|
||||||
|
if table.indexof(ExceptPrefabList, gameObject.name) then
|
||||||
|
return
|
||||||
|
end
|
||||||
if GetCurLanguage()~=0 then
|
if GetCurLanguage()~=0 then
|
||||||
local textArr=gameObject:GetComponentsInChildren(typeof(LanguageText),true);
|
local textArr=gameObject:GetComponentsInChildren(typeof(UnityEngine.UI.Text),true);
|
||||||
for i = 0, textArr.Length-1 do
|
for i = 0, textArr.Length-1 do
|
||||||
local textStr=textArr[i].text
|
local textStr=textArr[i].text
|
||||||
textArr[i].text=GetLanguageStrById(textStr)
|
textArr[i].text=GetLanguageStrById(textStr)
|
||||||
|
|
|
@ -60,6 +60,9 @@ function this:InitComponent()
|
||||||
this.logo = Util.GetGameObject(this.gameObject, "logo")
|
this.logo = Util.GetGameObject(this.gameObject, "logo")
|
||||||
this.logo:GetComponent("Image"):SetNativeSize()
|
this.logo:GetComponent("Image"):SetNativeSize()
|
||||||
-- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo)
|
-- BindLightFlash(Util.GetGameObject(this.logo, "saoguang"), this.logo)
|
||||||
|
|
||||||
|
this.healthTip = Util.GetGameObject(this.gameObject, "healthTip")
|
||||||
|
this.healthTip:SetActive(IS_SHOW_HEALTH_TIP)
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
|
|
@ -61,44 +61,44 @@ function GMPanel:InitComponent()
|
||||||
--- subType 类型 Server 直接向服务器请求的GM Func 回调某个方法的GM
|
--- subType 类型 Server 直接向服务器请求的GM Func 回调某个方法的GM
|
||||||
---
|
---
|
||||||
_GMConfig = {
|
_GMConfig = {
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "12#0#%s", btnTip = Language[11170], inputTip = {Language[11171]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "12#0#%s", btnTip = "改名", inputTip = {"输入名称"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "20#0#%s", btnTip = Language[11172], inputTip = {Language[11173]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "20#0#%s", btnTip = "完成", inputTip = {"输入任务ID"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = Language[11174], inputTip = {Language[11175]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = Language[11176], inputTip = {Language[11177]}, callBack = this.SetSunLongScroe},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe},
|
||||||
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "13#%s#0", btnTip = "解锁", inputTip = {"外敌ID"}, callBack = nil},
|
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "13#%s#0", btnTip = "解锁", inputTip = {"外敌ID"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "11#%s#0", btnTip = Language[10732], inputTip = {Language[11178]}, callBack = this.SetVip},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "11#%s#0", btnTip = "确定", inputTip = {"输入Vip等级"}, callBack = this.SetVip},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "7#%s#0", btnTip = Language[11179],inputTip = {Language[11180]}, callBack = this.LVPlayer},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "7#%s#0", btnTip = "角色升级",inputTip = {"输入等级"}, callBack = this.LVPlayer},
|
||||||
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "10#4#%s", btnTip = "设置服务器时间", inputTip = {"例:20170801190000"}, callBack = nil},
|
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "10#4#%s", btnTip = "设置服务器时间", inputTip = {"例:20170801190000"}, callBack = nil},
|
||||||
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "10#%s#0", btnTip = "搜索地图", inputTip = {"输入地图Id"}, callBack = nil},
|
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "10#%s#0", btnTip = "搜索地图", inputTip = {"输入地图Id"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "1#%s", btnTip = Language[11181], inputTip = {Language[11182]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "1#%s", btnTip = "生成道具", inputTip = {"道具ID#道具数量"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[12138], inputTip = {Language[12139]}, callBack = this.GetManyItems},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "批量生成道具", inputTip = {"道具ID#道具数量|..."}, callBack = this.GetManyItems},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "4#%s", btnTip = Language[11183], inputTip = {Language[11184]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "4#%s", btnTip = "生成英雄", inputTip = {"英雄ID#星级"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[12140], inputTip = {Language[12141]}, callBack = this.GetManyHeros},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "批量生成英雄", inputTip = {"英雄ID#星级|..."}, callBack = this.GetManyHeros},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "9#%s#0", btnTip = Language[11185], inputTip = {Language[11186]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "9#%s#0", btnTip = "通关关卡", inputTip = {"关卡id"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "3#1#%s", btnTip = Language[11187], inputTip = {"id,num|id,num..."}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "3#1#%s", btnTip = "发送邮件", inputTip = {"id,num|id,num..."}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "14#%s#0", btnTip = Language[11174], inputTip = {Language[11188]}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 1, args = "14#%s#0", btnTip = "跳转", inputTip = {"试炼副本层数"}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[12142], inputTip = {Language[12143]}, callBack = this.AddHoly},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "添加圣物", inputTip = {"输入圣物ID"}, callBack = this.AddHoly},
|
||||||
{type = GMType.Player, subType = GMSubType.Server, inputNum = 0, args = "8#1#1", btnTip = Language[11189], inputTip = {}, callBack = nil},
|
{type = GMType.Player, subType = GMSubType.Server, inputNum = 0, args = "8#1#1", btnTip = "通关所有关卡", inputTip = {}, callBack = nil},
|
||||||
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 0, args = "6#0#0", btnTip = "一键物品", inputTip = {""}, callBack = nil},
|
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 0, args = "6#0#0", btnTip = "一键物品", inputTip = {""}, callBack = nil},
|
||||||
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 0, args = "22#0#0", btnTip = "一键异妖", inputTip = {""}, callBack = nil},
|
-- {type = GMType.Player, subType = GMSubType.Server, inputNum = 0, args = "22#0#0", btnTip = "一键异妖", inputTip = {""}, callBack = nil},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11190], inputTip = {""}, callBack = this.FiveHero},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成五个12星英雄", inputTip = {""}, callBack = this.FiveHero},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11191], inputTip = {""}, callBack = this.GetMoney},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键很多钱", inputTip = {""}, callBack = this.GetMoney},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11192], inputTip = {""}, callBack = this.Baowu},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级魂灵宝", inputTip = {""}, callBack = this.Baowu},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11193], inputTip = {""}, callBack = this.GetEquipe},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级装备", inputTip = {""}, callBack = this.GetEquipe},
|
||||||
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[12151], inputTip = {""}, callBack = this.GetAllItems},
|
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems},
|
||||||
|
|
||||||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11194], inputTip = {Language[11195]}, callBack = this.TestJump},
|
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "跳转测试", inputTip = {"输入跳转ID"}, callBack = this.TestJump},
|
||||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = Language[11176], inputTip = {Language[11196]}, callBack = nil},
|
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil},
|
||||||
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = Language[11197], inputTip = {Language[11198]}, callBack = nil},
|
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "24#%s", btnTip = "逍遥游", inputTip = {"类型#mapId#bossId"}, callBack = nil},
|
||||||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[12175], inputTip = {Language[12176]}, callBack = this.TestFuncGuide},
|
{type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "功能引导测试", inputTip = {"请输入引导ID"}, callBack = this.TestFuncGuide},
|
||||||
{type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[12285], inputTip = {""}, callBack = this.OpenRedDebug},
|
{type = GMType.Function, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "红点Debug", inputTip = {""}, callBack = this.OpenRedDebug},
|
||||||
|
|
||||||
|
|
||||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11199], inputTip = {""}, callBack = this.GoTestBattle},
|
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "战斗测试场景", inputTip = {""}, callBack = this.GoTestBattle},
|
||||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11200], inputTip = {Language[11201]}, callBack = this.ChallengeMonster},
|
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "挑战怪物", inputTip = {"输入怪物组id"}, callBack = this.ChallengeMonster},
|
||||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11202], inputTip = {Language[11203]}, callBack = this.RunFakeBattle},
|
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "测试假战斗", inputTip = {"输入假战斗id"}, callBack = this.RunFakeBattle},
|
||||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = Language[11204], inputTip = {Language[11205], Language[11206]}, callBack = this.RunBattleData},
|
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "演算战斗数据", inputTip = {"战斗数据", "时间戳"}, callBack = this.RunBattleData},
|
||||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11207], inputTip = {Language[11208]}, callBack = this.RunServerBattle},
|
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "演算后端战斗", inputTip = {"输入战斗id"}, callBack = this.RunServerBattle},
|
||||||
}
|
}
|
||||||
|
|
||||||
this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
|
this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
|
||||||
|
@ -156,7 +156,7 @@ function GMPanel:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GetManyItems(text)
|
function this.GetManyItems(text)
|
||||||
if text == Language[12247] then
|
if text == "一键装备" then
|
||||||
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig))
|
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig))
|
||||||
local cor = coroutine.start(function()
|
local cor = coroutine.start(function()
|
||||||
for k,v in (config) do
|
for k,v in (config) do
|
||||||
|
@ -169,7 +169,7 @@ function this.GetManyItems(text)
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if text == Language[12248] then
|
if text == "一键宝器" then
|
||||||
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig))
|
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig))
|
||||||
local cor = coroutine.start(function()
|
local cor = coroutine.start(function()
|
||||||
for k,v in (config) do
|
for k,v in (config) do
|
||||||
|
@ -180,7 +180,7 @@ function this.GetManyItems(text)
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if text == Language[12249] then
|
if text == "一键魂印" then
|
||||||
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig))
|
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig))
|
||||||
local cor = coroutine.start(function()
|
local cor = coroutine.start(function()
|
||||||
for k,v in (config) do
|
for k,v in (config) do
|
||||||
|
@ -193,7 +193,7 @@ function this.GetManyItems(text)
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if text == Language[12250] then
|
if text == "一键灵兽" then
|
||||||
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimal))
|
local config = ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimal))
|
||||||
local cor = coroutine.start(function()
|
local cor = coroutine.start(function()
|
||||||
for k,v in (config) do
|
for k,v in (config) do
|
||||||
|
@ -343,11 +343,11 @@ end
|
||||||
function this.ChallengeMonster(text)
|
function this.ChallengeMonster(text)
|
||||||
local monsterId = tonumber(text)
|
local monsterId = tonumber(text)
|
||||||
if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then
|
if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then
|
||||||
PopupTipPanel.ShowTip(Language[10700])
|
PopupTipPanel.ShowTip("编队没人,请先上人!")
|
||||||
else
|
else
|
||||||
local MonsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup)
|
local MonsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup)
|
||||||
if not MonsterGroup[monsterId] then
|
if not MonsterGroup[monsterId] then
|
||||||
PopupTipPanel.ShowTip(Language[10704] .. monsterId .. Language[10705])
|
PopupTipPanel.ShowTip("怪物表id :" .. monsterId .. "不存在!")
|
||||||
else
|
else
|
||||||
UIManager.OpenPanel(UIName.BattlePanel, BattleManager.GetBattleData(1, monsterId), nil, nil, nil, monsterId, nil)
|
UIManager.OpenPanel(UIName.BattlePanel, BattleManager.GetBattleData(1, monsterId), nil, nil, nil, monsterId, nil)
|
||||||
end
|
end
|
||||||
|
@ -443,7 +443,7 @@ function GMPanel:OnOpen(...)
|
||||||
local args = {}
|
local args = {}
|
||||||
for i = 1, config.inputNum do
|
for i = 1, config.inputNum do
|
||||||
if input[i].text == "" then
|
if input[i].text == "" then
|
||||||
PopupTipPanel.ShowTip(Language[11209])
|
PopupTipPanel.ShowTip("参数错误")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
table.insert(args, input[i].text)
|
table.insert(args, input[i].text)
|
||||||
|
@ -455,13 +455,13 @@ function GMPanel:OnOpen(...)
|
||||||
if config.callBack then
|
if config.callBack then
|
||||||
config.callBack(unpack(args))
|
config.callBack(unpack(args))
|
||||||
end
|
end
|
||||||
PopupTipPanel.ShowTip(Language[11210])
|
PopupTipPanel.ShowTip("GM应用成功")
|
||||||
end)
|
end)
|
||||||
elseif config.subType == GMSubType.Func then
|
elseif config.subType == GMSubType.Func then
|
||||||
if config.callBack then
|
if config.callBack then
|
||||||
config.callBack(unpack(args))
|
config.callBack(unpack(args))
|
||||||
end
|
end
|
||||||
PopupTipPanel.ShowTip(Language[11210])
|
PopupTipPanel.ShowTip("GM应用成功")
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -134,7 +134,7 @@ end
|
||||||
|
|
||||||
function RewardBoxPanel:RefreshData()
|
function RewardBoxPanel:RefreshData()
|
||||||
this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条
|
this.selectBar:SetActive(#this.rewardGroup ~= 1)--设置顶部属性条
|
||||||
this.tip.text = BagManager.isBagPanel and GetLanguageStrById(Language[12287]) or GetLanguageStrById(Language[12287])--GetLanguageStrById(Language[12288])
|
this.tip.text = BagManager.isBagPanel and GetLanguageStrById(Language[12287]) or GetLanguageStrById(Language[12287])
|
||||||
RewardBoxPanel:SetGiftData()
|
RewardBoxPanel:SetGiftData()
|
||||||
RewardBoxPanel:SetBottom()
|
RewardBoxPanel:SetBottom()
|
||||||
end
|
end
|
||||||
|
|
|
@ -39,6 +39,10 @@ namespace Assets.Scripts.Editor.LanguageTool
|
||||||
"Assets/ManagedResources/~Lua/Logic/Network.lua",
|
"Assets/ManagedResources/~Lua/Logic/Network.lua",
|
||||||
//"Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua"
|
//"Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua"
|
||||||
};
|
};
|
||||||
|
private static string[] ExceptLuaPath = new string[] {
|
||||||
|
"Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua"
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// lua数据文件路径
|
// lua数据文件路径
|
||||||
private static string LuaDataPath = "Assets/ManagedResources/~Lua/Common/Language.lua";
|
private static string LuaDataPath = "Assets/ManagedResources/~Lua/Common/Language.lua";
|
||||||
|
@ -608,9 +612,26 @@ namespace Assets.Scripts.Editor.LanguageTool
|
||||||
/// </summary>
|
/// </summary>
|
||||||
///
|
///
|
||||||
|
|
||||||
|
private static bool IsExceptLuaPath(string path)
|
||||||
|
{
|
||||||
|
foreach(string eptName in ExceptLuaPath)
|
||||||
|
{
|
||||||
|
if (path.Replace("\\", "/").Equals(eptName))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// 遍历lua文件的每一行找到 中文数据并替换
|
// 遍历lua文件的每一行找到 中文数据并替换
|
||||||
private static void CheckLuaPath(string path)
|
private static void CheckLuaPath(string path)
|
||||||
{
|
{
|
||||||
|
if (IsExceptLuaPath(path))
|
||||||
|
{
|
||||||
|
Debug.Log("Except lua file: " + path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
string[] lines = File.ReadAllLines(path, System.Text.Encoding.UTF8);
|
string[] lines = File.ReadAllLines(path, System.Text.Encoding.UTF8);
|
||||||
if (lines.Length <= 0)
|
if (lines.Length <= 0)
|
||||||
{
|
{
|
||||||
|
|