xgan/2025TapTapGameJam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: xgan:2f1ad467aab3adc0a2a8675567ff130fa4202138
Branches Tags
xgan:master
..
compare: xgan:1944fb40a151dc60dc95a96978e340c08cf694f5
Branches Tags
xgan:master

58 Commits
2f1ad467aa ... 1944fb40a1

Author SHA1 Message Date
10yan\641
1944fb40a1 Merge branch 'master' of http://8.134.150.210:3000/xgan/2025TapTapGameJam 2025-10-25 15:43:10 +08:00
GanX
180e03e4c2 chore(LFS): 将Assets/Art/Model中的文件都使用LFS管理 2025-10-25 09:10:02 +08:00
10yan\641
267cbba6f8 更新关卡白盒 2025-10-25 08:44:24 +08:00
GanX
d028246f8f feat(VoidKillZone): 实现玩家直接死亡空气墙 2025-10-24 17:01:46 +08:00
GanX
78b8e5f154 faet(fallDamage): 实现玩家的摔落伤害 2025-10-24 16:54:15 +08:00
GanX
22a2ab724a feat(Read): 将阅读修改为R键，并添加阅读提示 2025-10-24 16:45:02 +08:00
GanX
9d7106bb5e feat(ScreenGlitch): 完成基础的故障屏幕闪烁效果，并在重启时启用 2025-10-24 16:08:37 +08:00
GanX
2dc89a3d54 chore(Git): 添加Unity拉取最新版本的快捷编辑器工具 2025-10-23 15:56:42 +08:00
GanX
efcbc8eea5 feat(Dialogue): 实现基本的对话系统 2025-10-23 15:46:17 +08:00
GanX
869d5794f3 feat(MeshRenderer): 实现MeshRenderer的可编辑组件 2025-10-23 09:45:56 +08:00
GanX
798b07aa53 chore(): Tag补充 2025-10-23 09:27:04 +08:00
GanX
f50ad955aa feat(Transport): 实现传送器 2025-10-23 09:26:47 +08:00
GanX
7903e7fdbe feat(): 完成控制台的2中发射信号的模式切换, 优化基本按钮和拉杆的表现 2025-10-22 19:38:22 +08:00
GanX
5198a80318 refactor(Facility): 使用继承让所有机关都拥有了独自的 可交互 可编辑 可连接设定。大面积重构 2025-10-22 17:34:58 +08:00
GanX
acd8282ff0 feat(Console MovePlateform): 实现控制台和移动平台 2025-10-22 11:32:53 +08:00
GanX
93b83b3af3 refactor():重构编辑系统，不再需要添加额外的脚本作为可编辑的入口了 2025-10-21 16:40:41 +08:00
GanX
1ce3d1a0d8 feat(): 添加删除连接线的提示 2025-10-21 15:40:06 +08:00
GanX
a7dcf15aed feat(Emmit): 实现发射器 2025-10-21 15:32:59 +08:00
GanX
6ff684a71e feat(UIReminder): 优化了提示键位的UI 2025-10-21 14:23:54 +08:00
GanX
f71ef8cae9 feat(Edit): 现在玩家按E可以直接对可编辑物体进行编辑 2025-10-21 13:41:51 +08:00
GanX
d3eed0945c feat(Gaze): 实现注视相关提示 2025-10-21 13:07:48 +08:00
GanX
4737220e42 fix(DeleteLines): 修复无法删除连线的BUG 2025-10-21 08:51:37 +08:00
GanX
56fab4ede4 fix(ConnectUI): 让连接UI正确显示 2025-10-20 20:05:24 +08:00
GanX
9daa56a457 feat(NumberSlot): 实现号码槽 2025-10-20 19:59:44 +08:00
GanX
0a1aa83425 refactor(Connect): 重构连接体系，实现一个物体拥有多个连接线 2025-10-20 19:40:55 +08:00
GanX
bb2c5aa436 feat(Connect): 实现在场景中提前布置连线，游戏开始后自动连接的功能 2025-10-20 11:02:10 +08:00
GanX
ec905d2a27 feat(Connect Distance): 添加了玩家最大可连接距离的逻辑 2025-10-20 10:42:32 +08:00
GanX
2b4a7af1e1 feat(CutLine): 实现切除连接线的逻辑 2025-10-20 10:33:00 +08:00
GanX
5dd9760a20 chore(Script.Gameplay.Player): 修改名称空间Gameplay.Player -> Script.Gameplay.Player 2025-10-20 10:12:07 +08:00
GanX
3593a9f0e8 feat(Lever):实现拉杆 2025-10-20 10:01:40 +08:00
GanX
bb16550a0f feat(PressurePlate):实现压力板 2025-10-20 09:54:58 +08:00
GanX
6edc9fa3fd chore(StartFromCore):添加从Core开启的编辑器快捷方法 2025-10-20 09:48:56 +08:00
GanX
7c826ceba4 feat(Button): 实现按钮预制体，测试倒计时功能，添加从测试开始的按钮 2025-10-20 09:34:22 +08:00
GanX
fc91a61930 fix(): 修复Rigidbody无法正常下落的BUG 2025-10-20 09:23:04 +08:00
GanX
06b253da24 chore(): 修改了Gameplay接口的名称空间，添加Test场景专门摆放展示预制体的功能 2025-10-20 09:02:15 +08:00
GanX
bc6e0277f8 fix(UI): 修复当UIBase的IsOpenOnFirstLoad为false的时候，会导致组件的Awake无法触发的BUG 2025-10-19 19:42:55 +08:00
GanX
f3d73ab65a feat(Connect): 完成连线基本玩法， 2025-10-19 19:38:52 +08:00
GanX
e14e8925de fix(): 修复字符集缺少_, 修复TimePauseManager的警告问题 2025-10-19 17:21:03 +08:00
GanX
0eb5cbf784 fix(DoorInteract): 2025-10-18 17:16:39 +08:00
GanX
462a3b5850 refactor(): 使用第一人称射线检测来替换掉 可交互和可编辑种重合的部分 2025-10-18 17:14:09 +08:00
GanX
b709d1219f chore():整理了一下文件夹和玩家的血量逻辑 2025-10-18 15:41:43 +08:00
GanX
ab403fac4b feat(Rigidbody Collider): 实现可编辑的Rigidbody 和 Collider 2025-10-18 11:56:50 +08:00
GanX
0716cbc0f7 fix(Door): 修复了交互开关无法正常运行的BUG 2025-10-18 11:42:25 +08:00
GanX
30574160f9 feat(font): 添加中文字体 2025-10-18 11:09:44 +08:00
GanX
b4f229d29e feat(): 实现EditComponent的UI基础，引入TextMeshPro,添加了在Inside状态下不能互动物体的逻辑控制 2025-10-18 11:00:06 +08:00
GanX
2614dab342 feat(TimeCountDown): 实现倒计时功能 2025-10-18 10:06:12 +08:00
GanX
48d872b4b9 feat(Time & Mode): 给模式切换添加上时间暂停相关逻辑 2025-10-18 09:25:06 +08:00
GanX
a86107b79d refactor(WatchMode): 将鼠标逻辑修改移动到PlayerWatchModeController当中 2025-10-18 09:20:37 +08:00
GanX
da7ba72698 feat(TimePause):时间暂停管理器 2025-10-18 09:13:25 +08:00
GanX
0be7ccceba chore():冗余2 2025-10-18 09:00:33 +08:00
GanX
e545fa41ca chore(): 删除所有冗余的代码和资源 2025-10-18 09:00:18 +08:00
GanX
345930843d feat():完成3种模式的基本运行框架 2025-10-18 08:55:38 +08:00
GanX
3d03c59dc3 feat():大改前的提交，这个版本保存了所有冗余的代码 2025-10-17 15:10:19 +08:00
GanX
668bfe12eb feat(): 大量更新 2025-10-15 21:31:13 +08:00
GanX
546f08c53a feat(PlayerCamera):完成玩家的第一人称相机 2025-10-14 17:10:15 +08:00
GanX
9536e1b1c8 feat(Card): 卡牌基本框架，尚未测试 2025-10-14 14:10:20 +08:00
GanX
eba8d5792d feat(init): 搭建初始的项目框架 2025-10-14 12:39:53 +08:00
GanX
3cf503bfa6 init():初始化仓库提交，包括gitignore 2025-10-13 16:47:12 +08:00
6 changed files with 91 additions and 0 deletions
Expand all files Collapse all files

22
Assets/Prefab/Gameplay/ConnectionLine.prefab
View File

@@ -42,7 +42,11 @@ LineRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2140853775088731430}
m_Enabled: 1
<<<<<<< HEAD
m_CastShadows: 1
=======
m_CastShadows: 0
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
@@ -54,7 +58,11 @@ LineRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
<<<<<<< HEAD
- {fileID: 2100000, guid: fd7b6ef1c8d01724683c1f9dc2114f9e, type: 2}
=======
- {fileID: 2100000, guid: e96f7d97b7194c548bcfc2a18e277891, type: 2}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -85,8 +93,13 @@ LineRenderer:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: 0.48411998
value: 0.018180847
=======
time: 0.6359602
value: 0.052467346
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -132,7 +145,11 @@ LineRenderer:
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
<<<<<<< HEAD
generateLightingData: 0
=======
generateLightingData: 1
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
m_MaskInteraction: 0
m_UseWorldSpace: 1
m_Loop: 0
@@ -149,5 +166,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 73c8f3d3a6144dc780b46b6c363b8ca6, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
monoSource: {fileID: 0}
monoTarget: {fileID: 0}
=======
monoPointA: {fileID: 0}
monoPointB: {fileID: 0}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138

3
Assets/Prefab/Gameplay/Player.prefab
View File

@@ -239,8 +239,11 @@ MonoBehaviour:
groundMask:
serializedVersion: 2
m_Bits: 64
<<<<<<< HEAD
=======
fallDamageThreshold: 3
pushPower: 0.5
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!114 &2963170313432786625
MonoBehaviour:
m_ObjectHideFlags: 0

12
Assets/Prefab/UI/PlayerDialogueViwer.prefab
View File

@@ -74,8 +74,13 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
<<<<<<< HEAD
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
=======
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -163,8 +168,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
<<<<<<< HEAD
m_Children: []
=======
m_Children:
- {fileID: 6562215877067561314}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
m_Father: {fileID: 137519622818440187}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -263,6 +272,8 @@ MonoBehaviour:
IsOpenOnFirstLoad: 0
dialogueText: {fileID: 8851227466014393207}
panel: {fileID: 4131091626654046850}
<<<<<<< HEAD
=======
--- !u!1 &6242942909134640294
GameObject:
m_ObjectHideFlags: 0
@@ -397,3 +408,4 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138

33
Assets/Scenes/Test.unity
View File

@@ -216,6 +216,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 115d4e847c444833bc8dce4a03a78e55, type: 3}
m_Name:
m_EditorClassIdentifier:
<<<<<<< HEAD
=======
--- !u!1001 &346781470
PrefabInstance:
m_ObjectHideFlags: 0
@@ -284,6 +286,7 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1 &410087039
GameObject:
m_ObjectHideFlags: 0
@@ -616,6 +619,8 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 85652dd0e36597644aa5b3bc9603797b, type: 3}
<<<<<<< HEAD
=======
--- !u!1001 &761528196
PrefabInstance:
m_ObjectHideFlags: 0
@@ -764,6 +769,7 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be07db3098b709a40a6965f50f8c9640, type: 3}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1001 &865274353
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1426,6 +1432,8 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b3e24e2df98d14e4ebc08cc68c071afa, type: 3}
<<<<<<< HEAD
=======
--- !u!114 &1753046143 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4936355834716623489, guid: be07db3098b709a40a6965f50f8c9640,
@@ -1438,6 +1446,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6b9b9a895b0d40edb9a6d7213afbb256, type: 3}
m_Name:
m_EditorClassIdentifier:
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1 &1859676917
GameObject:
m_ObjectHideFlags: 0
@@ -2281,6 +2290,8 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 17ad2833fef1bc044bcc25a227730d74, type: 3}
<<<<<<< HEAD
=======
--- !u!1001 &4318083913684650404
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2354,6 +2365,7 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fff496640cf3cc748b6a608893c657ba, type: 3}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
--- !u!1001 &4550639332017178188
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2639,6 +2651,14 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
<<<<<<< HEAD
- target: {fileID: 3748514579879403869, guid: 667aedb0d3f8c9d469819c9ff2b4472b,
type: 3}
propertyPath: m_RendererIndex
value: -1
objectReference: {fileID: 0}
=======
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b,
type: 3}
propertyPath: m_LocalPosition.x
@@ -2710,7 +2730,11 @@ PrefabInstance:
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: preConnectionLines.Array.size
<<<<<<< HEAD
value: 1
=======
value: 2
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
objectReference: {fileID: 0}
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
@@ -2722,6 +2746,8 @@ PrefabInstance:
propertyPath: preConnectionLines.Array.data[0].target
value:
objectReference: {fileID: 183959152}
<<<<<<< HEAD
=======
- target: {fileID: 6919868315282518728, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: preConnectionLines.Array.data[1].source
@@ -2737,6 +2763,7 @@ PrefabInstance:
propertyPath: preConnectionLines.Array.data[1].PreConnectionID
value: 0
objectReference: {fileID: 0}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- target: {fileID: 8209060139561151121, guid: e6007da0e1121fd4ab3b932c054f6256,
type: 3}
propertyPath: m_LocalPosition.x
@@ -3098,8 +3125,11 @@ SceneRoots:
- {fileID: 4550639332017178188}
- {fileID: 6865129841946316189}
- {fileID: 2578337202726380610}
<<<<<<< HEAD
=======
- {fileID: 4318083913684650404}
- {fileID: 761528196}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- {fileID: 1781028406820323425}
- {fileID: 7779342506646282638}
- {fileID: 8980111935536418165}
@@ -3110,8 +3140,11 @@ SceneRoots:
- {fileID: 473911345}
- {fileID: 865274353}
- {fileID: 6350903300567888677}
<<<<<<< HEAD
=======
- {fileID: 346781470}
- {fileID: 817379214}
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
- {fileID: 1549323716}
- {fileID: 2110019781}
- {fileID: 730184548946979397}

8
Assets/Script/Gameplay/Edit/RigidbodyEditableController.cs
View File

@@ -34,7 +34,11 @@ namespace Script.Gameplay.Edit
{
_rigidbody = GetComponent<Rigidbody>();
//应用序列化的初始状态
<<<<<<< HEAD
_rigidbody.isKinematic = !IsEnableEdit;
=======
_rigidbody.isKinematic = !isOpenInEditor;
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
}
#if UNITY_EDITOR
@@ -43,7 +47,11 @@ namespace Script.Gameplay.Edit
//在编辑器中即时生效
_rigidbody = _rigidbody == null ? GetComponent<Rigidbody>() : _rigidbody;
if (_rigidbody != null)
<<<<<<< HEAD
_rigidbody.isKinematic = !IsEnableEdit;
=======
_rigidbody.isKinematic = !isOpenInEditor;
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
}
#endif
}

13
Assets/Script/Gameplay/Player/PlayerDialogueController.cs
View File

@@ -19,9 +19,12 @@ namespace Script.Gameplay.Player
public event Action OnPlayerEndDialogue;
public event Action<GameObject> OnGazeEnterDialogue;
public event Action<GameObject> OnGazeExitDialogue;
<<<<<<< HEAD
=======
private InputManager inputManager;
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
private Queue<string> dialogueQueue = new Queue<string>();
private PlayerDialogueViewer playerDialogueViewer;
@@ -58,8 +61,12 @@ namespace Script.Gameplay.Player
if (firstPersonRaycaster == null)
Debug.LogWarning("FirstPersonRaycaster not found! Please assign or add it to the player.");
<<<<<<< HEAD
var input = InputManager.Instance.Input;
=======
inputManager = InputManager.Instance;
var input = inputManager.Input;
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
input.Player.Read.performed += ctx =>
{
if (!isEnablePlayerDialogue) return;
@@ -99,8 +106,11 @@ namespace Script.Gameplay.Player
OnPlayerBeginDialogue?.Invoke();
CurrentDialogueTarget.OnBeginDialogue?.Invoke(true);
dialogueQueue = SplitDialogue(CurrentDialogueTarget.DialogueContent);
<<<<<<< HEAD
=======
inputManager.SetInputForLook(false);
inputManager.SetInputForMove(false);
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
PassNextDialogue();
}
}
@@ -130,8 +140,11 @@ namespace Script.Gameplay.Player
isReadingDialogue = false;
OnPlayerEndDialogue?.Invoke();
CurrentDialogueTarget.OnEndDialogue?.Invoke(true);
<<<<<<< HEAD
=======
inputManager.SetInputForLook(true);
inputManager.SetInputForMove(true);
>>>>>>> 2f1ad467aab3adc0a2a8675567ff130fa4202138
if (playerDialogueViewer != null)
{
playerDialogueViewer.ClosePanel();