X Tutup
Skip to content

Commit a140764

Browse files
keiwandokeiwando
committed
Use higher resolution arrow and camera icon assets
1 parent ba9b5c7 commit a140764

File tree

6 files changed

+200
-19
lines changed

6 files changed

+200
-19
lines changed

‎Assets/Scenes/SimulationContainerScene.unity‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5312,8 +5312,8 @@ RectTransform:
53125312
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
53135313
m_AnchorMin: {x: 0, y: 1}
53145314
m_AnchorMax: {x: 0, y: 1}
5315-
m_AnchoredPosition: {x: 94, y: -15}
5316-
m_SizeDelta: {x: 0, y: 30}
5315+
m_AnchoredPosition: {x: 250.99997, y: -15}
5316+
m_SizeDelta: {x: 285.99994, y: 30}
53175317
m_Pivot: {x: 0.5, y: 0.5}
53185318
--- !u!114 &954620509
53195319
MonoBehaviour:
@@ -6109,7 +6109,7 @@ RectTransform:
61096109
m_GameObject: {fileID: 1114405001}
61106110
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
61116111
m_LocalPosition: {x: 0, y: 0, z: 0}
6112-
m_LocalScale: {x: -1, y: 1, z: 1}
6112+
m_LocalScale: {x: 1, y: 1, z: 1}
61136113
m_ConstrainProportionsScale: 0
61146114
m_Children: []
61156115
m_Father: {fileID: 1529590670}
@@ -6188,14 +6188,14 @@ MonoBehaviour:
61886188
m_Name:
61896189
m_EditorClassIdentifier:
61906190
m_Material: {fileID: 0}
6191-
m_Color: {r: 1, g: 1, b: 1, a: 0.8980392}
6191+
m_Color: {r: 0.20392157, g: 0.2, b: 0.20392157, a: 0.8980392}
61926192
m_RaycastTarget: 1
61936193
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
61946194
m_Maskable: 1
61956195
m_OnCullStateChanged:
61966196
m_PersistentCalls:
61976197
m_Calls: []
6198-
m_Sprite: {fileID: 21300000, guid: c309779a0221f41469bff7547cefc5b3, type: 3}
6198+
m_Sprite: {fileID: 21300000, guid: dbb0ad2a149074480b47771a8e02b2bb, type: 3}
61996199
m_Type: 0
62006200
m_PreserveAspect: 0
62016201
m_FillCenter: 1
@@ -6854,9 +6854,9 @@ MonoBehaviour:
68546854
m_OnCullStateChanged:
68556855
m_PersistentCalls:
68566856
m_Calls: []
6857-
m_Sprite: {fileID: 21300000, guid: 4e10c60b94fbf4174bef29fc0976c14b, type: 3}
6857+
m_Sprite: {fileID: 21300000, guid: 72f24244eccf04568ad116a56026fefe, type: 3}
68586858
m_Type: 0
6859-
m_PreserveAspect: 0
6859+
m_PreserveAspect: 1
68606860
m_FillCenter: 1
68616861
m_FillMethod: 4
68626862
m_FillAmount: 1
@@ -8927,14 +8927,14 @@ MonoBehaviour:
89278927
m_Name:
89288928
m_EditorClassIdentifier:
89298929
m_Material: {fileID: 0}
8930-
m_Color: {r: 1, g: 1, b: 1, a: 0.797}
8930+
m_Color: {r: 0.20392157, g: 0.2, b: 0.20392157, a: 0.8}
89318931
m_RaycastTarget: 1
89328932
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
89338933
m_Maskable: 1
89348934
m_OnCullStateChanged:
89358935
m_PersistentCalls:
89368936
m_Calls: []
8937-
m_Sprite: {fileID: 21300000, guid: 6b7e282498f7c4a3fa984ab0df4bccbd, type: 3}
8937+
m_Sprite: {fileID: 21300000, guid: dbb0ad2a149074480b47771a8e02b2bb, type: 3}
89388938
m_Type: 0
89398939
m_PreserveAspect: 0
89408940
m_FillCenter: 1
@@ -9115,14 +9115,14 @@ MonoBehaviour:
91159115
m_Name:
91169116
m_EditorClassIdentifier:
91179117
m_Material: {fileID: 0}
9118-
m_Color: {r: 1, g: 1, b: 1, a: 0.797}
9118+
m_Color: {r: 0.20392157, g: 0.2, b: 0.20392157, a: 0.8}
91199119
m_RaycastTarget: 1
91209120
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
91219121
m_Maskable: 1
91229122
m_OnCullStateChanged:
91239123
m_PersistentCalls:
91249124
m_Calls: []
9125-
m_Sprite: {fileID: 21300000, guid: 6b7e282498f7c4a3fa984ab0df4bccbd, type: 3}
9125+
m_Sprite: {fileID: 21300000, guid: dbb0ad2a149074480b47771a8e02b2bb, type: 3}
91269126
m_Type: 0
91279127
m_PreserveAspect: 0
91289128
m_FillCenter: 1
@@ -9543,7 +9543,7 @@ RectTransform:
95439543
m_GameObject: {fileID: 1551180572}
95449544
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
95459545
m_LocalPosition: {x: 0, y: 0, z: 0}
9546-
m_LocalScale: {x: 1, y: 1, z: 1}
9546+
m_LocalScale: {x: -1, y: 1, z: 1}
95479547
m_ConstrainProportionsScale: 0
95489548
m_Children: []
95499549
m_Father: {fileID: 1529590670}
@@ -9622,14 +9622,14 @@ MonoBehaviour:
96229622
m_Name:
96239623
m_EditorClassIdentifier:
96249624
m_Material: {fileID: 0}
9625-
m_Color: {r: 1, g: 1, b: 1, a: 0.897}
9625+
m_Color: {r: 0.20392157, g: 0.2, b: 0.20392157, a: 0.9019608}
96269626
m_RaycastTarget: 1
96279627
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
96289628
m_Maskable: 1
96299629
m_OnCullStateChanged:
96309630
m_PersistentCalls:
96319631
m_Calls: []
9632-
m_Sprite: {fileID: 21300000, guid: c309779a0221f41469bff7547cefc5b3, type: 3}
9632+
m_Sprite: {fileID: 21300000, guid: dbb0ad2a149074480b47771a8e02b2bb, type: 3}
96339633
m_Type: 0
96349634
m_PreserveAspect: 0
96359635
m_FillCenter: 1
@@ -11635,7 +11635,7 @@ PrefabInstance:
1163511635
- target: {fileID: 825649059045380973, guid: f614abeab23d542e583ef2442e7edc77,
1163611636
type: 3}
1163711637
propertyPath: m_SizeDelta.x
11638-
value: 94
11638+
value: 108
1163911639
objectReference: {fileID: 0}
1164011640
- target: {fileID: 825649059045380973, guid: f614abeab23d542e583ef2442e7edc77,
1164111641
type: 3}
@@ -11695,7 +11695,7 @@ PrefabInstance:
1169511695
- target: {fileID: 825649059045380973, guid: f614abeab23d542e583ef2442e7edc77,
1169611696
type: 3}
1169711697
propertyPath: m_AnchoredPosition.x
11698-
value: 47
11698+
value: 54
1169911699
objectReference: {fileID: 0}
1170011700
- target: {fileID: 825649059045380973, guid: f614abeab23d542e583ef2442e7edc77,
1170111701
type: 3}

‎Assets/Scripts/Controllers/BoneSettingsManager.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public BoneSettingsManager(Bone bone, List<Decoration> decorations, AdvancedBody
6767
oldData.weight, oldData.isWing, inverted
6868
);
6969
bone.BoneData = data;
70-
foreach (Decoration decoration in decorations) {
70+
foreach (Decoration decoration in this.decorations) {
7171
if (decoration.DecorationData.boneId == bone.BoneData.id) {
7272
var oldPosition = decoration.transform.position;
7373
var targetLocalPosition = bone.transform.InverseTransformPoint(oldPosition);
@@ -77,7 +77,6 @@ public BoneSettingsManager(Bone bone, List<Decoration> decorations, AdvancedBody
7777
decoration.UpdateOrientation();
7878
}
7979
}
80-
// TODO: Update all decorations that are attached to this bone to maintain their previous orientations.
8180
Refresh();
8281
};
8382

‎Assets/Scripts/Controllers/SettingsManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public void Setup(SettingsView settingsView, bool setupForPauseScreen) {
302302
};
303303

304304
bool showQuitButton = false;
305-
#if UNITY_WINDOWS || UNITY_MACOS || UNITY_EDITOR
305+
#if UNITY_WINDOWS || UNITY_STANDALONE_OSX || UNITY_EDITOR
306306
showQuitButton = true;
307307
#endif
308308
SettingControl[] aboutSettingsControls = new SettingControl[showQuitButton ? 5 : 4];

‎Assets/Textures/camera.png‎

4.04 KB
Loading

‎Assets/Textures/camera.png.meta‎

Lines changed: 182 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Design/Evolution.sketch‎

-8.89 KB
Binary file not shown.

0 commit comments

Comments
 (0)
X Tutup