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

Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1 into main

Browse Source
This commit is contained in:
wuwenbo 2025-11-05 19:45:41 +08:00
commit fb88f2da10
32 changed files with 77400 additions and 823 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tools/Multilingual.xlsx
View File

Binary file not shown.

12
Tools/MultilingualTxt.txt
View File

File diff suppressed because one or more lines are too long

2
Tools/OPSFile.txt
View File

File diff suppressed because one or more lines are too long

553
Unity/Assets/OPS/Obfuscator/Log/StandaloneWindows64.txt
View File

File diff suppressed because it is too large Load Diff

6
Unity/Assets/Resources/DataAssets/SkillDataAssets.asset
View File

@ -311,7 +311,7 @@ MonoBehaviour:
SkillShowList: []
- SkillType: 43
SkillName: "\u5438\u8840\u9B3C"
SkillDesc: "\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB325%\u7684\u8840\u91CF\u3002"
SkillDesc: "\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB320%\u7684\u8840\u91CF\u3002"
HasShowList: 1
SkillShowList:
- UnitFullType:
@ -323,8 +323,8 @@ MonoBehaviour:
UnitLevel: 0
IgnoreUnitGiantType: 0
IgnoreUnitLevel: 1
SkillDesc: "<color=yellow>\u7EEF\u7EA2\u4E4B\u51FB</color>:\u88AB\u52A8\u6280\u80FD\u3002\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB330%\u7684\u8840\u91CF\u3002"
SkillName:
SkillDesc: "\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB320%\u7684\u8840\u91CF"
SkillName: "\u5438\u8840\u9B3C"
- SkillType: 73
SkillName:
SkillDesc: "<color=yellow>\u5438\u8840\u9B3C\u5F3A\u5316</color>:\u88AB\u52A8\u6280\u80FD\u3002\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB350%\u7684\u8840\u91CF\u3002"

7
Unity/Assets/Resources/DataAssets/VersionConfig.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
m_Name: VersionConfig
m_EditorClassIdentifier:
CurVersionId: 10502
CurVersionId: 10503
Versions:
- MajorVersion: 1
MinorVersion: 0
@ -240,6 +240,11 @@ MonoBehaviour:
[\u4F18\u5316 \u4E0E bug\u4FEE\u590D] ----------\n1.\u4FEE\u590D\u4E86\u53CC\u65B9\u4E92\u76F8\u5EFA\u7ACB\u5927\u4F7F\u9986\u5E76\u8FDB\u5165\u6218\u4E89\u540E\uFF0C\u5927\u4F7F\u9986\u64A4\u9500\u754C\u9762\u663E\u793A\u9519\u8BEF\u7684bug\n2.\u4FEE\u590D\u4E86AI\u5EFA\u9020\u8C37\u4ED3\u3001\u952F\u6728\u5382\u548C\u51B6\u70BC\u5382\u65F6\uFF0C\u5C06\u73A9\u5BB6\u7684\u5EFA\u7B51\u8BC6\u522B\u4E3AAI\u4E00\u65B9\u7684\u5EFA\u7B51\u4ECE\u800C\u9519\u8BEF\u5EFA\u9020\u7684bug\n3.\u4FEE\u590D\u4E86\u5728\u663E\u793A\u5730\u5757\u7684\u60C5\u51B5\u4E0B\u9000\u51FA\u6E38\u620F\u4F1A\u5361\u6B7B\u7684bug\n4.\u4FEE\u590D\u4E86\u8FD1\u6218\u5355\u4F4D\u51FB\u6740\u4F4D\u4E8E\u6865\u6881\u4E0A\u7684\u5355\u4F4D\u65F6\uFF0C\u4E0D\u4F1A\u79FB\u52A8\u5230\u6865\u6881\u4E0A\u7684bug\n5.\u4FEE\u590D\u4E86\u519B\u6E2F\u7684\u6587\u5B57\u63CF\u8FF0\u3002\u519B\u6E2F\u7684\u6548\u679C\u5BF9\u4EFB\u610F\u5904\u4E8E\u519B\u6E2F\u4E2D\u7684\u5355\u4F4D\u751F\u6548\n6.\u4FEE\u590D\u4E86Lv2\u4EE5\u4E0A\u7684\u5E15\u79CB\u8389\u5728\u76DF\u53CB\u9886\u571F\u4E0A\u4E5F\u53EF\u4EE5\u83B7\u5F97\u9B54\u529B\u77F3(\u706B)\u7684bug\n7.\u4FEE\u590D\u4E86\u5B66\u8005\u53EF\u4EE5\u653B\u51FB\u82F1\u96C4\u4E14\u82F1\u96C4\u4E0D\u4F1A\u53CD\u51FB\u7684bug\u3002\u76EE\u524D\uFF0C\u5B66\u8005\u65E0\u6CD5\u9009\u4E2D\u82F1\u96C4\u8FDB\u884C\u653B\u51FB\u3002\n8.\u4FEE\u590D\u4E86\u5E15\u79CB\u8389\u7684\u9B54\u529B\u77F3(\u706B)\u6280\u80FD\u63CF\u8FF0\u9519\u8BEF\u7684bug\n9.\u4FEE\u590D\u4E86\u5E15\u79CB\u8389\u5728\u6CBB\u7597\u53CB\u65B9\u65F6\uFF0C\u4E0D\u4F1A\u6D88\u8017\u9B54\u529B\u77F3(\u91D1)\u7684bug\n10.\u4FEE\u590D\u4E86\u704C\u6E89\u5DE5\u7A0B\u4E0D\u80FD\u62C6\u9664\u7684bug\n11.\u4FEE\u590D\u4E86\u5B66\u8005\u8F6C\u5316\u514B\u62C9\u514B\u65F6\uFF0C\u6CA1\u6709\u7ACB\u523B\u83B7\u5F97\u514B\u62C9\u514B\u7684\u6240\u6709\u89C6\u91CE\u7684bug\n12.\u4FEE\u590D\u4E86\u6BCF\u56DE\u5408\u5F00\u59CB\u65F6\uFF0C\u201C\u7B2CX\u56DE\u5408\u201D\u7684\u672C\u56DE\u5408\u63D0\u793A\u4E2D\u6570\u5B57\u9519\u8BEF\u7684bug\n13.\u4FEE\u590D\u4E86\u7EA2\u7F8E\u94C3\"\u864E\u52B2\u201Cbuff\u63CF\u8FF0\u9519\u8BEF\u7684bug\n14.\u4FEE\u590D\u4E86\u857E\u7C73\u8389\u4E9ALv3\u65F6\u7EEF\u7EA2\u9B54\u6CD5\u672A\u6B63\u786E\u751F\u6548\uFF0C\u4EE5\u53CA\u6280\u80FD\u6587\u5B57\u63CF\u8FF0\u9519\u8BEF\u7684bug\n15.\u4FEE\u590D\u4E86\u82F1\u96C4\u6218\u8239\u6B7B\u4EA1\u540E\uFF0C\u5BF9\u5E94\u82F1\u96C4\u6CA1\u6709\u590D\u6D3B\u51B7\u5374\u65F6\u95F4\u7684bug\n16.\u4FEE\u590D\u4E86\u5E15\u79CB\u8389\u8FDB\u5165\u82F1\u96C4\u6218\u8239\u540E\uFF0C\u4F53\u529B\u6D88\u5931\u7684bug\u3002\u5728\u82F1\u96C4\u6218\u8239\u4E0A\u79FB\u52A8\u65F6\uFF0C\u5E15\u79CB\u8389\u5C06\u4E0D\u4F1A\u6D88\u8017\u4F53\u529B\u3002\n\n---------
[\u6570\u503C\u8C03\u6574] ----------\n1.Lv.0\u7EA2\u7F8E\u94C3\u7684HP\u753120\u70B9\u8C03\u6574\u4E3A15\u70B9\uFF0C\u5347\u7EA7\u4EFB\u52A1\u8C03\u6574\u4E3A\u9020\u621025\u70B9/50\u70B9/100\u70B9\u4F24\u5BB3\n2.\u8299\u5170\u6735\u9732\u7684\"\u7981\u679C\u201C\u53E0\u5C42\u4E0A\u7EBF\u75316\u5C42\u8C03\u6574\u4E3A4\u5C42\n3.Lv.1\u5341\u516D\u591C\u54B2\u591C\u7684\u5347\u7EA7\u4EFB\u52A1\u8C03\u6574\u4E3A\u7D2F\u8BA1\u627F\u53D725\u70B9\u4F24\u5BB3\n3.\u4F18\u5316\u4E86\u84EC\u83B1\u5C71\u5E1D\u56FD\u7684\u521D\u59CB\u5730\u56FE\u8D44\u6E90\u5206\u5E03\n4.\u7EA2\u9B54\u9986\u7684\u6574\u4F53\u5E73\u8861\u8C03\u6574\u5C06\u5728\u4E0B\u4E2A\u5927\u7248\u672C\u4E2D\u653E\u51FA\n\n---------
[\u65B0\u589E\u5185\u5BB9] ----------\n1.\u65B0\u589EBGM\u97F3\u4E503\u9996\uFF1A\u7EF4\u4EAC\u6587\u660E-\u535A\u4E3D\u5E1D\u56FD\uFF0C\u82F1\u683C\u5170\u6587\u660E-\u547D\u83B2\u5E1D\u56FD\uFF0C\u6CE2\u65AF\u6587\u660E-\u4E30\u806A\u8033\u5E1D\u56FD\u3002\u5728\u9996\u6B21\u9047\u89C1\u6587\u660E\uFF0C\u6216\u8005\u6253\u5F00\u8BE5\u6587\u660E\u5916\u4EA4\u9762\u677F\u65F6\uFF0C\u5C06\u4F1A\u64AD\u653E\u5BF9\u5E94\u97F3\u4E50\u3002"
- MajorVersion: 1
MinorVersion: 5
PatchVersion: 3
Description: "[\u8865\u4E01\u7248\u672C\uFF1ADemo 1.5.3] \n\u53D1\u5E03\u65E5\u671F
25.11.5\n\n-------- [\u4F18\u5316\u4E0Ebug\u4FEE\u590D] --------\n1.\u4F18\u5316\u4E86\u8054\u673A\u65F6\u5EF6\u8FDF\u95EE\u9898\n2.\u8054\u673A\u4F18\u5316\uFF1A\u4F18\u5316\u4E86\u9080\u8BF7\u597D\u53CB\u5217\u8868\u7684\u70B9\u51FB\u53CD\u9988\n3.\u4FEE\u590D\u4E86\u8054\u673A\u65F6\u653B\u51FB\u53EF\u80FD\u5931\u6548\u7684bug"
- MajorVersion: 1
MinorVersion: 5
PatchVersion: 11

240
Unity/Assets/Resources/Export/Achievement.asset
View File

@ -14,246 +14,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
Data:
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}'
- BigID: 2
SmallID: 1
InternalID: 1

19
Unity/Assets/Resources/Export/Multilingual.asset
View File

@ -15724,4 +15724,23 @@ MonoBehaviour:
EN:
JP:
KR:
- ID: 2429
ZH: "[\u8865\u4E01\u7248\u672C\uFF1ADemo 1.5.3] \r\n\u53D1\u5E03\u65E5\u671F
25.11.5\r\n\r\n-------- [\u4F18\u5316\u4E0Ebug\u4FEE\u590D] --------\r\n1.\u4F18\u5316\u4E86\u8054\u673A\u65F6\u5EF6\u8FDF\u95EE\u9898\r\n2.\u8054\u673A\u4F18\u5316\uFF1A\u4F18\u5316\u4E86\u9080\u8BF7\u597D\u53CB\u5217\u8868\u7684\u70B9\u51FB\u53CD\u9988\r\n3.\u4FEE\u590D\u4E86\u8054\u673A\u65F6\u653B\u51FB\u53EF\u80FD\u5931\u6548\u7684bug"
TDZH:
EN:
JP:
KR:
- ID: 2430
ZH: "\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB320%\u7684\u8840\u91CF\u3002"
TDZH:
EN:
JP:
KR:
- ID: 2431
ZH: "\u653B\u51FB\u6216\u53CD\u51FB\u65F6\u6062\u590D\u4F24\u5BB320%\u7684\u8840\u91CF"
TDZH:
EN:
JP:
KR:
TargetTypes: 0100000001000000010000000100000001000000

6
Unity/Assets/Resources/Export/SkillDataAssets.asset
View File

@ -311,7 +311,7 @@ MonoBehaviour:
SkillShowList: []
- SkillType: 43
SkillName: 2328
SkillDesc: 2329
SkillDesc: 2430
HasShowList: 1
SkillShowList:
- UnitFullType:
@ -323,8 +323,8 @@ MonoBehaviour:
UnitLevel: 0
IgnoreUnitGiantType: 0
IgnoreUnitLevel: 1
SkillDesc: 1597
SkillName:
SkillDesc: 2431
SkillName: 2328
- SkillType: 73
SkillName:
SkillDesc: 1523

6
Unity/Assets/Resources/Export/VersionConfig.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
m_Name: VersionConfig
m_EditorClassIdentifier:
CurVersionId: 10502
CurVersionId: 10503
Versions:
- MajorVersion: 1
MinorVersion: 0
@ -82,6 +82,10 @@ MonoBehaviour:
MinorVersion: 5
PatchVersion: 2
Description: 2428
- MajorVersion: 1
MinorVersion: 5
PatchVersion: 3
Description: 2429
- MajorVersion: 1
MinorVersion: 5
PatchVersion: 11

75866
Unity/Assets/Resources/Prefab/UI/Info/UIInfoGridInfo.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Unity/Assets/Resources/Prefab/UI/Info/UIInfoGridInfo.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a7822dbfc047def428a56fe21b3b95ad
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

229
Unity/Assets/Resources/Prefab/UI/Outside/MultiplayFriendRow.prefab
View File

@ -151,6 +151,157 @@ MonoBehaviour:
ID: 2225
FontID: 0
TextCfg: []
--- !u!1 &1361731889024573105
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7581158890160607529}
- component: {fileID: 3834636637776316853}
- component: {fileID: 5319943759768548515}
- component: {fileID: 5033417634265818372}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7581158890160607529
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1361731889024573105}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4129301784502815366}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 7.8967, y: -6.2273}
m_SizeDelta: {x: 76.3673, y: 27.545}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3834636637776316853
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1361731889024573105}
m_CullTransparentMesh: 1
--- !u!114 &5319943759768548515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1361731889024573105}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u5DF2\u53D1\u9001"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 18
m_fontSizeBase: 18
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 12
m_fontSizeMax: 24
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: -0.9935417, y: -0.5048704, z: 2.1417084, w: 0.16910934}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &5033417634265818372
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1361731889024573105}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
m_Name:
m_EditorClassIdentifier:
Ban: 1
ID: 2426
FontID: 0
TextCfg: []
--- !u!1 &1855862625699240544
GameObject:
m_ObjectHideFlags: 0
@ -374,6 +525,7 @@ MonoBehaviour:
NameText: {fileID: 1930665045483255458}
StatusText: {fileID: 7934296884757067808}
InviteButton: {fileID: 8344017412151716554}
InviteHint: {fileID: 8143927519873095998}
animancer: {fileID: 8892751739136331366}
--- !u!114 &8892751739136331366
MonoBehaviour:
@ -451,6 +603,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1781432251121814556}
- {fileID: 4129301784502815366}
m_Father: {fileID: 7222495681480126330}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@ -1168,6 +1321,82 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8143927519873095998
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4129301784502815366}
- component: {fileID: 767415581764721060}
- component: {fileID: 1367376865315616672}
m_Layer: 5
m_Name: TmpHint1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4129301784502815366
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8143927519873095998}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 7581158890160607529}
m_Father: {fileID: 2531852660454568211}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 41.2, y: -24.3}
m_SizeDelta: {x: 100, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &767415581764721060
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8143927519873095998}
m_CullTransparentMesh: 1
--- !u!114 &1367376865315616672
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8143927519873095998}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.37330395, g: 0.78616345, b: 0.53129643, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 1d14a2250e15d9b4fbb3010b32ff861d, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 3
--- !u!1 &8745360226520175884
GameObject:
m_ObjectHideFlags: 0

8
Unity/Assets/Resources/TH1UI/GridInfo.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 055285da173622b46a993cab1d60818d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Unity/Assets/Resources/TH1UI/GridInfo/GridInfo_BG1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

114
Unity/Assets/Resources/TH1UI/GridInfo/GridInfo_BG1.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 4e2066116717a394da1eda816cb9fc7e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Unity/Assets/Resources/TH1UI/GridInfo/GridInfo_BG2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

114
Unity/Assets/Resources/TH1UI/GridInfo/GridInfo_BG2.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 1ef0e8896df75da418456f7a54cc4784
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Unity/Assets/Resources/TH1UI/GridInfo/GridInfo_BG3_Sun.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

114
Unity/Assets/Resources/TH1UI/GridInfo/GridInfo_BG3_Sun.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 1f7166b81402cf14e8fc565699eec09b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 1
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

4
Unity/Assets/Scripts/TH1_Data/MapData.cs
View File

@ -1478,7 +1478,7 @@ namespace RuntimeData
return alivePlayerCount == 0 || aliveCount <= 1;
}
public bool CheckIsPlayer(uint playerId)
public bool CheckIsRealPlayer(uint playerId)
{
if (Net.Mode == NetMode.Multi)
{
@ -1489,7 +1489,7 @@ namespace RuntimeData
return false;
}
return playerId != PlayerMap.SelfPlayerId;
return playerId == PlayerMap.SelfPlayerId;
}
public bool CheckIsAI(uint playerId)

16
Unity/Assets/Scripts/TH1_Data/PlayerData.cs
View File

@ -632,13 +632,13 @@ namespace RuntimeData
}
// 迷人的 恼人的
if (map.MapConfig.AIDiff == AIDifficult.EASY && map.CheckIsPlayer(player.Id) && map.CheckIsAI(Id))
if (map.MapConfig.AIDiff == AIDifficult.EASY && map.CheckIsRealPlayer(player.Id) && map.CheckIsAI(Id))
{
score += 15;
selfToPlayer.FeelingStrategyList.Add(FeelingStrategy.Charming);
}
if (map.MapConfig.AIDiff == AIDifficult.LUNATIC && map.CheckIsPlayer(player.Id) && map.CheckIsAI(Id))
if (map.MapConfig.AIDiff == AIDifficult.LUNATIC && map.CheckIsRealPlayer(player.Id) && map.CheckIsAI(Id))
{
score -= 15;
selfToPlayer.FeelingStrategyList.Add(FeelingStrategy.Annoying);
@ -1312,7 +1312,7 @@ namespace RuntimeData
return false;
}
public bool AddHero(GiantType giantType)
public bool AddHero(MapData map,PlayerData player,GiantType giantType)
{
var type = new UnitFullType(UnitType.Giant, giantType, 0);
//如果不是首个英雄，起步是Lv1
@ -1320,13 +1320,18 @@ namespace RuntimeData
if (HasHero(giantType)) return false;
HeroList.Add(type);
//如果Lv3或者其他意外，就不需要填加对应task了
if(HeroTaskManager.Instance.GetHeroTaskContent(type, out var task))
if (HeroTaskManager.Instance.GetHeroTaskContent(type, out var task))
{
HeroTaskDict.Add(type,task);
task.OnTaskInit(map,player);
}
return true;
}
//发生在英雄升级的时候，更新heroList，让新的英雄type替换旧的type
public bool UpdateHero(UnitFullType newType)
public bool UpdateHero(MapData map,PlayerData player,UnitFullType newType)
{
if (!HasHero(newType.GiantType)) return false;
//TODO 临时写法
@ -1343,6 +1348,7 @@ namespace RuntimeData
if(newType.UnitLevel < 3){
if (!HeroTaskManager.Instance.GetHeroTaskContent(newType, out var task)) return false;
HeroTaskDict.Add(newType,task);
task.OnTaskInit(map,player);
}
return true;
}

6
Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs
View File

@ -444,6 +444,10 @@ namespace Logic.Action
ActionLogicDict[commonActionId] = new UnitAttackAction(commonActionId);
commonActionId = new CommonActionId { ActionType = CommonActionType.UnitPassiveMove };
ActionLogicDict[commonActionId] = new UnitPassiveMoveAction(commonActionId);
commonActionId = new CommonActionId { ActionType = CommonActionType.UnitAttackAlly };
ActionLogicDict[commonActionId] = new UnitAttackAllyAction(commonActionId);
// 回合开始和结束 Action 入库
commonActionId = new CommonActionId { ActionType = CommonActionType.TurnStart };
@ -1972,7 +1976,7 @@ namespace Logic.Action
return false;
if (actionParams.MapData.Net.Mode == NetMode.Multi)
{
if (actionParams.MapData.CheckIsPlayer(actionParams.PlayerData.Id))return false;
if (actionParams.MapData.CheckIsRealPlayer(actionParams.PlayerData.Id))return false;
}
else
{

4
Unity/Assets/Scripts/TH1_Logic/Action/PlayerActionLogic.cs
View File

@ -445,7 +445,7 @@ namespace TH1_Logic.Action
{
var player = actionParams.PlayerData;
var heroD = player.PlayerHeroData;
return heroD?.AddHero(_actionId.GiantType)??false;
return heroD?.AddHero(actionParams.MapData,actionParams.PlayerData,_actionId.GiantType)??false;
}
public override bool CheckCan(CommonActionParams actionParams)
@ -483,7 +483,7 @@ namespace TH1_Logic.Action
var can = heroD.ForceFinishHeroTask(_actionId.GiantType);
if (can)
{
if (actionParams.MapData.CheckIsPlayer(actionParams.PlayerData.Id))
if (actionParams.MapData.CheckIsRealPlayer(actionParams.PlayerData.Id))
{
actionParams.PlayerData.PlayerWealth -= cost;
}

10
Unity/Assets/Scripts/TH1_Logic/HeroTask/HeroTaskContent.cs
View File

@ -105,7 +105,9 @@ namespace TH1_Logic.HeroTask
{
return _isForceFinished || Level >= TargetLevel;
}
public virtual void OnTaskInit(MapData mapData,PlayerData self) { }
public virtual void OnCoinAdd(MapData mapData, uint value)
{
@ -463,6 +465,12 @@ namespace TH1_Logic.HeroTask
return newContent;
}
public override void OnTaskInit(MapData mapData, PlayerData self)
{
var max = Mathf.CeilToInt(mapData.PlayerMap.PlayerDataList.Count / 3f);
if (TargetLevel > max) TargetLevel = (uint)max;
Level = (uint)Mathf.Max(0, self.MeetPlayers.Count - 1);
}
public override void OnMeetOtherPlayers(MapData mapData, PlayerData self)
{
var max = Mathf.CeilToInt(mapData.PlayerMap.PlayerDataList.Count / 3f);

23
Unity/Assets/Scripts/TH1_Logic/Map/MapInteraction.cs
View File

@ -116,7 +116,7 @@ namespace Logic
Timer.Instance.TimerRegister(this, () =>
{
OnTileClicked(mapData,gridData);
},Table.Instance.AnimDataAssets.MoveAnimTime,"MapInteraction_OnTileClicked_Move");
},Table.Instance.AnimDataAssets.MoveAnimTime,"MapInteraction_OnTileClicked_Attack");
}
}
@ -124,9 +124,26 @@ namespace Logic
else if (roUnit.IsAllyHighlight)
{
CancelAllHighlight();
Main.UnitLogic.AttackAlly(Main.MapData,MapRenderer.Instance.SelectUnitData, unitData);
//Main.UnitLogic.Attack(Main.MapData, MapRenderer.Instance.SelectUnitData, unitData, out _);
var attackAllyID = new CommonActionId { ActionType = CommonActionType.UnitAttackAlly };
var attackAllyAction = new UnitAttackAllyAction(attackAllyID);
var param = new CommonActionParams(Main.MapData, playerData:Main.MapData.PlayerMap.SelfPlayerData,unitData:MapRenderer.Instance.SelectUnitData, targetUnit:unitData);
param.RefreshParams();
attackAllyAction.CompleteExecute(param);
//Main.UnitLogic.AttackAlly(Main.MapData,MapRenderer.Instance.SelectUnitData, unitData);
UIManager.Instance.BottomInfoUI.UIBottomInfoStatus = false;
//攻击后判定是否连续行动
if (MapRenderer.Instance.CheckUnitHasMoveAttackTarget(MapRenderer.Instance.SelectUnitData.Id))
{
Timer.Instance.TimerRegister(this, () =>
{
OnTileClicked(mapData,gridData);
},Table.Instance.AnimDataAssets.MoveAnimTime,"MapInteraction_OnTileClicked_Ally");
}
}
//如果是选择角色
else if (!roGrid.IsSelectHighlight)

14
Unity/Assets/Scripts/TH1_Logic/Unit/UnitLogic.cs
View File

@ -213,18 +213,6 @@ namespace Logic
return canCounter;
}
public bool AttackAlly(MapData mapData, UnitData unit1, UnitData unit2)
{
//只有白名单才能使用AttackAlly
// 攻击行为切换成 Action 驱动
var actionId = new CommonActionId { ActionType = CommonActionType.UnitAttackAlly };
var attackAllyAction = new UnitAttackAllyAction(actionId);
var param = new CommonActionParams(mapData, playerData:unit1.Player(mapData), unitData:unit1, targetUnit:unit2);
param.RefreshParams();
return attackAllyAction.CompleteExecute(param);
}
public void Attack(MapData mapData, UnitData unit1, UnitData unit2, out int attackDmg,out int counterDmg,out FragmentType fragmentType)
{
attackDmg = 0;
@ -957,7 +945,7 @@ namespace Logic
{ UnitType = unit.UnitType, GiantType = unit.GiantType, UnitLevel = unit.UnitLevel + 1 };
UnitTypeTransform(map,unit,targetType);
unit.Player(map)?.PlayerHeroData.UpdateHeroMaxCount(targetType.UnitLevel);
return unit.Player(map)?.PlayerHeroData.UpdateHero(unit.UnitFullType) ?? false;
return unit.Player(map)?.PlayerHeroData.UpdateHero(map,unit.Player(map),unit.UnitFullType) ?? false;
}
//unit[uid]死亡

4
Unity/Assets/Scripts/TH1_Renderer/CityInfoRenderer.cs
View File

@ -213,10 +213,10 @@ namespace TH1_Renderer
//如果不是己方的城市，不显示
if (_cityData.Player(Main.MapData)?.Id != _mapData.PlayerMap.SelfPlayerData.Id)
{
_ROCityInfo.transform.Find("CityInfoCanvas/CityLevelBar").gameObject.SetActive(false);
_ROCityInfo?.transform.Find("CityInfoCanvas/CityLevelBar")?.gameObject.SetActive(false);
return;
}
_ROCityInfo.transform.Find("CityInfoCanvas/CityLevelBar").gameObject.SetActive(true);
_ROCityInfo?.transform.Find("CityInfoCanvas/CityLevelBar")?.gameObject.SetActive(true);
//第0part 更新基础信息,主要是cityname
RenderUpdateCityName();

5
Unity/Assets/Scripts/TH1_UI/View/Outside/MultiplayFriendRowMono.cs
View File

@ -15,7 +15,8 @@ public class MultiplayFriendRowMono : MonoBehaviour
public TextMeshProUGUI NameText;
public TextMeshProUGUI StatusText;
public Button InviteButton;
public GameObject InviteHint;
public AnimancerComponent animancer;
// Start is called before the first frame update
@ -27,6 +28,7 @@ public class MultiplayFriendRowMono : MonoBehaviour
public void SetContent(MemberInfo memberInfo ,SteamLobbyManager lobby)
{
if (!CheckParam()) return;
InviteHint.SetActive(false);
NameText.text = memberInfo.Name;
var texture = memberInfo.Texture;
if (texture != null)
@ -46,6 +48,7 @@ public class MultiplayFriendRowMono : MonoBehaviour
InviteButton.onClick.AddListener(()=>
{
lobby.InviteFriend(mid);
InviteHint.SetActive(true);
});
InviteButton.gameObject.SetActive(true);
}

604
Unity/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

226
Unity/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

4
Unity/ProjectSettings/ProjectSettings.asset
View File

@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Remilia Command
productName: TOHOTOPIA Demo v1.5.2
productName: TOHOTOPIA Demo v1.5.3
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@ -140,7 +140,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.5.2
bundleVersion: 1.5.3
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0