worlds md + workbench anim speed

Lunary-Labs · Jun 30, 2023 · 8b6ade4 · 8b6ade4
1 parent 98f4ca8
commit 8b6ade4
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 476 deletions.
diff --git a/Assets/Resources/Prefabs/cooker_ui/old_ui.prefab b/Assets/Resources/Prefabs/cooker_ui/old_ui.prefab
@@ -133,6 +133,30 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: menu_cooker, Assembly-CSharp
+        m_MethodName: delete_cooker_list
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: menu_cooker, Assembly-CSharp
+        m_MethodName: display_cooker
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &8000765254978216290
 GameObject:
   m_ObjectHideFlags: 0
@@ -166,8 +190,8 @@ RectTransform:
   m_Father: {fileID: 8000765255587208343}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.49857146, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -219,9 +243,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8000765255024872874}
   - component: {fileID: 8000765255024872873}
-  - component: {fileID: 8000765255024872872}
   m_Layer: 5
-  m_Name: Content
+  m_Name: recipe_list
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -271,19 +294,6 @@ MonoBehaviour:
   m_Spacing: {x: 250, y: 250}
   m_Constraint: 0
   m_ConstraintCount: 2
---- !u!114 &8000765255024872872
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8000765255024872875}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 578bc735d4722ed4b87029bd1f8d8457, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  recipe_prefab: {fileID: 7938832587734965300, guid: 8ea74949af31efa49abe82e80f836d82, type: 3}
 --- !u!1 &8000765255505047788
 GameObject:
   m_ObjectHideFlags: 0
@@ -318,7 +328,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -505,6 +515,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: menu_cooker, Assembly-CSharp
+        m_MethodName: delete_recipe_list
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!1 &8000765255581200655
 GameObject:
   m_ObjectHideFlags: 0
@@ -724,7 +746,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8000765255931479713
 RectTransform:
   m_ObjectHideFlags: 0
@@ -825,9 +847,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8000765255999366408}
-  - component: {fileID: 9204238315115097675}
+  - component: {fileID: 66603674}
+  - component: {fileID: 66603675}
   m_Layer: 5
-  m_Name: Content
+  m_Name: cooker_list
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -850,10 +873,34 @@ 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.0001449585, y: 0.00008872083}
-  m_SizeDelta: {x: 0, y: 300}
+  m_AnchoredPosition: {x: 0.000061035156, y: 0.00008872083}
+  m_SizeDelta: {x: -880, y: 816}
   m_Pivot: {x: 0, y: 1}
---- !u!114 &9204238315115097675
+--- !u!114 &66603674
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8000765255999366409}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 70
+    m_Right: 0
+    m_Top: 80
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 450, y: 736}
+  m_Spacing: {x: 50, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
+--- !u!114 &66603675
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -862,10 +909,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 8000765255999366409}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6299cc95752a3ad4999462633ea3c659, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cooker_prefab: {fileID: 7550098772783707856, guid: 772584ff66683e14d999687ab09dfbc4, type: 3}
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
 --- !u!1 &8000765256148785691
 GameObject:
   m_ObjectHideFlags: 0
@@ -1005,9 +1053,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -17}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8000765256176146403
 CanvasRenderer:
@@ -1193,6 +1241,30 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: menu_manager, Assembly-CSharp
+        m_MethodName: display_cooker
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
+      - m_Target: {fileID: 8000765256391926645}
+        m_TargetAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
+        m_MethodName: set_interactable
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &8000765256786309671
 GameObject:
   m_ObjectHideFlags: 0
@@ -1229,9 +1301,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8000765256786309691
 CanvasRenderer:
@@ -1302,7 +1374,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8000765256795869997
 RectTransform:
   m_ObjectHideFlags: 0

diff --git a/Assets/Resources/Prefabs/cooker_ui/ui_recipe_displayer.prefab b/Assets/Resources/Prefabs/cooker_ui/ui_recipe_displayer.prefab
@@ -147,10 +147,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1c521efa9fc71e24f8e94edf0328d718, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  change_recipe_ui: {fileID: 0}
-  cooker_ui: {fileID: 0}
-  recipe_displayer_script: {fileID: 0}
-  close: {fileID: 0}
 --- !u!1 &3916661893239330461
 GameObject:
   m_ObjectHideFlags: 0
@@ -1237,7 +1233,6 @@ GameObject:
   - component: {fileID: 7502059007434156940}
   - component: {fileID: 7502059007434156936}
   - component: {fileID: 7502059007434156939}
-  - component: {fileID: 7502059007434156938}
   - component: {fileID: 7502059007434156941}
   m_Layer: 5
   m_Name: recipe_cooker
@@ -1316,62 +1311,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &7502059007434156938
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7502059007041650602}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7502059007434156939}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 7502059007434156941}
-        m_TargetAssemblyTypeName: choose_recipe_button, Assembly-CSharp
-        m_MethodName: on_click
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!114 &7502059007434156941
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1384,12 +1323,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7a1683ddbd448914f9a3999bd9d9b56f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  menu_manager: {fileID: 0}
+  script_menu_cooker: {fileID: 0}
   recipe_name: 
   cooker_name: 
   game_controller: {fileID: 0}
-  close: {fileID: 0}
   displayer: {fileID: 0}
-  displayer_script: {fileID: 0}
 --- !u!1 &7502059007286011784
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Resources/Prefabs/islands/island_1/island_1_lvl_0.prefab b/Assets/Resources/Prefabs/islands/island_1/island_1_lvl_0.prefab
@@ -549,6 +549,7 @@ MonoBehaviour:
   fields: []
   cats: []
   child_tilemap_colliders: []
+  workbench: {fileID: 0}
   total_island_ressources: 0
 --- !u!156049354 &4097405454852465987
 Grid: