Commit 37647745 authored by wanqing's avatar wanqing

更换icon

parent 32398aa3
This diff is collapsed.
...@@ -231,7 +231,7 @@ public class GlobalConfig ...@@ -231,7 +231,7 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj); varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
} }
//varObj.transform.SetParent(parent); //varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ); varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero; varObj.transform.localEulerAngles = Vector3.zero;
} }
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
...@@ -247,6 +247,18 @@ public class GlobalConfig ...@@ -247,6 +247,18 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj); varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
} }
//varObj.transform.SetParent(parent); //varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.StrawberryObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.OrangeObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ); varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero; varObj.transform.localEulerAngles = Vector3.zero;
} }
...@@ -287,7 +299,7 @@ public class GlobalConfig ...@@ -287,7 +299,7 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj); varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
} }
//varObj.transform.SetParent(parent); //varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ); varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero; varObj.transform.localEulerAngles = Vector3.zero;
} }
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
...@@ -303,6 +315,18 @@ public class GlobalConfig ...@@ -303,6 +315,18 @@ public class GlobalConfig
varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj); varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.VolleyBallObj);
} }
//varObj.transform.SetParent(parent); //varObj.transform.SetParent(parent);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 3.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.FootBallObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.0f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero;
}
for (int i = 0; i < 3; i++)
{
GameObject varObj = PoolManager.Instance.GetObjectFromPool(CacheManager.Instance.BasketBallObj);
varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ); varObj.transform.localPosition = new Vector3(-0.5f + 0.5f * i + varX, 4.5f + varY, 0.0f + varZ);
varObj.transform.localEulerAngles = Vector3.zero; varObj.transform.localEulerAngles = Vector3.zero;
} }
......
...@@ -1245,7 +1245,7 @@ MonoBehaviour: ...@@ -1245,7 +1245,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3afc2b4c334b2134897b4ea3997bc013, type: 3} m_Sprite: {fileID: 21300000, guid: 14c5a3a3ccce523459a47a03bb1734fe, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -11718,7 +11718,7 @@ MonoBehaviour: ...@@ -11718,7 +11718,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 3eada229472b6054abf9a399699efe04, type: 3} m_Sprite: {fileID: 21300000, guid: c5a907af424db2f44bffe2a7ad5ef797, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -36882,6 +36882,11 @@ PrefabInstance: ...@@ -36882,6 +36882,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: SM_Primitive_Torus_04 value: SM_Primitive_Torus_04
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: eeac5b70c5baae8478ec17be74426a76,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: eeac5b70c5baae8478ec17be74426a76, type: 3} m_SourcePrefab: {fileID: 100100000, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
--- !u!1 &1514226244696436991 stripped --- !u!1 &1514226244696436991 stripped
......
...@@ -13,7 +13,7 @@ PlayerSettings: ...@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: Dyspace companyName: Dyspace
productName: Blent it Match productName: Blend it match
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
...@@ -163,7 +163,7 @@ PlayerSettings: ...@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.Dyspace.BlentitMatch Android: com.Dyspace.Blenditmatch
buildNumber: {} buildNumber: {}
AndroidBundleVersionCode: 1 AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 19 AndroidMinSdkVersion: 19
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment