This commit is contained in:
liuliang 2024-11-15 15:14:27 +08:00
commit c0e5cbc88a
2 changed files with 102 additions and 37 deletions

View File

@ -147,7 +147,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20523878} m_GameObject: {fileID: 20523878}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -230,7 +230,7 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1432362433} m_Father: {fileID: 1432362433}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
@ -280,7 +280,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 41418336} m_TargetGraphic: {fileID: 41418336}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 510804176}
m_TargetAssemblyTypeName: landContorl_jinsha, Assembly-CSharp
m_MethodName: OnClick
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &41418336 --- !u!114 &41418336
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -502,7 +514,7 @@ RectTransform:
- {fileID: 1265030038} - {fileID: 1265030038}
- {fileID: 1071194271} - {fileID: 1071194271}
m_Father: {fileID: 1432362433} m_Father: {fileID: 1432362433}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
@ -571,12 +583,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359301738} m_GameObject: {fileID: 359301738}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1432362433} m_Father: {fileID: 2072244184}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -866,6 +878,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 510804175} - component: {fileID: 510804175}
- component: {fileID: 510804176}
m_Layer: 5 m_Layer: 5
m_Name: top1 m_Name: top1
m_TagString: Untagged m_TagString: Untagged
@ -894,6 +907,37 @@ RectTransform:
m_AnchoredPosition: {x: 540, y: -960} m_AnchoredPosition: {x: 540, y: -960}
m_SizeDelta: {x: 1080, y: 1920} m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &510804176
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 510804174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e14236262b3cead4597580fdb841652f, type: 3}
m_Name:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 0}
listItem: []
startPos: {fileID: 0}
endPos: {fileID: 0}
type: 0
ActivateValue: 0
Num: 0
Type: 0
paths: []
pathsNeedTimer: 30
fishingNeedTimer: 30
restTimer: 5
goldNumerTextPro: {fileID: 0}
shipNumberTextPro: {fileID: 0}
HightLight: {fileID: 359301738}
OnBtnAni: {fileID: 2072244184}
FishPrice: 0
map: {fileID: 0}
ids: []
--- !u!1 &568510979 --- !u!1 &568510979
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1642,12 +1686,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 909562576} m_GameObject: {fileID: 909562576}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1432362433} m_Father: {fileID: 2072244184}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
@ -1957,7 +2001,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1096743754} m_GameObject: {fileID: 1096743754}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
@ -3329,8 +3373,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 359301739} - {fileID: 2072244184}
- {fileID: 909562577}
- {fileID: 41418334} - {fileID: 41418334}
- {fileID: 307679580} - {fileID: 307679580}
m_Father: {fileID: 510804175} m_Father: {fileID: 510804175}
@ -4589,6 +4632,44 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2064797687} m_GameObject: {fileID: 2064797687}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &2072244183
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2072244184}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2072244184
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2072244183}
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: 359301739}
- {fileID: 909562577}
m_Father: {fileID: 1432362433}
m_RootOrder: 0
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!1 &2131270350 --- !u!1 &2131270350
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -49,7 +49,8 @@ public class landContorl_jinsha : MonoBehaviour
[Header("点击的高亮图层")] [Header("点击的高亮图层")]
public GameObject HightLight;//高亮图层 public GameObject HightLight;//高亮图层
public Transform Btntrans; [Header("点击按钮出现的动画")]
public Transform OnBtnAni;
public float FishPrice; public float FishPrice;
@ -132,13 +133,10 @@ public class landContorl_jinsha : MonoBehaviour
} }
} }
private void OnMouseDown()
{
//OnClick();
}
private void OnTouch() private void OnTouch()
{ {
OnClick(); //OnClick();
} }
public void OnClick() public void OnClick()
@ -160,15 +158,10 @@ public class landContorl_jinsha : MonoBehaviour
Debug.Log("进入买船"); Debug.Log("进入买船");
//if (listItem.Count==0)
//{ ScaleAni(OnBtnAni);
// Promptmgr.Instance.PromptBubble("还没有买船了", Color.black, Color.red);
// return;
//}
ScaleAni(Btntrans);
add_fish(); add_fish();
// map.GetComponent<boy_jinsha>().UpShip();
} }
public void add_fish(string timerStr = null)//生成船只 public void add_fish(string timerStr = null)//生成船只
{ {
@ -291,6 +284,8 @@ public class landContorl_jinsha : MonoBehaviour
StartCoroutine(MoveToStartPos(fishMan, selectedPath.pathPoints)); StartCoroutine(MoveToStartPos(fishMan, selectedPath.pathPoints));
} }
IEnumerator MoveToStartPos(GameObject man, List<Transform> path) IEnumerator MoveToStartPos(GameObject man, List<Transform> path)
{ {
@ -353,18 +348,7 @@ public class landContorl_jinsha : MonoBehaviour
fishMan.GetComponent<shipcontorl>().ChangeLookat(180f); // 朝向左边 fishMan.GetComponent<shipcontorl>().ChangeLookat(180f); // 朝向左边
} }
} }
//加钱服务器计算,本地不需要
/*void AddGold()
{
Debug.LogError("返航完成,开始:真·摸-鱼,加钱");
goldNumerTextPro.text = ActivateValue.ToString();
fishMan.GetComponent<shipcontorl>().SetState(ShipState.draw);
}*/
//更新船只数量显示 //更新船只数量显示