Jelajahi Sumber

UI优化备份

jet 8 tahun lalu
induk
melakukan
c68a2688b4

+ 0 - 9
Assets/AppleDependency/iOS.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 23df5e7f85c1015458ac26bb10bc3044
-folderAsset: yes
-timeCreated: 1502861975
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/AppleDependency/iOS/en.lproj.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 992ed30966df18540a7468cd79bd16e2
-folderAsset: yes
-timeCreated: 1502861987
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 0
Assets/AppleDependency/iOS/en.lproj/InfoPlist.strings


+ 0 - 8
Assets/AppleDependency/iOS/en.lproj/InfoPlist.strings.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 30b14400251b5014f9314fd324d8f4e6
-timeCreated: 1502862046
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/AppleDependency/iOS/zh-Hans.lproj.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: b8863581315a0f140a676b99a1b97e36
-folderAsset: yes
-timeCreated: 1502861995
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 0
Assets/AppleDependency/iOS/zh-Hans.lproj/InfoPlist.strings


+ 0 - 8
Assets/AppleDependency/iOS/zh-Hans.lproj/InfoPlist.strings.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3b12d10046690004baee4b9f67c48450
-timeCreated: 1502862046
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -30,6 +30,8 @@
 
             if (GUILayout.Button("Test"))
             {
+                Debug.Log(Script.Graphic.depth);
+                
                 //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

@@ -1,12 +1,14 @@
 namespace AtlasUtility
 {
     using UnityEngine;
+    using UnityEngine.UI;
 
     public class Test : MonoBehaviour
     {
         #region Variable
 
         public Sprite Sprite;
+        public Graphic Graphic;
         public TextAsset TextAsset1;
         public TextAsset TextAsset2;
         public Texture2D Texture2D;

+ 5 - 1
Assets/Resource/Prefab/PrefabUI/SkillItem.prefab

@@ -246,6 +246,8 @@ MonoBehaviour:
     m_LineSpacing: 1
   m_Text: "\u8D2D\u4E70"
   Draw: 0
+  SetY: 0
+  Y: 0
   LineHeight: 0
   RemovePos: 
   ImageIndex: 
@@ -401,6 +403,8 @@ MonoBehaviour:
     m_LineSpacing: 0.75
   m_Text: "\u6BCF\u5206\u949F\u589E\u52A06\u4EBA\u53C2\u89C2\uFF0C\u6301\u7EED5\u5206\u949F"
   Draw: 0
+  SetY: 0
+  Y: 0
   LineHeight: 0
   RemovePos: 
   ImageIndex: 
@@ -431,7 +435,7 @@ MonoBehaviour:
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 10
+    m_MinSize: 5
     m_MaxSize: 20
     m_Alignment: 4
     m_AlignByGeometry: 0

+ 12 - 0
Assets/Script/Editor/PostProcessor.cs

@@ -64,6 +64,18 @@ public class NewBehaviourScript
         project.AddFrameworkToProject(targetGuid, "Security.framework", false);
 
 
+        //修改PList
+        string plistPath = Path.Combine(buildPath, "Info.plist");
+
+        PlistDocument plist = new PlistDocument();
+
+        plist.ReadFromFile(plistPath);
+        
+        plist.root.SetString("Bundle display name", "CFBundleDisplayName");
+
+        plist.WriteToFile(plistPath);
+
+
         //保存
         File.WriteAllText(projectPath, project.WriteToString());
     }

+ 14 - 7
Assets/Script/Object/Skill/Pack.cs

@@ -70,7 +70,14 @@ public class Pack : SkillRoot
 
                 SkillItem.SetActive(true);
 
-                ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                if (!string.IsNullOrEmpty(Label))
+                {
+                    ManaLan.Add(ItemBtnLab, new LanStr("UI", Label), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                }
+                else
+                {
+                    ManaLan.Add(ItemBtnLab, new LanStr("UI", "Fe_BtnLab3"), "\n", Auxiliary.ImageParse(BuyCur), UseAmt.ToString("0"));
+                }
             }
             else if (ItemStatus_ == SkillStatus.Lock)
             {
@@ -166,17 +173,17 @@ public class Pack : SkillRoot
         {
             UseA();
         }
-        //IconLab1
+
         ItemBtn.onClick.RemoveAllListeners();
         ItemBtn.onClick.AddListener(OnClick);
 
 
-        if (!string.IsNullOrEmpty(Label))
-        {
-            ItemIcon1.SetActive(true);
+        //if (!string.IsNullOrEmpty(Label))
+        //{
+        //    ItemIcon1.SetActive(true);
 
-            ManaLan.Add(IconLab1, new LanStr("UI", Label));
-        }
+        //    ManaLan.Add(IconLab1, new LanStr("UI", Label));
+        //}
 
         ItemLab.text = GetDescription(0);
 

+ 3 - 1
ToList.txt

@@ -1,4 +1,6 @@
-IAP调试
+AlipayManager ManaIAP调试
+
+自动打包(DisplayNade的设置)
 
 存档不能更新?