Skip to content

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

Merge branch 'develop_mjb_cscmnq_1.0.6' of… 

Merge branch 'develop_mjb_cscmnq_1.0.6' of gitlab.huolea.com:wangxuewei/wdlc_mjb_unity into develop_mjb_cscmnq_1.0.6
parents f7a4171a 261610dc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 659 additions and 101 deletions
Assets/Game/Main/Resource/Guide/手.png
View replaced file @ f7a4171a View file @ 8cee60e3
Assets/Game/Main/Resource/Guide/手.png

6.85 KB | W: | H:

Assets/Game/Main/Resource/Guide/手.png

5.18 KB | W: | H:

Assets/Game/Main/Resource/Guide/手.png
Assets/Game/Main/Resource/Guide/手.png
Assets/Game/Main/Resource/Guide/手.png
Assets/Game/Main/Resource/Guide/手.png
  • 2-up
  • Swipe
  • Onion skin
Assets/Game/Main/Resource/ui/top/0.3元1.png.meta → Assets/Game/Main/Resource/Guide/手指 拷贝.png.meta
View file @ 8cee60e3
fileFormatVersion: 2
guid: f364fb4943be14474aa28348e03d64f9
guid: ff8fe5f5113094fbbb0ef45fa9265048
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
Assets/Game/Main/Resource/ui/top/0.3元1-2.png.meta 0 → 100644
View file @ 8cee60e3
fileFormatVersion: 2
guid: c25ebcf8b870f495a9eb7034649ad372
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/Scenes/CrazyCar.unity
View file @ 8cee60e3
This diff is collapsed.
Assets/Game/Main/Scripts/Item/ExchangeItem.cs
View file @ 8cee60e3
......@@ -27,17 +27,12 @@ public class ExchangeItem : MonoBehaviour
public void clickDuihuan()
{
Debug.Log(""+ bean.id);
Dictionary<string, object> parm = new Dictionary<string, object>();
parm.Clear();
parm.Add("id", bean.id);
HttpTool.Instance._Post("app/v1/game/module/exchange/choose", parm, new Action<GoodsBean>((bean) =>
if (bean.status==0)
{
// setItemData(bean);
FindObjectOfType<DialogControl>().ShowRealAwardsWinDialog().SetUpSubviews(bean.goods.img,bean.goods.name,bean.no);
}), new Action<string, string>((code, errMsg) =>
{
}));
ToastPlugin.ToastHelper.ShowToast("余额不足");
return;
}
FindObjectOfType<DialogControl>().ShowRealAwardsWinDialog().SetUpSubviews(bean.img, bean.name, bean.id+"");
}
}
Assets/Game/Main/Scripts/Item/PlantTreeItem.cs
View file @ 8cee60e3
......@@ -128,7 +128,7 @@ public class PlantTreeItem : MonoBehaviour
//EventCenter.Broadcast(MyEventType.WITHDRAW_DIALOG, bean);
// 0.3元提现后, 直接弹出实物奖励页面
if (mData.id == 1&&mData.status==1)
if (mData.id == 1&&bean.status==1)
{
FindObjectOfType<DialogControl>().closePlantTreeWithDrawDialog();
......@@ -176,4 +176,5 @@ public class PlantTreeItem : MonoBehaviour
}
}
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ 8cee60e3
......@@ -8,7 +8,8 @@ public class Guide : MonoBehaviour
public GameObject Car4Parent,Car4Bottom;
public GameObject Car4Obj;
public GameObject flyBox;
public GameObject step4, step5;
public GameObject step4;
public GameObject Step5, Step6, Step7, Step8, Step9, Step10,Step11;
private int carListNum;
public static Guide guide;
private bool isStartShow = false;
......@@ -20,7 +21,13 @@ public class Guide : MonoBehaviour
private string step3Key = "step3Key";
private string step4Key = "step4Key";
private string step5Key = "step5Key";
// private string step6Key = "step6Key";
private string step6Key = "step6Key";
private string step7Key = "step7Key";
private string step8Key = "step8Key";
private string step9Key = "step9Key";
private string step10Key = "step10Key";
private string step11Key = "step11Key";
// private string step6Key = "step6Key";
private void Awake()
......@@ -28,7 +35,7 @@ public class Guide : MonoBehaviour
guide = this;
isStartShow = false;
fitFrame();
//fitFrame();
}
// 判断是否是刘海屏
......@@ -126,18 +133,18 @@ public class Guide : MonoBehaviour
carListNum--;
Debug.Log("点击第3步");
DissmissGuide(false);
flyBox.SetActive(true);
PlayerDataControl.Instance.IsNewUser = false;
// flyBox.SetActive(true);
//新版本去掉第四和第五步
//if (PlayerPrefs.GetInt(step4Key, 0) == 0)
//{
// if (PlayerDataControl.Instance.IsNewUser)
// {
// PlayerPrefs.SetInt(step4Key, 1);
// step4.SetActive(true);
// plantHand.SetActive(false);
// }
//}
if (PlayerPrefs.GetInt(step4Key, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
PlayerPrefs.SetInt(step4Key, 1);
step4.SetActive(true);
plantHand.SetActive(false);
}
}
//if (PlayerPrefs.GetInt(step4Key, 0) == 0)
//{
// if (PlayerDataControl.Instance.IsNewUser)
......@@ -153,20 +160,17 @@ public class Guide : MonoBehaviour
{
Debug.Log("点击第4步");
DissmissGuide(false);
PlayerDataControl.Instance.IsNewUser = false;
flyBox.SetActive(true);
//Car4Obj.transform.parent = Car4Parent.transform;
if (PlayerPrefs.GetInt(step5Key, 0) == 0)
{
if (PlayerDataControl.Instance.IsNewUser)
{
{
PlayerPrefs.SetInt(step5Key, 1);
Debug.Log("显示第5步");
step5.SetActive(true);
// ObjStep5.SetActive(true);
// hand_5.SetActive(true);
}
Step5.SetActive(true);
}
// step5.SetActive(true);
flyBox.SetActive(true);
// step5.SetActive(true);
//if (PlayerDataControl.Instance.IsNewUser)
//{
// ObjStep6.SetActive(true);
......@@ -180,7 +184,13 @@ public class Guide : MonoBehaviour
{
Debug.Log("点击第5步");
DissmissGuide(false);
EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
if (PlayerPrefs.GetInt(step6Key, 0) == 0)
{
PlayerPrefs.SetInt(step6Key, 1);
Debug.Log("显示第6步");
Step6.SetActive(true);
}
//EventUtils.OnEvent("newUser_cashOut", "当日新用户完成引导提现");
//ObjStep5.SetActive(false);
//hand_5.SetActive(false);
//if (PlayerPrefs.GetInt(step6Key, 0) == 0)
......@@ -193,10 +203,19 @@ public class Guide : MonoBehaviour
// }
//}
IsNewUser = false;
PlayerDataControl.Instance.IsNewUser = false;
//IsNewUser = false;
//PlayerDataControl.Instance.IsNewUser = false;
}
public void onClickStep6()
{
DissmissGuide(false);
if (PlayerPrefs.GetInt(step7Key, 0) == 0)
{
PlayerPrefs.SetInt(step7Key, 1);
Debug.Log("显示第7步");
Step7.SetActive(true);
}
}
//public void onClickStep6()
//{
// Debug.Log("点击第6步");
......@@ -247,7 +266,14 @@ public class Guide : MonoBehaviour
ObjStep3.SetActive(false);
//ObjStep4.SetActive(false);
step4.SetActive(false);
step5.SetActive(false);
// step5.SetActive(false);
Step5.SetActive(false);
Step6.SetActive(false);
Step7.SetActive(false);
Step8.SetActive(false);
Step9.SetActive(false);
Step10.SetActive(false);
Step11.SetActive(false);
//ObjStep5.SetActive(false);
hand_1.SetActive(false);
hand_2.SetActive(false);
......
Assets/Game/Main/Scripts/dialog/PlantTreeControl.cs
View file @ 8cee60e3
......@@ -159,4 +159,21 @@ public class PlantTreeControl : MonoBehaviour
getRecordLog();
// index = 3;
}
//完成填写信息后
public void FinishWriteInfo(int id, Action<string> action)
{
Dictionary<string, object> parm = new Dictionary<string, object>();
parm.Clear();
parm.Add("id", id);
HttpTool.Instance._Post("app/v1/game/module/exchange/choose", parm, new Action<GoodsBean>((bean) =>
{
// setItemData(bean);
action(bean.no);
}), new Action<string, string>((code, errMsg) =>
{
}));
}
}
Packages/packages-lock.json
View file @ 8cee60e3
......@@ -19,7 +19,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.analytics": {
"version": "3.3.5",
......@@ -28,21 +28,21 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.collab-proxy": {
"version": "1.2.16",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ide.rider": {
"version": "1.1.4",
......@@ -51,14 +51,14 @@
"dependencies": {
"com.unity.test-framework": "1.1.1"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.multiplayer-hlapi": {
"version": "1.0.8",
......@@ -67,7 +67,7 @@
"dependencies": {
"nuget.mono-cecil": "0.1.6-preview"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.purchasing": {
"version": "2.2.1",
......@@ -76,7 +76,7 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"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.com"
"url": "https://packages.unity.cn"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
......@@ -96,14 +96,14 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"com.unity.timeline": {
"version": "1.2.17",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"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.com"
"url": "https://packages.unity.cn"
},
"nuget.mono-cecil": {
"version": "0.1.6-preview",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"url": "https://packages.unity.cn"
},
"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