Merge branch '修改坠落素材' into 'develop'

替换素材

See merge request aibis-dream/aibis-dream!682

Assets/RawResources/Art/CG/坠落序列.psb.meta

@@ -94,27 +94,6 @@ ScriptedImporter:
     spritePosition: {x: 0, y: 0}
   mosaicSpriteImportData: []
   rigSpriteImportData:
-  - name: "\u773C\u775B"
-    originalName: 
-    pivot: {x: 0.5, y: 0.5}
-    alignment: 0
-    border: {x: 0, y: 0, z: 0, w: 0}
-    rect:
-      serializedVersion: 2
-      x: 4
-      y: 4
-      width: 3840
-      height: 2160
-    spriteID: 7cbdf7539320c19459ca466510b197d4
-    spriteBone: []
-    spriteOutline: []
-    vertices: []
-    spritePhysicsOutline: []
-    indices: 
-    edges: []
-    tessellationDetail: 0
-    uvTransform: {x: 4, y: 4}
-    spritePosition: {x: 0, y: 0}
   - name: 1
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -123,7 +102,7 @@ ScriptedImporter:
     rect:
       serializedVersion: 2
       x: 4
-      y: 2172
+      y: 4
       width: 3840
       height: 2160
     spriteID: bcfc79b3115d3c642b2a1b1acec55013
@@ -134,7 +113,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 4, y: 2172}
+    uvTransform: {x: 4, y: 4}
     spritePosition: {x: 0, y: 0}
   - name: 2
     originalName: 
@@ -143,10 +122,10 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 3852
-      y: 4
-      width: 2409
-      height: 1939
+      x: 4
+      y: 4340
+      width: 3676
+      height: 2160
     spriteID: 3abb407a96afe684da94bd8703dbee83
     spriteBone: []
     spriteOutline: []
@@ -155,8 +134,8 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 3852, y: 4}
-    spritePosition: {x: 633, y: 111}
+    uvTransform: {x: -35, y: 4340}
+    spritePosition: {x: 39, y: 0}
   - name: 3
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -166,8 +145,8 @@ ScriptedImporter:
       serializedVersion: 2
       x: 4
       y: 6508
-      width: 707
-      height: 646
+      width: 787
+      height: 782
     spriteID: e1cfafe55991778468b04cbb626da09b
     spriteBone: []
     spriteOutline: []
@@ -177,7 +156,7 @@ ScriptedImporter:
     edges: []
     tessellationDetail: 0
     uvTransform: {x: 4, y: 6508}
-    spritePosition: {x: 1542, y: 730}
+    spritePosition: {x: 1464, y: 683}
   - name: 4
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -185,10 +164,10 @@ ScriptedImporter:
     border: {x: 0, y: 0, z: 0, w: 0}
     rect:
       serializedVersion: 2
-      x: 719
-      y: 6508
-      width: 97
-      height: 100
+      x: 3688
+      y: 4340
+      width: 302
+      height: 266
     spriteID: a9afe888adfcf074fb1c765152c69731
     spriteBone: []
     spriteOutline: []
@@ -197,8 +176,8 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 719, y: 6508}
-    spritePosition: {x: 1865, y: 1026}
+    uvTransform: {x: 3688, y: 4340}
+    spritePosition: {x: 1769, y: 947}
   - name: "\u80CC\u666F"
     originalName: 
     pivot: {x: 0.5, y: 0.5}
@@ -207,7 +186,7 @@ ScriptedImporter:
     rect:
       serializedVersion: 2
       x: 4
-      y: 4340
+      y: 2172
       width: 3840
       height: 2160
     spriteID: 5995b81796ee94d49892754b43f097ee
@@ -218,7 +197,7 @@ ScriptedImporter:
     indices: 
     edges: []
     tessellationDetail: 0
-    uvTransform: {x: 4, y: 4340}
+    uvTransform: {x: 4, y: 2172}
     spritePosition: {x: 0, y: 0}
   characterData:
     bones: []
@@ -301,7 +280,7 @@ ScriptedImporter:
   documentPivot: {x: 0, y: 0}
   documentAlignment: 7
   importHiddenLayers: 0
-  layerMappingOption: 2
+  layerMappingOption: 0
   generatePhysicsShape: 0
   paperDollMode: 0
   keepDupilcateSpriteName: 1
@@ -311,26 +290,16 @@ ScriptedImporter:
   spriteCategoryList:
     categories: []
   spritePackingTag: 
-  resliceFromLayer: 0
+  resliceFromLayer: 1
   mosaicPSDLayers: []
   rigPSDLayers:
-  - name: "\u773C\u775B"
-    spriteName: "\u773C\u775B"
-    isGroup: 0
-    parentIndex: -1
-    spriteID: 7cbdf7539320c19459ca466510b197d4
-    layerID: 21
-    mosaicPosition: {x: 4, y: 4}
-    flatten: 0
-    isImported: 1
-    isVisible: 1
   - name: 1
     spriteName: 1
     isGroup: 0
     parentIndex: -1
     spriteID: bcfc79b3115d3c642b2a1b1acec55013
     layerID: 5
-    mosaicPosition: {x: 4, y: 2172}
+    mosaicPosition: {x: 4, y: 4}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -339,8 +308,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: 3abb407a96afe684da94bd8703dbee83
-    layerID: 10
-    mosaicPosition: {x: 3852, y: 4}
+    layerID: 28
+    mosaicPosition: {x: 4, y: 4340}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -349,7 +318,7 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: e1cfafe55991778468b04cbb626da09b
-    layerID: 15
+    layerID: 29
     mosaicPosition: {x: 4, y: 6508}
     flatten: 0
     isImported: 1
@@ -359,8 +328,8 @@ ScriptedImporter:
     isGroup: 0
     parentIndex: -1
     spriteID: a9afe888adfcf074fb1c765152c69731
-    layerID: 16
-    mosaicPosition: {x: 719, y: 6508}
+    layerID: 38
+    mosaicPosition: {x: 3688, y: 4340}
     flatten: 0
     isImported: 1
     isVisible: 1
@@ -370,7 +339,7 @@ ScriptedImporter:
     parentIndex: -1
     spriteID: 5995b81796ee94d49892754b43f097ee
     layerID: 14
-    mosaicPosition: {x: 4, y: 4340}
+    mosaicPosition: {x: 4, y: 2172}
     flatten: 0
     isImported: 1
     isVisible: 1