bug修复
This commit is contained in:
parent
4bf5f2eb1b
commit
85683b4915
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -659,7 +659,7 @@
|
||||
{
|
||||
"Type" : "Bool",
|
||||
"Key" : "Global_Enable_Obfuscation",
|
||||
"Value" : "False",
|
||||
"Value" : "True",
|
||||
"Values" : null
|
||||
}
|
||||
]
|
||||
|
||||
@ -195,7 +195,7 @@ MonoBehaviour:
|
||||
SkillName: "\u82F1\u96C4\u8FD0\u8F7D"
|
||||
- SkillType: 12
|
||||
SkillViewType: 0
|
||||
SkillName: "\u5DE1\u6D0B"
|
||||
SkillName: "\u77AD\u671B"
|
||||
SkillDesc: "\u62E5\u67092\u683C\u8DDD\u79BB\u89C6\u91CE\u3002"
|
||||
NotShow: 0
|
||||
SkillIcon: {fileID: 21300000, guid: 36cfab88013f1364b989d84ff18001f8, type: 3}
|
||||
@ -208,11 +208,23 @@ MonoBehaviour:
|
||||
UnitType: 14
|
||||
GiantType: 8
|
||||
UnitLevel: 0
|
||||
IgnoreUnitGiantType: 1
|
||||
IgnoreUnitGiantType: 0
|
||||
IgnoreUnitLevel: 1
|
||||
Icon: {fileID: 0}
|
||||
SkillDesc: "\u62E5\u67092\u683C\u8DDD\u79BB\u7684\u89C6\u91CE"
|
||||
SkillName: "\u8FF7\u9014\u7AF9\u6797\u7684\u4E3B\u4EBA"
|
||||
- UnitFullType:
|
||||
UnitType: 11
|
||||
GiantType: 0
|
||||
UnitLevel: 0
|
||||
UnitType: 11
|
||||
GiantType: 0
|
||||
UnitLevel: 0
|
||||
IgnoreUnitGiantType: 1
|
||||
IgnoreUnitLevel: 1
|
||||
Icon: {fileID: 0}
|
||||
SkillDesc: "\u62E5\u67092\u683C\u8DDD\u79BB\u7684\u89C6\u91CE"
|
||||
SkillName: "\u5DE1\u6D0B"
|
||||
- SkillType: 13
|
||||
SkillViewType: 0
|
||||
SkillName: "\u65E0\u6CD5\u5347\u7EA7"
|
||||
|
||||
@ -12,8 +12,21 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
|
||||
m_Name: VersionConfig
|
||||
m_EditorClassIdentifier:
|
||||
CurVersionId: 606
|
||||
CurVersionId: 607
|
||||
Versions:
|
||||
- MajorVersion: 0
|
||||
MinorVersion: 6
|
||||
PatchVersion: 7
|
||||
Description: "[\u6D4B\u8BD5\u7248\u672C\uFF1A0.6.7] \n\u53D1\u5E03\u65E5\u671F
|
||||
25.2.6\n\n-------- [bug\u4FEE\u590D\u4E0E\u4F18\u5316] --------\n1. \u4FEE\u590D\u516B\u5742\u795E\u5948\u5B50\u53EF\u80FD\u4F1A\u53CD\u590D\u5207\u6362\u5FA1\u67F1\u53E4\u6218\u573A\u7684bug\n2.
|
||||
\u4FEE\u590D\u5E15\u79CB\u8389\u8BFA\u857E\u59EC\u53CD\u51FB\u65F6\u4E5F\u4F1A\u83B7\u5F97\u5BF9\u65B9\u89C6\u91CE\u7684bug\n3.
|
||||
\u8C03\u6574\u4E86\u5FA1\u5C04\u5BAB\u53F8\u5927\u4EBA\u7684\u63CF\u8FF0\uFF0C\n4.
|
||||
\u4FEE\u590D\u4E86\u5FA1\u5C04\u5BAB\u53F8\u5927\u4EBALv.4\u53CA\u4EE5\u4E0A\u5408\u5E76\u65F6\u8840\u91CF\u8D85\u51FA\u751F\u547D\u4E0A\u9650\u7684bug\n5.
|
||||
\u4FEE\u590D\u4E86\u5FA1\u5C04\u5BAB\u53F8\u5927\u4EBALv.3\u53CA\u4EE5\u4E0A\u5728\u6CA1\u6709\u6D29\u77E2\u8BF9\u8BBF\u5B50\u5728\u573A\u65F6\uFF0C\u4E5F\u5177\u5907\u6B7B\u4EA1\u5206\u88C2\u80FD\u529B\u7684bug\n6.
|
||||
\u4F18\u5316\u4E86\u6C34\u8DEF\u7684\u663E\u793A\u903B\u8F91\n7. \u8054\u673A\u6389\u7EBF\u540E\uFF0C\u6301\u7EED\u7B49\u5F85\u7684bug\n8.
|
||||
\u4FEE\u590D\u4E86\u5730\u56FE\u751F\u6210\u65F6\u7ED3\u754C\u5854\u53EF\u80FD\u4E22\u5931\u7684bug\n9.
|
||||
\u4FEE\u590D\u4E86\u8FDE\u7EED\u5F00\u5C40\u53EF\u80FD\u51FA\u73B0\u521D\u59CB\u8FF7\u96FE\u663E\u793A\u9519\u8BEF\u7684bug\n10.
|
||||
\u4F18\u5316\u4E86\u8054\u673A\u9080\u8BF7\u754C\u9762\uFF0C\u73B0\u5728\u53EF\u4EE5\u5728\u6E38\u620F\u5185\u5B8C\u6210\u9080\u8BF7\u53CA\u63A5\u53D7\u9080\u8BF7\n11.\u4FEE\u590D\u4E86\u6210\u5C31\u63D0\u793A\u53CD\u590D\u51FA\u73B0\u7684bug\n12.\u4FEE\u590D\u4E86\u77AD\u671B\u6280\u80FD\u63CF\u8FF0\u9519\u8BEF\u7684bug\n13.\u4FEE\u590D\u4E86\u62E5\u6709\u65E9\u82D7\u4E58\u98CEbuff\u65F6\u4E0D\u80FD\u8FDB\u5165\u6211\u65B9\u57CE\u5E02\u4E2D\u5FC3\u7684bug\n"
|
||||
- MajorVersion: 0
|
||||
MinorVersion: 6
|
||||
PatchVersion: 6
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -195,7 +195,7 @@ MonoBehaviour:
|
||||
SkillName: 17025
|
||||
- SkillType: 12
|
||||
SkillViewType: 0
|
||||
SkillName: 2133
|
||||
SkillName: 2058
|
||||
SkillDesc: 2134
|
||||
NotShow: 0
|
||||
SkillIcon: {fileID: 21300000, guid: 36cfab88013f1364b989d84ff18001f8, type: 3}
|
||||
@ -208,11 +208,23 @@ MonoBehaviour:
|
||||
UnitType: 14
|
||||
GiantType: 8
|
||||
UnitLevel: 0
|
||||
IgnoreUnitGiantType: 1
|
||||
IgnoreUnitGiantType: 0
|
||||
IgnoreUnitLevel: 1
|
||||
Icon: {fileID: 0}
|
||||
SkillDesc: 2210
|
||||
SkillName: 17294
|
||||
- UnitFullType:
|
||||
UnitType: 11
|
||||
GiantType: 0
|
||||
UnitLevel: 0
|
||||
UnitType: 11
|
||||
GiantType: 0
|
||||
UnitLevel: 0
|
||||
IgnoreUnitGiantType: 1
|
||||
IgnoreUnitLevel: 1
|
||||
Icon: {fileID: 0}
|
||||
SkillDesc: 2210
|
||||
SkillName: 2133
|
||||
- SkillType: 13
|
||||
SkillViewType: 0
|
||||
SkillName: 2135
|
||||
|
||||
@ -12,8 +12,12 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
|
||||
m_Name: VersionConfig
|
||||
m_EditorClassIdentifier:
|
||||
CurVersionId: 606
|
||||
CurVersionId: 607
|
||||
Versions:
|
||||
- MajorVersion: 0
|
||||
MinorVersion: 6
|
||||
PatchVersion: 7
|
||||
Description: 17381
|
||||
- MajorVersion: 0
|
||||
MinorVersion: 6
|
||||
PatchVersion: 6
|
||||
|
||||
@ -63,7 +63,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -981,8 +981,8 @@ RectTransform:
|
||||
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: 177.4023, y: 36.168}
|
||||
m_SizeDelta: {x: 215.7453, y: 27.663}
|
||||
m_AnchoredPosition: {x: 123.0773, y: 36.168}
|
||||
m_SizeDelta: {x: 324.3952, y: 27.663}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3972534266086571123
|
||||
CanvasRenderer:
|
||||
@ -1039,7 +1039,7 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 23.4
|
||||
m_fontSize: 24
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
@ -2014,8 +2014,8 @@ RectTransform:
|
||||
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: -98.09996, y: 17.122677}
|
||||
m_SizeDelta: {x: 117.55, y: 25.127}
|
||||
m_AnchoredPosition: {x: 0.6478, y: 16.309}
|
||||
m_SizeDelta: {x: 315.05, y: 26.755}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &811433457070246892
|
||||
CanvasRenderer:
|
||||
@ -2072,12 +2072,12 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 22
|
||||
m_fontSize: 18
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 22
|
||||
m_fontSizeMin: 1
|
||||
m_fontSizeMax: 18
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
@ -2332,8 +2332,8 @@ RectTransform:
|
||||
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: 0.000038146973, y: -13.377325}
|
||||
m_SizeDelta: {x: 316.3408, y: 32.6177}
|
||||
m_AnchoredPosition: {x: 0.00019073, y: -10.819}
|
||||
m_SizeDelta: {x: 316.34, y: 37.734}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3359400167016552258
|
||||
CanvasRenderer:
|
||||
@ -2390,15 +2390,15 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 22
|
||||
m_fontSize: 18
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 1
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 22
|
||||
m_fontSizeMin: 1
|
||||
m_fontSizeMax: 18
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 1
|
||||
m_VerticalAlignment: 256
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
|
||||
@ -789,7 +789,7 @@ MonoBehaviour:
|
||||
Ban: 0
|
||||
NoExport: 0
|
||||
FontBan: 0
|
||||
ID: 17374
|
||||
ID: 17380
|
||||
FontID: 2
|
||||
TextCfg:
|
||||
- Type: 1
|
||||
|
||||
@ -1949,9 +1949,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Ban: 0
|
||||
Ban: 1
|
||||
NoExport: 0
|
||||
FontBan: 0
|
||||
FontBan: 1
|
||||
ID: 17373
|
||||
FontID: 0
|
||||
TextCfg: []
|
||||
|
||||
@ -1716,8 +1716,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: "\u786E\u8BA4"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_sharedMaterial: {fileID: -8836383360333263746, guid: ca3ea612c29dc5f49a32dffc195e45fe, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_sharedMaterial: {fileID: 1214840240034325189, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
|
||||
@ -705,7 +705,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u6536\u5230\u8054\u673A\u9080\u8BF7!"
|
||||
m_text: "\u6536\u5230\u8054\u673A\u9080\u8BF7"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
m_sharedMaterial: {fileID: 1214840240034325189, guid: ce4904f8ddac15944907907115531ad5, type: 2}
|
||||
@ -789,7 +789,7 @@ MonoBehaviour:
|
||||
Ban: 0
|
||||
NoExport: 0
|
||||
FontBan: 0
|
||||
ID: 17374
|
||||
ID: 17380
|
||||
FontID: 2
|
||||
TextCfg:
|
||||
- Type: 1
|
||||
|
||||
@ -202,6 +202,7 @@ MonoBehaviour:
|
||||
UnitBGBlue: {r: 0.20392157, g: 0.23529412, b: 0.45882353, a: 1}
|
||||
UnitBGRed: {r: 0.99607843, g: 0, b: 0.48235294, a: 1}
|
||||
UnitBGGreen: {r: 0, g: 0.7610062, b: 0.1462325, a: 1}
|
||||
UnitLowHealth: {r: 0.5647059, g: 0.039575133, b: 0.039575133, a: 1}
|
||||
--- !u!1 &1540669486289876344
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -162,6 +162,7 @@ namespace TH1_Core.Managers
|
||||
CheckNotCurQueue();
|
||||
//每帧开始前,检查“下一帧队列”的是否有内容,将所有内容加入当前的队列
|
||||
CheckNextFrameQueue();
|
||||
TryProcessNext();
|
||||
if (_currentTask == null) return;
|
||||
|
||||
tmp++;
|
||||
|
||||
@ -90,9 +90,10 @@ public class SkillDataAssets : ScriptableObject
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
skillDesc = MultilingualManager.Instance.GetMultilingualTextSafe(skillDesc);
|
||||
skillName = MultilingualManager.Instance.GetMultilingualTextSafe(skillName);
|
||||
if(skillDesc != "")
|
||||
skillDesc = MultilingualManager.Instance.GetMultilingualTextSafe(skillDesc);
|
||||
if(skillName != "")
|
||||
skillName = MultilingualManager.Instance.GetMultilingualTextSafe(skillName);
|
||||
|
||||
//特殊skill变量处理 (目前仅SanaeWindX \ ayamoveagainbuff
|
||||
if (skill == SkillType.SANAEWINDX)
|
||||
|
||||
@ -61,7 +61,7 @@ namespace Logic
|
||||
|
||||
//step #4 如果是player是真人玩家,发出界面通知事件
|
||||
|
||||
if (player != mapData.PlayerMap.SelfPlayerData) continue;
|
||||
if (mapData != Main.MapData || player != mapData.PlayerMap.SelfPlayerData) continue;
|
||||
var announcement = new ShowUIAnnounceMajorEvent { EventType = UIAnnounceMajorEventType.WonderStart,Param1 = (int)wonder };
|
||||
EventManager.Publish(announcement);
|
||||
|
||||
@ -93,7 +93,7 @@ namespace Logic
|
||||
|
||||
//step #3 如果是player是真人玩家,发出界面通知事件
|
||||
|
||||
if (player != mapData.PlayerMap.SelfPlayerData) continue;
|
||||
if (mapData != Main.MapData || player != mapData.PlayerMap.SelfPlayerData) continue;
|
||||
var announcement = new ShowUIAnnounceMajorEvent { EventType = UIAnnounceMajorEventType.WonderEnd, Param1 = (int)wonder };
|
||||
EventManager.Publish(announcement);
|
||||
}
|
||||
|
||||
@ -397,7 +397,18 @@ namespace TH1_Logic.Steam
|
||||
var lobbyId = LobbyManager.Instance.Lobby.GetShareableLobbyId();
|
||||
if (lobbyId == message.LobbyInfo.LobbyId) return;
|
||||
}
|
||||
LobbyManager.Instance.Lobby.JoinLobbyById(message.LobbyInfo.LobbyId);
|
||||
|
||||
|
||||
if (Main.Instance.GameLogic.GetCurState() != GameState.Menu)
|
||||
{
|
||||
EventManager.Publish(new ShowUITopInvited(){LobbyId = message.LobbyInfo.LobbyId});
|
||||
}
|
||||
else if (Main.Instance.GameLogic.GetCurState() == GameState.Menu)
|
||||
{
|
||||
EventManager.Publish(new ShowUIOutsideInvited(){LobbyId = message.LobbyInfo.LobbyId});
|
||||
//LobbyManager.Instance.Lobby.JoinLobbyById(message.LobbyInfo.LobbyId);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -858,7 +858,7 @@ namespace Logic
|
||||
{
|
||||
if (!city.Player(mapData, out var playerA)) continue;
|
||||
if (!unitData.Player(mapData, out var playerB)) continue;
|
||||
if (mapData.SameUnionOrJustBreakUnion(playerA.Id, playerB.Id)) continue;
|
||||
if (playerA.Id != playerB.Id && mapData.SameUnionOrJustBreakUnion(playerA.Id, playerB.Id)) continue;
|
||||
}
|
||||
|
||||
SanaeMap[newVec.x, newVec.y] = true;
|
||||
|
||||
@ -28,6 +28,7 @@ public class UnitMono : MonoBehaviour
|
||||
public Color UnitBGBlue;
|
||||
public Color UnitBGRed;
|
||||
public Color UnitBGGreen;
|
||||
public Color UnitLowHealth;
|
||||
|
||||
void Start()
|
||||
{
|
||||
|
||||
@ -173,7 +173,7 @@ namespace TH1_Renderer
|
||||
_unitMono.HealthText.text = _unitData.Health.ToString();
|
||||
//处理血量的颜色。如果血量<一半且<5,那么赋予红色,否则白色
|
||||
if(_unitData.Health < 5 && _unitData.Health < _unitData.GetMaxHealth() / 2)
|
||||
_unitMono.HealthText.color = Color.red;
|
||||
_unitMono.HealthText.color = _unitMono.UnitLowHealth;
|
||||
else
|
||||
_unitMono.HealthText.color = Color.white;
|
||||
|
||||
|
||||
@ -52,7 +52,6 @@ namespace TH1_UI.Controller.Bottom
|
||||
ShowBottomBarNextTurn();
|
||||
else
|
||||
HideBottomBarNextTurn();
|
||||
//OpenWithParam(new ShowUIBottomNet());
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
// 文件位置建议: Assets/Scripts/TH1_UI/Controller/UIAnnounceMajorEventController.cs
|
||||
|
||||
using RuntimeData;
|
||||
using TH1_Core.Events;
|
||||
using TH1_Logic.Core;
|
||||
using TH1_UI.Controller.Base;
|
||||
using TH1_UI.View.Bottom;
|
||||
using UnityEngine;
|
||||
@ -36,6 +38,13 @@ namespace TH1_UI.Controller.Bottom
|
||||
base.UnregisterEventCallback();
|
||||
}
|
||||
|
||||
public override void OnMatchStart()
|
||||
{
|
||||
if(Main.MapData.Net.Mode == NetMode.Multi)
|
||||
OpenWithParam(new ShowUIBottomNet());
|
||||
|
||||
}
|
||||
|
||||
protected override void OnOpen()
|
||||
{
|
||||
base.OnOpen();
|
||||
|
||||
@ -28,6 +28,7 @@ namespace TH1_UI.Core
|
||||
public void OnMatchStart()
|
||||
{
|
||||
BottomBarController.OnMatchStart();
|
||||
BottomNetController.OnMatchStart();
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -98,7 +98,8 @@ namespace UI.HintUI
|
||||
case HintDataType.SkillHintData:
|
||||
// 假设GetSkillDesc存在并且接收SkillTypeData
|
||||
Table.Instance.SkillDataAssets.GetSkillNameAndDesc_DECODE(this.SkillTypeData,UnitFullType,SkillParam,out ret2,out ret);
|
||||
ret = "<color=orange>" + ret2 +"</color> : " + ret;
|
||||
if(ret != "" && ret2 != "")
|
||||
ret = "<color=orange>" + ret2 +"</color> : " + ret;
|
||||
IsDecode = true;
|
||||
break;
|
||||
case HintDataType.ActionHintData:
|
||||
|
||||
@ -94,14 +94,14 @@ namespace TH1_UI.View.Bottom
|
||||
|
||||
private void OnTechButtonClicked()
|
||||
{
|
||||
if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return;
|
||||
//if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return;
|
||||
EventManager.Publish(new ShowUIInfoTechTree(){});
|
||||
Main.Instance.MapInteractionLogic.CancelAllHighlight();
|
||||
}
|
||||
|
||||
private void OnHeroButtonClicked()
|
||||
{
|
||||
if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return;
|
||||
//if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return;
|
||||
EventManager.Publish(new ShowUIInfoHero(){});
|
||||
}
|
||||
|
||||
|
||||
@ -185,6 +185,7 @@ namespace TH1_UI.View.Info
|
||||
ForceFinishCost.color = Color.white;
|
||||
ForceFinishButton.onClick.AddListener(() =>
|
||||
{
|
||||
if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return;
|
||||
var type = giantType;
|
||||
var actionId = new CommonActionId()
|
||||
{
|
||||
|
||||
@ -211,6 +211,7 @@ namespace TH1_UI.View.Info
|
||||
public void OnCheckChoice()
|
||||
{
|
||||
if (_choiceGiantType == GiantType.None) return;
|
||||
if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return;
|
||||
var heroData = Main.MapData.PlayerMap.SelfPlayerData.PlayerHeroData;
|
||||
|
||||
var actionId = new CommonActionId()
|
||||
|
||||
@ -101,6 +101,7 @@ namespace TH1_UI.View.Info
|
||||
|
||||
public bool OnResearch(TechType techType)
|
||||
{
|
||||
if (Main.MapData.CurPlayer != Main.MapData.PlayerMap.SelfPlayerData) return false;
|
||||
var player = Main.MapData.PlayerMap.SelfPlayerData;
|
||||
CommonActionParams param = new CommonActionParams(mapData :Main.MapData,playerData : player,mainObjectType: MainObjectType.Player);
|
||||
CommonActionId actionId = new CommonActionId(){ActionType = CommonActionType.LearnTech,TechType = techType};
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -13,7 +13,7 @@ PlayerSettings:
|
||||
useOnDemandResources: 0
|
||||
accelerometerFrequency: 60
|
||||
companyName: Remilia Command
|
||||
productName: TOHOTOPIA Demo v0.6.6
|
||||
productName: TOHOTOPIA Demo v0.6.7
|
||||
defaultCursor: {fileID: 0}
|
||||
cursorHotspot: {x: 0, y: 0}
|
||||
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
||||
@ -54,7 +54,7 @@ PlayerSettings:
|
||||
mipStripping: 0
|
||||
numberOfMipsStripped: 0
|
||||
numberOfMipsStrippedPerMipmapLimitGroup: {}
|
||||
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
|
||||
m_StackTraceTypes: 010000000100000000000000000000000100000001000000
|
||||
iosShowActivityIndicatorOnLoading: -1
|
||||
androidShowActivityIndicatorOnLoading: -1
|
||||
iosUseCustomAppBackgroundBehavior: 0
|
||||
@ -88,7 +88,7 @@ PlayerSettings:
|
||||
deferSystemGesturesMode: 0
|
||||
hideHomeButton: 0
|
||||
submitAnalytics: 1
|
||||
usePlayerLog: 1
|
||||
usePlayerLog: 0
|
||||
dedicatedServerOptimizations: 0
|
||||
bakeCollisionMeshes: 0
|
||||
forceSingleInstance: 0
|
||||
@ -140,7 +140,7 @@ PlayerSettings:
|
||||
loadStoreDebugModeEnabled: 0
|
||||
visionOSBundleVersion: 1.0
|
||||
tvOSBundleVersion: 1.0
|
||||
bundleVersion: 0.6.6
|
||||
bundleVersion: 0.6.7
|
||||
preloadedAssets: []
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
@ -447,7 +447,7 @@ PlayerSettings:
|
||||
playModeTestRunnerEnabled: 0
|
||||
runPlayModeTestAsEditModeTest: 0
|
||||
actionOnDotNetUnhandledException: 1
|
||||
enableInternalProfiler: 1
|
||||
enableInternalProfiler: 0
|
||||
logObjCUncaughtExceptions: 1
|
||||
enableCrashReportAPI: 0
|
||||
cameraUsageDescription:
|
||||
@ -702,12 +702,12 @@ PlayerSettings:
|
||||
webGLMemoryGeometricGrowthCap: 96
|
||||
webGLPowerPreference: 2
|
||||
scriptingDefineSymbols:
|
||||
Standalone: UNITY;ENABLE_VIEW;NODECANVAS;STEAMWORKS_NET;STEAM_CHANNEL;USE_INPUT
|
||||
Standalone: UNITY;ENABLE_VIEW;NODECANVAS;STEAMWORKS_NET;STEAM_CHANNEL
|
||||
additionalCompilerArguments: {}
|
||||
platformArchitecture: {}
|
||||
scriptingBackend:
|
||||
Android: 1
|
||||
Standalone: 0
|
||||
Standalone: 1
|
||||
il2cppCompilerConfiguration: {}
|
||||
il2cppCodeGeneration: {}
|
||||
managedStrippingLevel:
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff68865d630f84dbe83e4490ea2afd98a176800_003F4e_003F5e22dbaf_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb0b3ee161b9b40739da01ef24d5555a846ac00_003Fbe_003Fe9840d64_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb0b3ee161b9b40739da01ef24d5555a846ac00_003F69_003Fe65ce2a6_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnum_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5a41d6b7189842eca409fd0b1c3e3dcf17bf78_003F16_003Fe52aae14_003FEnum_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AException_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb0b3ee161b9b40739da01ef24d5555a846ac00_003F88_003Ffd97fc1e_003FException_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGameObject_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff68865d630f84dbe83e4490ea2afd98a176800_003Fc1_003Fec909946_003FGameObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGraph_002Ecs_002Fl_003AC_0021_003FUsers_003Fdaixiawu_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ffdc8af92b46e46aba104e604fd7d63d73e000_003Fd9_003Fc3581192_003FGraph_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user