修改人物卡箱子

SteelBall/Assets/0A2_Scripts/Battle/Collision/SixLevelCollision.cs

@@ -13,8 +13,8 @@ public class SixLevelCollision : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        m_render = GetComponent<MeshRenderer>();
-        m_collider = GetComponent<BoxCollider>();
+        m_render = transform.parent.GetComponent<MeshRenderer>();
+        m_collider = transform.parent.GetComponent<BoxCollider>();
         //m_cacheObj = GameObject.Instantiate(m_cubeObj);
         //m_cacheObj.transform.SetParent(transform, false);
         //m_cacheObj.SetActive(false);
@@ -40,15 +40,15 @@ public class SixLevelCollision : MonoBehaviour
             m_bCollider = false;
             m_render.enabled = false;
             m_collider.enabled = false;
-            BattleCtrl.instance.GetFromPool(transform);
+            BattleCtrl.instance.GetFromPool(transform.parent);
             //if(m_cacheObj)
             //{
             //    m_cacheObj.SetActive(true);
             //}
-            if (m_sixLevel)
-            {
-                m_sixLevel.SetCollision();
-            }
+            //if (m_sixLevel)
+            //{
+            //    m_sixLevel.SetCollision();
+            //}
             BattleCtrl.instance.battleUI.SetSymbolPos(0, 0);
             //GameServices.timerServices.Push(this, 2.0f, delegate
             //{

SteelBall/Assets/0A2_Scripts/Battle/View/ChainHandle.cs

@@ -223,6 +223,7 @@ public class ChainHandle : MonoBehaviour
                 Vector3 varVec3 = m_parentTrans.position;
                 varVec3.x = hit.point.x - m_maxHeightBallPos.x;
                 varVec3.y = hit.point.y+6.0f;
+                varVec3.z = 0;
                 m_parentTrans.position = varVec3;
                 GameServices.timerServices.Push(this, 0.1f, delegate
                 {

SteelBall/Assets/0C3_Materials/BG03.mat

@@ -73,5 +73,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.2509804, g: 0.87843144, b: 0.81568635, a: 1}
+    - _Color: {r: 0.3726415, g: 0.85713625, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

SteelBall/Assets/0D1_Effects/LowPolyWater/Demo/Materials/WavesHighQualityDemo.mat

@@ -59,7 +59,7 @@ Material:
     - __Speed: 0.5
     - __TexSize: 64
     m_Colors:
-    - _Color: {r: 0.2509804, g: 0.87843144, b: 0.81568635, a: 0.6862745}
+    - _Color: {r: 0.3726415, g: 0.85713625, b: 1, a: 1}
     - _Direction_: {r: -1, g: -0.00000008742278, b: -1.65, a: -0.00000014424758}
     - _ShoreColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}

SteelBall/Assets/HoleBall/Materials/Hole.mat

@@ -11,7 +11,7 @@ Material:
   m_Shader: {fileID: 4800000, guid: 2b7967d7ad2b84c158ad8a41f4a2ec12, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}