Merge branch 'master_develop' into 0功能/公会副本
# Conflicts: # data_execl/base_data/MonsterConfig.xlsxdev_chengFeng
commit
c6b0acb7d8
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: bba95498987a2dc4bb032150121232db
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b9c28a22224cab240994f806ef885228
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
|
@ -1,6 +1,6 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &390682369631869273
|
||||
--- !u!1 &455213989645340573
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -8,9 +8,9 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3548671348848776434}
|
||||
- component: {fileID: 2184747530942052943}
|
||||
- component: {fileID: 1372799137081488477}
|
||||
- component: {fileID: 6923744091624053075}
|
||||
- component: {fileID: 6331278726999269556}
|
||||
- component: {fileID: 8693437810846329191}
|
||||
m_Layer: 0
|
||||
m_Name: live2d_c_dhdj_00042
|
||||
m_TagString: Untagged
|
||||
|
|
@ -18,13 +18,13 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3548671348848776434
|
||||
--- !u!224 &6923744091624053075
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 390682369631869273}
|
||||
m_GameObject: {fileID: 455213989645340573}
|
||||
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}
|
||||
|
|
@ -37,21 +37,21 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2184747530942052943
|
||||
--- !u!222 &6331278726999269556
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 390682369631869273}
|
||||
m_GameObject: {fileID: 455213989645340573}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1372799137081488477
|
||||
--- !u!114 &8693437810846329191
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 390682369631869273}
|
||||
m_GameObject: {fileID: 455213989645340573}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9994b005f14363f43aa2d957d67118d4
|
||||
guid: 99a294a54a10ecf4a81c4e9bf3d6d741
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1243129679
|
||||
--- !u!1 &6508717805150910446
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -8,23 +8,23 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1243129680}
|
||||
- component: {fileID: 1243129682}
|
||||
- component: {fileID: 1243129681}
|
||||
m_Layer: 5
|
||||
- component: {fileID: 5717217308216250317}
|
||||
- component: {fileID: 73784017667493157}
|
||||
- component: {fileID: 2386675751477379258}
|
||||
m_Layer: 0
|
||||
m_Name: live2d_c_lslz_00046
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1243129680
|
||||
--- !u!224 &5717217308216250317
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1243129679}
|
||||
m_GameObject: {fileID: 6508717805150910446}
|
||||
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}
|
||||
|
|
@ -37,21 +37,21 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1243129682
|
||||
--- !u!222 &73784017667493157
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1243129679}
|
||||
m_GameObject: {fileID: 6508717805150910446}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1243129681
|
||||
--- !u!114 &2386675751477379258
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1243129679}
|
||||
m_GameObject: {fileID: 6508717805150910446}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8baca0274114f2f4898f3884ccee4bf9
|
||||
guid: c2b6616905b9f934498028aefcad1b4f
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1598983314
|
||||
--- !u!1 &603727892120272939
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -8,24 +8,24 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1598983315}
|
||||
- component: {fileID: 1598983317}
|
||||
- component: {fileID: 1598983316}
|
||||
m_Layer: 5
|
||||
- component: {fileID: 4770290999852293296}
|
||||
- component: {fileID: 7450234269275261447}
|
||||
- component: {fileID: 1198381044707875405}
|
||||
m_Layer: 0
|
||||
m_Name: live2d_c_wsps_00016
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1598983315
|
||||
--- !u!224 &4770290999852293296
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1598983314}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_GameObject: {fileID: 603727892120272939}
|
||||
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: []
|
||||
|
|
@ -37,21 +37,21 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1598983317
|
||||
--- !u!222 &7450234269275261447
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1598983314}
|
||||
m_GameObject: {fileID: 603727892120272939}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1598983316
|
||||
--- !u!114 &1198381044707875405
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1598983314}
|
||||
m_GameObject: {fileID: 603727892120272939}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: def9a64ed4c018f40b3ccc8b5222a5cf
|
||||
guid: 4824968fd39510e4190a11628a7cc7f9
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -1230,7 +1230,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 468}
|
||||
m_AnchoredPosition: {x: -2374, y: 490.8}
|
||||
m_SizeDelta: {x: 910, y: 224}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4530659726193409078
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 740 KiB After Width: | Height: | Size: 837 KiB |
|
|
@ -42,7 +42,7 @@ TextureImporter:
|
|||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 0
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
|
|
@ -69,46 +69,13 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
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: 8e02fc52e352d144d8481625ea555842
|
||||
spriteID: 97f1cb4b5e1eaa94db9f5ba8af336987
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_lslz_00046
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 618 KiB After Width: | Height: | Size: 775 KiB |
|
|
@ -42,7 +42,7 @@ TextureImporter:
|
|||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 0
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
|
|
@ -69,46 +69,13 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
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: 86109a091d9c59a41949452571cbe483
|
||||
spriteID: fa0b480dd91d7fe45af5963b19f499df
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4,5 +4,5 @@ folderAsset: yes
|
|||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_wsps_00016
|
||||
assetBundleVariant: unity3d
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -4,521 +4,416 @@ size: 1024,1024
|
|||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
repeat: none
|
||||
biyan
|
||||
rotate: false
|
||||
xy: 23, 3
|
||||
size: 36, 23
|
||||
orig: 36, 23
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang01
|
||||
rotate: false
|
||||
xy: 2, 28
|
||||
size: 250, 240
|
||||
orig: 250, 240
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang02
|
||||
rotate: false
|
||||
xy: 259, 349
|
||||
size: 174, 251
|
||||
orig: 174, 251
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang03
|
||||
rotate: false
|
||||
xy: 635, 712
|
||||
size: 224, 310
|
||||
orig: 224, 310
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang04
|
||||
biyan_25
|
||||
rotate: true
|
||||
xy: 624, 432
|
||||
size: 168, 90
|
||||
orig: 168, 90
|
||||
xy: 454, 319
|
||||
size: 29, 13
|
||||
orig: 29, 13
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang05
|
||||
bozi_30
|
||||
rotate: false
|
||||
xy: 623, 219
|
||||
size: 74, 105
|
||||
orig: 74, 105
|
||||
xy: 870, 705
|
||||
size: 57, 74
|
||||
orig: 57, 74
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang06
|
||||
diaozhui_10
|
||||
rotate: true
|
||||
xy: 259, 229
|
||||
size: 118, 245
|
||||
orig: 118, 245
|
||||
xy: 494, 630
|
||||
size: 84, 187
|
||||
orig: 84, 187
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang07
|
||||
diaozhui_12
|
||||
rotate: true
|
||||
xy: 593, 874
|
||||
size: 44, 202
|
||||
orig: 44, 202
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
diaozhui_8
|
||||
rotate: true
|
||||
xy: 530, 780
|
||||
size: 92, 191
|
||||
orig: 92, 191
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
diaozhui_9
|
||||
rotate: false
|
||||
xy: 302, 706
|
||||
size: 331, 316
|
||||
orig: 331, 316
|
||||
xy: 649, 491
|
||||
size: 56, 137
|
||||
orig: 56, 137
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
chibang08
|
||||
erduo_21
|
||||
rotate: true
|
||||
xy: 530, 874
|
||||
size: 6, 11
|
||||
orig: 6, 11
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jian_54
|
||||
rotate: true
|
||||
xy: 454, 350
|
||||
size: 153, 58
|
||||
orig: 153, 58
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jianshui_56
|
||||
rotate: false
|
||||
xy: 2, 270
|
||||
size: 255, 358
|
||||
orig: 255, 358
|
||||
xy: 867, 781
|
||||
size: 66, 125
|
||||
orig: 66, 125
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
guanghuan
|
||||
jiao_41
|
||||
rotate: false
|
||||
xy: 2, 630
|
||||
size: 298, 392
|
||||
orig: 298, 392
|
||||
xy: 935, 787
|
||||
size: 64, 119
|
||||
orig: 64, 119
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
hudiejie01
|
||||
rotate: true
|
||||
xy: 501, 6
|
||||
size: 34, 41
|
||||
orig: 34, 41
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
hudiejie02
|
||||
rotate: true
|
||||
xy: 826, 373
|
||||
size: 24, 20
|
||||
orig: 24, 20
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
hudiejie03
|
||||
jiao_42
|
||||
rotate: false
|
||||
xy: 111, 10
|
||||
size: 19, 16
|
||||
orig: 19, 16
|
||||
xy: 635, 375
|
||||
size: 70, 114
|
||||
orig: 70, 114
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao01
|
||||
maomao_1
|
||||
rotate: false
|
||||
xy: 658, 2
|
||||
size: 16, 41
|
||||
orig: 16, 41
|
||||
xy: 307, 185
|
||||
size: 186, 132
|
||||
orig: 186, 132
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao02
|
||||
rotate: true
|
||||
xy: 699, 215
|
||||
size: 26, 87
|
||||
orig: 26, 87
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao03
|
||||
maomao_13
|
||||
rotate: false
|
||||
xy: 757, 130
|
||||
size: 32, 83
|
||||
orig: 32, 83
|
||||
xy: 559, 491
|
||||
size: 88, 137
|
||||
orig: 88, 137
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao04
|
||||
rotate: true
|
||||
xy: 946, 486
|
||||
size: 42, 53
|
||||
orig: 42, 53
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao05
|
||||
maomao_2
|
||||
rotate: false
|
||||
xy: 920, 288
|
||||
size: 41, 81
|
||||
orig: 41, 81
|
||||
xy: 723, 747
|
||||
size: 77, 125
|
||||
orig: 77, 125
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jinshu01
|
||||
maomao_3
|
||||
rotate: true
|
||||
xy: 753, 62
|
||||
size: 66, 56
|
||||
orig: 66, 56
|
||||
xy: 307, 319
|
||||
size: 184, 145
|
||||
orig: 184, 145
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jinshu02
|
||||
piaodai_11
|
||||
rotate: true
|
||||
xy: 825, 696
|
||||
size: 14, 32
|
||||
orig: 14, 32
|
||||
xy: 604, 192
|
||||
size: 33, 61
|
||||
orig: 33, 61
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
lian01
|
||||
piaodai_17
|
||||
rotate: true
|
||||
xy: 693, 229
|
||||
size: 61, 36
|
||||
orig: 61, 36
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai_18
|
||||
rotate: false
|
||||
xy: 848, 371
|
||||
size: 111, 113
|
||||
orig: 111, 113
|
||||
xy: 495, 207
|
||||
size: 50, 141
|
||||
orig: 50, 141
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai01
|
||||
rotate: true
|
||||
xy: 963, 886
|
||||
size: 136, 49
|
||||
orig: 136, 49
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai02
|
||||
rotate: true
|
||||
xy: 660, 116
|
||||
size: 101, 29
|
||||
orig: 101, 29
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai03
|
||||
piaodai_37
|
||||
rotate: false
|
||||
xy: 861, 683
|
||||
size: 100, 339
|
||||
orig: 100, 339
|
||||
xy: 605, 227
|
||||
size: 86, 56
|
||||
orig: 86, 56
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai04
|
||||
rotate: true
|
||||
xy: 716, 399
|
||||
size: 85, 130
|
||||
orig: 85, 130
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai05
|
||||
rotate: true
|
||||
xy: 472, 114
|
||||
size: 99, 186
|
||||
orig: 99, 186
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai06
|
||||
rotate: true
|
||||
xy: 302, 602
|
||||
size: 102, 276
|
||||
orig: 102, 276
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai07
|
||||
rotate: true
|
||||
xy: 699, 243
|
||||
size: 58, 113
|
||||
orig: 58, 113
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai08
|
||||
piaodai_38
|
||||
rotate: false
|
||||
xy: 708, 412
|
||||
size: 6, 18
|
||||
orig: 6, 18
|
||||
xy: 247, 505
|
||||
size: 215, 120
|
||||
orig: 215, 120
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunbai01
|
||||
piaodai_5
|
||||
rotate: false
|
||||
xy: 690, 342
|
||||
size: 91, 31
|
||||
orig: 91, 31
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai_53
|
||||
rotate: false
|
||||
xy: 743, 634
|
||||
size: 43, 23
|
||||
orig: 43, 23
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
piaodai_6
|
||||
rotate: true
|
||||
xy: 506, 215
|
||||
size: 151, 115
|
||||
orig: 151, 115
|
||||
xy: 683, 632
|
||||
size: 82, 58
|
||||
orig: 82, 58
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunbai02
|
||||
piaodai_7
|
||||
rotate: false
|
||||
xy: 254, 109
|
||||
size: 216, 118
|
||||
orig: 216, 118
|
||||
xy: 845, 908
|
||||
size: 164, 112
|
||||
orig: 164, 112
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunbai03
|
||||
qunzi_40
|
||||
rotate: false
|
||||
xy: 2, 430
|
||||
size: 243, 295
|
||||
orig: 243, 295
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
qunzi_43
|
||||
rotate: false
|
||||
xy: 2, 5
|
||||
size: 215, 166
|
||||
orig: 215, 166
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou_34
|
||||
rotate: false
|
||||
xy: 514, 381
|
||||
size: 43, 122
|
||||
orig: 43, 122
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou_35
|
||||
rotate: false
|
||||
xy: 247, 692
|
||||
size: 18, 33
|
||||
orig: 18, 33
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou_49
|
||||
rotate: false
|
||||
xy: 690, 292
|
||||
size: 59, 48
|
||||
orig: 59, 48
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou_50
|
||||
rotate: true
|
||||
xy: 435, 368
|
||||
size: 232, 187
|
||||
orig: 232, 187
|
||||
xy: 707, 375
|
||||
size: 39, 61
|
||||
orig: 39, 61
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha01
|
||||
shou_55
|
||||
rotate: false
|
||||
xy: 615, 45
|
||||
size: 48, 67
|
||||
orig: 48, 67
|
||||
xy: 189, 173
|
||||
size: 25, 27
|
||||
orig: 25, 27
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha02
|
||||
tou_26
|
||||
rotate: false
|
||||
xy: 963, 709
|
||||
size: 59, 51
|
||||
orig: 59, 51
|
||||
xy: 559, 378
|
||||
size: 74, 111
|
||||
orig: 74, 111
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha03
|
||||
toufa_20
|
||||
rotate: false
|
||||
xy: 247, 444
|
||||
size: 55, 59
|
||||
orig: 55, 59
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa_22
|
||||
rotate: true
|
||||
xy: 961, 607
|
||||
size: 74, 61
|
||||
orig: 74, 61
|
||||
xy: 547, 200
|
||||
size: 47, 55
|
||||
orig: 47, 55
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha04
|
||||
toufa_23
|
||||
rotate: true
|
||||
xy: 604, 9
|
||||
size: 34, 52
|
||||
orig: 34, 52
|
||||
xy: 494, 720
|
||||
size: 54, 26
|
||||
orig: 54, 26
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha05
|
||||
toufa_24
|
||||
rotate: true
|
||||
xy: 390, 15
|
||||
size: 30, 60
|
||||
orig: 30, 60
|
||||
xy: 530, 882
|
||||
size: 16, 61
|
||||
orig: 16, 61
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha06
|
||||
toufa_27
|
||||
rotate: true
|
||||
xy: 814, 251
|
||||
size: 50, 44
|
||||
orig: 50, 44
|
||||
xy: 751, 295
|
||||
size: 45, 39
|
||||
orig: 45, 39
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
sha07
|
||||
toufa_28
|
||||
rotate: true
|
||||
xy: 452, 2
|
||||
size: 38, 47
|
||||
orig: 38, 47
|
||||
xy: 1001, 889
|
||||
size: 17, 21
|
||||
orig: 17, 21
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shenti01
|
||||
rotate: false
|
||||
xy: 472, 42
|
||||
size: 70, 70
|
||||
orig: 70, 70
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shiu02
|
||||
rotate: false
|
||||
xy: 963, 251
|
||||
size: 57, 65
|
||||
orig: 57, 65
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou01
|
||||
toufa_57
|
||||
rotate: true
|
||||
xy: 624, 326
|
||||
size: 104, 82
|
||||
orig: 104, 82
|
||||
xy: 797, 909
|
||||
size: 9, 35
|
||||
orig: 9, 35
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou03
|
||||
toufa_58
|
||||
rotate: false
|
||||
xy: 860, 237
|
||||
size: 37, 29
|
||||
orig: 37, 29
|
||||
xy: 464, 505
|
||||
size: 93, 120
|
||||
orig: 93, 120
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou04
|
||||
toufa_59
|
||||
rotate: false
|
||||
xy: 300, 4
|
||||
size: 137, 179
|
||||
orig: 137, 179
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_14
|
||||
rotate: false
|
||||
xy: 707, 514
|
||||
size: 42, 116
|
||||
orig: 42, 116
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_15
|
||||
rotate: true
|
||||
xy: 259, 602
|
||||
size: 26, 25
|
||||
orig: 26, 25
|
||||
xy: 268, 627
|
||||
size: 147, 224
|
||||
orig: 147, 224
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou05
|
||||
yifu_16
|
||||
rotate: true
|
||||
xy: 1001, 486
|
||||
size: 42, 20
|
||||
orig: 42, 20
|
||||
xy: 268, 900
|
||||
size: 120, 323
|
||||
orig: 120, 323
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shou06
|
||||
rotate: false
|
||||
xy: 61, 3
|
||||
size: 36, 23
|
||||
orig: 36, 23
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toiushi03
|
||||
rotate: false
|
||||
xy: 544, 6
|
||||
size: 58, 51
|
||||
orig: 58, 51
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa01
|
||||
yifu_29
|
||||
rotate: true
|
||||
xy: 580, 602
|
||||
size: 102, 76
|
||||
orig: 102, 76
|
||||
xy: 743, 659
|
||||
size: 86, 72
|
||||
orig: 86, 72
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa02
|
||||
rotate: false
|
||||
xy: 708, 303
|
||||
size: 116, 94
|
||||
orig: 116, 94
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa03
|
||||
rotate: false
|
||||
xy: 814, 219
|
||||
size: 36, 30
|
||||
orig: 36, 30
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa04
|
||||
rotate: false
|
||||
xy: 907, 256
|
||||
size: 34, 30
|
||||
orig: 34, 30
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa05
|
||||
rotate: false
|
||||
xy: 475, 350
|
||||
size: 20, 16
|
||||
orig: 20, 16
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa06
|
||||
yifu_34
|
||||
rotate: true
|
||||
xy: 691, 65
|
||||
size: 66, 60
|
||||
orig: 66, 60
|
||||
xy: 158, 173
|
||||
size: 27, 29
|
||||
orig: 27, 29
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa07
|
||||
yifu_39
|
||||
rotate: false
|
||||
xy: 716, 486
|
||||
size: 104, 123
|
||||
orig: 104, 123
|
||||
xy: 2, 727
|
||||
size: 264, 293
|
||||
orig: 264, 293
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa08
|
||||
yifu_44
|
||||
rotate: false
|
||||
xy: 268, 776
|
||||
size: 260, 122
|
||||
orig: 260, 122
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_45
|
||||
rotate: false
|
||||
xy: 219, 2
|
||||
size: 79, 198
|
||||
orig: 79, 198
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_46
|
||||
rotate: false
|
||||
xy: 530, 716
|
||||
size: 190, 62
|
||||
orig: 190, 62
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youyixiu_19
|
||||
rotate: false
|
||||
xy: 547, 249
|
||||
size: 56, 127
|
||||
orig: 56, 127
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youyixiu_47
|
||||
rotate: false
|
||||
xy: 707, 416
|
||||
size: 65, 96
|
||||
orig: 65, 96
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youyixiu_48
|
||||
rotate: true
|
||||
xy: 822, 486
|
||||
size: 104, 122
|
||||
orig: 104, 122
|
||||
xy: 593, 920
|
||||
size: 100, 250
|
||||
orig: 100, 250
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa09
|
||||
youyixiu_51
|
||||
rotate: false
|
||||
xy: 439, 3
|
||||
size: 95, 180
|
||||
orig: 95, 180
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
youyixiu_52
|
||||
rotate: false
|
||||
xy: 817, 678
|
||||
size: 51, 78
|
||||
orig: 51, 78
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
zuoyixiu_32
|
||||
rotate: false
|
||||
xy: 605, 285
|
||||
size: 83, 88
|
||||
orig: 83, 88
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
zuoyixiu_33
|
||||
rotate: true
|
||||
xy: 658, 611
|
||||
size: 99, 165
|
||||
orig: 99, 165
|
||||
xy: 2, 173
|
||||
size: 255, 154
|
||||
orig: 255, 154
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa10
|
||||
zuoyixiu_36
|
||||
rotate: true
|
||||
xy: 254, 47
|
||||
size: 60, 208
|
||||
orig: 60, 208
|
||||
xy: 158, 202
|
||||
size: 226, 147
|
||||
orig: 226, 147
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa11
|
||||
zuoyixiu_4
|
||||
rotate: false
|
||||
xy: 544, 59
|
||||
size: 69, 53
|
||||
orig: 69, 53
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa12
|
||||
rotate: true
|
||||
xy: 826, 304
|
||||
size: 65, 92
|
||||
orig: 65, 92
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa13
|
||||
rotate: false
|
||||
xy: 946, 530
|
||||
size: 76, 60
|
||||
orig: 76, 60
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa14
|
||||
rotate: false
|
||||
xy: 825, 592
|
||||
size: 134, 89
|
||||
orig: 134, 89
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa15
|
||||
rotate: false
|
||||
xy: 691, 133
|
||||
size: 64, 80
|
||||
orig: 64, 80
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa16
|
||||
rotate: true
|
||||
xy: 961, 400
|
||||
size: 84, 58
|
||||
orig: 84, 58
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toushi01
|
||||
rotate: false
|
||||
xy: 963, 318
|
||||
size: 57, 80
|
||||
orig: 57, 80
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toushi02
|
||||
rotate: true
|
||||
xy: 254, 11
|
||||
size: 34, 67
|
||||
orig: 34, 67
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
y01aodai
|
||||
rotate: true
|
||||
xy: 99, 2
|
||||
size: 24, 10
|
||||
orig: 24, 10
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai02
|
||||
rotate: false
|
||||
xy: 323, 5
|
||||
size: 65, 40
|
||||
orig: 65, 40
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai03
|
||||
rotate: false
|
||||
xy: 435, 349
|
||||
size: 38, 17
|
||||
orig: 38, 17
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai04
|
||||
rotate: true
|
||||
xy: 852, 205
|
||||
size: 30, 35
|
||||
orig: 30, 35
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai05
|
||||
rotate: true
|
||||
xy: 943, 265
|
||||
size: 21, 18
|
||||
orig: 21, 18
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai06
|
||||
rotate: true
|
||||
xy: 2, 2
|
||||
size: 24, 19
|
||||
orig: 24, 19
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai07
|
||||
rotate: false
|
||||
xy: 963, 688
|
||||
size: 46, 19
|
||||
orig: 46, 19
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai08
|
||||
rotate: false
|
||||
xy: 963, 762
|
||||
size: 45, 122
|
||||
orig: 45, 122
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yaodai09
|
||||
rotate: false
|
||||
xy: 860, 268
|
||||
size: 45, 34
|
||||
orig: 45, 34
|
||||
xy: 802, 758
|
||||
size: 63, 148
|
||||
orig: 63, 148
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 776 KiB After Width: | Height: | Size: 554 KiB |
|
|
@ -42,7 +42,7 @@ TextureImporter:
|
|||
compressionQuality: 50
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 0
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
|
|
@ -69,46 +69,13 @@ TextureImporter:
|
|||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
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: 395451bf69062e54ca2627d568e33544
|
||||
spriteID: 8869f56ffc7b62044a377955302397e8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1749,6 +1749,7 @@ RANK_TYPE = {
|
|||
FORCE_CURR_RANK=22,-- 实时战力排行
|
||||
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
|
||||
XUANYUANMIRROR_RANK=24,-- 竞技场积分排名 前端自己添加
|
||||
FAST_EXPLORE=25,--极速达人排行
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
|
@ -2020,6 +2021,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1
|
|||
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,Id = 44,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,Id = 42,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false},
|
||||
[6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,Id = 8,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,Id = 42,rankType = RANK_TYPE.FAST_EXPLORE,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
|||
|
|
@ -1980,7 +1980,7 @@ local effectList = {
|
|||
-- 检测技能伤害治疗加成
|
||||
f2 = BattleUtil.CheckSkillDamageHeal(f2, caster, arr[1])
|
||||
-- 治疗血量最低队友实际伤害的f2%
|
||||
BattleUtil.ApplyTreat(caster, arr[1], floor(finalDmg*f2))
|
||||
BattleUtil.ApplyTreat(caster, arr[1], floor(damage*f2))
|
||||
end
|
||||
target.Event:AddEvent(BattleEventName.RoleBeHit, OnBeHit)
|
||||
BattleUtil.CalDamage(skill, caster, target, dt, f1)
|
||||
|
|
|
|||
|
|
@ -1687,7 +1687,8 @@ local passivityList = {
|
|||
local allDamage = 0
|
||||
local OnHit = function(atkRole, damage, bCrit, finalDmg, damageType, skill)
|
||||
if skill and skill.type == BattleSkillType.Special then
|
||||
allDamage = allDamage + finalDmg
|
||||
--吸血修改,finaldag 改成 damage by:王振兴 2020/08/17
|
||||
allDamage = allDamage + damage
|
||||
end
|
||||
end
|
||||
local function onSkillCast(skill)
|
||||
|
|
@ -2615,7 +2616,8 @@ local passivityList = {
|
|||
local f1 = args[2]
|
||||
local onHit = function(target, damage, bCrit, finalDmg)
|
||||
if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function(buff) return buff.damageType == dot end) then
|
||||
BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(finalDmg * f1)))
|
||||
--吸血修改 finaldamage 改为 damage by:往王振兴 2020/08/17
|
||||
BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(damage * f1)))
|
||||
end
|
||||
end
|
||||
local onSkillCast = function(skill)
|
||||
|
|
@ -3133,7 +3135,8 @@ local passivityList = {
|
|||
local f1 = args[2]
|
||||
local onHit = function(target, damage, bCrit, finalDmg)
|
||||
if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function(buff) return buff.damageType == dot end) then
|
||||
BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(finalDmg * f1)))
|
||||
--吸血修改 finaldamage 改为 damage by:往王振兴 2020/08/17
|
||||
BattleUtil.ApplyTreat(role, role, floor(BattleUtil.ErrorCorrection(damage * f1)))
|
||||
end
|
||||
end
|
||||
local onSkillCast = function(skill)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
BattleUtil = {}
|
||||
BattleUtil = {}
|
||||
--local BattleUtil = BattleUtil
|
||||
local floor = math.floor
|
||||
local max = math.max
|
||||
|
|
@ -173,9 +173,11 @@ function BattleUtil.ChooseTarget(role, chooseId)
|
|||
end
|
||||
arr = tempArr
|
||||
elseif chooseLimit == 3 then-- 对列
|
||||
local myCol = role.position % 3
|
||||
local tempArr = BattleUtil.ChooseCol(arr, myCol)
|
||||
if #tempArr == 0 then -- 对列没有人,按顺序找到有人得列
|
||||
local target=RoleManager.GetAggro(role)
|
||||
if target then
|
||||
local myCol = target.position % 3
|
||||
local tempArr = BattleUtil.ChooseCol(arr, myCol)
|
||||
if #tempArr == 0 then -- 对列没有人,按顺序找到有人得列
|
||||
for i = 1, 3 do
|
||||
local col = i % 3 -- 0 表示第三列嗷
|
||||
tempArr = BattleUtil.ChooseCol(arr, col)
|
||||
|
|
@ -183,8 +185,10 @@ function BattleUtil.ChooseTarget(role, chooseId)
|
|||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
arr = tempArr
|
||||
end
|
||||
arr = tempArr
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
-- 选择条件
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
require("Modules.Battle.Logic.Misc.BattleDefine")
|
||||
require("Modules.Battle.Logic.Misc.BattleDefine")
|
||||
local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig")
|
||||
RoleView = {}
|
||||
RoleView.__index = RoleView
|
||||
|
|
@ -310,6 +310,7 @@ function RoleView:LoopFunc(time, count, func)
|
|||
if not self._LoopFuncList then
|
||||
self._LoopFuncList = {}
|
||||
end
|
||||
|
||||
local timer = nil
|
||||
local ctr = 0
|
||||
timer = Timer.New(function ()
|
||||
|
|
@ -1373,7 +1374,8 @@ function RoleView:OnDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType,
|
|||
end
|
||||
--
|
||||
function RoleView:OnceDamaged(atkRole, dmg, bCrit, finalDmg, damageType, dotType, skill)
|
||||
if self.isDead then return end
|
||||
--王振兴注释,为了解决英雄死亡多段伤害显示不完整 2020/8/17
|
||||
--if self.isDead then return end
|
||||
if dotType then
|
||||
if dotType == DotType.Poison then
|
||||
self:ArtFloating(ArtFloatingType.PoisonDamage, ArtFloatingColor.Poison, dmg)
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ function this.RefreshShow(i)
|
|||
|
||||
this.titleBg.sprite=Util.LoadSprite(titleBg[i].bg)
|
||||
this.titleTip.text=titleBg[i].titleTip
|
||||
this.titleTip.gameObject:GetComponent("RectTransform").localPosition =titleBg[i].pos
|
||||
this.titleTip.gameObject:GetComponent("RectTransform").localPosition = titleBg[i].pos
|
||||
this.SetTimeTip()
|
||||
this.SetScroll(i)
|
||||
DailyCarbonPanel:RefreshRedPotShow()
|
||||
|
|
@ -174,7 +174,14 @@ function this.SetScroll(i)
|
|||
this.scrollView:SetData(curData,function(index,root)
|
||||
this.SetData(root,curData[index], curData[index - 1])
|
||||
end)
|
||||
this.scrollView:SetIndex(1)
|
||||
local t = 1
|
||||
for k,v in ipairs(curData) do
|
||||
if not CarbonManager.IsDailyCarbonPass(v.Id) then
|
||||
t = k
|
||||
break
|
||||
end
|
||||
end
|
||||
this.scrollView:SetIndex(t - 2 < 1 and 1 or t - 2)
|
||||
end
|
||||
|
||||
--设置滚动条数据 root根节点 data本地表数据 ldata 上一条数据
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ end
|
|||
|
||||
function this.GetBuyTimesTip()
|
||||
local config = raceTowerConfig[1].Privilege
|
||||
local rechargeCommodityConfig=ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"Id",4003)
|
||||
local rechargeCommodityConfig=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,4003)
|
||||
local rechargeId =tonumber(rechargeCommodityConfig.OpenPrivilege[1])
|
||||
return PrivilegeManager.GetPrivilegeOpenStatusById(rechargeId)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -145,6 +145,14 @@ function this:SwitchView()
|
|||
table.insert(list, go)
|
||||
end
|
||||
)
|
||||
local t = 1
|
||||
for k,v in ipairs(dataList) do
|
||||
if v.state == 1 then
|
||||
t = k
|
||||
break
|
||||
end
|
||||
end
|
||||
this.ScrollView:SetIndex(t - 2 < 1 and 1 or t - 2)
|
||||
end
|
||||
|
||||
function this:NewItemView(config, gameObject, ...)
|
||||
|
|
|
|||
|
|
@ -44,10 +44,7 @@ function Expert:BindEvent()
|
|||
local activityId = ActivityGiftManager.IsActivityTypeOpen(numExChange[activeIndext])
|
||||
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2)
|
||||
end)
|
||||
Util.AddClick(this.sortBtn, function()
|
||||
--UIManager.OpenPanel(UIName.ExpertRewardSortPanel,numExChange[activeIndext],1)
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
||||
end)
|
||||
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
@ -88,6 +85,14 @@ function Expert:OnShowData(index)
|
|||
if globalActive and globalActive.OpenRanking == 1 then
|
||||
this.rewardBtn:SetActive(true)
|
||||
this.sortBtn:SetActive(true)
|
||||
Util.AddClick(this.sortBtn, function()
|
||||
if index == 5 then
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[5])
|
||||
elseif index == 10 then
|
||||
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[7])
|
||||
end
|
||||
|
||||
end)
|
||||
end
|
||||
expertRewardTabs = ActivityGiftManager.GetActivityTypeInfo(numExChange[activeIndext])
|
||||
self.titleBg.sprite = Util.LoadSprite(titleImageSprites[activeIndext])
|
||||
|
|
|
|||
Loading…
Reference in New Issue