From d7fa9eba856480f53984ea335514276ce01a5445 Mon Sep 17 00:00:00 2001 From: kawagiri Date: Wed, 27 Aug 2025 21:23:44 +0800 Subject: [PATCH] =?UTF-8?q?prefab=E5=AF=BC=E5=87=BA=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tools/Multilingual.xlsx | Bin 128369 -> 128376 bytes Tools/MultilingualTxt.txt | 4 +- .../Prefab/UI/Info/UIInfoDiplomacy.prefab | 3 +- Unity/Assets/Scenes/SampleScene.unity | 188 +----------------- .../Scripts/TH1_Logic/Action/ActionLogic.cs | 5 +- .../TH1_UI/View/Info/UIInfoDiplomacyView.cs | 7 +- 6 files changed, 11 insertions(+), 196 deletions(-) diff --git a/Tools/Multilingual.xlsx b/Tools/Multilingual.xlsx index 33d5e8f8f9348e0ed08d708cd6edbc8f4bb11f9f..b618319fd3186b56e713db3addafa1eae79ba867 100644 GIT binary patch delta 15450 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 O3>w^OeFAi+>|ynogJ diff --git a/Tools/MultilingualTxt.txt b/Tools/MultilingualTxt.txt index 71a443425..c9bd71881 100644 --- a/Tools/MultilingualTxt.txt +++ b/Tools/MultilingualTxt.txt @@ -312,7 +312,7 @@ T:打开/关闭科技树 发布日期 25.8.8 [新增内容] 1. -[修复bug]%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1462%$#@!我只想知道打赢之后去哪里领钱。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1463%$#@![Demo V1.0.71]%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1464%$#@!Demo V1.0.71%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1465%$#@!Demo V1.0.7%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1466%$#@!Demo V1.0.6%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1467%$#@!Demo V1.0.5%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1468%$#@!Demo V1.0.0%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1469%$#@!Demo V1.1.0 +[修复bug]%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1462%$#@!我只想知道打赢之后去哪里领钱。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1463%$#@![Demo V1.0.71]%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1464%$#@!Demo V1.0.71%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1465%$#@!Demo V1.0.7%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1466%$#@!Demo V1.0.6%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1467%$#@!Demo V1.0.5%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1468%$#@!Demo V1.0.0%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1469%$#@!Demo V1.1.0 发布日期 25.8.8 [新增内容] 1.[新增]科技点:每回合获得科技点,科技点将被优先消耗 @@ -548,4 +548,4 @@ Lv.5升级要求:160英雄经验。各属性全面提升,新增技能绯红 18.再次修复了AI空城拱手让人的bug 19.修复了军营无法生产英雄的bug%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1606%$#@!完成任务即可获得奇观{param}。保持5回合不主动攻击,从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1607%$#@!完成任务即可获得奇观{param}。研发所有基础科技(不包括伟人职阶科技),从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1608%$#@!完成任务即可获得奇观{param}。拥有5座与首都联通的城市,从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1609%$#@!完成任务即可获得奇观{param}。在回合结束时拥有超过100枚金币,从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1610%$#@!完成任务即可获得奇观{param}。击杀10名敌人,从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1611%$#@!完成任务即可获得奇观{param}。拥有一座6级及以上的城市,从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1612%$#@!完成任务即可获得奇观{param}。拥有地图全部四个角落的视野,从而获得该奇观!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1613%$#@!您已获得了奇观{param}!在平原或者浅海地区建造您的奇观吧!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1614%$#@!您已获得了奇观:{param}!在平原或者浅海地区建造您的奇观吧!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1615%$#@!{param}-{param}的领袖{param}向您和您的伟大文明致以诚挚的问候。您获得了{money}金币的一次性贸易奖励。%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1616%$#@!昔日辉煌如朝阳初升,今朝却随风尘湮没。{param}未能经受时光的考验,终究湮没于历史长河的涛声之中。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1617%$#@!{param}-{param}的领袖{param}向您和您的伟大文明致以诚挚的问候。您获得了{param}金币的一次性贸易奖励。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1618%$#@!CID=11 PID=11 CIV=0 PW=20 PST=Attack CST=Attack -Tech = {climb,strategy,}%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1619%$#@!回复生命!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1620%$#@!这里是具体的提示内容这里是具体的提示内容这里是具体的提示内容这里是具体的提示内容%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1621%$#@!可在设置关闭提示%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1622%$#@!DebugText%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1623%$#@!测试新版UI系统%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1624%$#@!城市{param}已升级!%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1625%$#@!{param}帝国%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1626%$#@!{param}%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1627%$#@!{param}帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1628%$#@!外交面板%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1629%$#@!战争%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1630%$#@!{param}帝国对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1631%$#@!结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1632%$#@!{param}帝国与其他玩家的关系%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1633%$#@!{param}对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1634%$#@!斯卡雷特帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1635%$#@!蓬莱山帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1636%$#@!德意志%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1637%$#@!守矢帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1638%$#@!印度%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1639%$#@!古明地帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1640%$#@!挪威%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1641%$#@!博丽帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1642%$#@!英格兰%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1643%$#@!命莲帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1644%$#@!波斯%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1645%$#@!丰聪耳帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1646%$#@!拜占庭%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1647%$#@!日白帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1648%$#@!咲夜的建议:攻防兼备,最高性价比的基础单位。当没有别的选择的时候,就训练她们吧!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1649%$#@!26 + 4%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1650%$#@![Demo V1.2.1]%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1651%$#@!Demo V1.2.1%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1652%$#@!Demo V1.2.0%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1653%$#@!Demo V1.1.1%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1654%$#@!Demo V1.1.0%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1655%$#@!城市开罗已升级!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1656%$#@!蓬莱山帝国对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1657%$#@!对方尚未结识您%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1658%$#@!中立%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1659%$#@!未结识%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1660%$#@!盟友%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1661%$#@!背盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1662%$#@!欣赏%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1663%$#@!认可%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1664%$#@!警惕%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1665%$#@!猜忌%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1666%$#@!敌视%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1667%$#@!渔产%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1668%$#@!咲夜的建议:拥有鱼群的浅海是前期获得城市经验的绝佳来源,别犹豫,快来捕鱼吧!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1669%$#@!1000 + 3%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1670%$#@!德意志-守矢帝国的领袖八坂神奈子向您和您的伟大文明致以诚挚的问候。您获得了3金币的一次性贸易奖励。%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1671%$#@!守矢帝国对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1672%$#@!对方还未结识您%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1673%$#@!斯卡雷特帝国拒绝了结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1674%$#@!拒绝%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1675%$#@!解除结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1676%$#@!结盟申请已发送%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1677%$#@!向对方发起结盟请求。需要防御科技。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1678%$#@!建立大使馆后,获得对方首都一格内视野,每回合双方获得2金币收益。盟友则收益翻倍。双方进入战争则大使馆自动撤销。需要大使馆科技。%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1679%$#@!接受结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1680%$#@!接受结盟后,双方正式成为结盟关系。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1681%$#@!拒绝结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1682%$#@!拒绝结盟后,双方不会成为结盟关系。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1683%$#@!发起解除结盟,对方领土上的所有我方单位强制解散。我方所有单位强制跳过本回合。在对方的下一回合结束后,双方将正式解除结盟关系。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1684%$#@!可以建造大使馆。大使馆将提供额外的金币收入。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1685%$#@!可以建造市场。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1686%$#@!明智的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1687%$#@!您与她们持有相同的外交关系%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1688%$#@!迷人的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1689%$#@!不知道为什么她们就是很喜欢您(难度特性)%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1690%$#@!和平的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1691%$#@!近期您没有攻击过她们%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1692%$#@!外交的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1693%$#@!您在她们的国家建立了大使馆%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1694%$#@!强大的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1695%$#@!在她们的视野内,您拥有更多的军事力量%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1696%$#@!勇敢的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1697%$#@!您正在与场上最强的势力作战%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1698%$#@!暴力的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1699%$#@!近期您攻击过她们%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1700%$#@!有威胁的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1701%$#@!您的军事单位处于她们的领土或边境上%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1702%$#@!烦人的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1703%$#@!不知道为什么她们就是不喜欢您(难度特性)%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1704%$#@!愚蠢的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1705%$#@!您对其他国家的外交策略与她们的很不一致%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1706%$#@!警惕的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1707%$#@!您与她们有领土相邻%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1708%$#@!主宰的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1709%$#@!您似乎最有可能获得游戏胜利%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1710%$#@!您对其他国家的外交策略与她们相近%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1711%$#@!未结识玩家的领土%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1712%$#@!{param}(您)%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1713%$#@!建立大使馆后,获得对方首都一格内视野,每回合双方获得2金币收益。盟友则收益翻倍。双方进入战争则大使馆自动撤销。无法在丢失原始首都的帝国内建立大使馆。需要大使馆科技。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1714%$#@!大使馆已建立%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1715%$#@!在她们的视野内,您拥有更强的军事力量%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1716%$#@!弱小的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1717%$#@!在她们的视野内,您拥有更弱的军事力量%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1718%$#@!请等待{param}行动...%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1719%$#@!建立大使馆后,获得对方首都一格内视野,每回合双方获得2金币收益,盟友则收益翻倍。
双方进入战争则大使馆自动撤销。
无法在丢失原始首都的帝国内建立大使馆。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1720%$#@!{param}向您提议结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1721%$#@!{param}接受了您的结盟提议%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1722%$#@!{param}拒绝了您的结盟提议%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1723%$#@!{param}解除了与您的结盟关系%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1724%$#@!您在{param}首都的大使馆已建成%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1725%$#@!{param}在您首都的大使馆已建成%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1726%$#@!您在{param}首都的大使馆已撤销%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1727%$#@!{param}在您首都的大使馆已撤销%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$% \ No newline at end of file +Tech = {climb,strategy,}%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1619%$#@!回复生命!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1620%$#@!这里是具体的提示内容这里是具体的提示内容这里是具体的提示内容这里是具体的提示内容%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1621%$#@!可在设置关闭提示%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1622%$#@!DebugText%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1623%$#@!测试新版UI系统%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1624%$#@!城市{param}已升级!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1625%$#@!{param}帝国%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1626%$#@!{param}%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1627%$#@!{param}帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1628%$#@!外交面板%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1629%$#@!战争%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1630%$#@!{param}帝国对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1631%$#@!结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1632%$#@!{param}帝国与其他玩家的关系%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1633%$#@!{param}对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1634%$#@!斯卡雷特帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1635%$#@!蓬莱山帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1636%$#@!德意志%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1637%$#@!守矢帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1638%$#@!印度%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1639%$#@!古明地帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1640%$#@!挪威%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1641%$#@!博丽帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1642%$#@!英格兰%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1643%$#@!命莲帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1644%$#@!波斯%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1645%$#@!丰聪耳帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1646%$#@!拜占庭%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1647%$#@!日白帝国%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1648%$#@!咲夜的建议:攻防兼备,最高性价比的基础单位。当没有别的选择的时候,就训练她们吧!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1649%$#@!26 + 4%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1650%$#@![Demo V1.2.1]%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1651%$#@!Demo V1.2.1%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1652%$#@!Demo V1.2.0%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1653%$#@!Demo V1.1.1%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1654%$#@!Demo V1.1.0%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1655%$#@!城市开罗已升级!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1656%$#@!蓬莱山帝国对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1657%$#@!对方尚未结识您%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1658%$#@!中立%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1659%$#@!未结识%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1660%$#@!盟友%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1661%$#@!背盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1662%$#@!欣赏%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1663%$#@!认可%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1664%$#@!警惕%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1665%$#@!猜忌%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1666%$#@!敌视%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1667%$#@!渔产%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1668%$#@!咲夜的建议:拥有鱼群的浅海是前期获得城市经验的绝佳来源,别犹豫,快来捕鱼吧!%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1669%$#@!1000 + 3%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1670%$#@!德意志-守矢帝国的领袖八坂神奈子向您和您的伟大文明致以诚挚的问候。您获得了3金币的一次性贸易奖励。%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1671%$#@!守矢帝国对您的态度%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1672%$#@!对方还未结识您%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1673%$#@!斯卡雷特帝国拒绝了结盟%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1674%$#@!拒绝%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1675%$#@!解除结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1676%$#@!结盟申请已发送%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1677%$#@!向对方发起结盟请求。需要防御科技。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1678%$#@!建立大使馆后,获得对方首都一格内视野,每回合双方获得2金币收益。盟友则收益翻倍。双方进入战争则大使馆自动撤销。需要大使馆科技。%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1679%$#@!接受结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1680%$#@!接受结盟后,双方正式成为结盟关系。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1681%$#@!拒绝结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1682%$#@!拒绝结盟后,双方不会成为结盟关系。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1683%$#@!发起解除结盟,对方领土上的所有我方单位强制解散。我方所有单位强制跳过本回合。在对方的下一回合结束后,双方将正式解除结盟关系。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1684%$#@!可以建造大使馆。大使馆将提供额外的金币收入。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1685%$#@!可以建造市场。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1686%$#@!明智的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1687%$#@!您与她们持有相同的外交关系%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1688%$#@!迷人的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1689%$#@!不知道为什么她们就是很喜欢您(难度特性)%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1690%$#@!和平的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1691%$#@!近期您没有攻击过她们%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1692%$#@!外交的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1693%$#@!您在她们的国家建立了大使馆%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1694%$#@!强大的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1695%$#@!在她们的视野内,您拥有更多的军事力量%$#@!%$#@!%$#@!%$#@!%$#@!0!@#$%1696%$#@!勇敢的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1697%$#@!您正在与场上最强的势力作战%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1698%$#@!暴力的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1699%$#@!近期您攻击过她们%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1700%$#@!有威胁的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1701%$#@!您的军事单位处于她们的领土或边境上%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1702%$#@!烦人的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1703%$#@!不知道为什么她们就是不喜欢您(难度特性)%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1704%$#@!愚蠢的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1705%$#@!您对其他国家的外交策略与她们的很不一致%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1706%$#@!警惕的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1707%$#@!您与她们有领土相邻%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1708%$#@!主宰的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1709%$#@!您似乎最有可能获得游戏胜利%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1710%$#@!您对其他国家的外交策略与她们相近%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1711%$#@!未结识玩家的领土%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1712%$#@!{param}(您)%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1713%$#@!建立大使馆后,获得对方首都一格内视野,每回合双方获得2金币收益。盟友则收益翻倍。双方进入战争则大使馆自动撤销。无法在丢失原始首都的帝国内建立大使馆。需要大使馆科技。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1714%$#@!大使馆已建立%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1715%$#@!在她们的视野内,您拥有更强的军事力量%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1716%$#@!弱小的%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1717%$#@!在她们的视野内,您拥有更弱的军事力量%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1718%$#@!请等待{param}行动...%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1719%$#@!建立大使馆后,获得对方首都一格内视野,每回合双方获得2金币收益,盟友则收益翻倍。
双方进入战争则大使馆自动撤销。
无法在丢失原始首都的帝国内建立大使馆。%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1720%$#@!{param}向您提议结盟%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1721%$#@!{param}接受了您的结盟提议%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1722%$#@!{param}拒绝了您的结盟提议%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1723%$#@!{param}解除了与您的结盟关系%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1724%$#@!您在{param}首都的大使馆已建成%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1725%$#@!{param}在您首都的大使馆已建成%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1726%$#@!您在{param}首都的大使馆已撤销%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$%1727%$#@!{param}在您首都的大使馆已撤销%$#@!%$#@!%$#@!%$#@!%$#@!1!@#$% \ No newline at end of file diff --git a/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab b/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab index 04c4c0931..1026f47df 100644 --- a/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab +++ b/Unity/Assets/Resources/Prefab/UI/Info/UIInfoDiplomacy.prefab @@ -1717,10 +1717,11 @@ MonoBehaviour: DiplomacyBaseInfo: {fileID: 2346096541604194801} ActionArea: {fileID: 1602262009084493556} NoMeetText: {fileID: 6623925848885411558} + RelationSubArea: {fileID: 6719303612942898519} RelationText: {fileID: 8165877537025501972} RelationBar: {fileID: 7325536663217747} RelationHandle: {fileID: 87178625905760550} - RelationHintText: {fileID: 0} + RelationHintText: {fileID: 6390497550116288730} BubbleChat: {fileID: 6047651367882887697} BubbleChatText: {fileID: 2617465551149939853} ActionList: diff --git a/Unity/Assets/Scenes/SampleScene.unity b/Unity/Assets/Scenes/SampleScene.unity index ce98f3372..91c0c7507 100644 --- a/Unity/Assets/Scenes/SampleScene.unity +++ b/Unity/Assets/Scenes/SampleScene.unity @@ -15994,9 +15994,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} insertIndex: -1 addedObject: {fileID: 122265654} - - targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - insertIndex: -1 - addedObject: {fileID: 1718239607} m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} --- !u!224 &122265652 stripped RectTransform: @@ -20812,39 +20809,6 @@ MonoBehaviour: WordSpacing: 0 LineSpacing: -30 ParagraphSpacing: 0 ---- !u!1 &160159227 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - m_PrefabInstance: {fileID: 1244394151} - m_PrefabAsset: {fileID: 0} ---- !u!114 &160159231 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 160159227} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} - m_Name: - m_EditorClassIdentifier: - Ban: 0 - ID: 111 - FontID: 3 - TextCfg: - - Type: 0 - FontSize: 95 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 - - Type: 1 - FontSize: 72 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 --- !u!1 &160676531 GameObject: m_ObjectHideFlags: 0 @@ -22047,39 +22011,6 @@ RectTransform: m_AnchoredPosition: {x: 2, y: -13} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &172089344 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - m_PrefabInstance: {fileID: 4136842294473716466} - m_PrefabAsset: {fileID: 0} ---- !u!114 &172089348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 172089344} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} - m_Name: - m_EditorClassIdentifier: - Ban: 0 - ID: 110 - FontID: 3 - TextCfg: - - Type: 0 - FontSize: 95 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 - - Type: 1 - FontSize: 72 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 --- !u!1 &177691647 GameObject: m_ObjectHideFlags: 0 @@ -67459,39 +67390,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 506755352} m_CullTransparentMesh: 1 ---- !u!1 &507880768 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - m_PrefabInstance: {fileID: 1467393258} - m_PrefabAsset: {fileID: 0} ---- !u!114 &507880772 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 507880768} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} - m_Name: - m_EditorClassIdentifier: - Ban: 0 - ID: 113 - FontID: 3 - TextCfg: - - Type: 0 - FontSize: 95 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 - - Type: 1 - FontSize: 72 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 --- !u!1 &509066659 GameObject: m_ObjectHideFlags: 0 @@ -153273,7 +153171,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1082107953 RectTransform: m_ObjectHideFlags: 0 @@ -176191,9 +176089,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} insertIndex: -1 addedObject: {fileID: 1244394154} - - targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - insertIndex: -1 - addedObject: {fileID: 160159231} m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} --- !u!224 &1244394152 stripped RectTransform: @@ -205804,9 +205699,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} insertIndex: -1 addedObject: {fileID: 1467393261} - - targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - insertIndex: -1 - addedObject: {fileID: 507880772} m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} --- !u!224 &1467393259 stripped RectTransform: @@ -234690,45 +234582,6 @@ MonoBehaviour: WordSpacing: 0 LineSpacing: 0 ParagraphSpacing: 0 ---- !u!1 &1672324880 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - m_PrefabInstance: {fileID: 1677662079} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1672324884 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1672324880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} - m_Name: - m_EditorClassIdentifier: - Ban: 0 - ID: 114 - FontID: 3 - TextCfg: - - Type: 0 - FontSize: 95 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 - - Type: 2 - FontSize: 60 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 - - Type: 1 - FontSize: 72 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 --- !u!1 &1676258169 GameObject: m_ObjectHideFlags: 0 @@ -235337,9 +235190,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} insertIndex: -1 addedObject: {fileID: 1677662082} - - targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - insertIndex: -1 - addedObject: {fileID: 1672324884} m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} --- !u!224 &1677662080 stripped RectTransform: @@ -240340,39 +240190,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1718144292} m_CullTransparentMesh: 1 ---- !u!1 &1718239603 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - m_PrefabInstance: {fileID: 122265651} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1718239607 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1718239603} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} - m_Name: - m_EditorClassIdentifier: - Ban: 0 - ID: 112 - FontID: 3 - TextCfg: - - Type: 0 - FontSize: 95 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 - - Type: 1 - FontSize: 72 - CharacterSpacing: 10 - WordSpacing: 0 - LineSpacing: 0 - ParagraphSpacing: 0 --- !u!1 &1718867970 GameObject: m_ObjectHideFlags: 0 @@ -300584,9 +300401,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7763630946422454447, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} insertIndex: -1 addedObject: {fileID: 1695505477} - - targetCorrespondingSourceObject: {fileID: 1314771010785267260, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} - insertIndex: -1 - addedObject: {fileID: 172089348} m_SourcePrefab: {fileID: 100100000, guid: ed4eb8742157dca4aa5c80a5430333c5, type: 3} --- !u!114 &5522046704728294241 MonoBehaviour: diff --git a/Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs b/Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs index ec984674d..abc16ba04 100644 --- a/Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs +++ b/Unity/Assets/Scripts/TH1_Logic/Action/ActionLogic.cs @@ -814,9 +814,9 @@ namespace Logic.Action // 完整的执行调用, 供外部使用 public virtual bool CompleteExecute(CommonActionParams actionParams, bool isMoment) { - Execute(actionParams, isMoment); + var ret = Execute(actionParams, isMoment); AfterExecute(actionParams, isMoment); - return false; + return ret; } // 实际的执行逻辑 @@ -1024,6 +1024,7 @@ namespace Logic.Action //消除水果 actionParams.GridData.Resource = ResourceType.None; actionParams.GridData.RenderMark = true; + return true; } diff --git a/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs b/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs index 3a94b04e9..e32254b8d 100644 --- a/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs +++ b/Unity/Assets/Scripts/TH1_UI/View/Info/UIInfoDiplomacyView.cs @@ -28,6 +28,7 @@ namespace TH1_UI.View.Info public TextMeshProUGUI NoMeetText; + public GameObject RelationSubArea; public TextMeshProUGUI RelationText; public GameObject RelationBar; public RectTransform RelationHandle; @@ -89,16 +90,14 @@ namespace TH1_UI.View.Info if (dipInfo.DiplomacyState == DiplomacyState.NoDiplomacy) { NoMeetText.gameObject.SetActive(true); - RelationBar.SetActive(false); - RelationText.gameObject.SetActive(false); + RelationSubArea.SetActive(false); } //如果对方已经发现了我们 else { NoMeetText.gameObject.SetActive(false); - RelationText.gameObject.SetActive(true); - RelationBar.SetActive(true); + RelationSubArea.SetActive(true); MultilingualManager.Instance.SetUIText(RelationText,feelingInfo.feelingText); RelationText.color = feelingInfo.feelingColor; RelationHandle.anchoredPosition = new Vector2(Mathf.Lerp(-330f, -30f, dipInfo.FeelingValue/100f),RelationHandle.anchoredPosition.y);