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

ai前存档

Browse Source
This commit is contained in:
wz1531
2026-05-27 19:47:06 +08:00
parent a73b4c7dd9
commit ecff13130f
37 changed files with 8434 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/Windows/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/MyGame/Scenes/UIScene.unity
+1
View File
@@ -3697,6 +3697,7 @@ MonoBehaviour:
fishRoot: {fileID: 1184862095}
poolRoot: {fileID: 1663842063}
spawnList: []
isCreateFish: 0
fangzhu: 0
isResources: 0
--- !u!61 &2075409201
Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs
+24 -24
View File
@@ -114,8 +114,9 @@ public class MonsterContral : MonoBehaviour
/// <summary>主相机缓存</summary>
protected Camera mainCamera;
public List<Transform> colliderList;
// ================================================================
// Unity 生命周期
@@ -213,15 +214,8 @@ public class MonsterContral : MonoBehaviour
}
public IEnumerator yanchi(GameObject obj,float time, bool isyuzhen)
{
if (isyuzhen)
{
Debug.Log($"[MonsterContral] 鱼阵 {yzID} 路线结束，等待 {time} 秒后销毁"+ guid);
}
yield return new WaitForSeconds(time);
if (isyuzhen)
{
Debug.Log($"[MonsterContral] 鱼阵 {yzID} 路线结束，销毁对象" + guid);
}
CreateFishManager.Instance.Id_DieFish_NotFX(guid);
}
@@ -352,34 +346,40 @@ public class MonsterContral : MonoBehaviour
/// <param name="nextPos">下一帧目标位置</param>
private void ApplyFacingDirection(Vector2 nextPos)
{
if (!isRotate)
{
return;
}
Vector2 toNext = nextPos - (Vector2)transform.position;
Vector2 fromNext = (Vector2)transform.position - nextPos;
if (!isRotate) return;
Vector2 toNext = nextPos - (Vector2)transform.position;
if (toNext.sqrMagnitude < 0.0001f) return; // 避免零向量
if (string.IsNullOrEmpty(forwordXYZ))
{
// 默认：2D 用 up，3D 用 forward
if (!is3D)
transform.up = fromNext.normalized;
{
// 2D 用 up，推荐用 Quaternion.AngleAxis
float angle = Mathf.Atan2(toNext.y, toNext.x) * Mathf.Rad2Deg;
transform.rotation = Quaternion.AngleAxis(angle - 90f, Vector3.forward);
}
else
transform.forward = toNext.normalized;
{
// 3D 用 forward，推荐用 LookRotation
transform.rotation = Quaternion.LookRotation(toNext.normalized, Vector3.up);
}
return;
}
switch (forwordXYZ)
{
case "X": transform.right = toNext.normalized; break;
case "-X": transform.right = fromNext.normalized; break;
case "Y": transform.up = toNext.normalized; break;
case "-Y": transform.up = fromNext.normalized; break;
case "Z": transform.forward = toNext.normalized; break;
case "-Z": transform.forward = fromNext.normalized; break;
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;
}
}
// ================================================================
// 动画
// ================================================================
Assets/MyGame/Scripts/Characters/Monster/MonsterControl_BossBase.cs
+1
View File
@@ -25,6 +25,7 @@ public class MonsterControl_BossBase : MonsterContral
public Action<int> JiaFen;
public List<List<RedPacketRecord>> redPacketRecords = new List<List<RedPacketRecord>>();
public Camera ZhuCam;
public override void Awake()
{
base.Awake();
Assets/MyGame/Scripts/Items/Bullits/BullitMove.cs
+31 -11
View File
@@ -3,6 +3,7 @@ using Assets.MyGame.Scripts.Net.API;
using Assets.MyGame.Scripts.Net.WebResponses;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using UnityEngine;
@@ -19,6 +20,7 @@ public class BullitMove : MonoBehaviour
Vector3 vector3_startPosition;
public bool isTriggerFirst = true;
MonsterContral target;
public Transform targetTra;
public string bulletID;
// Start is called before the first frame update
void Awake()
@@ -27,7 +29,7 @@ public class BullitMove : MonoBehaviour
//Destroy(gameObject, desTime);
}
bool isLock = false;
public void Lock(MonsterContral monsterContral)
public void Lock(MonsterContral monsterContral,Transform endTra)
{
foreach (var item in GetComponents<Collider2D>())
{
@@ -35,6 +37,7 @@ public class BullitMove : MonoBehaviour
}
isLock = true;
target = monsterContral;
targetTra = endTra;
}
public void NotLock()
{
@@ -51,9 +54,13 @@ public class BullitMove : MonoBehaviour
public void Init()
{
vector3_startPosition = transform.position;
vector3_startPosition.z = -400;
transform.position = vector3_startPosition;
}
//子弹同步分为两种一种是锁定目标一种是不锁定目标
// Update is called once per frame
float ABdistanceTemp=999999999;
public float a = 0.1f;
void Update()
{
if (isLock)
@@ -62,24 +69,35 @@ public class BullitMove : MonoBehaviour
{
NotLock();
}
var ABdistance = Vector3.Distance(transform.position, target.transform.position);
var rotateSpeed = 1/ABdistance;
Vector3 targetPoint = (target.transform.position-transform.position).normalized * moveSpeed*Time.deltaTime;
transform.up = Vector3.Lerp(transform.up, targetPoint, rotateSpeed);
Vector3 v3bullet = transform.position;
v3bullet.z = 0;
Vector3 v3target = targetTra.transform.position;
v3target.z = 0;
var ABdistance = Vector3.Distance(v3bullet, v3target);
var rotateSpeed = 1/(ABdistance/3);
Vector3 targetPoint = (targetTra.transform.position-transform.position).normalized * moveSpeed*Time.deltaTime;
targetPoint.z = transform.position.z;
//transform.up = Vector2.Lerp(transform.up, targetPoint, rotateSpeed);
transform.up = Vector2.Lerp(transform.up, targetPoint, a);
targetPoint = transform.up.normalized * moveSpeed * Time.deltaTime;
targetPoint.z = 0;
transform.position+= targetPoint;
if (ABdistance <= 2)
//if (ABdistance <= 2)
if (ABdistance > ABdistanceTemp)
{
AttackFish(target);
}
ABdistanceTemp = ABdistance;
}
else
{
//方便帧同步
currShowTime += Time.deltaTime;
Vector3 targetPoint = transform.up.normalized * currShowTime * moveSpeed;
targetPoint.z = 0;
transform.position = vector3_startPosition + targetPoint;
}
@@ -176,13 +194,15 @@ public class BullitMove : MonoBehaviour
var v2 = GameManager.Instance.gameData.currRoomData;
if (true)
{
WebSocketSendList.KillFish(v2.roomId, userid,monster.monsterData.fishTypeConfig.fishNumber, monster.guid, (int)CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum);
//WebSocketSendList.KillFish(v2.roomId, userid,monster.monsterData.fishTypeConfig.fishNumber, monster.guid, (int)CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum);
WebSocketSendList.KillFish(v2.roomId, userid, monster.monsterData.fishTypeConfig.fishNumber, monster.guid, (int)CreateFishManager.Instance.currGameType.currSitData.consumeGoldNum, bulletID, "63215f0afa3f5b25");
}
//受激
//monster.monsterData.charactersHealth.OnHurt(10, CharacterHurtType.none);
//monster.HP--;
//if (monster.HP == 0)
Assets/MyGame/Scripts/Manager/CreateFishManager.cs
+8 -2
View File
@@ -610,7 +610,13 @@ 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 == "13030")
// {
// item.isCreate = 2;
// }
//}
StartCoroutine(buchongfu(bossList, bossCount));
@@ -675,7 +681,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
foreach (var cfg in candidates)
{
randWeight -= cfg.fishWeight;
if (randWeight <= 0) // 注意这里是 <= 0
if (randWeight < 0) // 注意这里是 <= 0
{
chosen = cfg;
break;
Assets/MyGame/Scripts/Net/APIManager.cs
+3 -1
View File
@@ -18,7 +18,9 @@ namespace Assets.MyGame.Scripts.Net
public static Dictionary<APIType, string> dic_API = new Dictionary<APIType, string>();
//public const string baseURL = "http://game5241.wzaxr.top";
#if UNITY_EDITOR
public const string baseURL = "http://8.137.163.153";
//public const string baseURL = "http://8.137.163.153";
public const string baseURL = "http://8.137.8.46";
#else
public const string baseURL = "http://8.137.8.46";
Assets/MyGame/Scripts/Net/WebResponses/RoomKillNotice.cs
+2 -1
View File
@@ -25,12 +25,13 @@ namespace Assets.MyGame.Scripts.Net.WebResponses
/// 获得金币
/// </summary>
public int gold;
public int beishu;
/// <summary>
/// 鱼的唯一实例 ID
/// </summary>
public string fishId;
public int timespan;
public long timespan;
public int killtime;
public string msg;
public JObject param;
Assets/MyGame/Scripts/Net/WebResponses/SyncGameData.cs
+11 -2
View File
@@ -51,6 +51,15 @@ namespace Assets.MyGame.Scripts.Net.WebResponses
changeTurret=7
}
[Serializable]
public class FireCannonSendData
{
public string userId;
public List<string> bulletIds;
public long gold;
public int count;
public SyncGameData extra;
}
/// <summary>
/// 同步游戏数据
/// </summary>
@@ -95,8 +104,8 @@ namespace Assets.MyGame.Scripts.Net.WebResponses
[Serializable]
public class FrameData_ChangeAutoTarget : FrameData
{
public string targetGuid;
public string targetPostName;
public List< string> targetGuid;
public int colliderIndex;
}
[Serializable]
public class FrameData_RandomDieFish : FrameData
Assets/MyGame/Scripts/Net/WebSocketManager.cs
+3 -1
View File
@@ -25,7 +25,9 @@ namespace Assets.MyGame.Scripts.Net
//private const string baseUrl = "ws://game5241.wzaxr.top";
#if UNITY_EDITOR
private const string baseUrl = "ws://8.137.163.153";
//private const string baseUrl = "ws://8.137.163.153";
private const string baseUrl = "ws://8.137.8.46";
#else
private const string baseUrl = "ws://8.137.8.46";
#endif
Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs
+5
View File
@@ -265,6 +265,7 @@ namespace Assets.MyGame.Scripts.Net
case MessageType.Invocation:
switch (v.target)
{
case "GetRoomListResult":
//UIManager.Instance.Get<UIHome_BY_SelectRoomLevelPanel>(UIPanel.SelectRoomPenel);
WebSocketReponseList.GetRoomListResult(msg);
@@ -275,6 +276,10 @@ namespace Assets.MyGame.Scripts.Net
break;
case "RoomInfo":
WebSocketReponseList.RoomInfo(msg);
break;
case "RoomFireNotice":
WebSocketReponseList.RoomFireNotice(msg);
break;
case "RoomKillNotice":
WebSocketReponseList.RoomKillNotice(msg);
Assets/MyGame/Scripts/Net/WebSocketReponseList.cs
+10 -1
View File
@@ -132,6 +132,14 @@ namespace Assets.MyGame.Scripts.Net
{
CreateFishManager.Instance.Ws_DieFish(msg);
}
public static void RoomFireNotice(string msg)
{
FireCannonSendData fireCannonSendData = JsonConvert.DeserializeObject<WebSocketResponseBase<FireCannonSendData>>(msg).arguments[0];
var syncGameData = fireCannonSendData.extra;
EventCenter.Instance.EventTrigger<FireCannonSendData>(ConstEventString.SyncGameData_FireBullet, fireCannonSendData);
}
public static void SyncPlayerGold(string msg)
{
var gold = JsonConvert.DeserializeObject<WebSocketResponseBase<long>>(msg).arguments[0];
@@ -141,6 +149,7 @@ namespace Assets.MyGame.Scripts.Net
break;
case GameType.defaultPanel:
UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelDefault).currSitData.goldNum = gold;
break;
case GameType.FLZY:
UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelFLZY).currSitData.goldNum = gold;
@@ -182,7 +191,7 @@ namespace Assets.MyGame.Scripts.Net
EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_Rotate, syncGameData);
break;
case FrameDataType.fireBullet:
EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_FireBullet, syncGameData);
//EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_FireBullet, syncGameData);
break;
case FrameDataType.createFish:
EventCenter.Instance.EventTrigger<SyncGameData>(ConstEventString.SyncGameData_CreateFish, syncGameData);
Assets/MyGame/Scripts/Net/WebSocketSendList_Fish.cs
+115 -3
View File
@@ -1,11 +1,58 @@
using Assets.MyGame.Scripts.Net;
using Assets.MyGame.Scripts.Net.WebResponses;
using Assets.MyGame.Scripts.Net.WebResponses.ChineseChess;
using Newtonsoft.Json;
using System;
using System.Text;
using Unity.VisualScripting;
using UnityEngine;
public partial class WebSocketSendList
{
public static string MakeKillFishSign(
string roomId,
string userId,
string fishNumber,
string fishId,
long gold,
long timespan,
string bulletId,
long timestamp,
string signKey
)
{
string rawStr = $"{roomId}|{userId}|{fishNumber}|{fishId}|{gold}|{timespan}|{bulletId}|{timestamp}";
return Sign(rawStr, signKey);
}
public static string MakeFireCannonSign(string roomId, string userId, long gold, int count, long timestamp, string signKey)
{
string rawStr = $"{roomId}|{userId}|{gold}|{count}|{timestamp}";
Debug.Log($"生成签名的原始字符串：{rawStr}");
return Sign(rawStr, signKey);
}
public static string Sign(string rawStr, string signKey)
{
string input = rawStr + "|" + signKey;
using (var md5 = System.Security.Cryptography.MD5.Create())
{
byte[] bytes = Encoding.UTF8.GetBytes(input);
byte[] hash = md5.ComputeHash(bytes);
// 转成 hex 字符串（前 8 位）
StringBuilder sb = new StringBuilder();
for (int i = 0; i < hash.Length; i++)
{
sb.Append(hash[i].ToString("x2"));
}
return sb.ToString().Substring(0, 8);
}
}
/// <summary>
/// 获取房间信息
/// </summary>
@@ -13,7 +60,7 @@ public partial class WebSocketSendList
{
WebSocketManager.Instance.Send(SocketType.room, "{\"type\":1,\"target\":\"GetRoomList\",\"invocationId\":\"1\",\"arguments\":[\"" + GameManager.Instance.user.id + "\"," + (int)GameManager.Instance.gameData.currGameType + "," + leave + ","+ district + "]}");
}
/// <summary>
/// 打中鱼
/// </summary>
@@ -21,11 +68,76 @@ public partial class WebSocketSendList
/// <param name="userId"></param>
/// <param name="fishNumber">配置id</param>
/// <param name="fishId">唯一id</param>
public static void KillFish(string roomId, string userId, string fishNumber, string fishId,int paoBei)
public static void KillFish(
string roomId,
string userId,
string fishNumber,
string fishId,
int paoBei,
string bulletId,
string signKey
)
{
var sendObj = new WebSocketSendList("KillFish", roomId, userId, fishNumber, fishId, paoBei, DateTimeOffset.UtcNow.ToUnixTimeSeconds());
long timespan = BeijingTimeManager.Instance.CurrentTimestampMs; // 毫秒
long timestamp = timespan / 1000; // 秒级
// count 固定为 1
string sign = MakeKillFishSign(roomId, userId, fishNumber, fishId, paoBei, timespan, bulletId, timestamp, signKey);
var sendObj = new WebSocketSendList(
"KillFish",
roomId,
userId,
fishNumber,
fishId,
paoBei,
timespan,
bulletId,
timestamp,
sign
);
WebSocketManager.Instance.Send(SocketType.game, JsonConvert.SerializeObject(sendObj));
}
/// <summary>
/// 发射子弹
/// </summary>
/// <param name="roomId"></param>
/// <param name="userId"></param>
/// <param name="gold">单价</param>
/// <param name="count">数量</param>
/// <summary>
/// 发射子弹（与 KillFish 同结构版本）
/// </summary>
public static void FireCannon(
string roomId,
string userId,
long gold,
int count,
object extra,
string signKey
)
{
long timespan = BeijingTimeManager.Instance.CurrentTimestampMs; // 毫秒
long timestamp = timespan / 1000; // 秒级
// FireCannon 的签名规则与 KillFish 一样：roomId|userId|gold|count|timestamp
string sign = MakeFireCannonSign(roomId, userId, gold, count, timestamp, signKey);
var sendObj = new WebSocketSendList(
"FireCannon",
roomId,
userId,
gold,
count,
timestamp,
sign,
extra
);
WebSocketManager.Instance.Send(SocketType.game, JsonConvert.SerializeObject(sendObj));
}
/// <summary>
/// 发射子弹
/// </summary>
Assets/MyGame/Scripts/Turret/SitPosData.cs
+29 -9
View File
@@ -265,6 +265,7 @@ using System.Collections.Generic;
using System.Linq;
using TMPro;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UI;
public class SitPosData : MonoBehaviour
@@ -322,14 +323,14 @@ public class SitPosData : MonoBehaviour
private void Awake()
{
btn_TurretAdd.onClick.AddListener(() => ChangeTurretAddConsumeNum());
btn_TurretMinus.onClick.AddListener(() => ChangeTurretMinusConsumeNum());
// 构建字典
dic_Turrets = list_Turrets.ToDictionary(t => t.turretID);
// 炮台倍率按钮
btn_TurretAdd.onClick.AddListener(() => ChangeTurretAddConsumeNum(1000));
btn_TurretMinus.onClick.AddListener(() => ChangeTurretMinusConsumeNum(1000));
}
}
// -------------------------
// 切换炮台
// -------------------------
@@ -347,7 +348,7 @@ public class SitPosData : MonoBehaviour
currentTurretID = currentTurret.turretID;
currentTurret.gameObject.SetActive(true);
// 绑定状态机入口
// 绑定状态机入口
OnStateChange = currentTurret.ChangeState;
// 缓存旋转点
@@ -400,16 +401,34 @@ public class SitPosData : MonoBehaviour
tMP_GoldNum.text = goldNum.ToString();
return true;
}
public void ChangeTurretAddConsumeNum(int n)
int indexConsume=0;
public void ChangeTurretAddConsumeNum()
{
consumeGoldNum += n;
if (CreateFishManager.Instance.currGameType.paoBeiList.Count-1> indexConsume)
{
indexConsume++;
}
else
{
indexConsume = 0;
}
consumeGoldNum = CreateFishManager.Instance.currGameType.paoBeiList[indexConsume];
tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
}
public void ChangeTurretMinusConsumeNum(int n)
public void ChangeTurretMinusConsumeNum()
{
consumeGoldNum -= n;
if (indexConsume>0)
{
indexConsume--;
}
else
{
indexConsume = CreateFishManager.Instance.currGameType.paoBeiList.Count - 1;
}
consumeGoldNum = CreateFishManager.Instance.currGameType.paoBeiList[indexConsume];
tMP_TurretConsumeNum.text = consumeGoldNum.ToString();
}
@@ -432,6 +451,7 @@ public class SitPosData : MonoBehaviour
isLock = false;
lockFX.SetActive(false);
ChangeState(TurretState.Idle);
}
}
Assets/MyGame/Scripts/Turret/TurretData.cs
+2 -2
View File
@@ -53,8 +53,8 @@ public class TurretData : MonoBehaviour
private void Awake()
{
if (setPosData != null)
setPosData.OnStateChange = ChangeState;
//if (setPosData != null)
// setPosData.OnStateChange = ChangeState;
// 自动判断：如果狂暴攻击动画名不为空，就启用切换动画模式
useFrenzyAnim = !string.IsNullOrEmpty(frenzyAttackAnim);
Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab
+23
View File
@@ -46,6 +46,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 811dbe57edb5c9c44a26adf557eb3342, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -65,6 +66,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 6154013042348716668, guid: a82246e8833a95444a02ab209e7fea94,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -72,6 +74,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u767D\u9AA8\u7CBE"
tMP_CurrBossScore: {fileID: 0}
@@ -2526,11 +2529,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 111353891062718048, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111616761771223058, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_Animation
value:
objectReference: {fileID: 7400000, guid: 2425ef8bf54c2844fadc4c5f2871f39d, type: 2}
- target: {fileID: 111616761771223058, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111616761771223058, guid: 3f29f63bb226af24ca5ef9bee742c41d,
type: 3}
propertyPath: m_PlayAutomatically
@@ -4854,6 +4867,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -14.183159
objectReference: {fileID: 0}
- target: {fileID: 111477794280538272, guid: f9bdcb2c4d107cb49ac89bbec9e44727,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111510073901028830, guid: f9bdcb2c4d107cb49ac89bbec9e44727,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
Assets/MyGame/aa/Game/HHWK/Boss/BaoChuanJuXie/Game177_bcjx.prefab
+24
View File
@@ -46,6 +46,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1be96b84d201f154e849c469c6d20cf9, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -65,6 +66,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 3379146031953069891, guid: d71e4a653d9838140996f17791820930,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -72,6 +74,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u5B9D\u8239\u5C45\u87F9"
tMP_CurrBossScore: {fileID: 0}
@@ -82,6 +85,7 @@ MonoBehaviour:
ZhuCam: {fileID: 0}
isDieFish: 0
dieTime: 3
v3: {x: 0, y: 0, z: 0}
defaultAnim: {fileID: 4710615497412397201}
skillAnim: {fileID: 5856041252673125816}
skillEffect: {fileID: 0}
@@ -1514,6 +1518,11 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111690175861776792, guid: f7541f449c9e29645aed5158851332c1,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -2940,6 +2949,21 @@ PrefabInstance:
propertyPath: m_Animation
value:
objectReference: {fileID: 7400000, guid: e1b1d354fde552f4aa19a4e00c079489, type: 2}
- target: {fileID: 111066778049879928, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111291547872775986, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111500050402096248, guid: e48497135c317fe43ae64de38915cd95,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/Game/HHWK/Boss/ChangE/Game177_changE.prefab
+720 -578
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/Game/HHWK/Boss/ChangE/HHWK_CE_Boss.cs
+3
View File
@@ -28,6 +28,8 @@ public class HHWK_CE_Boss : MonsterControl_BossBase
public override void OnEnable()
{
//base.Start();
isEnd = false;
if (UnityEngine.Random.Range(0, 1f) > 0.5f)
{
defaultAnim.transform.parent.gameObject.SetActive(true);
@@ -105,6 +107,7 @@ public class HHWK_CE_Boss : MonsterControl_BossBase
}
if (moveTime >= setMoveTime&& pathId == "3")
{
if (isEnd)
Assets/MyGame/aa/Game/HHWK/Boss/ShaSeng/Game177_shaseng.prefab
+19
View File
@@ -52,6 +52,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 40a0abcaeb0d1fb4abd5368c6914ea65, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -71,6 +72,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 1180578158617408324, guid: 6a128042473b1a2408a6c77088fe102c,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -78,6 +80,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u6C99\u50E7"
tMP_CurrBossScore: {fileID: 0}
@@ -88,6 +91,7 @@ MonoBehaviour:
ZhuCam: {fileID: 0}
isDieFish: 0
dieTime: 3
v3: {x: 0, y: 0, z: 0}
idleAnim: {fileID: 5736229465822459635}
skillAnim: {fileID: 8912379870525328617}
obj_Skill101Effect: {fileID: 3275368157761356577}
@@ -5085,6 +5089,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 111433881075115309, guid: f3c1d4aa2730c794ca0ca680c35b6097,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -6869,6 +6878,11 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111887312969816373, guid: cf19a340494f9464abcb71879f4dd4f8,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -9298,6 +9312,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -29.413002
objectReference: {fileID: 0}
- target: {fileID: 111484755779879834, guid: 4512d2c5e4964f04a86caaf7709a6f44,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/Game177_wukong.prefab
+10 -1
View File
@@ -46,6 +46,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a35098a8a1b10d9428ef21cffc34d830, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -65,6 +66,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 3444441392116629287, guid: 9dc58c733df05e346a67129da9aa2e98,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -72,6 +74,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u5B59\u609F\u7A7A"
tMP_CurrBossScore: {fileID: 0}
@@ -82,6 +85,7 @@ MonoBehaviour:
ZhuCam: {fileID: 0}
isDieFish: 0
dieTime: 3
v3: {x: 0, y: 0, z: 0}
defaultAnim: {fileID: 4201200322555743540}
skillAnim: {fileID: 6762785892346278323}
--- !u!1001 &4305481844920513146
@@ -1353,6 +1357,11 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111901155395665742, guid: bfe3df1769c87a94bb45857e06520ed2,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -2864,7 +2873,7 @@ PrefabInstance:
- target: {fileID: 111771092198208730, guid: aa7e92afb22dcd54cb64c818ec6b17a2,
type: 3}
propertyPath: m_AnimatePhysics
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111771092198208730, guid: aa7e92afb22dcd54cb64c818ec6b17a2,
type: 3}
Assets/MyGame/aa/Game/HHWK/Boss/SunWuKong/HHWK_SWK_Boss.cs
+6 -1
View File
@@ -35,9 +35,14 @@ public class HHWK_SWK_Boss : MonsterControl_BossBase
{
base.Awake();
prizeCount = 6;
}
public override void OnEnable()
{
base.OnEnable();
defaultAnim.transform.parent.gameObject.SetActive(true);
skillAnim.transform.parent.gameObject.SetActive(false);
}
float setMoveTime = 20;
bool isEnd = false;
Assets/MyGame/aa/Game/HHWK/Boss/TangSeng/Game177_tangseng.prefab
+14
View File
@@ -80,6 +80,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b5b2a326b13b0094db210bdff0485b15, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -99,6 +100,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 9137225375339653359, guid: 63bc4f7541a285d47b954f1f69e33f14,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -106,6 +108,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u5510\u50E7"
tMP_CurrBossScore: {fileID: 0}
@@ -116,6 +119,7 @@ MonoBehaviour:
ZhuCam: {fileID: 0}
isDieFish: 0
dieTime: 3
v3: {x: 0, y: 0, z: 0}
defaultAnim: {fileID: 4924076738661606036}
skillAnim: {fileID: 1691082259229192235}
skillEffect: {fileID: 803156215411881838}
@@ -1610,6 +1614,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 28.856346
objectReference: {fileID: 0}
- target: {fileID: 111533803739292891, guid: 67fce1adb9bdbaa4ca6e06e2b32dc44b,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
@@ -3071,6 +3080,11 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111408345039935966, guid: 1b67a9cc57717b540b1d3cf1c0b8775a,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/Game/HHWK/Boss/TieShanGongZhu/Game177_tieshangongzhu.prefab
+14
View File
@@ -48,6 +48,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2235b06d58970cb48b252db67d544e70, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -67,6 +68,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 7882560147169503175, guid: 997369fca46b5304dbda93ce85dfb18e,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -74,6 +76,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u94C1\u6247\u516C\u4E3B"
tMP_CurrBossScore: {fileID: 0}
@@ -84,6 +87,7 @@ MonoBehaviour:
ZhuCam: {fileID: 0}
isDieFish: 0
dieTime: 3
v3: {x: 0, y: 0, z: 0}
defaultAnim: {fileID: 5596313341512249453}
skillAnim: {fileID: 1690992969017980382}
--- !u!1001 &1655676627107907063
@@ -1910,6 +1914,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -123.80341
objectReference: {fileID: 0}
- target: {fileID: 111948132087033897, guid: d23d6e1670cd5a84ab17f3a17bf2029e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -3907,6 +3916,11 @@ PrefabInstance:
propertyPath: m_Animation
value:
objectReference: {fileID: 7400000, guid: b7a2b42180239884d91317836d1603d7, type: 2}
- target: {fileID: 111817325062191328, guid: 5a583fd179bb19e4693bdbb25c336cc0,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111817325062191328, guid: 5a583fd179bb19e4693bdbb25c336cc0,
type: 3}
propertyPath: m_Animations.Array.data[2]
Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/Game177_lm.prefab
+506 -371
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/Game/HHWK/Boss/YiLong/Game177_yilong.prefab
+97
View File
@@ -46,6 +46,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cf305e06d6e95a641acf0cc2bd0dad62, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -65,6 +66,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 7437404940134228005, guid: 91db3b5ecee5e6c499597cfa9bbfdfe2,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -72,6 +74,16 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList:
- {fileID: 3421437994888077689}
- {fileID: 3415113208108055307}
- {fileID: 3421052081613006218}
- {fileID: 3415409984878836842}
- {fileID: 3415018763858839740}
- {fileID: 3415199644000639940}
- {fileID: 3415189053566432643}
- {fileID: 3421246963248850191}
- {fileID: 3421056663850599134}
isRotate: 1
bossName: YiLong
tMP_CurrBossScore: {fileID: 0}
@@ -82,6 +94,7 @@ MonoBehaviour:
ZhuCam: {fileID: 0}
isDieFish: 0
dieTime: 3
v3: {x: 0, y: 0, z: 0}
idleAnim: {fileID: 3379856991190237005}
dieAnim: {fileID: 678688688032345743}
--- !u!1001 &639745227239370806
@@ -1216,6 +1229,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 97.54049
objectReference: {fileID: 0}
- target: {fileID: 111095919050787622, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111356700911858394, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111458735412797113, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111891103352497787, guid: 810cf681ff1e7254fa1d27b0d5e42645,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -2921,6 +2954,16 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 28.634092
objectReference: {fileID: 0}
- target: {fileID: 111528911807818478, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111688331903957256, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114187454977326620, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
propertyPath: obj_EffectFire
@@ -2945,12 +2988,42 @@ Animation:
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3415018763858839740 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4228214996573471, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3415113208108055307 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4358105479016104, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3415189053566432643 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4117307842306080, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3415199644000639940 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4126508818681447, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3415378865181926841 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4024252914577434, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3415409984878836842 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4056905764334025, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3417510510119036608 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1969505138979683, guid: 7c45496dc34e95e48a133e52513cdc90,
@@ -2980,12 +3053,36 @@ MonoBehaviour:
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!4 &3421052081613006218 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4948132087033897, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3421056663850599134 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4952320105404285, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3421243963348060952 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4824317463469755, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3421246963248850191 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4825818419884204, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3421437994888077689 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4771092198208730, guid: 7c45496dc34e95e48a133e52513cdc90,
type: 3}
m_PrefabInstance: {fileID: 3416984115205772707}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4612594075884504877
PrefabInstance:
m_ObjectHideFlags: 0
Assets/MyGame/aa/Game/HHWK/Boss/YuXI/Game177_yuxi.prefab
+103
View File
@@ -47,6 +47,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4a3e0d0c09d75ea4893527b7d0018aa7, type: 3}
m_Name:
m_EditorClassIdentifier:
beilv: 0
guid:
monsterData:
die_Score: 0
@@ -66,6 +67,7 @@ MonoBehaviour:
effect_Die: {fileID: 0}
effect_DieAward: {fileID: 3521828562207678694, guid: c9f35d82cea6daa47be7df43beceaaee,
type: 3}
currEffect_DieAward: {fileID: 0}
isMove: 1
is3D: 0
forwordXYZ:
@@ -73,6 +75,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u4E5D\u9F99\u7389\u73BA"
tMP_CurrBossScore: {fileID: 0}
@@ -515,6 +518,51 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 34.39913
objectReference: {fileID: 0}
- target: {fileID: 111075864462779534, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111101133080060232, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111151797847433907, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111163714622165790, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111216095195831122, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111426252596376205, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111514865527688870, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111725357837634651, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111856281198064092, guid: b00087b57145e5f428c4364a7a19606e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -3525,6 +3573,16 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111008770253507523, guid: 49acee7e5db085c4a86d1ad72c22468b,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111147706149845817, guid: 49acee7e5db085c4a86d1ad72c22468b,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -3986,6 +4044,51 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -129.17252
objectReference: {fileID: 0}
- target: {fileID: 111029543675603457, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111095919050787622, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111134286944189183, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111176931266004030, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111274088443893264, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111416982030819627, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111540393087334429, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111725357837634651, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111855622808019284, guid: 2a793fc3f1399704987fd2587ff36ca5,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/Game/HHWK/Boss/ZhuBaJie/Game177_zhubajie.prefab
+7 -1
View File
@@ -76,6 +76,7 @@ MonoBehaviour:
moveTime: 0
isyz: 0
yzID:
colliderList: []
isRotate: 1
bossName: "\u732A\u516B\u6212"
tMP_CurrBossScore: {fileID: 0}
@@ -999,7 +1000,7 @@ PrefabInstance:
- target: {fileID: 111215879266689626, guid: 02e32a5dbdf10494fb82dc592e4ac6e5,
type: 3}
propertyPath: m_AnimatePhysics
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -1991,6 +1992,11 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 111570723408815475, guid: 081b040fea8728c4c9b18a590ba3035e,
type: 3}
propertyPath: m_AnimatePhysics
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Assets/MyGame/aa/Game/Turrets/paotai11001.prefab
+1 -1
View File
@@ -162,7 +162,7 @@ PrefabInstance:
- target: {fileID: 8050254276545140993, guid: c2f0865344a970d459ea7df4bebb12fb,
type: 3}
propertyPath: m_Name
value: "\u70AE1 Variant 7"
value: paotai11001
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Assets/MyGame/aa/Game/Turrets/炮1.prefab
-76
View File
@@ -1,80 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3256520982739592280
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3991118687467606259}
- component: {fileID: 2786909347197782433}
- component: {fileID: 6297365374186182631}
m_Layer: 0
m_Name: "\u7EC4 233686 \u62F7\u8D1D_3"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3991118687467606259
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256520982739592280}
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: 4266654332782161073}
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.000030517578, y: -14}
m_SizeDelta: {x: 114, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2786909347197782433
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256520982739592280}
m_CullTransparentMesh: 1
--- !u!114 &6297365374186182631
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3256520982739592280}
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: e0db8bb51a19bf342917ad9abed2219b, 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!1 &3373312624562575071
GameObject:
m_ObjectHideFlags: 0
@@ -234,7 +159,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6441124963233406188}
- {fileID: 3991118687467606259}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
Assets/MyGame/aa/Game/XJMH/Prefabs/Bullit/PW_Bullet_1.prefab
+5 -19
View File
@@ -29,7 +29,7 @@ Transform:
m_GameObject: {fileID: 1166920474713197}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.23, y: 0, z: 0}
m_LocalPosition: {x: -1.23, y: 0, z: -400}
m_LocalScale: {x: 6, y: 6, z: 6}
m_ConstrainProportionsScale: 1
m_Children: []
@@ -171,24 +171,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 59323a063846feb4cb2ab243e7887554, type: 3}
m_Name:
m_EditorClassIdentifier:
user:
userId:
userName:
avatar:
isRedName: 0
vipLevel: 0
userCardLevel: 0
cId:
gold: 0
diamond: 0
position: 0
cannonId:
wingsId:
warGodId:
cannonMultiple: 0
beginCoin: 0
beginTime: 0
state: 0
userid:
moveSpeed: 100
desTime: 10
playerID:
@@ -197,3 +180,6 @@ MonoBehaviour:
diePrefab: {fileID: 6304718870697136037, guid: 81d9913b840dd1e4d9801e06ed16d14e,
type: 3}
isTriggerFirst: 1
targetTra: {fileID: 0}
bulletID:
a: 0.5
Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs
+201 -93
View File
@@ -91,6 +91,8 @@ using Spine.Unity;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using TMPro;
using UnityEngine;
@@ -99,7 +101,6 @@ using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using static UnityEngine.AddressableAssets.Addressables;
public class GameMainPanel_FishBase : GameMainPanel_Base
{
@@ -123,6 +124,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public Toggle toggle_Three;
public Toggle toggle_Shuang;
public Toggle toggle_BaoZou;
public Image img_BaoZou;
public float frenzyDuration = 5f; // 疯狂状态持续时间
public float currFrenzyTime = 0f;
public Toggle toggle_BingFeng;
public Image img_BingFeng;
public float bingFengDuration = 5f; // 冰封状态持续时间
public float currBingFengTime = 0f;
public List<SitPosData> list_Sits = new List<SitPosData>();
public SitPosData currSitData;
@@ -139,11 +147,11 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
AudioClip bulletClip;
public List<int> paoBeiList=new List<int>();
public ProgressBar JinDuTiao;
#region UI
bool isfirstShow = true;
protected override void OnShow(object args = null)
{
base.OnShow(args);
@@ -156,6 +164,18 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
RoomJoinNotice roomJoinNotice = v.arguments[0];
if (isfirstShow)
{
int t = GameManager.Instance.gameData.currRoomData.gameType;
int l = GameManager.Instance.gameData.currRoomData.roomLevel;
foreach (var item in GameManager.Instance.gameConfig.roomConfigs)
{
if (item.gameType== t && l == GameManager.Instance.gameData.currRoomData.roomLevel)
{
paoBeiList= item.cannonMultipleList;
}
}
string roomId = GameManager.Instance.gameData.currRoomData.roomId;
//string roomId = GameManager.Instance.gameData.currRoomData;
foreach (var item in GameManager.Instance.gameData.currRoomData.players)
{
@@ -172,6 +192,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
else
{
JoinGame(roomJoinNotice.position, roomJoinNotice.gold, roomJoinNotice.cannonMultiple, 0, roomJoinNotice.userId);
}
@@ -214,7 +235,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// 服务器广播监听
EventCenter.Instance.AddEventListener<SyncGameData>(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate);
EventCenter.Instance.AddEventListener<SyncGameData>(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit);
EventCenter.Instance.AddEventListener<FireCannonSendData>(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit);
EventCenter.Instance.AddEventListener<SyncGameData>(ConstEventString.SyncGameData_ChangeTargetMonster, SyncGameData_ChangeTargetMonster);
EventCenter.Instance.AddEventListener<SyncGameData>(ConstEventString.SyncGameData_RendromDieFish, SyncGameData_RendromDieFish);
EventCenter.Instance.AddEventListener<SyncGameData>(ConstEventString.SyncGameData_TurretState, SyncGameData_TurretState);
@@ -225,7 +246,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public virtual void OnDestroy()
{
EventCenter.Instance.RemoveEventListener<SyncGameData>(ConstEventString.SyncGameData_Rotate, SyncGameData_Rotate);
EventCenter.Instance.RemoveEventListener<SyncGameData>(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit);
EventCenter.Instance.RemoveEventListener<FireCannonSendData>(ConstEventString.SyncGameData_FireBullet, SyncGameData_FireBullit);
EventCenter.Instance.RemoveEventListener<SyncGameData>(ConstEventString.SyncGameData_ChangeTargetMonster, SyncGameData_ChangeTargetMonster);
EventCenter.Instance.RemoveEventListener<SyncGameData>(ConstEventString.SyncGameData_RendromDieFish, SyncGameData_RendromDieFish);
EventCenter.Instance.RemoveEventListener<SyncGameData>(ConstEventString.SyncGameData_TurretState, SyncGameData_TurretState);
@@ -278,9 +299,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
currSitData.ChangeState(TurretState.Idle);
}
});
toggle_BingFeng.onValueChanged.AddListener(on => {
});
}
public bool isFrenzy;
@@ -300,24 +325,42 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
public void OnEnable()
{
}
int ina = 0;
private void Update()
{
if (Keyboard.current.oKey.wasPressedThisFrame)
{
ina++;
currSitData.ChangeTurret(ina);
}
if (Keyboard.current.pKey.wasPressedThisFrame)
{
ina--;
currSitData.ChangeTurret(ina);
}
HandleInput();
HandleAutoRotate();
CheckLockTargetValid();//锁定目标失效自动清除
HandleLock();
HandleAutoFire(); // 自动开火真正发射
HandleLock();
UpdateLockFX();
HandleAutoLock();
LoopLaser();
SettingClose();
}
float sittingTime = 10;
float currSittingTime ;
float currSittingTime;
/// <summary>
/// 等待10秒未操作关闭设置面板
@@ -326,10 +369,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
//if (isOpenSetting) StartCoroutine(CloseSettingList());
//else StartCoroutine(OpenSettingList());
if (isOpenSetting)
if (isOpenSetting)
{
currSittingTime -= Time.deltaTime;
if (currSittingTime<=0)
if (currSittingTime <= 0)
{
StartCoroutine(CloseSettingList());
}
@@ -340,21 +383,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
}
}
private void UpdateLockFX()
{
foreach (var sit in list_Sits)
{
if (!sit.isLock || sit.monCotl_Lock == null) continue;
Vector3 pos = sit.monCotl_Lock_Position.position;
pos.z = Camera.main.transform.position.z + 1;
sit.lockFX.transform.position = pos;
if (!sit.lockFX.activeSelf)
sit.lockFX.SetActive(true);
}
}
#endregion
@@ -465,7 +494,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (!input.isPressed && !input.wasPressedThisFrame && !input.wasReleasedThisFrame)
return;
// ⭐ UI 点击过滤（保持你之前的逻辑）
// ⭐ UI 点击过滤
if (IsPointerOverUI(input.position))
return;
@@ -716,6 +745,34 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#endregion
#region Skill系统（SkillModule）
public void DaoJiShi()
{
if (toggle_BaoZou.isOn)
{
img_BaoZou.fillAmount = currFrenzyTime / frenzyDuration;
currFrenzyTime -= Time.deltaTime;
if (currFrenzyTime <= 0)
{
toggle_BaoZou.isOn = false;
img_BaoZou.fillAmount = 1;
}
}
if (toggle_BingFeng.isOn)
{
img_BingFeng.fillAmount = currBingFengTime / bingFengDuration;
currBingFengTime -= Time.deltaTime;
if (currBingFengTime <= 0)
{
toggle_BingFeng.isOn = false;
img_BingFeng.fillAmount = 1;
}
}
}
#endregion
#region ③ 攻击系统（FireModule）
private void TryFire()
{
@@ -729,22 +786,21 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
bool isDouble = toggle_Shuang.isOn;
bool isLock = toggle_Lock.isOn;
FireBullet(currSitData, angle, isSanShe, isDouble, isLock);
//FireBullet(currSitData, angle, isSanShe, isDouble, isLock);
SyncFire(angle, isSanShe, isDouble, isLock);
}
private void FireBullet(SitPosData sit, float angle, bool isSanShe, bool isDouble, bool isLock)
private void FireBullet(SitPosData sit, float angle, bool isSanShe, bool isDouble, bool isLock,List<string> bullitIDs)
{
Vector2 startPos = sit.GetBulletStartPos();
if (isSanShe)
{
CreateBullet(sit, startPos, angle - 20, isDouble, isLock);
CreateBullet(sit, startPos, angle, isDouble, isLock);
CreateBullet(sit, startPos, angle + 20, isDouble, isLock);
CreateBullet(sit, startPos, angle - 20, isDouble, isLock, bullitIDs[0]);
CreateBullet(sit, startPos, angle, isDouble, isLock, bullitIDs[1]);
CreateBullet(sit, startPos, angle + 20, isDouble, isLock, bullitIDs[2]);
}
else
{
CreateBullet(sit, startPos, angle, isDouble, isLock);
CreateBullet(sit, startPos, angle, isDouble, isLock, bullitIDs[0]);
}
AudioManager.Instance.PlayFX(bulletClip);
@@ -798,7 +854,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
{
if (currSitData == null) return;
bool needAutoFire = toggle_SkillAuto.isOn || (toggle_Lock.isOn && currSitData.isLock);
bool needAutoFire = toggle_SkillAuto.isOn || (toggle_Lock.isOn && currSitData.isLock && currSitData.lockFX.gameObject.activeSelf);
if (!needAutoFire)
{
autoFireTimer = 0f;
@@ -818,7 +874,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
// ⭐ 自动攻击也要播放攻击动画
currSitData.ChangeState(TurretState.Attack);
FireBullet(currSitData, angle, isSanShe, isDouble, isLock);
//FireBullet(currSitData, angle, isSanShe, isDouble, isLock);
SyncFire(angle, isSanShe, isDouble, isLock);
}
@@ -828,41 +884,18 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#endregion
#region 锁定系统（LockModule）
//private void HandleLock()
//{
// if (!toggle_Lock.isOn) return;
// if (Touchscreen.current.primaryTouch.press.wasPressedThisFrame)
// {
// Vector2 worldPos = Camera.main.ScreenToWorldPoint(
// Touchscreen.current.primaryTouch.position.ReadValue());
// RaycastHit2D hit = Physics2D.Raycast(worldPos, Vector2.zero, 50, LayerMask.GetMask("Fish"));
// if (hit.collider != null)
// {
// MonsterContral monster = hit.collider.GetComponentInParent<MonsterContral>();
// currSitData.SetLockTarget(monster, hit.collider.transform);
// // 同步锁定
// SyncLock(monster);
// }
// else
// {
// // 点击空白：取消锁定 + 隐藏图标
// currSitData.ClearLock();
// SyncLock(null);
// }
// }
//}
private void HandleLock()
{
CrossPlatformInput input = GetInput();
if (!toggle_Lock.isOn) return;
// 只有按下那一帧才触发锁定
if (!input.wasPressedThisFrame) return;
if (!input.wasReleasedThisFrame&&!input.wasPressedThisFrame) return;
// ⭐ UI 点击过滤
if (IsPointerOverUI(input.position))
return;
Vector2 worldPos = Camera.main.ScreenToWorldPoint(input.position);
RaycastHit2D hit = Physics2D.Raycast(worldPos, Vector2.zero, 50, LayerMask.GetMask("Fish"));
@@ -871,7 +904,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
MonsterContral monster = hit.collider.GetComponentInParent<MonsterContral>();
currSitData.SetLockTarget(monster, hit.collider.transform);
SyncLock(monster);
SyncLock(new List<string> { monster?.guid }, monster.colliderList.IndexOf(hit.collider.transform));
}
else
{
@@ -879,7 +912,46 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
SyncLock(null);
}
}
private void UpdateLockFX()
{
foreach (var sit in list_Sits)
{
if (!sit.isLock || sit.monCotl_Lock == null) continue;
Vector3 pos = Vector3.zero;
if (!sit.monCotl_Lock_Position.gameObject.activeInHierarchy)
{
foreach (Transform t in sit.monCotl_Lock.colliderList)
{
if (t.gameObject.activeInHierarchy)
{
sit.monCotl_Lock_Position = t;
pos = sit.monCotl_Lock_Position.position;
break;
}
}
if (!sit.monCotl_Lock_Position.gameObject.activeInHierarchy)
{
if (sit.lockFX.activeSelf)
sit.lockFX.SetActive(false);
}
}
else
{
pos = sit.monCotl_Lock_Position.position;
if (!sit.lockFX.activeSelf)
sit.lockFX.SetActive(true);
}
pos.z = Camera.main.transform.position.z + 1;
sit.lockFX.transform.position = pos;
}
}
private void CheckLockTargetValid()
{
if (!currSitData.isLock) return;
@@ -915,7 +987,21 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
if (target != null)
{
currSitData.SetLockTarget(target, target.transform);
SyncLock(target);
if (target.colliderList.Count>0)
{
for (int i = 0; i < target.colliderList.Count; i++)
{
if (target.colliderList[i].gameObject.activeInHierarchy)
{
SyncLock(new List<string> { target?.guid }, i);
}
}
}
else
{
SyncLock(new List<string> { target?.guid }, -1);
}
}
else
{
@@ -970,7 +1056,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#endregion
#region BulletModule（子弹系统）
private BullitMove CreateBullet(SitPosData sit, Vector2 pos, float angle, bool isDouble, bool isLock)
private BullitMove CreateBullet(SitPosData sit, Vector2 pos, float angle, bool isDouble, bool isLock,string id)
{
GameObject prefab = isDouble ? sit.currentTurret.bulletPrefab_Two : sit.currentTurret.bulletPrefab;
@@ -982,10 +1068,10 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
bullet.userid = sit.user;
bullet.playerID = sit.user;
bullet.bulletID = Guid.NewGuid().ToString();
bullet.bulletID = id;
if (isLock)
bullet.Lock(sit.monCotl_Lock);
bullet.Lock(sit.monCotl_Lock, currSitData.monCotl_Lock_Position);
return bullet;
}
@@ -1022,10 +1108,32 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
auto = toggle_SkillAuto.isOn
}
};
WebSocketSendList.SyncGameData(sgd);
//WebSocketSendList.SyncGameData(sgd);
var roomdata = GameManager.Instance.gameData.currRoomData;
var user = GameManager.Instance.user;
// 三射 = 3 发，否则 = 1 发
int count = isSanShe ? 3 : 1;
// 新版 FireCannon 不需要 timestamp 和 sign
WebSocketSendList.FireCannon(
roomdata.roomId,
user.id,
currSitData.consumeGoldNum,
count,
sgd,
"63215f0afa3f5b25"
);
// WebSocketSendList.FireCannon(roomdata.roomId, user.id,currSitData.consumeGoldNum,1,BeijingTimeManager.Instance.CurrentTimestamp, "63215f0afa3f5b25", sgd);
}
private void SyncLock(MonsterContral monster)
private void SyncLock(List<string> monsterguid,int index=-1)
{
SyncGameData sgd = new SyncGameData
{
@@ -1034,8 +1142,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
time = BeijingTimeManager.Instance.CurrentTimestampMs,
frameData = new FrameData_ChangeAutoTarget
{
targetGuid = monster?.guid,
targetPostName = monster == null ? null : monster.name
targetGuid = monsterguid,
colliderIndex=index,
}
};
WebSocketSendList.SyncGameData(sgd);
@@ -1077,12 +1185,12 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
SmoothRotate(list_Sits[sync.sitPos], data.angle);
}
public void SyncGameData_FireBullit(SyncGameData sync)
public void SyncGameData_FireBullit(FireCannonSendData sync)
{
if (sync.sitPos == currSitData.posID) return;
//if (sync.sitPos == currSitData.posID) return;
var data = FrameDataParser.Parse<FrameData_FireBullit>(sync.frameData);
FireBullet(list_Sits[sync.sitPos], data.angle, data.isSanShe, data.twoRTruuect, data.isSuoDing);
var data = FrameDataParser.Parse<FrameData_FireBullit>(sync.extra.frameData);
FireBullet(list_Sits[sync.extra.sitPos], data.angle, data.isSanShe, data.twoRTruuect, data.isSuoDing,sync.bulletIds);
}
public void SyncGameData_ChangeTargetMonster(SyncGameData sync)
@@ -1097,8 +1205,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
return;
}
MonsterContral monster = CreateFishManager.Instance.fishDatas_hashCodekey[data.targetGuid];
Transform hitPos = monster.transform.Find(data.targetPostName);
MonsterContral monster = CreateFishManager.Instance.fishDatas_hashCodekey[data.targetGuid[0]];
Transform hitPos = data.colliderIndex != -1?monster.colliderList[ data.colliderIndex]: monster.transform;
list_Sits[sync.sitPos].SetLockTarget(monster, hitPos);
}
@@ -1140,30 +1248,30 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
#region 玩家加入/退出（PlayerJoinModule）
public void JoinGame(int sitNum, long goldNum, long consumeGold, int currentTurretIndex, string user = null)
{
foreach (var sit in list_Sits)
{
if (sit.posID != sitNum) continue;
foreach (var sit in list_Sits)
{
if (sit.posID != sitNum) continue;
sit.gameObject.SetActive(true);
sit.gameObject.SetActive(true);
sit.user = user ?? GameManager.Instance.user.id;
sit.goldNum = goldNum;
sit.consumeGoldNum = consumeGold;
sit.user = user ?? GameManager.Instance.user.id;
sit.goldNum = goldNum;
sit.consumeGoldNum = consumeGold;
sit.tMP_GoldNum.text = goldNum.ToString();
sit.tMP_TurretConsumeNum.text = consumeGold.ToString();
sit.tMP_GoldNum.text = goldNum.ToString();
sit.tMP_TurretConsumeNum.text = consumeGold.ToString();
sit.ChangeTurret(currentTurretIndex);
sit.ChangeTurret(currentTurretIndex);
}
}
}
public void TuiChuHHWK()
{
WebSocketSendList.LeaveRoom(GameManager.Instance.gameData.currRoomData.roomId, currSitData.user);
CreateFishManager.Instance.fangzhu = false;
}
public void TuiChuHHWK()
{
WebSocketSendList.LeaveRoom(GameManager.Instance.gameData.currRoomData.roomId, currSitData.user);
CreateFishManager.Instance.fangzhu = false;
}
#endregion
#endregion
}
Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.cs
+1
View File
@@ -17,6 +17,7 @@ public class GameMainPanel_HHWK : GameMainPanel_FishBase
});
AudioManager.Instance.ChangeBG(61004);
}
public override void OnDestroy()
{
base.OnDestroy();
Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab
+6419 -46
View File
File diff suppressed because it is too large Load Diff
Assets/MyGame/aa/UI/Home/UIHomeMain.cs
+5 -3
View File
@@ -70,7 +70,8 @@ public class UIHomeMain : UIBase
});
TGXXButton.onClick.AddListener(() =>
{
subUIManager.ShowAsync(UIPanel.SelectRoomLeavePenel, GameType.YYSC);
//subUIManager.ShowAsync(UIPanel.SelectRoomLeavePenel, GameType.YYSC);
UIManager.Instance.ShowBoardError("维护中...");
});
ZGXQButton.onClick.AddListener(() =>
{
@@ -82,8 +83,9 @@ public class UIHomeMain : UIBase
});
XJMHButton.onClick.AddListener(() =>
{
subUIManager.ShowAsync(UIPanel.SelectRoomLeavePenel, GameType.XJMH);
//subUIManager.ShowAsync(UIPanel.SelectRoomLeavePenel, GameType.XJMH);
UIManager.Instance.ShowBoardError("维护中...");
});
HHWKButton.onClick.AddListener(() =>
{
Assets/Scripts/Assembly-CSharp/Eff_lm_AniEvent.cs
+5
View File
@@ -6,6 +6,11 @@ public class Eff_lm_AniEvent : MonoBehaviour
private void Awake()
{
hHWK_BLM_Boss = GetComponentInParent<HHWK_BLM_Boss>();
}
public void OnEnable()
{
a=0;
}
int a=0;
public void EventTrample1()
Assets/Scripts/Assembly-CSharp/Eff_long_AniEvent.cs
+6 -1
View File
@@ -3,9 +3,14 @@
public class Eff_long_AniEvent : MonoBehaviour
{
int num = 0;
public void OnEnable()
{
num = 0;
}
public void StartSwim()
{
if (num == 4)
if (num >= 4)
{
//transform.parent.parent.gameObject.SetActive(false);
//Destroy( transform.parent.parent.gameObject);