Commit d23a7d16 authored by maxiaoliang's avatar maxiaoliang

添加强引导步骤

parent 9ac6d104
......@@ -382,8 +382,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 788e2a3a769e26b459cd63d4a5de7d76, type: 3}
m_Name:
m_EditorClassIdentifier:
isTest: 0
isShowLog: 0
isTest: 1
isShowLog: 1
XyDialog: {fileID: 0}
--- !u!1 &2010092450
GameObject:
......
fileFormatVersion: 2
guid: 7c53fe4f34738464283aa48e141e2c02
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:
fileFormatVersion: 2
guid: 7d75814f2ba494fc9854e741e9ad3688
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:
fileFormatVersion: 2
guid: a4c6ea3274b264d77b3b0a31e66c42f5
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:
fileFormatVersion: 2
guid: b36a06f22c6d3409ba586fd11bb64466
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:
This diff is collapsed.
......@@ -37,7 +37,47 @@ public class CarPresenter : CarContract.Presenter
AudioUtils.ins.PlaySpeedAudio();
mView.clockTime(PlayerDataControl.Instance.acceleratorReduceMinute);
EventCenter.Broadcast<int>(MyEventType.ShowSpeedAnimal,bean.landId);
if (PlayerPrefs.GetInt("step3Key", 0) == 0)
{
//引导加速白菜
if (PlayerDataControl.Instance.IsNewUser)
{
GameObject toastObj = GameObject.Instantiate(Resources.Load<GameObject>("Toast"));
toastObj.GetComponent<ToastUtils>().ShowToastUI("加速成功,蔬菜已经成熟");
}
}
else if (PlayerPrefs.GetInt("speednanguaKey", 0) == 0 && PlayerPrefs.GetInt("step3Key", 0) == 1)
{
//引导加速西红柿
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt("speednanguaKey", 1);
Guide.guide.clickSpeedXihongshi();
}
}
else if(PlayerPrefs.GetInt("shouhuoKey", 0) == 0&& PlayerPrefs.GetInt("speednanguaKey", 0) == 1)
{
//引导加速南瓜
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt("shouhuoKey", 1);
Guide.guide.clickSpeedNangua();
}
}
Guide.guide.onClickStep2();
//if (PlayerPrefs.GetInt("speedxihongshiKey", 0) == 0)
//{
// if (PlayerDataControl.Instance.IsNewUser)
// {
// PlayerPrefs.SetInt("speedxihongshiKey", 1);
// Guide.guide.clickSpeedXihongshi();
// }
//}
//加速西红柿
mView.CarInfo(bean);
EventCenter.Broadcast(MyEventType.RefreshHomeInfo);
isLoadingSped = false;
......@@ -93,8 +133,15 @@ public class CarPresenter : CarContract.Presenter
parm.Add("landId", landId);
HttpTool.Instance._Post("app/v1/wdlc/seed", parm, new Action<LandListData>((bean) =>
{
if (PlayerPrefs.GetInt("step2Key", 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
GameObject toastObj = GameObject.Instantiate(Resources.Load<GameObject>("Toast"));
toastObj.GetComponent<ToastUtils>().ShowToastUI("白菜种植成功啦");
}
}
Guide.guide.onClickStep1();
// Guide.guide.showStep7();
mView.CarInfo(bean);
......@@ -147,7 +194,47 @@ public class CarPresenter : CarContract.Presenter
#else
// mView.showFlyFruit();
#endif
if (PlayerPrefs.GetInt("step3Key", 0) == 0)
{
GameObject toastObj = GameObject.Instantiate(Resources.Load<GameObject>("Toast"));
toastObj.GetComponent<ToastUtils>().ShowToastUI("恭喜获得"+ bean.harvestPlantPrice+"元红包");
}
if (PlayerPrefs.GetInt("plantxihongshiKey", 0) == 0)
{
//引导收获白菜
UnityEngine.Debug.Log("引导收获白菜");
if (PlayerDataControl.Instance.IsNewUser)
{
Guide.guide.onClickStep3();
}
}else if(PlayerPrefs.GetInt("shouhuoxiongshiKey", 0) == 0&& PlayerPrefs.GetInt("plantxihongshiKey", 0) == 1)
{
//引导收获西红柿
if (PlayerDataControl.Instance.IsNewUser)
{
UnityEngine.Debug.Log("引导收获西红柿");
PlayerPrefs.SetInt("shouhuoxiongshiKey", 1);
Guide.guide.clickkShouhuoXihongshi();
GameObject.Instantiate(Resources.Load<GameObject>("Toast")).GetComponent<ToastUtils>().ShowToastUI("恭喜获得" + bean.harvestPlantPrice + "元红包");
}
}
else if (PlayerPrefs.GetInt("shouhuonanguaKey", 0) == 0 && PlayerPrefs.GetInt("shouhuoxiongshiKey", 0) == 1)
{
//引导收获南瓜
if (PlayerDataControl.Instance.IsNewUser)
{
UnityEngine.Debug.Log("引导收获南瓜");
PlayerPrefs.SetInt("shouhuonanguaKey", 1);
Guide.guide.clickkShouhuoNangua();
GameObject toastObj = GameObject.Instantiate(Resources.Load<GameObject>("Toast"));
toastObj.GetComponent<ToastUtils>().ShowToastUI("恭喜获得" + bean.harvestPlantPrice + "元红包");
}
}
//EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
if (PlayerPrefs.GetInt("finishedStrongGuide") != 1)
{
......
......@@ -28,7 +28,18 @@ public class Guide : MonoBehaviour
private string step9Key = "step9Key";
private string step10Key = "step10Key";
private string step11Key = "step11Key";
private string plantxihongshiKey = "plantxihongshiKey";
private string plantnanguaKey = "plantnanguaKey";
private string speedxihongshiKey = "speedxihongshiKey";
private string speednanguaKey = "speednanguaKey";
private string shouhuoxiongshiKey = "shouhuoxiongshiKey";
private string shouhuonanguaKey = "shouhuonanguaKey";
private string tixianyindaoKey = "tixianyindaoKey";//提现引导
private string closeyindaoKey = "closeyindaoKey";//关闭引导
private string plantbaicaiKey = "plantbaicaiKey";//种植白菜
// private string step6Key = "step6Key";
public GameObject plantxihongshi, plantnangua, oneParent,car1,car2, twoParent,mengceng;
public GameObject tixianyindao,closeyindao,plantbaicai;
/// <summary>
/// 所有引导
......@@ -88,7 +99,7 @@ public class Guide : MonoBehaviour
public void showGuide(bool isUser)
{
//isUser = true;
isUser = true;
if (isStartShow)
{
return;
......@@ -129,6 +140,7 @@ public class Guide : MonoBehaviour
{
carListNum++;
Debug.Log("点击第一步");
EventUtils.OnEvent("xsyd01_zzbc_click");
DissmissGuide(false);
if(PlayerPrefs.GetInt(step2Key, 0) == 0)
{
......@@ -144,6 +156,7 @@ public class Guide : MonoBehaviour
public void onClickStep2()
{
Debug.Log("点击第2步");
EventUtils.OnEvent("xsyd02_jsbc_click");
DissmissGuide(false);
if (PlayerPrefs.GetInt(step3Key, 0) == 0)
{
......@@ -159,39 +172,113 @@ public class Guide : MonoBehaviour
public void onClickStep3()
{
carListNum--;
Debug.Log("点击第3步");
Debug.Log("收获白菜");
DissmissGuide(false);
EventUtils.OnEvent("xsyd03_shbc_click");
// flyBox.SetActive(true);
//新版本去掉第四和第五步
if (PlayerPrefs.GetInt(step4Key, 0) == 0)
//1.0.11修改新手引导逻辑
if(PlayerPrefs.GetInt(plantxihongshiKey, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(step4Key, 1);
step4.SetActive(true);
plantHand.SetActive(false);
PlayerPrefs.SetInt(plantxihongshiKey, 1);
plantxihongshi.SetActive(true);
}
}
//新版本去掉第四和第五步
//if (PlayerPrefs.GetInt(step4Key, 0) == 0)
//{
// if (PlayerDataControl.Instance.IsNewUser)
// {
// PlayerPrefs.SetInt(step4Key, 1);
// Car4Obj.transform.parent = Car4Bottom.transform;
// ObjStep4.SetActive(true);
// hand_4.SetActive(true);
// step4.SetActive(true);
// plantHand.SetActive(false);
// }
//}
}
public void onClickPlantXihongshi()
{
Debug.Log("点击种植番茄");
EventUtils.OnEvent("xsyd04_zzxhs_click");
DissmissGuide(false);
if (PlayerPrefs.GetInt(plantnanguaKey, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(plantnanguaKey, 1);
plantnangua.SetActive(true);
FastPlanting.Instance().Planting(2);
}
}
}
public void clickPlantNangua()
{
Debug.Log("点击种植南瓜");
EventUtils.OnEvent("xsyd05_zzng_click");
DissmissGuide(false);
FastPlanting.Instance().Planting(3);
if (PlayerPrefs.GetInt(speedxihongshiKey, 0) == 0)
{
PlayerPrefs.SetInt(speedxihongshiKey, 1);
mengceng.SetActive(true);
}
}
public void clickSpeedXihongshi()
{
Debug.Log("点击加速西红柿");
EventUtils.OnEvent("xsyd06_jsxhs_click");
car1.transform.parent = twoParent.transform;
car2.transform.parent = oneParent.transform;
}
public void clickSpeedNangua()
{
Debug.Log("点击加速南瓜");
EventUtils.OnEvent("xsyd07_jsng_click");
car1.transform.parent = oneParent.transform;
car2.transform.parent = twoParent.transform;
}
public void clickkShouhuoXihongshi()
{
Debug.Log("收获西红柿");
EventUtils.OnEvent("xsyd08_shxhs_click");
car1.transform.parent = twoParent.transform;
car2.transform.parent = oneParent.transform;
}
public void clickkShouhuoNangua()
{
Debug.Log("收获南瓜");
EventUtils.OnEvent("xsyd09_shng_click");
car1.transform.parent = oneParent.transform;
car2.transform.parent = twoParent.transform;
mengceng.SetActive(false);
if (PlayerPrefs.GetInt(step4Key, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(step4Key, 1);
step4.SetActive(true);
plantHand.SetActive(false);
}
}
}
public void onClickStep4()
{
Debug.Log("点击第4步");
DissmissGuide(false);
PlayerDataControl.Instance.IsNewUser = false;
Invoke("showFlyBox", 60);
EventUtils.OnEvent("xsyd10_qdh_click");
//PlayerDataControl.Instance.IsNewUser = false;
//Invoke("showFlyBox", 60);
LeeMainController.Instance.UpdateTitleBG2Info();
if (PlayerPrefs.GetInt(tixianyindaoKey, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(tixianyindaoKey, 1);
tixianyindao.SetActive(true);
}
}
PlayerPrefs.SetInt("finishedStrongGuide", 1);
//Car4Obj.transform.parent = Car4Parent.transform;
......@@ -211,7 +298,48 @@ public class Guide : MonoBehaviour
//IsNewUser = false;
//PlayerDataControl.Instance.IsNewUser = false;
}
//引导提现点击
public void onClickTixian()
{
EventUtils.OnEvent("xsyd11_tx03_click");
DialogControl.Instance.NetWorkRequest<WithDrawDialogBean>(false, "app/v3/cscmnq/do_wd", new Dictionary<string, object>() { { "wdId", 11 } }, (obj) =>
{
GameObject obj2 = Instantiate(Resources.Load<GameObject>("Toast"));
obj2.GetComponent<ToastUtils>().ShowToastUI(obj.reason);
});
DissmissGuide(false);
if (PlayerPrefs.GetInt(closeyindaoKey, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(closeyindaoKey, 1);
closeyindao.SetActive(true);
}
}
}
//关闭提现
public void onClickCloseTixian()
{
DissmissGuide(false);
EventUtils.OnEvent("xsyd12_close_click");
if (PlayerPrefs.GetInt(plantbaicaiKey, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(plantbaicaiKey, 1);
plantbaicai.SetActive(true);
}
}
}
//种植白菜
public void onclickPlantBaicai()
{
EventUtils.OnEvent("xsyd13_zzbc_click");
DissmissGuide(false);
FastPlanting.Instance().Planting(1);
PlayerDataControl.Instance.IsNewUser = false;
Invoke("showFlyBox", 60);
}
public void onClickStep5()
{
Debug.Log("点击第5步");
......@@ -358,6 +486,11 @@ public class Guide : MonoBehaviour
hand_3.SetActive(false);
hand_4.SetActive(false);
plantHand.SetActive(false);
plantxihongshi.SetActive(false);
plantnangua.SetActive(false);
tixianyindao.SetActive(false);
closeyindao.SetActive(false);
plantbaicai.SetActive(false);
//hand_5.SetActive(false);
//ObjStep6.SetActive(false);
//hand_6.SetActive(false);
......
......@@ -26,7 +26,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
{
#if UNITY_EDITOR
AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8");
Constant.Instance.shubiao = false;
Constant.Instance.shubiao = true;
#endif
mPresenter = new HomePresenter(this);
EventCenter.AddListener(MyEventType.UPDATE_CAR_LIST_DATA, OnUpdateCarListData);
......
......@@ -6,7 +6,7 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Game/Main/Scenes/InitScene.unity
path: Assets/Base/InitScene.unity
guid: 902436d14e36d4d42921eab701175b51
- enabled: 1
path: Assets/Game/Splash/Splash.unity
......
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