From 76b861965d64fe1b29cc7b9506338dec4355193b Mon Sep 17 00:00:00 2001
From: Stefan Richter <o-s-r1993@web.de>
Date: Tue, 14 Mar 2023 13:42:16 +0100
Subject: [PATCH] Added Exceptions for tape
---
Assets/Resources/Prefabs/Stage_Default.prefab | 6 +-
.../Prefabs/UI/Ingame/FrameITUI_mobile.prefab | 48 ++++++++++-
Assets/Scenes/Worlds/RiverWorld.unity | 85 +++++++++++++++++++
Assets/Scripts/UI/HideUI_mobile.cs | 7 +-
.../Scripts/UI/InGame/MainPlayerMode_Ctrl.cs | 3 +
.../Scripts/UI/NetwMenue/StartMenue_mobile.cs | 2 +-
.../Scripts/UI/PlayerControls/AxisTouchPad.cs | 13 +++
7 files changed, 153 insertions(+), 11 deletions(-)
diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab
index 8be167d0..c3a99c68 100644
--- a/Assets/Resources/Prefabs/Stage_Default.prefab
+++ b/Assets/Resources/Prefabs/Stage_Default.prefab
@@ -2628,12 +2628,12 @@ PrefabInstance:
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
@@ -2648,7 +2648,7 @@ PrefabInstance:
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 940
objectReference: {fileID: 0}
- target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84,
type: 3}
diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
index e31b2c22..f854ea39 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab
@@ -2221,7 +2221,7 @@ GameObject:
- component: {fileID: 3153660507764185559}
- component: {fileID: 5400571071174051820}
m_Layer: 5
- m_Name: MathMenue1_bttn_onoff_0
+ m_Name: SwitchCamera_bttn_onoff_0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2466,7 +2466,7 @@ GameObject:
- component: {fileID: 118299968777129975}
- component: {fileID: 695663164670639176}
m_Layer: 0
- m_Name: MathMenue1_Bttn_onoff_"17"
+ m_Name: MathMenue1_Bttn_onoff_"19"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2506,7 +2506,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
myself_GObj: {fileID: 5594427878834005957}
- myUI_ID: 17
+ myUI_ID: 19
default_value: 1
--- !u!1 &6449084213387415065
GameObject:
@@ -4492,7 +4492,7 @@ PrefabInstance:
- target: {fileID: 6500467619489830996, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.0009765625
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7093782584270134969, guid: 292834880e6f0e54186b873acc62d3f2,
type: 3}
@@ -5176,6 +5176,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2368791980465913659, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3134360799033672926, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Enabled
@@ -5291,6 +5296,26 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5326558049661044244, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: DPAD_subID_2
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5678210953895042949, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: DPAD_ID
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5678210953895042949, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: DPAD_ID_2
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5678210953895042949, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: DPAD_subID_2
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 6141706914604419468, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Enabled
@@ -5301,6 +5326,16 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7664050507038371539, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8298271169650038834, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8364050863120939096, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Enabled
@@ -5316,6 +5351,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 8505524874228820094, guid: 6a36259218adf9c4d82396fcaa06650d,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8718522871135096508, guid: 6a36259218adf9c4d82396fcaa06650d,
type: 3}
propertyPath: m_Name
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index 6e8dbef6..767d8055 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -39681,6 +39681,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1258196667482719520, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.000030517578
+ objectReference: {fileID: 0}
- target: {fileID: 1518354053009218582, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchoredPosition.y
@@ -39701,6 +39706,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1884886062868963456, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 2.999939
+ objectReference: {fileID: 0}
+ - target: {fileID: 1898191558618400828, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1933676565815785523, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchorMax.y
@@ -40156,6 +40171,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 6990104356646364506, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7216169563200149950, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchorMax.y
@@ -40191,6 +40211,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7647234183557425222, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0.000030517578
+ objectReference: {fileID: 0}
- target: {fileID: 7702767795185280971, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_IsActive
@@ -60109,6 +60134,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2922756910265347783, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2927467717156712422, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -60504,6 +60534,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3056603077265773707, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3060216605866299851, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -60879,6 +60914,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3800846218600177375, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 3880727195338854050, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -61189,6 +61229,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4517512635491800811, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4531387228611741292, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -61669,6 +61714,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5664405441459887119, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 5688016967540468862, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -61959,6 +62009,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6310624404615752746, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6467638319553815892, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6568854318450501685, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -62139,6 +62199,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6849629549808862850, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6879937767831435659, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -62534,6 +62599,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7486688211159863925, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7499374438244155108, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -62554,6 +62624,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7523122168512463278, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7668172506670744135, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -62594,6 +62669,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7719520560471814958, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7748114935345543003, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
@@ -62914,6 +62994,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8453247782535831454, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8468172704577445214, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_AnchorMax.y
diff --git a/Assets/Scripts/UI/HideUI_mobile.cs b/Assets/Scripts/UI/HideUI_mobile.cs
index 9a023f56..83a46549 100644
--- a/Assets/Scripts/UI/HideUI_mobile.cs
+++ b/Assets/Scripts/UI/HideUI_mobile.cs
@@ -220,7 +220,7 @@ void CheckUI_Vis_walk()
case ControlMode.Mobile:
uiccm = 1;
break;
- default:
+ default:
uiccm = 0;
break;
}
@@ -228,14 +228,15 @@ void CheckUI_Vis_walk()
switch(GameplayMode){
case 2:
UIconfig.CanvasOnOff_Array[11] = 0;
- UIconfig.CanvasOnOff_Array[17] = 1;
+ UIconfig.CanvasOnOff_Array[19] = 1;
break;
default:
UIconfig.CanvasOnOff_Array[11] = uiccm;
UIconfig.CanvasOnOff_Array[12] = uiccm;
UIconfig.CanvasOnOff_Array[13] = uiccm;
UIconfig.CanvasOnOff_Array[15] = uiccm;
- UIconfig.CanvasOnOff_Array[17] = 0;
+ UIconfig.CanvasOnOff_Array[17] = uiccm;
+ UIconfig.CanvasOnOff_Array[19] = 0;
UIconfig.CanvasOnOff_Array[18] = uiccm;
break;
diff --git a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs
index 6265c555..6e04bcf2 100644
--- a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs
+++ b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs
@@ -89,9 +89,11 @@ private void Update2(){
break;
case 3:
ThirdPerson_manualCam_GObj.SetActive(true);
+ UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView;
break;
case 4:
ThirdPerson_dampedCam_GObj.SetActive(true);
+ UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView;
break;
case 5:
FirstPerson_GObj.SetActive(true);
@@ -102,6 +104,7 @@ private void Update2(){
break;
case 7:
ThirdPerson_Shoulder_GObj.SetActive(true);
+ UIconfig.interactingRangeMode = InteractingRangeMode.fromObserverView;
break;
case 8:
Sidescroller_GObj.SetActive(true);
diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
index fe374f5a..46459bd2 100644
--- a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
@@ -39,7 +39,7 @@ private void Awake()
start2_CheckOS_CheckConfig();
checkOperationSystemAlreadyDone = true;
}
- GObj_text.text = CommunicationEvents.Opsys + "";
+ GObj_text.text = Application.platform + " -> " + CommunicationEvents.Opsys + "";
//GObj_text.text = "2: " + Application.streamingAssetsPath + " " + Application.persistentDataPath + " " + Application.dataPath;
//Debug.Log(Application.streamingAssetsPath);
CheckServerA[1] = 1;
diff --git a/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs b/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs
index a45e9abe..eaf36efa 100644
--- a/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs
+++ b/Assets/Scripts/UI/PlayerControls/AxisTouchPad.cs
@@ -1,6 +1,7 @@
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
+using static UIconfig;
namespace PlayerCtrl
{
@@ -8,7 +9,13 @@ namespace PlayerCtrl
[RequireComponent(typeof(Image))]
public class AxisTouchPad : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
{
+
// Options for which axes to use
+ public int DPAD_ID;
+ public int DPAD_subID;
+ public int DPAD_ID_2;
+ public int DPAD_subID_2;
+
public enum AxisOption
{
Both, // Use both
@@ -89,11 +96,13 @@ void UpdateVirtualAxes(Vector3 value)
if (m_UseX)
{
m_HorizontalVirtualAxis.Update(value.x);
+ DPAD[DPAD_ID, DPAD_subID] = value.x;
}
if (m_UseY)
{
m_VerticalVirtualAxis.Update(value.y);
+ DPAD[DPAD_ID_2, DPAD_subID_2] = value.y;
}
}
@@ -133,6 +142,8 @@ void Update()
m_PreviousMouse = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 0f);
#endif
UpdateVirtualAxes(new Vector3(pointerDelta.x, pointerDelta.y, 0));
+
+
}
}
@@ -142,6 +153,8 @@ public void OnPointerUp(PointerEventData data)
m_Dragging = false;
m_Id = -1;
UpdateVirtualAxes(Vector3.zero);
+ DPAD[DPAD_ID, DPAD_subID] = 0f;
+ DPAD[DPAD_ID_2, DPAD_subID_2] = 0f;
}
void OnDisable()
--
GitLab