Skip to content

W
wdlc_mjb_unity
Commit ae894317 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改问题

parent 4725f237
Show whitespace changes
Inline Side-by-side
Showing with 163 additions and 45 deletions
Assets/Game/Main/Resource/ui/top/0.3元1.png.meta → Assets/Game/Main/Resource/ui/top/0.3元1-2.png.meta
View file @ ae894317
fileFormatVersion: 2
guid: f364fb4943be14474aa28348e03d64f9
guid: c25ebcf8b870f495a9eb7034649ad372
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ ae894317
......@@ -7911,7 +7911,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -90.8, y: 633}
m_AnchoredPosition: {x: -90.8, y: 611.7}
m_SizeDelta: {x: 101, y: 57}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &261466077
......@@ -13279,7 +13279,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -692}
m_AnchoredPosition: {x: 0, y: -670}
m_SizeDelta: {x: 750, y: 1334}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &415499554
......@@ -22478,7 +22478,7 @@ GameObject:
m_Component:
- component: {fileID: 699910950}
m_Layer: 5
m_Name: Step5 (1)
m_Name: Step6
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -55739,8 +55739,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -42.9, y: 562.9}
m_SizeDelta: {x: 196.78345, y: 197.28256}
m_AnchoredPosition: {x: -42.9, y: 547.4}
m_SizeDelta: {x: 196.79178, y: 198.7561}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1785447893
MonoBehaviour:
......@@ -59080,6 +59080,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885306645}
m_CullTransparentMesh: 0
--- !u!1 &1890460380
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1890460381}
- component: {fileID: 1890460383}
- component: {fileID: 1890460382}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1890460381
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890460380}
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: 1891798943}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1.38, y: 21.13}
m_SizeDelta: {x: 104.57158, y: 52.864067}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1890460382
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890460380}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.98039216, g: 0.019607844, b: 0.2, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 66d2f797a9d094b3598e5816d772b676, type: 3}
m_FontSize: 15
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "2000\u5143"
--- !u!222 &1890460383
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890460380}
m_CullTransparentMesh: 0
--- !u!1 &1891798942
GameObject:
m_ObjectHideFlags: 0
......@@ -59109,7 +59187,8 @@ RectTransform:
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_Children:
- {fileID: 1890460381}
m_Father: {fileID: 5414249952764383350}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -59191,7 +59270,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f364fb4943be14474aa28348e03d64f9, type: 3}
m_Sprite: {fileID: 21300000, guid: c25ebcf8b870f495a9eb7034649ad372, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -62403,13 +62482,13 @@ MonoBehaviour:
Car4Obj: {fileID: 1741054207}
flyBox: {fileID: 771430748}
step4: {fileID: 415499551}
step5: {fileID: 577554101}
Step5: {fileID: 0}
Step5: {fileID: 290488166}
Step6: {fileID: 0}
Step7: {fileID: 0}
Step8: {fileID: 0}
Step9: {fileID: 0}
Step10: {fileID: 0}
Step11: {fileID: 0}
--- !u!1 &2020284656
GameObject:
m_ObjectHideFlags: 0
......@@ -62855,7 +62934,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -28, y: 551}
m_AnchoredPosition: {x: -28, y: 525.3}
m_SizeDelta: {x: 154, y: 138}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &2035028204
Assets/Game/Main/Scripts/Item/PlantTreeItem.cs
View file @ ae894317
......@@ -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,20 @@ public class PlantTreeItem : MonoBehaviour
}
//完成填写信息后
public void FinishWriteInfo(int id)
{
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);
}), new Action<string, string>((code, errMsg) =>
{
}));
}
}
Assets/Game/Main/Scripts/Utils/Guide.cs
View file @ ae894317
......@@ -8,8 +8,8 @@ public class Guide : MonoBehaviour
public GameObject Car4Parent,Car4Bottom;
public GameObject Car4Obj;
public GameObject flyBox;
public GameObject step4, step5;
public GameObject Step5, Step6, Step7, Step8, Step9, Step10;
public GameObject step4;
public GameObject Step5, Step6, Step7, Step8, Step9, Step10,Step11;
private int carListNum;
public static Guide guide;
private bool isStartShow = false;
......@@ -21,6 +21,12 @@ public class Guide : MonoBehaviour
private string step3Key = "step3Key";
private string step4Key = "step4Key";
private string step5Key = "step5Key";
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";
......@@ -29,7 +35,7 @@ public class Guide : MonoBehaviour
guide = this;
isStartShow = false;
fitFrame();
//fitFrame();
}
// 判断是否是刘海屏
......@@ -157,17 +163,12 @@ public class Guide : MonoBehaviour
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);
// }
//}
if (PlayerPrefs.GetInt(step5Key, 0) == 0)
{
PlayerPrefs.SetInt(step5Key, 1);
Debug.Log("显示第5步");
Step5.SetActive(true);
}
// step5.SetActive(true);
//if (PlayerDataControl.Instance.IsNewUser)
......@@ -183,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)
......@@ -196,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步");
......@@ -250,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);
......
Packages/packages-lock.json
View file @ ae894317
......@@ -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