Skip to content

W
wdlc_mjb_unity
Commit 610cb83e authored by zhangzhe's avatar zhangzhe
Browse files
Options

修改种菜引导小手

parent e3d84545
Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 35 deletions
Assets/Game/Main/Resource/LeeScripts/LeeMainController.cs
View file @ 610cb83e
......@@ -33,8 +33,15 @@ public class LeeMainController : MonoBehaviour
});
TitleBG2.Find("btnRedBag/txtMoney").GetComponent<Text>().text = model.yuan.ToString()+"元";
int handIndex = -1; // 第几个条件未达成
for (int i = 0; i < 3; i++)
{
if (handIndex == -1 && model.infoList[i].current < model.infoList[i].targetNum)
{
handIndex = i;
}
TitleBG2.Find("Fruit" + i.ToString() + "/txtFruitName").GetComponent<Text>().text = model.infoList[i].name;
TitleBG2.Find("Fruit" + i.ToString() + "/imgFruitPic").GetComponent<Image>().sprite = Resources.Load<Sprite>("Fruit/" + model.infoList[i].woodId.ToString());
TitleBG2.Find("Fruit" + i.ToString() + "/imgProcess").GetComponent<Image>().fillAmount = (float)model.infoList[i].current / (float)model.infoList[i].targetNum;
......@@ -48,6 +55,16 @@ public class LeeMainController : MonoBehaviour
DidSelectedToPlanting(woodId);
});
}
// 刷新首页上面的手指显示
GameObject.Find("TitleBG2").transform.parent.Find("hand1").gameObject.SetActive(false);
GameObject.Find("TitleBG2").transform.parent.Find("hand2").gameObject.SetActive(false);
GameObject.Find("TitleBG2").transform.parent.Find("hand3").gameObject.SetActive(false);
if (handIndex != -1)
{
GameObject.Find("TitleBG2").transform.parent.Find("hand" + (handIndex + 1)).gameObject.SetActive(FastPlanting.Instance().CheckIfCanPlanting() && !Guide.guide.IfHaveGuide());
}
});
}
......
Assets/Game/Main/Resource/ui/WithdrawEveryDay.meta deleted 100644 → 0
View file @ e3d84545
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 610cb83e
......@@ -4232,7 +4232,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 16, y: -0.000011011958}
m_AnchoredPosition: {x: 16, y: -0.000005161645}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &133138106
......@@ -8941,9 +8941,9 @@ RectTransform:
m_Father: {fileID: 1548415916}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -72.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 355, y: 0}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
......@@ -15121,6 +15121,7 @@ GameObject:
- component: {fileID: 479268149}
- component: {fileID: 479268152}
- component: {fileID: 479268151}
- component: {fileID: 479268150}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
......@@ -18953,7 +18954,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: -182, y: -129}
m_AnchoredPosition: {x: -182, y: -89}
m_SizeDelta: {x: 359, y: 115}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &604644949
......@@ -22444,6 +22445,8 @@ RectTransform:
- {fileID: 1747314418}
- {fileID: 119901837}
- {fileID: 1710032075}
- {fileID: 1813439481}
- {fileID: 1007627802}
m_Father: {fileID: 105570271}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -30230,6 +30233,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007618976}
m_CullTransparentMesh: 0
--- !u!1 &1007627801
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1007627802}
- component: {fileID: 1007627805}
- component: {fileID: 1007627804}
- component: {fileID: 1007627803}
m_Layer: 5
m_Name: hand3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1007627802
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007627801}
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: 716226832}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 89, y: 1348.424}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1007627803
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007627801}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 532f0e55e970ecb41a4f1fbe54da826e, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &1007627804
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007627801}
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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ce65a2a00524549f3978918c7a7bbcec, 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!222 &1007627805
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007627801}
m_CullTransparentMesh: 0
--- !u!1 &1010401973
GameObject:
m_ObjectHideFlags: 0
......@@ -42588,6 +42685,7 @@ GameObject:
- component: {fileID: 1432068691}
- component: {fileID: 1432068690}
- component: {fileID: 1432068689}
- component: {fileID: 1432068692}
m_Layer: 5
m_Name: btnRedBag
m_TagString: Untagged
......@@ -42706,6 +42804,25 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1432068687}
m_CullTransparentMesh: 0
--- !u!95 &1432068692
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1432068687}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 24bee2e12d27f42f8affee8a5fc485e6, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1432513996
GameObject:
m_ObjectHideFlags: 0
......@@ -50448,7 +50565,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: -192, y: -123}
m_AnchoredPosition: {x: -192, y: -83}
m_SizeDelta: {x: 288, y: 115}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1681316800
......@@ -54382,6 +54499,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1810026933}
m_CullTransparentMesh: 0
--- !u!1 &1813439480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1813439481}
- component: {fileID: 1813439484}
- component: {fileID: 1813439483}
- component: {fileID: 1813439482}
m_Layer: 5
m_Name: hand2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1813439481
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1813439480}
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: 716226832}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -21, y: 1348.424}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1813439482
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1813439480}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 532f0e55e970ecb41a4f1fbe54da826e, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &1813439483
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1813439480}
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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ce65a2a00524549f3978918c7a7bbcec, 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!222 &1813439484
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1813439480}
m_CullTransparentMesh: 0
--- !u!1 &1813487033
GameObject:
m_ObjectHideFlags: 0
......@@ -64050,7 +64261,7 @@ PrefabInstance:
- target: {fileID: 455528767810083866, guid: db026780330de104d920b4c604141362,
type: 3}
propertyPath: m_Alpha
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 455528767847454827, guid: db026780330de104d920b4c604141362,
type: 3}
......@@ -75076,7 +75287,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: -298.9, y: -78.599976}
m_AnchoredPosition: {x: -298.9, y: -78.59961}
m_SizeDelta: {x: 90, y: 92}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &4911638570596748396
......@@ -77135,7 +77346,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: -70.70001}
m_AnchoredPosition: {x: 0, y: -70.700195}
m_SizeDelta: {x: 761, y: 154}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5973347687574087203
Assets/Game/Main/Scripts/Presenter/CarPresenter.cs
View file @ 610cb83e
......@@ -154,7 +154,7 @@ public class CarPresenter : CarContract.Presenter
{
GameObject.Find("Dialog").GetComponent<DialogControl>().ShowJingxiDialog();
}
LeeMainController.Instance.UpdateTitleBG2Info();
//LeeMainController.Instance.UpdateTitleBG2Info();
}), new Action<string, string>((code, errMsg) =>
{
......
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ 610cb83e
......@@ -29,12 +29,34 @@ public class Guide : MonoBehaviour
private string step11Key = "step11Key";
// private string step6Key = "step6Key";
/// <summary>
/// 所有引导
/// </summary>
private List<GameObject> guideList = new List<GameObject>();
private void Awake()
{
guide = this;
isStartShow = false;
// 所有引导
guideList.Add(ObjStep1);
guideList.Add(ObjStep2);
guideList.Add(ObjStep3);
guideList.Add(step4);
guideList.Add(Step5);
guideList.Add(Step6);
guideList.Add(Step7);
guideList.Add(Step8);
guideList.Add(Step9);
guideList.Add(Step10);
guideList.Add(Step11);
guideList.Add(hand_1);
guideList.Add(hand_2);
guideList.Add(hand_3);
guideList.Add(hand_4);
guideList.Add(plantHand);
#if UNITY_IOS
fitFrame();
#endif
......@@ -264,7 +286,8 @@ public class Guide : MonoBehaviour
public void onClickStep11()
{
DissmissGuide(false);
LeeMainController.Instance.UpdateTitleBG2Info();
}
//public void onClickStep6()
//{
......@@ -339,4 +362,21 @@ public class Guide : MonoBehaviour
// hand_6.SetActive(false);
//}
}
/// <summary>
/// 当前页面上是否有引导
/// </summary>
/// <returns></returns>
public bool IfHaveGuide()
{
foreach (var item in guideList)
{
if (item.activeInHierarchy)
{
return true;
}
}
return false;
}
}
Assets/Game/Main/Scripts/View/CarUIControl.cs
View file @ 610cb83e
......@@ -227,7 +227,7 @@ public class CarUIControl : MonoBehaviour
setTime(land);
FastPlanting.Instance().landListDictionary[land.landId] = land;
GameObject.Find("TitleBG2").transform.parent.Find("hand1").gameObject.SetActive(FastPlanting.Instance().CheckIfCanPlanting());
LeeMainController.Instance.UpdateTitleBG2Info();
}
else
{ //没有数据
......
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ 610cb83e
......@@ -750,8 +750,6 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
/// </summary>
public void DidSelectedEveryDayWIthdraw()
{
AudioUtils.ins.PlayBtnAudio();
Guide.guide.onClickStep10();
DialogControl.Instance.ShowEverydayWithdraw();
}
}
Packages/packages-lock.json
View file @ 610cb83e
......@@ -19,7 +19,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.analytics": {
"version": "3.3.5",
......@@ -28,21 +28,21 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.1.4",
......@@ -51,14 +51,14 @@
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
......@@ -67,7 +67,7 @@
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
"version": "2.2.1",
......@@ -76,7 +76,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.20",
......@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
......@@ -96,14 +96,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.2.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
......@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
......
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