Commit b92c4838 authored by zhangzhe's avatar zhangzhe

修改bug

parent 288709eb
fileFormatVersion: 2
guid: 7b3e8ec87e29145e8af830a0176a5970
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -9,6 +9,11 @@ public class LeeMainController : MonoBehaviour
public static LeeMainController Instance;
public Transform TitleBG2;
/// <summary>
/// 首页顶部任务奖励金额(埋点用)
/// </summary>
private string homeTaskPrice;
public Transform ZhongCaiTiXian;
private void Awake()
......@@ -32,6 +37,26 @@ public class LeeMainController : MonoBehaviour
DidSelectedBtnRedBag();
});
TitleBG2.Find("btnRedBag/txtMoney").GetComponent<Text>().text = model.yuan.ToString()+"元";
if (model.yuan == 0.3)
{
homeTaskPrice = "03";
}
else if (model.yuan == 0.4)
{
homeTaskPrice = "04";
}
else if (model.yuan == 0.5)
{
homeTaskPrice = "05";
}
else if (model.yuan == 1)
{
homeTaskPrice = "1";
}
else if (model.yuan == 5)
{
homeTaskPrice = "5";
}
int handIndex = -1; // 第几个条件未达成
......@@ -124,44 +149,60 @@ public class LeeMainController : MonoBehaviour
ZhongCaiTiXian.gameObject.SetActive(false);
UpdateTitleBG2Info();
Guide.guide.onClickCloseTixian();
}
private void DidSelectedToPlanting(int plantId)
{
FastPlanting.Instance().Planting(plantId);
string plantString = "";
switch (plantId)
{
case 1: // 白菜
EventUtils.OnEvent("zz_bc_click");
plantString = "bc";
break;
case 2: // 西红柿
EventUtils.OnEvent("zz_xhs_click");
plantString = "xhs";
break;
case 3: // 南瓜
EventUtils.OnEvent("zz_ng_click");
plantString = "ng";
break;
case 4: // 萝卜
EventUtils.OnEvent("zz_lb_click");
plantString = "lb";
break;
case 5: // 玉米
EventUtils.OnEvent("zz_ym_click");
plantString = "ym";
break;
case 6: // 茄子
EventUtils.OnEvent("zz_qz_click");
plantString = "qz";
break;
case 7: // 西瓜
EventUtils.OnEvent("zz_xg_click");
plantString = "xg";
break;
case 8: // 葡萄
EventUtils.OnEvent("zz_pt_click");
plantString = "pt";
break;
case 9: // 草莓
EventUtils.OnEvent("zz_cm_click");
plantString = "cm";
break;
default:
break;
}
EventUtils.OnEvent("rw" + homeTaskPrice + "_" + plantString + "_kjzz");
Debug.Log("快捷种植埋点: " + "rw" + homeTaskPrice + "_" + plantString + "_kjzz");
}
public void DidSelectedBtnRedBag()
......
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -4564,100 +4564,6 @@ RectTransform:
m_AnchoredPosition: {x: 434.1, y: -50.8}
m_SizeDelta: {x: 105, y: 93}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &154575108
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 154575109}
- component: {fileID: 154575111}
- component: {fileID: 154575110}
- component: {fileID: 154575112}
m_Layer: 5
m_Name: hand7
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &154575109
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154575108}
m_LocalRotation: {x: -0, y: -0, z: 0.5314281, w: 0.84710336}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 592572115}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 64.204}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 104, y: -492}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &154575110
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154575108}
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: b21fc9e114e59c34eb5afe1ef0984505, 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 &154575111
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154575108}
m_CullTransparentMesh: 0
--- !u!95 &154575112
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 154575108}
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!1 &158002088
GameObject:
m_ObjectHideFlags: 0
......@@ -19005,7 +18911,6 @@ RectTransform:
- {fileID: 309528193}
- {fileID: 646408898}
- {fileID: 1204027506}
- {fileID: 1575014089}
m_Father: {fileID: 0}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -19828,6 +19733,100 @@ MonoBehaviour:
scrollview1: {fileID: 2086848421}
scrollview2: {fileID: 797785698}
CashOut: {fileID: 1282799106}
--- !u!1 &589399965
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 589399966}
- component: {fileID: 589399969}
- component: {fileID: 589399968}
- component: {fileID: 589399967}
m_Layer: 5
m_Name: hand4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &589399966
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589399965}
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: 592572115}
m_RootOrder: 17
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: -22, y: -259}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &589399967
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589399965}
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 &589399968
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589399965}
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 &589399969
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589399965}
m_CullTransparentMesh: 0
--- !u!1 &590829642
GameObject:
m_ObjectHideFlags: 0
......@@ -19950,9 +19949,10 @@ RectTransform:
- {fileID: 1699807653}
- {fileID: 382383542}
- {fileID: 455875924}
- {fileID: 1758539460}
- {fileID: 1359973898}
- {fileID: 154575109}
- {fileID: 589399966}
- {fileID: 1117266856}
- {fileID: 1670978395}
- {fileID: 1851720249}
m_Father: {fileID: 634203768}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -26300,7 +26300,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b36a06f22c6d3409ba586fd11bb64466, type: 3}
m_Sprite: {fileID: 21300000, guid: 7b3e8ec87e29145e8af830a0176a5970, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -35647,6 +35647,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114893819}
m_CullTransparentMesh: 0
--- !u!1 &1117266855
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1117266856}
- component: {fileID: 1117266859}
- component: {fileID: 1117266858}
- component: {fileID: 1117266857}
m_Layer: 5
m_Name: hand5
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1117266856
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117266855}
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: 592572115}
m_RootOrder: 18
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: 236, y: -150}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1117266857
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117266855}
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 &1117266858
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117266855}
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 &1117266859
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117266855}
m_CullTransparentMesh: 0
--- !u!1 &1119774001
GameObject:
m_ObjectHideFlags: 0
......@@ -43542,100 +43636,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1357218283}
m_CullTransparentMesh: 0
--- !u!1 &1359973897
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1359973898}
- component: {fileID: 1359973900}
- component: {fileID: 1359973899}
- component: {fileID: 1359973901}
m_Layer: 5
m_Name: hand5
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1359973898
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359973897}
m_LocalRotation: {x: -0, y: -0, z: 0.5314281, w: 0.84710336}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 592572115}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 64.204}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -91, y: -516}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1359973899
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359973897}
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: b21fc9e114e59c34eb5afe1ef0984505, 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 &1359973900
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359973897}
m_CullTransparentMesh: 0
--- !u!95 &1359973901
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1359973897}
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!1 &1360427703
GameObject:
m_ObjectHideFlags: 0
......@@ -50392,100 +50392,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1564616015}
m_CullTransparentMesh: 0
--- !u!1 &1575014088
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1575014089}
- component: {fileID: 1575014091}
- component: {fileID: 1575014090}
- component: {fileID: 1575014092}
m_Layer: 5
m_Name: hand6
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1575014089
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1575014088}
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: 557124198}
m_RootOrder: 9
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: 248, y: 490}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1575014090
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1575014088}
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: b21fc9e114e59c34eb5afe1ef0984505, 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 &1575014091
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1575014088}
m_CullTransparentMesh: 0
--- !u!95 &1575014092
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1575014088}
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!1 &1584344294
GameObject:
m_ObjectHideFlags: 0
......@@ -54251,6 +54157,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670539657}
m_CullTransparentMesh: 0
--- !u!1 &1670978394
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1670978395}
- component: {fileID: 1670978398}
- component: {fileID: 1670978397}
- component: {fileID: 1670978396}
m_Layer: 5
m_Name: hand6
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1670978395
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670978394}
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: 592572115}
m_RootOrder: 19
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: -22, y: -259}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1670978396
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670978394}
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 &1670978397
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670978394}
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 &1670978398
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670978394}
m_CullTransparentMesh: 0
--- !u!1 &1676435280
GameObject:
m_ObjectHideFlags: 0
......@@ -57237,100 +57237,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1757584578}
m_CullTransparentMesh: 0
--- !u!1 &1758539459
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1758539460}
- component: {fileID: 1758539462}
- component: {fileID: 1758539461}
- component: {fileID: 1758539463}
m_Layer: 5
m_Name: hand4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1758539460
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1758539459}
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: 592572115}
m_RootOrder: 17
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: -90, y: -280}
m_SizeDelta: {x: 154, y: 138}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1758539461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1758539459}
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 &1758539462
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1758539459}
m_CullTransparentMesh: 0
--- !u!95 &1758539463
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1758539459}
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!1 &1759005313
GameObject:
m_ObjectHideFlags: 0
......@@ -60114,6 +60020,100 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1850815697}
m_CullTransparentMesh: 0
--- !u!1 &1851720248
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1851720249}
- component: {fileID: 1851720252}
- component: {fileID: 1851720251}
- component: {fileID: 1851720250}
m_Layer: 5
m_Name: hand7
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1851720249
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1851720248}
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: 592572115}
m_RootOrder: 20
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: 236, y: -150}
m_SizeDelta: {x: 77.6, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1851720250
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1851720248}
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 &1851720251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1851720248}
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 &1851720252
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1851720248}
m_CullTransparentMesh: 0
--- !u!1 &1853878467
GameObject:
m_ObjectHideFlags: 0
......@@ -64317,10 +64317,10 @@ MonoBehaviour:
hand_1: {fileID: 1699807652}
hand_2: {fileID: 382383541}
hand_3: {fileID: 455875923}
hand_4: {fileID: 1758539459}
hand_5: {fileID: 1359973897}
hand_6: {fileID: 1575014088}
hand_7: {fileID: 154575108}
hand_4: {fileID: 589399965}
hand_5: {fileID: 1117266855}
hand_6: {fileID: 1670978394}
hand_7: {fileID: 1851720248}
plantHand: {fileID: 1521926631}
Car4Parent: {fileID: 377542755}
Car4Bottom: {fileID: 46128299}
......@@ -43,6 +43,11 @@ public class PlantMakeMoneyItem : MonoBehaviour
toastObj.GetComponent<ToastUtils>().ShowToastUI("请根据引导种植");
return;
}
else
{
GameObject toastObj = Instantiate(Resources.Load<GameObject>("Toast"));
toastObj.GetComponent<ToastUtils>().ShowToastUI("白菜种植成功啦");
}
}
Debug.Log("点击的Id" + item.id+item.name);
EventCenter.Broadcast(MyEventType.CloseMakeMoney);
......
......@@ -201,6 +201,8 @@ public class CarPresenter : CarContract.Presenter
}
if (PlayerPrefs.GetInt("plantxihongshiKey", 0) == 0)
{
GameObject toastObj = GameObject.Instantiate(Resources.Load<GameObject>("Toast"));
toastObj.GetComponent<ToastUtils>().ShowToastUI("恭喜获得" + bean.harvestPlantPrice + "元红包");
//引导收获白菜
UnityEngine.Debug.Log("引导收获白菜");
if (PlayerDataControl.Instance.IsNewUser)
......@@ -236,7 +238,7 @@ public class CarPresenter : CarContract.Presenter
}
//EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
if (PlayerPrefs.GetInt("finishedStrongGuide") != 1)
if (Guide.guide.IfHaveGuide())
{
EventCenter.Broadcast(MyEventType.FlyRedPack, landId);
}
......
......@@ -67,7 +67,15 @@ public class Guide : MonoBehaviour
guideList.Add(hand_2);
guideList.Add(hand_3);
guideList.Add(hand_4);
guideList.Add(hand_5);
guideList.Add(hand_6);
guideList.Add(hand_7);
guideList.Add(plantHand);
guideList.Add(plantxihongshi);
guideList.Add(plantnangua);
guideList.Add(tixianyindao);
guideList.Add(closeyindao);
guideList.Add(plantbaicai);
#if UNITY_IOS
fitFrame();
......@@ -209,6 +217,7 @@ public class Guide : MonoBehaviour
PlayerPrefs.SetInt(plantnanguaKey, 1);
plantnangua.SetActive(true);
FastPlanting.Instance().Planting(2);
EventUtils.OnEvent("rw03_xhs_kjzz");
}
}
}
......@@ -218,10 +227,12 @@ public class Guide : MonoBehaviour
EventUtils.OnEvent("xsyd05_zzng_click");
DissmissGuide(false);
FastPlanting.Instance().Planting(3);
EventUtils.OnEvent("rw03_ng_kjzz");
if (PlayerPrefs.GetInt(speedxihongshiKey, 0) == 0)
{
PlayerPrefs.SetInt(speedxihongshiKey, 1);
mengceng.SetActive(true);
hand_4.SetActive(true);
}
}
......@@ -231,6 +242,8 @@ public class Guide : MonoBehaviour
EventUtils.OnEvent("xsyd06_jsxhs_click");
car1.transform.parent = twoParent.transform;
car2.transform.parent = oneParent.transform;
hand_4.SetActive(false);
hand_5.SetActive(true);
}
public void clickSpeedNangua()
{
......@@ -238,6 +251,8 @@ public class Guide : MonoBehaviour
EventUtils.OnEvent("xsyd07_jsng_click");
car1.transform.parent = oneParent.transform;
car2.transform.parent = twoParent.transform;
hand_5.SetActive(false);
hand_6.SetActive(true);
}
public void clickkShouhuoXihongshi()
{
......@@ -245,6 +260,8 @@ public class Guide : MonoBehaviour
EventUtils.OnEvent("xsyd08_shxhs_click");
car1.transform.parent = twoParent.transform;
car2.transform.parent = oneParent.transform;
hand_6.SetActive(false);
hand_7.SetActive(true);
}
public void clickkShouhuoNangua()
{
......@@ -253,6 +270,7 @@ public class Guide : MonoBehaviour
car1.transform.parent = oneParent.transform;
car2.transform.parent = twoParent.transform;
mengceng.SetActive(false);
hand_7.SetActive(false);
if (PlayerPrefs.GetInt(step4Key, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
......@@ -270,7 +288,7 @@ public class Guide : MonoBehaviour
EventUtils.OnEvent("xsyd10_qdh_click");
//PlayerDataControl.Instance.IsNewUser = false;
//Invoke("showFlyBox", 60);
LeeMainController.Instance.UpdateTitleBG2Info();
//LeeMainController.Instance.UpdateTitleBG2Info();
if (PlayerPrefs.GetInt(tixianyindaoKey, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
......@@ -279,7 +297,6 @@ public class Guide : MonoBehaviour
tixianyindao.SetActive(true);
}
}
PlayerPrefs.SetInt("finishedStrongGuide", 1);
//Car4Obj.transform.parent = Car4Parent.transform;
//if (PlayerPrefs.GetInt(step5Key, 0) == 0)
......@@ -337,8 +354,10 @@ public class Guide : MonoBehaviour
EventUtils.OnEvent("xsyd13_zzbc_click");
DissmissGuide(false);
FastPlanting.Instance().Planting(1);
EventUtils.OnEvent("rw03_bc_kjzz");
PlayerDataControl.Instance.IsNewUser = false;
Invoke("showFlyBox", 60);
LeeMainController.Instance.UpdateTitleBG2Info();
}
public void onClickStep5()
{
......@@ -419,8 +438,6 @@ public class Guide : MonoBehaviour
public void onClickStep11()
{
DissmissGuide(false);
LeeMainController.Instance.UpdateTitleBG2Info();
}
//public void onClickStep6()
//{
......
......@@ -37,7 +37,7 @@ public class StartControl : MonoBehaviour
private void ShowPigBanDialog()
{
if (PlayerPrefs.GetInt("finishedStrongGuide") == 1)
if (!Guide.guide.IfHaveGuide())
{
DialogControl.Instance.showPigBankDialog();
}
......@@ -209,7 +209,7 @@ public class StartControl : MonoBehaviour
#if UNITY_ANDROID
if (!AdUtils.IsShowRewardAd)
{
DialogControl.Instance.showPigBankDialog();
ShowPigBanDialog();
}
#endif
......
......@@ -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