1

Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs

@@ -365,6 +365,7 @@ public class MonsterContral : MonoBehaviour
         transform.position = next;
     }
     public bool isRotate = true;
+    public bool isNot1 = false;
     /// <summary>
     /// 根据 forwordXYZ 字段将物体朝向目标点方向。
     /// 为空时 2D 鱼用 up，3D 鱼用 forward。
@@ -441,8 +442,16 @@ public class MonsterContral : MonoBehaviour
                     {
                         transform.GetChild(0).forward = toNext.normalized;
                         var vv = transform.GetChild(0).eulerAngles;
+                        if (isNot1)
+                        {
+                            vv.z = rotationPY;
 
-                        vv.z = rotationPY * (vv.y < 180 ? -1 : 1);
+                        }
+                        else
+                        {
+                            vv.z = rotationPY * (vv.y < 180 ? -1 : 1);
+
+                        }
                         transform.GetChild(0).eulerAngles = vv;
                     }
                     

Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs

@@ -1,4 +1,4 @@
-using Assets.MyGame.Scripts.Net;
+using Assets.MyGame.Scripts.Net;
 using Assets.MyGame.Scripts.Net.API;
 using Assets.MyGame.Scripts.Net.WebResponses;
 using System.Collections;
@@ -64,6 +64,14 @@ public class BullitMove : MonoBehaviour
 
     void Update()
     {
+        // 子弹生命周期：超时自动销毁（默认10秒）
+        currShowTime += Time.deltaTime;
+        if (currShowTime >= desTime)
+        {
+            Destroy(gameObject);
+            return;
+        }
+
         if (isLock)
         {
             // 目标无效 → 解除锁定
@@ -104,7 +112,6 @@ public class BullitMove : MonoBehaviour
         else
         {
             // 非锁定模式：保持原有直线 + 反弹逻辑（不变）
-            currShowTime += Time.deltaTime;
             Vector3 targetPoint = transform.up.normalized * currShowTime * moveSpeed;
             targetPoint.z = 0;
             transform.position = vector3_startPosition + targetPoint;

Assets/MyGame/Scripts/Manager/CreateFishManager.cs

@@ -617,15 +617,17 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
         //bossTimer = 3f;
         if (!fishTypeConfig.TryGetValue(FishTypeEnum.Boss鱼, out var bossList) || bossList.Count == 0)
             return;
-        foreach (var item in bossList)
-        {
-            //if (item.fishNumber == "11027")
-            //    item.isCreate = 2;
+        //foreach (var item in bossList)
+        //{
+        //    if (item.fishNumber == "13036")
+        //        item.isCreate = 2;
 
-            //if (item.fishNumber == "11042")
-            //    item.isCreate = 2;
+        //    //    if (item.fishNumber == "11027")
+        //    //        item.isCreate = 2;
+        //    //    if (item.fishNumber == "11030")
+        //    //        item.isCreate = 2;
 
-        }
+        //}
 
         StartCoroutine(buchongfu(bossList, bossCount, fishDatas_hashCodekey_Boss, bossRecentList, bossRecentMax));
 

Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs

@@ -0,0 +1,79 @@
+using Assets.MyGame.Scripts.Net.API;
+using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net
+{
+    public static partial class APIRequestList
+    {
+        #region ActivityConfig
+
+        /// <summary>
+        /// 获取活动配置（聚合）（GET）
+        /// 返回：ActivityConfig
+        /// </summary>
+        public static void GetActivityConfig(Action<ActivityConfig> callback)
+        {
+            APIManager.Response<ActivityConfig>(APIType.ActivityConfig_Get, callback);
+        }
+
+        /// <summary>
+        /// 获取钻石商城列表（GET）
+        /// </summary>
+        public static void GetDiamondShopList(Action<List<DiamondShopConfig>> callback)
+        {
+            APIManager.Response<List<DiamondShopConfig>>(APIType.ActivityConfig_DiamondShopList, callback);
+        }
+
+        /// <summary>
+        /// 获取金币商城列表（GET）
+        /// </summary>
+        public static void GetGoldShopList(Action<List<GoldShopConfig>> callback)
+        {
+            APIManager.Response<List<GoldShopConfig>>(APIType.ActivityConfig_GoldShopList, callback);
+        }
+
+        /// <summary>
+        /// 获取救济金配置（GET）
+        /// </summary>
+        public static void GetReliefConfig(Action<ReliefConfig> callback)
+        {
+            APIManager.Response<ReliefConfig>(APIType.ActivityConfig_ReliefConfig, callback);
+        }
+
+        /// <summary>
+        /// 获取签到池配置（GET）
+        /// </summary>
+        public static void GetSignConfigs(Action<List<SignConfig>> callback)
+        {
+            APIManager.Response<List<SignConfig>>(APIType.ActivityConfig_SignConfigs, callback);
+        }
+
+        /// <summary>
+        /// 获取注册配置（GET）
+        /// </summary>
+        public static void GetRegisterConfig(Action<RegisterConfig> callback)
+        {
+            APIManager.Response<RegisterConfig>(APIType.ActivityConfig_RegisterConfig, callback);
+        }
+
+        /// <summary>
+        /// 获取战令配置（GET）
+        /// </summary>
+        public static void GetBattleOrderConfig(Action<BattleOrderConfig> callback)
+        {
+            APIManager.Response<BattleOrderConfig>(APIType.ActivityConfig_BattleOrderConfig, callback);
+        }
+
+        /// <summary>
+        /// 获取捕鱼返利配置（GET）
+        /// </summary>
+        public static void GetFishingReturnConfig(Action<FishingReturnConfig> callback)
+        {
+            APIManager.Response<FishingReturnConfig>(APIType.ActivityConfig_FishingReturnConfig, callback);
+        }
+
+        #endregion
+    }
+}

Assets/MyGame/Scripts/Net/APIRequestList_Activity.cs.meta

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

Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs

@@ -0,0 +1,70 @@
+using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
+using Assets.MyGame.Scripts.Net.API.UserData_SubClass;
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net.API
+{
+    /// <summary>
+    /// 活动配置实体类（独立于 GameConfig）
+    /// 商店金币/钻石、签到、救济金等已从 GameConfig 迁移至此
+    /// </summary>
+    [Serializable]
+    public class ActivityConfig
+    {
+        /// <summary>
+        /// 数据ID
+        /// </summary>
+        public string id;
+
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        public bool isDelete;
+
+        /// <summary>
+        /// 创建人信息
+        /// </summary>
+        public OptionUserInfo createInfo;
+
+        /// <summary>
+        /// 战令配置
+        /// </summary>
+        public BattleOrderConfig battleOrderConfig;
+
+        /// <summary>
+        /// 救济金配置
+        /// </summary>
+        public ReliefConfig reliefConfig;
+
+        /// <summary>
+        /// 签到池配置
+        /// </summary>
+        public List<SignConfig> signConfigs;
+
+        /// <summary>
+        /// 金币商城配置
+        /// </summary>
+        public List<GoldShopConfig> goldShopConfigs;
+
+        /// <summary>
+        /// 钻石商城配置
+        /// </summary>
+        public List<DiamondShopConfig> diamondShopConfigs;
+
+        /// <summary>
+        /// 注册配置
+        /// </summary>
+        public RegisterConfig registerConfig;
+
+        /// <summary>
+        /// 捕鱼返利配置
+        /// </summary>
+        public FishingReturnConfig fishingReturnConfig;
+
+        /// <summary>
+        /// 抽奖活动配置
+        /// </summary>
+        public LotteryActivityConfig lotteryActivityConfig;
+    }
+}

Assets/MyGame/Scripts/Net/APIResponses/ActivityConfig.cs.meta

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

Assets/MyGame/Scripts/Net/APIResponses/GameConfig.cs

@@ -1,4 +1,4 @@
-using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
+using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
 using Assets.MyGame.Scripts.Net.API.UserData_SubClass;
 using System;
 using System.Collections.Generic;
@@ -6,6 +6,7 @@ namespace Assets.MyGame.Scripts.Net.API
 {
     /// <summary>
     /// 游戏后台配置（Unity 解析版）
+    /// 注：商店/签到/救济等配置已迁移至 ActivityConfig
     /// </summary>
     [Serializable]
     public class GameConfig
@@ -65,35 +66,14 @@ namespace Assets.MyGame.Scripts.Net.API
         /// </summary>
         public List<VipLevelConfig> vipLevelConfigs;
 
-        /// <summary>
-        /// 签到池配置
-        /// </summary>
-        public List<SignConfig> signConfigs;
-
         /// <summary>
         /// 月卡配置
         /// </summary>
         public List<MonthCardConfig> monthCardConfigs;
 
-        /// <summary>
-        /// 救济金配置
-        /// </summary>
-        public ReliefConfig reliefConfigs;
-
-        /// <summary>
-        /// 金币商城配置
-        /// </summary>
-        public List<GoldShopConfig> goldShopConfigs;
-
-        /// <summary>
-        /// 钻石商城配置
-        /// </summary>
-        public List<DiamondShopConfig> diamondShopConfigs;
         /// <summary>
         /// 击杀配置
         /// </summary>
-      
-        public object killConfig ;
+        public object killConfig;
     }
-
-}
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+    /// <summary>
+    /// 战令配置
+    /// </summary>
+    [Serializable]
+    public class BattleOrderConfig
+    {
+        public bool isOpen;
+        public long endTime;
+        public string ruleDesc;
+        public string buyDesc;
+        public string advanceGiftDesc;
+        public List<BattleOrderLevelConfig> levelConfig;
+        public List<AdvanceGiftConfig> advanceGift;
+    }
+
+    /// <summary>
+    /// 战令等级配置
+    /// </summary>
+    [Serializable]
+    public class BattleOrderLevelConfig
+    {
+        public int level;
+        public int exp;
+        public GiftConfig normalGift;
+        public GiftConfig luxuryGift;
+        public GiftConfig supremeGift;
+        public int payType;
+        public int payCount;
+    }
+
+    /// <summary>
+    /// 进阶奖励配置
+    /// </summary>
+    [Serializable]
+    public class AdvanceGiftConfig
+    {
+        public int type;
+        public string name;
+        public int count;
+        public string imageUrl;
+        public int payType;
+        public int payCount;
+        public List<GiftConfig> giftList;
+    }
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/BattleOrderConfig.cs.meta

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

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/DiamondShopConfig.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
@@ -34,8 +34,15 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
         /// 现金价格
         /// </summary>
         public double money;
+
+        /// <summary>
+        /// 经销商价格
+        /// </summary>
+        public double dealerMoney;
+
+        /// <summary>
+        /// 是否首充限制
+        /// </summary>
+        public bool isFirst;
     }
-
-
-
-}
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs

@@ -0,0 +1,26 @@
+using System;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+    /// <summary>
+    /// 捕鱼返金币活动配置
+    /// </summary>
+    [Serializable]
+    public class FishingReturnConfig
+    {
+        /// <summary>
+        /// 是否开启活动
+        /// </summary>
+        public bool isEnabled;
+
+        /// <summary>
+        /// 返利比例（千分之一 = 0.001）
+        /// </summary>
+        public double returnRate;
+
+        /// <summary>
+        /// 每日返利上限（0=无上限）
+        /// </summary>
+        public long dailyMaxReturn;
+    }
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/FishingReturnConfig.cs.meta

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

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/GoldShopConfig.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
@@ -31,10 +31,18 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
         public long gold;
 
         /// <summary>
-        /// 钻石数量
+        /// 钻石数量（购买所需钻石）
         /// </summary>
         public int diamond;
+
+        /// <summary>
+        /// 经销商价格（钻石）
+        /// </summary>
+        public int dealerDiamond;
+
+        /// <summary>
+        /// 是否首充限制
+        /// </summary>
+        public bool isFirst;
     }
-
-
-}
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+    [Serializable]
+    public class LotteryActivityConfig
+    {
+        public string activityName;
+        public bool isOpen;
+        public long startTime;
+        public long endTime;
+        public List<LotteryPoolLevel> pools;
+        public List<long> costs;
+        public int userMaxDraw;
+    }
+
+    [Serializable]
+    public class LotteryPoolLevel
+    {
+        public string level;
+        public int count;
+        public int weight;
+        public List<LotteryPrize> prizeList;
+    }
+
+    [Serializable]
+    public class LotteryPrize
+    {
+        public string type;
+        public long count;
+        public string name;
+        public string icon;
+        public int weight;
+    }
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/LotteryActivityConfig.cs.meta

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

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using Assets.MyGame.Scripts.Net.API.UserData_SubClass;
+
+namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
+{
+    /// <summary>
+    /// 注册配置
+    /// </summary>
+    [Serializable]
+    public class RegisterConfig
+    {
+        /// <summary>
+        /// 注册初始金币
+        /// </summary>
+        public int initGold;
+
+        /// <summary>
+        /// 注册初始钻石
+        /// </summary>
+        public int initDiamond;
+
+        /// <summary>
+        /// 注册初始道具列表
+        /// </summary>
+        public List<BaseProductCount> initProductList;
+    }
+}

Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/RegisterConfig.cs.meta

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

Assets/MyGame/Scripts/Net/APIType.cs

@@ -1,4 +1,4 @@
-namespace Assets.MyGame.Scripts.Net
+namespace Assets.MyGame.Scripts.Net
 {
     /// <summary>
     /// 所有接口类型（自动生成）
@@ -18,6 +18,32 @@
         GameConfig_Update,
 
 
+        // ---------------- ActivityConfig ----------------
+        /// <summary>获取活动配置·聚合（GET）</summary>
+        ActivityConfig_Get,
+
+        /// <summary>钻石商城列表（GET）</summary>
+        ActivityConfig_DiamondShopList,
+
+        /// <summary>金币商城列表（GET）</summary>
+        ActivityConfig_GoldShopList,
+
+        /// <summary>救济金配置（GET）</summary>
+        ActivityConfig_ReliefConfig,
+
+        /// <summary>签到池配置（GET）</summary>
+        ActivityConfig_SignConfigs,
+
+        /// <summary>注册配置（GET）</summary>
+        ActivityConfig_RegisterConfig,
+
+        /// <summary>战令配置（GET）</summary>
+        ActivityConfig_BattleOrderConfig,
+
+        /// <summary>捕鱼返利配置（GET）</summary>
+        ActivityConfig_FishingReturnConfig,
+
+
         // ---------------- Hall ----------------
         /// <summary>存入保险箱（GET）</summary>
         Hall_SaveSafeBox,
@@ -297,4 +323,4 @@
         /// <summary>获取聊天记录（GET）</summary>
         Customer_ChatLog,
     }
-}
+}