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

no message

parent 95254d85
......@@ -371,6 +371,7 @@ RectTransform:
m_Children:
- {fileID: 6858165440223377955}
- {fileID: 2901800396522636964}
- {fileID: 7268807190228230171}
m_Father: {fileID: 2447367370084599883}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1315,7 +1316,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 90.3}
m_AnchoredPosition: {x: 0, y: 93}
m_SizeDelta: {x: 600, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6519409804576558141
......@@ -1346,7 +1347,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: You claimed this already
m_text: You received
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 828dd775a1241bd499717f4d25d00134, type: 2}
m_sharedMaterial: {fileID: 8331841587601156102, guid: 828dd775a1241bd499717f4d25d00134,
......@@ -2616,6 +2617,81 @@ MonoBehaviour:
root: {fileID: 4237599748401683266}
- amountText: {fileID: 2504248222169993250}
root: {fileID: 2104940970679151368}
--- !u!1 &6641607783992794089
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7268807190228230171}
- component: {fileID: 3722513457970725003}
- component: {fileID: 8528975917616955264}
m_Layer: 5
m_Name: Title (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7268807190228230171
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6641607783992794089}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4066906727061304985}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -79}
m_SizeDelta: {x: 732, y: 68.625}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3722513457970725003
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6641607783992794089}
m_CullTransparentMesh: 1
--- !u!114 &8528975917616955264
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6641607783992794089}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9bece9eecccd5c04fb6916ee9e669267, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6948803864935937057
GameObject:
m_ObjectHideFlags: 0
......
......@@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 404}
m_AnchoredPosition: {x: 0, y: 503}
m_SizeDelta: {x: 800, y: 68.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4369287123480911803
......@@ -183,7 +183,7 @@ RectTransform:
- {fileID: 1316890504968220868}
- {fileID: 7087781969720731859}
- {fileID: 1460743538444662132}
- {fileID: 4985809756949100585}
- {fileID: 1473224749065589045}
m_Father: {fileID: 5644505234666477160}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -217,16 +217,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2540384937296414028}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5175912746860559562}
m_RootOrder: 6
m_Father: {fileID: 1473224749065589045}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -448}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 800, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8204879003956267689
......@@ -378,7 +378,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.2
timeHide: 0.01
bg_alpha: 0.9
backgound: {fileID: 3900882940593161701}
popup: {fileID: 5175912746860559562}
icon: {fileID: 3176731359957891318}
......@@ -591,7 +592,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.53333336}
m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
......@@ -644,7 +645,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -666}
m_AnchoredPosition: {x: 0, y: -717}
m_SizeDelta: {x: 570.6, y: 226.9442}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4577525325471183264
......@@ -877,6 +878,82 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8181394581501780370
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1473224749065589045}
- component: {fileID: 3660553961944708373}
- component: {fileID: 947503004612893598}
m_Layer: 5
m_Name: _name
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1473224749065589045
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8181394581501780370}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4985809756949100585}
m_Father: {fileID: 5175912746860559562}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -496}
m_SizeDelta: {x: 1094.9703, y: 108}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3660553961944708373
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8181394581501780370}
m_CullTransparentMesh: 1
--- !u!114 &947503004612893598
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8181394581501780370}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8fbd009f8de48eb43838645d3449cb9f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8913152124649214153
GameObject:
m_ObjectHideFlags: 0
......
......@@ -36276,6 +36276,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.01
bg_alpha: 0.5
backgound: {fileID: 1052032759}
popup: {fileID: 182707451}
slot_1:
......@@ -51554,6 +51555,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.2
bg_alpha: 0.5
backgound: {fileID: 564530349}
popup: {fileID: 43760203}
stars:
......@@ -65610,6 +65612,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.1
bg_alpha: 0.5
backgound: {fileID: 1255309506}
popup: {fileID: 2034800622}
icon: {fileID: 1017326646}
......@@ -68842,6 +68845,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.1
bg_alpha: 0.5
backgound: {fileID: 675634141}
popup: {fileID: 709971957}
icon: {fileID: 161329909}
......@@ -92782,6 +92786,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.01
bg_alpha: 0.5
backgound: {fileID: 442920553}
popup: {fileID: 938155146}
selectShipTab: {fileID: 1215342216}
......@@ -192782,6 +192787,12 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3176731359957891318, guid: 230ec6c498fbe39489a47a9cbe5f6f67,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 819cc4269cdc198449a78482529ef428,
type: 3}
- target: {fileID: 5644505234666477160, guid: 230ec6c498fbe39489a47a9cbe5f6f67,
type: 3}
propertyPath: m_Pivot.x
......@@ -269623,6 +269634,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.01
bg_alpha: 0.5
backgound: {fileID: 3356609145052316669}
popup: {fileID: 3356609146157779934}
scrollRect: {fileID: 3356609145195635101}
......@@ -271220,6 +271232,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.2
bg_alpha: 0.5
backgound: {fileID: 3356609146044632221}
popup: {fileID: 3356609144482143195}
vibration_on: {fileID: 6114266978053206684}
......@@ -277266,6 +277279,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
timeShow: 0.2
timeHide: 0.01
bg_alpha: 0.5
backgound: {fileID: 3356609144080403063}
popup: {fileID: 3356609145512600317}
rewardAmount: 010000000100000010270000020000000a0000000a00000014000000
......@@ -8,13 +8,14 @@ public class BasePopup : MonoBehaviour
{
public float timeShow = 0.5f;
public float timeHide = 0.5f;
public float bg_alpha = 0.5f;
public Image backgound;
public Transform popup;
public void OnEnable()
{
backgound.color = backgound.color.SetAlpha(0f);
popup.localScale = Vector3.one * 1.3f;
DOTween.To(() => { return backgound.color.a; }, (a) => { backgound.color = backgound.color.SetAlpha(a); }, 0.5f, timeShow).SetUpdate(true);
DOTween.To(() => { return backgound.color.a; }, (a) => { backgound.color = backgound.color.SetAlpha(a); }, bg_alpha, timeShow).SetUpdate(true);
popup.DOScale(Vector3.one, timeShow).SetEase(Ease.InQuad).SetUpdate(true);
OnShow();
}
......
......@@ -28,7 +28,7 @@ public class RankUI : MonoBehaviour
{
DataManager.RankData rankData = DataManager.Instance.GetCurrentRankData();
DataManager.RankIcon rankIcon = DataManager.Instance.GetCurrentRankIcon();
icon.sprite = rankIcon.small_icon;
icon.sprite = rankIcon.normal_icon;
fill.fillAmount = ((float)DataManager.Instance.userData.RankValue / rankData.stars);
rewards[0].Load(rankData.reward_1, rankData.stars, DataManager.Instance.userData.rewardStatus.reward_1_claimed);
rewards[1].Load(rankData.reward_2, rankData.stars, DataManager.Instance.userData.rewardStatus.reward_2_claimed);
......@@ -119,7 +119,7 @@ public class RankUI : MonoBehaviour
rewards[2].Load(currentRank.reward_3, currentRank.stars, DataManager.Instance.userData.rewardStatus.reward_3_claimed);
DataManager.RankIcon rankIcon = DataManager.Instance.GetCurrentRankIcon();
icon.sprite = rankIcon.small_icon;
icon.sprite = rankIcon.normal_icon;
InterfaceOperation.Instance.rankUpPopup.gameObject.SetActive(true);
}
......
......@@ -12,11 +12,12 @@ public class RankUpPopup : BasePopup
{
base.OnShow();
Time.timeScale = 0f;
Load();
}
private void Load()
{
DataManager.RankIcon rankIcon = DataManager.Instance.GetCurrentRankIcon();
icon.sprite = rankIcon.normal_icon;
icon.sprite = rankIcon.small_icon;
}
public void OnClick_MyHonor()
{
......
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