Commit f9fc29fe authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)

no message

parent 4b48acdd
...@@ -10,9 +10,11 @@ public class LocalizationText : MonoBehaviour ...@@ -10,9 +10,11 @@ public class LocalizationText : MonoBehaviour
private void Start() private void Start()
{ {
text = GetComponent<TMP_Text>(); text = GetComponent<TMP_Text>();
if(text != null) if (text != null)
{ {
switch (Application.systemLanguage) //SystemLanguage systemLanguage = Application.systemLanguage;
SystemLanguage systemLanguage = SystemLanguage.English;
switch (systemLanguage)
{ {
case SystemLanguage.English: case SystemLanguage.English:
text.text = textData.en; text.text = textData.en;
......
...@@ -28555,19 +28555,7 @@ MonoBehaviour: ...@@ -28555,19 +28555,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 986086455} m_TargetGraphic: {fileID: 986086455}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls: []
- m_Target: {fileID: 848805986}
m_TargetAssemblyTypeName: ShopScreen, Assembly-CSharp
m_MethodName: OnSelect_Hands
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
isScale: 1 isScale: 1
--- !u!114 &986086455 --- !u!114 &986086455
MonoBehaviour: MonoBehaviour:
...@@ -31964,7 +31952,7 @@ MonoBehaviour: ...@@ -31964,7 +31952,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: HANDS m_text: Coming soon
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 219dd7769ea8fa84ea083063c4e7ea7e, type: 2} m_fontAsset: {fileID: 11400000, guid: 219dd7769ea8fa84ea083063c4e7ea7e, type: 2}
m_sharedMaterial: {fileID: -6282418299803804154, guid: 219dd7769ea8fa84ea083063c4e7ea7e, type: 2} m_sharedMaterial: {fileID: -6282418299803804154, guid: 219dd7769ea8fa84ea083063c4e7ea7e, type: 2}
...@@ -31991,7 +31979,7 @@ MonoBehaviour: ...@@ -31991,7 +31979,7 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 72 m_fontSize: 42.75
m_fontSizeBase: 36 m_fontSizeBase: 36
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 1 m_enableAutoSizing: 1
...@@ -32053,7 +32041,7 @@ MonoBehaviour: ...@@ -32053,7 +32041,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3} m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 975fd72e0f112584c9d0b68781ce521d, type: 2} textData: {fileID: 11400000, guid: a392dcacaa423aa4b9d2c423fe985b69, type: 2}
--- !u!1 &1107960602 --- !u!1 &1107960602
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -40539,7 +40527,7 @@ RectTransform: ...@@ -40539,7 +40527,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 50} m_SizeDelta: {x: 53.7484, y: 50.3891}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1393658283 --- !u!114 &1393658283
MonoBehaviour: MonoBehaviour:
...@@ -54918,7 +54906,7 @@ MonoBehaviour: ...@@ -54918,7 +54906,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: HANDS m_text: Coming soon
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 219dd7769ea8fa84ea083063c4e7ea7e, type: 2} m_fontAsset: {fileID: 11400000, guid: 219dd7769ea8fa84ea083063c4e7ea7e, type: 2}
m_sharedMaterial: {fileID: 4757348997730905547, guid: a408dd050be1bab4eb8f22ab036cd0a8, type: 2} m_sharedMaterial: {fileID: 4757348997730905547, guid: a408dd050be1bab4eb8f22ab036cd0a8, type: 2}
...@@ -55007,7 +54995,7 @@ MonoBehaviour: ...@@ -55007,7 +54995,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3} m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 975fd72e0f112584c9d0b68781ce521d, type: 2} textData: {fileID: 11400000, guid: a392dcacaa423aa4b9d2c423fe985b69, type: 2}
--- !u!1 &1870923515 --- !u!1 &1870923515
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -30,9 +30,9 @@ public class FightSelection : MergeSelection ...@@ -30,9 +30,9 @@ public class FightSelection : MergeSelection
protected override void ShowAnimal() protected override void ShowAnimal()
{ {
animal = ObjectPool.Get<Gp_landAnimal>("Selection_" + ID); //animal = ObjectPool.Get<Gp_landAnimal>("Selection_" + ID);
if (animal == null) //if (animal == null)
{ //{
var dinosaur = DataManager.Instance.assetManager.GetIslandAnimal(ID); var dinosaur = DataManager.Instance.assetManager.GetIslandAnimal(ID);
icon.texture = dinosaur.icon; icon.texture = dinosaur.icon;
...@@ -79,7 +79,7 @@ public class FightSelection : MergeSelection ...@@ -79,7 +79,7 @@ public class FightSelection : MergeSelection
//animal = Instantiate(prefab); //animal = Instantiate(prefab);
//animal.speed = 0f; //animal.speed = 0f;
} //}
//animal.transform.DOKill(); //animal.transform.DOKill();
//Vector3 localScale = animal.transform.localScale; //Vector3 localScale = animal.transform.localScale;
//animal.transform.parent = spawner; //animal.transform.parent = spawner;
......
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