Quellcode durchsuchen

增加点赞和评论

LiuQilin vor 8 Jahren
Ursprung
Commit
79a6fb28cc

+ 3 - 2
Assets/Resource/Logo.unity

@@ -445,8 +445,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f1828554d8ffa12449b221fe29b2c32c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  DebugMode: 0
-  DebugModeGo: {fileID: 0}
+  DebugMode: 1
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

+ 88 - 129
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -51,6 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93a1da3798d4c6b44a5a139df98a95f3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Texture: {fileID: 2800000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   UiList:
   - {fileID: 21300004, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300018, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
@@ -61,7 +62,6 @@ MonoBehaviour:
   - {fileID: 1778995246200592, guid: e71b00d758f7c8341ac775c8694a411a, type: 2}
   - {fileID: 1346530573601956, guid: a10d06e0f5f691943b242f354e65d756, type: 2}
   - {fileID: 1446131628915858, guid: c45699dd63768e844839c3f1f36793d0, type: 2}
-  - {fileID: 21300000, guid: 5371bd980fad6824f97fe233859670b5, type: 3}
   - {fileID: 1721431208006218, guid: e719f06d55a7db842abdc96b01c32ae1, type: 2}
   - {fileID: 2100000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
   - {fileID: 1507184977330266, guid: 4b27b1fc0c9780a4492f68549d3e1f52, type: 2}
@@ -70,10 +70,8 @@ MonoBehaviour:
   - {fileID: 1846155164804538, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
   - {fileID: 1988003470994862, guid: ed63e319067658f48b0c72b655552450, type: 2}
   - {fileID: 1424904125323438, guid: c176e58cecd9fd5428a8498de87375a2, type: 2}
-  - {fileID: 21300000, guid: ee6655093ea65d94b8e4e21f6c532fe8, type: 3}
   - {fileID: 1530314730688346, guid: aefbbfee089a9964e9b377589692f48c, type: 2}
   - {fileID: 1987736408932752, guid: e94e1c2506968d14ba9792fb79e31e39, type: 2}
-  - {fileID: 21300000, guid: 1258b465a9bfc8042822c22571387170, type: 3}
   - {fileID: 21300006, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300020, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
@@ -109,105 +107,84 @@ MonoBehaviour:
   - {fileID: 1810007713505970, guid: 290623bdcdeb3b1408050b70ebad1637, type: 2}
   - {fileID: 1059876177522622, guid: 718ebdaed223e93409d6dc7e53a23167, type: 2}
   - {fileID: 1574183927423390, guid: f9745d1e09b5acc47a0abe1eb100c9b8, type: 2}
-  - {fileID: 21300062, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300064, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300066, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300068, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300070, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300072, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300074, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300076, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300078, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300080, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
   - {fileID: 21300000, guid: b302746e597587e4ea2e8d2e9765a58c, type: 3}
   - {fileID: 1648846713598210, guid: 9b0fa99244cc9c94fa53cbfd572e5f1b, type: 2}
+  - {fileID: 21300072, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300048, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300050, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300052, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300054, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300056, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300022, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300030, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300028, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300026, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300024, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  AtlasList:
+  - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  - {fileID: 21300002, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  - {fileID: 21300000, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  - {fileID: 21300010, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  - {fileID: 21300008, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
+  - {fileID: 21300008, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   Atlas2List:
-  - {fileID: 21300030, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300024, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300002, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300000, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300016, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300034, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300054, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300044, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300004, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300038, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300006, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300046, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300048, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300036, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300028, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300040, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300032, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300014, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300042, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300020, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300012, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300026, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300018, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300056, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300050, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300052, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300058, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300010, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300008, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300022, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
-  - {fileID: 21300090, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300104, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300114, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300116, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300118, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300102, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300106, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300108, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300110, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300112, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300092, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300094, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300096, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300098, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300100, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300080, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300082, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300084, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300088, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300086, guid: dd5fc9b966656ec489946ef8540f9488, type: 3}
-  - {fileID: 21300026, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300028, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300030, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300042, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300040, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300018, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300020, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300038, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300048, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300000, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300002, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300022, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300024, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300004, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300032, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300010, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300034, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300036, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300006, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300008, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300012, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300014, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300016, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300044, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300046, guid: 92acf314e1ccad54baf2a5aa535b4088, type: 3}
-  - {fileID: 21300002, guid: 514a9cc3d48e0cf419b5498f1daebc9d, type: 3}
-  - {fileID: 21300006, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
-  - {fileID: 21300006, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300002, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300000, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
-  - {fileID: 21300004, guid: 514a9cc3d48e0cf419b5498f1daebc9d, type: 3}
-  - {fileID: 21300002, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
-  - {fileID: 21300008, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300004, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300000, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300004, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
+  - {fileID: 21300068, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300066, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300026, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300056, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300028, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300054, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300060, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300032, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300042, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300040, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300070, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300064, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300018, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300024, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300038, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300048, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300058, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300052, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300000, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300002, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300020, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300022, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300004, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300030, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300050, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300062, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300010, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300036, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300034, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300008, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300006, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300014, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300016, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300012, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300044, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300046, guid: b9c1c4d92b62e3849a6503ef6531ca4a, type: 3}
+  - {fileID: 21300038, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300036, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300010, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300032, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300034, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300030, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300028, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300022, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300024, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300026, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300020, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300012, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300014, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300016, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300018, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300000, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300002, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300004, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300008, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
+  - {fileID: 21300006, guid: c9f73f372de30284b9c4158a7b6c9634, type: 3}
   EffectList:
   - {fileID: 2100000, guid: d112dba8bb2f53941b3807271af7bc52, type: 2}
   - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
@@ -233,49 +210,32 @@ MonoBehaviour:
   - {fileID: 1755534108849072, guid: fd76b8ae8b2d75e42812830672529b1c, type: 2}
   - {fileID: 1166344047165030, guid: b83568af2a6c2574d9a102a98a611a41, type: 2}
   - {fileID: 1718165080095612, guid: 88b6da1c153074445a6a8f8165071b0e, type: 2}
-  - {fileID: 21300008, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
-  - {fileID: 21300008, guid: 514a9cc3d48e0cf419b5498f1daebc9d, type: 3}
-  - {fileID: 21300000, guid: 960889fe3f4c30047b0d2a7970e7e2ea, type: 3}
-  - {fileID: 21300002, guid: 9c0c9693f6294b446b6730326e348cc4, type: 3}
-  - {fileID: 21300002, guid: 960889fe3f4c30047b0d2a7970e7e2ea, type: 3}
-  - {fileID: 21300008, guid: b3fafe21d2102d84d902f62676849a99, type: 3}
-  - {fileID: 21300004, guid: 9c0c9693f6294b446b6730326e348cc4, type: 3}
-  - {fileID: 21300004, guid: 960889fe3f4c30047b0d2a7970e7e2ea, type: 3}
-  - {fileID: 21300008, guid: ac65323e315e5804ebdf4d234d610d4f, type: 3}
-  - {fileID: 21300006, guid: ac65323e315e5804ebdf4d234d610d4f, type: 3}
-  - {fileID: 21300010, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
-  - {fileID: 21300006, guid: 9c0c9693f6294b446b6730326e348cc4, type: 3}
-  - {fileID: 21300000, guid: 514a9cc3d48e0cf419b5498f1daebc9d, type: 3}
-  - {fileID: 21300006, guid: 514a9cc3d48e0cf419b5498f1daebc9d, type: 3}
-  - {fileID: 21300004, guid: ac65323e315e5804ebdf4d234d610d4f, type: 3}
-  - {fileID: 21300004, guid: b3fafe21d2102d84d902f62676849a99, type: 3}
-  - {fileID: 21300000, guid: 9c0c9693f6294b446b6730326e348cc4, type: 3}
-  - {fileID: 21300010, guid: b3fafe21d2102d84d902f62676849a99, type: 3}
-  - {fileID: 21300000, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300002, guid: 514a9cc3d48e0cf419b5498f1daebc9d, type: 3}
-  - {fileID: 21300004, guid: 650e3c5dd1820674897f16f988a5f6ef, type: 3}
-  - {fileID: 21300006, guid: 960889fe3f4c30047b0d2a7970e7e2ea, type: 3}
-  - {fileID: 21300006, guid: b3fafe21d2102d84d902f62676849a99, type: 3}
-  - {fileID: 21300010, guid: ac65323e315e5804ebdf4d234d610d4f, type: 3}
-  - {fileID: 21300000, guid: b4435a6ae3b33bb47b2f94f749e43e47, type: 3}
-  - {fileID: 21300000, guid: ac65323e315e5804ebdf4d234d610d4f, type: 3}
-  - {fileID: 21300002, guid: ac65323e315e5804ebdf4d234d610d4f, type: 3}
   - {fileID: 1649364772911118, guid: 08a1f522944c12245b657272217bf6b7, type: 2}
   - {fileID: 1419661773526862, guid: 034390a4ac0a8aa40863954a4a717afb, type: 2}
   - {fileID: 1766945874161584, guid: 8dca2c526a81c534ab9271aa85c7fe34, type: 2}
   - {fileID: 2800000, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
-  - {fileID: 2800000, guid: 650acd38d498d664185f2a3b2cf387e9, type: 3}
   - {fileID: 4800000, guid: 62507a9ea3ab77f4db3a493bdcbe5eff, type: 3}
   - {fileID: 2100000, guid: fb2dfea585d68dc47a46204dac2928d9, type: 2}
   - {fileID: 1388920081486088, guid: e7e5120af8916d144931c09850445367, type: 2}
   - {fileID: 1376626361390566, guid: dc899950ee8f7614dbd44d7edc7c0f3d, type: 2}
+  - {fileID: 21300012, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300002, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300000, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300016, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300004, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300008, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300006, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 21300014, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
+  - {fileID: 1658220073256390, guid: 4211c250985daa64582ec4922f16e3f5, type: 2}
+  - {fileID: 21300000, guid: c4fc7aa8356e62948b06cfc31aea088e, type: 3}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}
   - {fileID: 4900000, guid: 592b5873809f003499db8a5484f2b765, type: 3}
   - {fileID: 4900000, guid: 2a6d8a1acd28b9b40acaa68244594b9d, type: 3}
   - {fileID: 4900000, guid: d9f61a725b556c844a98ee0b486eabe7, type: 3}
-  - {fileID: 4900000, guid: 0cad47e5fe7664c4889face32561e5f3, type: 3}
   - {fileID: 4900000, guid: cf10bfe715240ea4e87102475ca55678, type: 3}
   - {fileID: 4900000, guid: 6bf784d003b5c104e94531afb827212a, type: 3}
   - {fileID: 4900000, guid: aed362854a581da4399847ab3c71acce, type: 3}
@@ -285,7 +245,6 @@ MonoBehaviour:
   - {fileID: 4900000, guid: 16643d19dfc304a41b32298462967d94, type: 3}
   - {fileID: 4900000, guid: d8ed8cd3127330247beb079345e6c151, type: 3}
   - {fileID: 4900000, guid: d9cae0096b575ad439815b89ff28bbf0, type: 3}
-  - {fileID: 4900000, guid: 05b6fcf2910d93d4886759a50c715ede, type: 3}
   - {fileID: 4900000, guid: 55c5db2c9a211884895cd4df0dc4dc96, type: 3}
   - {fileID: 4900000, guid: 8f38b94956f16c64f9bd76a51d82dc3f, type: 3}
   - {fileID: 4900000, guid: c73fc4d1ada1ad744ba552dd68b77db2, type: 3}

+ 380 - 14
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -622,7 +622,25 @@ GameObject:
   - component: {fileID: 114632778979679736}
   - component: {fileID: 114313412454825080}
   m_Layer: 5
-  m_Name: C_DressRoom
+  m_Name: C_Praise
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1318604786165176
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224143706629484300}
+  - component: {fileID: 222405680851784024}
+  - component: {fileID: 114819683288494210}
+  - component: {fileID: 114445350026731740}
+  m_Layer: 5
+  m_Name: C_Comment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2012,6 +2030,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1786341545338434
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224517132005796266}
+  - component: {fileID: 222164206937952368}
+  - component: {fileID: 114283277122895324}
+  m_Layer: 5
+  m_Name: C_PraiseBK
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1799333161007222
 GameObject:
   m_ObjectHideFlags: 1
@@ -2216,6 +2251,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1867225040184034
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224255675434360252}
+  - component: {fileID: 222031430045221714}
+  - component: {fileID: 114321583423386170}
+  m_Layer: 5
+  m_Name: C_PraiseText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1890764015995844
 GameObject:
   m_ObjectHideFlags: 1
@@ -2302,6 +2354,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1973255530588194
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224739630613680282}
+  - component: {fileID: 222609592414113084}
+  - component: {fileID: 114802002609585006}
+  - component: {fileID: 114461068228389666}
+  m_Layer: 5
+  m_Name: C_DressRoom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1980266109334568
 GameObject:
   m_ObjectHideFlags: 1
@@ -4019,6 +4089,33 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114283277122895324
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1786341545338434}
+  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: 21300000, guid: 5fa525a6a115b9842b1b97e1ab81c539, 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 &114312866216072174
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4101,6 +4198,39 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114321583423386170
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1867225040184034}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 20
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0
 --- !u!114 &114332561840295026
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4625,6 +4755,88 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5236\u4F5C\u56E2\u961F"
+--- !u!114 &114445350026731740
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1318604786165176}
+  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: 114819683288494210}
+  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 &114461068228389666
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1973255530588194}
+  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: 114802002609585006}
+  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 &114465302002327662
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -5887,7 +6099,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300010, guid: 8d5fb26beef3dde488c316021ca5729f, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 42b93b138fe7fa84f93b48bfbe62fbd4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6519,6 +6731,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114802002609585006
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1973255530588194}
+  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: 21300010, 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 &114803830044468886
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6607,6 +6846,33 @@ MonoBehaviour:
   m_EffectColor: {r: 0.9338235, g: 0.4671012, b: 0.32958475, a: 0}
   m_EffectDistance: {x: 3, y: -3}
   m_UseGraphicAlpha: 1
+--- !u!114 &114819683288494210
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1318604786165176}
+  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: 21300000, guid: efe747cf24cc74448aacfbe6e4711ae0, 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 &114821256285364464
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7433,6 +7699,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1559130588826966}
+--- !u!222 &222031430045221714
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1867225040184034}
 --- !u!222 &222036094272079320
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7493,6 +7765,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1217210102700862}
+--- !u!222 &222164206937952368
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1786341545338434}
 --- !u!222 &222168107804915068
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7703,6 +7981,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1783642330778036}
+--- !u!222 &222405680851784024
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1318604786165176}
 --- !u!222 &222423029238303552
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7859,6 +8143,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1604541502126410}
+--- !u!222 &222609592414113084
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1973255530588194}
 --- !u!222 &222615705513963032
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8295,17 +8585,16 @@ 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: 0.99999994, y: 0.99999994, z: 0.99999994}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224713315808876022}
-  - {fileID: 224123597743654216}
-  m_Father: {fileID: 224686880427899620}
-  m_RootOrder: 3
+  - {fileID: 224255675434360252}
+  m_Father: {fileID: 224517132005796266}
+  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: 40, y: -111}
-  m_SizeDelta: {x: 80, y: 74}
+  m_AnchoredPosition: {x: 2.6981812, y: -15.650078}
+  m_SizeDelta: {x: 51.099976, y: 45.299988}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224117731691766184
 RectTransform:
@@ -8336,7 +8625,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224106350729927538}
+  m_Father: {fileID: 224739630613680282}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -8383,6 +8672,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224143706629484300
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1318604786165176}
+  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: -690.3018, y: 36.909973}
+  m_SizeDelta: {x: 59.3, y: 46.2}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224166789963831102
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8650,6 +8957,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224255675434360252
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1867225040184034}
+  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: 224106350729927538}
+  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: 60.6, y: 0}
+  m_SizeDelta: {x: 70.1, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224257891620253718
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9110,8 +9435,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200, y: -72.350006}
-  m_SizeDelta: {x: 400, y: 144.70001}
+  m_AnchoredPosition: {x: 200, y: -96}
+  m_SizeDelta: {x: 400, y: 98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224430338104111620
 RectTransform:
@@ -9404,6 +9729,25 @@ RectTransform:
   m_AnchoredPosition: {x: -47, y: -26.271912}
   m_SizeDelta: {x: 94, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224517132005796266
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1786341545338434}
+  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:
+  - {fileID: 224106350729927538}
+  m_Father: {fileID: 224686880427899620}
+  m_RootOrder: 4
+  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: -609.6, y: 147.9}
+  m_SizeDelta: {x: 112, y: 31.3}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224519958922616262
 RectTransform:
   m_ObjectHideFlags: 1
@@ -9841,7 +10185,9 @@ RectTransform:
   - {fileID: 224455867312941770}
   - {fileID: 224099416328236884}
   - {fileID: 224402016592928158}
-  - {fileID: 224106350729927538}
+  - {fileID: 224143706629484300}
+  - {fileID: 224517132005796266}
+  - {fileID: 224739630613680282}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9896,7 +10242,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224106350729927538}
+  m_Father: {fileID: 224739630613680282}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.43}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -9983,6 +10329,26 @@ RectTransform:
   m_AnchoredPosition: {x: 90, y: -41.181976}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224739630613680282
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1973255530588194}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+  m_Children:
+  - {fileID: 224713315808876022}
+  - {fileID: 224123597743654216}
+  m_Father: {fileID: 224686880427899620}
+  m_RootOrder: 5
+  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: -111}
+  m_SizeDelta: {x: 80, y: 74}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224743514926715882
 RectTransform:
   m_ObjectHideFlags: 1

+ 1 - 0
Assets/Script/Manage/Initializer.cs

@@ -82,6 +82,7 @@ public class Initializer : MonoBehaviour
         gameObject.AddScript<ManaMiniGame>();
 
         gameObject.AddScript<ManaInfo>();
+        gameObject.AddScript<ManaSocial>();
 
         StartCoroutine(IInitialize());
     }

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

@@ -425,7 +425,7 @@ public class ManaReso : Regist
             
             if (t == null)
             {
-                throw new Exception(goName);
+                throw new Exception(goName + " " + folder);
             }
 
             ObjDic.Add(goName, t);

+ 25 - 3
Assets/Script/Manage/ManaServer.cs

@@ -100,6 +100,7 @@ public class ManaServer : Regist
     public static bool FirstConnect = true;
 
     public static string ID = "Default";
+    public static string SerialNumber;
     public static string ReportContent;
 
     public static JsonData JsonData;
@@ -112,6 +113,27 @@ public class ManaServer : Regist
 
     public void Awake()
     {
+        //URLRequestData urlData = new URLRequestData();
+
+        //urlData.Add("u", "1704189794672324513");
+
+        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/other", urlData, Debug.Log, URLRequest.Method.POST);
+
+
+        //URLRequestData urlData = new URLRequestData();
+
+        //urlData.Add("i", "");
+
+        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/rand", urlData, Debug.Log, URLRequest.Method.POST);
+
+
+        //URLRequestData urlData = new URLRequestData();
+
+        //urlData.Add("u", "ytcy9g");
+
+        //URLRequest.CreateStrURLRequest("https://garden.dashgame.com/index.php/home/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+
+
         //Login((data => print(data.ToJson())));
 
         //Download("ytcy9g",(data)=> { print(data.ToJson()); });
@@ -122,9 +144,9 @@ public class ManaServer : Regist
 
         //GetComment("12b", "0", "0");
 
-        //Praise("123", "321");
+        //Praise("123", "1704189794672324513");
 
-        //Target("321", "123");
+        //Target("", "1704189794672324513");
     }
 
     public void Update()
@@ -606,9 +628,9 @@ public class ManaServer : Regist
 
             JsonData = jsonData;
 
-
             Time = DateUtil.GetTime(jsonData["time"].ToJson());
 
+            SerialNumber = jsonData["i"].ToJson().Trim('"');
 
             if (ManaData.DamageLock)
             {

+ 2 - 2
Assets/Script/Manage/ManaSign.cs

@@ -273,8 +273,8 @@ public class Lottery
 
             for (int j = 0; j < leftBorderStrList.Count; j++)
             {
-                leftBorderList.Add((int)Auxiliary.FmlParse(leftBorderStrList[j], "l", ManaCenter.Level.ToString()));
-                rightBorderList.Add((int)Auxiliary.FmlParse(rightBorderStrList[j], "l", ManaCenter.Level.ToString()));
+                leftBorderList.Add((int)Auxiliary.FmlParse(leftBorderStrList[j], "l", (ManaCenter.Level+1).ToString()));
+                rightBorderList.Add((int)Auxiliary.FmlParse(rightBorderStrList[j], "l", (ManaCenter.Level+1).ToString()));
             }
 
             LeftBorderDList.Add(leftBorderList);

+ 46 - 0
Assets/Script/Manage/ManaSocial.cs

@@ -0,0 +1,46 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+using System.Collections;
+using System.Collections.Generic;
+
+public class ManaSocial : Regist 
+{
+    #region Variable
+
+    public static Text PraiseText;
+    public static Button PraiseBtn;
+
+    public static float PraiseTimer;
+
+    #endregion
+
+    public void Update()
+    {
+        PraiseTimer += Time.deltaTime;
+
+        if (PraiseTimer >= 10)
+        {
+            
+        }
+    }
+
+    public override void RegistValueA()
+    {
+        PraiseText = ManaReso.Get<Text>("C_PraiseText");
+        PraiseBtn = ManaReso.Get<Button>("C_Praise");
+    }
+
+    public static void Praise()
+    {
+        if (ManaVisit.InVisit)
+        {
+            
+        }
+        else
+        {
+            PraiseBtn.image.color = Lib.Pink;
+            PraiseBtn.interactable = false;
+        }
+    }
+}

+ 12 - 0
Assets/Script/Manage/ManaSocial.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: f1f933da05a2da64790d99db43491a89
+timeCreated: 1503649320
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 9
Assets/Script/Manage/ManaTutorial.cs

@@ -385,11 +385,7 @@ public class ManaTutorial : Regist
         ManaReso.Get("C_MiniGame").TweenReForCG();
 
         ManaReso.SetActive("C_Coin", false);
-        ManaReso.SetActive("C_Setting", false);
-        ManaReso.SetActive("C_Achieve", false);
-        ManaReso.SetActive("C_Manage", false);
-        ManaReso.SetActive("C_DressRoom", false);
-
+        ManaReso.SetActive("C_Group1", false);
         ManaReso.SetActive("N_Tutorial", true);
 
 
@@ -529,10 +525,7 @@ public class ManaTutorial : Regist
         TutorialIndexA = 6;
 
         ManaReso.SetActive("C_Coin", true);
-        ManaReso.SetActive("C_Setting", true);
-        ManaReso.SetActive("C_Achieve", true);
-        ManaReso.SetActive("C_Manage", true);
-        ManaReso.SetActive("C_DressRoom", true);
+        ManaReso.SetActive("C_Group1", true);
 
         ManaReso.SetActive("N_Tutorial", true);
 

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

@@ -522,6 +522,21 @@ public class ManaUI : Regist
 
         #endregion
 
+        #region C_Praise
+
+        ManaReso.SetButtonEvent
+        (
+            "C_Praise",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
+
+                ManaSocial.Praise();
+            }
+        );
+
+        #endregion
+
         #region C_Return
 
         ManaReso.AddButtonEvent

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

@@ -665,7 +665,7 @@ public class ManaVisit
                 (jsonData) =>
                 {
                     LoadComplete = true;
-                    
+
                     if (jsonData.Inst_Object.ContainsKey("l"))
                     {
                         XmlStr = jsonData["l"].ToString();

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

@@ -126,8 +126,6 @@ public class Auxiliary : Regist
     private void Awake()
     {
         Instance = this;
-
-
     }
 
     private void Update()
@@ -147,14 +145,14 @@ public class Auxiliary : Regist
 
             //Lottery.EnterAnimation(false);
 
-            //ManaCenter.MiniTimer = 0;
+            ManaCenter.MiniTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
+            //StartCoroutine(ManaServer.DownloadAllAsset(new List<string>() { "http://or5zgoeui.bkt.clouddn.com/game_icon.png", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3853411417,2245648913&fm=26&gp=0.jpg" }, ManaServer.DownloadAllTexture));
 
-            //ManaMiniGame.GameTimer = 45;
+            ManaMiniGame.GameTimer = 45;
 
             //Lottery.TempTypeList = new List<int>();
             //Lottery.TempValueList = new List<int>();

+ 16 - 3
Assets/Script/Tool/Bundle.cs

@@ -27,7 +27,9 @@ public class Bundle : MonoBehaviour
     public static AssetBundle Config;
     public static AssetBundle Discard;
 
+    public Texture2D Texture;
     public List<Object> UiList;
+    public List<Object> AtlasList;
     public List<Sprite> Atlas2List;
     public List<Object> EffectList;
     public List<Object> AudioList;
@@ -52,7 +54,7 @@ public class Bundle : MonoBehaviour
         if (Initializer.Instance.DebugMode)
         {
             #region MyRegion
-
+            
             if (folder == Folder.UI)
             {
                 for (int i = 0; i < Instance.UiList.Count; i++)
@@ -115,7 +117,18 @@ public class Bundle : MonoBehaviour
             }
             else if (folder == Folder.Atlas)
             {
-                return Atlas.LoadAsset<T>(goName);
+                if (goName == "Atlas")
+                {
+                    return (T) (Object) Sprite.Create(Instance.Texture, new Rect(0, 0, Instance.Texture.width, Instance.Texture.height), new Vector2(0.5f, 0.5f));
+                }
+
+                for (int i = 0; i < Instance.AtlasList.Count; i++)
+                {
+                    if (Instance.AtlasList[i].name == goName)
+                    {
+                        return (T)Instance.AtlasList[i];
+                    }
+                }
             }
 
             #endregion
@@ -156,7 +169,7 @@ public class Bundle : MonoBehaviour
             #endregion
         }
         
-        throw new Exception();
+        throw new Exception(goName + " " + folder);
     }
 
     public static void LoadAtlasSprites()

+ 1 - 1
Assets/Script/Tool/Lib.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 public class Lib
 {
-
+	public static Color Pink = new Color(1, 60/255f, 60/255f, 1);
 	public static Color Orange = new Color(233/255f, 63/255f, 20/255f, 1);
 	public static Color LightGray = new Color(165/255f, 192/255f, 200/255f, 1);
 

+ 4 - 2
ToDoList.txt

@@ -1,10 +1,12 @@
 调整箱子
 
-图文混排使用网络图片和超链接
+访问时的箱子
 
 是否要修改帧率
 
-宝箱 分享按钮需要打入图集
+教程中的评论和点赞
+
+评论 点赞 宝箱 截图需要打入图集
 
 FlowerHouse动画控制器优化