Commit 01c3aa50 authored by shujianhe's avatar shujianhe

关闭带参数

parent d7386eda
...@@ -320,7 +320,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -320,7 +320,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
image.sprite = sprite; image.sprite = sprite;
image.color = Color.white; image.color = Color.white;
autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto-switch", autoSwitchGroup.ToString())); autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto-switch", autoSwitchGroup.ToString()));
//vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", autoSwitchGroup.ToString())) vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", vibration.ToString()));
gameShowView.GetComponent<mainGameView>().loadGameImgId(); gameShowView.GetComponent<mainGameView>().loadGameImgId();
this.handlerLoadingPosition(image); this.handlerLoadingPosition(image);
} }
...@@ -518,6 +518,10 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -518,6 +518,10 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
}; };
gridViewList.setDataNoGrid(groupInfos.Count, gradView); gridViewList.setDataNoGrid(groupInfos.Count, gradView);
//震动 //震动
if (vibration)
{
Handheld.Vibrate();
}
if (nowidx >= 0) if (nowidx >= 0)
{ {
if(autoSwitchGroup == false) if(autoSwitchGroup == false)
...@@ -542,6 +546,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -542,6 +546,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
gameShowView.GetComponent<mainGameView>().onClear(); gameShowView.GetComponent<mainGameView>().onClear();
//SceneManager.LoadScene("Scenes/MainHallGame"); //SceneManager.LoadScene("Scenes/MainHallGame");
utilsTools.setGDataByKey("NativeTempData", "main");
SceneManager.LoadScene("Scenes/MainGame"); SceneManager.LoadScene("Scenes/MainGame");
} }
public void onTestTemp1() public void onTestTemp1()
......
...@@ -9,12 +9,10 @@ public class Native : MonoBehaviour ...@@ -9,12 +9,10 @@ public class Native : MonoBehaviour
{ {
public Text text; public Text text;
void appendToText(string line) { text.text += line + "\n"; }
void Start() void Start()
{ {
// text.text = "test"; string param = utilsTools.getGDataByKey<string>("NativeTempData", "splash");
showHostMainWindow(); showHostMainWindow(param);
Debug.Log("UnityStart"); Debug.Log("UnityStart");
} }
private void OnEnable() private void OnEnable()
...@@ -26,27 +24,38 @@ public class Native : MonoBehaviour ...@@ -26,27 +24,38 @@ public class Native : MonoBehaviour
{ {
} }
void showHostMainWindow() public void showHostMainWindow(string str)
{ {
#if UNITY_ANDROID #if UNITY_ANDROID
try try
{ {
AndroidJavaClass jc = new AndroidJavaClass("com.company.product.OverrideUnityActivity"); AndroidJavaClass jc = new AndroidJavaClass("com.company.product.OverrideUnityActivity");
AndroidJavaObject overrideActivity = jc.GetStatic<AndroidJavaObject>("instance"); AndroidJavaObject overrideActivity = jc.GetStatic<AndroidJavaObject>("instance");
overrideActivity.Call("showMainActivity", "red"); overrideActivity.Call("showMainActivity", str);
} }
catch (Exception e) catch (Exception e)
{ {
appendToText("Exception during showHostMainWindow"); // appendToText("Exception during showHostMainWindow");
appendToText(e.Message); //appendToText(e.Message);
} }
#endif #endif
} }
void onNativeMessage(string json) void onNativeMessage(string json)
{ {
SceneManager.LoadScene("Scenes/gameScene"); SceneManager.LoadScene("Scenes/gameScene");
Debug.Log("Android调用该方法"+json); Debug.Log("Android调用该方法" + json);
} }
void jumpGame(string json)
{
Debug.Log("JSON:" + json);
utilsTools.setGDataByKey("NativeGameData", JsonUtility.FromJson<netLableImageItem>(json));
SceneManager.LoadScene("Scenes/gameScene");
}
} }
\ No newline at end of file
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