This commit is contained in:
hyskai 2024-10-31 01:19:19 +08:00
parent 4d14f14085
commit a28a221302
8 changed files with 3224 additions and 119 deletions

View File

@ -226,7 +226,7 @@ Material:
- _PosterizeGamma: 0.75
- _PosterizeNumColors: 8
- _PosterizeOutline: 0
- _Radius: 1
- _Radius: 0
- _RandomSeed: 0
- _RectSize: 1
- _RotateUvAmount: 0

View File

@ -705,6 +705,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 3493682475662937687, guid: 0991c3a29d050114f8900e457bbb5022, type: 3}
startPos: {fileID: 347020761}
type: 0
isbuy: 1
isGoldLand: 0
paths:
- pathPoints:
- {fileID: 6047004}
@ -731,6 +734,7 @@ MonoBehaviour:
goldNumerTextPro: {fileID: 1113669198}
HightLight: {fileID: 998933731}
Btntrans: {fileID: 56346249}
FishPrice: 0
--- !u!1 &76149330
GameObject:
m_ObjectHideFlags: 0
@ -2293,6 +2297,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 2573296898750738764, guid: ad264b5cad6c49547925f7ce059b94bb, type: 3}
startPos: {fileID: 1467507543}
type: 0
isbuy: 1
isGoldLand: 0
paths:
- pathPoints:
- {fileID: 418966151}
@ -2319,6 +2326,7 @@ MonoBehaviour:
goldNumerTextPro: {fileID: 956953120}
HightLight: {fileID: 908447973}
Btntrans: {fileID: 559443431}
FishPrice: 0
--- !u!1 &582440289
GameObject:
m_ObjectHideFlags: 0
@ -4127,6 +4135,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 6097386749501479918, guid: a8700ae973e4404429799e98d0f777ee, type: 3}
startPos: {fileID: 582440290}
type: 0
isbuy: 1
isGoldLand: 0
paths:
- pathPoints:
- {fileID: 202400057}
@ -4153,6 +4164,7 @@ MonoBehaviour:
goldNumerTextPro: {fileID: 1634093115}
HightLight: {fileID: 1642726817}
Btntrans: {fileID: 1048058358}
FishPrice: 0
--- !u!1 &1050211811
GameObject:
m_ObjectHideFlags: 0

View File

@ -369,6 +369,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 9155457817904467836, guid: 12cf12d921b09b343bdadb6638b7447c, type: 3}
startPos: {fileID: 423906224}
type: 2
isbuy: 0
isGoldLand: 1
paths:
- pathPoints:
- {fileID: 78513529}
@ -393,6 +396,7 @@ MonoBehaviour:
goldNumerTextPro: {fileID: 1113669198}
HightLight: {fileID: 102276561}
Btntrans: {fileID: 56346249}
FishPrice: 0
--- !u!1 &78513528
GameObject:
m_ObjectHideFlags: 0
@ -783,6 +787,8 @@ GameObject:
- component: {fileID: 109717920}
- component: {fileID: 109717919}
- component: {fileID: 109717918}
- component: {fileID: 109717923}
- component: {fileID: 109717922}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@ -864,7 +870,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 189054950}
- {fileID: 1912716592}
- {fileID: 107193843}
m_Father: {fileID: 0}
m_RootOrder: 7
@ -874,11 +880,31 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!224 &189054950 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
m_PrefabInstance: {fileID: 6720542061166726233}
--- !u!114 &109717922
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109717917}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea8231e49b8e6c440b4ede383765832d, type: 3}
m_Name:
m_EditorClassIdentifier:
canvs: {fileID: 109717917}
--- !u!114 &109717923
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 109717917}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a48788a64136b294b8e996807b88dad1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &199805571
GameObject:
m_ObjectHideFlags: 0
@ -2350,6 +2376,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 8759413356347716201, guid: 895559f95d4ca3b47a49156ec979e40c, type: 3}
startPos: {fileID: 1734571546}
type: 0
isbuy: 0
isGoldLand: 1
paths:
- pathPoints:
- {fileID: 1752358036}
@ -2374,6 +2403,7 @@ MonoBehaviour:
goldNumerTextPro: {fileID: 979148971}
HightLight: {fileID: 1504197550}
Btntrans: {fileID: 559443431}
FishPrice: 0
--- !u!61 &559443433
BoxCollider2D:
m_ObjectHideFlags: 0
@ -3917,6 +3947,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
fishManPrefab: {fileID: 9027535534103199909, guid: 930941387799a9d479889a373bafdc8e, type: 3}
startPos: {fileID: 1067588907}
type: 1
isbuy: 0
isGoldLand: 1
paths:
- pathPoints:
- {fileID: 199805572}
@ -3941,6 +3974,7 @@ MonoBehaviour:
goldNumerTextPro: {fileID: 1634093115}
HightLight: {fileID: 579933540}
Btntrans: {fileID: 1048058358}
FishPrice: 0
--- !u!1 &1067588906
GameObject:
m_ObjectHideFlags: 0
@ -6849,6 +6883,136 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1912716591
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 109717921}
m_Modifications:
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 109717923}
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: buy_ship
objectReference: {fileID: 0}
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: shopman, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 2013356390253994791, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396412, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_Name
value: minbtn
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchoredPosition.x
value: 458
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchoredPosition.y
value: 736
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
--- !u!224 &1912716592 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
m_PrefabInstance: {fileID: 1912716591}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1935800547
GameObject:
m_ObjectHideFlags: 0
@ -7609,108 +7773,3 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &6720542061166726233
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 109717921}
m_Modifications:
- target: {fileID: 6515558657369441852, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: buyPanel
value:
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396412, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_Name
value: rcsc
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396412, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMax.x
value: 0.9752223
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMax.y
value: 0.9110001
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMin.x
value: 0.8722223
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchorMin.y
value: 0.8544792
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_SizeDelta.x
value: -11
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_SizeDelta.y
value: -9
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6720542061045396415, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 44f8c7a70b8d4c54983e81548e983557, type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -523,4 +523,4 @@ SortingGroup:
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_SortingOrder: 3

View File

@ -77,8 +77,9 @@ public class Logo_in : mount
Rootobject root = JsonUtility.FromJson<Rootobject>(response);
Debug.Log(root.ErrorMessage);
if (root.ErrorMessage =="")
if (root.ErrorMessage=="")
{
gameObject.SetActive(false);
Promptmgr.Instance.PromptBubble("登录成功");

View File

@ -25,8 +25,7 @@ public class minbtn : MonoBehaviour
btn.onClick.AddListener(() => {
DoTweenAni();
DoTweenAni();
});
}

View File

@ -17,6 +17,10 @@ public class landContorl : MonoBehaviour
private shipcontorl fishManShipContorl;
public Transform startPos;
public int type;
public bool isbuy=false;
public bool isGoldLand=false;
//路径
public List<Path> paths;
//航行时间
@ -59,7 +63,34 @@ public class landContorl : MonoBehaviour
goldNumerTextPro.text = goldnumer.ToString();
HightLight.SetActive(false);
shopman.instance.OnType += addman;
}
private void OnDisable()
{
shopman.instance.OnType -= addman;
}
void addman(int type,int number)
{
if (type==this.type)
{
if (isbuy == false)
{
isbuy = true;
PlayerManager.Instance.SetMoney(MoneyType.Coins, -FishPrice);
Promptmgr.Instance.PromptBubble("购买成功", Color.black, Color.blue);
}
else
{
Promptmgr.Instance.PromptBubble("已经购买了", Color.black, Color.red);
}
}
}
private void OnMouseDown()
{
OnClick();
@ -72,17 +103,28 @@ public class landContorl : MonoBehaviour
void OnClick()
{
//动画
ScaleAni(Btntrans);
if (!isbuy)
{
Promptmgr.Instance.PromptBubble("还没有船", Color.black, Color.red);
return;
}
if (fishMan!=null)
{
Promptmgr.Instance.PromptBubble("船已经有了",Color.black,Color.red);
return;
}
//Debug.LogError("쇱꿎繫법");
//Debug.LogError("왱풀쭉서");
PlayerManager.Instance.SetMoney(MoneyType.Stones, -FishPrice);
if (!isGoldLand)
{
Debug.LogError("ok");
PlayerManager.Instance.SetMoney(MoneyType.Stones, -FishPrice);
}
fishMan = GameObject.Instantiate(fishManPrefab);
//fishMan.transform.SetParent(startPos);