Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-11-29 14:39:15 +08:00
commit c71616be27
39 changed files with 340 additions and 330 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: bc065a484ed68314a9255ccdab4c03dd
guid: fb6807a30fbacd049afe3fbc50110248
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
@ -97,7 +97,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: b5e3b8a8dbcf47545b2399db932671d8
spriteID: f99f88e70a01c3f478fda14b19b555a2
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 145 KiB

View File

@ -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

View File

@ -677,7 +677,7 @@ MonoBehaviour:
changeV3: {x: 200, y: -385, z: 0}
changeFloat: 0
duration: 0.5
delay: 0.5
delay: 0.1
curveType: 0
changeType: 0
sequeueType: 1
@ -1292,7 +1292,7 @@ MonoBehaviour:
changeV3: {x: 0, y: 261, z: 0}
changeFloat: 0
duration: 0.5
delay: 0
delay: 0.2
curveType: 10
changeType: 0
sequeueType: 0
@ -1305,7 +1305,7 @@ MonoBehaviour:
changeV3: {x: 350, y: 39, z: 0}
changeFloat: 0
duration: 0.3
delay: 0
delay: 0.2
curveType: 10
changeType: 0
sequeueType: 1
@ -1467,7 +1467,7 @@ MonoBehaviour:
changeV3: {x: -150, y: -385, z: 0}
changeFloat: 0
duration: 0.5
delay: 0.5
delay: 0.1
curveType: 0
changeType: 0
sequeueType: 1

View File

@ -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

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2900318f1d23aed41a2bbad847221caf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0ce1f246ac0f9274199bac2d0e6b63d3
guid: 7307cadd0f6fe1b40bf25b8b60600114
TextScriptImporter:
externalObjects: {}
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 859 KiB

View File

@ -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: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 434547111343c4a4d921d1748bbd9409
guid: 3bc77e9e36e9b854ab96e06e4d549634
TextScriptImporter:
externalObjects: {}
userData:

View File

@ -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}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 46c169e05db028245a272af5fd07201a
guid: f4cf89c472b0a9941bbc2b04492aad86
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

View File

@ -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:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1001ffa37ecc460419745b036d3f0862
guid: 4d920e01b23d86b4d8ac73906ede0a3d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -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: []

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 933890d50f824c645909e9020563420d
guid: 8874d283334a16a44ac5145495051337
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

View File

@ -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

View File

@ -139,7 +139,7 @@ function this.InitActivityServerData(msg, isUpdate)
this.CheckMoneyProgress(v)
this.mission[v.activityId] = v
LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
-- LogYellow("刷新活动数据activityId" .. v.activityId .. " value" .. v.value)
for n, m in ipairs(v.mission) do
--LogGreen(" 刷新活动数据missionId" .. m.missionId .. " state" .. m.state .. " progress" .. m.progress)
if (v.activityId == ActivityTypeDef.OnlineGift) then
@ -176,11 +176,11 @@ function this.InitActivityServerData(msg, isUpdate)
LuckyCatManager.GetRewardProgress(v.mission, v.activityId, v.value)
end
end
if (v.activityId == ActivityTypeDef.SupremeHero) then
for n, m in ipairs(v.mission) do
LogGreen("v.activityId:"..v.activityId.." m.missionId:"..m.missionId.." m.state:"..m.state)
end
end
-- if (v.activityId == ActivityTypeDef.SupremeHero) then
-- for n, m in ipairs(v.mission) do
-- LogGreen("v.activityId:"..v.activityId.." m.missionId:"..m.missionId.." m.state:"..m.state)
-- end
-- end
this.CheckActiveIsOpen(v)
else
LogError("服务器发送了前端不存在的活动ID"..v.activityId)
@ -419,7 +419,7 @@ function this.RefreshActivityData(respond)
--newOpen
if respond.activityInfo then
for i = 1, #respond.activityInfo do
Log("活动开启 " .. respond.activityInfo[i].activityId)
-- Log("活动开启 " .. respond.activityInfo[i].activityId)
this.mission[respond.activityInfo[i].activityId] = respond.activityInfo[i]
local activityType = this.GetActivityTypeFromId(respond.activityInfo[i].activityId)
if activityType == ActivityTypeDef.LuckyCat then --招财猫

View File

@ -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

View File

@ -62,7 +62,10 @@ function LingShowTeHui:OnShow(_sortingOrder,_parent)
self.parent.tabbox:SetActive(false)
self.gameObject:SetActive(true)
sortingOrder = _sortingOrder
self:Refresh()
end
function LingShowTeHui:Refresh()
self.actId = self.actConfig.ActId
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
if self.actConfig.IfBack == 1 then
@ -78,8 +81,7 @@ function LingShowTeHui:OnShow(_sortingOrder,_parent)
end
end
self:OnShowData()
self.time.text = "每周一零点刷新"
-- self:SetTime()
self:SetTime()
end
local FrameSprite = {
[3] = "l_lishoutehui_ziyuan",
@ -144,25 +146,24 @@ function LingShowTeHui:OnShowData()
end
end
-- function LingShowTeHui:SetTime()
-- if self.timer then
-- self.timer:Stop()
-- self.timer = nil
-- end
-- local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui)
-- local timeDown = endTime - GetTimeStamp()
-- self.time.text = "每周一零点刷新"--Language[10470]..TimeToDHMS(timeDown)
-- self.timer = Timer.New(function()
-- timeDown = timeDown - 1
-- if timeDown < 1 then
-- self.timer:Stop()
-- self.timer = nil
-- self.time.text = Language[10470]..TimeToDHMS(0)
-- end
-- self.time.text = Language[10470]..TimeToDHMS(timeDown)
-- end, 1, -1, true)
-- self.timer:Start()
-- end
function LingShowTeHui:SetTime()
if self.timer then
self.timer:Stop()
self.timer = nil
end
-- local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.LingShowTeHui)
local endTime = math.ceil((GetTimeStamp() - PlayerManager.ServerOpenTime)/604800)*604800 + PlayerManager.ServerOpenTime
local timeDown = endTime - GetTimeStamp()
self.time.text = Language[10470]..TimeToDHMS(timeDown)
self.timer = Timer.New(function()
if timeDown <= 0 then
self:Refresh()
end
timeDown = timeDown - 1
self.time.text = Language[10470]..TimeToDHMS(timeDown)
end, 1, -1, true)
self.timer:Start()
end
function LingShowTeHui:OnClose()
self.spLoader:Destroy()

View File

@ -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

View File

@ -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

View File

@ -47,9 +47,7 @@ end
-- 初始化关卡状态, state , 1 已开启未通过 2 :已通过 -1 已开启等级未解锁
function this.InitAllFightPointState(msg)
Log("当前关卡ID " .. msg.fightId)
Log("当前关卡的状态 " .. msg.state)
Log("当前已经挂机的时长 " .. msg.duration)
Log("当前关卡ID " .. tostring(msg.fightId).." 当前关卡的状态:" ..tostring(msg.state).." 当前已经挂机的时长:" .. tostring(msg.duration).." 挂机奖励:"..tostring(msg.reward))
if msg.duration < 0 then
Log("服务器返回的挂机时长是负数,是不是调时间??")
end
@ -62,7 +60,7 @@ function this.InitAllFightPointState(msg)
this.curFightState = msg.state
this.adventrueEnemyList=msg.adventureBossInfo
this.HangOnReward=msg.reward
Log("挂机奖励:"..this.HangOnReward)
Log()
this.maxChapterNum = LengthOfTable(GameDataBase.SheetBase.GetKeys(ConfigManager.GetConfig(ConfigName.MainLevelSettingConfig)))
end

View File

@ -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

View File

@ -108,7 +108,7 @@ function this.InitMsg(msg)
this.serData[id].restTime = restTime
this.serData[id].switch = switch
LogGreen(string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",id, startTime, endTime, switch))
-- LogGreen(string.format("--- 功能解锁数据 id = %s, startTime = %s, endTime = %s, switch = %s",id, startTime, endTime, switch))
-- 用于标记是否解锁使用
local typeId = AllActSetConfig[id].IsIDdSame

View File

@ -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

View File

@ -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
@ -290,6 +291,8 @@ function IncarnationPanel:SetSingleData(go,data,index)
PopupTipPanel.ShowTip(string.format("成功激活%s",data.name))
CheckRedPointStatus(data.property + 438001)
end)
else
PopupTipPanel.ShowTip(string.format("成功激活%s",data.name))
end
end)
Util.AddOnceClick(self.itemPreList[go].incarnationBtn,function()
@ -314,7 +317,9 @@ function IncarnationPanel:SetSingleData(go,data,index)
end)
else
PopupTipPanel.ShowTip("身外化身位置已达上限,请卸下需要替换的化身!")
end
end
else
PopupTipPanel.ShowTip("化身成功!")
end
end)
Util.AddOnceClick(self.itemPreList[go].incarnationningBtn,function()
@ -329,6 +334,8 @@ function IncarnationPanel:SetSingleData(go,data,index)
self.upLayoutItemList[oldPos].btn.gameObject:SetActive(false)
PopupTipPanel.ShowTip("成功卸下身外化身!")
end)
else
PopupTipPanel.ShowTip("成功卸下身外化身!")
end
end)
if data.state == -1 then

View File

@ -93,7 +93,7 @@ function this.GetLingMaiServerData(msg,func)
-- .." practiceLevel:"..tostring(msg.lingmaiData[i].practiceLevel).." servername:"..tostring(msg.lingmaiData[i].servername))
msg.lingmaiData[i].name = PracticeManager.SetNameColor(msg.lingmaiData[i].name,msg.lingmaiData[i].practiceLevel)
end
Log("state:"..tostring(msg.state).." myPlaceId:"..tostring(msg.myOccupyId).." startTime:"..tostring(msg.myOccupyTime)
Log("灵脉秘境:state:"..tostring(msg.state).." myPlaceId:"..tostring(msg.myOccupyId).." startTime:"..tostring(msg.myOccupyTime)
.." fightTime:"..tostring(msg.remainChangeTimes).." lingmaiData:"..tostring(#msg.lingmaiData).." curPage:"..tostring(this.curPage).." timePoint:"..tostring(msg.timePoint))
if func then
func()

View File

@ -942,7 +942,7 @@ function this.TreasureStateIndicaion(buffer)
msg:ParseFromString(data)
-- --LogGreen("msg.score :"..msg.score.." msg.resetTime:"..msg.resetTime)
TreasureOfHeavenManger.UpdateData(msg)
LogPink("推回来的数据长度"..#msg.treasureRewardState)
-- LogPink("推回来的数据长度"..#msg.treasureRewardState)
end
function this.GuildTranscriptIndication(buffer)

View File

@ -11,7 +11,7 @@ end
-- 更新所有周卡数据
function this.UpdateAllWeekCard(msg)
_WeekCardData = {}
LogRed("周卡信息初始化 "..#msg.allWeekCardInfo)
Log("周卡信息初始化 "..#msg.allWeekCardInfo)
for i, data in ipairs(msg.allWeekCardInfo) do
this.UpdateWeekCardData(data)
end
@ -20,7 +20,7 @@ function this.UpdateAllWeekCard(msg)
end
-- 更新月卡数据
function this.UpdateWeekCardData(data)
LogRed("月卡信息更新 "..data.id.." "..tostring(data.isBuy).." "..data.leaveGetRewardDays)
-- LogRed("月卡信息更新 "..data.id.." "..tostring(data.isBuy).." "..data.leaveGetRewardDays)
local week = {}
week.id = data.id
week.isBuy = data.isBuy

View File

@ -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 ()

View File

@ -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

View File

@ -90,7 +90,7 @@ function SurpriseBox:SetItemList()
end
function SurpriseBox:ShowSingleData(item,data,index)
Log("PackId:"..tostring(data.otherData.PackId).." State:"..tostring(data.progress))
-- Log("PackId:"..tostring(data.otherData.PackId).." State:"..tostring(data.progress))
local box = Util.GetGameObject(item,"box"):GetComponent("Image")
local lock = Util.GetGameObject(item,"lock")
local getBtn = Util.GetGameObject(item,"getBtn")

View File

@ -53,9 +53,9 @@ end
function this.SetRewardData(data,time)
rewardState=data
challengeTime=time
for i = 1, #data do
Log("宝箱状态========"..data[1])
end
-- for i = 1, #data do
-- Log("宝箱状态========"..data[1])
-- end
end