This commit is contained in:
shurongsen 2024-11-07 20:27:33 +08:00
parent bdabe1b7b8
commit 8010108fb8
13 changed files with 221 additions and 69 deletions

View File

@ -73,7 +73,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_SortingOrder: 6
m_Sprite: {fileID: 21300000, guid: e23270122b82eb446a90e15c95c7e40f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View File

@ -73,7 +73,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_SortingOrder: 6
m_Sprite: {fileID: 21300000, guid: 9c12067653da8a548b5a57a2ce63e059, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View File

@ -73,7 +73,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 3
m_SortingOrder: 6
m_Sprite: {fileID: 21300000, guid: a1b0a6bad1a05d7478fd2fd42fb5a158, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View File

@ -589,7 +589,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 44899766}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -4.041, y: -0.026, z: 0}
m_LocalPosition: {x: -3.43, y: -0.026, z: 0}
m_LocalScale: {x: 0.49999997, y: 0.49999997, z: 0.49999997}
m_ConstrainProportionsScale: 1
m_Children: []
@ -738,20 +738,10 @@ MonoBehaviour:
paths:
- pathPoints:
- {fileID: 6047004}
- {fileID: 414507143}
- {fileID: 1643783864}
- {fileID: 736501712}
- {fileID: 696659662}
- {fileID: 1050211812}
- {fileID: 1711639167}
- {fileID: 44899767}
- pathPoints:
- {fileID: 866420153}
- {fileID: 1798729324}
- {fileID: 76149331}
- {fileID: 1857952291}
- {fileID: 191521818}
- {fileID: 1421307109}
- {fileID: 6111264}
- {fileID: 44899767}
pathsNeedTimer: 30
fishingNeedTimer: 30
restTimer: 5
@ -1938,7 +1928,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 346538289}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -5.57, y: -4.83, z: 0}
m_LocalPosition: {x: -5.35, y: -4.83, z: 0}
m_LocalScale: {x: 0.49999997, y: 0.49999997, z: 0.49999997}
m_ConstrainProportionsScale: 1
m_Children: []
@ -4548,20 +4538,10 @@ MonoBehaviour:
paths:
- pathPoints:
- {fileID: 202400057}
- {fileID: 1831085405}
- {fileID: 1919302}
- {fileID: 1635591605}
- {fileID: 1589111885}
- {fileID: 1620158627}
- {fileID: 97294784}
- {fileID: 346538290}
- pathPoints:
- {fileID: 1469919405}
- {fileID: 1312121262}
- {fileID: 1704329312}
- {fileID: 402907781}
- {fileID: 1509427519}
- {fileID: 23420342}
- {fileID: 1302727107}
- {fileID: 346538290}
pathsNeedTimer: 30
fishingNeedTimer: 30
restTimer: 5
@ -5001,7 +4981,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312121261}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.87, y: -3.09, z: 0}
m_LocalPosition: {x: 1.05, y: -3.09, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []
@ -5934,7 +5914,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1469919404}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.81, y: -1.82, z: 0}
m_LocalPosition: {x: 2.1, y: -1.82, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children: []

View File

@ -1473,7 +1473,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 10
orthographic size: 12
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@ -5069,7 +5069,7 @@ MonoBehaviour:
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 60
OrthographicSize: 10
OrthographicSize: 12
NearClipPlane: 0.3
FarClipPlane: 1000
Dutch: 0

View File

@ -375,7 +375,7 @@ PrefabInstance:
- target: {fileID: 6931136036337460997, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3011360594389648156}
objectReference: {fileID: 3011360594389648164}
- target: {fileID: 6931136036337460997, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
@ -386,7 +386,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6931136036337460997, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: AssestPanel, Assembly-CSharp
value: Main_AsstePanel, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 6931136036337460997, guid: e80ddc32e04c4a44eaeabc0e8937a298, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
@ -2465,6 +2465,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3011360594285297422, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3011360594291280551, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@ -2573,17 +2577,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 237
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 1307045635883690205, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
--- !u!114 &3011360594389648156 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1307045635883690205, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_CorrespondingSourceObject: {fileID: 3011360592761625472, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_PrefabInstance: {fileID: 3011360594389648155}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21c091287355b794bba54c08c0a11ab5, type: 3}
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3011360594389648157 stripped
@ -2619,3 +2624,63 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3011360594389648160 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3011360593904648034, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_PrefabInstance: {fileID: 3011360594389648155}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3011360594389648161 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3011360594475079259, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_PrefabInstance: {fileID: 3011360594389648155}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3011360594389648162 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3011360594535962131, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_PrefabInstance: {fileID: 3011360594389648155}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &3011360594389648163 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3011360593795016195, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
m_PrefabInstance: {fileID: 3011360594389648155}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3011360594389648164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3011360594389648163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1f315a08b646784ba42d9ccddfea572, type: 3}
m_Name:
m_EditorClassIdentifier:
is_one: 0
Stone: {fileID: 3011360594389648161}
Coin: {fileID: 3011360594389648162}
Ore: {fileID: 3011360594389648156}
Forging: {fileID: 3011360594389648160}
StoneBtn: {fileID: 591236217}
CoinBtn: {fileID: 3011360594389648159}
OreBtn: {fileID: 3011360594389648158}
ForgingBtn: {fileID: 3011360594389648157}
AssetDetails: {fileID: 207058394}

View File

@ -65,8 +65,8 @@ public class Cinemachine_2dCon : MonoBehaviour
}
// 处理鼠标滚轮缩放
var distance = Input.GetAxis("Mouse ScrollWheel");
HandleMouseScrollWheel(distance * 10);
//var distance = Input.GetAxis("Mouse ScrollWheel");
//HandleMouseScrollWheel(distance * 10);
#else
// 移动端:双指缩放
@ -139,11 +139,11 @@ public class Cinemachine_2dCon : MonoBehaviour
/// 鼠标滚轮缩放
/// </summary>
/// <param name="distance"></param>
private void HandleMouseScrollWheel(float distance)
{
if (0 == distance) return;
ScaleCamere(distance);
}
//private void HandleMouseScrollWheel(float distance)
//{
// if (0 == distance) return;
// ScaleCamere(distance);
//}
/// <summary>
/// 缩放摄像机的视口

View File

@ -15,15 +15,15 @@ public class InitInfo : MonoBehaviour
// Start is called before the first frame update
private async void Start()
{
string response = await web.SendRequest("http://47.109.133.52/Player/GetInfo", "POST");
Debug.Log(response);
//string response = await web.SendRequest("http://47.109.133.52/Player/GetInfo", "POST");
//Debug.Log(response);
parsedData = JsonUtility.FromJson<MainObject>(response);
//parsedData = JsonUtility.FromJson<MainObject>(response);
Debug.Log(parsedData.Info.Gold);
//Debug.Log(parsedData.Info.Gold);
Promptmgr.assestPanel.SetCoinText(parsedData.Info.Gold);
Promptmgr.assestPanel.SetStoneText(parsedData.Info.Gem);
//Promptmgr.assestPanel.SetCoinText(parsedData.Info.Gold);
//Promptmgr.assestPanel.SetStoneText(parsedData.Info.Gem);
//name.text = parsedData.Info.Name;
//userid.text = "id :" + parsedData.Info.Id;

View File

@ -40,7 +40,7 @@ public class GgTanchuang : mount
List<BoxType> boxTypes = new List<BoxType>();
boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 9,widthnum =700,WidthHeight =500 ,content = "トレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレトレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネン" }) ;
boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 9,widthnum =700,WidthHeight =650 ,content = "トレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレトレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネントレネン" }) ;
boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 11 });
GameObject gameObject = add_pop_up();
gameObject.transform.position = new Vector3(540,950,0);
@ -62,6 +62,8 @@ public class GgTanchuang : mount
{
yield return null;
allpanel.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBack);
yield return new WaitForSeconds(0.5f);
hdtxbg.sprite = GgglUpsp;
}
// Update is called once per frame

View File

@ -11,6 +11,7 @@ public class Promptmgr : MonoBehaviour
private float moveDuration = 1f;//移动所需的时间
public GameObject canvs;
public static AssestPanel assestPanel;
public static Main_AsstePanel Main_AsstePanel;
// Start is called before the first frame update
void Start()
{

View File

@ -33,28 +33,13 @@ public class AssestPanel : MonoBehaviour
}
AssetDetails.gameObject.SetActive(false);
StoneBtn.onClick.AddListener(AsClick);
CoinBtn.onClick.AddListener(AsClick);
OreBtn.onClick.AddListener(AsClick);
ForgingBtn.onClick.AddListener(AsClick);
}
private void AsClick()
{
Debug.Log("点击资产明细按钮");
AssetDetails.gameObject.SetActive(true);
}
public void CloseClick()
{
AssetDetails.gameObject.SetActive(false);
}
async void Tloding()
{

View File

@ -0,0 +1,108 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class Main_AsstePanel : MonoBehaviour
{
public bool is_one = false;
public Text Stone;
public Text Coin;
public Text Ore;
public Text Forging;
public Button StoneBtn;
public Button CoinBtn;
public Button OreBtn;
public Button ForgingBtn;
public GameObject AssetDetails;
void Start()
{
if (Promptmgr.Main_AsstePanel == null)
{
Promptmgr.Main_AsstePanel = this;
Stone.text = PlayerManager.Instance.Stones.ToString();
Forging.text = PlayerManager.Instance.Forging.ToString();
Coin.text = PlayerManager.Instance.Coins.ToString();
Ore.text = PlayerManager.Instance.Ore.ToString();
Promptmgr.Main_AsstePanel.is_one = true;
Promptmgr.Main_AsstePanel.InvokeRepeating("Tloding", 1.0f, 1.0f);
}
AssetDetails.gameObject.SetActive(false);
StoneBtn.onClick.AddListener(AsClick);
CoinBtn.onClick.AddListener(AsClick);
OreBtn.onClick.AddListener(AsClick);
ForgingBtn.onClick.AddListener(AsClick);
}
private void AsClick()
{
Debug.Log("µã»÷×ʲúÃ÷ϸ°´Å¥");
AssetDetails.gameObject.SetActive(true);
}
public void CloseClick()
{
AssetDetails.gameObject.SetActive(false);
}
async void Tloding()
{
//string userponse = await web.SendRequest(web.URL + "/Player/GetInfo", "POST");
// Debug.Log(userponse.ToString());
// infopyler res = JsonUtility.FromJson<infopyler>(userponse);
// SetCoinText(res.Info.Gold);
// SetStoneText(res.Info.Gem);
// SetOreText(res.Info.Ore);
// SetForgingText(res.Info.Forge);
}
public void SetStoneText(float num)
{
if (Stone != null)
{
Stone.text = num.ToString();
}
}
public void SetCoinText(float num)
{
if (Coin != null)
{
Coin.text = num.ToString();
}
}
public void SetOreText(float num)
{
if (Ore != null)
{
Ore.text = num.ToString();
}
}
public void SetForgingText(float num)
{
if (Forging != null)
{
Forging.text = num.ToString();
}
}
private void Update()
{
Stone.text = PlayerManager.Instance.Stones.ToString();
Coin.text = PlayerManager.Instance.Coins.ToString();
Ore.text = PlayerManager.Instance.Ore.ToString();
Forging.text = PlayerManager.Instance.Forging.ToString();
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c1f315a08b646784ba42d9ccddfea572
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: