Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
38f70b2c8d
|
@ -65,7 +65,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
skeletonDataAsset: {fileID: 11400000, guid: 46c169e05db028245a272af5fd07201a, type: 2}
|
||||
skeletonDataAsset: {fileID: 11400000, guid: 8874d283334a16a44ac5145495051337, type: 2}
|
||||
initialSkinName: default
|
||||
initialFlipX: 0
|
||||
initialFlipY: 0
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cb7a38853c9edeb48829eec118fd31ba
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/spine/c_0054
|
||||
assetBundleVariant: unity3d
|
Binary file not shown.
Before Width: | Height: | Size: 2.4 MiB |
Binary file not shown.
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2900318f1d23aed41a2bbad847221caf
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -1,503 +1,496 @@
|
|||
|
||||
c_0054.png
|
||||
size: 2048,2048
|
||||
s_fuxi.png
|
||||
size: 1024,1024
|
||||
format: RGBA8888
|
||||
filter: Linear,Linear
|
||||
repeat: none
|
||||
biyan
|
||||
rotate: false
|
||||
xy: 1619, 1351
|
||||
size: 46, 11
|
||||
orig: 46, 11
|
||||
rotate: true
|
||||
xy: 358, 258
|
||||
size: 25, 6
|
||||
orig: 25, 6
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
bozi
|
||||
rotate: false
|
||||
xy: 614, 67
|
||||
size: 51, 89
|
||||
orig: 51, 89
|
||||
rotate: true
|
||||
xy: 215, 3
|
||||
size: 28, 49
|
||||
orig: 28, 49
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
fuzhi_01
|
||||
rotate: false
|
||||
xy: 422, 70
|
||||
size: 141, 80
|
||||
orig: 141, 80
|
||||
xy: 595, 271
|
||||
size: 78, 44
|
||||
orig: 78, 44
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
huzi_01
|
||||
rotate: true
|
||||
xy: 2, 7
|
||||
size: 30, 101
|
||||
orig: 30, 101
|
||||
xy: 759, 237
|
||||
size: 17, 56
|
||||
orig: 17, 56
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao_01
|
||||
rotate: false
|
||||
xy: 1435, 952
|
||||
size: 60, 161
|
||||
orig: 60, 161
|
||||
rotate: true
|
||||
xy: 675, 266
|
||||
size: 33, 89
|
||||
orig: 33, 89
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao_02
|
||||
rotate: true
|
||||
xy: 920, 327
|
||||
size: 74, 240
|
||||
orig: 74, 240
|
||||
rotate: false
|
||||
xy: 511, 184
|
||||
size: 41, 132
|
||||
orig: 41, 132
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
jiao_03
|
||||
rotate: true
|
||||
xy: 1309, 1115
|
||||
size: 60, 180
|
||||
orig: 60, 180
|
||||
rotate: false
|
||||
xy: 987, 552
|
||||
size: 33, 99
|
||||
orig: 33, 99
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
lian
|
||||
rotate: true
|
||||
xy: 990, 179
|
||||
size: 146, 174
|
||||
orig: 146, 174
|
||||
rotate: false
|
||||
xy: 429, 220
|
||||
size: 80, 96
|
||||
orig: 80, 96
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
meimaoyou
|
||||
rotate: false
|
||||
xy: 565, 2
|
||||
size: 19, 6
|
||||
orig: 19, 6
|
||||
xy: 429, 215
|
||||
size: 10, 3
|
||||
orig: 10, 3
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
meimaozuo
|
||||
rotate: false
|
||||
xy: 1186, 704
|
||||
size: 19, 7
|
||||
orig: 19, 7
|
||||
rotate: true
|
||||
xy: 722, 474
|
||||
size: 10, 4
|
||||
orig: 10, 4
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shenqu
|
||||
rotate: true
|
||||
xy: 1130, 876
|
||||
size: 235, 303
|
||||
orig: 235, 303
|
||||
xy: 442, 318
|
||||
size: 129, 167
|
||||
orig: 129, 167
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_01
|
||||
rotate: true
|
||||
xy: 422, 2
|
||||
size: 66, 79
|
||||
orig: 66, 79
|
||||
xy: 595, 161
|
||||
size: 36, 43
|
||||
orig: 36, 43
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_02
|
||||
rotate: false
|
||||
xy: 1308, 240
|
||||
size: 114, 84
|
||||
orig: 114, 84
|
||||
xy: 899, 241
|
||||
size: 63, 46
|
||||
orig: 63, 46
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_03
|
||||
rotate: false
|
||||
xy: 1491, 1132
|
||||
size: 24, 43
|
||||
orig: 24, 43
|
||||
rotate: true
|
||||
xy: 679, 160
|
||||
size: 13, 24
|
||||
orig: 13, 24
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_04
|
||||
rotate: false
|
||||
xy: 1309, 1263
|
||||
size: 39, 62
|
||||
orig: 39, 62
|
||||
xy: 718, 199
|
||||
size: 21, 34
|
||||
orig: 21, 34
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_05
|
||||
rotate: true
|
||||
xy: 736, 130
|
||||
size: 34, 77
|
||||
orig: 34, 77
|
||||
xy: 674, 214
|
||||
size: 19, 42
|
||||
orig: 19, 42
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_06
|
||||
rotate: true
|
||||
xy: 929, 128
|
||||
size: 36, 51
|
||||
orig: 36, 51
|
||||
rotate: false
|
||||
xy: 763, 207
|
||||
size: 20, 28
|
||||
orig: 20, 28
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouyou_07
|
||||
rotate: false
|
||||
xy: 920, 302
|
||||
size: 51, 23
|
||||
orig: 51, 23
|
||||
xy: 692, 471
|
||||
size: 28, 13
|
||||
orig: 28, 13
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouzuo_01
|
||||
rotate: false
|
||||
xy: 874, 123
|
||||
size: 53, 41
|
||||
orig: 53, 41
|
||||
xy: 580, 461
|
||||
size: 29, 23
|
||||
orig: 29, 23
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouzuo_02
|
||||
rotate: false
|
||||
xy: 815, 127
|
||||
size: 57, 37
|
||||
orig: 57, 37
|
||||
rotate: true
|
||||
xy: 741, 202
|
||||
size: 31, 20
|
||||
orig: 31, 20
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouzuo_03
|
||||
rotate: false
|
||||
xy: 667, 73
|
||||
size: 64, 21
|
||||
orig: 64, 21
|
||||
xy: 987, 503
|
||||
size: 35, 12
|
||||
orig: 35, 12
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouzuo_04
|
||||
rotate: false
|
||||
xy: 1970, 1364
|
||||
size: 71, 92
|
||||
orig: 71, 92
|
||||
xy: 359, 93
|
||||
size: 39, 51
|
||||
orig: 39, 51
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
shouzuo_05
|
||||
rotate: false
|
||||
xy: 1166, 264
|
||||
size: 140, 77
|
||||
orig: 140, 77
|
||||
xy: 595, 227
|
||||
size: 77, 42
|
||||
orig: 77, 42
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa_01
|
||||
rotate: true
|
||||
xy: 503, 5
|
||||
size: 63, 60
|
||||
orig: 63, 60
|
||||
rotate: false
|
||||
xy: 987, 517
|
||||
size: 35, 33
|
||||
orig: 35, 33
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa_02
|
||||
rotate: true
|
||||
xy: 736, 103
|
||||
size: 25, 53
|
||||
orig: 25, 53
|
||||
rotate: false
|
||||
xy: 709, 726
|
||||
size: 14, 29
|
||||
orig: 14, 29
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
toufa_03
|
||||
rotate: true
|
||||
xy: 1424, 240
|
||||
size: 65, 70
|
||||
orig: 65, 70
|
||||
xy: 554, 167
|
||||
size: 36, 39
|
||||
orig: 36, 39
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_01
|
||||
rotate: false
|
||||
xy: 1435, 882
|
||||
size: 67, 68
|
||||
orig: 67, 68
|
||||
xy: 640, 160
|
||||
size: 37, 37
|
||||
orig: 37, 37
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_02
|
||||
rotate: false
|
||||
xy: 1553, 1149
|
||||
size: 27, 27
|
||||
orig: 27, 27
|
||||
xy: 922, 488
|
||||
size: 15, 15
|
||||
orig: 15, 15
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_03
|
||||
rotate: false
|
||||
xy: 667, 96
|
||||
size: 67, 68
|
||||
orig: 67, 68
|
||||
xy: 679, 175
|
||||
size: 37, 37
|
||||
orig: 37, 37
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_04
|
||||
rotate: false
|
||||
xy: 565, 10
|
||||
size: 41, 41
|
||||
orig: 41, 41
|
||||
xy: 785, 212
|
||||
size: 23, 23
|
||||
orig: 23, 23
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_05
|
||||
rotate: false
|
||||
xy: 329, 34
|
||||
size: 91, 486
|
||||
orig: 91, 486
|
||||
xy: 870, 488
|
||||
size: 50, 267
|
||||
orig: 50, 267
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_06
|
||||
rotate: false
|
||||
xy: 558, 201
|
||||
size: 93, 506
|
||||
orig: 93, 506
|
||||
xy: 817, 477
|
||||
size: 51, 278
|
||||
orig: 51, 278
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_07
|
||||
rotate: false
|
||||
xy: 105, 2
|
||||
size: 35, 35
|
||||
orig: 35, 35
|
||||
xy: 718, 178
|
||||
size: 19, 19
|
||||
orig: 19, 19
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_08
|
||||
rotate: false
|
||||
xy: 1517, 1142
|
||||
size: 34, 34
|
||||
orig: 34, 34
|
||||
xy: 417, 194
|
||||
size: 19, 19
|
||||
orig: 19, 19
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_09
|
||||
rotate: false
|
||||
xy: 2, 1405
|
||||
size: 774, 641
|
||||
orig: 774, 641
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
wuqi_10
|
||||
rotate: false
|
||||
xy: 778, 1832
|
||||
size: 1040, 214
|
||||
orig: 1040, 214
|
||||
xy: 2, 669
|
||||
size: 426, 353
|
||||
orig: 426, 353
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_01
|
||||
rotate: true
|
||||
xy: 1162, 343
|
||||
size: 53, 150
|
||||
orig: 53, 150
|
||||
xy: 674, 235
|
||||
size: 29, 83
|
||||
orig: 29, 83
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_02
|
||||
rotate: true
|
||||
xy: 1297, 190
|
||||
size: 48, 134
|
||||
orig: 48, 134
|
||||
xy: 595, 199
|
||||
size: 26, 74
|
||||
orig: 26, 74
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_03
|
||||
rotate: true
|
||||
xy: 1820, 1844
|
||||
size: 202, 216
|
||||
orig: 202, 216
|
||||
xy: 903, 375
|
||||
size: 111, 119
|
||||
orig: 111, 119
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_04
|
||||
rotate: false
|
||||
xy: 1308, 488
|
||||
size: 184, 223
|
||||
orig: 184, 223
|
||||
rotate: true
|
||||
xy: 233, 182
|
||||
size: 101, 123
|
||||
orig: 101, 123
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_05
|
||||
rotate: false
|
||||
xy: 1350, 1238
|
||||
size: 264, 110
|
||||
orig: 264, 110
|
||||
rotate: true
|
||||
xy: 366, 215
|
||||
size: 145, 61
|
||||
orig: 145, 61
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_06
|
||||
rotate: true
|
||||
xy: 653, 166
|
||||
size: 134, 335
|
||||
orig: 134, 335
|
||||
rotate: false
|
||||
xy: 827, 291
|
||||
size: 74, 184
|
||||
orig: 74, 184
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_07
|
||||
rotate: false
|
||||
xy: 1853, 1372
|
||||
size: 115, 470
|
||||
orig: 115, 470
|
||||
xy: 922, 505
|
||||
size: 63, 259
|
||||
orig: 63, 259
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_08
|
||||
rotate: false
|
||||
xy: 990, 166
|
||||
size: 11, 11
|
||||
orig: 11, 11
|
||||
xy: 358, 250
|
||||
size: 6, 6
|
||||
orig: 6, 6
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_09
|
||||
rotate: false
|
||||
xy: 565, 53
|
||||
size: 47, 103
|
||||
orig: 47, 103
|
||||
rotate: true
|
||||
xy: 358, 187
|
||||
size: 26, 57
|
||||
orig: 26, 57
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_10
|
||||
rotate: false
|
||||
xy: 1820, 1832
|
||||
size: 10, 10
|
||||
orig: 10, 10
|
||||
xy: 358, 242
|
||||
size: 6, 6
|
||||
orig: 6, 6
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_11
|
||||
rotate: true
|
||||
xy: 1309, 1177
|
||||
size: 59, 201
|
||||
orig: 59, 201
|
||||
rotate: false
|
||||
xy: 987, 653
|
||||
size: 32, 111
|
||||
orig: 32, 111
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_12
|
||||
rotate: false
|
||||
xy: 661, 1333
|
||||
size: 96, 70
|
||||
orig: 96, 70
|
||||
xy: 359, 146
|
||||
size: 53, 39
|
||||
orig: 53, 39
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_13
|
||||
rotate: true
|
||||
xy: 1431, 307
|
||||
size: 106, 78
|
||||
orig: 106, 78
|
||||
rotate: false
|
||||
xy: 766, 256
|
||||
size: 58, 43
|
||||
orig: 58, 43
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_14
|
||||
rotate: true
|
||||
xy: 661, 864
|
||||
size: 247, 467
|
||||
orig: 247, 467
|
||||
rotate: false
|
||||
xy: 442, 449
|
||||
size: 136, 257
|
||||
orig: 136, 257
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_15
|
||||
rotate: false
|
||||
xy: 1970, 1458
|
||||
size: 52, 384
|
||||
orig: 52, 384
|
||||
rotate: true
|
||||
xy: 2, 2
|
||||
size: 29, 211
|
||||
orig: 29, 211
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_16
|
||||
rotate: true
|
||||
xy: 920, 403
|
||||
size: 299, 241
|
||||
orig: 299, 241
|
||||
xy: 692, 301
|
||||
size: 164, 133
|
||||
orig: 164, 133
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_17
|
||||
rotate: true
|
||||
xy: 421, 709
|
||||
size: 694, 238
|
||||
orig: 694, 238
|
||||
xy: 233, 285
|
||||
size: 382, 131
|
||||
orig: 382, 131
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_18
|
||||
rotate: true
|
||||
xy: 778, 1327
|
||||
size: 503, 570
|
||||
orig: 503, 570
|
||||
rotate: false
|
||||
xy: 430, 708
|
||||
size: 277, 314
|
||||
orig: 277, 314
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_19
|
||||
rotate: false
|
||||
xy: 653, 302
|
||||
size: 265, 400
|
||||
orig: 265, 400
|
||||
xy: 580, 486
|
||||
size: 146, 220
|
||||
orig: 146, 220
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_20
|
||||
rotate: true
|
||||
xy: 1308, 415
|
||||
size: 71, 201
|
||||
orig: 71, 201
|
||||
rotate: false
|
||||
xy: 554, 205
|
||||
size: 39, 111
|
||||
orig: 39, 111
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_21
|
||||
rotate: true
|
||||
xy: 2, 522
|
||||
size: 881, 417
|
||||
orig: 881, 417
|
||||
xy: 2, 182
|
||||
size: 485, 229
|
||||
orig: 485, 229
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_22
|
||||
rotate: false
|
||||
xy: 1619, 1364
|
||||
size: 232, 466
|
||||
orig: 232, 466
|
||||
xy: 890, 766
|
||||
size: 128, 256
|
||||
orig: 128, 256
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_23
|
||||
rotate: true
|
||||
xy: 1512, 1178
|
||||
size: 58, 103
|
||||
orig: 58, 103
|
||||
rotate: false
|
||||
xy: 359, 34
|
||||
size: 32, 57
|
||||
orig: 32, 57
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_24
|
||||
rotate: true
|
||||
xy: 142, 19
|
||||
size: 18, 62
|
||||
orig: 18, 62
|
||||
rotate: false
|
||||
xy: 430, 672
|
||||
size: 10, 34
|
||||
orig: 10, 34
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_25
|
||||
rotate: true
|
||||
xy: 558, 158
|
||||
size: 41, 79
|
||||
orig: 41, 79
|
||||
rotate: false
|
||||
xy: 400, 101
|
||||
size: 23, 43
|
||||
orig: 23, 43
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_26
|
||||
rotate: true
|
||||
xy: 1433, 191
|
||||
size: 47, 59
|
||||
orig: 47, 59
|
||||
xy: 359, 6
|
||||
size: 26, 32
|
||||
orig: 26, 32
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_27
|
||||
rotate: false
|
||||
xy: 422, 152
|
||||
size: 134, 555
|
||||
orig: 134, 555
|
||||
xy: 366, 362
|
||||
size: 74, 305
|
||||
orig: 74, 305
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_28
|
||||
rotate: true
|
||||
xy: 1186, 713
|
||||
size: 161, 323
|
||||
orig: 161, 323
|
||||
rotate: false
|
||||
xy: 268, 2
|
||||
size: 89, 178
|
||||
orig: 89, 178
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_29
|
||||
rotate: false
|
||||
xy: 661, 1113
|
||||
size: 646, 212
|
||||
orig: 646, 212
|
||||
rotate: true
|
||||
xy: 903, 289
|
||||
size: 84, 112
|
||||
orig: 84, 112
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_30
|
||||
rotate: false
|
||||
xy: 661, 704
|
||||
size: 523, 158
|
||||
orig: 523, 158
|
||||
rotate: true
|
||||
xy: 728, 467
|
||||
size: 288, 87
|
||||
orig: 288, 87
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_31
|
||||
rotate: true
|
||||
xy: 1314, 326
|
||||
size: 87, 115
|
||||
orig: 87, 115
|
||||
rotate: false
|
||||
xy: 964, 224
|
||||
size: 48, 63
|
||||
orig: 48, 63
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_32
|
||||
rotate: true
|
||||
xy: 1166, 185
|
||||
size: 77, 129
|
||||
orig: 77, 129
|
||||
xy: 826, 247
|
||||
size: 42, 71
|
||||
orig: 42, 71
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_33
|
||||
rotate: false
|
||||
xy: 1350, 1350
|
||||
size: 267, 480
|
||||
orig: 267, 480
|
||||
rotate: true
|
||||
xy: 2, 33
|
||||
size: 147, 264
|
||||
orig: 147, 264
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_34
|
||||
rotate: false
|
||||
xy: 2, 39
|
||||
size: 325, 481
|
||||
orig: 325, 481
|
||||
xy: 709, 757
|
||||
size: 179, 265
|
||||
orig: 179, 265
|
||||
offset: 0, 0
|
||||
index: -1
|
||||
yifu_35
|
||||
rotate: false
|
||||
xy: 1163, 398
|
||||
size: 143, 304
|
||||
orig: 143, 304
|
||||
xy: 611, 317
|
||||
size: 79, 167
|
||||
orig: 79, 167
|
||||
offset: 0, 0
|
||||
index: -1
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0ce1f246ac0f9274199bac2d0e6b63d3
|
||||
guid: 7307cadd0f6fe1b40bf25b8b60600114
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
Binary file not shown.
After Width: | Height: | Size: 859 KiB |
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cfa831af43d4641438aa8278510d1464
|
||||
guid: 5b500452400e7a44b8a3a633335aa14e
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
@ -75,7 +75,7 @@ TextureImporter:
|
|||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 9ecbb3b3a177d6d4da91ffdd797908c3
|
||||
spriteID: 7b9a418a331271e42960bde07e880693
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
Binary file not shown.
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 434547111343c4a4d921d1748bbd9409
|
||||
guid: 3bc77e9e36e9b854ab96e06e4d549634
|
||||
TextScriptImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
|
@ -10,8 +10,8 @@ MonoBehaviour:
|
|||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
|
||||
m_Name: c_0054_Atlas
|
||||
m_Name: s_fuxi_Atlas
|
||||
m_EditorClassIdentifier:
|
||||
atlasFile: {fileID: 4900000, guid: 434547111343c4a4d921d1748bbd9409, type: 3}
|
||||
atlasFile: {fileID: 4900000, guid: 7307cadd0f6fe1b40bf25b8b60600114, type: 3}
|
||||
materials:
|
||||
- {fileID: 2100000, guid: 1001ffa37ecc460419745b036d3f0862, type: 2}
|
||||
- {fileID: 2100000, guid: 4d920e01b23d86b4d8ac73906ede0a3d, type: 2}
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 46c169e05db028245a272af5fd07201a
|
||||
guid: f4cf89c472b0a9941bbc2b04492aad86
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
|
@ -7,7 +7,7 @@ Material:
|
|||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: c_0054_Material
|
||||
m_Name: s_fuxi_Material
|
||||
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 4
|
||||
|
@ -20,7 +20,7 @@ Material:
|
|||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: cfa831af43d4641438aa8278510d1464, type: 3}
|
||||
m_Texture: {fileID: 2800000, guid: 5b500452400e7a44b8a3a633335aa14e, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 1001ffa37ecc460419745b036d3f0862
|
||||
guid: 4d920e01b23d86b4d8ac73906ede0a3d
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
|
@ -10,12 +10,12 @@ MonoBehaviour:
|
|||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
|
||||
m_Name: c_0054_SkeletonData
|
||||
m_Name: s_fuxi_SkeletonData
|
||||
m_EditorClassIdentifier:
|
||||
atlasAssets:
|
||||
- {fileID: 11400000, guid: 933890d50f824c645909e9020563420d, type: 2}
|
||||
- {fileID: 11400000, guid: f4cf89c472b0a9941bbc2b04492aad86, type: 2}
|
||||
scale: 0.01
|
||||
skeletonJSON: {fileID: 4900000, guid: 0ce1f246ac0f9274199bac2d0e6b63d3, type: 3}
|
||||
skeletonJSON: {fileID: 4900000, guid: 3bc77e9e36e9b854ab96e06e4d549634, type: 3}
|
||||
fromAnimation: []
|
||||
toAnimation: []
|
||||
duration: []
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 933890d50f824c645909e9020563420d
|
||||
guid: 8874d283334a16a44ac5145495051337
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
|
@ -538,9 +538,12 @@ function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rot
|
|||
end
|
||||
|
||||
--设置英雄立绘朝向
|
||||
function SetHEeroLiveToward(go,toward)
|
||||
function SetHEeroLiveToward(go,toward,pos)
|
||||
if go and toward==1 then
|
||||
go.transform.rotation=Vector3.New(0,180,0)
|
||||
if pos then
|
||||
go.transform.localPosition=Vector3.New(-pos[1],pos[2],0)
|
||||
end
|
||||
else
|
||||
go.transform.rotation=Vector3.New(0,0,0)
|
||||
end
|
||||
|
|
|
@ -156,6 +156,7 @@ function this.ShowTitleData(curHeroCompoundData)
|
|||
this.compoundHerolive.texture = CardRendererManager.GetSpineTexture(1, liveName, Vector3.one * scale, livePos, true)
|
||||
this.compoundHerolive.transform.localScale = Vector3.one
|
||||
this.compoundHerolive.transform.localPosition = Vector3.zero
|
||||
SetHEeroLiveToward(this.compoundHerolive,heroConfig.Toward)
|
||||
this.compoundHeropro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
this.compoundHeroname.text=GetLanguageStrById(heroConfig.ReadingName)
|
||||
if zsName == "" then
|
||||
|
|
|
@ -182,7 +182,7 @@ function TimeLimitUpHero:RefreshHeroData()
|
|||
end
|
||||
lastLiveName=GetResourcePath(curConfig.Live)
|
||||
heroLiveObj=HeroManager.LoadHerolive1(curConfig,self.heroPar)
|
||||
SetHEeroLiveToward(heroLiveObj,curConfig.Toward)
|
||||
SetHEeroLiveToward(heroLiveObj,curConfig.Toward,curConfig.Position)
|
||||
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(self.actId)
|
||||
local totalTimes = 0
|
||||
for i = 1, #wishConfig.UpList do
|
||||
|
|
|
@ -156,6 +156,9 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local scale = roleConfig.play_liveScale
|
||||
local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)
|
||||
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
|
||||
if heroConfig.Toward==2 then
|
||||
SetHEeroLiveToward(live,1)
|
||||
end
|
||||
live.transform.localScale = Vector3.one
|
||||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
|
|
|
@ -185,7 +185,9 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
live.texture = CardRendererManager.GetSpineTexture(_pos + 6, liveName, Vector3.one * scale, livePos, true)
|
||||
live.transform.localScale = Vector3.one
|
||||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
if heroConfig.Toward==2 then
|
||||
SetHEeroLiveToward(live,1)
|
||||
end
|
||||
local zs = Util.GetGameObject(o, "zs")
|
||||
local zsName = GetHeroCardStarZs[curMonsterConfig.Star]
|
||||
if zsName == "" then
|
||||
|
|
|
@ -375,6 +375,7 @@ function HandBookHeroInfoPanel:LoadHerolive(_heroData, _objPoint)
|
|||
poolManager:SetLiveClearCall(_heroData.Live, testLive, function ()
|
||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
||||
end)
|
||||
SetHEeroLiveToward(testLive,_heroData.Toward,_heroData.Position)
|
||||
return testLive
|
||||
end
|
||||
|
||||
|
|
|
@ -210,6 +210,7 @@ function IncarnationPanel:RefreshSingleCardPre(cardPre,data,isJump,index)
|
|||
end
|
||||
self.cardList[cardPre].icon.transform.localScale = Vector3.one
|
||||
self.cardList[cardPre].icon.transform.localPosition = Vector3.zero
|
||||
SetHEeroLiveToward(self.cardList[cardPre].icon.gameObject,heroConfig[data.heroId].Toward)
|
||||
self.cardList[cardPre].proImage.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.property))
|
||||
self.cardList[cardPre].cardBg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[data.quality])
|
||||
if isJump then
|
||||
|
|
|
@ -135,6 +135,7 @@ function ElementDrawCardPanelNew:BtnAction(index)
|
|||
self.liveNode = poolManager:LoadLive(name, self.root.transform,Vector3.one *heroConfig.Scale, Vector3.New(heroConfig.Position[1], heroConfig.Position[2], 0))
|
||||
self.liveNode.name = name
|
||||
SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic")
|
||||
SetHEeroLiveToward(self.liveNode,heroConfig.Toward)
|
||||
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
|
||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
|
||||
poolManager:SetLiveClearCall(name, self.liveNode, function ()
|
||||
|
|
|
@ -365,10 +365,10 @@ function this:RightBtnOnClick()
|
|||
end
|
||||
Util.ClearChild(this.leftObj.transform)
|
||||
this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj)
|
||||
SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward)
|
||||
SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward,leftHeroData.position)
|
||||
this.curLiveObj = this.rightLiveObj
|
||||
this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj)
|
||||
SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward)
|
||||
SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward,rightHeroData.position)
|
||||
local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic")
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
|
||||
this.rightBtn:GetComponent("Button").enabled = true
|
||||
|
@ -411,10 +411,10 @@ function this:LeftBtnOnClick()
|
|||
end
|
||||
Util.ClearChild(this.rightObj.transform)
|
||||
this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj)
|
||||
SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward)
|
||||
SetHEeroLiveToward(this.rightLiveObj,rightHeroData.heroConfig.Toward,rightHeroData.position)
|
||||
this.curLiveObj = this.leftLiveObj
|
||||
this.leftLiveObj = HeroManager.LoadHerolive(leftHeroData,this.leftObj)
|
||||
SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward)
|
||||
SetHEeroLiveToward(this.leftLiveObj,leftHeroData.heroConfig.Toward,leftHeroData.position)
|
||||
local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic")
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
|
||||
this.leftBtn:GetComponent("Button").enabled = true
|
||||
|
@ -717,7 +717,7 @@ function this:ChangeCurentHeroSkinLive(herodata)
|
|||
if herodata then
|
||||
this.curLiveObj=HeroManager.LoadHerolive1(herodata,this.curObj)
|
||||
if herodata.heroConfig then
|
||||
SetHEeroLiveToward(this.curLiveObj,herodata.heroConfig.Toward)
|
||||
SetHEeroLiveToward(this.curLiveObj,herodata.heroConfig.Toward,herodata.position)
|
||||
end
|
||||
|
||||
-- 临时保存皮肤位置
|
||||
|
@ -735,7 +735,7 @@ function this:ChangeCurentHeroSkinLive(herodata)
|
|||
end
|
||||
this.force.text = WarPower
|
||||
this.curLiveObj=HeroManager.LoadHerolive(curHeroData,this.curObj)
|
||||
SetHEeroLiveToward(this.curLiveObj,curHeroData.heroConfig.Toward)
|
||||
SetHEeroLiveToward(this.curLiveObj,curHeroData.heroConfig.Toward,curHeroData.position)
|
||||
-- 清空临时保存的皮肤位置
|
||||
curHeroPosition = nil
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue