Merge branch 'bugfix/存档功能过严' into 'develop'
art: 佩佩动画更新 See merge request aibis-dream/aibis-dream!805
This commit is contained in:
@@ -797,19 +797,19 @@ MonoBehaviour:
|
||||
durationMs: 600
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 265.aseprite"
|
||||
sourceIndex: 265
|
||||
- sprite: {fileID: -1996565304, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
- sprite: {fileID: -1862775544, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 100
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 266.aseprite"
|
||||
sourceIndex: 266
|
||||
- sprite: {fileID: 550088396, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
- sprite: {fileID: -645936584, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 100
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 267.aseprite"
|
||||
sourceIndex: 267
|
||||
- sprite: {fileID: -1996565304, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
- sprite: {fileID: -1862775544, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 800
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 268.aseprite"
|
||||
sourceIndex: 268
|
||||
- sprite: {fileID: 550088396, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
- sprite: {fileID: -645936584, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 100
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 269.aseprite"
|
||||
sourceIndex: 269
|
||||
@@ -2245,7 +2245,7 @@ MonoBehaviour:
|
||||
id: "\u96BE\u53D7\u8868\u60C5"
|
||||
displayName: "\u96BE\u53D7\u8868\u60C5"
|
||||
frames:
|
||||
- sprite: {fileID: -872182907, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
- sprite: {fileID: 398084234, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 100
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 347.aseprite"
|
||||
sourceIndex: 347
|
||||
@@ -3005,6 +3005,7 @@ MonoBehaviour:
|
||||
- {fileID: 5879060989275078076}
|
||||
- {fileID: -4636145662785001099}
|
||||
- {fileID: -2099653027158671016}
|
||||
- {fileID: 2806729431852121782}
|
||||
nodes:
|
||||
- internalId: ea586bd0d9b34db8bc25a344c180eb0d
|
||||
displayName: D1S6-3
|
||||
@@ -3394,14 +3395,14 @@ MonoBehaviour:
|
||||
endBehaviorOverride: 0
|
||||
importSources:
|
||||
- internalId: 5bf1b9e4942c4dfba52350567c8119b1
|
||||
displayName:
|
||||
displayName: "\u4F69\u4F69\u901A\u7528"
|
||||
isEnabled: 1
|
||||
texture: {fileID: 2800000, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
asepriteJson: {fileID: 4900000, guid: 0675b1faa4e80e342b71cc41b304d3b8, type: 3}
|
||||
pivot: {x: 0.5, y: 0}
|
||||
manageSpriteSlicing: 1
|
||||
defaultNewClipEndBehavior: 0
|
||||
lastSourceHash: 4545544fadf3056a4dd6625fc5be63be79fe55d1c2c8db63367eb5f2cf255b64
|
||||
lastSourceHash: 87aaf2212bc32c1a493a46bda7d18dcc11a7c6602af11c11fa6cc1f442f7ba78
|
||||
settings:
|
||||
defaultPlayableId: default
|
||||
newManualClipDefaultEndBehavior: 0
|
||||
@@ -4382,6 +4383,60 @@ MonoBehaviour:
|
||||
manageSpriteSlicing: 0
|
||||
lastSourceHash:
|
||||
lastImportedTagName:
|
||||
--- !u!114 &2806729431852121782
|
||||
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: 408fe45af4d321848a6c97f0356e8e5c, type: 3}
|
||||
m_Name: "D2S10-6\u6539"
|
||||
m_EditorClassIdentifier:
|
||||
id: "D2S10-6\u6539"
|
||||
displayName: "D2S10-6\u6539"
|
||||
frames:
|
||||
- sprite: {fileID: 2770730464502199813, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 300
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 348.aseprite"
|
||||
sourceIndex: 348
|
||||
- sprite: {fileID: 1856218385, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 300
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 349.aseprite"
|
||||
sourceIndex: 349
|
||||
- sprite: {fileID: 1295600482, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 300
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 350.aseprite"
|
||||
sourceIndex: 350
|
||||
- sprite: {fileID: -2243561437946085050, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 300
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 351.aseprite"
|
||||
sourceIndex: 351
|
||||
- sprite: {fileID: -2917586438916601290, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 300
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 352.aseprite"
|
||||
sourceIndex: 352
|
||||
- sprite: {fileID: 7069710893094011476, guid: 3954d5d85e3967145b8a28289bb06cc2, type: 3}
|
||||
durationMs: 300
|
||||
frameName: "\u4F69\u4F69\u50CF\u7D20\u7248-\u901A\u7528\u52A8\u753B 353.aseprite"
|
||||
sourceIndex: 353
|
||||
speed: 1
|
||||
defaultEndBehavior: 0
|
||||
hasImportInfo: 1
|
||||
importInfo:
|
||||
importSourceId: 5bf1b9e4942c4dfba52350567c8119b1
|
||||
sourceTagName: "D2S10-6\u6539"
|
||||
isMissingFromSource: 0
|
||||
hasStandaloneImportSource: 0
|
||||
standaloneImportSource:
|
||||
texture: {fileID: 0}
|
||||
asepriteJson: {fileID: 0}
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
manageSpriteSlicing: 0
|
||||
lastSourceHash:
|
||||
lastImportedTagName:
|
||||
--- !u!114 &2826545114883539041
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -2782,11 +2782,59 @@
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 100
|
||||
},
|
||||
"佩佩像素版-通用动画 348.aseprite": {
|
||||
"frame": { "x": 3080, "y": 1760, "w": 440, "h": 440 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 300
|
||||
},
|
||||
"佩佩像素版-通用动画 349.aseprite": {
|
||||
"frame": { "x": 1760, "y": 4840, "w": 440, "h": 440 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 300
|
||||
},
|
||||
"佩佩像素版-通用动画 350.aseprite": {
|
||||
"frame": { "x": 2200, "y": 4840, "w": 440, "h": 440 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 300
|
||||
},
|
||||
"佩佩像素版-通用动画 351.aseprite": {
|
||||
"frame": { "x": 880, "y": 1760, "w": 440, "h": 440 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 300
|
||||
},
|
||||
"佩佩像素版-通用动画 352.aseprite": {
|
||||
"frame": { "x": 1760, "y": 1760, "w": 440, "h": 440 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 300
|
||||
},
|
||||
"佩佩像素版-通用动画 353.aseprite": {
|
||||
"frame": { "x": 2200, "y": 1760, "w": 440, "h": 440 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 440, "h": 440 },
|
||||
"sourceSize": { "w": 440, "h": 440 },
|
||||
"duration": 300
|
||||
}
|
||||
},
|
||||
"meta": {
|
||||
"app": "https://www.aseprite.org/",
|
||||
"version": "1.3.17.2-x64",
|
||||
"version": "1.3.18.1-x64",
|
||||
"image": "佩佩像素版-通用动画.png",
|
||||
"format": "RGBA8888",
|
||||
"size": { "w": 8192, "h": 5280 },
|
||||
@@ -2939,7 +2987,8 @@
|
||||
{ "name": "D3SH-2", "from": 337, "to": 340, "direction": "forward", "color": "#000000ff" },
|
||||
{ "name": "D3SH-3", "from": 341, "to": 344, "direction": "forward", "color": "#000000ff" },
|
||||
{ "name": "D3SB-2", "from": 345, "to": 346, "direction": "forward", "color": "#000000ff" },
|
||||
{ "name": "难受表情", "from": 347, "to": 347, "direction": "forward", "color": "#000000ff" }
|
||||
{ "name": "难受表情", "from": 347, "to": 347, "direction": "forward", "color": "#000000ff" },
|
||||
{ "name": "D2S10-6改", "from": 348, "to": 353, "direction": "forward", "color": "#000000ff" }
|
||||
],
|
||||
"layers": [
|
||||
{ "name": "底图", "color": "#57b9f2ff" },
|
||||
@@ -2988,6 +3037,7 @@
|
||||
{ "name": "3", "group": "流泪", "opacity": 255, "blendMode": "normal" },
|
||||
{ "name": "2", "group": "流泪", "opacity": 255, "blendMode": "normal" },
|
||||
{ "name": "1", "group": "流泪", "opacity": 255, "blendMode": "normal" },
|
||||
{ "name": "0", "group": "流泪", "opacity": 255, "blendMode": "normal" },
|
||||
{ "name": "眉-皱眉", "group": "表情-默认&画画", "opacity": 255, "blendMode": "normal" },
|
||||
{ "name": "眉-扬眉", "group": "表情-默认&画画", "opacity": 255, "blendMode": "normal" },
|
||||
{ "name": "流汗", "group": "表情-默认&画画", "opacity": 255, "blendMode": "normal" },
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user