diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 8298dcf4b0..12c8b7c2b9 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -14418,7 +14418,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
@@ -14468,7 +14468,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 428.97, y: -0.000015258789}
- m_SizeDelta: {x: 857.94, y: 45}
+ m_SizeDelta: {x: 857.94, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5582656793896342774
CanvasRenderer:
@@ -22107,7 +22107,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 728.75, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 139.5, y: 50.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1420070111345050450
@@ -22448,7 +22448,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
@@ -25400,7 +25400,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 428.5, y: -573.75}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 865, y: 387.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5440619234679825355
@@ -28341,7 +28341,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 428.5, y: -850.5}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 865, y: 266}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &5787845084316277716
@@ -31944,7 +31944,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &2221885512223848565
RectTransform:
m_ObjectHideFlags: 0
@@ -33878,7 +33878,7 @@ RectTransform:
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: 0.00003631129}
+ m_AnchoredPosition: {x: 0, y: -0.000005543596}
m_SizeDelta: {x: 916, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &5918842748614186787
@@ -35998,7 +35998,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -3.1000977, y: -14.600586}
+ m_AnchoredPosition: {x: -3.1000977, y: -14.600098}
m_SizeDelta: {x: -168.8, y: -584}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3588302341315408117
@@ -36363,8 +36363,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 432, y: -338.5}
- m_SizeDelta: {x: 872, y: 83}
+ m_AnchoredPosition: {x: 432, y: 0}
+ m_SizeDelta: {x: 872, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5183859335168644090
CanvasRenderer:
@@ -36709,7 +36709,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -431.52002}
- m_SizeDelta: {x: 864.04, y: 1116.5}
+ m_SizeDelta: {x: 864.04, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &2484587132639556036
MonoBehaviour:
@@ -42366,7 +42366,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 425.865, y: -188}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 859.73, y: 218}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3230228749451359137
@@ -43927,7 +43927,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
@@ -47873,8 +47873,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 432, y: -809}
- m_SizeDelta: {x: 872, y: 83}
+ m_AnchoredPosition: {x: 432, y: 0}
+ m_SizeDelta: {x: 872, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4863705341942113372
CanvasRenderer:
@@ -49677,7 +49677,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &475247785733533137
RectTransform:
m_ObjectHideFlags: 0
@@ -58114,8 +58114,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: -26}
- m_SizeDelta: {x: 819.94, y: 38}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 819.94, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &435024635268583513
CanvasRenderer:
@@ -60294,8 +60294,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 432, y: -39.5}
- m_SizeDelta: {x: 872, y: 79}
+ m_AnchoredPosition: {x: 432, y: 0}
+ m_SizeDelta: {x: 872, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2217457181138367202
CanvasRenderer:
diff --git a/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab b/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab
index 32a9eb2306..f4aac8968b 100644
--- a/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GodPrint/GodPrintPopUp.prefab
@@ -728,7 +728,7 @@ MonoBehaviour:
m_Top: 10
m_Bottom: 10
m_ChildAlignment: 0
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -938,7 +938,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: -1.2599, y: -0.000043637574}
+ m_AnchoredPosition: {x: -1.2599, y: -0.00006206119}
m_SizeDelta: {x: 846.52, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7892514507901717546
@@ -1218,7 +1218,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: -39, y: -10}
+ m_AnchoredPosition: {x: -113.5, y: 6}
m_SizeDelta: {x: 109.14, y: 63.18}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204043210945665
@@ -1713,7 +1713,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 7
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -2066,8 +2066,8 @@ 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: 117, y: -107}
- m_SizeDelta: {x: 591.6, y: 112.4}
+ m_AnchoredPosition: {x: 117, y: -85.2}
+ m_SizeDelta: {x: 591.6, y: 81.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204044452706537
CanvasRenderer:
@@ -2102,7 +2102,7 @@ MonoBehaviour:
m_FontSize: 28
m_FontStyle: 0
m_BestFit: 1
- m_MinSize: 2
+ m_MinSize: 28
m_MaxSize: 28
m_Alignment: 3
m_AlignByGeometry: 0
@@ -2110,7 +2110,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: "\u795E\u6811\u82B1\u7075\u7ED3\u6210\u7684\u521D\u7EA7\u9B54\u6297\u795E\u5370\u662F\u6C34\u6C34\u6C34\u6C34\u6C34\u6C34\u6C34\u6C34\u6C34\u6C34\u6C34\u662F\u662F\u662F\u662F\u662F\u662F\u662F\u662F\u662F\u662F\u662F\u662F"
+ m_Text: "\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0\u63CF\u8FF0"
LanguageIndex: 0
--- !u!114 &5554714147106251392
MonoBehaviour:
@@ -2207,7 +2207,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: 305, y: -11}
+ m_AnchoredPosition: {x: 305, y: 83.9}
m_SizeDelta: {x: 170.3, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204044491858967
@@ -2343,7 +2343,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -2441,7 +2441,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 5
m_ChildAlignment: 0
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -2481,7 +2481,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: 107, y: -12}
+ m_AnchoredPosition: {x: 32.5, y: 4.000001}
m_SizeDelta: {x: 236.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204044902728451
@@ -2576,7 +2576,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 341, y: -194}
+ m_AnchoredPosition: {x: 663.2, y: -131.3}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2569204044946346337
@@ -2695,7 +2695,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 10
m_ChildAlignment: 0
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -3173,7 +3173,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@@ -5113,7 +5113,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 5
m_ChildAlignment: 0
- m_Spacing: 0
+ m_Spacing: 5
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab
index d82805aae1..03d1322e4f 100644
--- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab
@@ -302,7 +302,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.4745098}
+ m_Color: {r: 0.26415092, g: 0.24795298, b: 0.24795298, a: 0.4745098}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -1344,8 +1344,8 @@ 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: -161.51, y: -13.200001}
- m_SizeDelta: {x: 340.26, y: 69.5}
+ m_AnchoredPosition: {x: -161.51, y: -1}
+ m_SizeDelta: {x: 400, y: 69.5}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &309248663674038662
CanvasRenderer:
@@ -1368,7 +1368,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9725491, g: 0.9803922, b: 0.98823535, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@@ -1377,7 +1377,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 48
+ m_FontSize: 70
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@@ -1403,7 +1403,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
- m_EffectDistance: {x: 2, y: -2}
+ m_EffectDistance: {x: 0.5, y: -0.5}
m_UseGraphicAlpha: 1
--- !u!114 &198526555081314675
MonoBehaviour:
@@ -1417,8 +1417,8 @@ MonoBehaviour:
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_EffectColor: {r: 0.9921569, g: 0.6509804, b: 0.16470589, a: 1}
- m_EffectDistance: {x: 3, y: -3}
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1.5, y: -1.5}
m_UseGraphicAlpha: 1
--- !u!1 &259358215116488240
GameObject:
@@ -1634,7 +1634,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &2571783354715065522
RectTransform:
m_ObjectHideFlags: 0
@@ -1651,7 +1651,7 @@ RectTransform:
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: -144, y: -51}
+ m_AnchoredPosition: {x: -235.7, y: -42.7}
m_SizeDelta: {x: 87.445, y: 60.753}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4560229119903574052
@@ -1689,7 +1689,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
- m_Alignment: 4
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -2180,7 +2180,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: 200, y: -0.8}
+ m_AnchoredPosition: {x: 229, y: -0.8}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2733825174990518068
@@ -2204,7 +2204,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.32156864, g: 0.59607846, b: 0.39215687, a: 1}
+ m_Color: {r: 0.28773582, g: 1, b: 0.47088942, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2213,18 +2213,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 32
+ m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
- m_MaxSize: 45
+ m_MaxSize: 50
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: 100
+ m_Text: 1000%
--- !u!1 &1199523777796317299
GameObject:
m_ObjectHideFlags: 0
@@ -2304,7 +2304,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: 656.1, y: 137.3}
+ m_AnchoredPosition: {x: 641, y: 137.3}
m_SizeDelta: {x: 143.9, y: 142.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1369435289748674630
@@ -3028,7 +3028,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: -338, y: 143.45502}
+ m_AnchoredPosition: {x: -283, y: 143.45502}
m_SizeDelta: {x: 186, y: 44}
m_Pivot: {x: 0, y: 0}
--- !u!222 &7240914529778927305
@@ -6645,7 +6645,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: -4.6, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 160, y: 67.06}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3203932933413411728
@@ -6678,7 +6678,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 48
+ m_FontSize: 50
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 4
@@ -7683,7 +7683,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: -114.8, y: 163}
+ m_AnchoredPosition: {x: -59.799995, y: 163}
m_SizeDelta: {x: 44, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4933596178887281237
@@ -7833,7 +7833,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: 21, y: 5.1}
+ m_AnchoredPosition: {x: 44.000008, y: 5.1}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3960836453904541201
@@ -7870,7 +7870,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: -78.5, y: 138.45502}
+ m_AnchoredPosition: {x: -23.499992, y: 138.45502}
m_SizeDelta: {x: 186, y: 44}
m_Pivot: {x: 0, y: 0}
--- !u!222 &7019911687049427158
@@ -7944,7 +7944,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: 15.1, y: 0.5}
+ m_AnchoredPosition: {x: 14, y: 0.5}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7576132995892271718
@@ -7977,18 +7977,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 32
+ m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
- m_MaxSize: 45
- m_Alignment: 3
+ m_MaxSize: 50
+ m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text: 100
+ m_Text: 1000%
--- !u!1 &4058379862583600284
GameObject:
m_ObjectHideFlags: 0
@@ -9264,7 +9264,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: -130, y: 64}
+ m_AnchoredPosition: {x: -107, y: 64}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4687331368555449477
@@ -9413,7 +9413,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 70
- m_Alignment: 1
+ m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -9950,7 +9950,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: -153.1, y: 2}
+ m_AnchoredPosition: {x: -163, y: 2}
m_SizeDelta: {x: 197.1, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3816946209160564979
@@ -9983,7 +9983,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 32
+ m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -11083,7 +11083,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 3a26a653ede19f547aa35b873069fb87, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -11264,7 +11264,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 565.54, y: -117.23}
+ m_AnchoredPosition: {x: 565.54, y: -129}
m_SizeDelta: {x: 272.48, y: 90.47}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6275965867404684713
@@ -11445,7 +11445,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: 664.7, y: -65.8}
+ m_AnchoredPosition: {x: 638, y: -65.8}
m_SizeDelta: {x: 273.1, y: 86.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6275908341821672553
@@ -11620,7 +11620,7 @@ RectTransform:
m_GameObject: {fileID: 6055873216861326691}
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_LocalScale: {x: -1, y: 1, z: 1}
m_Children:
- {fileID: 76519823539542594}
m_Father: {fileID: 6274276792458260021}
@@ -11659,7 +11659,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 87f02bd2a5259244aa2fe3d12563fcf7, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -12309,7 +12309,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: 633, y: 49}
+ m_AnchoredPosition: {x: 639, y: 80}
m_SizeDelta: {x: 197.07, y: 47.75}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6276022582899603475
@@ -14282,8 +14282,8 @@ 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: 109.7, y: 23}
- m_SizeDelta: {x: 26, y: 26}
+ m_AnchoredPosition: {x: 121.7, y: 33.1}
+ m_SizeDelta: {x: 54, y: 54}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7194126143611269178
CanvasRenderer:
@@ -14356,8 +14356,8 @@ 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: 85.1, y: 18.9}
- m_SizeDelta: {x: 26, y: 26}
+ m_AnchoredPosition: {x: 117.5, y: 34.3}
+ m_SizeDelta: {x: 54, y: 54}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7194126144450840983
CanvasRenderer:
@@ -15038,7 +15038,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: -2.5, y: 4.2}
+ m_AnchoredPosition: {x: -2.5, y: 1.9}
m_SizeDelta: {x: 160, y: 67.06}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &411766089844069149
@@ -15071,7 +15071,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 46
+ m_FontSize: 50
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 4
@@ -16333,7 +16333,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: 61.9, y: 2}
+ m_AnchoredPosition: {x: 123.9, y: 2}
m_SizeDelta: {x: 44, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3016378080448527816
@@ -16580,7 +16580,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: f4e0f2aac65ddde4f97575e064b00ba3, type: 3}
+ m_Sprite: {fileID: 21300000, guid: ea96ef02219e8ae49beccefebb6fdcdf, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab
index 949aab1e3e..0e507162ca 100644
--- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab
@@ -832,7 +832,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2004, y: 299}
- m_SizeDelta: {x: 814, y: 130}
+ m_SizeDelta: {x: 814, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &610871085379917261
GameObject:
@@ -869,8 +869,8 @@ 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: -93.35, y: 3.48}
- m_SizeDelta: {x: 625.31, y: 120}
+ m_AnchoredPosition: {x: -93.35, y: 3.61}
+ m_SizeDelta: {x: 625.31, y: 139.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2485461049148167896
CanvasRenderer:
@@ -1120,6 +1120,7 @@ GameObject:
- component: {fileID: 3936331274145793095}
- component: {fileID: 291946901644951916}
- component: {fileID: 5607062259010784078}
+ - component: {fileID: 7975143076625263222}
m_Layer: 5
m_Name: pokemonStateText
m_TagString: Untagged
@@ -1167,7 +1168,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -1176,11 +1177,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 40
+ m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
- m_MaxSize: 40
+ m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@@ -1189,6 +1190,21 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5408 \u6210"
LanguageIndex: 0
+--- !u!114 &7975143076625263222
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 826356585411724159}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 1, y: -1}
+ m_UseGraphicAlpha: 1
--- !u!1 &831607153641849087
GameObject:
m_ObjectHideFlags: 0
@@ -1221,8 +1237,8 @@ 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: 7.42, y: 306.07}
- m_SizeDelta: {x: 812.79, y: 1075.18}
+ m_AnchoredPosition: {x: 5.6, y: 306.07}
+ m_SizeDelta: {x: 809.2, y: 1075.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &901912493587518605
GameObject:
@@ -1413,8 +1429,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 338.6, y: 45}
- m_SizeDelta: {x: 300, y: 40}
+ m_AnchoredPosition: {x: 338.6, y: 23.3}
+ m_SizeDelta: {x: 300, y: 53.82}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5759443425803507341
CanvasRenderer:
@@ -1437,7 +1453,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.8627451, b: 0.68235296, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@@ -1446,7 +1462,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 28
+ m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@@ -1611,8 +1627,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 338, y: -27.8}
- m_SizeDelta: {x: 300, y: 110}
+ m_AnchoredPosition: {x: 338, y: -24.1}
+ m_SizeDelta: {x: 300, y: 62.533}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4402369311973345832
CanvasRenderer:
@@ -1691,8 +1707,8 @@ 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: 419.6, y: 0}
- m_SizeDelta: {x: 149, y: 120}
+ m_AnchoredPosition: {x: 403.8, y: 0}
+ m_SizeDelta: {x: 180.6, y: 139.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &750712578584216
CanvasRenderer:
@@ -2084,8 +2100,8 @@ 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: 419.6, y: 0}
- m_SizeDelta: {x: 149, y: 120}
+ m_AnchoredPosition: {x: 403.21, y: 0.000011444}
+ m_SizeDelta: {x: 181.79, y: 139.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2657845709555399833
CanvasRenderer:
@@ -2405,7 +2421,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 338.6, y: 45}
+ m_AnchoredPosition: {x: 338.6, y: 40.3}
m_SizeDelta: {x: 300, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &798697634588757426
@@ -2429,7 +2445,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.8627451, b: 0.68235296, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2438,7 +2454,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 28
+ m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@@ -2815,7 +2831,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@@ -2998,7 +3014,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@@ -3665,7 +3681,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@@ -4071,7 +4087,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 28
+ m_FontSize: 35
m_FontStyle: 2
m_BestFit: 0
m_MinSize: 2
@@ -4143,7 +4159,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.86309886, b: 0.6839622, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@@ -4152,7 +4168,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
- m_FontSize: 28
+ m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@@ -4246,7 +4262,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@@ -5431,7 +5447,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@@ -6034,7 +6050,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -2004, y: 109}
- m_SizeDelta: {x: 814, y: 130}
+ m_SizeDelta: {x: 814, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5706933110758858176
GameObject:
@@ -6275,8 +6291,8 @@ 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: 6.9, y: 307.16}
- m_SizeDelta: {x: 840.7, y: 1073.9}
+ m_AnchoredPosition: {x: 6.13, y: 307.16}
+ m_SizeDelta: {x: 811.44, y: 1073.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5935303785263305452
GameObject:
@@ -6632,7 +6648,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 285.73, y: 0}
- m_SizeDelta: {x: 165, y: 70}
+ m_SizeDelta: {x: 180, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5979528672487799334
CanvasRenderer:
@@ -6747,8 +6763,8 @@ 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: 71.6, y: 27.1}
- m_SizeDelta: {x: 30, y: 30}
+ m_AnchoredPosition: {x: 85.3, y: 38.8}
+ m_SizeDelta: {x: 54, y: 54}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3226745134179389187
CanvasRenderer:
@@ -6853,7 +6869,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
@@ -6936,8 +6952,8 @@ 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: 11.937998, y: 312.43}
- m_SizeDelta: {x: 830.5, y: 1063.37}
+ m_AnchoredPosition: {x: 6.1295004, y: 307.16}
+ m_SizeDelta: {x: 811.44, y: 1073.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6349641605898572657
GameObject:
@@ -7267,8 +7283,8 @@ 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: -93.35, y: 3.48}
- m_SizeDelta: {x: 625.31, y: 120}
+ m_AnchoredPosition: {x: -93.35, y: 3.78}
+ m_SizeDelta: {x: 625.31, y: 139.76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1284542677299077873
CanvasRenderer:
@@ -7447,7 +7463,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@@ -8588,7 +8604,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index a0995a90c6..75dd4b9ebd 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -2933,7 +2933,7 @@ ItemBaseTypeName = {
[11] = "奥义卡",
[12] = "意念",
[13] = "芯片",
- [14] = "主角礼物",
+ [14] = "命格",
[15] = "英雄礼物",
}
diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua
index d5473de273..d25facd2d3 100644
--- a/Assets/ManagedResources/~Lua/Common/functions.lua
+++ b/Assets/ManagedResources/~Lua/Common/functions.lua
@@ -1444,7 +1444,7 @@ function GetEquipPosStrByEquipPosNum(_index)
elseif _index == 6 then
return Language[12044]
elseif _index == 7 then
- return "主角礼物"
+ return "命格"
elseif _index == 8 then
return "英雄礼物"
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua
index 0fc781adc1..b9a6d658ab 100644
--- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaTypePanel.lua
@@ -228,9 +228,9 @@ function ArenaTypePanel:OnShow()
NetManager.GetDeathPathInfoResponse(function(msg)
if DeathPosManager.status == DeathPosStatus.Reward then
- this.overTime.text = Language[11029]
+ --this.overTime.text = Language[11029]
elseif DeathPosManager.status == DeathPosStatus.Close then
- this.overTime.text = Language[11030]
+ --this.overTime.text = Language[11030]
else
this.slzdTimeDown = msg.overTime
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua
index f42dae7f33..9511ea5dc6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Compound/CompoundPanel.lua
@@ -7,7 +7,7 @@ local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", lock = "UI_hz_gonghui_L
[2] = { default = "UI_hz_zhonghe01_83", lock = "UI_hz_gonghui_Lock",select = "UI_hz_zhonghe01_82", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin},
[3] = { default = "UI_hz_zhonghe01_83", lock = "UI_hz_gonghui_Lock",select = "UI_hz_zhonghe01_82", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure },
[4] = { default = "UI_hz_zhonghe01_83", lock = "UI_hz_gonghui_Lock",select = "UI_hz_zhonghe01_82", name = "将礼合成", funcType = FUNCTION_OPEN_TYPE.Gift,redpoint=RedPointType.HeroGiftCompound },
- [5] = { default = "UI_hz_zhonghe01_83", lock = "UI_hz_gonghui_Lock",select = "UI_hz_zhonghe01_82", name = "主礼合成", funcType = FUNCTION_OPEN_TYPE.Gift,redpoint=RedPointType.PlayerGiftCompound },
+ [5] = { default = "UI_hz_zhonghe01_83", lock = "UI_hz_gonghui_Lock",select = "UI_hz_zhonghe01_82", name = "命石合成", funcType = FUNCTION_OPEN_TYPE.Gift,redpoint=RedPointType.PlayerGiftCompound },
}
local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1),
select = Color.New(255 / 255, 255 / 255, 255 / 255, 1),
diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua
index 62e6482cf8..49f485ebbf 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua
@@ -668,7 +668,7 @@ function this:HeroAttack()
end)
- self:DelayFunc(dataAttack.combat.KeyFrame / 1000, function()
+ self:DelayFunc(dataAttack.combat.ActionTime / 1000, function()
--hit effect
-- local idx = turnIdx == 4 and targetIndex or 4
this:OnDamaged(roleLiveGoDefend[targetIndex], liveNodesDefend[targetIndex], this:randDmg(),
@@ -723,7 +723,7 @@ function this:HeroAttack()
end
end)
- self:DelayFunc(dataAttack.combat.KeyFrame / 1000, function()
+ self:DelayFunc(dataAttack.combat.ActionTime / 1000, function()
--hit effect
-- local idx = turnIdx == 4 and targetIndex or 4
this:OnDamaged(roleLiveGoDefend[targetIndex], liveNodesDefend[targetIndex], this:randDmg(),
@@ -1338,6 +1338,7 @@ function this:OnDamaged(livego, livenode, dmg, bCrit, combat, skill, isLeft, tur
if combat == nil then
LogError("onhook OnDamaged combat nil")
end
+ LogError("onhook OnDamaged combat nil")
if combat and #combat.SkillNumbetTime > 0
--and combat.SkillNumber > 1 and #combat.SkillNumbetTime == combat.SkillNumber - 1
then
diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua
index 9d90deb492..03e3bd0c2d 100644
--- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua
@@ -302,15 +302,15 @@ function GodPrintPopUp:RefreshShow(_type)
--firstStr=curStr
elseif index==2 then
if equipConfig[soulId].Star>=index-1 then
- stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
+ stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
else
- stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
+ stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
end
else
if equipConfig[soulId].Star>=index-1 then
- stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
+ stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
else
- stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
+ stringInfo=stringInfo..""..curStr..""..""..string.format(" (+%s解锁)",index-1).."\n"
end
end
end
@@ -402,9 +402,9 @@ function GodPrintPopUp:RefreshShow(_type)
--LogError("goldSuiteSkill[i][2]=="..goldSuiteSkill[i][2])
if goldSuiteSkill[i][2] then
if isEnough then
- go:GetComponent("Text").text = string.format("%s",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
+ go:GetComponent("Text").text = string.format("%s",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
else
- go:GetComponent("Text").text = string.format("%s",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
+ go:GetComponent("Text").text = string.format("%s",GetLanguageStrById(passiveSkillConfig[goldSuiteSkill[i][2]].Desc))
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
index 1243d341d6..530e178de7 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
@@ -2058,7 +2058,9 @@ end
this.sgEffect[1].gameObject:SetActive(true)
this.sgEffect[2].gameObject:SetActive(false)
end
- this.sgItemView:OnOpen(false,{itemId,0},0.73)
+ if itemId ~= 0 then
+ this.sgItemView:OnOpen(false,{itemId,0},0.73)
+ end
this.sgName.text=ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
index 8dd60cbe7a..c72cf092c8 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
@@ -387,7 +387,7 @@ function RewardEquipSingleShowPopup2:OnShow()
LogError("GiftManager.GetPlayerGiftAdd()============="..GiftManager.GetPlayerGiftAdd().." prop[2]==========="..prop[2].." HeroManager.ReturnGiftAtt()=="..HeroManager.ReturnGiftAtt())
local proValue =math.floor(prop[2]*(1+GiftManager.GetPlayerGiftAdd()/100)+0.5)
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])..
- string.format(" 主角礼物加成+%s (%s%%)",math.floor(proValue*GiftManager.GetPlayerGiftAdd()/100),GiftManager.GetPlayerGiftAdd())
+ string.format(" 命格加成+%s (%s%%)",math.floor(proValue*GiftManager.GetPlayerGiftAdd()/100),GiftManager.GetPlayerGiftAdd())
..string.format(" 特训加成+%s (%s%%)",math.floor(proValue*HeroManager.ReturnGiftAtt()),HeroManager.ReturnGiftAtt())
elseif equipConfigData.Position<=4 and self.curHeroData then
-- for k, v in pairs(self.curHeroData.potential) do
diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
index 110c4999b8..6a34020e34 100644
--- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua
@@ -33,6 +33,7 @@ function Practice:InitComponent()
self.gemBtn = Util.GetGameObject(self.Btns, "rightGrid/gemBtn")
self.gemRedPoint = Util.GetGameObject(self.gemBtn, "redPoint")
+ self.gemBtn:SetActive(false)
-- Util.GetGameObject(self.Btns, "rightGrid/gemBtn"):GetComponent("Image").sprite=self.spLoader:LoadSprite("x_xiuxing_mingge_zh")
self.giftBtn = Util.GetGameObject(self.Btns, "rightGrid/giftBtn")
@@ -209,8 +210,8 @@ function Practice:BindEvent()
BindRedPointObject(RedPointType.Sacred_roleInfo,self.treeRed)
BindRedPointObject(RedPointType.incarnation,self.incarnationBtnRed)
BindRedPointObject(RedPointType.Practice,self.practice_tab)
- BindRedPointObject(RedPointType.Gem,self.gemRedPoint)
- --BindRedPointObject(RedPointType.playerGift,self.giftRedPoint)
+ --BindRedPointObject(RedPointType.Gem,self.gemRedPoint)
+ BindRedPointObject(RedPointType.playerGift,self.giftRedPoint)
end
function Practice:BtnClickEvent()
NetManager.UpPracticeLevelRequest(function ()
@@ -467,7 +468,7 @@ function Practice:RefreshBtn()
self.talsmanSoulBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TailsmanSoul))
self.incarnationBtn:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.Incarnation))
self.giftBtn:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.Gift))
- self.giftBtn:SetActive(false)
+ --self.giftBtn:SetActive(false)
self.noOpenTip:SetActive(false)
if XinXianConfig[PracticeManager.PracticeLevel + 1] then
self.button:SetActive(true)
@@ -553,8 +554,8 @@ function Practice:OnDestroy()
ClearRedPointObject(RedPointType.tailsmanSoul,self.talsmanSoulBtnRed)
ClearRedPointObject(RedPointType.incarnation,self.incarnationBtnRed)
ClearRedPointObject(RedPointType.Practice,self.practice_tab)
- ClearRedPointObject(RedPointType.Gem,self.gemRedPoint)
- --ClearRedPointObject(RedPointType.playerGift,self.giftRedPoint)
+ --ClearRedPointObject(RedPointType.Gem,self.gemRedPoint)
+ ClearRedPointObject(RedPointType.playerGift,self.giftRedPoint)
for i = 1, 4 do
ClearRedPointObject(500+i*100,Util.GetGameObject(self.Practice, "SkillObj/skill"..i.."/red"))
end
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua
index a042f50869..d839704783 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/PlayerGiftPanel.lua
@@ -4,7 +4,7 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local giftConfig=ConfigManager.GetConfig(ConfigName.GiftConfig)
PlayerGiftPanel = Inherit(BasePanel)
local isGonming = 0
-local tableName={ "礼物","碎片"}
+local tableName={ "命格","碎片"}
local isUpZhen = false
local this = PlayerGiftPanel
local indexBtnNum=0
@@ -35,7 +35,7 @@ function PlayerGiftPanel:InitComponent()
--effectList[i] = Util.GetGameObject(self.transform, "bg/equipInfo/equip" .. i .. "/effect")
end
this.titleTxt=Util.GetGameObject(self.gameObject, "title"):GetComponent("Text")
- this.titleTxt.text="主角礼物"
+ this.titleTxt.text="命格"
this.selectBtn = Util.GetGameObject(self.gameObject, "selectBtn")
this.btnPrant = Util.GetGameObject(self.gameObject, "Tabs")
this.btnPrant:SetActive(false)
@@ -74,9 +74,9 @@ function PlayerGiftPanel:InitComponent()
this.listObj = Util.GetGameObject(self.transform, "listObj")
this.listCloseBtn = Util.GetGameObject(self.transform, "listObj/bg/btn_close")
- Util.GetGameObject(self.transform, "listObj/bg/title (1)"):GetComponent("Text").text="主角礼物"
+ Util.GetGameObject(self.transform, "listObj/bg/title (1)"):GetComponent("Text").text="命格"
this.proTitle = Util.GetGameObject(self.transform, "proTitle/name/text"):GetComponent("Text")
- this.proTitle.text="当前礼物总加成"
+ this.proTitle.text="当前命格总加成"
this.proGrid = Util.GetGameObject(self.transform, "pro")
this.proPre=Util.GetGameObject(self.transform, "pro/name")
--this.tipInfo = Util.GetGameObject(self.transform, "tipInfo"):GetComponent("Text")
@@ -241,7 +241,7 @@ function this.RefreshWindowData()
local proList=IncarnationManager.GetproDesLst(GiftManager.GetPlayerGiftAddPro(),"00FF00")
table.insert(proList,string.format("全体英雄潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv()))
- table.insert(proList,string.format("全体英雄礼物属性+%s%%",GiftManager.GetPlayerGiftAdd()))
+ table.insert(proList,string.format("全体英雄命格属性+%s%%",GiftManager.GetPlayerGiftAdd()))
if proList and #proList>0 then
this.proGrid:SetActive(true)
this.proEmptyObj:SetActive(false)
@@ -335,7 +335,7 @@ function this:OnClickTabBtn(_index)
end)
--"装备数量:"
- this.itemNumText.text = "礼物种类:" .. count
+ this.itemNumText.text = "命格种类:" .. count
this:SetItemData(allEquip)
--this.CheckRedTab()
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua
index 7a6c6c3596..612242ae1f 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleGiftPanel.lua
@@ -296,7 +296,7 @@ function this.RefreshWindowData()
this.proGrid.transform:GetChild(i-1).gameObject:SetActive(true)
LogError("originalList[i]======================"..originalList[i])
this.proGrid.transform:GetChild(i-1):GetComponent("Text").text=proList[i]..
- string.format(" 主角礼物加成+%s (%s%%)",math.floor(originalList[i]*GiftManager.GetPlayerGiftAdd()/100), GiftManager.GetPlayerGiftAdd())
+ string.format(" 命格加成+%s (%s%%)",math.floor(originalList[i]*GiftManager.GetPlayerGiftAdd()/100), GiftManager.GetPlayerGiftAdd())
..string.format(" 特训加成+%s (%s%%)",math.floor(originalList[i]*HeroManager.ReturnGiftAtt()),HeroManager.ReturnGiftAtt())
elseif i==#proList then
this.proGrid.transform:GetChild(i-1).gameObject:SetActive(true)
diff --git a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua
index 884162852f..76b70882dc 100644
--- a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua
+++ b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua
@@ -17,6 +17,7 @@ function FourElementSingleWave:InitComponent(go,_data,_curType)
self.reward = Util.GetGameObject(go,"bg/rewardRect")
self.fight = Util.GetGameObject(go,"bg/fight")
self.pass = Util.GetGameObject(go,"bg/pass"):GetComponent("Image")
+ self.rewardTittle = Util.GetGameObject(go,"bg/Text")
self.title = Util.GetGameObject(go,"bg/leftLayout/title"):GetComponent("Image")
self.hero = Util.GetGameObject(go,"bg/Hero")
self.rewardText = Util.GetGameObject(self.reward,"Text"):GetComponent("Text")
@@ -60,7 +61,8 @@ function FourElementSingleWave:OnOpen()
-- self.bg.sprite = self.spLoader:LoadSprite(GetFourElementBgByType(self.trailData.fourElementType))
if self.data.wave < self.trailData.monsterWave then
- self.pass.gameObject:SetActive(true)
+ self.pass.gameObject:SetActive(false)
+ self.rewardTittle:SetActive(false)
self.fight.gameObject:SetActive(false)
self.reward.gameObject:SetActive(false)
else