new button icon

Assets/ArtSystem/superButton/toolBars/hinter.cs

@@ -32,8 +32,11 @@ public class hinter : MonoBehaviour
 
     private void in_()
     {
-        var screenPosition = Program.I().camera_main_2d
-            .WorldToScreenPoint(gameObject.GetComponentInChildren<UITexture>().gameObject.transform.position);
+        Vector3 screenPosition;
+        if (gameObject.GetComponentInChildren<UITexture>() == null)
+            screenPosition = Program.I().camera_main_2d.WorldToScreenPoint(gameObject.transform.position);
+        else
+            screenPosition = Program.I().camera_main_2d.WorldToScreenPoint(gameObject.GetComponentInChildren<UITexture>().gameObject.transform.position);
         screenPosition.y += 90;
         screenPosition.z = 0;
         var worldPositin = Program.I().camera_main_2d.ScreenToWorldPoint(screenPosition);

Assets/ArtSystem/superButton/toolBars/mats/toolShift.cs

@@ -43,22 +43,22 @@ public class toolShift : MonoBehaviour
         if (ObjectOption == null)
         {
             if (va.y >= 0)
-                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, -100, va.z), 0.6f);
+                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, -78, va.z), 0.6f);
             else
-                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, 0, va.z), 0.6f);
+                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, 22, va.z), 0.6f);
         }
         else
         {
             var vb = ObjectOption.transform.localPosition;
             if (va.y > vb.y)
             {
-                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, -100, va.z), 0.6f);
-                iTween.MoveToLocal(ObjectOption, new Vector3(vb.x, 0, vb.z), 0.6f);
+                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, -78, va.z), 0.6f);
+                iTween.MoveToLocal(ObjectOption, new Vector3(vb.x, 22, vb.z), 0.6f);
             }
             else
             {
-                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, 0, va.z), 0.6f);
-                iTween.MoveToLocal(ObjectOption, new Vector3(vb.x, -100, vb.z), 0.6f);
+                iTween.MoveToLocal(ObjectMust, new Vector3(va.x, 22, va.z), 0.6f);
+                iTween.MoveToLocal(ObjectOption, new Vector3(vb.x, -78, vb.z), 0.6f);
             }
         }
     }

Assets/ArtSystem/superButton/toolBars/new_toolBar_Room.prefab

@@ -42,7 +42,7 @@ GameObject:
   m_Component:
   - component: {fileID: 441644}
   - component: {fileID: 11447192}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: '!default'
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -172,7 +172,7 @@ GameObject:
   m_Component:
   - component: {fileID: 417448}
   - component: {fileID: 11411146}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -265,7 +265,7 @@ GameObject:
   - component: {fileID: 11431992}
   - component: {fileID: 6501274}
   - component: {fileID: 11424074}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: input_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -359,7 +359,7 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 1
-  mColor: {r: 1, g: 1, b: 1, a: 0.39215687}
+  mColor: {r: 1, g: 1, b: 1, a: 0.7490196}
   mPivot: 4
   mWidth: 320
   mHeight: 40

Assets/ArtSystem/superButton/toolBars/new_toolBar_editDeck.prefab

@@ -58,7 +58,7 @@ GameObject:
   m_Component:
   - component: {fileID: 408306}
   - component: {fileID: 11423592}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -197,7 +197,7 @@ GameObject:
   m_Component:
   - component: {fileID: 485586}
   - component: {fileID: 11429580}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -288,7 +288,7 @@ GameObject:
   m_Component:
   - component: {fileID: 416640}
   - component: {fileID: 11405112}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -882,7 +882,7 @@ GameObject:
   m_Component:
   - component: {fileID: 477728}
   - component: {fileID: 11413936}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: Symbol
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1110,7 +1110,7 @@ GameObject:
   m_Component:
   - component: {fileID: 458494}
   - component: {fileID: 11445334}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1382,7 +1382,7 @@ GameObject:
   - component: {fileID: 11450040}
   - component: {fileID: 6520404}
   - component: {fileID: 11450676}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: lfList_
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1734,7 +1734,7 @@ GameObject:
   m_Component:
   - component: {fileID: 411158}
   - component: {fileID: 11477190}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: Label
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1832,7 +1832,7 @@ GameObject:
   m_Component:
   - component: {fileID: 471488}
   - component: {fileID: 11445246}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2091,7 +2091,7 @@ GameObject:
   m_Component:
   - component: {fileID: 407142}
   - component: {fileID: 11446162}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2182,7 +2182,7 @@ GameObject:
   m_Component:
   - component: {fileID: 418478}
   - component: {fileID: 11490246}
-  m_Layer: 11
+  m_Layer: 5
   m_Name: UISlicedSprite
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/MD/Sound.meta

+fileFormatVersion: 2
+guid: 2dc94cfee532ce0468fbeb24478f5e08
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys.meta

+fileFormatVersion: 2
+guid: 9e1d619c8c234d34b8bedb8ac22cb6f2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DECK_WINDOW_OPEN.wav.meta

+fileFormatVersion: 2
+guid: bee14897b51bd104dbcb63367c578e4c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_COIN.wav.meta

+fileFormatVersion: 2
+guid: 60a2c5301bb7de84dad7ac8567d57cb4
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_COIN_HEAD.wav.meta

+fileFormatVersion: 2
+guid: 369101751fb70924e8318cc02cff2a78
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_COIN_TAIL.wav.meta

+fileFormatVersion: 2
+guid: cddeabcb76595074895ee6dd8cb3476d
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_GOOUT.wav.meta

+fileFormatVersion: 2
+guid: a65ca0fb8e56a444c95868afcf12e2c7
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_LOOP.wav.meta

+fileFormatVersion: 2
+guid: 317941ddefda42f4e82f4778edbceb8a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_LOOP_02.wav.meta

+fileFormatVersion: 2
+guid: 443742c46e64c5d4a9843ce17b77fed2
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_LOOP_ED.wav.meta

+fileFormatVersion: 2
+guid: 778e538cec3759048a9b0e196e99d54c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_DUEL_ENTRY_VS.wav.meta

+fileFormatVersion: 2
+guid: a1fd84ab14788044ea7fd672e201ee4f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_LEVEL_UP.wav.meta

+fileFormatVersion: 2
+guid: ad08c24febee3a246bc5d878fa7ee3c3
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_CANCEL.wav.meta

+fileFormatVersion: 2
+guid: 955d6cf27c5e0c54b87f317812dc96ea
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_DECIDE.wav.meta

+fileFormatVersion: 2
+guid: ae3d99ac8f0551f47a359c3411a82339
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_OVERLAP.wav.meta

+fileFormatVersion: 2
+guid: 12722c42b69b17c4d8bdb5656d491967
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_OVERLAP_02.wav.meta

+fileFormatVersion: 2
+guid: 689c639eb1b5e3c40849297aba250ceb
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_SELECT_01.wav.meta

+fileFormatVersion: 2
+guid: 067ed1d886d7ccb41bd4bbed05178892
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_SELECT_02.wav.meta

+fileFormatVersion: 2
+guid: 990fef4f03af37749a7050f77cb06d91
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MD/Sound/se_sys/SE_MENU_SLIDE_01.wav.meta

+fileFormatVersion: 2
+guid: 193761e50a161164da228622f98e559f
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: