Browse Source

场景完善,ui图层bug修改

pull/51/head
45 1 year ago
parent
commit
5f1805f3c5
  1. 14
      ColorlessWorld-2024-4-2/Assets/Image/MapUnityAnim/MapUnity _2.controller
  2. 2
      ColorlessWorld-2024-4-2/Assets/Image/MapUnityAnim/Normal.anim
  3. 9
      ColorlessWorld-2024-4-2/Assets/Image/开始地面动画/BookGround/BookAnim/BookAnim.fbx.meta
  4. 15
      ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab
  5. 755
      ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
  6. 6
      ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity
  7. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs
  8. 17
      ColorlessWorld-2024-4-2/Assets/Scripts/UI/AddUIToHideUICrtl.cs
  9. 11
      ColorlessWorld-2024-4-2/Assets/Scripts/UI/AddUIToHideUICrtl.cs.meta
  10. 33
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs
  11. 11
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs.meta
  12. 2
      ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

14
ColorlessWorld-2024-4-2/Assets/Image/MapUnityAnim/MapUnity _2.controller

@ -44,11 +44,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -85,7 +85,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpAndChange
m_Speed: 1.5
m_Speed: 1.3
m_CycleOffset: 0
m_Transitions:
- {fileID: 8295689702687532929}
@ -146,11 +146,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.88
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

2
ColorlessWorld-2024-4-2/Assets/Image/MapUnityAnim/Normal.anim

@ -70,7 +70,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0

9
ColorlessWorld-2024-4-2/Assets/Image/开始地面动画/BookGround/BookAnim/BookAnim.fbx.meta

@ -244,7 +244,14 @@ ModelImporter:
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
events:
- time: 0.010989011
functionName: BookPageVoicePlayer
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 2
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}

15
ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab

@ -344,6 +344,7 @@ GameObject:
- component: {fileID: 8570734685845233804}
- component: {fileID: 6055812006071397122}
- component: {fileID: 2423811669981212207}
- component: {fileID: 1929445142485092888}
m_Layer: 10
m_Name: EnemyInSenceCanvas(Clone)
m_TagString: Untagged
@ -420,7 +421,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
m_PresetInfoIsWorld: 1
--- !u!114 &8739798778191560965
MonoBehaviour:
m_ObjectHideFlags: 0
@ -496,6 +497,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_camera: {fileID: 0}
--- !u!114 &1929445142485092888
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 964438308613443404}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d9af96d3efeea7643b6681771fa498c2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1844870834168589050
GameObject:
m_ObjectHideFlags: 0

755
ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@ -3507,6 +3507,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: ShowUIBar
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 &218472044
MonoBehaviour:
m_ObjectHideFlags: 0
@ -3739,6 +3751,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &239420340
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 239420341}
- component: {fileID: 239420343}
- component: {fileID: 239420342}
m_Layer: 5
m_Name: Image (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &239420341
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 239420340}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1840237607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &239420342
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 239420340}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: -1766650982, guid: 0b8cc0450c9f8d84eb3efbe059bada77, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &239420343
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 239420340}
m_CullTransparentMesh: 1
--- !u!1 &253958914
GameObject:
m_ObjectHideFlags: 0
@ -5845,6 +5932,7 @@ Transform:
- {fileID: 1251297425}
- {fileID: 1766672721}
- {fileID: 430040821}
- {fileID: 1607756701}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &350066633
@ -8797,6 +8885,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: HideUIBar
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!114 &471985940
MonoBehaviour:
m_ObjectHideFlags: 0
@ -9021,6 +9121,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: ShowUIBar
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 &475017436
MonoBehaviour:
m_ObjectHideFlags: 0
@ -12348,6 +12460,81 @@ MonoBehaviour:
startRotation: -90
speed: 50
rotationPos: {fileID: 0}
--- !u!1 &643048635
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 643048636}
- component: {fileID: 643048638}
- component: {fileID: 643048637}
m_Layer: 5
m_Name: Image (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &643048636
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 643048635}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1840237607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &643048637
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 643048635}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: -1766650982, guid: 0b8cc0450c9f8d84eb3efbe059bada77, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &643048638
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 643048635}
m_CullTransparentMesh: 1
--- !u!1 &669923021
GameObject:
m_ObjectHideFlags: 0
@ -14960,6 +15147,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: HideUIBar
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!114 &816979503
MonoBehaviour:
m_ObjectHideFlags: 0
@ -15442,7 +15641,6 @@ RectTransform:
m_Children:
- {fileID: 1504140803}
- {fileID: 442538738}
- {fileID: 1748859174}
- {fileID: 1317009332}
- {fileID: 1293189437}
- {fileID: 1998717001}
@ -21270,6 +21468,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1191866219
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1191866220}
- component: {fileID: 1191866222}
- component: {fileID: 1191866221}
m_Layer: 5
m_Name: Image (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1191866220
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1191866219}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1840237607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1191866221
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1191866219}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: -1766650982, guid: 0b8cc0450c9f8d84eb3efbe059bada77, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1191866222
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1191866219}
m_CullTransparentMesh: 1
--- !u!1 &1199482893
GameObject:
m_ObjectHideFlags: 0
@ -21889,6 +22162,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: HideUIBar
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!114 &1225743233
MonoBehaviour:
m_ObjectHideFlags: 0
@ -25401,6 +25686,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: HideUIBar
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 &1437895613
GameObject:
m_ObjectHideFlags: 0
@ -25412,6 +25709,7 @@ GameObject:
- component: {fileID: 1437895614}
- component: {fileID: 1437895616}
- component: {fileID: 1437895615}
- component: {fileID: 1437895617}
m_Layer: 0
m_Name: playerUI
m_TagString: Untagged
@ -25501,6 +25799,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1437895617
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1437895613}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d9af96d3efeea7643b6681771fa498c2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1442274114
GameObject:
m_ObjectHideFlags: 0
@ -26659,6 +26969,8 @@ RectTransform:
- {fileID: 669923022}
- {fileID: 83788479}
- {fileID: 1143340466}
- {fileID: 1840237607}
- {fileID: 1748859174}
m_Father: {fileID: 846544929}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -26883,6 +27195,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1522578862
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1522578863}
- component: {fileID: 1522578865}
- component: {fileID: 1522578864}
m_Layer: 5
m_Name: Image (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1522578863
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1522578862}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1840237607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1522578864
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1522578862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: -1766650982, guid: 0b8cc0450c9f8d84eb3efbe059bada77, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1522578865
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1522578862}
m_CullTransparentMesh: 1
--- !u!1 &1524380207
GameObject:
m_ObjectHideFlags: 0
@ -28515,6 +28902,56 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1607756700
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1607756701}
- component: {fileID: 1607756702}
m_Layer: 0
m_Name: HideUIBarManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1607756701
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607756700}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 348176937}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1607756702
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607756700}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c3495e636facc2244848c59b08ae0bb2, type: 3}
m_Name:
m_EditorClassIdentifier:
roleUIBarList: []
uiList:
- {fileID: 809894445}
- {fileID: 1803518537}
- {fileID: 328558925}
- {fileID: 893839548}
--- !u!1 &1608025176
GameObject:
m_ObjectHideFlags: 0
@ -28622,6 +29059,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: ShowUIBar
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 &1608025179
MonoBehaviour:
m_ObjectHideFlags: 0
@ -29102,6 +29551,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: HideUIBar
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 &1627366718
GameObject:
m_ObjectHideFlags: 0
@ -31036,7 +31497,7 @@ GameObject:
- component: {fileID: 1748859175}
- component: {fileID: 1748859177}
m_Layer: 5
m_Name: legacyPanel
m_Name: RelicPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -31050,17 +31511,17 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1748859173}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalPosition: {x: 0, y: 0, z: 0.000060122}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 846544929}
m_Father: {fileID: 1504140803}
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: -715.26, y: 417}
m_SizeDelta: {x: 447.9592, y: 46.02}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -43.109985, y: -69.283}
m_SizeDelta: {x: 154.54, y: 173.66}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1748859175
MonoBehaviour:
m_ObjectHideFlags: 0
@ -31112,15 +31573,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 6
m_Right: 0
m_Top: 0
m_Top: 13
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 45, y: 45}
m_Spacing: {x: 10, y: 10}
m_CellSize: {x: 40, y: 40}
m_Spacing: {x: 10, y: 15}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &1750187011
@ -32408,6 +32869,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1607756702}
m_TargetAssemblyTypeName: HideUIBarManager, Assembly-CSharp
m_MethodName: ShowUIBar
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 &1792619722
MonoBehaviour:
m_ObjectHideFlags: 0
@ -32446,6 +32919,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792619719}
m_CullTransparentMesh: 1
--- !u!1 &1792629818
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1792629819}
- component: {fileID: 1792629821}
- component: {fileID: 1792629820}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1792629819
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792629818}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1840237607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1792629820
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792629818}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: -1766650982, guid: 0b8cc0450c9f8d84eb3efbe059bada77, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1792629821
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1792629818}
m_CullTransparentMesh: 1
--- !u!1 &1793415341
GameObject:
m_ObjectHideFlags: 0
@ -33393,6 +33941,112 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1833978457}
m_CullTransparentMesh: 1
--- !u!1 &1840237606
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1840237607}
- component: {fileID: 1840237610}
- component: {fileID: 1840237609}
- component: {fileID: 1840237608}
m_Layer: 5
m_Name: RelicListSlot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1840237607
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1840237606}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1792629819}
- {fileID: 2117866914}
- {fileID: 1522578863}
- {fileID: 643048636}
- {fileID: 1191866220}
- {fileID: 239420341}
m_Father: {fileID: 1504140803}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -41.859985, y: -69.28}
m_SizeDelta: {x: 157.04, y: 173.67}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1840237608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1840237606}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 5
m_Right: 0
m_Top: 5
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 45, y: 50}
m_Spacing: {x: 5, y: 5}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!114 &1840237609
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1840237606}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
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: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1840237610
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1840237606}
m_CullTransparentMesh: 1
--- !u!1 &1845795078
GameObject:
m_ObjectHideFlags: 0
@ -37370,6 +38024,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2106515562}
m_CullTransparentMesh: 1
--- !u!1 &2117866913
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2117866914}
- component: {fileID: 2117866916}
- component: {fileID: 2117866915}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2117866914
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2117866913}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1840237607}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2117866915
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2117866913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
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: -1766650982, guid: 0b8cc0450c9f8d84eb3efbe059bada77, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &2117866916
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2117866913}
m_CullTransparentMesh: 1
--- !u!1 &2120932318
GameObject:
m_ObjectHideFlags: 0

6
ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity

@ -21002,15 +21002,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 22
m_Left: 50
m_Right: 0
m_Top: 22
m_Top: 30
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 125, y: 200}
m_Spacing: {x: 22, y: 22}
m_Spacing: {x: 80, y: 60}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &1715692589

2
ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs

@ -87,6 +87,7 @@ public class ShopManager : Singleton <ShopManager>
for (int i = 0; i < cardDeck.Count; i++)
{
var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardDeck[i], cardFatherPanle.transform);
card.transform.localScale = new Vector3(1.2f, 1.2f, 1.2f);
CardMapNode cardMapNode = card.GetComponent<CardMapNode>();
cardMapNode.button.onClick.AddListener(cardMapNode.ChangeColor);
cardMap.Add(card);
@ -104,6 +105,7 @@ public class ShopManager : Singleton <ShopManager>
for (int i = 0; i < cardDeck.Count; i++)
{
var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardDeck[i], cardFatherPanle.transform);
card.transform.localScale = new Vector3(1.2f, 1.2f, 1.2f);
CardMapNode cardMapNode = card.GetComponent<CardMapNode>();
cardMapNode.button.onClick.AddListener(cardMapNode.DeleteCard);
cardMap.Add(card);

17
ColorlessWorld-2024-4-2/Assets/Scripts/UI/AddUIToHideUICrtl.cs

@ -0,0 +1,17 @@
using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
public class AddUIToHideUICrtl : MonoBehaviour
{
private void Start()
{
HideUIBarManager.Instance.roleUIBarList.Add(this.gameObject);
}
private void OnDestroy()
{
HideUIBarManager.Instance.roleUIBarList.Remove(this.gameObject);
}
}

11
ColorlessWorld-2024-4-2/Assets/Scripts/UI/AddUIToHideUICrtl.cs.meta

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d9af96d3efeea7643b6681771fa498c2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

33
ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs

@ -0,0 +1,33 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class HideUIBarManager : Singleton <HideUIBarManager>
{
public List<GameObject> roleUIBarList = new List<GameObject>();
public List<GameObject> uiList = new List<GameObject>();
public void HideUIBar()
{
Debug.Log("¿ªÊ¼");
foreach (GameObject uiBar in roleUIBarList )
{
Debug.Log("¿ªÊ¼"+uiBar .name );
uiBar.SetActive(false);
}
}
public void ShowUIBar()
{
if(uiList .Count >0)
{
foreach(GameObject ui in uiList )
{
if (ui.activeInHierarchy == true)
return;
}
}
foreach (GameObject uiBar in roleUIBarList)
{
uiBar.SetActive(true);
}
}
}

11
ColorlessWorld-2024-4-2/Assets/Scripts/manager/HideUIBarManager.cs.meta

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c3495e636facc2244848c59b08ae0bb2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs

@ -34,7 +34,7 @@ public class ScenceLoadManager : Singleton <ScenceLoadManager>
if(operation .progress >=0.9f)
{
slider.value = 1;
text.text = "Press AnyKey to Continue";
text.text = "100%";
operation.allowSceneActivation = true;
// if (Input .anyKeyDown )
}

Loading…
Cancel
Save