Browse Source

战斗表现

zhaoyang 2 years ago
parent
commit
0e65889731

+ 7 - 7
GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -229,10 +229,10 @@ namespace GFGGame
             TryRemoveAnimationObj(parentObj, aniObjName);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
             GameObject gameObject = AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
-            if (itemCfg.subType == (int)ConstDressUpItemType.BEI_JING)
-            {
-                gameObject.layer = 6;//设置bg层
-            }
+            // if (itemCfg.subType == (int)ConstDressUpItemType.BEI_JING)
+            // {
+            //     gameObject.layer = 3;//设置bg层
+            // }
             if (itemCfg.isAni > 0 && showAni)
             {
                 AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
@@ -452,10 +452,10 @@ namespace GFGGame
             Rect rect = new Rect(0, 0, UnityEngine.Screen.width, UnityEngine.Screen.height);
             RenderTexture render = new RenderTexture((int)rect.width, (int)rect.height, 0);//创建一个RenderTexture对象 
 
-            camera.gameObject.SetActive(true);//启用截图相机
+            // camera.gameObject.SetActive(true);//启用截图相机
             camera.targetTexture = render;//设置截图相机的targetTexture为render
-            RenderTexture.active = render;//激活RenderTexture
             camera.Render();//手动开启截图相机的渲染
+            RenderTexture.active = render;//激活RenderTexture
 
             Texture2D tex = new Texture2D((int)rect.width, (int)rect.height, TextureFormat.ARGB32, false);//新建一个Texture2D对象
             tex.ReadPixels(rect, 0, 0);//读取像素
@@ -464,7 +464,7 @@ namespace GFGGame
             camera.targetTexture = null;//重置截图相机的targetTexture
             RenderTexture.active = null;//关闭RenderTexture的激活状态
             Object.Destroy(render);//删除RenderTexture对象
-            camera.gameObject.SetActive(false);
+            // camera.gameObject.SetActive(false);
 
             return new NTexture(tex);
 

+ 1 - 1
GameClient/Assets/ResIn/Prefab/SceneDressUpFight.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4137215948490320690
 Transform:
   m_ObjectHideFlags: 0

+ 2 - 2
GameClient/Assets/Scenes/GameLauncher.unity

@@ -277,7 +277,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170410349}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.8125, y: -5, z: 0}
+  m_LocalPosition: {x: 2.25, y: -5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -354,7 +354,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 87
+    m_Bits: 31
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

+ 2 - 2
GameClient/ProjectSettings/TagManager.asset

@@ -8,10 +8,10 @@ TagManager:
   - Default
   - TransparentFX
   - Ignore Raycast
-  - 
+  - Bg
   - Water
   - UI
-  - Bg
+  - 
   - 
   - 
   -