Skip to content

Commit 857752a

Browse files
committed
3 tool
1 parent 4657fb9 commit 857752a

File tree

3 files changed

+48
-37
lines changed

3 files changed

+48
-37
lines changed

Assets/Scenes/GameScene.unity

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2317,6 +2317,10 @@ PrefabInstance:
23172317
m_Modification:
23182318
m_TransformParent: {fileID: 1238698634}
23192319
m_Modifications:
2320+
- target: {fileID: 483870817, guid: 4a7c1b49b2924a64e9c757d086060867, type: 3}
2321+
propertyPath: m_Interactable
2322+
value: 1
2323+
objectReference: {fileID: 0}
23202324
- target: {fileID: 483870817, guid: 4a7c1b49b2924a64e9c757d086060867, type: 3}
23212325
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
23222326
value: 1
@@ -2872,6 +2876,11 @@ PrefabInstance:
28722876
value:
28732877
objectReference: {fileID: 21300000, guid: 6130516e23c29a34e93e3e3644972a7b,
28742878
type: 3}
2879+
- target: {fileID: 3836268076026735594, guid: 4a7c1b49b2924a64e9c757d086060867,
2880+
type: 3}
2881+
propertyPath: m_Color.a
2882+
value: 1
2883+
objectReference: {fileID: 0}
28752884
- target: {fileID: 4643508003151439271, guid: 4a7c1b49b2924a64e9c757d086060867,
28762885
type: 3}
28772886
propertyPath: toolId
@@ -3640,7 +3649,7 @@ RectTransform:
36403649
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36413650
m_AnchorMin: {x: 0, y: 1}
36423651
m_AnchorMax: {x: 0, y: 1}
3643-
m_AnchoredPosition: {x: 319.92, y: -48.774}
3652+
m_AnchoredPosition: {x: 319.91998, y: -48.774}
36443653
m_SizeDelta: {x: 158.26, y: 40.645}
36453654
m_Pivot: {x: 0.5, y: 0.5}
36463655
--- !u!114 &1879916604

Assets/Scenes/MainScene.unity

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4958,15 +4958,6 @@ MonoBehaviour:
49584958
m_Script: {fileID: 11500000, guid: 0962aad7a0b001e47b8df086db1a211c, type: 3}
49594959
m_Name:
49604960
m_EditorClassIdentifier:
4961-
roomItems:
4962-
- {fileID: 121745549}
4963-
- {fileID: 1728893052}
4964-
- {fileID: 205432816}
4965-
- {fileID: 200775130}
4966-
- {fileID: 871958904}
4967-
- {fileID: 161867984}
4968-
roomSecondItems:
4969-
- {fileID: 910525371}
49704961
completeTask: {fileID: 617734679}
49714962
novelController: {fileID: 1708860283}
49724963
--- !u!1001 &249007733
@@ -9536,6 +9527,7 @@ GameObject:
95369527
- component: {fileID: 527943996}
95379528
- component: {fileID: 527943998}
95389529
- component: {fileID: 527943997}
9530+
- component: {fileID: 527943999}
95399531
m_Layer: 0
95409532
m_Name: NavMesh
95419533
m_TagString: Untagged
@@ -9608,6 +9600,27 @@ MonoBehaviour:
96089600
m_BuildHeightMesh: 0
96099601
m_HideEditorLogs: 0
96109602
m_NavMeshData: {fileID: 23800000, guid: 65c42a18766545948a152f1ed45a0c1d, type: 2}
9603+
--- !u!114 &527943999
9604+
MonoBehaviour:
9605+
m_ObjectHideFlags: 0
9606+
m_CorrespondingSourceObject: {fileID: 0}
9607+
m_PrefabInstance: {fileID: 0}
9608+
m_PrefabAsset: {fileID: 0}
9609+
m_GameObject: {fileID: 527943993}
9610+
m_Enabled: 1
9611+
m_EditorHideFlags: 0
9612+
m_Script: {fileID: 11500000, guid: 0a7304fb2036e6246aab1435713cbae3, type: 3}
9613+
m_Name:
9614+
m_EditorClassIdentifier:
9615+
roomItems:
9616+
- {fileID: 121745549}
9617+
- {fileID: 1728893052}
9618+
- {fileID: 205432816}
9619+
- {fileID: 200775130}
9620+
- {fileID: 871958904}
9621+
- {fileID: 161867984}
9622+
roomSecondItems:
9623+
- {fileID: 910525371}
96119624
--- !u!1 &528494357
96129625
GameObject:
96139626
m_ObjectHideFlags: 0
@@ -31922,7 +31935,6 @@ MonoBehaviour:
3192231935
- {fileID: 11400000, guid: ea8f5aae565f4514a978f7fa78bf90e1, type: 2}
3192331936
novelController: {fileID: 1708860283}
3192431937
canvasController: {fileID: 660655100}
31925-
roomForFilling: {fileID: 234664752}
3192631938
--- !u!1 &1728893050
3192731939
GameObject:
3192831940
m_ObjectHideFlags: 0

Assets/Uses/Predabs/ChoisePanel (4).prefab

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &905207170830559528
3+
--- !u!1 &1263460064811244176
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 9191077772607351121}
12-
- component: {fileID: 7797991447823405391}
13-
- component: {fileID: 2360722814160682605}
11+
- component: {fileID: 4532445716763651319}
12+
- component: {fileID: 6601523286949666890}
13+
- component: {fileID: 8226687183121190209}
1414
m_Layer: 5
1515
m_Name: Image
1616
m_TagString: Untagged
1717
m_Icon: {fileID: 0}
1818
m_NavMeshLayer: 0
1919
m_StaticEditorFlags: 0
2020
m_IsActive: 1
21-
--- !u!224 &9191077772607351121
21+
--- !u!224 &4532445716763651319
2222
RectTransform:
2323
m_ObjectHideFlags: 0
2424
m_CorrespondingSourceObject: {fileID: 0}
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
27-
m_GameObject: {fileID: 905207170830559528}
27+
m_GameObject: {fileID: 1263460064811244176}
2828
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2929
m_LocalPosition: {x: 0, y: 0, z: 0}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -35,24 +35,24 @@ RectTransform:
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
m_AnchorMin: {x: 0.5, y: 0.5}
3737
m_AnchorMax: {x: 0.5, y: 0.5}
38-
m_AnchoredPosition: {x: -0.000091076, y: 2.3}
39-
m_SizeDelta: {x: 85.42, y: 80.02}
38+
m_AnchoredPosition: {x: -0.000014782, y: 2.9}
39+
m_SizeDelta: {x: 87.8448, y: 81.6663}
4040
m_Pivot: {x: 0.5, y: 0.5}
41-
--- !u!222 &7797991447823405391
41+
--- !u!222 &6601523286949666890
4242
CanvasRenderer:
4343
m_ObjectHideFlags: 0
4444
m_CorrespondingSourceObject: {fileID: 0}
4545
m_PrefabInstance: {fileID: 0}
4646
m_PrefabAsset: {fileID: 0}
47-
m_GameObject: {fileID: 905207170830559528}
47+
m_GameObject: {fileID: 1263460064811244176}
4848
m_CullTransparentMesh: 1
49-
--- !u!114 &2360722814160682605
49+
--- !u!114 &8226687183121190209
5050
MonoBehaviour:
5151
m_ObjectHideFlags: 0
5252
m_CorrespondingSourceObject: {fileID: 0}
5353
m_PrefabInstance: {fileID: 0}
5454
m_PrefabAsset: {fileID: 0}
55-
m_GameObject: {fileID: 905207170830559528}
55+
m_GameObject: {fileID: 1263460064811244176}
5656
m_Enabled: 1
5757
m_EditorHideFlags: 0
5858
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -107,7 +107,7 @@ RectTransform:
107107
m_LocalScale: {x: 1, y: 1, z: 1}
108108
m_ConstrainProportionsScale: 0
109109
m_Children:
110-
- {fileID: 9191077772607351121}
110+
- {fileID: 4532445716763651319}
111111
m_Father: {fileID: 0}
112112
m_RootOrder: 0
113113
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -144,7 +144,7 @@ MonoBehaviour:
144144
m_OnCullStateChanged:
145145
m_PersistentCalls:
146146
m_Calls: []
147-
m_Sprite: {fileID: 21300000, guid: 876a2b1909161314dbe348ba93a14219, type: 3}
147+
m_Sprite: {fileID: 21300000, guid: 31be0a07525508f41a0ca2ad3b493d5c, type: 3}
148148
m_Type: 0
149149
m_PreserveAspect: 1
150150
m_FillCenter: 1
@@ -166,15 +166,5 @@ MonoBehaviour:
166166
m_Script: {fileID: 11500000, guid: 51dcb6a2be927e24c8e1b926f7de8421, type: 3}
167167
m_Name:
168168
m_EditorClassIdentifier:
169-
amoutImage: {fileID: 2360722814160682605}
170-
allNumbers:
171-
- {fileID: 21300000, guid: abe65885dff509d44992b36bbecb6bfc, type: 3}
172-
- {fileID: 21300000, guid: e0600c0a50c84b94983be02108117527, type: 3}
173-
- {fileID: 21300000, guid: 943b9c0cf08e2a84ea17ec0b412234c4, type: 3}
174-
- {fileID: 21300000, guid: da187b566add33e43ac65d053edc94a6, type: 3}
175-
- {fileID: 21300000, guid: e1bcd740929b71e4c982c4b3e2ad3810, type: 3}
176-
- {fileID: 21300000, guid: 921a659f5dd543a41a728704e3430db5, type: 3}
177-
- {fileID: 21300000, guid: 3c45fdce78cf37d409b04ed181272329, type: 3}
178-
- {fileID: 21300000, guid: 72755605368b19e43bb42ae7e0cc4318, type: 3}
179-
- {fileID: 21300000, guid: b87bba28edc50d145bcfb794d624133c, type: 3}
180-
- {fileID: 21300000, guid: 3ff3c99f34f85da43b551e3369b73711, type: 3}
169+
amoutImage: {fileID: 8226687183121190209}
170+
toolId: 0

0 commit comments

Comments
 (0)