Merge remote-tracking branch 'origin/master' into Yuy

3D Fruit/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -475,24 +475,29 @@ public class BattleUI : MonoBehaviour
             //varPos.y = -400.0f;
             m_fruitSecondLineObj.SetActive(false);
             m_fruitIconObj.SetActive(true);
+            m_needIconNum.text = "Fruit Juice";
         }
         else if(BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex)
         {
             //varPos.y = -286.0f;
             m_fruitSecondLineObj.SetActive(true);
             m_sportIconObj.SetActive(true);
+            m_needIconNum.text = "Vegitable";
         }
         else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
         {
             m_threeIconObj.SetActive(true);
+            m_needIconNum.text = "Sports";
         }
         else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
         {
             m_fourIconObj.SetActive(true);
+            m_needIconNum.text = "Junk Food";
         }
         else if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
         {
             m_fiveIconObj.SetActive(true);
+            m_needIconNum.text = "Cube";
         }
         //m_fruitGroupRT.anchoredPosition = varPos;
         m_moveNumText.text = string.Format("{0:d}", GlobalConfig.FruitMoveTotalNum);

3D Fruit/Assets/#A2_Scripts/Services/GlobalConfig.cs

@@ -395,7 +395,11 @@ public class GlobalConfig
         {
             GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.CubeObj);
             varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 2.5f + varY, 0.0f + varZ);
-            varObj.transform.localEulerAngles = Vector3.zero;
+            Vector3 varVec3 = varObj.transform.localEulerAngles;
+            varVec3.x = Random.Range(0.0f, 360.0f);
+            varVec3.y = Random.Range(0.0f, 360.0f);
+            varVec3.z = Random.Range(0.0f, 360.0f);
+            varObj.transform.localEulerAngles = varVec3;
         }
         for (int i = 0; i < 3; i++)
         {
@@ -407,7 +411,11 @@ public class GlobalConfig
         {
             GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.CubeObj);
             varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
-            varObj.transform.localEulerAngles = Vector3.zero;
+            Vector3 varVec3 = varObj.transform.localEulerAngles;
+            varVec3.x = Random.Range(0.0f, 360.0f);
+            varVec3.y = Random.Range(0.0f, 360.0f);
+            varVec3.z = Random.Range(0.0f, 360.0f);
+            varObj.transform.localEulerAngles = varVec3;
         }
         for (int i = 0; i < 3; i++)
         {
@@ -419,7 +427,11 @@ public class GlobalConfig
         {
             GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.CubeObj);
             varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
-            varObj.transform.localEulerAngles = Vector3.zero;
+            Vector3 varVec3 = varObj.transform.localEulerAngles;
+            varVec3.x = Random.Range(0.0f, 360.0f);
+            varVec3.y = Random.Range(0.0f, 360.0f);
+            varVec3.z = Random.Range(0.0f, 360.0f);
+            varObj.transform.localEulerAngles = varVec3;
         }
         SetActiveFruitState(true);
     }
@@ -585,7 +597,11 @@ public class GlobalConfig
                 varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
             }
             varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * (i % 3) + varX, 3.5f + 1.0f * (i / 3) + varY, 0.0f + varZ);
-            varObj.transform.localEulerAngles = Vector3.zero;
+            Vector3 varVec3 = varObj.transform.localEulerAngles;
+            varVec3.x = Random.Range(0.0f, 360.0f);
+            varVec3.y = Random.Range(0.0f, 360.0f);
+            varVec3.z = Random.Range(0.0f, 360.0f);
+            varObj.transform.localEulerAngles = varVec3;
         }
     }
 

3D Fruit/Assets/#A3_Prefabs/NPC互动 1.prefab.meta

+fileFormatVersion: 2
+guid: fead71dcf8c60ba41b4516c48a03fadf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: