Skip to content

W
wdlc_mjb_unity
Commit 7829df1d authored by zhangzhe's avatar zhangzhe
Browse files
Options

点击首页任务直接种菜

parent 8cb1e8ed
Show whitespace changes
Inline Side-by-side
Showing with 278 additions and 25 deletions
Assets/Game/Main/Resource/LeeScripts/LeeMainController.cs
View file @ 7829df1d
......@@ -39,6 +39,12 @@ public class LeeMainController : MonoBehaviour
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;
TitleBG2.Find("Fruit" + i.ToString() + "/txtProcess").GetComponent<Text>().text = string.Format("{0}/{1}", (float)model.infoList[i].current, model.infoList[i].targetNum);
int woodId = (int)model.infoList[i].woodId;
TitleBG2.Find("Fruit" + i.ToString()).GetComponent<Button>().onClick.AddListener(() =>
{
DidSelectedToPlanting(woodId);
});
}
});
}
......@@ -97,4 +103,9 @@ public class LeeMainController : MonoBehaviour
ZhongCaiTiXian.gameObject.SetActive(false);
}
private void DidSelectedToPlanting(int plantId)
{
FastPlanting.Instance().Planting(plantId);
}
}
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 7829df1d
......@@ -2545,7 +2545,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 782149801}
m_HandleRect: {fileID: 782149800}
m_Direction: 2
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
......@@ -16995,8 +16995,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1531958713}
m_HandleRect: {fileID: 1531958712}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1.0000032
m_Size: 0.9349216
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -20083,6 +20083,7 @@ RectTransform:
- {fileID: 761882146}
- {fileID: 621809731}
- {fileID: 1904910581}
- {fileID: 1710032075}
m_Father: {fileID: 716226832}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -21499,6 +21500,7 @@ GameObject:
- component: {fileID: 621809731}
- component: {fileID: 621809734}
- component: {fileID: 621809733}
- component: {fileID: 621809732}
m_Layer: 5
m_Name: Fruit1
m_TagString: Untagged
......@@ -21530,6 +21532,49 @@ RectTransform:
m_AnchoredPosition: {x: -75, y: -20}
m_SizeDelta: {x: 98.06662, y: 114.51256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &621809732
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 621809730}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 621809733}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &621809733
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -25875,6 +25920,7 @@ GameObject:
- component: {fileID: 761882146}
- component: {fileID: 761882149}
- component: {fileID: 761882148}
- component: {fileID: 761882147}
m_Layer: 5
m_Name: Fruit0
m_TagString: Untagged
......@@ -25906,6 +25952,49 @@ RectTransform:
m_AnchoredPosition: {x: -190, y: -20}
m_SizeDelta: {x: 98.06662, y: 114.51256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &761882147
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 761882145}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 761882148}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &761882148
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -56231,6 +56320,100 @@ RectTransform:
m_AnchoredPosition: {x: 447, y: 0}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1710032074
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1710032075}
- component: {fileID: 1710032078}
- component: {fileID: 1710032077}
- component: {fileID: 1710032076}
m_Layer: 5
m_Name: hand1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1710032075
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1710032074}
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: 571633588}
m_RootOrder: 4
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: -143, y: 19}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1710032076
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1710032074}
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 &1710032077
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1710032074}
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 &1710032078
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1710032074}
m_CullTransparentMesh: 0
--- !u!1 &1712055592
GameObject:
m_ObjectHideFlags: 0
......@@ -62469,6 +62652,7 @@ GameObject:
- component: {fileID: 1904910581}
- component: {fileID: 1904910584}
- component: {fileID: 1904910583}
- component: {fileID: 1904910582}
m_Layer: 5
m_Name: Fruit2
m_TagString: Untagged
......@@ -62500,6 +62684,49 @@ RectTransform:
m_AnchoredPosition: {x: 40, y: -20}
m_SizeDelta: {x: 98.06662, y: 114.51256}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1904910582
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1904910580}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1904910583}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1904910583
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -65780,7 +66007,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2026228882
RectTransform:
m_ObjectHideFlags: 0
......@@ -66707,7 +66934,7 @@ MonoBehaviour:
RealAwards: {fileID: 3336770981114390305, guid: c8a7c6a15b5684cebbd1bbb8dec4d3b6,
type: 3}
rdp: {fileID: 1520725255}
nme: {fileID: 1132365601}
nme: {fileID: 0}
--- !u!1 &2053463148
GameObject:
m_ObjectHideFlags: 0
Assets/Game/Main/Scripts/View/CarUIControl.cs
View file @ 7829df1d
......@@ -225,6 +225,9 @@ public class CarUIControl : MonoBehaviour
CarType(land.status);
Debug.Log("地块状态"+land.status);
setTime(land);
FastPlanting.Instance().landListDictionary[land.landId] = land;
GameObject.Find("TitleBG2").transform.Find("hand1").gameObject.SetActive(FastPlanting.Instance().CheckIfCanPlanting());
}
else
{ //没有数据
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ 7829df1d
......@@ -543,13 +543,8 @@ public class DialogControl : MonoBehaviour
EventUtils.OnEvent("addDiamond_click", "点击钻石加号");
HttpTool.Instance._Get("app/v2/cscmnq/diamond_by_video_status", null, new Action<DiamondStatusBean>((bean) =>
{
<<<<<<< HEAD
DiamondRewardNum = bean.rewardDiamondNum;
=======
DiamondplayNum = bean.playNum;
DiamondRewardNum = bean.rewardDiamondNum;
>>>>>>> 9b00e1332e9bbf41d0221509f4e86bb98a4b5535
if (DiamondplayNum > 0)
{
rdp.Show(bean.rewardDiamondNum);
......
Assets/Game/Main/Scripts/View/FastPlanting.cs
View file @ 7829df1d
......@@ -9,7 +9,7 @@ using UnityEngine;
public class FastPlanting : SingletonMono<FastPlanting>
{
public List<LandListData> landListDatas = new List<LandListData>();
public Dictionary<int, LandListData> landListDictionary = new Dictionary<int, LandListData>();
/// <summary>
/// 在第一个可用的地块上种植蔬菜
......@@ -23,7 +23,7 @@ public class FastPlanting : SingletonMono<FastPlanting>
// 是否可以种植
bool ifCanPlanting = false;
foreach (var item in landListDatas)
foreach (var item in landListDictionary.Values)
{
if (item.status == 1)
{
......@@ -63,4 +63,21 @@ public class FastPlanting : SingletonMono<FastPlanting>
}
}
}
/// <summary>
/// 判断是否可以种植
/// </summary>
/// <returns></returns>
public bool CheckIfCanPlanting()
{
foreach (var item in landListDictionary.Values)
{
if (item.status == 1)
{
return true;
}
}
return false;
}
}
Packages/packages-lock.json
View file @ 7829df1d
......@@ -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