wz1531/5.24BuYu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wz1531
2026-06-11 19:37:56 +08:00
parent 22f7317273
commit 96b1c140b4
176 changed files with 13520 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+19 -73
View File
@@ -347,60 +347,6 @@ public class MonsterContral : MonoBehaviour
/// 为空时 2D 鱼用 up，3D 鱼用 forward。
/// </summary>
/// <param name="nextPos">下一帧目标位置</param>
//private void ApplyFacingDirection(Vector2 nextPos)
//{
// if (!isRotate) return;
// Vector2 toNext = nextPos - (Vector2)transform.position;
// if (toNext.sqrMagnitude < 0.0001f) return; // 避免零向量
// if (string.IsNullOrEmpty(forwordXYZ))
// {
// if (!is3D)
// {
// // 2D 用 up，推荐用 Quaternion.AngleAxis
// float angle = Mathf.Atan2(toNext.y, toNext.x) * Mathf.Rad2Deg;
// transform.rotation = Quaternion.AngleAxis(angle - 90f, Vector3.forward);
// }
// else
// {
// // 3D 用 forward，推荐用 LookRotation
// transform.rotation = Quaternion.LookRotation(toNext.normalized, Vector3.up);
// }
// return;
// }
// if (monsterData.fishTypeConfig.fishNumber=="11024")
// {
// }
// //if (ischild0)
// //{
// // switch (forwordXYZ)
// // {
// // case "X": transform.GetChild(0).right = toNext.normalized; break;
// // case "-X": transform.GetChild(0).right = -toNext.normalized; break;
// // case "Y": transform.GetChild(0).up = toNext.normalized; break;
// // case "-Y": transform.GetChild(0).up = -toNext.normalized; break;
// // case "Z": transform.GetChild(0).forward = toNext.normalized; break;
// // case "-Z": transform.GetChild(0).forward = -toNext.normalized; break;
// // }
// //}
// //else
// {
// switch (forwordXYZ)
// {
// case "X": transform.right = toNext.normalized; break;
// case "-X": transform.right = -toNext.normalized; break;
// case "Y": transform.up = toNext.normalized; break;
// case "-Y": transform.up = -toNext.normalized; break;
// case "Z": transform.forward = toNext.normalized; break;
// case "-Z": transform.forward = -toNext.normalized; break;
// }
// }
//}
private void ApplyFacingDirection(Vector2 nextPos)
{
if (!isRotate) return;
@@ -429,28 +375,28 @@ public class MonsterContral : MonoBehaviour
Transform child = transform.GetChild(0);
Vector3 localPos = Vector3.zero;
// 父物体朝向
//// 父物体朝向
switch (forwordXYZ)
{
case "X": transform.right = toNext.normalized; break;
case "-X": transform.right = -toNext.normalized; break;
case "Y": transform.up = toNext.normalized; break;
case "-Y": transform.up = -toNext.normalized; break;
case "Z": transform.forward = toNext.normalized; break;
case "-Z": transform.forward = -toNext.normalized; break;
}
// 子物体深度偏移：方向正 → 偏移正，方向负 → 偏移负
switch (forwordXYZ)
{
case "X": localPos.z = depthOffset; break;
case "-X": localPos.z = -depthOffset; break;
case "Y": localPos.x = depthOffset; break;
case "-Y": localPos.x = -depthOffset; break;
case "Z": localPos.x = depthOffset; break;
case "-Z": localPos.x = -depthOffset; break;
case "X": transform.GetChild(0).right = toNext.normalized; break;
case "-X": transform.GetChild(0).right = -toNext.normalized; break;
case "Y": transform.GetChild(0).up = toNext.normalized; break;
case "-Y": transform.GetChild(0).up = -toNext.normalized; break;
case "Z": transform.GetChild(0).forward = toNext.normalized; break;
case "-Z": transform.GetChild(0).forward = -toNext.normalized; break;
}
//// 子物体深度偏移：方向正 → 偏移正，方向负 → 偏移负
//switch (forwordXYZ)
//{
// case "X": localPos.z = depthOffset; break;
// case "-X": localPos.z = -depthOffset; break;
// case "Y": localPos.x = depthOffset; break;
// case "-Y": localPos.x = -depthOffset; break;
// case "Z": localPos.x = depthOffset; break;
// case "-Z": localPos.x = -depthOffset; break;
//}
localPos.z = depthOffset;
child.localPosition = localPos;
}
else
@@ -466,7 +412,7 @@ public class MonsterContral : MonoBehaviour
case "-Z": transform.forward = -toNext.normalized; break;
}
}
}
}
public bool ischild0 = false;
public int depthOffset;
// ================================================================
Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+5 -5
View File
@@ -615,7 +615,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
return;
foreach (var item in bossList)
{
if (item.fishNumber == "11024")
if (item.fishNumber == "11038")
{
item.isCreate = 2;
}
@@ -1422,7 +1422,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
monster.transform.position, Quaternion.identity, transform.parent);
// 非 Boss 鱼：金币飞向炮台
if (monster.fishenum != FishTypeEnum.Boss鱼)
if (monster.fishenum != FishTypeEnum.Boss鱼&&monster.fishenum!=FishTypeEnum.特殊Boss)
{
var award = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAward,
@@ -1639,9 +1639,9 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
bossCtrl.v3 = sitData.transform.position;
bossCtrl.currEffect_DieAward = Instantiate(
monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
currGameType.subPanelParent.parent);
//bossCtrl.currEffect_DieAward = Instantiate(
// monster.effect_DieAward != null ? monster.effect_DieAward : dieFXPrefabAwardTmp,
// currGameType.subPanelParent.parent);
if (bossCtrl.isToUI)
{
bossCtrl.currEffect_DieAward = Instantiate(
Assets/MyGame/Scripts/Net/APIResponses/UserData_SubClass/UserBaseInfo.cs
+53
View File
@@ -1,10 +1,63 @@
using System;
using System.Collections;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.Rendering;
[Serializable]
public class UserBaseInfo
{
public Sprite avatarSprite;
public IEnumerator DownSprite(System.Action<Sprite> action)
{
string url = avatarUrl;
int downCount = 5;
if (avatarSprite != null)
{
action?.Invoke(avatarSprite);
yield break;
}
Texture2D avatarTexture2D = new Texture2D(100, 100);
//if (avatarTexture2D == null)
for (int i = 0; i < downCount; i++)
{
using (UnityWebRequest www = UnityWebRequestTexture.GetTexture(url))
{
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError ||
www.result == UnityWebRequest.Result.ProtocolError)
{
Debug.LogError("下载失败: " + www.error);
downCount--;
if (downCount == 0)
{
yield break;
//action.Invoke(Sprite.Create(new Texture2D(100, 100), new Rect(0, 0, 100, 100), new Vector2(0.5f, 0.5f)));
}
}
else
{
avatarTexture2D = DownloadHandlerTexture.GetContent(www);
avatarSprite = Sprite.Create(avatarTexture2D, new Rect(0, 0, avatarTexture2D.width, avatarTexture2D.height), new Vector2(0.5f, 0.5f));
break;
}
}
}
action?.Invoke(avatarSprite);
}
public void UpdateAvatar(System.Action<Sprite> action)
{
GameManager.Instance.StartCoroutine(DownSprite(action));
}
public string userName { get; set; }
public string password { get; set; }
public string number { get; set; }
Assets/MyGame/Scripts/Net/WebResponses/ChineseChess/ChineseChessGameClassList.cs
+2 -2
View File
@@ -113,8 +113,8 @@ namespace Assets.MyGame.Scripts.Net.WebResponses.ChineseChess
www.result == UnityWebRequest.Result.ProtocolError)
{
Debug.LogError("下载失败: " + www.error);
downCount++;
if (downCount == 5)
downCount--;
if (downCount == 0)
{
action.Invoke(new Texture2D(100, 100));
Assets/MyGame/Scripts/fishResources/Resources/tbfishresources.json
+26 -4
View File
@@ -368,7 +368,7 @@
},
{
"fishNumber": 11034,
"prefabFishResourcesPath": "5025",
"prefabFishResourcesPath": "1613",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
@@ -379,7 +379,7 @@
},
{
"fishNumber": 11035,
"prefabFishResourcesPath": "5015",
"prefabFishResourcesPath": "6005",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
@@ -390,7 +390,7 @@
},
{
"fishNumber": 11036,
"prefabFishResourcesPath": "",
"prefabFishResourcesPath": "6012",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
@@ -401,7 +401,7 @@
},
{
"fishNumber": 11037,
"prefabFishResourcesPath": "",
"prefabFishResourcesPath": "1615",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
@@ -454,6 +454,28 @@
"boardText": "",
"dieEffectAssets": ""
},
{
"fishNumber": 11042,
"prefabFishResourcesPath": "1614",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
"dieGlodAduio": {},
"layer": 0,
"boardText": "",
"dieEffectAssets": ""
},
{
"fishNumber": 11043,
"prefabFishResourcesPath": "4022",
"showAudio": [],
"moveAudio": [],
"dieAudio": [],
"dieGlodAduio": {},
"layer": 0,
"boardText": "",
"dieEffectAssets": ""
},
{
"fishNumber": 12001,
"prefabFishResourcesPath": "PW_Enemy_2",