Commit f6d1bad2 authored by Ever's avatar Ever

同步代码

parent 5f8903dc
...@@ -17,10 +17,13 @@ public class GameMgr : MonoBehaviour ...@@ -17,10 +17,13 @@ public class GameMgr : MonoBehaviour
public TextItemMgr tiMgr; public TextItemMgr tiMgr;
public GrayItemMgr giMgr; public GrayItemMgr giMgr;
public Texture2D gray;
public void Init(string key, Texture2D png, Sprite jpg, ResJsonData json) public void Init(string key, Texture2D png, Sprite jpg, ResJsonData json)
{ {
ins = this; ins = this;
md.Init(key, png, jpg, json); md.Init(key, png, jpg, json);
GetComponent<RectTransform>().offsetMax = Vector2.zero;
GetComponent<RectTransform>().offsetMin = Vector2.zero;
} }
public void ChooseGroup(int id) public void ChooseGroup(int id)
...@@ -28,4 +31,8 @@ public class GameMgr : MonoBehaviour ...@@ -28,4 +31,8 @@ public class GameMgr : MonoBehaviour
md.ChooseGroup(id); md.ChooseGroup(id);
} }
public void SetGray(Texture2D _gray)
{
gray = _gray;
}
} }
...@@ -9,8 +9,7 @@ public class GrayItem : MonoBehaviour ...@@ -9,8 +9,7 @@ public class GrayItem : MonoBehaviour
public Image SP; public Image SP;
public RectTransform Rect; public RectTransform Rect;
public int id = -1; public int id = -1;
public Texture2D png; public void FunDo(MainData md, ExRoomDatas erd, int _id)
public void FunDo(MainData md, ExRoomDatas erd,int _id)
{ {
id = _id; id = _id;
//创建图片 //创建图片
...@@ -21,9 +20,14 @@ public class GrayItem : MonoBehaviour ...@@ -21,9 +20,14 @@ public class GrayItem : MonoBehaviour
colors[i].a = 0f; colors[i].a = 0f;
} }
te.SetPixels(colors); te.SetPixels(colors);
Texture2D gray = GameMgr.Ins.gray;
Color[] list = gray.GetPixels();
for (int i = 0; i < erd.list.Count; i++) for (int i = 0; i < erd.list.Count; i++)
{ {
te.SetPixel((int)(erd.list[i].x - erd.size.x), (int)(erd.list[i].y - erd.size.y), Color.black); int x = erd.list[i].x % gray.width;
int y = erd.list[i].y % gray.height;
Color c = list[x + y* gray.width];
te.SetPixel((int)(erd.list[i].x - erd.size.x), (int)(erd.list[i].y - erd.size.y), c);
} }
te.Apply(); te.Apply();
Sprite sp = Sprite.Create(te, new Rect(0, 0, te.width, te.height), Vector2.zero); Sprite sp = Sprite.Create(te, new Rect(0, 0, te.width, te.height), Vector2.zero);
......
...@@ -8,7 +8,7 @@ using UnityEngine; ...@@ -8,7 +8,7 @@ using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
public class MainData : MonoBehaviour, IDragHandler, IEndDragHandler, IBeginDragHandler public class MainData : MonoBehaviour
{ {
public static int gunSize = 50; public static int gunSize = 50;
public static Vector4 config = new Vector4(0, 150, 725f, 725f); public static Vector4 config = new Vector4(0, 150, 725f, 725f);
...@@ -54,26 +54,26 @@ public class MainData : MonoBehaviour, IDragHandler, IEndDragHandler, IBeginDrag ...@@ -54,26 +54,26 @@ public class MainData : MonoBehaviour, IDragHandler, IEndDragHandler, IBeginDrag
} }
#region 拖拽 #region 拖拽
private bool isDrag = false; //private bool isDrag = false;
private Vector2 StartPos = Vector2.zero; //private Vector2 StartPos = Vector2.zero;
private Vector2 EndPos = Vector2.zero; //private Vector2 EndPos = Vector2.zero;
public void OnBeginDrag(PointerEventData eventData) //public void OnBeginDrag(PointerEventData eventData)
{ //{
isDrag = true; // isDrag = true;
RectTransformUtility.ScreenPointToLocalPointInRectangle(rect, Input.mousePosition, Camera.main, out StartPos); // RectTransformUtility.ScreenPointToLocalPointInRectangle(rect, Input.mousePosition, Camera.main, out StartPos);
} //}
public void OnDrag(PointerEventData eventData) //public void OnDrag(PointerEventData eventData)
{ //{
if (!isDrag) { return; } // if (!isDrag) { return; }
RectTransformUtility.ScreenPointToLocalPointInRectangle(rect, Input.mousePosition, Camera.main, out EndPos); // RectTransformUtility.ScreenPointToLocalPointInRectangle(rect, Input.mousePosition, Camera.main, out EndPos);
Vector3 v = EndPos - StartPos; // Vector3 v = EndPos - StartPos;
transform.localPosition += v; // transform.localPosition += v;
} //}
public void OnEndDrag(PointerEventData eventData) //public void OnEndDrag(PointerEventData eventData)
{ //{
isDrag = false; // isDrag = false;
} //}
#endregion #endregion
#region 缩放 #region 缩放
......
...@@ -38,9 +38,14 @@ public class MaskItem : MonoBehaviour ...@@ -38,9 +38,14 @@ public class MaskItem : MonoBehaviour
colors[i].a = 0f; colors[i].a = 0f;
} }
te.SetPixels(colors); te.SetPixels(colors);
Texture2D gray = GameMgr.Ins.gray;
Color[] list = gray.GetPixels();
for (int i = 0; i < erd.list.Count; i++) for (int i = 0; i < erd.list.Count; i++)
{ {
te.SetPixel((int)(erd.list[i].x - erd.size.x), (int)(erd.list[i].y - erd.size.y), Color.white); int x = erd.list[i].x % gray.width;
int y = erd.list[i].y % gray.height;
Color c = list[x + y * gray.width];
te.SetPixel((int)(erd.list[i].x - erd.size.x), (int)(erd.list[i].y - erd.size.y), c);
} }
te.Apply(); te.Apply();
Sprite sp = Sprite.Create(te, new Rect(0, 0, te.width, te.height), Vector2.zero); Sprite sp = Sprite.Create(te, new Rect(0, 0, te.width, te.height), Vector2.zero);
......
...@@ -11,6 +11,8 @@ GameObject: ...@@ -11,6 +11,8 @@ GameObject:
- component: {fileID: 7902676659994826364} - component: {fileID: 7902676659994826364}
- component: {fileID: 5754881128437347031} - component: {fileID: 5754881128437347031}
- component: {fileID: 2338271980406512720} - component: {fileID: 2338271980406512720}
- component: {fileID: 4052713253165683402}
- component: {fileID: 2078633054962783023}
m_Layer: 0 m_Layer: 0
m_Name: jpg m_Name: jpg
m_TagString: Untagged m_TagString: Untagged
...@@ -29,12 +31,13 @@ RectTransform: ...@@ -29,12 +31,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 7679003703182876708}
m_Father: {fileID: 136994829194703267} m_Father: {fileID: 136994829194703267}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
...@@ -76,6 +79,46 @@ MonoBehaviour: ...@@ -76,6 +79,46 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &4052713253165683402
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 276238014372959979}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!114 &2078633054962783023
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 276238014372959979}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &417385666573305620 --- !u!1 &417385666573305620
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -318,7 +361,6 @@ MonoBehaviour: ...@@ -318,7 +361,6 @@ MonoBehaviour:
SP: {fileID: 7896971547950567980} SP: {fileID: 7896971547950567980}
Rect: {fileID: 5945244698823965143} Rect: {fileID: 5945244698823965143}
id: -1 id: -1
png: {fileID: 2800000, guid: cfe63fc6a2e3edc409d653cefd205fb7, type: 3}
--- !u!1 &1272658336346988519 --- !u!1 &1272658336346988519
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -395,6 +437,176 @@ MonoBehaviour: ...@@ -395,6 +437,176 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &2022807596644380550
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2902754919140836122}
- component: {fileID: 6154837051929643582}
- component: {fileID: 237648084539702437}
m_Layer: 5
m_Name: Content
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2902754919140836122
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022807596644380550}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 136994829194703267}
m_Father: {fileID: 3718553484409595390}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6154837051929643582
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022807596644380550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!114 &237648084539702437
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022807596644380550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &2370487241309862268
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3718553484409595390}
- component: {fileID: 3540624124884326624}
- component: {fileID: 735149898379688925}
- component: {fileID: 2452091612914919276}
m_Layer: 5
m_Name: Viewport
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3718553484409595390
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2370487241309862268}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2902754919140836122}
m_Father: {fileID: 3288970237706169799}
m_RootOrder: -1
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, y: 1}
--- !u!222 &3540624124884326624
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2370487241309862268}
m_CullTransparentMesh: 1
--- !u!114 &735149898379688925
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2370487241309862268}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2452091612914919276
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2370487241309862268}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!1 &2436549110189993140 --- !u!1 &2436549110189993140
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -405,6 +617,8 @@ GameObject: ...@@ -405,6 +617,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 136994829194703267} - component: {fileID: 136994829194703267}
- component: {fileID: 4535739684591336511} - component: {fileID: 4535739684591336511}
- component: {fileID: 5950458851555830853}
- component: {fileID: 2178059622702606756}
m_Layer: 0 m_Layer: 0
m_Name: MainData m_Name: MainData
m_TagString: Untagged m_TagString: Untagged
...@@ -425,15 +639,11 @@ RectTransform: ...@@ -425,15 +639,11 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 7902676659994826364} - {fileID: 7902676659994826364}
- {fileID: 7679003703182876708} m_Father: {fileID: 2902754919140836122}
- {fileID: 800309816225797410}
- {fileID: 2207622343904402988}
- {fileID: 8460472138427881079}
m_Father: {fileID: 2908597137679265870}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
...@@ -479,6 +689,46 @@ MonoBehaviour: ...@@ -479,6 +689,46 @@ MonoBehaviour:
imgjpg: {fileID: 2338271980406512720} imgjpg: {fileID: 2338271980406512720}
rect: {fileID: 136994829194703267} rect: {fileID: 136994829194703267}
curGroupId: -1 curGroupId: -1
--- !u!114 &5950458851555830853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2436549110189993140}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &2178059622702606756
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2436549110189993140}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 2
--- !u!1 &2488372294624611549 --- !u!1 &2488372294624611549
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -509,7 +759,7 @@ RectTransform: ...@@ -509,7 +759,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1203006329788771039} - {fileID: 1203006329788771039}
m_Father: {fileID: 136994829194703267} m_Father: {fileID: 7679003703182876708}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
...@@ -670,7 +920,7 @@ RectTransform: ...@@ -670,7 +920,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5945244698823965143} - {fileID: 5945244698823965143}
m_Father: {fileID: 136994829194703267} m_Father: {fileID: 7679003703182876708}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
...@@ -722,12 +972,15 @@ RectTransform: ...@@ -722,12 +972,15 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
m_Father: {fileID: 136994829194703267} - {fileID: 800309816225797410}
- {fileID: 2207622343904402988}
- {fileID: 8460472138427881079}
m_Father: {fileID: 7902676659994826364}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
...@@ -798,12 +1051,12 @@ RectTransform: ...@@ -798,12 +1051,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 136994829194703267} - {fileID: 3288970237706169799}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
...@@ -823,6 +1076,115 @@ MonoBehaviour: ...@@ -823,6 +1076,115 @@ MonoBehaviour:
miMgr: {fileID: 5326343875061023361} miMgr: {fileID: 5326343875061023361}
tiMgr: {fileID: 1490190831900560014} tiMgr: {fileID: 1490190831900560014}
giMgr: {fileID: 2042267472393982796} giMgr: {fileID: 2042267472393982796}
gray: {fileID: 2800000, guid: cfe63fc6a2e3edc409d653cefd205fb7, type: 3}
--- !u!1 &8927003478227325637
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3288970237706169799}
- component: {fileID: 359248439607302253}
- component: {fileID: 7489297326173830611}
- component: {fileID: 1238786231969924280}
m_Layer: 5
m_Name: ScrollView
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3288970237706169799
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8927003478227325637}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3718553484409595390}
m_Father: {fileID: 2908597137679265870}
m_RootOrder: -1
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!222 &359248439607302253
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8927003478227325637}
m_CullTransparentMesh: 1
--- !u!114 &7489297326173830611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8927003478227325637}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1238786231969924280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8927003478227325637}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 2902754919140836122}
m_Horizontal: 1
m_Vertical: 1
m_MovementType: 1
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_Viewport: {fileID: 3718553484409595390}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &9134782076413536134 --- !u!1 &9134782076413536134
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -853,7 +1215,7 @@ RectTransform: ...@@ -853,7 +1215,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3859749812772851665} - {fileID: 3859749812772851665}
m_Father: {fileID: 136994829194703267} m_Father: {fileID: 7679003703182876708}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
......
...@@ -7111,11 +7111,11 @@ RectTransform: ...@@ -7111,11 +7111,11 @@ RectTransform:
m_Father: {fileID: 1147557151012020857} m_Father: {fileID: 1147557151012020857}
m_RootOrder: -1 m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 750, y: 1274}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 1}
--- !u!1 &7432927552733396289 --- !u!1 &7432927552733396289
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
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