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

dev_chengFeng
jiaoyangna 2021-12-24 16:31:41 +08:00
commit 577752e71d
38 changed files with 1398 additions and 224 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

View File

@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 718372430775889281}
- component: {fileID: 7311019884520983636}
m_Layer: 0
m_Name: c_0022
m_Name: live2d_c_0022
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -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: 944d6ab4feca3ae408e49643e34ff152, type: 2}
skeletonDataAsset: {fileID: 11400000, guid: 2843444b9e1f72149a041ad2d301d3de, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0

View File

@ -0,0 +1,85 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8326377314930467075
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3606803276679486026}
- component: {fileID: 7729634043404442727}
- component: {fileID: 6174702492525351813}
m_Layer: 0
m_Name: zq_hunian
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3606803276679486026
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326377314930467075}
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: []
m_Father: {fileID: 0}
m_RootOrder: 0
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7729634043404442727
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326377314930467075}
m_CullTransparentMesh: 0
--- !u!114 &6174702492525351813
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8326377314930467075}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
skeletonDataAsset: {fileID: 11400000, guid: e794fbe451ba25a439bae21fc0082382, type: 2}
initialSkinName: default
initialFlipX: 0
initialFlipY: 0
startingAnimation: idle1
startingLoop: 1
timeScale: 1
freeze: 0
unscaledTime: 0
meshGenerator:
settings:
useClipping: 1
zSpacing: 0
pmaVertexColors: 1
tintBlack: 0
calculateTangents: 0
addNormals: 0
immutableTriangles: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c11db3ffb144e2241af54d31e8e2c6f0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6,421 +6,421 @@ filter: Linear,Linear
repeat: none
biyan_14
rotate: false
xy: 676, 245
size: 41, 31
orig: 41, 31
xy: 961, 308
size: 48, 36
orig: 48, 36
offset: 0, 0
index: -1
bozi_53
rotate: false
xy: 985, 803
size: 37, 62
orig: 37, 62
xy: 873, 317
size: 43, 73
orig: 43, 73
offset: 0, 0
index: -1
erzhui_1
rotate: true
xy: 762, 597
size: 37, 27
orig: 37, 27
xy: 990, 495
size: 43, 32
orig: 43, 32
offset: 0, 0
index: -1
erzhui_2
rotate: true
xy: 199, 17
size: 35, 22
orig: 35, 22
rotate: false
xy: 918, 298
size: 41, 25
orig: 41, 25
offset: 0, 0
index: -1
erzhui_3
rotate: false
xy: 231, 60
size: 126, 104
orig: 126, 104
xy: 322, 147
size: 147, 122
orig: 147, 122
offset: 0, 0
index: -1
fazhan_20
rotate: true
xy: 530, 366
size: 236, 43
orig: 236, 43
rotate: false
xy: 271, 352
size: 276, 50
orig: 276, 50
offset: 0, 0
index: -1
jiao_10
rotate: false
xy: 984, 637
size: 22, 22
orig: 22, 22
xy: 990, 468
size: 25, 25
orig: 25, 25
offset: 0, 0
index: -1
jiao_11
rotate: false
xy: 1008, 633
size: 14, 26
orig: 14, 26
xy: 201, 2
size: 16, 31
orig: 16, 31
offset: 0, 0
index: -1
jiemao_15
rotate: false
xy: 645, 370
size: 11, 13
orig: 11, 13
xy: 534, 287
size: 13, 15
orig: 13, 15
offset: 0, 0
index: -1
jiemao_16
rotate: true
xy: 575, 591
size: 11, 10
orig: 11, 10
rotate: false
xy: 680, 165
size: 13, 11
orig: 13, 11
offset: 0, 0
index: -1
qunzi_35
rotate: false
xy: 542, 119
size: 104, 125
orig: 104, 125
rotate: true
xy: 549, 280
size: 122, 146
orig: 122, 146
offset: 0, 0
index: -1
qunzi_68
rotate: true
xy: 358, 241
size: 361, 170
orig: 361, 170
rotate: false
xy: 538, 824
size: 421, 198
orig: 421, 198
offset: 0, 0
index: -1
qunzi_69
rotate: false
xy: 587, 825
size: 195, 197
orig: 195, 197
xy: 2, 35
size: 228, 230
orig: 228, 230
offset: 0, 0
index: -1
shenti_34
rotate: true
xy: 359, 67
size: 102, 149
orig: 102, 149
rotate: false
xy: 775, 648
size: 119, 174
orig: 119, 174
offset: 0, 0
index: -1
tou_17
rotate: true
xy: 949, 952
size: 70, 73
orig: 70, 73
rotate: false
xy: 514, 193
size: 81, 85
orig: 81, 85
offset: 0, 0
index: -1
toufa_12
rotate: true
xy: 676, 278
size: 44, 39
orig: 44, 39
xy: 961, 346
size: 52, 46
orig: 52, 46
offset: 0, 0
index: -1
toufa_13
rotate: false
xy: 632, 324
size: 83, 39
orig: 83, 39
xy: 597, 178
size: 97, 46
orig: 97, 46
offset: 0, 0
index: -1
toufa_18
rotate: true
xy: 734, 454
size: 85, 57
orig: 85, 57
rotate: false
xy: 888, 400
size: 99, 67
orig: 99, 67
offset: 0, 0
index: -1
toufa_19
rotate: false
xy: 510, 134
size: 30, 35
orig: 30, 35
rotate: true
xy: 918, 261
size: 35, 41
orig: 35, 41
offset: 0, 0
index: -1
toufa_21
rotate: true
xy: 621, 366
size: 17, 22
orig: 17, 22
rotate: false
xy: 477, 72
size: 20, 26
orig: 20, 26
offset: 0, 0
index: -1
toufa_22
rotate: false
xy: 783, 574
size: 6, 21
orig: 6, 21
rotate: true
xy: 485, 271
size: 7, 25
orig: 7, 25
offset: 0, 0
index: -1
toufa_23
rotate: false
xy: 962, 830
size: 18, 35
orig: 18, 35
rotate: true
xy: 158, 12
size: 21, 41
orig: 21, 41
offset: 0, 0
index: -1
toufa_24
rotate: true
xy: 93, 4
size: 11, 40
orig: 11, 40
rotate: false
xy: 534, 304
size: 13, 46
orig: 13, 46
offset: 0, 0
index: -1
toufa_25
rotate: false
xy: 528, 101
size: 11, 31
orig: 11, 31
xy: 322, 109
size: 13, 36
orig: 13, 36
offset: 0, 0
index: -1
toufa_8
rotate: false
xy: 962, 867
size: 60, 40
orig: 60, 40
rotate: true
xy: 485, 280
size: 70, 47
orig: 70, 47
offset: 0, 0
index: -1
toufa_8aa
rotate: false
xy: 358, 604
size: 227, 418
orig: 227, 418
xy: 271, 535
size: 265, 487
orig: 265, 487
offset: 0, 0
index: -1
toufa_9
rotate: true
xy: 575, 366
size: 81, 44
orig: 81, 44
rotate: false
xy: 597, 226
size: 95, 52
orig: 95, 52
offset: 0, 0
index: -1
wuqi_46
rotate: false
xy: 2, 166
size: 354, 856
orig: 354, 856
xy: 2, 267
size: 267, 755
orig: 267, 755
offset: 0, 0
index: -1
xiuzi_l_26
rotate: false
xy: 717, 334
size: 15, 29
orig: 15, 29
xy: 457, 64
size: 18, 34
orig: 18, 34
offset: 0, 0
index: -1
xiuzi_l_27
rotate: false
xy: 530, 246
size: 100, 118
orig: 100, 118
xy: 339, 7
size: 116, 138
orig: 116, 138
offset: 0, 0
index: -1
xiuzi_l_28
rotate: true
xy: 791, 596
size: 86, 100
orig: 86, 100
rotate: false
xy: 915, 540
size: 100, 116
orig: 100, 116
offset: 0, 0
index: -1
xiuzi_l_48
rotate: true
xy: 2, 2
size: 50, 89
orig: 50, 89
rotate: false
xy: 961, 918
size: 59, 104
orig: 59, 104
offset: 0, 0
index: -1
xiuzi_l_49
rotate: false
xy: 985, 711
size: 32, 44
orig: 32, 44
rotate: true
xy: 961, 268
size: 38, 51
orig: 38, 51
offset: 0, 0
index: -1
xiuzi_l_50
rotate: false
xy: 658, 365
size: 77, 74
orig: 77, 74
xy: 781, 304
size: 90, 86
orig: 90, 86
offset: 0, 0
index: -1
xiuzi_l_51
rotate: false
xy: 662, 441
size: 70, 98
orig: 70, 98
xy: 697, 290
size: 82, 114
orig: 82, 114
offset: 0, 0
index: -1
xiuzi_l_52
rotate: false
xy: 984, 661
size: 38, 34
orig: 38, 34
rotate: true
xy: 457, 100
size: 45, 39
orig: 45, 39
offset: 0, 0
index: -1
xiuzi_l_58
rotate: false
xy: 784, 903
size: 163, 119
orig: 163, 119
rotate: true
xy: 538, 404
size: 190, 139
orig: 190, 139
offset: 0, 0
index: -1
xiuzi_r_54
rotate: true
xy: 893, 577
size: 118, 89
orig: 118, 89
rotate: false
xy: 775, 542
size: 138, 104
orig: 138, 104
offset: 0, 0
index: -1
xiuzi_r_71
rotate: false
xy: 2, 54
size: 227, 110
orig: 227, 110
xy: 271, 404
size: 265, 129
orig: 265, 129
offset: 0, 0
index: -1
xiuzi_r_73
rotate: false
xy: 791, 684
size: 100, 140
orig: 100, 140
xy: 896, 658
size: 116, 164
orig: 116, 164
offset: 0, 0
index: -1
xiuzi_r_74
rotate: false
xy: 737, 376
size: 55, 76
orig: 55, 76
rotate: true
xy: 684, 538
size: 64, 89
orig: 64, 89
offset: 0, 0
index: -1
yaodai_33
rotate: true
xy: 632, 246
size: 76, 42
orig: 76, 42
xy: 961, 828
size: 88, 49
orig: 88, 49
offset: 0, 0
index: -1
yaodai_5
rotate: false
xy: 784, 826
size: 139, 75
orig: 139, 75
rotate: true
xy: 232, 103
size: 162, 88
orig: 162, 88
offset: 0, 0
index: -1
yaodai_55
rotate: false
xy: 737, 365
size: 21, 9
orig: 21, 9
rotate: true
xy: 219, 8
size: 25, 11
orig: 25, 11
offset: 0, 0
index: -1
yifu_32
rotate: false
xy: 575, 449
size: 85, 90
orig: 85, 90
rotate: true
xy: 232, 2
size: 99, 105
orig: 99, 105
offset: 0, 0
index: -1
youshou_72
rotate: false
xy: 925, 826
size: 35, 75
orig: 35, 75
rotate: true
xy: 590, 135
size: 41, 88
orig: 41, 88
offset: 0, 0
index: -1
youtui_40
rotate: false
xy: 713, 636
size: 76, 187
orig: 76, 187
xy: 684, 604
size: 89, 218
orig: 89, 218
offset: 0, 0
index: -1
youtui_41
rotate: true
xy: 701, 541
size: 86, 59
orig: 86, 59
rotate: false
xy: 888, 469
size: 100, 69
orig: 100, 69
offset: 0, 0
index: -1
youtui_42
rotate: true
xy: 949, 909
size: 41, 63
orig: 41, 63
xy: 514, 143
size: 48, 74
orig: 48, 74
offset: 0, 0
index: -1
youtui_75
rotate: true
xy: 648, 219
size: 25, 26
orig: 25, 26
rotate: false
xy: 2, 2
size: 29, 31
orig: 29, 31
offset: 0, 0
index: -1
yumao_6
rotate: true
xy: 621, 385
size: 62, 35
orig: 62, 35
xy: 918, 325
size: 73, 41
orig: 73, 41
offset: 0, 0
index: -1
yumao_7
rotate: true
xy: 985, 697
size: 12, 23
orig: 12, 23
rotate: false
xy: 498, 119
size: 14, 27
orig: 14, 27
offset: 0, 0
index: -1
zuoshou_29
rotate: false
xy: 985, 757
size: 37, 44
orig: 37, 44
xy: 873, 263
size: 43, 52
orig: 43, 52
offset: 0, 0
index: -1
zuoshou_30
rotate: true
xy: 893, 697
size: 127, 90
orig: 127, 90
xy: 781, 392
size: 148, 105
orig: 148, 105
offset: 0, 0
index: -1
zuoshou_31
rotate: false
xy: 587, 541
size: 112, 86
orig: 112, 86
rotate: true
xy: 679, 406
size: 130, 100
orig: 130, 100
offset: 0, 0
index: -1
zuoshou_47
rotate: false
xy: 762, 553
size: 19, 42
orig: 19, 42
rotate: true
xy: 107, 11
size: 22, 49
orig: 22, 49
offset: 0, 0
index: -1
zuotui_36
rotate: false
xy: 510, 70
size: 16, 62
orig: 16, 62
rotate: true
xy: 33, 14
size: 19, 72
orig: 19, 72
offset: 0, 0
index: -1
zuotui_37
rotate: false
xy: 587, 629
size: 124, 194
orig: 124, 194
xy: 538, 596
size: 144, 226
orig: 144, 226
offset: 0, 0
index: -1
zuotui_38
rotate: true
xy: 358, 171
size: 68, 182
orig: 68, 182
xy: 271, 271
size: 79, 212
orig: 79, 212
offset: 0, 0
index: -1
zuotui_39
rotate: true
xy: 93, 17
size: 35, 104
orig: 35, 104
rotate: false
xy: 471, 148
size: 41, 121
orig: 41, 121
offset: 0, 0
index: -1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 551 KiB

After

Width:  |  Height:  |  Size: 674 KiB

View File

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

View File

@ -0,0 +1,230 @@
s_ce_1.png
size: 2048,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
baobao
rotate: true
xy: 1113, 254
size: 167, 90
orig: 167, 90
offset: 0, 0
index: -1
biyan1
rotate: false
xy: 426, 2
size: 80, 68
orig: 80, 68
offset: 0, 0
index: -1
hua1
rotate: true
xy: 1113, 139
size: 113, 76
orig: 113, 76
offset: 0, 0
index: -1
hua2
rotate: false
xy: 1287, 198
size: 37, 52
orig: 37, 52
offset: 0, 0
index: -1
jianhua1
rotate: false
xy: 1191, 177
size: 94, 73
orig: 94, 73
offset: 0, 0
index: -1
jianhua7
rotate: true
xy: 1513, 420
size: 130, 170
orig: 130, 170
offset: 0, 0
index: -1
jiao2
rotate: true
xy: 1487, 795
size: 226, 442
orig: 226, 442
offset: 0, 0
index: -1
jiao4
rotate: false
xy: 839, 179
size: 272, 242
orig: 272, 242
offset: 0, 0
index: -1
jiao5
rotate: true
xy: 2, 13
size: 195, 422
orig: 195, 422
offset: 0, 0
index: -1
lain
rotate: true
xy: 1205, 252
size: 131, 138
orig: 131, 138
offset: 0, 0
index: -1
qunzi1
rotate: false
xy: 839, 715
size: 646, 306
orig: 646, 306
offset: 0, 0
index: -1
qunzi2
rotate: false
xy: 426, 72
size: 365, 136
orig: 365, 136
offset: 0, 0
index: -1
toufa1
rotate: false
xy: 1685, 437
size: 109, 103
orig: 109, 103
offset: 0, 0
index: -1
toufa2
rotate: true
xy: 1738, 542
size: 123, 140
orig: 123, 140
offset: 0, 0
index: -1
toufa3
rotate: true
xy: 1345, 273
size: 110, 143
orig: 110, 143
offset: 0, 0
index: -1
toufa4
rotate: true
xy: 1931, 796
size: 49, 61
orig: 49, 61
offset: 0, 0
index: -1
toufa5
rotate: false
xy: 936, 73
size: 138, 104
orig: 138, 104
offset: 0, 0
index: -1
toufa6
rotate: false
xy: 1796, 422
size: 79, 118
orig: 79, 118
offset: 0, 0
index: -1
tu11
rotate: true
xy: 1931, 847
size: 174, 89
orig: 174, 89
offset: 0, 0
index: -1
tu12
rotate: true
xy: 1994, 790
size: 55, 52
orig: 55, 52
offset: 0, 0
index: -1
tu13
rotate: false
xy: 1513, 385
size: 87, 33
orig: 87, 33
offset: 0, 0
index: -1
tu14
rotate: true
xy: 1076, 82
size: 95, 35
orig: 95, 35
offset: 0, 0
index: -1
tu15
rotate: false
xy: 2, 210
size: 835, 811
orig: 835, 811
offset: 0, 0
index: -1
tu16
rotate: true
xy: 1113, 89
size: 48, 60
orig: 48, 60
offset: 0, 0
index: -1
tu17
rotate: false
xy: 1490, 329
size: 63, 54
orig: 63, 54
offset: 0, 0
index: -1
tu18
rotate: false
xy: 1738, 667
size: 171, 126
orig: 171, 126
offset: 0, 0
index: -1
tu5
rotate: false
xy: 793, 65
size: 141, 112
orig: 141, 112
offset: 0, 0
index: -1
xiong1
rotate: false
xy: 1513, 552
size: 223, 241
orig: 223, 241
offset: 0, 0
index: -1
xiong2
rotate: true
xy: 1191, 143
size: 32, 68
orig: 32, 68
offset: 0, 0
index: -1
yanjiemao
rotate: false
xy: 1487, 775
size: 11, 18
orig: 11, 18
offset: 0, 0
index: -1
youshou3
rotate: false
xy: 839, 423
size: 380, 290
orig: 380, 290
offset: 0, 0
index: -1
zuoshou3
rotate: false
xy: 1221, 385
size: 290, 328
orig: 290, 328
offset: 0, 0
index: -1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 84de474332f663e4b8cb6b9a719ab72c
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: b4ffc137722aaf746bc8f0a6576c22a4
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: d0106698a8771b1459e595b55a3e0624
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 714342d3bfd65264da7daaebfae25bbc
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: s_ce_1_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: 84de474332f663e4b8cb6b9a719ab72c, type: 3}
materials:
- {fileID: 2100000, guid: f2b2fa94e97fb41448b078e8164671af, type: 2}

View File

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

View File

@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: s_ce_1_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: b4ffc137722aaf746bc8f0a6576c22a4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []

View File

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

View File

@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: s_ce_1_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: fdccaf0513f2bef488756b703c6f742c, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 714342d3bfd65264da7daaebfae25bbc, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2843444b9e1f72149a041ad2d301d3de
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@ -0,0 +1,419 @@
zq_hunian.png
size: 1024,1024
format: RGBA8888
filter: Linear,Linear
repeat: none
b_an_5
rotate: false
xy: 328, 669
size: 180, 161
orig: 180, 161
offset: 0, 0
index: -1
b_denglong_10
rotate: true
xy: 719, 627
size: 43, 75
orig: 43, 75
offset: 0, 0
index: -1
b_denglong_7
rotate: true
xy: 818, 675
size: 68, 83
orig: 68, 83
offset: 0, 0
index: -1
b_denglong_8
rotate: true
xy: 595, 515
size: 44, 74
orig: 44, 74
offset: 0, 0
index: -1
b_denglong_9
rotate: true
xy: 595, 561
size: 68, 82
orig: 68, 82
offset: 0, 0
index: -1
b_erduo_11
rotate: false
xy: 671, 501
size: 57, 58
orig: 57, 58
offset: 0, 0
index: -1
b_erduo_12
rotate: false
xy: 730, 515
size: 59, 59
orig: 59, 59
offset: 0, 0
index: -1
b_houtui_3
rotate: false
xy: 510, 705
size: 90, 125
orig: 90, 125
offset: 0, 0
index: -1
b_houtui_4
rotate: false
xy: 445, 87
size: 96, 132
orig: 96, 132
offset: 0, 0
index: -1
b_shengzi_2
rotate: false
xy: 2, 760
size: 286, 262
orig: 286, 262
offset: 0, 0
index: -1
b_shenti_6
rotate: false
xy: 325, 389
size: 177, 137
orig: 177, 137
offset: 0, 0
index: -1
b_tou_13
rotate: true
xy: 195, 529
size: 229, 131
orig: 229, 131
offset: 0, 0
index: -1
b_weiba_1
rotate: false
xy: 2, 227
size: 188, 214
orig: 188, 214
offset: 0, 0
index: -1
f_biyan_10
rotate: true
xy: 290, 781
size: 49, 36
orig: 49, 36
offset: 0, 0
index: -1
f_biyan_9
rotate: true
xy: 985, 737
size: 49, 34
orig: 49, 34
offset: 0, 0
index: -1
f_denglong_17
rotate: false
xy: 504, 270
size: 60, 81
orig: 60, 81
offset: 0, 0
index: -1
f_denglong_18
rotate: false
xy: 679, 561
size: 33, 68
orig: 33, 68
offset: 0, 0
index: -1
f_denglong_19
rotate: false
xy: 504, 353
size: 64, 81
orig: 64, 81
offset: 0, 0
index: -1
f_denglong_20
rotate: false
xy: 282, 20
size: 33, 68
orig: 33, 68
offset: 0, 0
index: -1
f_diaosui_2
rotate: true
xy: 504, 226
size: 42, 65
orig: 42, 65
offset: 0, 0
index: -1
f_diaosui_4
rotate: true
xy: 730, 488
size: 25, 54
orig: 25, 54
offset: 0, 0
index: -1
f_diaosui_6
rotate: false
xy: 570, 379
size: 25, 55
orig: 25, 55
offset: 0, 0
index: -1
f_erduo_7
rotate: false
xy: 317, 34
size: 56, 56
orig: 56, 56
offset: 0, 0
index: -1
f_erduo_8
rotate: false
xy: 375, 34
size: 56, 56
orig: 56, 56
offset: 0, 0
index: -1
f_hudiejie_1
rotate: false
xy: 714, 576
size: 72, 49
orig: 72, 49
offset: 0, 0
index: -1
f_shengzi_16
rotate: false
xy: 783, 862
size: 225, 160
orig: 225, 160
offset: 0, 0
index: -1
f_shenti_12
rotate: false
xy: 159, 90
size: 140, 134
orig: 140, 134
offset: 0, 0
index: -1
f_shenti_15
rotate: true
xy: 526, 584
size: 119, 67
orig: 119, 67
offset: 0, 0
index: -1
f_tongqian_3
rotate: false
xy: 121, 2
size: 18, 29
orig: 18, 29
offset: 0, 0
index: -1
f_tongqian_5
rotate: true
xy: 290, 761
size: 18, 29
orig: 18, 29
offset: 0, 0
index: -1
f_tou_11
rotate: false
xy: 550, 865
size: 231, 157
orig: 231, 157
offset: 0, 0
index: -1
f_tou_13
rotate: true
xy: 602, 674
size: 63, 117
orig: 63, 117
offset: 0, 0
index: -1
f_tou_14
rotate: true
xy: 159, 24
size: 64, 121
orig: 64, 121
offset: 0, 0
index: -1
l_an_5
rotate: false
xy: 328, 528
size: 196, 139
orig: 196, 139
offset: 0, 0
index: -1
l_an_6
rotate: true
xy: 595, 631
size: 41, 122
orig: 41, 122
offset: 0, 0
index: -1
l_an_7
rotate: false
xy: 192, 226
size: 167, 156
orig: 167, 156
offset: 0, 0
index: -1
l_biyan_18
rotate: true
xy: 492, 32
size: 53, 46
orig: 53, 46
offset: 0, 0
index: -1
l_denglong_2
rotate: false
xy: 504, 436
size: 79, 76
orig: 79, 76
offset: 0, 0
index: -1
l_denglong_3
rotate: false
xy: 985, 788
size: 37, 72
orig: 37, 72
offset: 0, 0
index: -1
l_denglong_4
rotate: false
xy: 543, 150
size: 40, 74
orig: 40, 74
offset: 0, 0
index: -1
l_diaosui_11
rotate: true
xy: 2, 3
size: 28, 58
orig: 28, 58
offset: 0, 0
index: -1
l_diaosui_9
rotate: true
xy: 62, 7
size: 24, 57
orig: 24, 57
offset: 0, 0
index: -1
l_erduo_15
rotate: true
xy: 526, 514
size: 68, 67
orig: 68, 67
offset: 0, 0
index: -1
l_houtui_21
rotate: false
xy: 721, 745
size: 114, 115
orig: 114, 115
offset: 0, 0
index: -1
l_houtui_22
rotate: false
xy: 912, 746
size: 71, 114
orig: 71, 114
offset: 0, 0
index: -1
l_houtui_26
rotate: false
xy: 837, 745
size: 73, 115
orig: 73, 115
offset: 0, 0
index: -1
l_hudiejie_1
rotate: false
xy: 433, 34
size: 57, 51
orig: 57, 51
offset: 0, 0
index: -1
l_hudiejie_12
rotate: true
xy: 543, 84
size: 64, 41
orig: 64, 41
offset: 0, 0
index: -1
l_hudiejie_13
rotate: false
xy: 540, 22
size: 40, 60
orig: 40, 60
offset: 0, 0
index: -1
l_qiantui_20
rotate: false
xy: 602, 739
size: 117, 124
orig: 117, 124
offset: 0, 0
index: -1
l_qiantui_25
rotate: true
xy: 721, 672
size: 71, 95
orig: 71, 95
offset: 0, 0
index: -1
l_shengzi_16
rotate: true
xy: 361, 221
size: 166, 141
orig: 166, 141
offset: 0, 0
index: -1
l_shengzi_17
rotate: true
xy: 195, 384
size: 143, 128
orig: 143, 128
offset: 0, 0
index: -1
l_shenti_23
rotate: true
xy: 2, 443
size: 315, 191
orig: 315, 191
offset: 0, 0
index: -1
l_tongqian_10
rotate: false
xy: 550, 836
size: 27, 27
orig: 27, 27
offset: 0, 0
index: -1
l_tongqian_8
rotate: false
xy: 796, 635
size: 35, 35
orig: 35, 35
offset: 0, 0
index: -1
l_tou_19
rotate: true
xy: 2, 33
size: 192, 155
orig: 192, 155
offset: 0, 0
index: -1
l_weiba_24
rotate: false
xy: 290, 832
size: 258, 190
orig: 258, 190
offset: 0, 0
index: -1
l_xiangquan_14
rotate: true
xy: 301, 92
size: 127, 142
orig: 127, 142
offset: 0, 0
index: -1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a144370ef96efe445acdc38109b74036
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 439 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 11b89de82e12931478f5a699a8c7e665
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 12152d80a0d804c408d213c396109f00
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4eb970607f1877d4a94d1c03b7922ec4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: zq_hunian_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: a144370ef96efe445acdc38109b74036, type: 3}
materials:
- {fileID: 2100000, guid: 7e6db75e596291c4d92ade1f7487b15e, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 950eb1b077cb0644689dc26ea1bf613b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,28 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: zq_hunian_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 11b89de82e12931478f5a699a8c7e665, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7e6db75e596291c4d92ade1f7487b15e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,23 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: zq_hunian_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: 950eb1b077cb0644689dc26ea1bf613b, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 4eb970607f1877d4a94d1c03b7922ec4, type: 3}
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

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

View File

@ -36,6 +36,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId)
self.elementImg = Util.GetGameObject(go, "Pro/Image"):GetComponent("Image")
--
local roleId=role.roleData.roleId
self.roleId=roleId
local live=HeroConfig[role.roleData.roleId].Live
-- 判断是否有皮肤
if not role.roleData.skinId or role.roleData.skinId == 0 then
@ -393,8 +394,12 @@ function EnemyView:OnShowHintText(_ArtFontType)
end
function EnemyView:OnSkillPlay()
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "attack", false)
function EnemyView:OnSkillPlay(type)
local name="attack"
if type and type==1 then
name="skill"
end
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, name, false)
end
function EnemyView:OnSkillEnd()

View File

@ -44,8 +44,9 @@ function PlayerView:onCreate(go, role, position, root)
self.hpPassSlider.fillAmount = self.hpCache
self.yujiaSlider.fillAmount = 0
local roleId=role.roleData.roleId
self.roleId=role.roleData.roleId
-- 身外化身引导立绘展示处理
if roleId == 21061 then
if self.roleId == 21061 then
self.skinId = 0
if NameManager.roleSex == ROLE_SEX.BOY then
self.livePath = "live2d_npc_boy"
@ -427,7 +428,7 @@ function PlayerView:OnShowHintText(_ArtFontType)
end
function PlayerView:OnSkillPlay()
function PlayerView:OnSkillPlay(type)
if not self.GameObject then
return
end
@ -448,7 +449,11 @@ function PlayerView:OnSkillPlay()
-- end
-- local cardRenderMat = self.liveRender.material
-- cardRenderMat:SetInt("_IsMask", 0)
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "attack", false)
local name="attack"
if type and type==1 then
name="skill"
end
self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, name, false)
end
function PlayerView:OnSkillEnd()
@ -469,11 +474,15 @@ function PlayerView:OnSkillEnd()
self.lvHpObj:SetActive(true)
end
function PlayerView:OnSkillCastingStart()
function PlayerView:OnSkillCastingStart(type)
-- 提前进入下一阶段
self.RoleLiveGO2:SetActive(true)
self.lvHpObj:SetActive(false)
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "touch", false)
local name="touch"
-- if type and type~=0 then
-- name="skill"
-- end
self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0,name, false)
end

View File

@ -21,6 +21,7 @@ function SkillCaster:ctor(unit, actionTime, soundTime, soundName, castingEfectNo
self.castingEfectNode = castingEfectNode -- cast特效资源
self.castingNameNode = castingNameNode -- cast名称资源
self.effectRoot = self.owner.RootPanel.skillEffectRoot
self.roleConfig=ConfigManager.TryGetConfigData(ConfigName.RoleConfig,unit.roleId)
--
self.owner.role.Event:AddEvent(BattleEventName.SkillCast, self.OnSkillCast, self)
end
@ -50,9 +51,14 @@ function SkillCaster:OnSkillCast(skill)
if IsNull(self.owner.GameObject) then
return
end
local type=0
if self.roleConfig and self.roleConfig.ReadyAction and self.roleConfig.ReadyAction>0 and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill)then
type=1
self.actionTime=self.roleConfig.ReadyAction/1000
end
-- 调用上层接口
if self.owner.OnSkillPlay then
self.owner:OnSkillPlay()
self.owner:OnSkillPlay(type)
end
-- 播放
-- 这里相当于技能前摇,等待立绘播放到需要释放关键帧的时间时继续释放技能(人物前摇特效)
@ -135,9 +141,13 @@ function SkillCaster:PlaySkillCastingEffect(combat, skill, func)
self.owner:OnSkillCastStart(skill)
end
-- 调用上层接口
local type=0
if self.roleConfig and self.roleConfig.ReadyAction and self.roleConfig.ReadyAction>0 and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill) then
type=1
end
local _ExtraTime
if self.owner.OnSkillCastingStart then
_ExtraTime = self.owner:OnSkillCastingStart()
_ExtraTime = self.owner:OnSkillCastingStart(type)
end
_ExtraTime = _ExtraTime or 0

View File

@ -144,6 +144,11 @@ function this.ShowRideInfo(go,data)
-- this.setImage:SetActive(false)
if data.Id == curUserRideConFig.Id then
this.SingleRideClickShowInfo(data, go)
else
local selectObj=Util.GetGameObject(go, "setImage")
if selectObj then
selectObj.gameObject:SetActive(false)
end
end
local isGet = false
if PlayerManager.userMountList[data.Id] then