kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Merge branch 'main' of http://10.27.16.144:3000/kawagiri/TH1

Browse Source
This commit is contained in:
daixiawu 2025-07-16 01:40:33 +08:00
commit 87b0497571
5 changed files with 267 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
My project/Assets/Resources/DataAssets/Achievement.asset
View File

@ -12,4 +12,244 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b664cf36cbd74c59a853c45c232706b0, type: 3}
m_Name: Achievement
m_EditorClassIdentifier:
AchievementList: []
AchievementList:
- BigID: 1
SmallID: 1
InternalID: 1
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":2,"TrainCount":0}'
- BigID: 1
SmallID: 1
InternalID: 2
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":5,"TrainCount":0}'
- BigID: 1
SmallID: 1
InternalID: 3
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":3,"TrainCount":0}'
- BigID: 1
SmallID: 1
InternalID: 4
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":1,"TrainCount":0}'
- BigID: 1
SmallID: 1
InternalID: 5
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":4,"TrainCount":0}'
- BigID: 1
SmallID: 2
InternalID: 1
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":6,"TrainCount":0}'
- BigID: 1
SmallID: 2
InternalID: 2
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":9,"TrainCount":0}'
- BigID: 1
SmallID: 2
InternalID: 3
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":8,"TrainCount":0}'
- BigID: 1
SmallID: 2
InternalID: 4
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":7,"TrainCount":0}'
- BigID: 1
SmallID: 2
InternalID: 5
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":10,"TrainCount":0}'
- BigID: 1
SmallID: 3
InternalID: 1
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":11,"TrainCount":0}'
- BigID: 1
SmallID: 3
InternalID: 2
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":12,"TrainCount":0}'
- BigID: 1
SmallID: 3
InternalID: 3
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":13,"TrainCount":0}'
- BigID: 1
SmallID: 3
InternalID: 4
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":15,"TrainCount":0}'
- BigID: 1
SmallID: 3
InternalID: 5
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":14,"TrainCount":0}'
- BigID: 1
SmallID: 4
InternalID: 1
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":16,"TrainCount":0}'
- BigID: 1
SmallID: 4
InternalID: 2
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":17,"TrainCount":0}'
- BigID: 1
SmallID: 4
InternalID: 3
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":20,"TrainCount":0}'
- BigID: 1
SmallID: 4
InternalID: 4
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":19,"TrainCount":0}'
- BigID: 1
SmallID: 4
InternalID: 5
MapID: 0
IsFinished: 0
Name:
Desc:
_typeNames:
- Logic.Achievement.TrainGiantCondition, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
_jsonData:
- '{"TargetCount":1,"TargetGiant":18,"TrainCount":0}'

2
My project/Assets/Scripts/Logic/Achievement/AchievementCondition.cs
View File

@ -238,9 +238,7 @@ namespace Logic.Achievement
public WonderLibrary Wonder;
public GiantType Giant;
public int TargetTurns;
public uint RecordTurn;
public uint _gridId;

8
My project/Assets/Scripts/Logic/Achievement/AchievementItem.cs
View File

@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
using Logic.Multilingual;
using RuntimeData;
using UnityEngine;
@ -22,10 +23,15 @@ namespace Logic.Achievement
public uint SmallID;
public uint InternalID;
// 核心数据
// 核心数据 用来标记当前的地图 ID 防止继续游戏
public uint MapID;
public bool IsFinished;
//成就名称
public string Name;
// 成就描述
public string Desc;
public List<AchievementConditionBase> Conditions;
public uint ID => BigID * 10000 + SmallID * 100 + InternalID;

19
My project/Assets/Scripts/Logic/Editor/AchievementEditorWindow.cs
View File

@ -8,6 +8,7 @@
using System.Collections.Generic;
using Logic.Achievement;
using NUnit.Framework;
using UnityEditor;
using UnityEngine;
@ -109,6 +110,18 @@ namespace Logic.Editor
{
_asset.AchievementList.Sort((a, b) => a.ID.CompareTo(b.ID));
}
if (InspectorUtils.InspectorButtonWithTextWidth("全选"))
{
var keys = new List<uint>();
foreach (var key in _showItem.Keys)keys.Add(key);
foreach (var key in keys) _showItem[key] = true;
}
if (InspectorUtils.InspectorButtonWithTextWidth("全不选"))
{
var keys = new List<uint>();
foreach (var key in _showItem.Keys)keys.Add(key);
foreach (var key in keys) _showItem[key] = false;
}
EditorGUILayout.EndHorizontal();
EditorGUILayout.BeginHorizontal();
@ -216,7 +229,11 @@ namespace Logic.Editor
isShow = EditorGUILayout.Toggle(isShow, GUILayout.Width(16));
_showItem[item.ID] = isShow;
InspectorUtils.InspectorTextWidthRich($"<b> 成就ID: {item.ID}</b>");
if (InspectorUtils.InspectorButtonWithTextWidth("增加一条判断"))
InspectorUtils.InspectorTextWidthRich($"<b> 名称 </b>");
item.Name = EditorGUILayout.TextField(item.Name, GUILayout.Width(100));
InspectorUtils.InspectorTextWidthRich($"<b> 描述 </b>");
item.Desc = EditorGUILayout.TextField(item.Desc, GUILayout.Width(300));
if (InspectorUtils.InspectorButtonWithTextWidth("+"))
{
item.Conditions.Add(AchievementFactory.GetAchievementCondition(AchievementConditionType.AroundBuildings));
}

1
My project/Assets/Scripts/Logic/Main/GameLogic.cs
View File

@ -125,6 +125,7 @@ namespace Logic
//uiManager.EndTurn();
PlayerPrefs.SetInt("Archive", 1);
MapData.SaveMapData(_gameLogic.Main.MapData);
AchievementDataManager.Instance.OnTurnStart(_gameLogic.Main.MapData, _curPlayer);
#if GAME_AUTO_DEBUG
_aiLogic = new AILogic();