소스 검색

修改DragonBone图集

jet 8 년 전
부모
커밋
95f8f8f085
32개의 변경된 파일689개의 추가작업 그리고 806개의 파일을 삭제
  1. 2 4
      Assets/AtlasUtility/Script/Editor/TestEditor.cs
  2. 2 0
      Assets/AtlasUtility/Script/Test.cs
  3. 0 0
      Assets/Resource/Animations/人物动画/Closet_ske.json
  4. 0 0
      Assets/Resource/Animations/人物动画/Closet_tex.json
  5. 0 8
      Assets/Resource/Animations/人物动画/Closet_tex.json.meta
  6. BIN
      Assets/Resource/Animations/人物动画/Closet_texture.png
  7. 0 0
      Assets/Resource/Animations/人物动画/stand_ske.json
  8. 1 1
      Assets/Resource/Animations/人物动画/stand_ske.json.meta
  9. 0 0
      Assets/Resource/Animations/人物动画/stand_tex.json
  10. 2 2
      Assets/Resource/Animations/人物动画/stand_tex.json.meta
  11. BIN
      Assets/Resource/Animations/人物动画/stand_texture.png
  12. 362 362
      Assets/Resource/Animations/人物动画/stand_texture.png.meta
  13. 0 349
      Assets/Resource/Logo.unity
  14. 145 11
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  15. BIN
      Assets/Resource/Sprite/SpriteUI/Atlas.png
  16. 30 16
      Assets/Resource/Sprite/SpriteUI/Atlas.png.meta
  17. BIN
      Assets/Resource/Sprite/SpriteUI/试衣间.png
  18. 68 0
      Assets/Resource/Sprite/SpriteUI/试衣间.png.meta
  19. 1 1
      Assets/Resource/XML/PlayerConfig.xml
  20. 1 0
      Assets/Resource/XML/lan/ChineseSimplified.xml
  21. 1 0
      Assets/Resource/XML/lan/ChineseTraditional.xml
  22. 1 0
      Assets/Resource/XML/lan/English.xml
  23. BIN
      Assets/Resource/Xlsx/language_config.xlsx
  24. 9 0
      Assets/Script/Manage/ManaCenter.cs
  25. 11 13
      Assets/Script/Manage/ManaPlayer.cs
  26. 1 1
      Assets/Script/Manage/ManaServer.cs
  27. 7 6
      Assets/Script/Manage/ManaTutorial.cs
  28. 24 0
      Assets/Script/Manage/ManaUI.cs
  29. 6 23
      Assets/Script/Object/Player.cs
  30. 5 5
      Assets/Script/Tool/Auxiliary.cs
  31. 3 3
      ProjectSettings/GraphicsSettings.asset
  32. 7 1
      ToList.txt

+ 2 - 4
Assets/AtlasUtility/Script/Editor/TestEditor.cs

@@ -1,5 +1,7 @@
 namespace AtlasUtility
 {
+    using LitJson;
+
     using System.IO;
     using System.Linq;
     using System.Collections.Generic;
@@ -28,10 +30,6 @@
 
             if (GUILayout.Button("Test"))
             {
-                Debug.Log(Script.GetComponent<Graphic>().depth);
-
-                //EditorUtility.CompileCSharp("AtlasUtility.cs", )
-
                 //Texture2D texture2D = new Texture2D(Script.Texture2D.width, Script.Texture2D.height, TextureFormat.RGBA32, false);
 
                 //for (int i = 0; i < texture2D.width; i++)

+ 2 - 0
Assets/AtlasUtility/Script/Test.cs

@@ -7,6 +7,8 @@
         #region Variable
 
         public Sprite Sprite;
+        public TextAsset TextAsset1;
+        public TextAsset TextAsset2;
         public Texture2D Texture2D;
         public SpriteRenderer SpriteRenderer;
 

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
Assets/Resource/Animations/人物动画/Closet_ske.json


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
Assets/Resource/Animations/人物动画/Closet_tex.json


+ 0 - 8
Assets/Resource/Animations/人物动画/Closet_tex.json.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eac83164cf84fd84999cc3623ed9d406
-timeCreated: 1502687711
-licenseType: Pro
-TextScriptImporter:
-  userData: 
-  assetBundleName: config
-  assetBundleVariant: 

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


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_ske.json


+ 1 - 1
Assets/Resource/Animations/人物动画/stand_ske.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d9cae0096b575ad439815b89ff28bbf0
-timeCreated: 1502687711
+timeCreated: 1502703588
 licenseType: Pro
 TextScriptImporter:
   userData: 

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
Assets/Resource/Animations/人物动画/stand_tex.json


+ 2 - 2
Assets/Resource/Animations/人物动画/Closet_ske.json.meta → Assets/Resource/Animations/人物动画/stand_tex.json.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 0cad47e5fe7664c4889face32561e5f3
-timeCreated: 1502687711
+guid: cf10bfe715240ea4e87102475ca55678
+timeCreated: 1502703588
 licenseType: Pro
 TextScriptImporter:
   userData: 

BIN
Assets/Resource/Animations/人物动画/stand_texture.png


+ 362 - 362
Assets/Resource/Animations/人物动画/Closet_texture.png.meta → Assets/Resource/Animations/人物动画/stand_texture.png.meta

@@ -1,123 +1,123 @@
 fileFormatVersion: 2
-guid: e1d95b60d94eb774c82a0cd80cf996d0
-timeCreated: 1502688518
+guid: 8d523bac11c2f3742ab88a2cbd71bf39
+timeCreated: 1502703786
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
-    21300000: "\u978B\u5B503"
-    21300002: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
-    21300004: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
-    21300006: "\u5934\u53D14\uFF08\u7EFF\u8272\uFF09"
-    21300008: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
-    21300010: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
-    21300012: "\u5934\u53D15\uFF08\u9EC4\u8272\uFF09"
-    21300014: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
-    21300016: "\u5934\u53D17(\u6A59)"
-    21300018: "\u5934\u53D17(\u7C73\u767D)"
-    21300020: "\u5934\u53D17(\u84DD\u8272)"
-    21300022: "\u5934\u53D18(\u7C89)"
-    21300024: "\u5934\u53D18(\u7D2B)"
-    21300026: "\u5934\u53D18(\u7EFF)"
-    21300028: "\u5934\u53D18(\u9ED1)"
-    21300030: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
-    21300032: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
-    21300034: "\u88D9\u5B5010(\u9EC4)"
-    21300036: "\u88D9\u5B5011(\u7C89)"
-    21300038: "\u88D9\u5B5011"
-    21300040: "\u88D9\u5B507\uFF08\u7C89\uFF09"
-    21300042: "\u88D9\u5B507"
-    21300044: "\u88D9\u5B508"
-    21300046: 5
-    21300048: 7
-    21300050: 9
-    21300052: 11
-    21300054: "\u5934\u99708"
-    21300056: "\u4E0A\u88638"
-    21300058: "\u7FC5\u81802"
-    21300060: "\u53F3\u624B\u4F60\u7684\u53F3\u624B\uFF01\uFF01"
-    21300062: "\u5934\u9970\u54C11"
-    21300064: "\u773C\u775B1"
-    21300066: "\u4E0A\u88632"
-    21300068: "\u4E0A\u88633"
-    21300070: "\u773C\u775B2"
-    21300072: "\u773C\u775B3"
-    21300074: "\u8111\u58F32"
-    21300076: "\u88D9\u5B503"
-    21300078: "\u5634\u5DF42"
-    21300080: "\u5634\u5DF43"
-    21300082: "\u978B\u5B502"
-    21300084: "\u5934\u9970\u54C12"
-    21300086: "\u5934\u9970\u54C13"
-    21300088: "\u88D9\u5B502"
-    21300090: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
-    21300092: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
-    21300094: "\u5934\u53D16+\u4E0B\uFF08\u7EFF\uFF09"
-    21300096: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
-    21300098: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
-    21300100: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
-    21300102: "\u5934\u53D16+\u4E0A\uFF08\u7C89\uFF09"
-    21300104: "\u8111\u58F31(\u68D5\u8272)"
-    21300106: "\u8111\u58F31(\u7C89\u8272)"
-    21300108: "\u8111\u58F32(\u7C89\u8272)"
-    21300110: "\u8111\u58F32(\u9EC4\u8272)"
-    21300112: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
-    21300114: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
-    21300116: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
-    21300118: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
-    21300120: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
-    21300122: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
-    21300124: "\u8863\u670D10\uFF08\u9EC4\uFF09"
-    21300126: "\u8863\u670D10"
-    21300128: "\u88D9\u5B5010"
-    21300130: "\u8863\u670D11(\u7C89)"
-    21300132: "\u8863\u670D11"
-    21300134: "\u88D9\u5B504"
-    21300136: "\u88D9\u5B505"
-    21300138: "\u88D9\u5B506"
-    21300140: "\u88D9\u5B509"
-    21300142: "\u88D9\u5B5012"
-    21300144: "\u88D9\u5B5013"
-    21300146: "\u88D9\u5B5013(\u7D2B)"
-    21300148: 2
-    21300150: 3
-    21300152: 4
-    21300154: 6
-    21300156: 8
-    21300158: 10
-    21300160: 12
-    21300162: 13
-    21300164: "\u5934\u99704"
-    21300166: "\u5934\u99705"
-    21300168: "\u5934\u99706"
-    21300170: "\u5934\u99707"
-    21300172: "\u5934\u99709"
-    21300174: "\u5934\u997010"
-    21300176: "\u5934\u997011"
-    21300178: "\u5934\u997012"
-    21300180: "\u4E0A\u88634"
-    21300182: "\u4E0A\u88635"
-    21300184: "\u4E0A\u88636"
-    21300186: "\u4E0A\u88637"
-    21300188: "\u4E0A\u88639"
-    21300190: "\u4E0A\u886310"
-    21300192: "\u4E0A\u886311"
-    21300194: "\u4E0A\u886312"
-    21300196: "\u4E0A\u886313"
-    21300198: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
-    21300200: "\u4E0A\u886311(\u7C89)"
-    21300202: "\u4E0A\u886313(\u7D2B)"
-    21300204: "\u4E0A\u88637\uFF08\u7C89\uFF09"
-    21300206: "\u7FC5\u81801"
-    21300208: "\u7981\u6B62\u6807\u5FD7"
-    21300210: "\u4E0A\u88631"
-    21300212: "\u5634\u5DF41"
-    21300214: "\u5DE6\u624B\u770B\u6E05\u5DE6\u624B\u4F60\u7684\u5DE6\u624B\uFF01\uFF01"
-    21300216: "\u773C\u775B\u8868\u60C51"
-    21300218: "\u8111\u58F31"
-    21300220: "\u8116\u5B50"
-    21300222: "\u817F2\u4E2A\u63D0\u4F9B1\u4E2A"
-    21300224: "\u88D9\u5B501"
-    21300226: "\u978B\u5B501"
+    21300000: "\u8111\u58F31"
+    21300002: "\u817F2\u4E2A\u63D0\u4F9B1\u4E2A"
+    21300004: "\u53F3\u624B\u4F60\u7684\u53F3\u624B\uFF01\uFF01"
+    21300006: "\u88D9\u5B501"
+    21300008: "\u5DE6\u624B\u770B\u6E05\u5DE6\u624B\u4F60\u7684\u5DE6\u624B\uFF01\uFF01"
+    21300010: "\u8116\u5B50"
+    21300012: "\u978B\u5B501"
+    21300014: "\u5634\u5DF41"
+    21300016: "\u773C\u775B\u8868\u60C51"
+    21300018: "\u773C\u775B1"
+    21300020: "\u5934\u9970\u54C11"
+    21300022: "\u4E0A\u88631"
+    21300024: "\u4E0A\u88632"
+    21300026: "\u4E0A\u88633"
+    21300028: "\u773C\u775B2"
+    21300030: "\u773C\u775B3"
+    21300032: "\u8111\u58F32"
+    21300034: "\u88D9\u5B503"
+    21300036: "\u5634\u5DF42"
+    21300038: "\u5634\u5DF43"
+    21300040: "\u978B\u5B502"
+    21300042: "\u978B\u5B503"
+    21300044: "\u5934\u9970\u54C12"
+    21300046: "\u5934\u9970\u54C13"
+    21300048: "\u88D9\u5B502"
+    21300050: "\u5934\u53D14\uFF08\u7C89\u8272\uFF09"
+    21300052: "\u5934\u53D14\uFF08\u84DD\u8272\uFF09"
+    21300054: "\u5934\u53D14\uFF08\u7EFF\u8272\uFF09"
+    21300056: "\u5934\u53D15\uFF08\u68D5\u8272\uFF09"
+    21300058: "\u5934\u53D15\uFF08\u7EA2\u8272\uFF09"
+    21300060: "\u5934\u53D15\uFF08\u9EC4\u8272\uFF09"
+    21300062: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
+    21300064: "\u5934\u53D16+\u4E0A\uFF08\u68D5\uFF09"
+    21300066: "\u5934\u53D16+\u4E0B\uFF08\u7EFF\uFF09"
+    21300068: "\u5934\u53D16+\u4E0A\uFF08\u7EFF\uFF09"
+    21300070: "\u5934\u53D16+\u4E0B\uFF08\u9EC4\uFF09"
+    21300072: "\u5934\u53D16+\u4E0A\uFF08\u9EC4\uFF09"
+    21300074: "\u5934\u53D16+\u4E0B\uFF08\u7C89\uFF09"
+    21300076: "\u5934\u53D16+\u4E0A\uFF08\u7C89\uFF09"
+    21300078: "\u5934\u53D17(\u6A59)"
+    21300080: "\u5934\u53D17(\u7C73\u767D)"
+    21300082: "\u5934\u53D17(\u84DD\u8272)"
+    21300084: "\u5934\u53D18(\u7C89)"
+    21300086: "\u5934\u53D18(\u7D2B)"
+    21300088: "\u5934\u53D18(\u7EFF)"
+    21300090: "\u5934\u53D18(\u9ED1)"
+    21300092: "\u8111\u58F31(\u68D5\u8272)"
+    21300094: "\u8111\u58F31(\u7C89\u8272)"
+    21300096: "\u8111\u58F32(\u7C89\u8272)"
+    21300098: "\u8111\u58F32(\u9EC4\u8272)"
+    21300100: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
+    21300102: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
+    21300104: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
+    21300106: "\u8111\u58F33+\u4E0B\uFF08\u7C89\u8272\uFF09"
+    21300108: "\u8111\u58F33+\u4E0A\uFF08\u7C89\u8272\uFF09"
+    21300110: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
+    21300112: "\u8111\u58F33+\u4E0A\uFF08\u7D2B\u8272\uFF09"
+    21300114: "\u8111\u58F33+\u4E0A\uFF08\u9EC4\u8272\uFF09"
+    21300116: "\u8863\u670D10\uFF08\u9EC4\uFF09"
+    21300118: "\u88D9\u5B5010(\u9EC4)"
+    21300120: "\u8863\u670D10"
+    21300122: "\u88D9\u5B5010"
+    21300124: "\u8863\u670D11(\u7C89)"
+    21300126: "\u88D9\u5B5011(\u7C89)"
+    21300128: "\u8863\u670D11"
+    21300130: "\u88D9\u5B5011"
+    21300132: "\u88D9\u5B504"
+    21300134: "\u88D9\u5B505"
+    21300136: "\u88D9\u5B506"
+    21300138: "\u88D9\u5B507\uFF08\u7C89\uFF09"
+    21300140: "\u88D9\u5B507"
+    21300142: "\u88D9\u5B508"
+    21300144: "\u88D9\u5B509"
+    21300146: "\u88D9\u5B5012"
+    21300148: "\u88D9\u5B5013"
+    21300150: "\u88D9\u5B5013(\u7D2B)"
+    21300152: 2
+    21300154: 3
+    21300156: 4
+    21300158: 5
+    21300160: 6
+    21300162: 7
+    21300164: 8
+    21300166: 9
+    21300168: 10
+    21300170: 11
+    21300172: 12
+    21300174: 13
+    21300176: "\u5934\u99704"
+    21300178: "\u5934\u99705"
+    21300180: "\u5934\u99706"
+    21300182: "\u5934\u99707"
+    21300184: "\u5934\u99708"
+    21300186: "\u5934\u99709"
+    21300188: "\u5934\u997010"
+    21300190: "\u5934\u997011"
+    21300192: "\u5934\u997012"
+    21300194: "\u4E0A\u88634"
+    21300196: "\u4E0A\u88635"
+    21300198: "\u4E0A\u88636"
+    21300200: "\u4E0A\u88637"
+    21300202: "\u4E0A\u88638"
+    21300204: "\u4E0A\u88639"
+    21300206: "\u4E0A\u886310"
+    21300208: "\u4E0A\u886311"
+    21300210: "\u4E0A\u886312"
+    21300212: "\u4E0A\u886313"
+    21300214: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
+    21300216: "\u4E0A\u886311(\u7C89)"
+    21300218: "\u4E0A\u886313(\u7D2B)"
+    21300220: "\u4E0A\u88637\uFF08\u7C89\uFF09"
+    21300222: "\u7FC5\u81801"
+    21300224: "\u7FC5\u81802"
+    21300226: "\u7981\u6B62\u6807\u5FD7"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -200,11 +200,167 @@ TextureImporter:
     serializedVersion: 2
     sprites:
     - serializedVersion: 2
+      name: "\u8111\u58F31"
+      rect:
+        serializedVersion: 2
+        x: 385
+        y: 1949
+        width: 646
+        height: 391
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u817F2\u4E2A\u63D0\u4F9B1\u4E2A"
+      rect:
+        serializedVersion: 2
+        x: 3373
+        y: 1199
+        width: 45
+        height: 188
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u53F3\u624B\u4F60\u7684\u53F3\u624B\uFF01\uFF01"
+      rect:
+        serializedVersion: 2
+        x: 575
+        y: 2855
+        width: 62
+        height: 183
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u88D9\u5B501"
+      rect:
+        serializedVersion: 2
+        x: 2871
+        y: 756
+        width: 212
+        height: 135
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5DE6\u624B\u770B\u6E05\u5DE6\u624B\u4F60\u7684\u5DE6\u624B\uFF01\uFF01"
+      rect:
+        serializedVersion: 2
+        x: 262
+        y: 1425
+        width: 86
+        height: 182
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u8116\u5B50"
+      rect:
+        serializedVersion: 2
+        x: 3351
+        y: 809
+        width: 35
+        height: 51
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u978B\u5B501"
+      rect:
+        serializedVersion: 2
+        x: 4063
+        y: 390
+        width: 31
+        height: 38
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5634\u5DF41"
+      rect:
+        serializedVersion: 2
+        x: 3085
+        y: 881
+        width: 12
+        height: 10
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u773C\u775B\u8868\u60C51"
+      rect:
+        serializedVersion: 2
+        x: 2666
+        y: 1590
+        width: 227
+        height: 40
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u773C\u775B1"
+      rect:
+        serializedVersion: 2
+        x: 3085
+        y: 765
+        width: 264
+        height: 95
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5934\u9970\u54C11"
+      rect:
+        serializedVersion: 2
+        x: 3126
+        y: 2059
+        width: 226
+        height: 214
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u4E0A\u88631"
+      rect:
+        serializedVersion: 2
+        x: 350
+        y: 8
+        width: 165
+        height: 111
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u4E0A\u88632"
       rect:
         serializedVersion: 2
-        x: 3550
-        y: 14
+        x: 517
+        y: 32
         width: 165
         height: 111
       alignment: 0
@@ -216,8 +372,8 @@ TextureImporter:
       name: "\u4E0A\u88633"
       rect:
         serializedVersion: 2
-        x: 2029
-        y: 740
+        x: 183
+        y: 8
         width: 165
         height: 111
       alignment: 0
@@ -242,7 +398,7 @@ TextureImporter:
       name: "\u773C\u775B3"
       rect:
         serializedVersion: 2
-        x: 600
+        x: 591
         y: 202
         width: 220
         height: 78
@@ -255,7 +411,7 @@ TextureImporter:
       name: "\u8111\u58F32"
       rect:
         serializedVersion: 2
-        x: 1033
+        x: 385
         y: 1206
         width: 548
         height: 424
@@ -268,8 +424,8 @@ TextureImporter:
       name: "\u88D9\u5B503"
       rect:
         serializedVersion: 2
-        x: 591
-        y: 8
+        x: 386
+        y: 145
         width: 203
         height: 135
       alignment: 0
@@ -281,8 +437,8 @@ TextureImporter:
       name: "\u5634\u5DF42"
       rect:
         serializedVersion: 2
-        x: 2895
-        y: 1595
+        x: 1583
+        y: 1588
         width: 56
         height: 35
       alignment: 0
@@ -294,8 +450,8 @@ TextureImporter:
       name: "\u5634\u5DF43"
       rect:
         serializedVersion: 2
-        x: 3144
-        y: 1367
+        x: 386
+        y: 123
         width: 54
         height: 20
       alignment: 0
@@ -320,8 +476,8 @@ TextureImporter:
       name: "\u978B\u5B503"
       rect:
         serializedVersion: 2
-        x: 2620
-        y: 2089
+        x: 385
+        y: 2349
         width: 26
         height: 30
       alignment: 0
@@ -333,8 +489,8 @@ TextureImporter:
       name: "\u5934\u9970\u54C12"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1085
+        x: 773
+        y: 1787
         width: 194
         height: 160
       alignment: 0
@@ -359,8 +515,8 @@ TextureImporter:
       name: "\u88D9\u5B502"
       rect:
         serializedVersion: 2
-        x: 386
-        y: 5
+        x: 1
+        y: 1107
         width: 203
         height: 138
       alignment: 0
@@ -450,8 +606,8 @@ TextureImporter:
       name: "\u5934\u53D16+\u4E0B\uFF08\u68D5\uFF09"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 2045
+        x: 1
+        y: 1609
         width: 382
         height: 770
       alignment: 0
@@ -464,7 +620,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2215
-        y: 732
+        y: 282
         width: 449
         height: 448
       alignment: 0
@@ -490,7 +646,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2215
-        y: 1182
+        y: 732
         width: 449
         height: 448
       alignment: 0
@@ -502,8 +658,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
@@ -542,7 +698,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2215
-        y: 282
+        y: 1182
         width: 449
         height: 448
       alignment: 0
@@ -567,8 +723,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u7C73\u767D)"
       rect:
         serializedVersion: 2
-        x: 1495
-        y: 3509
+        x: 1
+        y: 3040
         width: 649
         height: 586
       alignment: 0
@@ -580,8 +736,8 @@ TextureImporter:
       name: "\u5934\u53D17(\u84DD\u8272)"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 3040
+        x: 1495
+        y: 3509
         width: 649
         height: 586
       alignment: 0
@@ -594,7 +750,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2720
-        y: 3595
+        y: 3093
         width: 709
         height: 500
       alignment: 0
@@ -607,7 +763,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2720
-        y: 3093
+        y: 3595
         width: 709
         height: 500
       alignment: 0
@@ -671,8 +827,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u7C89\u8272)"
       rect:
         serializedVersion: 2
-        x: 1665
-        y: 1583
+        x: 1033
+        y: 1206
         width: 548
         height: 424
       alignment: 0
@@ -684,8 +840,8 @@ TextureImporter:
       name: "\u8111\u58F32(\u9EC4\u8272)"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 1206
+        x: 1665
+        y: 1583
         width: 548
         height: 424
       alignment: 0
@@ -697,8 +853,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u68D5\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 3431
-        y: 739
+        x: 2648
+        y: 2025
         width: 476
         height: 532
       alignment: 0
@@ -710,8 +866,8 @@ TextureImporter:
       name: "\u8111\u58F32+\u4E0B\uFF08\u7C89\u8272\uFF09\u53E6\u4E00\u79CD\u53D1\u578B"
       rect:
         serializedVersion: 2
-        x: 2648
-        y: 2025
+        x: 3431
+        y: 739
         width: 476
         height: 532
       alignment: 0
@@ -723,8 +879,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u9EC4\u8272\uFF09\u8111\u58F32\u2014\u2014\u4E0B"
       rect:
         serializedVersion: 2
-        x: 2648
-        y: 2559
+        x: 1838
+        y: 2402
         width: 476
         height: 532
       alignment: 0
@@ -762,8 +918,8 @@ TextureImporter:
       name: "\u8111\u58F33+\u4E0B\uFF08\u7D2B\u8272\uFF09"
       rect:
         serializedVersion: 2
-        x: 1838
-        y: 2402
+        x: 2648
+        y: 2559
         width: 476
         height: 532
       alignment: 0
@@ -776,7 +932,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1583
-        y: 1195
+        y: 807
         width: 444
         height: 386
       alignment: 0
@@ -789,7 +945,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1583
-        y: 807
+        y: 1195
         width: 444
         height: 386
       alignment: 0
@@ -853,8 +1009,8 @@ TextureImporter:
       name: "\u8863\u670D11(\u7C89)"
       rect:
         serializedVersion: 2
-        x: 3112
-        y: 436
+        x: 385
+        y: 1646
         width: 386
         height: 301
       alignment: 0
@@ -879,8 +1035,8 @@ TextureImporter:
       name: "\u8863\u670D11"
       rect:
         serializedVersion: 2
-        x: 385
-        y: 1646
+        x: 3112
+        y: 436
         width: 386
         height: 301
       alignment: 0
@@ -918,8 +1074,8 @@ TextureImporter:
       name: "\u88D9\u5B505"
       rect:
         serializedVersion: 2
-        x: 2871
-        y: 749
+        x: 773
+        y: 1643
         width: 203
         height: 142
       alignment: 0
@@ -1036,7 +1192,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3688
-        y: 439
+        y: 523
         width: 30
         height: 40
       alignment: 0
@@ -1062,7 +1218,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 3688
-        y: 523
+        y: 439
         width: 30
         height: 40
       alignment: 0
@@ -1087,8 +1243,8 @@ TextureImporter:
       name: 6
       rect:
         serializedVersion: 2
-        x: 1619
-        y: 1598
+        x: 3387
+        y: 765
         width: 34
         height: 42
       alignment: 0
@@ -1100,8 +1256,8 @@ TextureImporter:
       name: 7
       rect:
         serializedVersion: 2
-        x: 2579
-        y: 2083
+        x: 1583
+        y: 1625
         width: 39
         height: 68
       alignment: 0
@@ -1139,8 +1295,8 @@ TextureImporter:
       name: 10
       rect:
         serializedVersion: 2
-        x: 1583
-        y: 1597
+        x: 3351
+        y: 764
         width: 34
         height: 43
       alignment: 0
@@ -1152,8 +1308,8 @@ TextureImporter:
       name: 11
       rect:
         serializedVersion: 2
-        x: 2620
-        y: 2121
+        x: 413
+        y: 2349
         width: 26
         height: 30
       alignment: 0
@@ -1165,8 +1321,8 @@ TextureImporter:
       name: 12
       rect:
         serializedVersion: 2
-        x: 2579
-        y: 2033
+        x: 2895
+        y: 1582
         width: 39
         height: 48
       alignment: 0
@@ -1230,8 +1386,8 @@ TextureImporter:
       name: "\u5934\u99707"
       rect:
         serializedVersion: 2
-        x: 3108
-        y: 862
+        x: 2316
+        y: 2662
         width: 270
         height: 272
       alignment: 0
@@ -1243,8 +1399,8 @@ TextureImporter:
       name: "\u5934\u99708"
       rect:
         serializedVersion: 2
-        x: 2316
-        y: 2662
+        x: 3108
+        y: 862
         width: 270
         height: 272
       alignment: 0
@@ -1282,8 +1438,8 @@ TextureImporter:
       name: "\u5934\u997011"
       rect:
         serializedVersion: 2
-        x: 197
-        y: 1069
+        x: 2029
+        y: 1405
         width: 171
         height: 176
       alignment: 0
@@ -1308,8 +1464,8 @@ TextureImporter:
       name: "\u4E0A\u88634"
       rect:
         serializedVersion: 2
-        x: 2029
-        y: 1258
+        x: 206
+        y: 1086
         width: 172
         height: 159
       alignment: 0
@@ -1321,8 +1477,8 @@ TextureImporter:
       name: "\u4E0A\u88635"
       rect:
         serializedVersion: 2
-        x: 3258
-        y: 746
+        x: 3550
+        y: 11
         width: 166
         height: 114
       alignment: 0
@@ -1334,8 +1490,8 @@ TextureImporter:
       name: "\u4E0A\u88636"
       rect:
         serializedVersion: 2
-        x: 3368
-        y: 14
+        x: 2029
+        y: 705
         width: 180
         height: 111
       alignment: 0
@@ -1347,8 +1503,8 @@ TextureImporter:
       name: "\u4E0A\u88637"
       rect:
         serializedVersion: 2
-        x: 3076
-        y: 749
+        x: 3368
+        y: 14
         width: 180
         height: 111
       alignment: 0
@@ -1387,7 +1543,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2029
-        y: 966
+        y: 931
         width: 179
         height: 144
       alignment: 0
@@ -1399,8 +1555,8 @@ TextureImporter:
       name: "\u4E0A\u886311"
       rect:
         serializedVersion: 2
-        x: 773
-        y: 1644
+        x: 2313
+        y: 2030
         width: 186
         height: 121
       alignment: 0
@@ -1425,8 +1581,8 @@ TextureImporter:
       name: "\u4E0A\u886313"
       rect:
         serializedVersion: 2
-        x: 1
-        y: 921
+        x: 2029
+        y: 1241
         width: 180
         height: 162
       alignment: 0
@@ -1438,8 +1594,8 @@ TextureImporter:
       name: "\u4E0A\u886310\uFF08\u9EC4\uFF09"
       rect:
         serializedVersion: 2
-        x: 2029
-        y: 1112
+        x: 1
+        y: 961
         width: 179
         height: 144
       alignment: 0
@@ -1465,7 +1621,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 2029
-        y: 1419
+        y: 1077
         width: 180
         height: 162
       alignment: 0
@@ -1477,8 +1633,8 @@ TextureImporter:
       name: "\u4E0A\u88637\uFF08\u7C89\uFF09"
       rect:
         serializedVersion: 2
-        x: 183
-        y: 8
+        x: 2029
+        y: 818
         width: 180
         height: 111
       alignment: 0
@@ -1516,166 +1672,10 @@ TextureImporter:
       name: "\u7981\u6B62\u6807\u5FD7"
       rect:
         serializedVersion: 2
-        x: 773
-        y: 1767
-        width: 180
-        height: 180
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u4E0A\u88631"
-      rect:
-        serializedVersion: 2
-        x: 2029
-        y: 853
-        width: 165
-        height: 111
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u53F3\u624B\u4F60\u7684\u53F3\u624B\uFF01\uFF01"
-      rect:
-        serializedVersion: 2
-        x: 575
-        y: 2855
-        width: 62
-        height: 183
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u5634\u5DF41"
-      rect:
-        serializedVersion: 2
-        x: 1619
-        y: 1586
-        width: 12
-        height: 10
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u5934\u9970\u54C11"
-      rect:
-        serializedVersion: 2
-        x: 3126
-        y: 2059
-        width: 226
-        height: 214
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u5DE6\u624B\u770B\u6E05\u5DE6\u624B\u4F60\u7684\u5DE6\u624B\uFF01\uFF01"
-      rect:
-        serializedVersion: 2
-        x: 262
-        y: 1425
-        width: 86
-        height: 182
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u773C\u775B1"
-      rect:
-        serializedVersion: 2
-        x: 2313
-        y: 2056
-        width: 264
-        height: 95
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u773C\u775B\u8868\u60C51"
-      rect:
-        serializedVersion: 2
-        x: 2666
-        y: 1590
-        width: 227
-        height: 40
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u8111\u58F31"
-      rect:
-        serializedVersion: 2
-        x: 385
-        y: 1949
-        width: 646
-        height: 391
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u8116\u5B50"
-      rect:
-        serializedVersion: 2
-        x: 1583
-        y: 1642
-        width: 35
-        height: 51
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u817F2\u4E2A\u63D0\u4F9B1\u4E2A"
-      rect:
-        serializedVersion: 2
         x: 3373
-        y: 1199
-        width: 45
-        height: 188
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u88D9\u5B501"
-      rect:
-        serializedVersion: 2
-        x: 386
-        y: 145
-        width: 212
-        height: 135
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: "\u978B\u5B501"
-      rect:
-        serializedVersion: 2
-        x: 4063
-        y: 390
-        width: 31
-        height: 38
+        y: 1137
+        width: 1
+        height: 1
       alignment: 0
       pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}

+ 0 - 349
Assets/Resource/Logo.unity

@@ -91,68 +91,6 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &442047128
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 442047131}
-  - component: {fileID: 442047130}
-  - component: {fileID: 442047129}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!114 &442047129
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 442047128}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &442047130
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 442047128}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 5
---- !u!4 &442047131
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 442047128}
-  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: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -217,120 +155,6 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
---- !u!1 &557082217
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 557082221}
-  - component: {fileID: 557082220}
-  - component: {fileID: 557082219}
-  - component: {fileID: 557082218}
-  - component: {fileID: 557082222}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!114 &557082218
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 557082217}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &557082219
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 557082217}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
---- !u!223 &557082220
-Canvas:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 557082217}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &557082221
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 557082217}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 1541018266}
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
---- !u!114 &557082222
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 557082217}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3cac44ec7ca55734c9dd55ba09a4b72a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  RegistLock: 0
-  String1: 
-  String2: 
-  TextAsset: {fileID: 0}
-  Texture: {fileID: 0}
-  Font: {fileID: 0}
-  Go: {fileID: 0}
-  GoList: []
-  SrList: []
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -594,179 +418,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1541018265
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1541018266}
-  - component: {fileID: 1541018268}
-  - component: {fileID: 1541018267}
-  - component: {fileID: 1541018269}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1541018266
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1541018265}
-  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: 557082221}
-  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: -334.3, y: 0.0000076294}
-  m_SizeDelta: {x: 197.6, y: 197.6}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1541018267
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1541018265}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  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
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!222 &1541018268
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1541018265}
---- !u!95 &1541018269
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1541018265}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 313b259a8bf0b0c499bbac8e5354063b, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
---- !u!1 &1632940791
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1632940796}
-  - component: {fileID: 1632940795}
-  - component: {fileID: 1632940794}
-  - component: {fileID: 1632940793}
-  - component: {fileID: 1632940792}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!81 &1632940792
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1632940791}
-  m_Enabled: 1
---- !u!92 &1632940793
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1632940791}
-  m_Enabled: 1
---- !u!124 &1632940794
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1632940791}
-  m_Enabled: 1
---- !u!20 &1632940795
-Camera:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1632940791}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
---- !u!4 &1632940796
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1632940791}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 4.010913, y: 3.2366495, z: 0.25}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0

+ 145 - 11
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -622,7 +622,7 @@ GameObject:
   - component: {fileID: 114632778979679736}
   - component: {fileID: 114313412454825080}
   m_Layer: 5
-  m_Name: C_Setting
+  m_Name: C_DressRoom
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -934,6 +934,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1441627754628646
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224402016592928158}
+  - component: {fileID: 222381329127419626}
+  - component: {fileID: 114839325306237002}
+  - component: {fileID: 114625155093229508}
+  m_Layer: 5
+  m_Name: C_Setting
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1446826123840378
 GameObject:
   m_ObjectHideFlags: 1
@@ -1301,6 +1319,7 @@ GameObject:
   serializedVersion: 5
   m_Component:
   - component: {fileID: 224686880427899620}
+  - component: {fileID: 114916945438668904}
   m_Layer: 5
   m_Name: C_Group1
   m_TagString: Untagged
@@ -5365,6 +5384,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114625155093229508
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1441627754628646}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114839325306237002}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114632202726341698
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5458,7 +5518,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bf1c75459cdd88441a7928bb916f47ef, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5493,7 +5553,7 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
-  Draw: 1
+  Draw: 0
 --- !u!114 &114637151775312998
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6286,6 +6346,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!114 &114839325306237002
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1441627754628646}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_Sprite: {fileID: 21300006, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114843960337677540
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6580,6 +6667,28 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114916945438668904
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1591056210969682}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
 --- !u!114 &114921890905725846
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7154,6 +7263,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1415200784515662}
+--- !u!222 &222381329127419626
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1441627754628646}
 --- !u!222 &222382345498978876
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7699,7 +7814,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 39.99994, y: -115.9786}
+  m_AnchoredPosition: {x: 40, y: -185}
   m_SizeDelta: {x: 80, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224105675886232962
@@ -7728,14 +7843,14 @@ RectTransform:
   m_GameObject: {fileID: 1314038889515210}
   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_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_Children: []
   m_Father: {fileID: 224686880427899620}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 39.99994, y: -194.9786}
+  m_AnchoredPosition: {x: 40, y: -111}
   m_SizeDelta: {x: 80, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224133419404342274
@@ -8317,6 +8432,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224402016592928158
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1441627754628646}
+  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: 224686880427899620}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 40, y: -259}
+  m_SizeDelta: {x: 80, y: 74}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224408791352645432
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8548,11 +8681,11 @@ RectTransform:
   m_Children:
   - {fileID: 224713315808876022}
   m_Father: {fileID: 224686880427899620}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 39.99994, y: -36.978577}
+  m_AnchoredPosition: {x: 40, y: -37}
   m_SizeDelta: {x: 80, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224462919386798482
@@ -9172,15 +9305,16 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224106350729927538}
   - {fileID: 224455867312941770}
+  - {fileID: 224106350729927538}
   - {fileID: 224099416328236884}
+  - {fileID: 224402016592928158}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -40, y: -193.465}
+  m_AnchoredPosition: {x: -39.998, y: -171}
   m_SizeDelta: {x: 80, y: 221.97998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224694890287585666

BIN
Assets/Resource/Sprite/SpriteUI/Atlas.png


+ 30 - 16
Assets/Resource/Sprite/SpriteUI/Atlas.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 64ace2edec65be1458f4f6c09ae97699
-timeCreated: 1502583930
+timeCreated: 1502696502
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -9,6 +9,7 @@ TextureImporter:
     21300004: "\u82B1\u6735"
     21300006: "\u5DF2\u8D2D"
     21300008: "\u793C\u5305"
+    21300010: "\u670D\u88C5"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -103,7 +104,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 375
+        y: 374
         width: 131
         height: 106
       alignment: 0
@@ -116,9 +117,22 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 7
-        y: 185
+        y: 184
         width: 182
-        height: 176
+        height: 179
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: 0
+    - serializedVersion: 2
+      name: "\u91D1\u5E01"
+      rect:
+        serializedVersion: 2
+        x: 197
+        y: 236
+        width: 88
+        height: 87
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
@@ -129,8 +143,8 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 0
-        y: 1
-        width: 197
+        y: 0
+        width: 195
         height: 182
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
@@ -138,26 +152,26 @@ TextureImporter:
       outline: []
       tessellationDetail: 0
     - serializedVersion: 2
-      name: "\u91D1\u5E01"
+      name: "\u94BB\u77F3"
       rect:
         serializedVersion: 2
-        x: 199
-        y: 91
-        width: 89
-        height: 87
+        x: 197
+        y: 146
+        width: 91
+        height: 88
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: 0
     - serializedVersion: 2
-      name: "\u94BB\u77F3"
+      name: "\u670D\u88C5"
       rect:
         serializedVersion: 2
-        x: 199
-        y: 1
-        width: 90
-        height: 88
+        x: 197
+        y: 0
+        width: 155
+        height: 143
       alignment: 0
       pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}

BIN
Assets/Resource/Sprite/SpriteUI/试衣间.png


+ 68 - 0
Assets/Resource/Sprite/SpriteUI/试衣间.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: bf1c75459cdd88441a7928bb916f47ef
+timeCreated: 1502696177
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/XML/PlayerConfig.xml

@@ -1,5 +1,5 @@
 <PlayerConfig>
-  <Version value="-6" />
+  <Version value="-7" />
 
   <ID value="Default" />
   <TutorialA value="1" />

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -2,6 +2,7 @@
   <UI>
     <C_MiniGameLab desc=""><![CDATA[快来打理花园吧!]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[等级]]></C_GardenLab>
+    <C_DressRoom desc=""><![CDATA[提升花园等级,开放试衣间]]></C_DressRoom>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精灵]]></F_ElfLab>

+ 1 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -2,6 +2,7 @@
   <UI>
     <C_MiniGameLab desc=""><![CDATA[快來打理花園吧!]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[等級]]></C_GardenLab>
+    <C_DressRoom desc=""><![CDATA[提升花園等級,開放試衣間]]></C_DressRoom>
     <F_StoreLab desc=""><![CDATA[商店]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[魔法]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[精靈]]></F_ElfLab>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -2,6 +2,7 @@
   <UI>
     <C_MiniGameLab desc=""><![CDATA[Come to play!]]></C_MiniGameLab>
     <C_GardenLab desc=""><![CDATA[Level ]]></C_GardenLab>
+    <C_DressRoom desc=""><![CDATA[Upgrade garden to enter dressroom]]></C_DressRoom>
     <F_StoreLab desc=""><![CDATA[Shop]]></F_StoreLab>
     <F_MagicLab desc=""><![CDATA[Mag]]></F_MagicLab>
     <F_ElfLab desc=""><![CDATA[Elf]]></F_ElfLab>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 9 - 0
Assets/Script/Manage/ManaCenter.cs

@@ -195,6 +195,15 @@ public class ManaCenter : Regist
                     ManaTutorial.TutorialB = true;
                 }
             }
+
+            if (Level < 13)
+            {
+                ManaReso.Get<Image>("C_DressRoom").material = Lib.GrayMat;
+            }
+            else
+            {
+                ManaReso.Get<Image>("C_DressRoom").material = null;
+            }
         }
     }
     public static float Person

+ 11 - 13
Assets/Script/Manage/ManaPlayer.cs

@@ -47,10 +47,8 @@ public class ManaPlayer : Regist
         if (!Complete)
         {
             UnityFactory.factory.LoadDragonBonesData(ManaReso.Load<TextAsset>("stand_ske", Folder.Config));
-            UnityFactory.factory.LoadDragonBonesData(ManaReso.Load<TextAsset>("Closet_ske", Folder.Config));
 
-            //UnityFactory.factory.LoadTextureAtlasData(ManaReso.Load<TextAsset>("stand_tex", Folder.Config), "stand_texture");
-            UnityFactory.factory.LoadTextureAtlasData(ManaReso.Load<TextAsset>("Closet_tex", Folder.Config), "Closet_texture");
+            UnityFactory.factory.LoadTextureAtlasData(ManaReso.Load<TextAsset>("stand_tex", Folder.Config), "stand_texture");
 
             Complete = true;
         }
@@ -157,16 +155,7 @@ public class ManaPlayer : Regist
         }
         else
         {
-            //Object[] objects = Bundle.Scene.LoadAssetWithSubAssets("stand_texture", typeof(Sprite));
-
-            //for (int i = 0; i < objects.Length; i++)
-            //{
-            //    Sprite sprite = (Sprite)objects[i];
-
-            //    CloseSpriteDic.Add(sprite.name, sprite);
-            //}
-
-            Object[] objects = Bundle.Scene.LoadAssetWithSubAssets("Closet_texture", typeof(Sprite));
+            Object[] objects = Bundle.Scene.LoadAssetWithSubAssets("stand_texture", typeof(Sprite));
 
             for (int i = 0; i < objects.Length; i++)
             {
@@ -174,6 +163,15 @@ public class ManaPlayer : Regist
 
                 CloseSpriteDic.Add(sprite.name, sprite);
             }
+
+            //Object[] objects = Bundle.Scene.LoadAssetWithSubAssets("Closet_texture", typeof(Sprite));
+
+            //for (int i = 0; i < objects.Length; i++)
+            //{
+            //    Sprite sprite = (Sprite)objects[i];
+
+            //    CloseSpriteDic.Add(sprite.name, sprite);
+            //}
         }
 
 

+ 1 - 1
Assets/Script/Manage/ManaServer.cs

@@ -244,7 +244,7 @@ public class ManaServer : Regist
 
                     mailItem.GetChild(2).GetComponent<Text>().text = closeUnit.Name;
 
-                    ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(花朵)>{closeUnit.Name}", 10);
+                    ManaInfo.Show($"{Language.GetStr("Common", "Get")} <(服装)>{closeUnit.Name}", 10);
                 }
                 else
                 {

+ 7 - 6
Assets/Script/Manage/ManaTutorial.cs

@@ -388,6 +388,7 @@ public class ManaTutorial : Regist
         ManaReso.SetActive("C_Setting", false);
         ManaReso.SetActive("C_Achieve", false);
         ManaReso.SetActive("C_Manage", false);
+        ManaReso.SetActive("C_DressRoom", false);
 
         ManaReso.SetActive("N_Tutorial", true);
 
@@ -531,6 +532,7 @@ public class ManaTutorial : Regist
         ManaReso.SetActive("C_Setting", true);
         ManaReso.SetActive("C_Achieve", true);
         ManaReso.SetActive("C_Manage", true);
+        ManaReso.SetActive("C_DressRoom", true);
 
         ManaReso.SetActive("N_Tutorial", true);
 
@@ -971,6 +973,10 @@ public class ManaTutorial : Regist
 
         TweenRoot tweenRoot = ManaReso.Get("I_BlackMask").TweenBacCG();
 
+        Tutorial.HightDisable();
+
+        ManaReso.Get("N_LabBK").TweenBacCG();
+
         tweenRoot.AddEventOnetime
         (
             EventType.BackwardFinish,
@@ -978,11 +984,6 @@ public class ManaTutorial : Regist
             {
                 Tutorial.MaskLock = true;
 
-                Tutorial.HightDisable();
-
-                ManaReso.Get("N_Mask").TweenBacGra();
-                ManaReso.Get("N_LabBK").TweenBacCG();
-
                 ManaReso.SetActive("N_Button", false);
                 ManaReso.SetActive("N_Tutorial", false);
             }
@@ -1053,7 +1054,7 @@ public class ManaTutorial : Regist
             "N_Button",
             () =>
             {
-                ManaPlayer.Player.OnPointerClick(null);
+                ManaPlayer.Player.EnterDressRoom();
 
                 EndD();
             }

+ 24 - 0
Assets/Script/Manage/ManaUI.cs

@@ -427,6 +427,30 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_DressRoom
+
+        ManaReso.SetButtonEvent
+            (
+                "C_DressRoom",
+                () =>
+                {
+                    ManaAudio.PlayClip(Clip.BtnClip);
+
+                    if (ManaCenter.Level < 13)
+                    {
+                        Toast.Show(1.5f, Language.GetStr("UI", "C_DressRoom"));
+                    }
+                    else
+                    {
+                        ManaReso.Get("I_BlackMask").GetTweenCG().Duration = 0.5f;
+
+                        ManaPlayer.Player.EnterDressRoom();
+                    }
+                }
+            );
+
+        #endregion
+
 
         #region C_Visit
 

+ 6 - 23
Assets/Script/Object/Player.cs

@@ -489,16 +489,9 @@ public class Player : Regist , IPointerClickHandler
 
     public void OnPointerClick(PointerEventData eventData)
     {
-        if (ManaCenter.Level < 13)
-        {
-            return;
-        }
-
-        ManaReso.Get("I_BlackMask").GetTweenCG().Duration = 0.5f;
-
         ManaAudio.PlayClip(Clip.CurrentClip);
 
-        EnterDressRoom();
+        PlayAnim("newAnimation1");
     }
 
 
@@ -750,10 +743,8 @@ public class Player : Regist , IPointerClickHandler
         if (!ManaPlayer.Complete)
         {
             UnityFactory.factory.LoadDragonBonesData(ManaReso.Load<TextAsset>("stand_ske", Folder.Config));
-            UnityFactory.factory.LoadDragonBonesData(ManaReso.Load<TextAsset>("Closet_ske", Folder.Config));
 
-            //UnityFactory.factory.LoadTextureAtlasData(ManaReso.Load<TextAsset>("stand_tex", Folder.Config), "stand_texture");
-            UnityFactory.factory.LoadTextureAtlasData(ManaReso.Load<TextAsset>("Closet_tex", Folder.Config), "Closet_texture");
+            UnityFactory.factory.LoadTextureAtlasData(ManaReso.Load<TextAsset>("stand_tex", Folder.Config), "stand_texture");
 
             ManaPlayer.Complete = true;
         }
@@ -793,11 +784,6 @@ public class Player : Regist , IPointerClickHandler
         RightShoeSlot = UAC.armature.GetSlot("鞋子右");
         HeadWearSlot = UAC.armature.GetSlot("头饰品");
 
-        ChangeClose(BodyPart.Leg, "腿2个提供1个", false);
-        ChangeClose(BodyPart.Neck, "脖子", false);
-        ChangeClose(BodyPart.LeftHand, "左手看清左手你的左手!!", false);
-        ChangeClose(BodyPart.RightHand, "右手你的右手!!", false);
-
         ChangeClose(BodyPart.Eye, "眼睛1", false);
         ChangeClose(BodyPart.Top, "上衣1", false);
         ChangeClose(BodyPart.Shoe, "鞋子1", false);
@@ -896,14 +882,11 @@ public class Player : Regist , IPointerClickHandler
         transform.FindChild("Armature").GetChild(tempTra.GetSiblingIndex() + 1).SetLZ(-0.001f);
 
 
-        tempTra = transform.FindChild("Armature/腿2个提供1个");
-        tempTra.SetLZ(0);
-
-        transform.FindChild("Armature").GetChild(tempTra.GetSiblingIndex() + 1).SetLZ(0);
-
+        transform.FindChild("Armature/左腿").SetLZ(0);
+        transform.FindChild("Armature/右腿").SetLZ(0);
         transform.FindChild("Armature/脖子").SetLZ(0.001f);
-        transform.FindChild("Armature/左手看清左手你的左手!!").SetLZ(-0.001f);
-        transform.FindChild("Armature/右手你的右手!!").SetLZ(-0.001f);
+        transform.FindChild("Armature/左手").SetLZ(-0.001f);
+        transform.FindChild("Armature/右手").SetLZ(-0.001f);
     }
 
     public void ChangeClose(BodyPart bodyPart, string armatureName, bool setDepth = true)

+ 5 - 5
Assets/Script/Tool/Auxiliary.cs

@@ -136,7 +136,7 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.M))
         {
-            
+            ManaTutorial.EnterD1();
         }
 
         if (Input.GetKeyDown(KeyCode.N))
@@ -194,11 +194,11 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.V))
         {
-            //ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
-            //ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
+            ManaServer.MailReward mailReward = new ManaServer.MailReward("1", "pack", "4");
+            ManaServer.MailReward mailReward1 = new ManaServer.MailReward("1", "close", "2");
 
-            //ManaServer.GetMainReward(mailReward);
-            //ManaServer.GetMainReward(mailReward1);
+            ManaServer.GetMainReward(mailReward);
+            ManaServer.GetMainReward(mailReward1);
 
             ManaGarden.ElfTimer = 0;
 

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []

+ 7 - 1
ToList.txt

@@ -1,5 +1,11 @@
-新资源
+图集有新图片 需要再设置一次引用
 
+存档不能更新?
+
+Player的影子只在试衣间中显示
+
+
+画面卡顿的问题
 
 花隐形的bug(小游戏C? 小游戏B?)
 

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.