Skip to content

W
wdlc_mjb_unity
Commit 1453d971 authored by LiLiuZhou's avatar LiLiuZhou
Browse files
Options

1

parents d1bc7306 203a3088
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 31 deletions
Assets/Base/UnityTool/UnityPhoneUtils.cs
View file @ 1453d971
......@@ -178,12 +178,12 @@ public class UnityPhoneUtils
string vc = "";
#if UNITY_EDITOR
vc = "6";
vc = "8";
#elif UNITY_ANDROID
vc = GetPhoneUtil().Call<int>("getAppVersionCode", GetActivity())+"";
#elif UNITY_IOS
vc = "6";
vc = "8";
#endif
Debug.unityLogger.Log("GetVC " + vc);
return vc;
......
Assets/Game/Main/Scenes/CrazyCar.unity
View file @ 1453d971
......@@ -2545,7 +2545,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 782149801}
m_HandleRect: {fileID: 782149800}
m_Direction: 2
m_Value: 0
m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
......@@ -9660,7 +9660,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 355, y: -72.29167}
m_AnchoredPosition: {x: 355, y: -72.5}
m_SizeDelta: {x: 710, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &300181110
......@@ -16996,8 +16996,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1531958713}
m_HandleRect: {fileID: 1531958712}
m_Direction: 2
m_Value: 1.0000032
m_Size: 0.9349216
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -66885,7 +66885,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2052625161}
m_MethodName: getDiamondReward
m_MethodName: LookvideoGetDiamond
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
Assets/Game/Main/Scripts/Item/TaskItem.cs
View file @ 1453d971
......@@ -171,12 +171,19 @@ public class TaskItem : MonoBehaviour
GameObject.Find("Dialog").GetComponent<DialogControl>().showSignDialog();
}else if(item.appmodel_id == 67)//跳转收获奖励弹窗
{
GameObject.Find("HarvestReward").GetComponent<HarvestControl>().OnClickOpenHarvestInPanel();
GameObject.Find("HarvestReward").GetComponent<HarvestControl>().OnClickCloseHarvestInPanel();
}else if (item.appmodel_id == 68)
{
JumpUtils.Instance.JumpWithdrawalEveryDay();
}
else if (item.appmodel_id == 73) // 跳转到一盒草莓
{
GameObject.Find("Main").GetComponent<HomeInfoControl>().clickStrawberries();
}
else if (item.appmodel_id == 74) // 跳转到翻一翻
{
GameObject.Find("Main").GetComponent<HomeInfoControl>().DidSelectedShiwujiangli();
}
}
else if (item.opentype == 1)//
......@@ -203,7 +210,7 @@ public class TaskItem : MonoBehaviour
Dictionary<string, object> parm = new Dictionary<string, object>();
parm.Clear();
parm.Add("adId", item.sid);
HttpTool.Instance._Post("app/v1/wdlc/task/receive_diamond_task", parm, new Action<RewardData>((bean) =>
HttpTool.Instance._Post("app/v2/cscmnq/receive_diamond_task", parm, new Action<RewardData>((bean) =>
{
EventCenter.Broadcast(MyEventType.FlyDiamond);
EventCenter.Broadcast(MyEventType.UpdateTaskList);
......
Assets/Game/Main/Scripts/View/DialogControl.cs
View file @ 1453d971
......@@ -541,8 +541,12 @@ public class DialogControl : MonoBehaviour
EventUtils.OnEvent("addDiamond_click", "点击钻石加号");
HttpTool.Instance._Get("app/v2/cscmnq/diamond_by_video_status", null, new Action<DiamondStatusBean>((bean) =>
{
<<<<<<< HEAD
DiamondRewardNum = bean.rewardDiamondNum;
=======
DiamondplayNum = bean.playNum;
>>>>>>> 203a308827d9b9dae2a93e572f7d221941fe2445
if (DiamondplayNum > 0)
{
rdp.Show(bean.rewardDiamondNum);
......
Assets/Game/Main/Scripts/View/HarvestControl.cs
View file @ 1453d971
......@@ -54,7 +54,7 @@ public class HarvestControl : MonoBehaviour
private void getDiamandTaskList()
{
Debug.Log("获取任务列表");
HttpTool.Instance._Get("app/v1/wdlc/task/diamond_task_list", null, new Action<TaskDiamondBean>((bean) =>
HttpTool.Instance._Get("app/v2/cscmnq/diamond_task_list", null, new Action<TaskDiamondBean>((bean) =>
{
SetListInfo(bean);
}), new Action<string, string>((code, errMsg) =>
......
Assets/Game/Main/Scripts/View/TaskDiamandControl.cs
View file @ 1453d971
......@@ -42,7 +42,7 @@ public class TaskDiamandControl : MonoBehaviour
private void getTaskList()
{
Debug.Log("获取任务列表");
HttpTool.Instance._Get("app/v1/wdlc/task/diamond_task_list", null, new Action<TaskDiamondBean>((bean) =>
HttpTool.Instance._Get("app/v2/cscmnq/diamond_task_list", null, new Action<TaskDiamondBean>((bean) =>
{
SetTaskListInfo(bean);
}), new Action<string, string>((code, errMsg) =>
......
Assets/Game/Splash/Splash.unity
View file @ 1453d971
......@@ -1491,7 +1491,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: 3, y: -11}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 720, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1199571191
......@@ -1643,8 +1643,8 @@ RectTransform:
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: 0, y: 149.99988}
m_SizeDelta: {x: 0, y: 100}
m_AnchoredPosition: {x: 0, y: 130}
m_SizeDelta: {x: 720, y: 260}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1266608718
GameObject:
......
Assets/Scripts/Splash/Splash.cs
View file @ 1453d971
......@@ -90,7 +90,7 @@ public class Splash : MonoBehaviour
{
Constant.Instance.shubiao = false;
}
Constant.Instance.shubiao = true;
//Constant.Instance.shubiao = true;
novelInfo();
}), new Action<string, string>((code, errMsg) =>
{
......
Packages/packages-lock.json
View file @ 1453d971
......@@ -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",
......
ProjectSettings/ProjectSettings.asset
View file @ 1453d971
......@@ -124,7 +124,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 1.0.6
bundleVersion: 1.0.7
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
......@@ -172,7 +172,7 @@ PlayerSettings:
iPhone: com.ym.simulator
buildNumber:
iPhone: 6
AndroidBundleVersionCode: 7
AndroidBundleVersionCode: 8
AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
......
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