add

2024-11-05 08:07:27 +08:00 · 2024-11-05 08:07:27 +08:00 · 0d502ea39d
commit 0d502ea39d
parent 87e51ab6ec
4 changed files with 200 additions and 6 deletions
--- a/meng_yao/Assets/Scenes/cultivation_Jinsha_mine_slices.unity
+++ b/meng_yao/Assets/Scenes/cultivation_Jinsha_mine_slices.unity
@ -3563,7 +3563,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &616677246
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/Scenes/cultivation_diamond_mines_slices.unity
+++ b/meng_yao/Assets/Scenes/cultivation_diamond_mines_slices.unity
@ -2148,6 +2148,7 @@ MonoBehaviour:
  - {fileID: 0}
  BlackRoom: {fileID: 288519254}
  Boom: {fileID: 1998930180334184709, guid: 1af55f3362cdbd643937d48b138bef77, type: 3}
+  isbuy: 0
 --- !u!61 &406645527
 BoxCollider2D:
  m_ObjectHideFlags: 0
@ -2380,6 +2381,7 @@ MonoBehaviour:
  - {fileID: 0}
  BlackRoom: {fileID: 15430203}
  Boom: {fileID: 1998930180334184709, guid: 1af55f3362cdbd643937d48b138bef77, type: 3}
+  isbuy: 0
 --- !u!61 &487852323
 BoxCollider2D:
  m_ObjectHideFlags: 0
@ -2528,6 +2530,7 @@ MonoBehaviour:
  - {fileID: 0}
  BlackRoom: {fileID: 1523345301}
  Boom: {fileID: 1998930180334184709, guid: 1af55f3362cdbd643937d48b138bef77, type: 3}
+  isbuy: 0
 --- !u!61 &529455993
 BoxCollider2D:
  m_ObjectHideFlags: 0
@ -4483,6 +4486,7 @@ MonoBehaviour:
  - {fileID: 0}
  BlackRoom: {fileID: 1587198408}
  Boom: {fileID: 1998930180334184709, guid: 1af55f3362cdbd643937d48b138bef77, type: 3}
+  isbuy: 0
 --- !u!61 &1001982878
 BoxCollider2D:
  m_ObjectHideFlags: 0
@ -6051,7 +6055,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1322986661
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -7486,6 +7490,7 @@ MonoBehaviour:
  - {fileID: 0}
  BlackRoom: {fileID: 602509379}
  Boom: {fileID: 1998930180334184709, guid: 1af55f3362cdbd643937d48b138bef77, type: 3}
+  isbuy: 0
 --- !u!61 &1933833150
 BoxCollider2D:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/Scenes/loading.unity
+++ b/meng_yao/Assets/Scenes/loading.unity
@ -139,7 +139,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1125018133084166433, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
      propertyPath: m_RootOrder
-      value: 3
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 1125018133084166433, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
      propertyPath: m_AnchorMax.x
@ -801,6 +801,24 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 791536910}
  m_CullTransparentMesh: 1
+--- !u!1 &934962570 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1125018133084166437, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3}
+  m_PrefabInstance: {fileID: 107147069}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &934962577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 934962570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0302e7dfe12577a4198abcaca8c0284b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  globalFrameRate: 100
 --- !u!1 &1091198944
 GameObject:
  m_ObjectHideFlags: 0
@ -890,6 +908,7 @@ GameObject:
  - component: {fileID: 1125672639}
  - component: {fileID: 1125672638}
  - component: {fileID: 1125672642}
+  - component: {fileID: 1125672643}
  m_Layer: 5
  m_Name: Canvas
  m_TagString: Untagged
@ -978,7 +997,7 @@ RectTransform:
  - {fileID: 1828282687}
  - {fileID: 603807340}
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -1000,6 +1019,96 @@ MonoBehaviour:
  sceneslider: {fileID: 2057344806}
  logo_inbtn: {fileID: 603807337}
  loadSpeed: 0.5
+--- !u!114 &1125672643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1125672637}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0302e7dfe12577a4198abcaca8c0284b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  globalFrameRate: 100
+--- !u!1 &1156445952
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1156445955}
+  - component: {fileID: 1156445954}
+  - component: {fileID: 1156445953}
+  m_Layer: 5
+  m_Name: Prompt(Clone)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1156445953
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1156445952}
+  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: 21300000, guid: 6bc0ebd48ebefc74c883205a7d859531, 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 &1156445954
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1156445952}
+  m_CullTransparentMesh: 1
+--- !u!224 &1156445955
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1156445952}
+  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: 1538368489}
+  m_Father: {fileID: 0}
+  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, y: 424}
+  m_SizeDelta: {x: 294, y: 66}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1348751385
 GameObject:
  m_ObjectHideFlags: 0
@ -1160,6 +1269,86 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1352207951}
  m_CullTransparentMesh: 1
+--- !u!1 &1538368488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1538368489}
+  - component: {fileID: 1538368491}
+  - component: {fileID: 1538368490}
+  m_Layer: 5
+  m_Name: Prompttext
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1538368489
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1538368488}
+  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: 1156445955}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 176.2191, y: 59.1941}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1538368490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1538368488}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u64CD\u4F5C\u4E0D\u5F53\uFF01\uFF01\uFF01"
+--- !u!222 &1538368491
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1538368488}
+  m_CullTransparentMesh: 1
 --- !u!1 &1798988486
 GameObject:
  m_ObjectHideFlags: 0
@ -1252,7 +1441,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &1822326802
 GameObject:
--- a/meng_yao/Assets/script/Manager/JumpScene.cs
+++ b/meng_yao/Assets/script/Manager/JumpScene.cs
@ -33,7 +33,7 @@ public class JumpScene
    public const string shop_scene= "shop_scene";
    public const string signin= "signin";
    public const string upLevel_Scene= "upLevel_Scene";
-    public const string EcoTree = "EcoTree";
+    public const string EcoTree = "eco_tree";
    public const string cultivation_diamond_mines_slices = "cultivation_diamond_mines_slices";
    // Start is called before the first frame update