Commit d4384f6c authored by maxiaoliang's avatar maxiaoliang

修改ui位置,加速气泡和害虫气泡逻辑修改

parent f9368278
fileFormatVersion: 2
guid: 4de77bfbd9c014146a2b371280ff0f63
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9216b5ab3159c44e594fa8e3a6bfcd90
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -1584,7 +1584,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: -124.2, y: 609.1}
m_AnchoredPosition: {x: -124.2, y: 612}
m_SizeDelta: {x: 136.7032, y: 122.00984}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &54350470
......@@ -4912,6 +4912,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_Sprite
......@@ -45856,6 +45861,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_Sprite
......@@ -52149,6 +52164,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -4
objectReference: {fileID: 0}
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 11
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_Sprite
......@@ -52304,7 +52329,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: 10.6, y: 629.2}
m_AnchoredPosition: {x: 10.6, y: 634}
m_SizeDelta: {x: 121.23505, y: 163.89551}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1747314419
......@@ -54700,6 +54725,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_Sprite
......@@ -77802,6 +77832,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 369872322}
m_Modifications:
- target: {fileID: 48928979346172635, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -5
objectReference: {fileID: 0}
- target: {fileID: 8311411286583156722, guid: b92c42fd55d7045d7b682bcb1473ceeb,
type: 3}
propertyPath: m_Sprite
......@@ -67,7 +67,11 @@ public class AdUtils
public void onAdClose(AdEntity entity)
{
AudioUtils.ins.music.Play();
if(PlayerPrefs.GetInt("IS_OPEN_MUSIC", 0) == 0)
{
AudioUtils.ins.music.Play();
}
setCurrentAdEntity(entity);
......
......@@ -391,6 +391,10 @@ public class CarUIControl : MonoBehaviour
floatStickObj.SetActive(true);
imghaichongs.SetActive(true);
}
else
{
floatSpeedObj.SetActive(false);
}
//if (floatStickTipsObj.activeSelf != true)
//{
// floatStickTipsObj.SetActive(true);
......@@ -414,6 +418,10 @@ public class CarUIControl : MonoBehaviour
floatStickObj.SetActive(false);
imghaichongs.SetActive(false);
}
else
{
floatSpeedObj.SetActive(true);
}
//if (floatStickTipsObj.activeSelf != false)
//{
// floatStickTipsObj.SetActive(false);
......
......@@ -1013,7 +1013,7 @@ public class DialogControl : MonoBehaviour
}
public void showTaoxinDialog(int rewardcount)
{
EventUtils.OnEvent("happy_get_dialog");
taoxinDialog.SetActive(true);
tv_taoxin_num.text = rewardcount.ToString();
}
......
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