Commit ecc43d61 authored by shujianhe's avatar shujianhe

修复自动切组false情况下无法点击和提示的问题

parent ea85cbb4
...@@ -495,27 +495,27 @@ PrefabInstance: ...@@ -495,27 +495,27 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 1200 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 2300 value: -464
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
...@@ -611,27 +611,27 @@ PrefabInstance: ...@@ -611,27 +611,27 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 1200 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 2300 value: -464
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
...@@ -655,27 +655,27 @@ PrefabInstance: ...@@ -655,27 +655,27 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 1200 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 2300 value: -464
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
...@@ -739,27 +739,27 @@ PrefabInstance: ...@@ -739,27 +739,27 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 0.5 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0.5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 1200 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 2300 value: -464
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
...@@ -807,7 +807,7 @@ PrefabInstance: ...@@ -807,7 +807,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6841462502927162422, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 6841462502927162422, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
...@@ -879,11 +879,11 @@ PrefabInstance: ...@@ -879,11 +879,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8235616612504007133, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 8235616612504007133, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8235616612504007133, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 8235616612504007133, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8242295764275695975, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 8242295764275695975, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
......
...@@ -38,6 +38,10 @@ public class gameInLoading : MonoBehaviour,IEventHandler ...@@ -38,6 +38,10 @@ public class gameInLoading : MonoBehaviour,IEventHandler
stepvalue1 = 0.015f; stepvalue1 = 0.015f;
} }
stepvalue = stepvalue1; stepvalue = stepvalue1;
if (isEnd)
{
utilsTools.sendEvent("inGameLoadingBarEnd");
}
} }
else if(eventName.Equals("initViewShowData")) else if(eventName.Equals("initViewShowData"))
{ {
......
...@@ -224,8 +224,12 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -224,8 +224,12 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
RectTransform rectTransform2 = transform.Find("tipSelectGroup").GetComponent<RectTransform>(); RectTransform rectTransform2 = transform.Find("tipSelectGroup").GetComponent<RectTransform>();
float y = (utilsTools.DisplaySize.y / 2 - rectTransform1.rect.height / 2) * -1 + rectTransform2.rect.height + 25; float y = (utilsTools.DisplaySize.y / 2 - rectTransform1.rect.height / 2) * -1 + rectTransform2.rect.height + 25;
rectTransform2.localPosition = new Vector3(rectTransform2.localPosition.x, y); rectTransform2.localPosition = new Vector3(rectTransform2.localPosition.x, y);
if(autoSwitchGroup == false) if (autoSwitchGroup == false)
{
rectTransform2.gameObject.SetActive(true); rectTransform2.gameObject.SetActive(true);
maingameView.GetComponent<mainGameScaleMove>().setCheckInput();
utilsTools.sendEventObjectParams("inGameLoadingValue", 100f, true);
}
} }
private void onEvent_gameClickPos_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects) private void onEvent_gameClickPos_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects)
{ {
......
...@@ -61,7 +61,7 @@ public class Native : MonoBehaviour ...@@ -61,7 +61,7 @@ public class Native : MonoBehaviour
{ {
Debug.Log("JSON:" + json); Debug.Log("JSON:" + json);
json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/cc--EDgRpc_nHQru7H.png\",\"hybridType\":64,\"id\":\"cc--EDgRpc_nHQru7H\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/cc--EDgRpc_nHQru7H.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}"; //json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/cc--EDgRpc_nHQru7H.png\",\"hybridType\":64,\"id\":\"cc--EDgRpc_nHQru7H\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/cc--EDgRpc_nHQru7H.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
utilsTools.setGDataByKey("NativeGameData", JsonUtility.FromJson<netLableImageItem>(json)); utilsTools.setGDataByKey("NativeGameData", JsonUtility.FromJson<netLableImageItem>(json));
SceneManager.LoadScene(utilsTools.getGameSceneName()); SceneManager.LoadScene(utilsTools.getGameSceneName());
......
using ICSharpCode.SharpZipLib.Zip.Compression;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -472,6 +473,7 @@ public class mainGameScaleMove : MonoBehaviour ...@@ -472,6 +473,7 @@ public class mainGameScaleMove : MonoBehaviour
Debug.Log(areaItem.ToString()); Debug.Log(areaItem.ToString());
RectTransform idAreaRectTransform = transform.Find("areaIdBase/" + areaItem.tempExKey).GetComponent<RectTransform>(); RectTransform idAreaRectTransform = transform.Find("areaIdBase/" + areaItem.tempExKey).GetComponent<RectTransform>();
pos = idAreaRectTransform.localPosition * -1 * nowScale / initScale; pos = idAreaRectTransform.localPosition * -1 * nowScale / initScale;
for (int i = 0; i < transform.childCount; i++) for (int i = 0; i < transform.childCount; i++)
{ {
var itemChild = transform.GetChild(i); var itemChild = transform.GetChild(i);
......
...@@ -1519,12 +1519,15 @@ public class mainGameView : MonoBehaviour ...@@ -1519,12 +1519,15 @@ public class mainGameView : MonoBehaviour
str1 = str1 + item.Key + "-----" + item.Value + ":" + (end - begin).ToString()+"\n"; str1 = str1 + item.Key + "-----" + item.Value + ":" + (end - begin).ToString()+"\n";
} }
Debug.Log(str1); Debug.Log(str1);
transform.parent.Find("debugShowTimes").GetComponent<TextMeshProUGUI>().text = str1; Transform debugShowTimes = transform.parent.Find("debugShowTimes");
utilsTools.addTimer_Sec(gameObject, "sdf", (String _) => if (debugShowTimes != null)
{ {
transform.parent.Find("debugShowTimes").gameObject.SetActive(false); debugShowTimes.GetComponent<TextMeshProUGUI>().text = str1;
return false; utilsTools.addTimer_Sec(gameObject, "sdf", (String _) =>
}, 5); {
transform.parent.Find("debugShowTimes").gameObject.SetActive(false);
return false;
}, 5);
}
} }
} }
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