Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

西部牛仔
2025-01-09 16:45:00 +08:00 · 2025-01-09 16:44:52 +08:00
4 changed files with 340 additions and 204 deletions
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
@ -2151,6 +2151,17 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 8631885451795898585, guid: 638b7f7423db411419568d073208d929, type: 3}
  m_PrefabInstance: {fileID: 29069100}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &29069102 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8631885451795898584, guid: 638b7f7423db411419568d073208d929, type: 3}
+  m_PrefabInstance: {fileID: 29069100}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 97513649}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &29151551
 GameObject:
  m_ObjectHideFlags: 0
@ -20447,7 +20458,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 1
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: 
+  m_Text: 11
 --- !u!222 &218069516
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -25695,7 +25706,6 @@ RectTransform:
  m_Children:
  - {fileID: 1996891429}
  - {fileID: 917784962}
-  - {fileID: 1067400303}
  m_Father: {fileID: 1276678947}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -25799,7 +25809,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  btn: {fileID: 282339284}
-  Text: {fileID: 1067400302}
+  Text: {fileID: 725912347}
  TextIsShow: 0
 --- !u!1 &282845201
 GameObject:
@ -57113,86 +57123,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 602911101}
  m_CullTransparentMesh: 1
--- !u!1 &605751577
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 605751578}
-  - component: {fileID: 605751580}
-  - component: {fileID: 605751579}
-  m_Layer: 6
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &605751578
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 605751577}
-  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: 1067400303}
-  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: 423.7929, y: 272.9289}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &605751579
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 605751577}
-  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: 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_FontData:
-    m_Font: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 59
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u897F\u90E8\u725B\u4ED4\u89C4\u5219\uFF1A\n\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219\u89C4\u5219"
--- !u!222 &605751580
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 605751577}
-  m_CullTransparentMesh: 1
 --- !u!1 &606204838
 GameObject:
  m_ObjectHideFlags: 0
@ -70083,6 +70013,168 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 724827065}
  m_CullTransparentMesh: 1
+--- !u!1001 &725912345
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1276678947}
+    m_Modifications:
+    - target: {fileID: 5597939931395878172, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5597939931395878172, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7936264300587005402, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7936264300587005402, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8255490281776792409, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8255490281776792409, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8255490281776792409, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668362755610848, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668362755610848, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668362755610848, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668362755610848, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -978
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -1818
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 448
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 745
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8266668363385741885, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+      propertyPath: m_Name
+      value: GameplayPlane
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+--- !u!224 &725912346 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8266668363385741884, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+  m_PrefabInstance: {fileID: 725912345}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &725912347 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8266668363385741885, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+  m_PrefabInstance: {fileID: 725912345}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &725912348 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8266668362755610847, guid: c8cee8188671fe34d82f935dd7d24c2d, type: 3}
+  m_PrefabInstance: {fileID: 725912345}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &727876603
 GameObject:
  m_ObjectHideFlags: 0
@ -85365,13 +85457,14 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 906771042}
+  - component: {fileID: 906771043}
  m_Layer: 5
  m_Name: Western_Cowboy
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &906771042
 RectTransform:
  m_ObjectHideFlags: 0
@ -85393,6 +85486,24 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &906771043
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 906771041}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9163bcd1e1639854aae4695bd6c798d4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  balance: {fileID: 1957443750}
+  intro_text: {fileID: 725912348}
+  bettings: []
+  Tourubtn: {fileID: 1677461938}
+  TimeText: {fileID: 418578358}
+  returnbtn: {fileID: 29069102}
 --- !u!1 &908599582
 GameObject:
  m_ObjectHideFlags: 0
@ -89888,7 +89999,7 @@ MonoBehaviour:
  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  m_CustomCaretColor: 0
  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
+  m_Text: 11
  m_CaretBlinkRate: 0.85
  m_CaretWidth: 1
  m_ReadOnly: 0
@ -100482,83 +100593,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1067161157}
  m_CullTransparentMesh: 1
--- !u!1 &1067400302
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1067400303}
-  - component: {fileID: 1067400305}
-  - component: {fileID: 1067400304}
-  m_Layer: 6
-  m_Name: rulesBg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &1067400303
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1067400302}
-  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: 605751578}
-  m_Father: {fileID: 282339283}
-  m_RootOrder: 2
-  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: -336, y: -137}
-  m_SizeDelta: {x: 470, y: 318}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1067400304
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1067400302}
-  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: 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_Sprite: {fileID: 21300000, guid: a3316af5bc37dfd489918ebf6b28ceb9, 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 &1067400305
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1067400302}
-  m_CullTransparentMesh: 1
 --- !u!1 &1068389282
 GameObject:
  m_ObjectHideFlags: 0
@ -120491,6 +120525,7 @@ RectTransform:
  - {fileID: 1957443749}
  - {fileID: 29151552}
  - {fileID: 282339283}
+  - {fileID: 725912346}
  m_Father: {fileID: 906771042}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -176147,7 +176182,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1872934998}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
  m_Name: 
@ -185001,35 +185036,35 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 284
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241791779464, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 428
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489241841894086, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -43
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4284489242025471100, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
      propertyPath: m_IsActive
@ -185062,6 +185097,17 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 4284489241738703987, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
  m_PrefabInstance: {fileID: 1957443748}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1957443750 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4284489241406162018, guid: cb107975b9c5d0340b2b96ff946e1b93, type: 3}
+  m_PrefabInstance: {fileID: 1957443748}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1959507340
 GameObject:
  m_ObjectHideFlags: 0
--- a/meng_yao/Assets/script/scene_Main/Thebestfishman/WebFishingPK.cs
+++ b/meng_yao/Assets/script/scene_Main/Thebestfishman/WebFishingPK.cs
@ -49,7 +49,7 @@ public class WebFishingPK : MonoBehaviour
    public Button returnbtn;
    private async void Awake()
    {
-        await ConnectWebSocket();
+        ///await ConnectWebSocket();
    }
    private async void Start()
    {
--- a/meng_yao/Assets/script/scene_Main/Thebestfishman/WebJoinroom.cs
+++ b/meng_yao/Assets/script/scene_Main/Thebestfishman/WebJoinroom.cs
@ -40,7 +40,7 @@ public class WebJoinroom : MonoBehaviour
    public Button returnbtn;
    private async void Awake()
    {
-        await ConnectWebSocket();
+       // await ConnectWebSocket();
    }
    private async void Start()
    {
@ -48,7 +48,7 @@ public class WebJoinroom : MonoBehaviour
        TimeText.gameObject.transform.parent.gameObject.SetActive(false);
        Debug.Log(PlayerPrefs.GetString("UserToken"));
        AuthorizationValue = PlayerPrefs.GetString("UserToken");
-
+        await ConnectWebSocket();
        returnbtn.onClick.AddListener(async () =>
        {
            await SendJsonMessage("{ \"code\": \"FISHING\", \"content\": \"{\\\"action\\\":\\\"LEAVE\\\"}\" }");
--- a/meng_yao/Assets/script/scene_Main/Thebestfishman/Westerncowboy.cs
+++ b/meng_yao/Assets/script/scene_Main/Thebestfishman/Westerncowboy.cs
@ -15,11 +15,13 @@ public class Westerncowboy : MonoBehaviour
    private ClientWebSocket _webSocket;
    private const string WebSocketUri = "ws://47.95.201.243:9527/api/ws";
    private string AuthorizationValue;
-    public int count = 0;
-    //界面元素
+    
+    /// <summary>
+    /// ½çÃæÔªËØ
+    /// </summary>
    public Text balance;
    public Text intro_text;
-    public Text surpluscount_text;
+    public Text[]  bettings;
    public Button Tourubtn;
    private float lastCallTime = 0f;
    float remainingTime = 0f;
@ -33,7 +35,7 @@ public class Westerncowboy : MonoBehaviour
    public Button returnbtn;
    private async void Awake()
    {
-        await ConnectWebSocket();
+        //await ConnectWebSocket();
    }
    private async void Start()
    {
@ -41,7 +43,7 @@ public class Westerncowboy : MonoBehaviour
        TimeText.gameObject.transform.parent.gameObject.SetActive(false);
        Debug.Log(PlayerPrefs.GetString("UserToken"));
        AuthorizationValue = PlayerPrefs.GetString("UserToken");
-
+        await ConnectWebSocket();

        returnbtn.onClick.AddListener(async () =>
        {
@ -107,47 +109,73 @@ public class Westerncowboy : MonoBehaviour
                        switch (baseResponse.code)
                        {
                            // 解析消息为 Fishresponse 对象
-                            case "FISHING_INFO":
+                            case "WEST_COWBOY_INFO":
                                // 解析为 FishJoinroomresponse 类型
-                                FishJoinroomresponse fishResponse = JsonConvert.DeserializeObject<FishJoinroomresponse>(message);
+                                WesternInforesponse fishResponse = JsonConvert.DeserializeObject<WesternInforesponse>(message);
                                
                                if (fishResponse?.data != null)
                                {
-                                    
+                                    Debug.Log(fishResponse.data.balance);
+                                    Debug.Log(fishResponse.data.intro_text);
+                                    Debug.Log(fishResponse.data.countdown);
+                                    Debug.Log(fishResponse.data.countdown_type);
+                                    foreach (var item in fishResponse.data.betting_data)
+                                    {
+                                        Debug.Log(""+item.pos_8);
+                                        Debug.Log("" + item.pos_7);
+                                        Debug.Log("" + item.pos_6);
+                                        Debug.Log("" + item.pos_5);
+                                        Debug.Log("" + item.pos_4);
+                                        Debug.Log("" + item.pos_3);
+                                        Debug.Log("" + item.pos_2);
+                                        Debug.Log("" + item.pos_1);
+
+                                    }
                                }
                                break;
-
-                            case "FISHING_BETTING":
-                                // 解析消息为 Fishresponse 对象
-                                FishBetonresponse fishResponse1 = JsonConvert.DeserializeObject<FishBetonresponse>(message);
-                                Promptmgr.Instance.PromptBubble(fishResponse1.message);
+                                //Î÷²¿Å£×ÐÀë¿ª·¿¼ä
+                            case "WEST_COWBOY_LEAVE":
+                                Promptmgr.Instance.PromptBubble(baseResponse.message);
                                // 检查是否成功反序列化
-                                if (fishResponse1 != null && fishResponse1.data != null)
-                                {
-                                  
-                                }
-                                else
-                                {
-                                    Debug.LogWarning("收到的消息无法解析为 Fishresponse 对象。");
-                                }
                                break;
-                            case "FISHING_FISHING":
+                            // Å£×ÐÍ¶Èë
+                            case "WEST_COWBOY_BETTING":

-                                // 解析消息为 Fishresponse 对象
-                                Fishingresponse fishResponse2 = JsonConvert.DeserializeObject<Fishingresponse>(message);
+
+                                WesternBetesponse fishResponse2 = JsonConvert.DeserializeObject<WesternBetesponse>(message);
                                //Promptmgr.Instance.PromptBubble(fishResponse2.message);
                                // 检查是否成功反序列化
                                if (fishResponse2 != null && fishResponse2.data != null)
                                {
-                                   
+                                   Debug.Log(fishResponse2.data.balance);
                                }
                                else
                                {
                                    Debug.LogWarning("收到的消息无法解析为 Fishresponse 对象。");
                                }
                                break;
-                            case "BALANCE":
+                            case "WEST_COWBOY_COUNTDOWN":
+                                WesternInforesponse fishResponse3 = JsonConvert.DeserializeObject<WesternInforesponse>(message);

+                                if (fishResponse3?.data != null)
+                                {
+                                    Debug.Log(fishResponse3.data.balance);
+                                    Debug.Log(fishResponse3.data.intro_text);
+                                    Debug.Log(fishResponse3.data.countdown);
+                                    Debug.Log(fishResponse3.data.countdown_type);
+                                    foreach (var item in fishResponse3.data.betting_data)
+                                    {
+                                        Debug.Log("" + item.pos_8);
+                                        Debug.Log("" + item.pos_7);
+                                        Debug.Log("" + item.pos_6);
+                                        Debug.Log("" + item.pos_5);
+                                        Debug.Log("" + item.pos_4);
+                                        Debug.Log("" + item.pos_3);
+                                        Debug.Log("" + item.pos_2);
+                                        Debug.Log("" + item.pos_1);
+
+                                    }
+                                }
                                break;
                        }
                    }
@ -229,10 +257,7 @@ public class Westerncowboy : MonoBehaviour
    {
        balance.text = detail.ToString();
    }
-    public void dissurplus(float detail, int p)
-    {
-        surpluscount_text.text = (p * (int)detail).ToString() + "金币";
-    }
+    
    void UpdateCountdownText(float remainingTime)
    {

@ -267,4 +292,69 @@ public class Westerncowboy : MonoBehaviour
            lastCallTime = Time.time;
        }
    }
+}
+public class WesternInforesponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+    public FWesternInfoData data { get; set; }
+}
+
+public class FWesternInfoData
+{
+    public float balance { get; set; }
+    
+    public string intro_text { get; set; }
+    public int countdown { get; set; }
+    public int countdown_type { get; set; }
+    public List<FWesternInfo> betting_data { get; set; }
+}
+
+public class FWesternInfo
+{
+    public float pos_1;
+
+    public float pos_2;
+    public float pos_3;
+    public float pos_4;
+    public float pos_5;
+    public float pos_6;
+    public float pos_7;
+    public float pos_8;
+}
+public class WesternBetesponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+    public WesternBetedata data { get; set; }
+}
+public class WesternBetedata
+{
+    public float balance { get; set; }
+}
+public class WesternCDresponse
+{
+    public string code { get; set; }
+    public string message { get; set; }
+    public FWesternInfoData data { get; set; }
+}
+
+public class FWesternCDData
+{
+    public int countdown { get; set; }
+    public int countdown_type { get; set; }
+    public List<FWesternInfo> betting_data { get; set; }
+}
+
+public class FWesternCD
+{
+    public float pos_1;
+
+    public float pos_2;
+    public float pos_3;
+    public float pos_4;
+    public float pos_5;
+    public float pos_6;
+    public float pos_7;
+    public float pos_8;
 }
Author	SHA1	Message	Date
杨号敬	1cbd1bbc74	Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks	2025-01-09 16:45:00 +08:00
杨号敬	ba5ca1ff49	西部牛仔	2025-01-09 16:44:52 +08:00