Skip to content

M
MDPro3
Commit 77c8a4f8 authored by SherryChaos's avatar SherryChaos
Browse files
Options

fix link marker direction error when closeup showing

parent 9db8d18d
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 22 deletions
Assets/Main.unity
View file @ 77c8a4f8
......@@ -6843,7 +6843,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: 0}
m_AnchoredPosition: {x: -399.99982, y: 0}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &129642814
......@@ -7766,7 +7766,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -490.00037, y: 0}
m_AnchoredPosition: {x: -490.0003, y: 0}
m_SizeDelta: {x: 490, y: 2000}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &153416284
......@@ -10174,7 +10174,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &203992981
......@@ -10314,7 +10314,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -95}
m_AnchoredPosition: {x: 0, y: -95.00003}
m_SizeDelta: {x: 790, y: -190}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &204678201
......@@ -13137,7 +13137,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &250597853
......@@ -16156,7 +16156,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &296823158
......@@ -18272,7 +18272,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: 300}
m_AnchoredPosition: {x: -399.99982, y: 300}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &365844423
......@@ -35736,7 +35736,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &681567863
......@@ -38388,7 +38388,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -419.99988, y: -60}
m_AnchoredPosition: {x: -419.99982, y: -60}
m_SizeDelta: {x: 400, y: 760}
m_Pivot: {x: 0, y: 1}
--- !u!114 &736958434
......@@ -39858,7 +39858,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028}
m_Direction: 2
m_Value: 1
m_Size: 0.69658244
m_Size: 0.6544184
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -52092,7 +52092,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1005556390
......@@ -54521,7 +54521,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -60}
m_AnchoredPosition: {x: 0, y: -60.00006}
m_SizeDelta: {x: -240, y: -120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1055201272
......@@ -65761,6 +65761,54 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
label: DEF
--- !u!1 &1279088654
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1279088655}
- component: {fileID: 1279088656}
m_Layer: 5
m_Name: Log
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1279088655
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1279088654}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1513174786}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1279088656
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1279088654}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 06df97112c547a342a1ca4b7b829e650, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1279232853
GameObject:
m_ObjectHideFlags: 0
......@@ -70138,7 +70186,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1371617110
......@@ -70290,7 +70338,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: 150}
m_AnchoredPosition: {x: -399.99982, y: 150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1374530642
......@@ -74213,7 +74261,7 @@ RectTransform:
- {fileID: 510606336}
- {fileID: 1523998317}
m_Father: {fileID: 1513174786}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -78750,6 +78798,7 @@ RectTransform:
- {fileID: 1152676713}
- {fileID: 1901605318}
- {fileID: 86981056}
- {fileID: 1279088655}
- {fileID: 1440028869}
m_Father: {fileID: 365283973}
m_RootOrder: 4
......@@ -78878,7 +78927,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513174785}
m_Enabled: 1
m_Alpha: 0
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
......@@ -94882,7 +94931,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -399.99988, y: -150}
m_AnchoredPosition: {x: -399.99982, y: -150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1800729521
......@@ -99874,7 +99923,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 247.49988, y: -540}
m_AnchoredPosition: {x: 247.49982, y: -540}
m_SizeDelta: {x: -565, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1895460095
......@@ -113006,7 +113055,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2140741781}
m_Enabled: 1
m_Alpha: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
Assets/ScriptableObjects/DuelPrefabs/CardModelWrapper.prefab
View file @ 77c8a4f8
......@@ -4311,7 +4311,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4454894838518779
Transform:
m_ObjectHideFlags: 0
......
Assets/Scripts/MDPro3/Duel/DuelLog.cs 0 → 100644
View file @ 77c8a4f8
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class DuelLog : MonoBehaviour
{
}
Assets/Scripts/MDPro3/Duel/DuelLog.cs.meta 0 → 100644
View file @ 77c8a4f8
fileFormatVersion: 2
guid: 06df97112c547a342a1ca4b7b829e650
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/MDPro3/Duel/GameCard.cs
View file @ 77c8a4f8
......@@ -2380,8 +2380,6 @@ namespace MDPro3
}
else
manager.GetElement("IconTypeChange").SetActive(false);
}
else
{
......@@ -2503,6 +2501,7 @@ namespace MDPro3
manager.GetElement<Transform>("CardType").localEulerAngles = new Vector3(0f, 0f, 0f);
manager.GetElement<Transform>("CardCounter").localEulerAngles = new Vector3(0f, 0f, 0f);
manager.GetElement<Transform>("StatusIcon").localEulerAngles = new Vector3(0f, 0f, 0f);
manager.GetElement<Transform>("LinkMarkerRoot").localEulerAngles = new Vector3(0f, 0f, 0f);
}
else
{
......@@ -2523,6 +2522,7 @@ namespace MDPro3
manager.GetElement<Transform>("CardType").localEulerAngles = new Vector3(0f, 0f, 0f);
manager.GetElement<Transform>("CardCounter").localEulerAngles = new Vector3(0f, 0f, 0f);
manager.GetElement<Transform>("StatusIcon").localEulerAngles = new Vector3(0f, 0f, 0f);
manager.GetElement<Transform>("LinkMarkerRoot").localEulerAngles = new Vector3(0f, 180f, 0f);
}
else
{
......@@ -2537,6 +2537,7 @@ namespace MDPro3
manager.GetElement<Transform>("CardType").localEulerAngles = new Vector3(0f, 180f, 0f);
manager.GetElement<Transform>("CardCounter").localEulerAngles = new Vector3(0f, 180f, 0f);
manager.GetElement<Transform>("StatusIcon").localEulerAngles = new Vector3(0f, 180f, 0f);
manager.GetElement<Transform>("LinkMarkerRoot").localEulerAngles = new Vector3(0f, 0f, 0f);
}
}
......
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