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

2025-01-06 17:57:38 +08:00 · 2025-01-06 17:57:38 +08:00 · 630178d70a
commit 630178d70a
parent 83280d65c8 382c51f242
5 changed files with 239 additions and 11 deletions
--- a/meng_yao/Assets/Scenes/scene_Main.unity
+++ b/meng_yao/Assets/Scenes/scene_Main.unity
@ -18752,6 +18752,7 @@ MonoBehaviour:
  - {fileID: 21300000, guid: a3fb5232a71af0c488b0933a810b7a01, type: 3}
  - {fileID: 21300000, guid: 7163f0d17ece9a74d889def43f3568fe, type: 3}
  - {fileID: 21300000, guid: 41d1db5839b816246825e7cced884dbf, type: 3}
+  zhengshu: {fileID: 467615617}
 --- !u!1 &205715504
 GameObject:
  m_ObjectHideFlags: 0
@ -25326,6 +25327,8 @@ RectTransform:
  - {fileID: 1296128571}
  - {fileID: 1699813513}
  - {fileID: 426265566}
+  - {fileID: 1893834195}
+  - {fileID: 2127014108}
  m_Father: {fileID: 1544898928}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -33955,27 +33958,27 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 600
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 733
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 300
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: -366.5
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3011360593729086421, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
      propertyPath: m_Sprite
@ -100352,6 +100355,13 @@ MonoBehaviour:
  Tourubtn: {fileID: 1594695428}
  TimeText: {fileID: 1716546489}
  Fishing: {fileID: 99292841}
+  yu:
+  - {fileID: 7179720788267147197, guid: 2cc877762118cd543853fb28827f280d, type: 3}
+  - {fileID: 8324679930610600339, guid: 3f9336f4f5a1b6045b5aeaa705560923, type: 3}
+  - {fileID: 8327991688875048604, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+  - {fileID: 6887896110515514769, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+  - {fileID: 6078443173104442897, guid: 67e04b1a5e4abd9499ad7887353b3ce7, type: 3}
+  - {fileID: 8063980341957640646, guid: c446c1690e0c42344b3ee6f7cae47912, type: 3}
 --- !u!1 &1073869858
 GameObject:
  m_ObjectHideFlags: 0
@ -176650,6 +176660,108 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1893258752}
  m_CullTransparentMesh: 1
+--- !u!1001 &1893834194
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 276578990}
+    m_Modifications:
+    - target: {fileID: 8327991688875048604, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_Name
+      value: yu_3 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 272
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 112
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -330
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 88
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+--- !u!224 &1893834195 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8327991688875048611, guid: 3dbff95a51f3ab14397e87122542f5dc, type: 3}
+  m_PrefabInstance: {fileID: 1893834194}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1893942892
 GameObject:
  m_ObjectHideFlags: 0
@ -200678,6 +200790,108 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2125327566}
  m_CullTransparentMesh: 1
+--- !u!1001 &2127014107
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 276578990}
+    m_Modifications:
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 138
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 97
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -63
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -76
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6887896110515514769, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+      propertyPath: m_Name
+      value: yu_4 (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+--- !u!224 &2127014108 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6887896110515514768, guid: ace9193e009411b4f903197028e5cc5d, type: 3}
+  m_PrefabInstance: {fileID: 2127014107}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2127736419 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 8631885451795898582, guid: 638b7f7423db411419568d073208d929, type: 3}
--- a/meng_yao/Assets/script/Panel/Islandpanel.cs
+++ b/meng_yao/Assets/script/Panel/Islandpanel.cs
@ -22,22 +22,33 @@ public class Islandpanel : MonoBehaviour
    float remainingTime = 0f;
    public CertificatePanel Certificate;
    public Sprite[] dao;
-    async void Start()
+    public Button zhengshu;
+    
+    private async void OnEnable()
    {
        AuctionResponse response = await Scene_main_jiekou.instance.Auctioninformations();
        //IslandResponse jinpairesponse = await Scene_main_jiekou.instance.Island(count);
-        gold.text=response.Data.gold.ToString();
+        gold.text = response.Data.gold.ToString();
        introtext.text = response.Data.intro_text;
        InvesttotalText.text = response.Data.invest_total.ToString();
        remainingTime = response.Data.countdown;
-        if(response.Data.island_id==0)
+        if (response.Data.island_id == 0)
        {
            Dao.gameObject.SetActive(false);
            islandname.gameObject.SetActive(false);
        }
+        zhengshu.onClick.AddListener(async () =>
+        {
+            Certificate.response = await Scene_main_jiekou.instance.AuctionCertificate();
+        });
        islandname.text = response.Data.island_name;
        UpdateCountdownText(remainingTime);
        Dao.sprite = dao[response.Data.island_id];
+        Certificate.response = await Scene_main_jiekou.instance.AuctionCertificate();
+    }
+    async void Start()
+    {
+        
        UpButton.onClick.AddListener(() =>
        {
            count += 1;
@ -55,7 +66,7 @@ public class Islandpanel : MonoBehaviour
        });
        if (remainingTime == 0)
        {
-            Certificate.response = await Scene_main_jiekou.instance.AuctionCertificate();
+            
        }
    }

--- a/meng_yao/Assets/script/scene_Main/Thebestfishman/WebJoinroom.cs
+++ b/meng_yao/Assets/script/scene_Main/Thebestfishman/WebJoinroom.cs
@ -26,6 +26,7 @@ public class WebJoinroom : MonoBehaviour
    private float interval = 1f; // 每秒调用一次
    public Button Fishing;
    FishJoinroomData fishJoinroomData;
+    public GameObject[] yu;
    private async void Start()
    {
        TimeText.gameObject.transform.parent.gameObject.SetActive(false);
--- a/meng_yao/Assets/script/scene_jinshakuang/minerControl.cs
+++ b/meng_yao/Assets/script/scene_jinshakuang/minerControl.cs
@ -123,7 +123,7 @@ public class minerControl : MonoBehaviour
        }

        //ΈΔ±δ³―Ος
-        ChangeShipLook(pathPoints[0], pathPoints[path.Count - 1]);
+        ChangeShipLook(this.transform.position, pathPoints[path.Count - 1]);



--- a/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs
+++ b/meng_yao/Assets/script/scene_jinshakuang/roomcontroller.cs
@ -133,6 +133,8 @@ public class roomcontroller : MonoBehaviour
            Vector3 pos = new Vector3(Random.Range((endPos.position.x-startPos.position.x)/2, endPos.position.x), endPos.position.y, endPos.position.z);
            fishMan.transform.position = pos;

+            //fishMan.transform.position = endPos.position;
+
            fishManShipContorl = fishMan.GetComponent<minerControl>();
            fishManShipContorl.init(this.paths, this.pathsNeedTimer, this.fishingNeedTimer, this.restTimer, this.startPos, this.endPos);