Skip to content

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

iOS修改

parent 291029ba
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 46 deletions
Assets/Game/Main/Resource/LeeScripts/LeeMainController.cs
View file @ ede13218
...@@ -56,6 +56,8 @@ public class LeeMainController : MonoBehaviour ...@@ -56,6 +56,8 @@ public class LeeMainController : MonoBehaviour
}); });
} }
if (Constant.Instance.shubiao)
{
// 刷新首页上面的手指显示 // 刷新首页上面的手指显示
GameObject.Find("TitleBG2").transform.parent.Find("hand1").gameObject.SetActive(false); GameObject.Find("TitleBG2").transform.parent.Find("hand1").gameObject.SetActive(false);
GameObject.Find("TitleBG2").transform.parent.Find("hand2").gameObject.SetActive(false); GameObject.Find("TitleBG2").transform.parent.Find("hand2").gameObject.SetActive(false);
...@@ -64,6 +66,7 @@ public class LeeMainController : MonoBehaviour ...@@ -64,6 +66,7 @@ public class LeeMainController : MonoBehaviour
{ {
GameObject.Find("TitleBG2").transform.parent.Find("hand" + (handIndex + 1)).gameObject.SetActive(FastPlanting.Instance().CheckIfCanPlanting() && !Guide.guide.IfHaveGuide()); GameObject.Find("TitleBG2").transform.parent.Find("hand" + (handIndex + 1)).gameObject.SetActive(FastPlanting.Instance().CheckIfCanPlanting() && !Guide.guide.IfHaveGuide());
} }
}
}); });
} }
......
Assets/Game/Main/Resource/ui/WithdrawEveryDay.meta deleted 100644 → 0
View file @ 291029ba
fileFormatVersion: 2
guid: c8769dd604faf4fb9b727d8d2fe57934
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game/Main/Scenes/InitScene.unity
View file @ ede13218
...@@ -382,8 +382,8 @@ MonoBehaviour: ...@@ -382,8 +382,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 788e2a3a769e26b459cd63d4a5de7d76, type: 3} m_Script: {fileID: 11500000, guid: 788e2a3a769e26b459cd63d4a5de7d76, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
isTest: 0 isTest: 1
isShowLog: 0 isShowLog: 1
XyDialog: {fileID: 0} XyDialog: {fileID: 0}
--- !u!1 &2010092450 --- !u!1 &2010092450
GameObject: GameObject:
......
Assets/Game/Main/Scripts/View/HomeInfoControl.cs
View file @ ede13218
...@@ -26,7 +26,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -26,7 +26,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8"); AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8");
Constant.Instance.shubiao = true; Constant.Instance.shubiao = false;
#endif #endif
mPresenter = new HomePresenter(this); mPresenter = new HomePresenter(this);
EventCenter.AddListener(MyEventType.UPDATE_CAR_LIST_DATA, OnUpdateCarListData); EventCenter.AddListener(MyEventType.UPDATE_CAR_LIST_DATA, OnUpdateCarListData);
...@@ -79,8 +79,12 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -79,8 +79,12 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
// 点击金币事件 // 点击金币事件
Destroy(transform.Find("Title/bg").GetComponent<Button>()); Destroy(transform.Find("Title/bg").GetComponent<Button>());
// 种菜任务
GameObject TitleBG2 = transform.Find("Title/TitleBG2").gameObject;
TitleBG2.SetActive(Constant.Instance.shubiao);
// 幸运转盘 // 幸运转盘
GameObject luckyzhuanpan = transform.Find("Title/luckyzhuanpan").gameObject; GameObject luckyzhuanpan = transform.Find("BottomFun/luckyzhuanpan").gameObject;
luckyzhuanpan.SetActive(Constant.Instance.shubiao); luckyzhuanpan.SetActive(Constant.Instance.shubiao);
// 我的礼包 // 我的礼包
...@@ -99,6 +103,10 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -99,6 +103,10 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
GameObject pigbank = transform.Find("Title/pigbank").gameObject; GameObject pigbank = transform.Find("Title/pigbank").gameObject;
pigbank.SetActive(Constant.Instance.shubiao); pigbank.SetActive(Constant.Instance.shubiao);
// 成功兑换横幅
GameObject horselight = transform.Find("Title/horselight").gameObject;
horselight.SetActive(Constant.Instance.shubiao);
// 收货奖励 // 收货奖励
GameObject Harvestreward = transform.Find("BottomFun/Harvestreward").gameObject; GameObject Harvestreward = transform.Find("BottomFun/Harvestreward").gameObject;
Harvestreward.SetActive(Constant.Instance.shubiao); Harvestreward.SetActive(Constant.Instance.shubiao);
...@@ -128,8 +136,12 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -128,8 +136,12 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
baiyuanenvelope.SetActive(Constant.Instance.shubiao); baiyuanenvelope.SetActive(Constant.Instance.shubiao);
// 飞行道具 // 飞行道具
GameObject flyBox = transform.Find("FlyBox/box").gameObject; GameObject flyBoxBox = transform.Find("FlyBox/box").gameObject;
flyBox.SetActive(Constant.Instance.shubiao); flyBoxBox.SetActive(Constant.Instance.shubiao);
// 飞行道具
GameObject flyBoxImage = transform.Find("FlyBox/Image").gameObject;
flyBoxImage.SetActive(Constant.Instance.shubiao);
} }
// 判断是否是刘海屏 // 判断是否是刘海屏
...@@ -153,7 +165,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View ...@@ -153,7 +165,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
if (!Constant.Instance.shubiao) if (!Constant.Instance.shubiao)
{ {
transform.Find("BottomFun/Dailytasks").GetComponent<RectTransform>().anchoredPosition = new Vector2(285, 1170); //transform.Find("BottomFun/Dailytasks").GetComponent<RectTransform>().anchoredPosition = new Vector2(285, 1170);
} }
} }
......
Assets/Scripts/StartControl.cs
View file @ ede13218
...@@ -9,9 +9,9 @@ public class StartControl : MonoBehaviour ...@@ -9,9 +9,9 @@ public class StartControl : MonoBehaviour
public GameObject[] HideObjs; public GameObject[] HideObjs;
private void Awake() private void Awake()
{ {
#if UNITY_EDITOR //#if UNITY_EDITOR
AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8"); // AppConfig.Instance.InitProgect(true, true, "43d2b0f567e422b8");
#endif //#endif
//ShopCheckApp(); //ShopCheckApp();
} }
private void Start() private void Start()
......
Packages/packages-lock.json
View file @ ede13218
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.analytics": { "com.unity.analytics": {
"version": "3.3.5", "version": "3.3.5",
...@@ -28,21 +28,21 @@ ...@@ -28,21 +28,21 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "1.2.16", "version": "1.2.16",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
"version": "1.0.6", "version": "1.0.6",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "1.1.4", "version": "1.1.4",
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.1.1" "com.unity.test-framework": "1.1.1"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.3", "version": "1.2.3",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.multiplayer-hlapi": { "com.unity.multiplayer-hlapi": {
"version": "1.0.8", "version": "1.0.8",
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"dependencies": { "dependencies": {
"nuget.mono-cecil": "0.1.6-preview" "nuget.mono-cecil": "0.1.6-preview"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.purchasing": { "com.unity.purchasing": {
"version": "2.2.1", "version": "2.2.1",
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.20", "version": "1.1.20",
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0" "com.unity.modules.jsonserialize": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "2.1.1", "version": "2.1.1",
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.2.17", "version": "1.2.17",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ugui": { "com.unity.ugui": {
"version": "1.0.0", "version": "1.0.0",
...@@ -122,14 +122,14 @@ ...@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0", "com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0" "com.unity.modules.xr": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"nuget.mono-cecil": { "nuget.mono-cecil": {
"version": "0.1.6-preview", "version": "0.1.6-preview",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.modules.ai": { "com.unity.modules.ai": {
"version": "1.0.0", "version": "1.0.0",
......
ProjectSettings/ProjectSettings.asset
View file @ ede13218
...@@ -41,12 +41,6 @@ PlayerSettings: ...@@ -41,12 +41,6 @@ PlayerSettings:
height: 1 height: 1
m_SplashScreenLogos: [] m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0}
m_ShowUnitySplashAds: 0
m_AdsAndroidGameId:
m_AdsIosGameId:
m_ShowSplashAdsSlogan: 0
m_SloganImage: {fileID: 0}
m_SloganHeight: 150
m_HolographicTrackingLossScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024 defaultScreenWidth: 1024
defaultScreenHeight: 768 defaultScreenHeight: 768
...@@ -124,7 +118,6 @@ PlayerSettings: ...@@ -124,7 +118,6 @@ PlayerSettings:
vulkanNumSwapchainBuffers: 3 vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0 vulkanEnableSetSRGBWrite: 0
vulkanEnableLateAcquireNextImage: 0 vulkanEnableLateAcquireNextImage: 0
useSecurityBuild: 0
m_SupportedAspectRatios: m_SupportedAspectRatios:
4:3: 1 4:3: 1
5:4: 1 5:4: 1
...@@ -178,7 +171,7 @@ PlayerSettings: ...@@ -178,7 +171,7 @@ PlayerSettings:
Android: com.ym.cscmnq Android: com.ym.cscmnq
iPhone: com.ym.simulator iPhone: com.ym.simulator
buildNumber: buildNumber:
iPhone: 6 iPhone: 0
AndroidBundleVersionCode: 11 AndroidBundleVersionCode: 11
AndroidMinSdkVersion: 21 AndroidMinSdkVersion: 21
AndroidTargetSdkVersion: 0 AndroidTargetSdkVersion: 0
...@@ -508,7 +501,6 @@ PlayerSettings: ...@@ -508,7 +501,6 @@ PlayerSettings:
m_Kind: 4 m_Kind: 4
m_SubKind: App Store m_SubKind: App Store
m_BuildTargetBatching: [] m_BuildTargetBatching: []
m_BuildTargetEncrypting: []
m_BuildTargetGraphicsJobs: m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport - m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0 m_GraphicsJobs: 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