Skip to content

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

修改bug

parent 288709eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 562 additions and 413 deletions
Assets/Game/Main/Resource/Guide/白菜@2x.png.meta 0 → 100644
View file @ b92c4838
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:
Assets/Game/Main/Resource/LeeScripts/LeeMainController.cs
View file @ b92c4838
......@@ -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()
......
Assets/Game/Main/Resource/ui/WithdrawEveryDay.meta deleted 100644 → 0
View file @ 288709eb
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ b92c4838
This diff is collapsed.
Assets/Game/Main/Scripts/Item/PlantMakeMoneyItem.cs
View file @ b92c4838
......@@ -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);
......
Assets/Game/Main/Scripts/Presenter/CarPresenter.cs
View file @ b92c4838
......@@ -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);
}
......
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ b92c4838
......@@ -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()
//{
......
Assets/Scripts/StartControl.cs
View file @ b92c4838
......@@ -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
......
Packages/packages-lock.json
View file @ b92c4838
......@@ -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