NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

여러 상황 조작 버그 수정, 농장 개선

This commit is contained in:
Ino 2025-08-09 22:10:17 +09:00
parent be6edb2cb6
commit 1822e83d0e
10 changed files with 551 additions and 71545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/ResWork/Suriyun/Environments/Materials/Butterfly.mat
View File

@ -2,21 +2,27 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Butterfly
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 5
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHAPREMULTIPLY_ON
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -56,19 +62,25 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

71870
Assets/Res_Addr/Map/MyFarm.prefab
View File

File diff suppressed because it is too large Load Diff

174
Assets/Res_Addr/Obj/FarmObj.prefab
View File

@ -10,8 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 4720377114256696}
- component: {fileID: 8098767285352453536}
- component: {fileID: 33892409337774094}
- component: {fileID: 23329927564101574}
- component: {fileID: 95078649442281346}
- component: {fileID: -1696916844959456614}
- component: {fileID: -1779682588939846481}
@ -35,7 +33,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 4899613769507982271}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8098767285352453536
@ -57,56 +56,7 @@ MonoBehaviour:
m_animation: {fileID: 0}
_target: {fileID: 0}
isTarget: 0
--- !u!33 &33892409337774094
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1010954298117434}
m_Mesh: {fileID: 4300000, guid: 6e1bbdb215f0fd6498134319f08d64df, type: 3}
--- !u!23 &23329927564101574
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1010954298117434}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5117de4b258fc1d4fb5282b457a70927, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
m_HUDUI: {fileID: 0}
--- !u!95 &95078649442281346
Animator:
serializedVersion: 5
@ -147,8 +97,8 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.15962431, y: 0.17085922, z: 0.19972351}
m_Center: {x: 0, y: -0.061739236, z: -0.0730629}
m_Size: {x: 5, y: 10, z: 5}
m_Center: {x: 0, y: 1, z: 0}
--- !u!195 &-1779682588939846481
NavMeshAgent:
m_ObjectHideFlags: 0
@ -158,10 +108,10 @@ NavMeshAgent:
m_GameObject: {fileID: 1010954298117434}
m_Enabled: 1
m_AgentTypeID: 0
m_Radius: 0.25
m_Radius: 3
m_Speed: 4.5
m_Acceleration: 140
avoidancePriority: 51
avoidancePriority: 0
m_AngularSpeed: 300
m_StoppingDistance: 0.1
m_AutoTraverseOffMeshLink: 1
@ -198,3 +148,113 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!1001 &7821921924084064754
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4720377114256696}
m_Modifications:
- target: {fileID: 3419323174930331245, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_Name
value: Mountain_01
objectReference: {fileID: 0}
- target: {fileID: 3419323174930331245, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3419323174930331245, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_NavMeshLayer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3419323174930331245, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_RootOrder
value: 32
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalRotation.y
value: -9.635897e-10
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 14.869
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 35.774002
objectReference: {fileID: 0}
- target: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -4.556
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 2701245738756083973, guid: 8ee67d497e344de49b7333e28232479f, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ee67d497e344de49b7333e28232479f, type: 3}
--- !u!4 &4899613769507982271 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3419323174930360909, guid: 8ee67d497e344de49b7333e28232479f,
type: 3}
m_PrefabInstance: {fileID: 7821921924084064754}
m_PrefabAsset: {fileID: 0}

BIN
Assets/Scenes/MyFarm/NavMesh.asset
View File

Binary file not shown.

1
Assets/Script/Character/Actor.cs
View File

@ -843,6 +843,7 @@ public class Actor : MyCoroutine
{
OptionInfo.Ins.Set_PCMove(this, false);
var startPos = Get_position(); // 현재 위치
if (m_Target.Get_Agent().radius > dist) dist = m_Target.Get_Agent().radius;
var targetPos = Get_TeleportPostion(m_Target, dist);
var elapsed = 0f;

4
Assets/Script/Character/MyActor.cs
View File

@ -81,6 +81,10 @@ public class MyActor : Actor
else
m_NavMeshAgent.stoppingDistance = m_Magic.m_SkillTableData.f_SkillRange;
// 상대 크기 보정해서 공격할 수 있게 함
if (m_Target.Get_Agent().radius > m_NavMeshAgent.stoppingDistance)
m_NavMeshAgent.stoppingDistance = m_Target.Get_Agent().radius + 0.5f;
if (Vector3.Distance(Get_position(), m_Target.Get_position()) > m_NavMeshAgent.stoppingDistance + m_Target.Get_ScaleSizeDist())
Play_Run();
else if (!DSUtil.CheckNull(m_Magic))

8
Assets/Script/Character/PCActor.cs
View File

@ -8,7 +8,7 @@ using Random = UnityEngine.Random;
public class PCActor : MyActor
{
public Transform[] tfs_weapon; // 0 ?ㅻ뱶, 1 ?ㅻⅨ??
public Transform[] tfs_weapon;
bool isUI;
float t_RecoverHPTime = 10f, t_RecoverMPTime = 10f, t_autoskill = 0.5f;
@ -17,7 +17,7 @@ public class PCActor : MyActor
ObscuredFloat[] arr_magicMaxCoolTime = new ObscuredFloat[] { 0f, 0f, 0f, 0f, 0f, 0f };
SkillListTableData[] arr_magicData = new SkillListTableData[6];
SkillCard[] arr_PCSkillCard;
public int JoystickStatus = 0; // 0 議곗씠?ㅽ떛 x, 1 議곗씠?ㅽ떛 + run ?좊떂, 2 議곗씠?ㅽ떛留?
public int JoystickStatus = 0; // 0 조이스틱 x, 1 조이스틱 + run 애님, 2 조이스틱만
ObscuredFloat m_AvoidCoolTime;
protected ClassConfigTableData m_ClassData;
@ -150,7 +150,7 @@ public class PCActor : MyActor
{
MyValue.MyPC = this;
//// 移대찓???꾩튂 ?↔린
//// 카메라 위치 잡기
//var curStageData = InGameInfo.Ins.Get_CurStageData();
//var viewcam = LoadMapMgr.Ins.Get_ViewCamera("ViewCamera");
//var maincam = Camera.main;
@ -189,6 +189,8 @@ public class PCActor : MyActor
Del_Magic();
Play_Idle();
ActorInfo.Ins.All_Stop(false);
OptionInfo.Ins.Set_PCMove(this, true);
JoystickStatus = 0;
}
protected override bool IsAvoidCoolTime() { return m_AvoidCoolTime > 0f; }

16
Assets/Script/Main/MainToFarm.cs
View File

@ -61,17 +61,27 @@ public class MainToFarm : MonoBehaviourSingletonTemplate<MainToFarm>
Resources.UnloadUnusedAssets();
}
if (warpPC) WarpToFarmFirstPosion();
//if (warpPC) WarpToFarm(0);
}
public void WarpToFarmFirstPosion()
public void WarpToFarm(int index)
{
MyValue.MyPC.Set_AutoBraking(false);
MyValue.MyPC.Play_Idle();
MyValue.MyChoiceMapData.n_PortalIndex = index;
LoadMapMgr.Ins.Get_PortalPos(MyValue.MyChoiceMapData, portalpos =>
{
MyValue.MyPC.Set_Warp(portalpos);
MyValue.m_RealCamera.Set_Target(transform, LoadMapMgr.Ins.Get_MapZoneData(MyValue.MyChoiceMapData).CamRot_Portal);
MyValue.m_RealCamera.Set_Target(MyValue.MyPC.transform,
LoadMapMgr.Ins.Get_MapZoneData(MyValue.MyChoiceMapData).CamRot_Portal);
var pet = ActorInfo.Ins.Get_Actor(eRole.Pet);
if (index == 1)
{
pet.gameObject.SetActive(true);
pet.Set_Warp(portalpos + Vector3.back);
}
else
pet.Off();
});
}
}

3
Assets/Script/UI/Farm/FarmFarmUI.cs
View File

@ -8,12 +8,13 @@ public class FarmFarmUI : BotMenuBase
gameObject.SetActive(true);
MyValue.MyPC.Set_AutoBraking(true);
NewGameUI.Ins.SetUI_byGameMode(eGameMode.MyFarm, true);
MainToFarm.Ins.WarpToFarm(1);
}
public void ReturnToFarm()
{
gameObject.SetActive(false);
NewGameUI.Ins.SetUI_byGameMode(eGameMode.MyFarm);
MainToFarm.Ins.WarpToFarmFirstPosion();
MainToFarm.Ins.WarpToFarm(0);
}
}

2
Assets/ThirdParty/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs vendored
View File

@ -56,7 +56,7 @@ public class FloatingJoystick : Joystick
{
background.gameObject.SetActive(false);
base.OnPointerUp(eventData);
if (MyValue.bMyPC && MyValue.MyPC.CanMove())
if (OptionInfo.Ins.Get_PCMove() && MyValue.bMyPC && MyValue.MyPC.CanMove())
{
MyValue.MyPC.Set_JoystickStatus(0);
MyValue.MyPC.Set_AutoBraking(true);