Skip to content

Commit

Permalink
Update unity and improve code
Browse files Browse the repository at this point in the history
  • Loading branch information
Guerra24 committed Jun 7, 2024
1 parent 6fc4c3f commit c2cd5c1
Show file tree
Hide file tree
Showing 31 changed files with 305 additions and 293 deletions.
2 changes: 1 addition & 1 deletion .github/game-ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GAMECI_IMAGE=unityci/editor:ubuntu-6000.0.2f1-windows-mono-3
ARG GAMECI_IMAGE=unityci/editor:ubuntu-6000.0.4f1-windows-mono-3
FROM $GAMECI_IMAGE

ARG BLENDER_SHORT_VERSION=3.5
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
strategy:
matrix:
build:
- { target-platform: StandaloneWindows64, image: 'unityci/editor:ubuntu-6000.0.2f1-windows-mono-3' }
- { target-platform: StandaloneLinux64, image: 'unityci/editor:ubuntu-6000.0.2f1-linux-il2cpp-3' }
- { target-platform: StandaloneWindows64, image: 'unityci/editor:ubuntu-6000.0.4f1-windows-mono-3' }
- { target-platform: StandaloneLinux64, image: 'unityci/editor:ubuntu-6000.0.4f1-linux-il2cpp-3' }
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
3 changes: 1 addition & 2 deletions Assets/Scenes/AlwaysLoaded.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -218,7 +217,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f8959b0d8693ed2479acaaffaa8f6a4d, type: 3}
m_Name:
m_EditorClassIdentifier:
Dialog: {fileID: 5870148006066236234, guid: 929a948e7e667ca4abbe0284823e3ed5, type: 3}
_dialog: {fileID: 6331452096440303288, guid: 929a948e7e667ca4abbe0284823e3ed5, type: 3}
--- !u!4 &1902987608
Transform:
m_ObjectHideFlags: 0
Expand Down
98 changes: 49 additions & 49 deletions Assets/Scenes/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1207,12 +1207,12 @@ PrefabInstance:
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Expand Down Expand Up @@ -1397,12 +1397,12 @@ PrefabInstance:
- target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: -9
objectReference: {fileID: 0}
- target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand Down Expand Up @@ -1447,12 +1447,12 @@ PrefabInstance:
- target: {fileID: 3731263543485166827, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3731263543485166827, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3731263543485166827, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand Down Expand Up @@ -1602,12 +1602,12 @@ PrefabInstance:
- target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_LocalPosition.x
value: -250
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_LocalPosition.y
value: 304
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6974992526447935581, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand All @@ -1632,7 +1632,7 @@ PrefabInstance:
- target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_LocalPosition.y
value: 304
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8211928304835922972, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand Down Expand Up @@ -2618,17 +2618,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down Expand Up @@ -3044,7 +3044,7 @@ MonoBehaviour:
m_FallbackState: 0
m_WaitForCompletion: 0
m_LocalVariables: []
Dialog: {fileID: 5870148006066236234, guid: 929a948e7e667ca4abbe0284823e3ed5, type: 3}
_dialog: {fileID: 6331452096440303288, guid: 929a948e7e667ca4abbe0284823e3ed5, type: 3}
OtherAvatars: {fileID: 1778950084}
ChangeAvatar: {fileID: 752966015}
Background: {fileID: 1997465280}
Expand Down Expand Up @@ -3077,32 +3077,32 @@ PrefabInstance:
- target: {fileID: 123716472919587500, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 123716472919587500, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 123716472919587500, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 885473348893351697, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 885473348893351697, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 885473348893351697, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 928665615356537823, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
Expand Down Expand Up @@ -3442,17 +3442,17 @@ PrefabInstance:
- target: {fileID: 8893846768399093815, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8893846768399093815, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8893846768399093815, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8919334697436194041, guid: 902103fdb18f1e74882b4e1b53857dd7,
type: 3}
Expand Down Expand Up @@ -5222,17 +5222,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down Expand Up @@ -5876,12 +5876,12 @@ PrefabInstance:
- target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: -9
objectReference: {fileID: 0}
- target: {fileID: 70972866194739485, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand Down Expand Up @@ -5921,12 +5921,12 @@ PrefabInstance:
- target: {fileID: 3731263543485166827, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3731263543485166827, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3731263543485166827, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand Down Expand Up @@ -6076,7 +6076,7 @@ PrefabInstance:
- target: {fileID: 4914328431171304639, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_LocalPosition.y
value: 304
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6974992526447935581, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand All @@ -6101,12 +6101,12 @@ PrefabInstance:
- target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_LocalPosition.x
value: 250
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7071451658218752593, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
propertyPath: m_LocalPosition.y
value: 304
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8211928304835922972, guid: d2bf08666f6585c4fb2de39208019ae2,
type: 3}
Expand Down Expand Up @@ -6439,17 +6439,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down Expand Up @@ -7646,12 +7646,12 @@ PrefabInstance:
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Expand Down Expand Up @@ -8994,17 +8994,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down Expand Up @@ -9287,17 +9287,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down Expand Up @@ -11498,17 +11498,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down Expand Up @@ -12082,17 +12082,17 @@ PrefabInstance:
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8866745772523254640, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8910265658418055102, guid: 2a0f8efce2f42a04c8d15d9a7c70378f,
type: 3}
Expand Down
Loading

0 comments on commit c2cd5c1

Please sign in to comment.