cxhy 1 jaar geleden
bovenliggende
commit
d95fa60cc4

+ 96 - 4
Assets/Resources/Pages/FullLoading.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5293469706244878279
 RectTransform:
   m_ObjectHideFlags: 0
@@ -146,6 +146,7 @@ GameObject:
   - component: {fileID: 8722643057276889896}
   - component: {fileID: 958717185263664692}
   - component: {fileID: 2101706619208001318}
+  - component: {fileID: 6388824265696154182}
   m_Layer: 5
   m_Name: FullLoading
   m_TagString: Untagged
@@ -243,6 +244,97 @@ MonoBehaviour:
   WaitingText: {fileID: 5689972781898047922}
   strs: []
   interval: 1
+--- !u!114 &6388824265696154182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2320301382847433757}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c10d422b52559da41aa9676770a8fc65, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animationSteps:
+  - rid: 3252789131541741585
+  - rid: 3252789131541741587
+  updateType: 0
+  timeScaleIndependent: 0
+  autoplayMode: 0
+  startPaused: 0
+  playbackSpeed: 1
+  playType: 0
+  loops: 0
+  loopType: 0
+  autoKill: 1
+  onStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onFinishedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onProgressEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  progress: -1
+  references:
+    version: 2
+    RefIds:
+    - rid: 3252789131541741585
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0
+        flowType: 1
+        target: {fileID: 8929063670908114469}
+        duration: 0.5
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741586
+    - rid: 3252789131541741586
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: -300, y: -300}
+    - rid: 3252789131541741587
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0
+        flowType: 1
+        target: {fileID: 6322627560309483010}
+        duration: 0.5
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741588
+    - rid: 3252789131541741588
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: 300, y: -300}
 --- !u!1 &6322627560309483010
 GameObject:
   m_ObjectHideFlags: 0
@@ -276,9 +368,9 @@ RectTransform:
   m_Father: {fileID: 5033671520054610316}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.00012207031, y: 12.539429}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -27, y: 149}
   m_SizeDelta: {x: 784.1509, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1825001914060552140

+ 274 - 1
Assets/Resources/Pages/Hall.prefab

@@ -665,6 +665,7 @@ GameObject:
   - component: {fileID: 8722643057276889896}
   - component: {fileID: 958717185263664692}
   - component: {fileID: 5805354459614382044}
+  - component: {fileID: 7320766700150570376}
   m_Layer: 5
   m_Name: Hall
   m_TagString: Untagged
@@ -778,6 +779,208 @@ MonoBehaviour:
     type: 3}
   RankPagePrefab: {fileID: 2320301382847433757, guid: 793d87795733148cfb181964580f39e6,
     type: 3}
+--- !u!114 &7320766700150570376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2320301382847433757}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c10d422b52559da41aa9676770a8fc65, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animationSteps:
+  - rid: 3252789131541741568
+  - rid: 3252789131541741570
+  - rid: 3252789131541741572
+  - rid: 3252789131541741574
+  - rid: 3252789131541741576
+  - rid: 3252789131541741578
+  updateType: 0
+  timeScaleIndependent: 0
+  autoplayMode: 0
+  startPaused: 0
+  playbackSpeed: 1
+  playType: 0
+  loops: 0
+  loopType: 0
+  autoKill: 1
+  onStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onFinishedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onProgressEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  progress: -1
+  references:
+    version: 2
+    RefIds:
+    - rid: 3252789131541741568
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0
+        flowType: 0
+        target: {fileID: 5315520779364543499}
+        duration: 1
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741569
+    - rid: 3252789131541741569
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: 300, y: 0}
+    - rid: 3252789131541741570
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0.3
+        flowType: 1
+        target: {fileID: 6876463441750245131}
+        duration: 0.5
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741571
+    - rid: 3252789131541741571
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: 0, y: -100}
+    - rid: 3252789131541741572
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0.6
+        flowType: 1
+        target: {fileID: 6972088974716066159}
+        duration: 0.5
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741573
+    - rid: 3252789131541741573
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: 0, y: -100}
+    - rid: 3252789131541741574
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0.9
+        flowType: 1
+        target: {fileID: 7257612497168266014}
+        duration: 0.5
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741575
+    - rid: 3252789131541741575
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: 0, y: -100}
+    - rid: 3252789131541741576
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0.5
+        flowType: 1
+        target: {fileID: 8206910322309076502}
+        duration: 0.8
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741577
+    - rid: 3252789131541741577
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: -300, y: 0}
+    - rid: 3252789131541741578
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0.5
+        flowType: 0
+        target: {fileID: 6322414869804566667}
+        duration: 1
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741580
+    - rid: 3252789131541741580
+      type: {class: ScaleDOTweenAction, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        scale: {x: 0, y: 0, z: 0}
+        axisConstraint: 0
 --- !u!1 &2487405070085330371
 GameObject:
   m_ObjectHideFlags: 0
@@ -2562,6 +2765,7 @@ GameObject:
   - component: {fileID: 5646676679600042430}
   - component: {fileID: 1521863231992944807}
   - component: {fileID: 3131513324142113046}
+  - component: {fileID: 1211603530351500084}
   m_Layer: 0
   m_Name: Top
   m_TagString: Untagged
@@ -2646,6 +2850,69 @@ MonoBehaviour:
   NickName: {fileID: 8763332360987252658}
   UserId: {fileID: 1942265979008946481}
   Avatar: {fileID: 6676254260714493409}
+--- !u!114 &1211603530351500084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6927249455338882758}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c10d422b52559da41aa9676770a8fc65, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animationSteps:
+  - rid: 3252789131541741583
+  updateType: 0
+  timeScaleIndependent: 0
+  autoplayMode: 0
+  startPaused: 0
+  playbackSpeed: 1
+  playType: 0
+  loops: 0
+  loopType: 0
+  autoKill: 1
+  onStartEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onFinishedEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  onProgressEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  progress: -1
+  references:
+    version: 2
+    RefIds:
+    - rid: 3252789131541741583
+      type: {class: DOTweenAnimationStep, ns: BrunoMikoski.AnimationSequencer, asm: BrunoMikoski.AnimationSequencer}
+      data:
+        delay: 0
+        flowType: 0
+        target: {fileID: 6927249455338882758}
+        duration: 1
+        loopCount: 0
+        loopType: 0
+        actions:
+        - rid: 3252789131541741584
+    - rid: 3252789131541741584
+      type: {class: AnchoredPositionMoveToPositionDOTweenActionBase, ns: BrunoMikoski.AnimationSequencer,
+        asm: BrunoMikoski.AnimationSequencer}
+      data:
+        direction: 1
+        ease:
+          ease: 7
+          curve:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+        isRelative: 1
+        axisConstraint: 0
+        position: {x: 0, y: 300}
 --- !u!1 &6972088974716066159
 GameObject:
   m_ObjectHideFlags: 0
@@ -4684,7 +4951,7 @@ MonoBehaviour:
     type: 3}
   m_PrefabInstance: {fileID: 5897341274079369739}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 8206910322309076502}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 96c7c9ebc8f6d4ae6a29c05d072531b0, type: 3}
@@ -4696,3 +4963,9 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5897341274079369739}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8206910322309076502 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2320301382847433757, guid: 0a8abaf38bee84b4facbbad1456c728e,
+    type: 3}
+  m_PrefabInstance: {fileID: 5897341274079369739}
+  m_PrefabAsset: {fileID: 0}

+ 11 - 10
Assets/Resources/Pages/Items/UICook.prefab

@@ -191,6 +191,7 @@ MonoBehaviour:
   Start1: {fileID: 4971582106972502929}
   Start2: {fileID: 2180459523888859533}
   Start3: {fileID: 5980297441031021211}
+  nameText: {fileID: 0}
   timesText: {fileID: 1796207222758062456}
   diamondText: {fileID: 4817105680325067600}
   BuyButton: {fileID: 5089361490020655879}
@@ -230,7 +231,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 197}
+  m_AnchoredPosition: {x: 0, y: 132}
   m_SizeDelta: {x: 400, y: 400}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!20 &8140807540464728076
@@ -345,7 +346,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 17, y: 76}
+  m_AnchoredPosition: {x: 17, y: 11}
   m_SizeDelta: {x: 693, y: 167}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4440440263253707096
@@ -558,7 +559,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7, y: -103}
+  m_AnchoredPosition: {x: 7, y: -168}
   m_SizeDelta: {x: 523, y: 183}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5436616318738068219
@@ -817,7 +818,7 @@ RectTransform:
   m_GameObject: {fileID: 4921741663458498647}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6370675529575693715}
@@ -828,7 +829,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 27, y: -335}
+  m_AnchoredPosition: {x: 27, y: -381}
   m_SizeDelta: {x: 600, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7594016175094271394
@@ -1081,7 +1082,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3, y: -543}
+  m_AnchoredPosition: {x: 3, y: -546}
   m_SizeDelta: {x: 395, y: 116}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3074599546837653110
@@ -1375,7 +1376,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 11, y: -305}
+  m_AnchoredPosition: {x: 11, y: -370}
   m_SizeDelta: {x: 645, y: 191}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7987284269521148234
@@ -1577,7 +1578,7 @@ RectTransform:
   m_GameObject: {fileID: 7267707822658182053}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4430844013683612294}
@@ -1585,7 +1586,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 323}
+  m_AnchoredPosition: {x: 0, y: 216}
   m_SizeDelta: {x: 800, y: 800}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5000600761884269468
@@ -1792,7 +1793,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -4.3987, y: 16}
+  m_AnchoredPosition: {x: -4.3987, y: -49}
   m_SizeDelta: {x: 735.8, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5901240215778313834