记录副本更新ui
This commit is contained in:
@@ -0,0 +1,289 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &649718929224510989
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2340566045124545787}
|
||||
- component: {fileID: 7443726341028319497}
|
||||
- component: {fileID: 5788392338802381900}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2340566045124545787
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 649718929224510989}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1.3359, y: 1.3359, z: 1.3359}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5906154763923034694}
|
||||
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: -393, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7443726341028319497
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 649718929224510989}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5788392338802381900
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 649718929224510989}
|
||||
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: 0}
|
||||
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 &1971376106441029885
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6980037835605108770}
|
||||
- component: {fileID: 4069715543161013403}
|
||||
- component: {fileID: 8514818509667669709}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6980037835605108770
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1971376106441029885}
|
||||
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: 5906154763923034694}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4069715543161013403
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1971376106441029885}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8514818509667669709
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1971376106441029885}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u592A\u6709\u5B9E\u529B\u4E86"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
|
||||
m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
|
||||
type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &2654078965480511721
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5906154763923034694}
|
||||
- component: {fileID: 4157826458431261933}
|
||||
- component: {fileID: 7104341906146201700}
|
||||
m_Layer: 5
|
||||
m_Name: BossBoardCarst
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5906154763923034694
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2654078965480511721}
|
||||
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:
|
||||
- {fileID: 6980037835605108770}
|
||||
- {fileID: 2340566045124545787}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -257}
|
||||
m_SizeDelta: {x: 734.6, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4157826458431261933
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2654078965480511721}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &7104341906146201700
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2654078965480511721}
|
||||
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: 0.4811321, g: 0.4811321, b: 0.4811321, 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: 0}
|
||||
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
|
||||
+2
-3
@@ -1,7 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 59d21bb464dd9d742afb09585f23be9c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
guid: 5b9fb25eac1f838459fe9492f6c8a242
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
@@ -1,17 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Assets.MyGame.aa.UI.Game
|
||||
{
|
||||
public class FishFormation
|
||||
{
|
||||
public static void YZ7001()
|
||||
{
|
||||
//鱼阵7001
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 83d3f3fc98f10694da71d828f0611b0d
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,6 +6,7 @@ using Spine.Unity;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.InputSystem;
|
||||
using UnityEngine.UI;
|
||||
|
||||
@@ -45,17 +46,18 @@ public class GameMainPanel_XJMH : UIBase
|
||||
}
|
||||
item.user = user;
|
||||
item.goldNum = goldNum;
|
||||
item.consumeGlodNum = consumeGlod;
|
||||
item.consumeGoldNum = consumeGlod;
|
||||
item.tMP_GoldNum.text = goldNum.ToString();
|
||||
item.currentTurretID = currentTurretID;
|
||||
item.tMP_TurretConsumeNum.text = consumeGlod.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
bool isZD;
|
||||
public void Start()
|
||||
{
|
||||
|
||||
CreateFishManager.Instance.EnterRoom(Assets.MyGame.Scripts.Net.APIResponses.Enum.GameTypeEnum.风雷之渊);
|
||||
CreateFishManager.Instance.EnterRoom(Assets.MyGame.Scripts.Net.APIResponses.Enum.GameTypeEnum.星际迷航);
|
||||
|
||||
btn_SettingList.onClick.AddListener(() =>
|
||||
{
|
||||
@@ -78,11 +80,20 @@ public class GameMainPanel_XJMH : UIBase
|
||||
}
|
||||
|
||||
});
|
||||
toggle_SkillAuto.onValueChanged.AddListener((a) =>
|
||||
{
|
||||
isZD = a;
|
||||
});
|
||||
|
||||
toggle_Three.onValueChanged.AddListener((a) =>
|
||||
{
|
||||
isThree = a;
|
||||
|
||||
});
|
||||
toggle_Shuang.onValueChanged.AddListener((a) =>
|
||||
{
|
||||
isShuang = a;
|
||||
});
|
||||
foreach (var item in tra_SettingListComponent)
|
||||
{
|
||||
if (item.name == "Setting")
|
||||
@@ -91,7 +102,7 @@ public class GameMainPanel_XJMH : UIBase
|
||||
{
|
||||
UIManager.Instance.Close(UIPanel.MainGamePanelXJMH);
|
||||
//等待界面添加
|
||||
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel,UIPanel.MainGamePanelXJMH);
|
||||
UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel, UIPanel.MainGamePanelXJMH);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -156,6 +167,8 @@ public class GameMainPanel_XJMH : UIBase
|
||||
float clickTime = 0;
|
||||
public GameObject bullet_Test;
|
||||
public GameObject bulletParent;
|
||||
float changeTurretTime = 0f;
|
||||
bool isChangingTurret = false;
|
||||
public void Update()
|
||||
{
|
||||
if (bulletCount >= 100)
|
||||
@@ -168,6 +181,59 @@ public class GameMainPanel_XJMH : UIBase
|
||||
{
|
||||
clickTime = attackTime;
|
||||
}
|
||||
#region 换炮台
|
||||
//Change Turret
|
||||
if (Touchscreen.current.primaryTouch.press.wasPressedThisFrame)
|
||||
{
|
||||
PointerEventData pointerData = new PointerEventData(EventSystem.current);
|
||||
pointerData.position = Touchscreen.current.primaryTouch.position.ReadValue();
|
||||
|
||||
List<RaycastResult> results = new List<RaycastResult>();
|
||||
EventSystem.current.RaycastAll(pointerData, results);
|
||||
|
||||
foreach (RaycastResult result in results)
|
||||
{
|
||||
if (result.gameObject.tag == "ChangeTurret")
|
||||
{
|
||||
if (result.gameObject.GetComponentInParent<SitPosData>() == currSitData)
|
||||
{
|
||||
isChangingTurret = true;
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (Touchscreen.current.primaryTouch.press.isPressed)
|
||||
{
|
||||
if (isChangingTurret)
|
||||
{
|
||||
changeTurretTime += Time.deltaTime;
|
||||
|
||||
if (changeTurretTime > 1f)
|
||||
{
|
||||
if (!currSitData.changeTurretList.activeSelf)
|
||||
{
|
||||
//切换炮台面板
|
||||
currSitData.changeTurretList.SetActive(true);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (Touchscreen.current.primaryTouch.press.wasReleasedThisFrame)
|
||||
{
|
||||
if (isChangingTurret)
|
||||
{
|
||||
changeTurretTime = 0;
|
||||
isChangingTurret = false;
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
if (isLock)
|
||||
{
|
||||
|
||||
@@ -213,7 +279,11 @@ public class GameMainPanel_XJMH : UIBase
|
||||
if (Touchscreen.current.primaryTouch.press.isPressed)
|
||||
{
|
||||
//FireBullit();
|
||||
PaoTaRotate();
|
||||
if (!isZD)
|
||||
{
|
||||
PaoTaRotate();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if (Touchscreen.current.primaryTouch.press.wasReleasedThisFrame)
|
||||
@@ -222,19 +292,24 @@ public class GameMainPanel_XJMH : UIBase
|
||||
}
|
||||
}
|
||||
|
||||
if (isZD&&isLock==false)
|
||||
{
|
||||
PaoTaRotate();
|
||||
}
|
||||
}
|
||||
|
||||
private void SendBullet()
|
||||
{
|
||||
if (bulletCount > 0)
|
||||
WebSocketSendList.ShootBullet(GameManager.Instance.gameData.currRoomData.roomId, currSitData.user.id, currSitData.consumeGlodNum, bulletCount);
|
||||
//if (bulletCount > 0)
|
||||
// WebSocketSendList.ShootBullet(GameManager.Instance.gameData.currRoomData.roomId, currSitData.user.id, currSitData.consumeGlodNum, bulletCount);
|
||||
bulletCount = 0;
|
||||
}
|
||||
|
||||
private void PaoTaRotate()
|
||||
{
|
||||
#region 计算点击方向
|
||||
Vector2 touchPos;
|
||||
|
||||
#region 计算点击方向
|
||||
Vector2 touchPos;
|
||||
// 获取触摸位置(屏幕坐标)
|
||||
if (monCotl_Lock != null)
|
||||
{
|
||||
@@ -254,26 +329,30 @@ public class GameMainPanel_XJMH : UIBase
|
||||
// 计算角度
|
||||
float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg - 90f;
|
||||
currSitData.tra_CurrTurret.transform.rotation = Quaternion.Euler(Vector3.forward * angle);
|
||||
FireBullit(angle);
|
||||
|
||||
#endregion
|
||||
|
||||
clickTime += Time.deltaTime;
|
||||
if (clickTime > attackTime)
|
||||
{
|
||||
clickTime = 0;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
FireBullit(angle);
|
||||
}
|
||||
|
||||
private void CancelLock() { monCotl_Lock = null; LockFX.SetActive(false); }
|
||||
private void FireBullit(float angle)
|
||||
{
|
||||
clickTime += Time.deltaTime;
|
||||
if (clickTime > attackTime)
|
||||
{
|
||||
|
||||
clickTime = 0;
|
||||
if (!currSitData.ConsumeGold())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
//计算方向
|
||||
Vector2 startV2;
|
||||
|
||||
//计算方向
|
||||
Vector2 startV2;
|
||||
startV2 = CoordinateTransformation.AnchoredPos_ToCanvas(currSitData.tra_CurrTurret.transform.GetChild(1).GetComponent<RectTransform>(), UIManager.Instance.uiRoot.GetComponent<Canvas>());
|
||||
startV2 = CoordinateTransformation.CanvasToWorld(startV2, UIManager.Instance.uiRoot.GetComponent<RectTransform>(), Camera.main);
|
||||
|
||||
@@ -290,9 +369,9 @@ public class GameMainPanel_XJMH : UIBase
|
||||
BullitMove bulletMove3 = CreateBullet(angle + 20, startV2);
|
||||
if (isLock)
|
||||
{
|
||||
bulletMove1.Lock(monCotl_Lock);
|
||||
bulletMove2.Lock(monCotl_Lock);
|
||||
bulletMove3.Lock(monCotl_Lock);
|
||||
bulletMove1?.Lock(monCotl_Lock);
|
||||
bulletMove2?.Lock(monCotl_Lock);
|
||||
bulletMove3?.Lock(monCotl_Lock);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -300,18 +379,37 @@ public class GameMainPanel_XJMH : UIBase
|
||||
BullitMove bulletMove = CreateBullet(angle, startV2);
|
||||
if (isLock)
|
||||
{
|
||||
bulletMove.Lock(monCotl_Lock);
|
||||
bulletMove?.Lock(monCotl_Lock);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public Toggle toggle_Shuang;
|
||||
bool isShuang= false;
|
||||
private BullitMove CreateBullet(float angle, Vector2 startV2)
|
||||
{
|
||||
var bulletMove = Instantiate(bullet_Test, startV2, Quaternion.Euler(Vector3.forward * angle), bulletParent.transform).GetComponent<BullitMove>();
|
||||
|
||||
GameObject bulletPrefab;
|
||||
//这里有双倍炮台的需求
|
||||
if (isShuang)
|
||||
{
|
||||
bulletPrefab = currSitData.currentTurret.bulletPrefab_Two;
|
||||
if (!currSitData.ConsumeGold(2))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bulletPrefab = currSitData.currentTurret.bulletPrefab;
|
||||
if (!currSitData.ConsumeGold())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
var bulletMove = Instantiate(bulletPrefab, startV2, Quaternion.Euler(Vector3.forward * angle), bulletParent.transform).GetComponent<BullitMove>();
|
||||
bulletMove.user = GameManager.Instance.gameData.roomJoinNotice;
|
||||
bulletMove.playerID = GameManager.Instance.gameData.currUser;
|
||||
currSitData.skeletonAnimation.AnimationState.SetAnimation(0, "shot", false);
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
using Assets.MyGame.Scripts.Net.API;
|
||||
using Spine.Unity;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
public class SitPosData : MonoBehaviour
|
||||
{
|
||||
public UserToken user;
|
||||
public int posID;
|
||||
public TextMeshProUGUI tMP_TurretConsumeNum;
|
||||
public TextMeshProUGUI tMP_GoldNum;
|
||||
public int goldNum;
|
||||
public int consumeGlodNum;
|
||||
public Dictionary<string, TurretData> dic_Turrets=new Dictionary<string, TurretData>();
|
||||
public List<TurretData> list_Turrets=new List<TurretData>();
|
||||
public int currentTurretIndex = 0;
|
||||
public string currentTurretID = "";
|
||||
public TurretData currentTurret;
|
||||
|
||||
|
||||
public SkeletonGraphic skeletonAnimation;
|
||||
public Transform tra_CurrTurret;
|
||||
public Transform tra_CurrFly;
|
||||
|
||||
|
||||
public void Awake()
|
||||
{
|
||||
//list_Turrets.Sort((td1,td2) =>
|
||||
//{
|
||||
// return td1.turretID.CompareTo(td2.turretLevel);
|
||||
//});
|
||||
dic_Turrets = list_Turrets.ToDictionary(td => td.turretID);
|
||||
}
|
||||
public void ChangeTurret(int n=0)
|
||||
{
|
||||
|
||||
if (currentTurretIndex>list_Turrets.Count|| currentTurretIndex<0)
|
||||
{
|
||||
//currentTurretIndex = currentTurretIndex;
|
||||
}
|
||||
else
|
||||
{
|
||||
currentTurretIndex = n;
|
||||
}
|
||||
if (currentTurret != null)
|
||||
{
|
||||
currentTurret.gameObject.SetActive(false);
|
||||
}
|
||||
currentTurretID = list_Turrets[currentTurretIndex].turretID; //dic_Turrets[currentTurretID];
|
||||
currentTurret=dic_Turrets[currentTurretID];
|
||||
currentTurret.gameObject.SetActive(true);
|
||||
|
||||
|
||||
gameObject.SetActive(true);
|
||||
tra_CurrTurret =currentTurret.transform.GetChild(0);
|
||||
tra_CurrFly = currentTurret.transform.GetChild(1);
|
||||
skeletonAnimation = tra_CurrTurret.GetChild(0).GetComponent<SkeletonGraphic>();
|
||||
|
||||
}
|
||||
public void ChangeTurretConsumeNum(int n = 0)
|
||||
{
|
||||
consumeGlodNum = n;
|
||||
tMP_TurretConsumeNum.text = consumeGlodNum.ToString();
|
||||
|
||||
}
|
||||
public bool ConsumeGold()
|
||||
{
|
||||
int temp = goldNum - consumeGlodNum;
|
||||
if (temp > 0)
|
||||
{
|
||||
goldNum = temp;
|
||||
tMP_GoldNum.text = goldNum.ToString();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 16cfaab69e1fa404dbb8432276bd7537
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,14 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TurretData : MonoBehaviour
|
||||
{
|
||||
public string turretID;
|
||||
public int turretLevel;
|
||||
public SitPosData setPosData;
|
||||
public Button btn_AddTurretNum;
|
||||
public Button btn_SubTractTurretNum;
|
||||
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1a0bd2a3126c052438fc0291e214e0a0
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -196,7 +196,7 @@ PrefabInstance:
|
||||
- target: {fileID: 5615636425683840664, guid: aab7adfb6126f094f8860d975314558b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TurretPanel Variant
|
||||
value: WingPanel
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5738013522008738310, guid: aab7adfb6126f094f8860d975314558b,
|
||||
type: 3}
|
||||
|
||||
@@ -196,7 +196,7 @@ PrefabInstance:
|
||||
- target: {fileID: 5615636425683840664, guid: aab7adfb6126f094f8860d975314558b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TurretPanel Variant
|
||||
value: ZSPanel
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5738013522008738310, guid: aab7adfb6126f094f8860d975314558b,
|
||||
type: 3}
|
||||
|
||||
Reference in New Issue
Block a user