Skip to content

G
GalaxySmash
Commit 6365a16c authored by Hà Trung (NEGAXY)'s avatar Hà Trung (NEGAXY)
Browse files
Options

no message

parent 41b58e3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 889 additions and 185 deletions
Assets/Game Resources/Prefabs/RankRewardPopup.prefab
View file @ 6365a16c
......@@ -678,6 +678,7 @@ GameObject:
- component: {fileID: 5913039282830268489}
- component: {fileID: 753600841080800069}
- component: {fileID: 5406108077585172126}
- component: {fileID: 2438804578264066754}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
......@@ -802,6 +803,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2438804578264066754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2181715205611832240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 5d3a99e71cf78584193c6716da8dc138, type: 2}
--- !u!1 &2959525926582580388
GameObject:
m_ObjectHideFlags: 0
......@@ -889,6 +903,7 @@ GameObject:
- component: {fileID: 2636129477678600473}
- component: {fileID: 1281228897946472045}
- component: {fileID: 8450014958833294525}
- component: {fileID: 3594930491698586181}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
......@@ -1013,6 +1028,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &3594930491698586181
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3185982554101178071}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 02baac9c68489bd4bb669438fdc70b9c, type: 2}
--- !u!1 &3190412213923681822
GameObject:
m_ObjectHideFlags: 0
......@@ -1234,6 +1262,7 @@ GameObject:
- component: {fileID: 5488618712038505582}
- component: {fileID: 1406066365527074321}
- component: {fileID: 8109884709538096607}
- component: {fileID: 6584032058872278587}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
......@@ -1358,6 +1387,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &6584032058872278587
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3763664641353365326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 6b84d5b45a9707a449578894223d858b, type: 2}
--- !u!1 &4003644880009159317
GameObject:
m_ObjectHideFlags: 0
......@@ -1715,6 +1757,7 @@ GameObject:
- component: {fileID: 2225245963691649859}
- component: {fileID: 102898091386115933}
- component: {fileID: 5340107983492172185}
- component: {fileID: 2953272075045776446}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
......@@ -1839,6 +1882,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &2953272075045776446
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4307468548547979573}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 5d3a99e71cf78584193c6716da8dc138, type: 2}
--- !u!1 &4441311183397844903
GameObject:
m_ObjectHideFlags: 0
......@@ -1985,6 +2041,7 @@ GameObject:
- component: {fileID: 7626717773454203350}
- component: {fileID: 7536532486249719717}
- component: {fileID: 7224466655259900050}
- component: {fileID: 3379736825855171246}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
......@@ -2109,6 +2166,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &3379736825855171246
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4728817392636707617}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 02baac9c68489bd4bb669438fdc70b9c, type: 2}
--- !u!1 &4751935264708904051
GameObject:
m_ObjectHideFlags: 0
......
Assets/Game Resources/Prefabs/RankUpPopup.prefab
View file @ 6365a16c
......@@ -755,6 +755,7 @@ GameObject:
- component: {fileID: 8420974416709778070}
- component: {fileID: 2339514191714837435}
- component: {fileID: 475946172756024074}
- component: {fileID: 3167989303166680816}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
......@@ -879,6 +880,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &3167989303166680816
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6839727202372235876}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 0}
--- !u!1 &8181394581501780370
GameObject:
m_ObjectHideFlags: 0
......@@ -1041,6 +1055,7 @@ GameObject:
- component: {fileID: 6727038996001169046}
- component: {fileID: 6360160014624254699}
- component: {fileID: 8574707817994020403}
- component: {fileID: 9215750401665632605}
m_Layer: 5
m_Name: Title
m_TagString: Untagged
......@@ -1165,3 +1180,16 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &9215750401665632605
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9218498791893823807}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 0}
Assets/OSG Infinity Square Space/Scenes/main.unity
View file @ 6365a16c
......@@ -54342,6 +54342,11 @@ PrefabInstance:
value:
objectReference: {fileID: 21300000, guid: 835efe33d57adca4abec98259d8c46dc,
type: 3}
- target: {fileID: 3120337067619741731, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3504026160529335267, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
......@@ -54417,6 +54422,12 @@ PrefabInstance:
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3504742969872784205, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 18ebb61ad1e73534593d6bf80314dc00,
type: 3}
- target: {fileID: 3504742969995073805, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_SizeDelta.x
......@@ -54993,6 +55004,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5519256934353319760, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5725032523227911668, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
......@@ -55128,6 +55144,120 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3504742970542838647 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1917045584186348946, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3504742970542838648 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742971146757228, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3504742970542838649 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742970287529471, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3504742970542838650 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 367100802688306768, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3504742970542838651
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838647}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 5d3a99e71cf78584193c6716da8dc138, type: 2}
--- !u!114 &3504742970542838652
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838648}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 58085b97fd6ac80439c2bf50f4b87b12, type: 2}
--- !u!114 &3504742970542838653
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838649}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: f3717cfb5023e714d862f12e89c00fba, type: 2}
--- !u!114 &3504742970542838654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838650}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 0}
--- !u!1 &3504742970542838655 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742970341649912, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3504742970542838656 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3504742970292061442, guid: 0a65ca5d691aad948b7d3ccd46ee2f72,
type: 3}
m_PrefabInstance: {fileID: 3504742970542838637}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3504742970542838657
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838655}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 11400000, guid: 5d3a99e71cf78584193c6716da8dc138, type: 2}
--- !u!114 &3504742970542838658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3504742970542838656}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 50fd61b7673ae9e489895fd51ac74e0b, type: 3}
m_Name:
m_EditorClassIdentifier:
textData: {fileID: 0}
--- !u!198 &3577048474464131065
ParticleSystem:
m_ObjectHideFlags: 0
Assets/Scripts/UI/ShopPopup.cs
View file @ 6365a16c
......@@ -37,10 +37,10 @@ public class ShopPopup : BasePopup
{
prices[i].text = IAPManager.Instance.GetPriceCountry(i);
}
for(int i=0; i<titles.Count; i++)
{
titles[i].text = titleValues[i];
}
//for(int i=0; i<titles.Count; i++)
//{
// titles[i].text = titleValues[i];
//}
}
private void CheckRemoveAds()
{
......
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