diff --git a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta deleted file mode 100644 index 1d182472..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b07afdbcf13e43438545d591cfd2e4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs index b3d0c05a..78de1a38 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartChoosePoint/StartChooseCardManager.cs @@ -128,33 +128,35 @@ public class StartChooseCardManager : Singleton return; } //载入武器节点 - /* for (int i = 0; i < WeaponManager.Instance.playerWeaponNodeList.childCount; i++) - { - if (WeaponManager.Instance.playerWeaponNodeList.GetChild(i).childCount > 0) + BagManager.Instance.isSyncWeapoNodePos = true; + BagManager.Instance.bagWeaponNodeManager.SyncBagWeaponNodeToFight(); + /* for (int i = 0; i < WeaponManager.Instance.playerWeaponNodeList.childCount; i++) + { + if (WeaponManager.Instance.playerWeaponNodeList.GetChild(i).childCount > 0) + { + Destroy(WeaponManager.Instance.playerWeaponNodeList.GetChild(i).GetChild(0).gameObject); + } + } + int childCount = BagManager.Instance.bagWeaponNodeFather.childCount; + for (int i = 0; i < childCount; i++) + { + DestroyImmediate(BagManager.Instance.bagWeaponNodeFather.GetChild(0).gameObject); + } + for (int i = 0; i < playerWeaponNode.childCount; i++) + { + if(playerWeaponNode.GetChild (i).childCount >0) { - Destroy(WeaponManager.Instance.playerWeaponNodeList.GetChild(i).GetChild(0).gameObject); - } - } - int childCount = BagManager.Instance.bagWeaponNodeFather.childCount; - for (int i = 0; i < childCount; i++) - { - DestroyImmediate(BagManager.Instance.bagWeaponNodeFather.GetChild(0).gameObject); - } - for (int i = 0; i < playerWeaponNode.childCount; i++) - { - if(playerWeaponNode.GetChild (i).childCount >0) - { - //playerWeaponNode.GetChild(i).GetChild(0).SetParent(WeaponManager.Instance.playerWeaponNodeList.GetChild(i)); - // WeaponManager.Instance.playerWeaponNodeList.GetChild(i).GetChild(0).localPosition = Vector3.zero; - GameObject currentWeaponNode = playerWeaponNode.GetChild(i).GetChild(0).gameObject; + //playerWeaponNode.GetChild(i).GetChild(0).SetParent(WeaponManager.Instance.playerWeaponNodeList.GetChild(i)); + // WeaponManager.Instance.playerWeaponNodeList.GetChild(i).GetChild(0).localPosition = Vector3.zero; + GameObject currentWeaponNode = playerWeaponNode.GetChild(i).GetChild(0).gameObject; - BagManager.Instance.GetWeaponNodeToBag(playerWeaponNode.GetChild(i).GetChild(0).gameObject); + BagManager.Instance.GetWeaponNodeToBag(playerWeaponNode.GetChild(i).GetChild(0).gameObject); - currentWeaponNode.transform.SetParent(WeaponManager.Instance.playerWeaponNodeList.GetChild(i)); - currentWeaponNode.transform.localPosition = Vector3.zero; - } - } - */ + currentWeaponNode.transform.SetParent(WeaponManager.Instance.playerWeaponNodeList.GetChild(i)); + currentWeaponNode.transform.localPosition = Vector3.zero; + } + } + */ //载入卡牌 //RegisterObtainedCard(); //重置地图