소스 검색

添加照相功能中,默认无边框不加载图片资源

leiyasi 1 년 전
부모
커밋
291a430cad

+ 22 - 3
GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs

@@ -24,7 +24,18 @@ namespace GFGGame
         public void AddBorderItem(ItemCfg itemCfg)
         {
             Transform tf = sceneObject.transform.Find("Border/BorderRes");
-            string resPath = ResPathUtil.GetPhotographBorderPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            string resPath;
+
+            if (itemCfg.id != ConstItemID.BORDERID)
+            {
+                resPath = ResPathUtil.GetPhotographBorderPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            }
+            // 默认无边框不用加载资源
+            else
+            {
+                resPath = "";
+            }
+
             SetSpriteRendererToTransform(tf, resPath);
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             spr.sortingOrder = 10000;//边框在所有道具的上边
@@ -135,8 +146,16 @@ namespace GFGGame
                 tf.gameObject.AddComponent<SpriteRenderer>();
                 spr = tf.GetComponent<SpriteRenderer>();
             }
-            SpriteHelper.AddSpriteTo(spr, resPath);
-            spr.size = spr.sprite.bounds.size;//将节点设置为原图大小
+
+            if(resPath != "")
+            {
+                SpriteHelper.AddSpriteTo(spr, resPath);
+                spr.size = spr.sprite.bounds.size;//将节点设置为原图大小
+            }
+            else
+            {
+                spr.sprite = null;
+            }
 
         }
 

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs

@@ -44,6 +44,7 @@ namespace GFGGame
             NoticeInfo noticeInfo = this.viewData as NoticeInfo;
             _ui.m_txtTitle.text = noticeInfo.title;
             _ui.m_ComContent.m_txtContent.text = noticeInfo.content;
+            _ui.m_ComContent.target.scrollPane.ScrollTop();
         }
 
         protected override void OnHide()