备份

Assets/Resource/Animations/人物动画/Closet_texture.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 8d523bac11c2f3742ab88a2cbd71bf39
-timeCreated: 1500430268
+timeCreated: 1500631382
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -111,6 +111,7 @@ TextureImporter:
     21300208: "\u7FC5\u81801"
     21300210: "\u7FC5\u81802"
     21300212: Empty
+    21300214: Empty
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -197,7 +198,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2865
-        y: 971
+        y: 858
         width: 165
         height: 111
       alignment: 0
@@ -210,7 +211,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2865
-        y: 858
+        y: 971
         width: 165
         height: 111
       alignment: 0
@@ -248,8 +249,8 @@ TextureImporter:
       name: "\u8111\u58F32"
       rect:
         serializedVersion: 2
-        x: 2313
-        y: 1599
+        x: 1665
+        y: 1583
         width: 548
         height: 424
       alignment: 0
@@ -313,7 +314,7 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 1958
+        x: 1930
         y: 1198
         width: 26
         height: 30
@@ -365,8 +366,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2146
-        y: 3438
+        x: 1
+        y: 2381
         width: 572
         height: 657
       alignment: 0
@@ -378,8 +379,8 @@ TextureImporter:
       name: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 2381
+        x: 2146
+        y: 3438
         width: 572
         height: 657
       alignment: 0
@@ -417,8 +418,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 3589
+        x: 1226
+        y: 2499
         width: 610
         height: 506
       alignment: 0
@@ -430,8 +431,8 @@ TextureImporter:
       name: "\u5934\u53D15\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1226
-        y: 2499
+        x: 3431
+        y: 3589
         width: 610
         height: 506
       alignment: 0
@@ -456,8 +457,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 1499
+        x: 836
+        y: 1065
         width: 449
         height: 448
       alignment: 0
@@ -469,8 +470,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 2045
+        x: 1
+        y: 1609
         width: 382
         height: 770
       alignment: 0
@@ -482,8 +483,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
       rect:
         serializedVersion: 2
-        x: 1033
-        y: 1515
+        x: 385
+        y: 1499
         width: 449
         height: 448
       alignment: 0
@@ -495,8 +496,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1609
+        x: 3431
+        y: 2045
         width: 382
         height: 770
       alignment: 0
@@ -508,8 +509,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 836
-        y: 1065
+        x: 1033
+        y: 1515
         width: 449
         height: 448
       alignment: 0
@@ -547,7 +548,7 @@ TextureImporter:
       name: "\u5934\u53D17(\u6A59)"
       rect:
         serializedVersion: 2
-        x: 844
+        x: 1495
         y: 3509
         width: 649
         height: 586
@@ -560,8 +561,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 1495
-        y: 3509
+        x: 1
+        y: 3040
         width: 649
         height: 586
       alignment: 0
@@ -573,8 +574,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 3040
+        x: 844
+        y: 3509
         width: 649
         height: 586
       alignment: 0
@@ -586,8 +587,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2720
-        y: 3595
+        x: 1226
+        y: 3007
         width: 709
         height: 500
       alignment: 0
@@ -599,8 +600,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7D2B)"
       rect:
         serializedVersion: 2
-        x: 1226
-        y: 3007
+        x: 2720
+        y: 3595
         width: 709
         height: 500
       alignment: 0
@@ -612,8 +613,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u7EFF)"
       rect:
         serializedVersion: 2
-        x: 1937
-        y: 2936
+        x: 2720
+        y: 3093
         width: 709
         height: 500
       alignment: 0
@@ -625,8 +626,8 @@ TextureImporter:
       name: "\u5934\u53D18(\u9ED1)"
       rect:
         serializedVersion: 2
-        x: 2720
-        y: 3093
+        x: 1937
+        y: 2936
         width: 709
         height: 500
       alignment: 0
@@ -638,8 +639,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u68D5\u8272)"
       rect:
         serializedVersion: 2
-        x: 1665
-        y: 2009
+        x: 385
+        y: 1949
         width: 646
         height: 391
       alignment: 0
@@ -651,8 +652,8 @@ TextureImporter:
       name: "\u8111\u58F31(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 1949
+        x: 1665
+        y: 2009
         width: 646
         height: 391
       alignment: 0
@@ -664,8 +665,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1665
-        y: 1583
+        x: 2313
+        y: 1599
         width: 548
         height: 424
       alignment: 0
@@ -690,8 +691,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 739
+        x: 1187
+        y: 1965
         width: 476
         height: 532
       alignment: 0
@@ -703,8 +704,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 1187
-        y: 1965
+        x: 3431
+        y: 739
         width: 476
         height: 532
       alignment: 0
@@ -716,8 +717,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 1838
-        y: 2402
+        x: 2648
+        y: 2025
         width: 476
         height: 532
       alignment: 0
@@ -730,7 +731,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2648
-        y: 2025
+        y: 2559
         width: 476
         height: 532
       alignment: 0
@@ -742,8 +743,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1484
-        y: 1195
+        x: 2215
+        y: 1211
         width: 444
         height: 386
       alignment: 0
@@ -755,8 +756,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2648
-        y: 2559
+        x: 1838
+        y: 2402
         width: 476
         height: 532
       alignment: 0
@@ -768,8 +769,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 661
+        x: 1484
+        y: 1195
         width: 444
         height: 386
       alignment: 0
@@ -781,8 +782,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 2215
-        y: 1211
+        x: 1
+        y: 661
         width: 444
         height: 386
       alignment: 0
@@ -795,7 +796,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 452
-        y: 827
+        y: 1163
         width: 349
         height: 334
       alignment: 0
@@ -821,7 +822,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 452
-        y: 1163
+        y: 827
         width: 349
         height: 334
       alignment: 0
@@ -846,8 +847,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 803
-        y: 746
+        x: 2661
+        y: 1296
         width: 386
         height: 301
       alignment: 0
@@ -872,8 +873,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 2661
-        y: 1296
+        x: 803
+        y: 746
         width: 386
         height: 301
       alignment: 0
@@ -898,8 +899,8 @@ TextureImporter:
       name: "\u88D9\u5B504"
       rect:
         serializedVersion: 2
-        x: 1669
-        y: 746
+        x: 1464
+        y: 781
         width: 203
         height: 142
       alignment: 0
@@ -911,8 +912,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 1464
-        y: 781
+        x: 1669
+        y: 746
         width: 203
         height: 142
       alignment: 0
@@ -1003,7 +1004,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3049
-        y: 806
+        y: 1321
         width: 340
         height: 276
       alignment: 0
@@ -1016,7 +1017,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3049
-        y: 1321
+        y: 806
         width: 340
         height: 276
       alignment: 0
@@ -1029,7 +1030,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3387
-        y: 2238
+        y: 2154
         width: 30
         height: 40
       alignment: 0
@@ -1042,7 +1043,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3387
-        y: 2154
+        y: 2238
         width: 30
         height: 40
       alignment: 0
@@ -1145,7 +1146,7 @@ TextureImporter:
       name: 11
       rect:
         serializedVersion: 2
-        x: 1930
+        x: 1958
         y: 1198
         width: 26
         height: 30
@@ -1159,7 +1160,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3389
-        y: 2037
+        y: 2087
         width: 39
         height: 48
       alignment: 0
@@ -1172,7 +1173,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3389
-        y: 2087
+        y: 2037
         width: 39
         height: 48
       alignment: 0
@@ -1327,8 +1328,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 1287
-        y: 1074
+        x: 1874
+        y: 812
         width: 180
         height: 111
       alignment: 0
@@ -1340,8 +1341,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 1874
-        y: 699
+        x: 1287
+        y: 1074
         width: 180
         height: 111
       alignment: 0
@@ -1379,8 +1380,8 @@ TextureImporter:
       name: "\u4E0A\u886310"
       rect:
         serializedVersion: 2
-        x: 1484
-        y: 1658
+        x: 800
+        y: 451
         width: 179
         height: 144
       alignment: 0
@@ -1392,8 +1393,8 @@ TextureImporter:
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 354
-        y: 395
+        x: 2313
+        y: 2030
         width: 186
         height: 121
       alignment: 0
@@ -1405,8 +1406,8 @@ TextureImporter:
       name: "\u4E0A\u886312"
       rect:
         serializedVersion: 2
-        x: 542
-        y: 405
+        x: 1874
+        y: 699
         width: 180
         height: 111
       alignment: 0
@@ -1419,7 +1420,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1287
-        y: 1187
+        y: 1351
         width: 180
         height: 162
       alignment: 0
@@ -1431,8 +1432,8 @@ TextureImporter:
       name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 800
-        y: 451
+        x: 1484
+        y: 1658
         width: 179
         height: 144
       alignment: 0
@@ -1444,8 +1445,8 @@ TextureImporter:
       name: "\u4E0A\u886311(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 2313
-        y: 2030
+        x: 354
+        y: 395
         width: 186
         height: 121
       alignment: 0
@@ -1458,7 +1459,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1287
-        y: 1351
+        y: 1187
         width: 180
         height: 162
       alignment: 0
@@ -1470,8 +1471,8 @@ TextureImporter:
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 1874
-        y: 812
+        x: 542
+        y: 405
         width: 180
         height: 111
       alignment: 0
@@ -1509,10 +1510,10 @@ TextureImporter:
       name: Empty
       rect:
         serializedVersion: 2
-        x: 136
-        y: 104
-        width: 152
-        height: 129
+        x: 2453
+        y: 537
+        width: 129
+        height: 143
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}

Assets/Script/Manage/ManaPlayer.cs

@@ -223,7 +223,7 @@ public class ManaPlayer : Regist
         {
             Player = tra.AddScript<Player>();
 
-            Player.BuildBlond();
+            Player.Build();
         }
         
 

Assets/Script/Object/Player.cs

@@ -738,7 +738,6 @@ public class Player : Regist , IPointerClickHandler
         ChangeClose(BodyPart.Top, "上衣1", false);
         ChangeClose(BodyPart.Shoe, "鞋子1", false);
         ChangeClose(BodyPart.Head, "脑壳1", false);
-        ChangeClose(BodyPart.Wing, "Empty", false);
         ChangeClose(BodyPart.Dress, "裙子1", false);
         ChangeClose(BodyPart.Mouse, "嘴巴1", false);
         ChangeClose(BodyPart.Headwear, "头饰品1", false);
@@ -754,6 +753,7 @@ public class Player : Regist , IPointerClickHandler
         ChangeClose(BodyPart.Top, "上衣3", false);
         ChangeClose(BodyPart.Shoe, "鞋子3", false);
         ChangeClose(BodyPart.Head, "脑壳3", false);
+        ChangeClose(BodyPart.Wing, "Empty", false);
         ChangeClose(BodyPart.Dress, "裙子3", false);
         ChangeClose(BodyPart.Mouse, "嘴巴3", false);
         ChangeClose(BodyPart.Headwear, "头饰品3", false);
@@ -767,6 +767,8 @@ public class Player : Regist , IPointerClickHandler
     {
         Build();
 
+        ChangeClose(BodyPart.Wing, "Empty", false);
+
         ResetDepth();
 
         return UAC;
@@ -780,6 +782,7 @@ public class Player : Regist , IPointerClickHandler
         ChangeClose(BodyPart.Top, "上衣2", false);
         ChangeClose(BodyPart.Shoe, "鞋子2", false);
         ChangeClose(BodyPart.Head, "脑壳2", false);
+        ChangeClose(BodyPart.Wing, "Empty", false);
         ChangeClose(BodyPart.Dress, "裙子2", false);
         ChangeClose(BodyPart.Mouse, "嘴巴2", false);
         ChangeClose(BodyPart.Headwear, "头饰品2", false);
@@ -895,6 +898,16 @@ public class Player : Regist , IPointerClickHandler
         }
 
         ChangeClose(slotList, armatureName, setDepth);
+
+
+        if (bodyPart == BodyPart.Wing)
+        {
+            TweenRoot tweenRoot = transform.FindChild("Armature/" + Wing).GetChild(0).CreateTweenScale(new Vector3(1, 1, 1), new Vector3(0.6f, 1, 1), 0.75f, true, true, Curve.Linear);
+
+            tweenRoot.PingPong = true;
+
+            tweenRoot.StartForward();
+        }
     }
 
     public void ChangeClose(List<DragonBones.Slot> slotList, string armatureName, bool setDepth = true)

Assets/Script/Tool/Anim/TweenScale.cs

@@ -133,6 +133,13 @@ public class TweenScale : TweenRoot
 
     public override bool DoForward()
     {
+        if (Target == null)
+        {
+            Pause();
+
+            return false;
+        }
+
         Timer += Time.fixedDeltaTime;
 
         if (Timer > Duration)
@@ -158,6 +165,13 @@ public class TweenScale : TweenRoot
 
     public override bool DoBackward()
     {
+        if (Target == null)
+        {
+            Pause();
+
+            return false;
+        }
+
         Timer += Time.fixedDeltaTime;
 
         if (Timer > Duration)

ToList.txt

@@ -1,12 +1,21 @@
-花朵数量不对
+检查教程是否有翅膀
 
-没有进入教程
+换装时不能重复点击
 
 
+打包过程中做一个ProgressBar
+
 DebugInfo要收集Unity版本信息
 
 36朵花2048打包时卡死过一次
 
+动画
+{
+  如果Target被Destroy了则暂停播放
+
+  便于编辑器中调试的功能(修改曲线 时间等)
+}
+
 
 还原PlayerConfig