tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction

Browse Source
This commit is contained in:
AlexanderT
2025-12-19 13:00:46 +01:00
parent 243f25ccec 9b7c6d7bfe
commit 69a892295f
18 changed files with 1480 additions and 1749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1850
Assets/Scenes/Levels/AppleHillsOverworld.unity
View File

File diff suppressed because it is too large Load Diff

28
Assets/Scenes/MiniGames/FortFight.unity
View File

@@ -1261,14 +1261,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.4117647}
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: 0}
m_Sprite: {fileID: 5687196385624274142, guid: 1e50595e80a4d8b408110dbc7b2d2345, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1631,9 +1631,9 @@ Transform:
m_GameObject: {fileID: 377753195}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.2, y: 9.4, z: 0}
m_LocalScale: {x: 16.29907, y: 16.29907, z: 16.29907}
m_ConstrainProportionsScale: 0
m_LocalPosition: {x: 14.59, y: 11.48, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 1389618396}
m_Father: {fileID: 799036564}
@@ -1685,9 +1685,9 @@ SpriteRenderer:
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 1
m_MaskInteraction: 0
m_Sprite: {fileID: -2691095878991102790, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3}
m_Sprite: {fileID: -6036242290923586072, guid: b35fcfb1908605e4caf7b52545f96792, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1
m_FlipY: 0
@@ -2570,7 +2570,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.8, y: 0.5}
m_AnchorMax: {x: 0.8, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -100}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &552665971
@@ -3482,7 +3482,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: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -189}
m_SizeDelta: {x: 0, y: 150}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &692393852
@@ -3922,7 +3922,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -47}
m_AnchoredPosition: {x: 0, y: -90}
m_SizeDelta: {x: 500, y: 200}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &729789713
@@ -6553,7 +6553,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.2, y: 0.5}
m_AnchorMax: {x: 0.2, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -99.999954}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1410755665
@@ -8123,14 +8123,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.22745098}
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: 0}
m_Sprite: {fileID: 4392604554859733554, guid: 67317c7fff6a0c546aaebe8e65e7bf45, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -9085,7 +9085,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 49}
m_AnchoredPosition: {x: 0, y: 89}
m_SizeDelta: {x: 500, y: 250}
m_Pivot: {x: 0.5, y: 0}
--- !u!114 &1996879309