This commit is contained in:
shurongsen 2024-10-28 15:37:48 +08:00
commit 4027cd70c0
10 changed files with 7552 additions and 2348 deletions

File diff suppressed because it is too large Load Diff

View File

@ -9,8 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1618018427688012048}
- component: {fileID: 1618018427688012063}
- component: {fileID: 1618018427688012062}
- component: {fileID: 787617161444694172}
- component: {fileID: 640971684}
m_Layer: 0
m_Name: miner1
@ -28,20 +27,88 @@ Transform:
m_GameObject: {fileID: 1618018427688012061}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_LocalScale: {x: 0.75, y: 0.74999994, z: 0.75}
m_ConstrainProportionsScale: 1
m_Children: []
m_Children:
- {fileID: 1496079022919682510}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1618018427688012063
SpriteRenderer:
--- !u!210 &787617161444694172
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1618018427688012061}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &640971684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1618018427688012061}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32c2f38a722aceb40980e1cdf8a6041a, type: 3}
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 5936455022273311000}
nowState: 0
probabilityOfStand: 0.4
probabilityOfMove: 0.3
probabilityOfDig: 0.3
ChangeStateTimer: 3
moveSpeed: 2
maxMovePos: {x: 2.6, y: 0.4, z: -3}
minMovePos: {x: -0.37, y: -0.3, z: -4}
digPosition: {x: 2.6, y: 0.2, z: -3}
digTime: 5
--- !u!1 &2222184914945000498
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1496079022919682510}
- component: {fileID: 8448619372019448527}
- component: {fileID: 5936455022273311000}
m_Layer: 0
m_Name: Square
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1496079022919682510
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2222184914945000498}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.972, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1618018427688012048}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8448619372019448527
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2222184914945000498}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@ -75,25 +142,25 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 2037703429, guid: ec7d7726df971d84c97346513b25c18f, type: 3}
m_Sprite: {fileID: 1679062413, guid: 8e4ba394e8569844caaefbadd38d117e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.66, y: 2.07}
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &1618018427688012062
--- !u!95 &5936455022273311000
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1618018427688012061}
m_GameObject: {fileID: 2222184914945000498}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 1633496a12ffc5a43b2c884de81064c1, type: 2}
@ -107,25 +174,3 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &640971684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1618018427688012061}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32c2f38a722aceb40980e1cdf8a6041a, type: 3}
m_Name:
m_EditorClassIdentifier:
nowState: 0
probabilityOfStand: 0.4
probabilityOfMove: 0.3
probabilityOfDig: 0.3
ChangeStateTimer: 3
moveSpeed: 2
maxMovePos: {x: 2, y: 0.6, z: -3}
minMovePos: {x: -4, y: 0.5, z: -4}
digPosition: {x: 2.4, y: 1.03, z: -3}
digTime: 5

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 61c32b30d525fa944ac7cea5beea2b61
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: cf45009d32887924bbd6af341975f17f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -20,7 +20,7 @@ public class buy_btn : MonoBehaviour
// Start is called before the first frame update
void Start()
{
BuyMan.onClick.AddListener(() => { OnBuyManBTN?.Invoke();});
BuyMan.onClick.AddListener(() => { OnBuyManBTN?.Invoke(); });
BuyTools.onClick.AddListener(() => { OnBuyToolsBTN?.Invoke(); });
GiveMan.onClick.AddListener(() => { OnGiveManBTN?.Invoke(); });
GiveTools.onClick.AddListener(() => { OnGiveToolsBTN?.Invoke(); });

View File

@ -28,11 +28,14 @@ public class buyingTalent : MonoBehaviour
closeBTN.onClick.AddListener(()=> {
OnCloseBTN?.Invoke();
HidePanel();
});
closeBTN.onClick.AddListener(()=> {
OnCloseBTN?.Invoke();
HidePanel();
});
HidePanel();
}
public void ShowPanel()

View File

@ -23,6 +23,8 @@ public class room : MonoBehaviour
public buy_btn buyBTNs;
public List<GameObject> cazhi;
public GameObject BlackRoom;
// Start is called before the first frame update
void Start()
{
@ -64,6 +66,7 @@ public class room : MonoBehaviour
UpdateShowCazhi();
ChangeTextPro();
GameObject newMiner = GameObject.Instantiate(minerPrefab);
newMiner.transform.SetParent(startPos);
newMiner.transform.position = startPos.position;
}
@ -75,29 +78,63 @@ public class room : MonoBehaviour
void addman()
{
if ((startPos.childCount + haveNumber) > 9)
{
Promptmgr.Instance.PromptBubble("¿ó¶´ÒÑÂú");
return;
}
if (haveNumber>9)
{
Promptmgr.Instance.PromptBubble("人数已满");
return;
}
Debug.Log("¿ÛÇ®¼ì²â");
haveNumber += 1;
Promptmgr.Instance.PromptBubble("购买成功");
ChangeTextPro();
GetRoom();
}
void addtools()
{
if ((startPos.childCount+ toolsNumber) > 9)
{
Promptmgr.Instance.PromptBubble("¿ó¶´ÒÑÂú");
return;
}
if (toolsNumber > 9)
{
Promptmgr.Instance.PromptBubble("工具已满");
return;
}
Debug.Log("¿ÛÇ®¼ì²â");
toolsNumber += 1;
Promptmgr.Instance.PromptBubble("购买成功");
UpdateShowCazhi();
ChangeTextPro();
GetRoom();
}
//¿ªÍØ·¿¼ä
void GetRoom()
{
if (BlackRoom == null) return;
Destroy(BlackRoom) ;
}
void UpdateShowCazhi()
{

View File

@ -12,7 +12,7 @@ public enum State
public class minercontorl : MonoBehaviour
{
// 动画组件
private Animator animator;
public Animator animator;
// 当前状态
public State nowState = State.stand;
@ -41,10 +41,12 @@ public class minercontorl : MonoBehaviour
public float digTime = 5f; // 挖矿的持续时间
private bool isDiging = false;
[SerializeField]
private Vector3 newV;//随机的挖矿位置
// 初始化
void Start()
{
animator = transform.GetComponent<Animator>();
//animator = transform.GetComponent<Animator>();
if (animator == null)
{
Debug.LogError("Animator component is missing.");
@ -52,6 +54,8 @@ public class minercontorl : MonoBehaviour
// 初始化当前位置
targetPosition = transform.position;
newV = new Vector3(digPosition.x, digPosition.y + Random.Range(-0.3f, 0.3f), digPosition.z);
}
// 每帧更新
@ -164,11 +168,13 @@ public class minercontorl : MonoBehaviour
}
// 检查是否在挖矿位置
void CheckDigPosition()
{
if (Vector3.Distance(transform.position, digPosition) > 0.01f)
{
if (Vector3.Distance(transform.position, newV) > 0.01f)
{
animator.SetInteger("state", 1);
Move(digPosition); // 移动到挖矿位置
Move(newV); // 移动到挖矿位置
}
else
{