1
This commit is contained in:
@@ -21,11 +21,11 @@ public class PermissionRequest : MonoBehaviour
|
||||
{
|
||||
if (hasFocus)
|
||||
{
|
||||
Debug.Log("应用程序获得焦点(OnApplicationFocus)" + hasFocus);
|
||||
//Debug.Log("应用程序获得焦点(OnApplicationFocus)" + hasFocus);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("应用程序失去焦点(OnApplicationFocus)" + hasFocus);
|
||||
//Debug.Log("应用程序失去焦点(OnApplicationFocus)" + hasFocus);
|
||||
}
|
||||
|
||||
if (hasFocus)
|
||||
|
||||
@@ -125,6 +125,7 @@ public class StartShowUICtr : MonoBehaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
//Debug.Log("WaitingShowUI" + RunningSceneMgr.Instance._runningSceneData.id);
|
||||
GlobalEventMgr.Dispatch(GameEvent.EventShowUI, RunningSceneMgr.Instance._runningSceneData.id % 10000);
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,9 @@ public class UIPanelControll : MonoSingleton<UIPanelControll>
|
||||
|
||||
//<2F><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>
|
||||
bool isRun = false;
|
||||
bool isRun2 = false;
|
||||
float waitTime = 5f;
|
||||
float waitTime2 = 3f;
|
||||
float runTime = 0;
|
||||
|
||||
int nowIndex = 0; //<2F><>ǰ<EFBFBD>±<EFBFBD>
|
||||
@@ -35,6 +37,23 @@ public class UIPanelControll : MonoSingleton<UIPanelControll>
|
||||
isRun = false;
|
||||
runTime = 0;
|
||||
ListUiImg[nowIndex].gameObject.SetActive(false);
|
||||
if (nowIndex==0)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
if (isRun2)
|
||||
{
|
||||
runTime += Time.deltaTime;
|
||||
if (runTime >= waitTime2)
|
||||
{
|
||||
isRun2 = false;
|
||||
isRun = true;
|
||||
runTime = 0;
|
||||
ListUiImg[0].gameObject.SetActive(true);
|
||||
ListUiImg[8].gameObject.SetActive(false);
|
||||
GlobalEventMgr.Dispatch(GameEvent.EventPlayTimeline);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,14 +64,22 @@ public class UIPanelControll : MonoSingleton<UIPanelControll>
|
||||
if (index == 0|| index == 7)
|
||||
{
|
||||
nowIndex = index;
|
||||
ListUiImg[nowIndex].gameObject.SetActive(true);
|
||||
if (index != 7)
|
||||
if (index == 0)
|
||||
{
|
||||
isRun2 = true;
|
||||
ListUiImg[8].gameObject.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
ListUiImg[nowIndex].gameObject.SetActive(true);
|
||||
}
|
||||
if (index != 7&&index!=0)
|
||||
isRun = true;
|
||||
else
|
||||
{
|
||||
if (index == 7)
|
||||
{
|
||||
waitTime = 11;
|
||||
waitTime = 5;
|
||||
isRun = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,8 +26,9 @@ public class LeavePlayPrefabControll : MonoBehaviour
|
||||
GameDataManage.Instance.isShowLeaveOn = true;
|
||||
RenderSettings.fog = false;
|
||||
GameObject gameScene = GameObject.Find("GameScene");
|
||||
Debug.Log("nowSceneId:" + SceneMgr.Instance.nowSceneId);
|
||||
//GameObject staticObj = gameScene.transform.Find("Static").gameObject;
|
||||
if (SceneMgr.Instance.nowSceneId == 4)
|
||||
if (SceneMgr.Instance.nowSceneId == 10004)
|
||||
{
|
||||
SetObjsRender(false);
|
||||
}
|
||||
@@ -53,7 +54,7 @@ public class LeavePlayPrefabControll : MonoBehaviour
|
||||
GameObject gameScene = GameObject.Find("GameScene");
|
||||
//gameScene.transform.Find("Static").gameObject.SetActive(false);
|
||||
//gameScene.transform.Find("Dynamic").gameObject.SetActive(false);
|
||||
if (SceneMgr.Instance.nowSceneId == 4)
|
||||
if (SceneMgr.Instance.nowSceneId == 10004)
|
||||
{
|
||||
SetObjsRender(false);
|
||||
}
|
||||
@@ -192,7 +193,7 @@ public class LeavePlayPrefabControll : MonoBehaviour
|
||||
GameObject gameScene = GameObject.Find("GameScene");
|
||||
if (GameDataManage.Instance.isNeedShowAnyBuyOffline)
|
||||
{
|
||||
if (SceneMgr.Instance.nowSceneId==4)
|
||||
if (SceneMgr.Instance.nowSceneId== 10004)
|
||||
{
|
||||
SetObjsRender(true);
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace BigSpace.Logic
|
||||
EventHideTuchJiaGu = 30, //隐藏可以摸的甲骨碰撞
|
||||
EventHideQuad = 31, //隐藏抓取字的碰撞片
|
||||
EventShowSound = 32, //显示场景3的七副图提前音
|
||||
EventPlayTimeline = 34,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
8
Assets/Scripts/Scene_00.meta
Normal file
8
Assets/Scripts/Scene_00.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f8ec2671f0c09f0488aa9a1ec5d102e7
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user