diff --git a/Assets/MyGame/Scripts/fishResources/Resources/tbturretresources.json b/Assets/MyGame/Scripts/fishResources/Resources/tbturretresources.json index e331ac5e6..1f48a2c0b 100644 --- a/Assets/MyGame/Scripts/fishResources/Resources/tbturretresources.json +++ b/Assets/MyGame/Scripts/fishResources/Resources/tbturretresources.json @@ -5,6 +5,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11001", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -14,6 +15,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11002", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -23,6 +25,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11003", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -32,6 +35,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11004", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -41,6 +45,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11005", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -50,6 +55,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11006", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -59,6 +65,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11007", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -68,6 +75,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11008", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -77,6 +85,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11009", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -86,6 +95,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11010", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -95,6 +105,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11011", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -104,6 +115,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11012", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -113,6 +125,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11013", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -122,6 +135,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11014", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -131,6 +145,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11015", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -140,6 +155,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11016", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -149,6 +165,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11017", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -158,6 +175,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11018", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -167,6 +185,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11019", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -176,6 +195,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11020", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -185,6 +205,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11021", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -194,6 +215,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11022", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -203,6 +225,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11023", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -212,6 +235,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11024", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -221,6 +245,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11025", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -230,6 +255,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11026", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -239,6 +265,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11027", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -248,6 +275,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11028", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -257,6 +285,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11029", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -266,6 +295,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11030", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -275,6 +305,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11031", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -284,6 +315,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11032", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -293,6 +325,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11033", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -302,6 +335,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11034", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -311,6 +345,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11035", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -320,6 +355,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11036", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -329,6 +365,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11037", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -338,6 +375,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11038", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -347,6 +385,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11039", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -356,6 +395,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11040", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -365,6 +405,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11041", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -374,6 +415,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11042", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -383,6 +425,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11043", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -392,6 +435,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11044", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -401,6 +445,7 @@ "turretType": 1, "prefabTurretResourcesPath": "paotai11045", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -410,6 +455,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17001", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -419,6 +465,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17002", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -428,6 +475,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17003", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -437,6 +485,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17004", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -446,6 +495,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17005", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -455,6 +505,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17006", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -464,6 +515,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17007", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -473,6 +525,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17008", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -482,6 +535,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17009", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -491,6 +545,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17010", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -500,6 +555,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17011", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -509,6 +565,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17012", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -518,6 +575,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17013", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -527,6 +585,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17014", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -536,6 +595,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17015", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -545,6 +605,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17016", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -554,6 +615,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17017", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -563,6 +625,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17018", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -572,6 +635,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17019", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -581,6 +645,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17020", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -590,6 +655,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17021", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -599,6 +665,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17022", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -608,6 +675,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17023", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -617,6 +685,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17024", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -626,6 +695,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17025", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -635,6 +705,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17026", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -644,6 +715,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17027", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -653,6 +725,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17028", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -662,6 +735,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17029", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -671,6 +745,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17030", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -680,6 +755,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17031", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -689,6 +765,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17032", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -698,6 +775,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17033", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -707,6 +785,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17034", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -716,6 +795,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17035", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -725,6 +805,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17036", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -734,6 +815,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17037", "animationType": 2, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -743,6 +825,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17038", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -752,6 +835,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17039", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -761,6 +845,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17040", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -770,6 +855,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17041", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -779,6 +865,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17042", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -788,6 +875,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17043", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -797,6 +885,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17044", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -806,6 +895,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17045", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -815,6 +905,7 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17046", "animationType": 1, + "prefabType": 0, "attackAudioID": 0, "bulletID": [] }, @@ -824,6 +915,67 @@ "turretType": 3, "prefabTurretResourcesPath": "chibang17047", "animationType": 1, + "prefabType": 0, + "attackAudioID": 0, + "bulletID": [] + }, + { + "turretNumber": 13001, + "turretName": "大乔", + "turretType": 2, + "prefabTurretResourcesPath": "display_wargod_in_14053_0_dev", + "animationType": 0, + "prefabType": 1, + "attackAudioID": 0, + "bulletID": [] + }, + { + "turretNumber": 13002, + "turretName": "孙悟空", + "turretType": 2, + "prefabTurretResourcesPath": "display_wargod_14902_0_dev", + "animationType": 0, + "prefabType": 2, + "attackAudioID": 0, + "bulletID": [] + }, + { + "turretNumber": 13003, + "turretName": "杨戬", + "turretType": 2, + "prefabTurretResourcesPath": "display_wargod_14901_0_dev", + "animationType": 0, + "prefabType": 2, + "attackAudioID": 0, + "bulletID": [] + }, + { + "turretNumber": 13004, + "turretName": "熊猫侠客", + "turretType": 2, + "prefabTurretResourcesPath": "display_14080_0_DaTing", + "animationType": 0, + "prefabType": 3, + "attackAudioID": 0, + "bulletID": [] + }, + { + "turretNumber": 13005, + "turretName": "人鱼公主", + "turretType": 2, + "prefabTurretResourcesPath": "display_FishEntry_6004", + "animationType": 0, + "prefabType": 3, + "attackAudioID": 0, + "bulletID": [] + }, + { + "turretNumber": 13006, + "turretName": "核能怪兽", + "turretType": 2, + "prefabTurretResourcesPath": "display_FishEntry_4022", + "animationType": 0, + "prefabType": 3, "attackAudioID": 0, "bulletID": [] } diff --git a/Assets/MyGame/Scripts/fishResources/TurretResources.cs b/Assets/MyGame/Scripts/fishResources/TurretResources.cs index e29004800..97fe87cc5 100644 --- a/Assets/MyGame/Scripts/fishResources/TurretResources.cs +++ b/Assets/MyGame/Scripts/fishResources/TurretResources.cs @@ -14,11 +14,12 @@ public class TurretResourcesData public int turretType; // 1=普通炮台 2=战神 3=翅膀 public string prefabTurretResourcesPath; // 资源路径（prefab/spine/sprite 共用名） public int animationType; // 1=spine 2=animator 3=animation + public int prefabType; // 预制体类型（战神分类：1=国色天香 2=西游传说 3=山海奇闻；炮台/翅膀=0） public int attackAudioID; // 攻击音效 ID public List bulletID; // 子弹 ID 列表 // ---- Addressables 标签 ---- - const string turret_AALabel = "PTCB"; // 炮台统一标签 + const string turret_AALabel = "PTCBZS"; // 炮台统一标签 const string defaultSubLabel = "Default"; // 默认子标签 // ---- 路径→ID 映射（用于 Addressables 加载时反查） ---- @@ -63,14 +64,21 @@ public class TurretResourcesData foreach (var item in list) { + // 战神(turretType==2)的 prefabTurretResourcesPath 可能为空，不跳过 + // 用 turretNumber 构造默认路径，以便 Addressables 按名匹配 if (string.IsNullOrEmpty(item.prefabTurretResourcesPath)) - continue; + { + if (item.turretType == 2) + item.prefabTurretResourcesPath = item.turretNumber.ToString(); + else + continue; // 炮台/翅膀路径为空则跳过 + } turretPrefabPathDic[item.prefabTurretResourcesPath] = item.turretNumber; turretSpritePathDic[item.prefabTurretResourcesPath] = item.turretNumber; turretDataDic[item.turretNumber] = item; - Debug.Log($"[TurretResourcesData] 加载炮台: ID={item.turretNumber}, Path={item.prefabTurretResourcesPath}, Type={item.turretType}, BulletIDs=[{string.Join(",", item.bulletID)}]"); + Debug.Log($"[TurretResourcesData] 加载炮台: ID={item.turretNumber}, Path={item.prefabTurretResourcesPath}, Type={item.turretType}, PrefabType={item.prefabType}, BulletIDs=[{string.Join(",", item.bulletID)}]"); } Debug.Log($"[TurretResourcesData] 初始化完成，共 {turretDataDic.Count} 个炮台配置"); diff --git a/Assets/MyGame/aa/Game/ZhanShen.meta b/Assets/MyGame/aa/Game/ZhanShen.meta new file mode 100644 index 000000000..f9f8dfe1d --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b735663dac089e246945c2413cd23d29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon.meta new file mode 100644 index 000000000..fa6854a60 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6647e477243b8a46bcda4f13ac01b2c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14053.png b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14053.png new file mode 100644 index 000000000..e290390a3 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14053.png differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14053.png.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14053.png.meta new file mode 100644 index 000000000..3236b22a9 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14053.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: f0277d5948835d94bae3af07480375d6 +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: 0 + 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 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android + 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: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14080.png b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14080.png new file mode 100644 index 000000000..0a0f176a5 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14080.png differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14080.png.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14080.png.meta new file mode 100644 index 000000000..b989b79c9 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14080.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 7567a70f6ccea3b45b705973b24c0832 +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: 0 + 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 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android + 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: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14081.png b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14081.png new file mode 100644 index 000000000..ffa42c86f Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14081.png differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14081.png.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14081.png.meta new file mode 100644 index 000000000..22d07f449 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14081.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 16ab7a0b63cd4634da7050e12dc6b53e +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: 0 + 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 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android + 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: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14082.png b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14082.png new file mode 100644 index 000000000..16ad93ce6 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14082.png differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14082.png.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14082.png.meta new file mode 100644 index 000000000..7cc9c8ccd --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14082.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 71c9749eb6ba3fc47bb2edca35a9a31b +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: 0 + 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 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android + 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: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14901.png b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14901.png new file mode 100644 index 000000000..b6c2b6892 Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14901.png differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14901.png.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14901.png.meta new file mode 100644 index 000000000..8f38d45b3 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14901.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 11856430d23b062489300a32ed378b37 +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: 0 + 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 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android + 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: diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14902.png b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14902.png new file mode 100644 index 000000000..c3265bd5a Binary files /dev/null and b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14902.png differ diff --git a/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14902.png.meta b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14902.png.meta new file mode 100644 index 000000000..a0c67f867 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/Icon/WarGodHeadIcon_14902.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e3465109cd9a7dc4ab52c0c25127c927 +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: 0 + 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 + - serializedVersion: 3 + buildTarget: iPhone + 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: Android + 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: diff --git a/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs b/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs new file mode 100644 index 000000000..b3a3aa927 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ZhanShenTurretData : TurretData +{ + +} diff --git a/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs.meta b/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs.meta new file mode 100644 index 000000000..340ca2cad --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/ZhanShenTurretData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 99a75d94f05f865448bfb611dc53d6e0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_14080_0_DaTing.prefab b/Assets/MyGame/aa/Game/ZhanShen/display_14080_0_DaTing.prefab new file mode 100644 index 000000000..64378d3cc --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_14080_0_DaTing.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4238903441396674916 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1094537691027082, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_Name + value: display_14080_0_DaTing + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalPosition.z + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 4152655903304744, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1094537691027082, guid: e98c45660a5c3f847a79ec1c3d635c79, + type: 3} + insertIndex: -1 + addedObject: {fileID: -2281994139596073171} + m_SourcePrefab: {fileID: 100100000, guid: e98c45660a5c3f847a79ec1c3d635c79, type: 3} +--- !u!1 &4238027167845672942 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1094537691027082, guid: e98c45660a5c3f847a79ec1c3d635c79, + type: 3} + m_PrefabInstance: {fileID: 4238903441396674916} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-2281994139596073171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4238027167845672942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 7567a70f6ccea3b45b705973b24c0832, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_14080_0_DaTing.prefab.meta b/Assets/MyGame/aa/Game/ZhanShen/display_14080_0_DaTing.prefab.meta new file mode 100644 index 000000000..e603fcacd --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_14080_0_DaTing.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 02e157a8c3e5e6d4785499cf9b2e7a0a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_4022.prefab b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_4022.prefab new file mode 100644 index 000000000..7493ade96 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_4022.prefab @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6901804991175447082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1989505751322186, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_Name + value: display_FishEntry_4022 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4909963178089994, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20469676439576528, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + propertyPath: m_Depth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 20469676439576528, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 20469676439576528, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 1219447519580357060, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6939146783735237921, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1989505751322186, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + insertIndex: -1 + addedObject: {fileID: -1492799418084695941} + m_SourcePrefab: {fileID: 100100000, guid: 2ea26456af73e874b968bbb2a62eb1b1, type: 3} +--- !u!1 &6903792157242547296 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1989505751322186, guid: 2ea26456af73e874b968bbb2a62eb1b1, + type: 3} + m_PrefabInstance: {fileID: 6901804991175447082} + m_PrefabAsset: {fileID: 0} +--- !u!114 &-1492799418084695941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6903792157242547296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 71c9749eb6ba3fc47bb2edca35a9a31b, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_4022.prefab.meta b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_4022.prefab.meta new file mode 100644 index 000000000..2ca8485d3 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_4022.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: da2e91e8226e54b42abcbd38f262fc87 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab new file mode 100644 index 000000000..0a3592e02 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6159722929862992360 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1849442363226194, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_Name + value: display_FishEntry_6004 + objectReference: {fileID: 0} + - target: {fileID: 4506759048170585, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.w + value: 0.031554535 + objectReference: {fileID: 0} + - target: {fileID: 4506759048170585, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.x + value: 0.002802189 + objectReference: {fileID: 0} + - target: {fileID: 4506759048170585, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9993439 + objectReference: {fileID: 0} + - target: {fileID: 4506759048170585, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.z + value: 0.017557034 + objectReference: {fileID: 0} + - target: {fileID: 4566363896813494, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.w + value: 0.21303469 + objectReference: {fileID: 0} + - target: {fileID: 4566363896813494, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.x + value: -0.042178802 + objectReference: {fileID: 0} + - target: {fileID: 4566363896813494, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.z + value: 0.040665578 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4985115279728356, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20339676655408473, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_Depth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 20339676655408473, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_ClearFlags + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 20339676655408473, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 20339676655408473, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 2097184 + objectReference: {fileID: 0} + - target: {fileID: 20959965865241341, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_Depth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 20959965865241341, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_ClearFlags + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 20959965865241341, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 20959965865241341, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 2097184 + objectReference: {fileID: 0} + - target: {fileID: 2623819106329780147, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4107578034385559261, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4798213610893633200, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8249417237614905816, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1849442363226194, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 238999210265513417} + m_SourcePrefab: {fileID: 100100000, guid: f8f95a9643e36f247bff145737f9cc99, type: 3} +--- !u!1 &6160125291677637050 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1849442363226194, guid: f8f95a9643e36f247bff145737f9cc99, + type: 3} + m_PrefabInstance: {fileID: 6159722929862992360} + m_PrefabAsset: {fileID: 0} +--- !u!114 &238999210265513417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6160125291677637050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 16ab7a0b63cd4634da7050e12dc6b53e, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab.meta b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab.meta new file mode 100644 index 000000000..b6d7e2246 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_FishEntry_6004.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ebbe9de6affbb0d41bddae70a32bf645 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14901_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14901_0_dev.prefab new file mode 100644 index 000000000..eb5deab4d --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14901_0_dev.prefab @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1843417306324614929 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1666700369917857, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_Name + value: display_wargod_14901_0_dev + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4070965805884995, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20461949316230737, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + propertyPath: m_Depth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 20461949316230737, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 20461949316230737, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 5399881684230315999, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6005981253935536704, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1666700369917857, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7647864841298109566} + m_SourcePrefab: {fileID: 100100000, guid: ad74bb04028d4b747b8f1400d1292fea, type: 3} +--- !u!1 &1842193932855265456 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1666700369917857, guid: ad74bb04028d4b747b8f1400d1292fea, + type: 3} + m_PrefabInstance: {fileID: 1843417306324614929} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7647864841298109566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842193932855265456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: 11856430d23b062489300a32ed378b37, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14901_0_dev.prefab.meta b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14901_0_dev.prefab.meta new file mode 100644 index 000000000..19e3959cc --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14901_0_dev.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1e88268d0a91a9f4d9943be093e1fc52 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14902_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14902_0_dev.prefab new file mode 100644 index 000000000..185f368c6 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14902_0_dev.prefab @@ -0,0 +1,124 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7686389060768714667 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1246098683530898, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_Name + value: display_wargod_14902_0_dev + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4611244993778273, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20931301976795348, guid: 4f595fb5ecd11014a9cde6c29838dbe0, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 20931301976795348, guid: 4f595fb5ecd11014a9cde6c29838dbe0, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 858769851679010607, guid: 4f595fb5ecd11014a9cde6c29838dbe0, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1217708101104974081, guid: 4f595fb5ecd11014a9cde6c29838dbe0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1246098683530898, guid: 4f595fb5ecd11014a9cde6c29838dbe0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5483741640936000229} + m_SourcePrefab: {fileID: 100100000, guid: 4f595fb5ecd11014a9cde6c29838dbe0, type: 3} +--- !u!1 &7687617563910619449 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1246098683530898, guid: 4f595fb5ecd11014a9cde6c29838dbe0, + type: 3} + m_PrefabInstance: {fileID: 7686389060768714667} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5483741640936000229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7687617563910619449} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: e3465109cd9a7dc4ab52c0c25127c927, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14902_0_dev.prefab.meta b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14902_0_dev.prefab.meta new file mode 100644 index 000000000..bfd5bda98 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_14902_0_dev.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6a05c5e2a907a3b45a22c2b9d0525b03 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_wargod_in_14053_0_dev.prefab b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_in_14053_0_dev.prefab new file mode 100644 index 000000000..da5a51830 --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_in_14053_0_dev.prefab @@ -0,0 +1,154 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8640232113691143622 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1132576329915826, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_Name + value: display_wargod_in_14053_0_dev + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalPosition.z + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 4167243999726043, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20314698714499024, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_Depth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 20314698714499024, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 20314698714499024, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 2097184 + objectReference: {fileID: 0} + - target: {fileID: 2195830022923188213, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2690932200899607448, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5081013505973641316, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5502391098067338320, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_Depth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5502391098067338320, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_TargetTexture + value: + objectReference: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + - target: {fileID: 5502391098067338320, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 2097184 + objectReference: {fileID: 0} + - target: {fileID: 6262846207903513613, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + propertyPath: m_CameraType + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1132576329915826, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 876025161877615684} + m_SourcePrefab: {fileID: 100100000, guid: 23a2837da6303b941ad42b7428624ee0, type: 3} +--- !u!1 &8641355753491853428 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1132576329915826, guid: 23a2837da6303b941ad42b7428624ee0, + type: 3} + m_PrefabInstance: {fileID: 8640232113691143622} + m_PrefabAsset: {fileID: 0} +--- !u!114 &876025161877615684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8641355753491853428} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a75d94f05f865448bfb611dc53d6e0, type: 3} + m_Name: + m_EditorClassIdentifier: + turretID: + setPosData: {fileID: 0} + tra_BulletStartPosition: {fileID: 0} + bulletPrefab_Two: {fileID: 0} + bulletPrefab: {fileID: 0} + turretNumber: 0 + turretType: 1 + displayName: + quality: 1 + unlockLevel: 0 + uiIconSprite: {fileID: 21300000, guid: f0277d5948835d94bae3af07480375d6, type: 3} + description: + skeletonAnimation: {fileID: 0} + old_CurrAnimation: {fileID: 0} + new_CurrAnimation: {fileID: 0} + currTurretType: 0 + isFrenzy: 0 + idleAnim: + attackAnim: + frenzyAttackAnim: + laserStartAnim: + laserLoopAnim: + laserEndAnim: diff --git a/Assets/MyGame/aa/Game/ZhanShen/display_wargod_in_14053_0_dev.prefab.meta b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_in_14053_0_dev.prefab.meta new file mode 100644 index 000000000..c543c1a0a --- /dev/null +++ b/Assets/MyGame/aa/Game/ZhanShen/display_wargod_in_14053_0_dev.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9295687d67b05c34caee0693c3b43b9b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab index fc4300d0d..eba86bc2b 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab @@ -240,6 +240,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3033795226433496283} - {fileID: 6608661717392225914} - {fileID: 8884138591173557373} m_Father: {fileID: 3014377986955302398} @@ -362,6 +363,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &533364535715866036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8450469475156613855} + - component: {fileID: 2561065754539046268} + - component: {fileID: 6088191444293229230} + m_Layer: 0 + m_Name: suipianIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8450469475156613855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533364535715866036} + 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: 8594976880771371846} + 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: -135.99997, y: 8} + m_SizeDelta: {x: 98, y: 102} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2561065754539046268 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533364535715866036} + m_CullTransparentMesh: 1 +--- !u!114 &6088191444293229230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533364535715866036} + 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: 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_Sprite: {fileID: 21300000, guid: d64c147d56416cf47a23ee770cd35840, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &540710489664850457 GameObject: m_ObjectHideFlags: 0 @@ -373,7 +449,6 @@ GameObject: - component: {fileID: 5200676725845588678} - component: {fileID: 270468340213066278} - component: {fileID: 1259993648898294191} - - component: {fileID: 4736916395846949078} m_Layer: 0 m_Name: zslb_tab_sel_2 (1) m_TagString: Untagged @@ -421,7 +496,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + 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 @@ -438,19 +513,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4736916395846949078 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 540710489664850457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 1 --- !u!1 &601831168725106744 GameObject: m_ObjectHideFlags: 0 @@ -462,6 +524,7 @@ GameObject: - component: {fileID: 7476315228300710254} - component: {fileID: 1883757436979605396} - component: {fileID: 7254333912220549592} + - component: {fileID: 3500349491260593746} m_Layer: 0 m_Name: "\u51FA\u6218" m_TagString: Untagged @@ -527,6 +590,50 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3500349491260593746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 601831168725106744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7254333912220549592} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &841804620468310696 GameObject: m_ObjectHideFlags: 0 @@ -617,7 +724,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1017489845355663375} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -815,12 +922,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1218515187402618319} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1 m_Children: [] - m_Father: {fileID: 8904622048228621647} + m_Father: {fileID: 3014377986955302398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1388,6 +1495,160 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1673613978682675176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 660840820438317137} + - component: {fileID: 5392476387671541513} + - component: {fileID: 7898501639293415350} + m_Layer: 0 + m_Name: "\u6FC0\u6D3B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &660840820438317137 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673613978682675176} + 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: 5660189231083169567} + 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.9998779, y: -0.5000076} + m_SizeDelta: {x: 96, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5392476387671541513 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673613978682675176} + m_CullTransparentMesh: 1 +--- !u!114 &7898501639293415350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1673613978682675176} + 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: 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_Sprite: {fileID: 21300000, guid: baaed3f4b7d218e4582d7e78a49e5b6f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1674687854835964879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8594976880771371846} + - component: {fileID: 3254042493560536801} + - component: {fileID: 889209266271695218} + m_Layer: 0 + m_Name: ZhanShen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8594976880771371846 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674687854835964879} + 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: + - {fileID: 5660189231083169567} + - {fileID: 707270129544013308} + - {fileID: 8450469475156613855} + - {fileID: 5418135355586680900} + m_Father: {fileID: 8904622048228621647} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -349.6, y: 88.7} + m_SizeDelta: {x: 272, y: 64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3254042493560536801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674687854835964879} + m_CullTransparentMesh: 1 +--- !u!114 &889209266271695218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674687854835964879} + 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: 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_Sprite: {fileID: 21300000, guid: 3af3e44433242e649a193259c5d9992e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1712410358221237052 GameObject: m_ObjectHideFlags: 0 @@ -1525,7 +1786,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3033795226433496283 RectTransform: m_ObjectHideFlags: 0 @@ -1533,18 +1794,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1864077981606213642} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - {fileID: 8101133485585134974} - {fileID: 3688442675079626818} - m_Father: {fileID: 6608661717392225914} + m_Father: {fileID: 9210332093848116924} 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, y: 0} + m_AnchoredPosition: {x: 0, y: 5.8822937} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1875585248203556723 @@ -1682,81 +1943,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1898889699165670944 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7528241081679819482} - - component: {fileID: 7684840956642067288} - - component: {fileID: 8440208149094914315} - m_Layer: 0 - m_Name: godking_main_suipian_bar01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7528241081679819482 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898889699165670944} - 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: 5875023756447217137} - 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: -70, y: 14.5} - m_SizeDelta: {x: 24, y: 15} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7684840956642067288 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898889699165670944} - m_CullTransparentMesh: 1 ---- !u!114 &8440208149094914315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1898889699165670944} - 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: 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_Sprite: {fileID: 21300000, guid: b2fd876dce55e5c48a0a3ea56388789b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &1943314218486924431 GameObject: m_ObjectHideFlags: 0 @@ -2326,6 +2512,7 @@ GameObject: - component: {fileID: 3180117190922256604} - component: {fileID: 5299152245078096126} - component: {fileID: 3950903698014160349} + - component: {fileID: 1950509129847314317} m_Layer: 0 m_Name: ZhanShenToggleItem m_TagString: Untagged @@ -2347,6 +2534,8 @@ RectTransform: m_Children: - {fileID: 4522747617826601814} - {fileID: 5200676725845588678} + - {fileID: 5600724271226018111} + - {fileID: 4853748889065139255} m_Father: {fileID: 4597330182082873754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2435,11 +2624,29 @@ MonoBehaviour: m_TargetGraphic: {fileID: 5299152245078096126} toggleTransition: 1 graphic: {fileID: 8071049544391353169} - m_Group: {fileID: 0} + m_Group: {fileID: 4610732407811174023} onValueChanged: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!114 &1950509129847314317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2507835057320326489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60afa0803d461fd4cbe966c85815591b, type: 3} + m_Name: + m_EditorClassIdentifier: + displayParent: {fileID: 0} + displayImage: {fileID: 1259993648898294191} + equipMark: {fileID: 5098026976941284872} + backgroundImage: {fileID: 5299152245078096126} + lockMask: {fileID: 8315561268799001308} + lockIcon: {fileID: 5801419270595105977} --- !u!1 &2549362125998013294 GameObject: m_ObjectHideFlags: 0 @@ -2698,6 +2905,127 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &2823648215553178533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5660189231083169567} + - component: {fileID: 4262895830082184888} + - component: {fileID: 6116404051185503304} + - component: {fileID: 7507621902209972943} + m_Layer: 0 + m_Name: duihuan + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5660189231083169567 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2823648215553178533} + 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: + - {fileID: 660840820438317137} + m_Father: {fileID: 8594976880771371846} + 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: 197.00002, y: 1.5} + m_SizeDelta: {x: 208, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4262895830082184888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2823648215553178533} + m_CullTransparentMesh: 1 +--- !u!114 &6116404051185503304 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2823648215553178533} + 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: 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_Sprite: {fileID: 21300000, guid: 62ce08dbfb10bf3479ab8e046ddd36be, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7507621902209972943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2823648215553178533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6116404051185503304} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2876699612892864628 GameObject: m_ObjectHideFlags: 0 @@ -2810,82 +3138,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3070677974899650291 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2854001837873626727} - - component: {fileID: 2733790612549498792} - - component: {fileID: 1419899278003965193} - m_Layer: 0 - m_Name: 0/100 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2854001837873626727 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3070677974899650291} - 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: 5875023756447217137} - 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.49993896, y: -15} - m_SizeDelta: {x: 93, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2733790612549498792 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3070677974899650291} - m_CullTransparentMesh: 1 ---- !u!114 &1419899278003965193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3070677974899650291} - 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: 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_Sprite: {fileID: -1547419117375922036, guid: e6f2504dd8bb74149b4c090eb09a85e9, - type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &3249919185889381097 GameObject: m_ObjectHideFlags: 0 @@ -3727,7 +3979,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3033795226433496283} - {fileID: 6468921829808028564} m_Father: {fileID: 9210332093848116924} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4050,81 +4301,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3964620772659032301 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3388082999459284963} - - component: {fileID: 1880331343586275923} - - component: {fileID: 751680295180594959} - m_Layer: 0 - m_Name: godking_main_suipian_diaocan - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3388082999459284963 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3964620772659032301} - 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: 5875023756447217137} - 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: -130.99997, y: 7} - m_SizeDelta: {x: 98, y: 102} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1880331343586275923 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3964620772659032301} - m_CullTransparentMesh: 1 ---- !u!114 &751680295180594959 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3964620772659032301} - 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: 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_Sprite: {fileID: 21300000, guid: 247a2532786e3cb46ab7206de925c4e8, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &4152894443990029045 GameObject: m_ObjectHideFlags: 0 @@ -4323,6 +4499,78 @@ MonoBehaviour: m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4570271699033369379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9115496853219944017} + - component: {fileID: 6235165147965413098} + - component: {fileID: 5235215277241295077} + m_Layer: 0 + m_Name: RawImage (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9115496853219944017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4570271699033369379} + 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: 1 + m_Children: [] + m_Father: {fileID: 9060029959765500742} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -375} + m_SizeDelta: {x: 1624, y: 750} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6235165147965413098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4570271699033369379} + m_CullTransparentMesh: 1 +--- !u!114 &5235215277241295077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4570271699033369379} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 88507e399a88aa744970855b92a576a8, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4583473627782864227 GameObject: m_ObjectHideFlags: 0 @@ -4488,6 +4736,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &4678873016668059498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5938451376145234422} + - component: {fileID: 169714422829631192} + - component: {fileID: 5801419270595105977} + m_Layer: 0 + m_Name: "\u7EC4 3" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5938451376145234422 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4678873016668059498} + 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: 5600724271226018111} + 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, y: 3} + m_SizeDelta: {x: 42, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &169714422829631192 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4678873016668059498} + m_CullTransparentMesh: 1 +--- !u!114 &5801419270595105977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4678873016668059498} + 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: 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_Sprite: {fileID: 21300000, guid: cddcffc46264f2d45b33b4515be76347, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4858565427870377112 GameObject: m_ObjectHideFlags: 0 @@ -4518,6 +4841,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6613517557947517512} - {fileID: 2173153052804533598} - {fileID: 4670066188549950499} - {fileID: 7047705136109306664} @@ -4645,6 +4969,117 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5098026976941284872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4853748889065139255} + - component: {fileID: 4724078510046808967} + - component: {fileID: 3924272431780601617} + m_Layer: 0 + m_Name: "\u7EC4 3 (2)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4853748889065139255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098026976941284872} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4940191743377420618} + 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, y: 0} + m_SizeDelta: {x: 55, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4724078510046808967 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098026976941284872} + m_CullTransparentMesh: 1 +--- !u!114 &3924272431780601617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098026976941284872} + 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: 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_Sprite: {fileID: 21300000, guid: a52487c0501db6b4b8e684ded0e25eff, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5120413346506675930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6207607175928289452} + m_Layer: 0 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6207607175928289452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5120413346506675930} + 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: + - {fileID: 3618794151711633032} + m_Father: {fileID: 5418135355586680900} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5282586523906308169 GameObject: m_ObjectHideFlags: 0 @@ -5604,9 +6039,9 @@ RectTransform: - {fileID: 9060029959765500742} - {fileID: 4095128562714369029} - {fileID: 9154134057524719367} - - {fileID: 6613517557947517512} - {fileID: 7813380295314095051} - {fileID: 5965340176431784292} + - {fileID: 8594976880771371846} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5636,6 +6071,9 @@ MonoBehaviour: propIcon: {fileID: 1249392386408153250} slider: {fileID: 701210061533139629} tmp_CurrSuiPian: {fileID: 8508762177392708964} + propIcon_ZS: {fileID: 6088191444293229230} + slider_ZS: {fileID: 3864208928626851181} + tmp_CurrSuiPian_ZS: {fileID: 6629798833085714512} tMP_Type: {fileID: 322712953226584951} toggle_TurretItemPrefab: {fileID: 3268227797923973528} toggle_WingItemPrefab: {fileID: 722333950919489853} @@ -5647,6 +6085,15 @@ MonoBehaviour: tmp_DetailDesc: {fileID: 5106596463736225623} tmp_YouXiaoQi: {fileID: 6995607058854093069} tmp_TeShuXiaoGuo: {fileID: 1354953415460216505} + toggle_ZhanShenTypeItemPrefab: {fileID: 7248139781549801033} + toggle_ZhanShenTypeItemParent: {fileID: 4298644773556292445} + toggle_ZhanShenItemPrefab: {fileID: 3950903698014160349} + toggle_ZhanShenItemParent: {fileID: 4178719530711345956} + tmp_ZHanShenName: {fileID: 532869935263397484} + tmp_ZHanShenLabel: {fileID: 2829478681478899944} + btn_XuanZe: {fileID: 3500349491260593746} + obj_TurretWingPanel: {fileID: 4858565427870377112} + obj_ZhanShenPanel: {fileID: 5722782085131459815} --- !u!1 &5701770668658621809 GameObject: m_ObjectHideFlags: 0 @@ -5766,13 +6213,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 9115496853219944017} - {fileID: 1337685106899237372} - {fileID: 7476315228300710254} - {fileID: 7418674246669330514} - {fileID: 7816399856328448821} - {fileID: 4597330182082873754} - {fileID: 6264088540415891893} - - {fileID: 5875023756447217137} m_Father: {fileID: 8904622048228621647} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5801,7 +6248,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6040,6 +6487,81 @@ MonoBehaviour: backgroundImage: {fileID: 6808965624897124765} lockMask: {fileID: 4346863250512304841} lockIcon: {fileID: 6079589398242300009} +--- !u!1 &6011039108782705321 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1117908757504561631} + - component: {fileID: 89696427502015712} + - component: {fileID: 7030485772882341131} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1117908757504561631 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6011039108782705321} + 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: 5418135355586680900} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &89696427502015712 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6011039108782705321} + m_CullTransparentMesh: 1 +--- !u!114 &7030485772882341131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6011039108782705321} + 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: 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + 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: 1 --- !u!1 &6042141600090879528 GameObject: m_ObjectHideFlags: 0 @@ -7055,85 +7577,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6846743450441747792 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5875023756447217137} - - component: {fileID: 5322380586446871063} - - component: {fileID: 2681301663759705858} - m_Layer: 0 - m_Name: godking_main_suipianl_bottom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5875023756447217137 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6846743450441747792} - 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: - - {fileID: 7528241081679819482} - - {fileID: 3388082999459284963} - - {fileID: 2854001837873626727} - - {fileID: 5764753659681075493} - m_Father: {fileID: 9060029959765500742} - 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: 460.99997, y: -284} - m_SizeDelta: {x: 272, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5322380586446871063 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6846743450441747792} - m_CullTransparentMesh: 1 ---- !u!114 &2681301663759705858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6846743450441747792} - 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: 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_Sprite: {fileID: 21300000, guid: 92fab40701139894eaca6175ec26393a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &6872650493034725227 GameObject: m_ObjectHideFlags: 0 @@ -7269,6 +7712,95 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6884459550921642404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5418135355586680900} + - component: {fileID: 3864208928626851181} + m_Layer: 0 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5418135355586680900 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6884459550921642404} + 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: + - {fileID: 1117908757504561631} + - {fileID: 6207607175928289452} + m_Father: {fileID: 8594976880771371846} + 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, y: 13.3} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3864208928626851181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6884459550921642404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 3618794151711633032} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &6986166306660916975 GameObject: m_ObjectHideFlags: 0 @@ -7356,7 +7888,7 @@ GameObject: - component: {fileID: 8907184129529078447} - component: {fileID: 2227984601529772168} m_Layer: 0 - m_Name: godking_main_suipianl_bottom + m_Name: PaoTaiChiBang m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7978,7 +8510,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 567238962629829935} toggleTransition: 1 graphic: {fileID: 0} - m_Group: {fileID: 0} + m_Group: {fileID: 6883282413956243244} onValueChanged: m_PersistentCalls: m_Calls: @@ -7994,7 +8526,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_IsOn: 1 + m_IsOn: 0 --- !u!1 &7710471300114985558 GameObject: m_ObjectHideFlags: 0 @@ -8295,6 +8827,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8001734406839140849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3618794151711633032} + - component: {fileID: 2975244630015875435} + - component: {fileID: 5576059270870691671} + m_Layer: 0 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3618794151711633032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8001734406839140849} + 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: 6207607175928289452} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2975244630015875435 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8001734406839140849} + m_CullTransparentMesh: 1 +--- !u!114 &5576059270870691671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8001734406839140849} + 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: 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_Sprite: {fileID: 21300000, guid: d07be727b115869468b56c0e7ab5c91f, 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: 1 --- !u!1 &8056862126588271078 GameObject: m_ObjectHideFlags: 0 @@ -8673,6 +9280,82 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &8315561268799001308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5600724271226018111} + - component: {fileID: 4179702885598967823} + - component: {fileID: 2440679418395533786} + m_Layer: 0 + m_Name: huise (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5600724271226018111 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315561268799001308} + 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: + - {fileID: 5938451376145234422} + m_Father: {fileID: 4940191743377420618} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000030517578, y: -0.000015258789} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4179702885598967823 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315561268799001308} + m_CullTransparentMesh: 1 +--- !u!114 &2440679418395533786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8315561268799001308} + 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, g: 0, b: 0, a: 0.53333336} + 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: e063459a010a442409b6e28e5fb91701, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 1 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8354578169569212041 GameObject: m_ObjectHideFlags: 0 @@ -8808,82 +9491,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8400514759072564391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5764753659681075493} - - component: {fileID: 5104220626016564892} - - component: {fileID: 6918526452544813915} - m_Layer: 0 - m_Name: activity_monthgift_btn_left01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5764753659681075493 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8400514759072564391} - 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: - - {fileID: 3951838481417141451} - m_Father: {fileID: 5875023756447217137} - 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: 202, y: 0.5} - m_SizeDelta: {x: 208, y: 81} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5104220626016564892 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8400514759072564391} - m_CullTransparentMesh: 1 ---- !u!114 &6918526452544813915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8400514759072564391} - 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: 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_Sprite: {fileID: 21300000, guid: 172f2496a6e917c49a73cc437c0520c7, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &8460253746075820893 GameObject: m_ObjectHideFlags: 0 @@ -8960,7 +9567,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7600647021588325299 RectTransform: m_ObjectHideFlags: 0 @@ -9019,6 +9626,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8518911857650823346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 707270129544013308} + - component: {fileID: 4880709989369253189} + - component: {fileID: 6629798833085714512} + m_Layer: 0 + m_Name: 0/100 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &707270129544013308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8518911857650823346} + 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: 8594976880771371846} + 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: -5.4999924, y: -14} + m_SizeDelta: {x: 93, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4880709989369253189 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8518911857650823346} + m_CullTransparentMesh: 1 +--- !u!114 &6629798833085714512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8518911857650823346} + 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: 0/100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} + m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + 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: 36.42 + m_fontSizeBase: 36.42 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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: 0 + 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, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8585913216082132517 GameObject: m_ObjectHideFlags: 0 @@ -9052,7 +9794,7 @@ RectTransform: m_Father: {fileID: 4426108099970246621} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -9835,81 +10577,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &9044069563812098275 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3951838481417141451} - - component: {fileID: 6058509685208736316} - - component: {fileID: 2305612631765051753} - m_Layer: 0 - m_Name: "\u6FC0\u6D3B" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3951838481417141451 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9044069563812098275} - 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: 5764753659681075493} - 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.99993896, y: -0.5} - m_SizeDelta: {x: 96, y: 48} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6058509685208736316 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9044069563812098275} - m_CullTransparentMesh: 1 ---- !u!114 &2305612631765051753 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9044069563812098275} - 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: 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_Sprite: {fileID: 21300000, guid: 138c9930a1b202c458de269992ef8d37, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &9129768282352035808 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs index 4a89c379d..1069f3ae6 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs @@ -33,9 +33,14 @@ public class UIHome_BY_ItemListPanels : SubUIBase [Header("操作按钮")] public Button btn_Get; //装备按钮 public Button btn_DuiHuan; //兑换按钮 + [Header("道具兑换炮台翅膀")] public Image propIcon; public Slider slider; //当前碎片数量/兑换所需数量 public TextMeshProUGUI tmp_CurrSuiPian;//这里写{当前碎片数量}/{兑换所需数量} + [Header("道具兑换战神")] + public Image propIcon_ZS; + public Slider slider_ZS; //当前碎片数量/兑换所需数量 + public TextMeshProUGUI tmp_CurrSuiPian_ZS;//这里写{当前碎片数量}/{兑换所需数量} [Header("筛选下拉框")] public TMP_Dropdown tMP_Type; @@ -53,6 +58,17 @@ public class UIHome_BY_ItemListPanels : SubUIBase public TextMeshProUGUI tmp_DetailDesc; //炮台描述 public TextMeshProUGUI tmp_YouXiaoQi; //有效期 public TextMeshProUGUI tmp_TeShuXiaoGuo; //特殊效果 + [Header("战神")] + public Toggle toggle_ZhanShenTypeItemPrefab; + public Transform toggle_ZhanShenTypeItemParent; + public Toggle toggle_ZhanShenItemPrefab; + public Transform toggle_ZhanShenItemParent; + public TextMeshProUGUI tmp_ZHanShenName; + public TextMeshProUGUI tmp_ZHanShenLabel; + public Button btn_XuanZe; + [Header("面板")] + public GameObject obj_TurretWingPanel; + public GameObject obj_ZhanShenPanel; // ---- 运行时数据 ---- private ItemPanelSelect _currentSelectType = ItemPanelSelect.None; @@ -72,6 +88,28 @@ public class UIHome_BY_ItemListPanels : SubUIBase /// Toggle → TurretResourcesData 映射 private Dictionary _toggleDataMap = new Dictionary(); + // ---- 战神运行时数据 ---- + /// 当前选中的战神类型（按 quality 分组） + private int _selectedZhanShenType = -1; + + /// 当前选中的战神编号 + private int _selectedZhanShenNumber = -1; + + /// 战神类型 Toggle 实例 + private List _instantiatedZSTypeToggles = new List(); + + /// 战神道具 Toggle 实例 + private List _instantiatedZSItemToggles = new List(); + + /// 战神类型 Toggle → quality 映射 + private Dictionary _zsTypeToggleMap = new Dictionary(); + + /// 战神道具 Toggle → TurretResourcesData 映射 + private Dictionary _zsItemToggleMap = new Dictionary(); + + /// 战神兑换 UI 的父节点 + private GameObject _duiHuanParent_ZS; + // ==================== 生命周期 ==================== public void Start() @@ -83,11 +121,20 @@ public class UIHome_BY_ItemListPanels : SubUIBase btn_Get.onClick.AddListener(OnClickGet); btn_DuiHuan.onClick.AddListener(OnClickDuiHuan); + if (btn_XuanZe != null) + btn_XuanZe.onClick.AddListener(OnClickXuanZe); + if (tMP_Type != null) tMP_Type.onValueChanged.AddListener(OnDropdownChanged); if (toggle_TurretItemPrefab != null) toggle_TurretItemPrefab.gameObject.SetActive(false); + if (toggle_WingItemPrefab != null) + toggle_WingItemPrefab.gameObject.SetActive(false); + if (toggle_ZhanShenTypeItemPrefab != null) + toggle_ZhanShenTypeItemPrefab.gameObject.SetActive(false); + if (toggle_ZhanShenItemPrefab != null) + toggle_ZhanShenItemPrefab.gameObject.SetActive(false); // 面板启动默认加载炮台列表 UpdateSelectType(ItemPanelSelect.Turrect); @@ -129,6 +176,16 @@ public class UIHome_BY_ItemListPanels : SubUIBase RefreshDropdownOptions(itemPanel); UpdateScrollViewVisibility(itemPanel); + // 战神面板：独立的二级列表（类型 + 道具），不走 RebuildItemList + if (itemPanel == ItemPanelSelect.ZS) + { + // 默认选中已装备的战神编号 + var equipped = GetUserEquipped(); + _selectedZhanShenNumber = (equipped != null && int.TryParse(equipped.number, out int n)) ? n : -1; + RebuildZhanShenTypeList(); + return; + } + // 切换到翅膀时，默认选中已装备的翅膀；无装备则先清空，列表会自动选第一个 if (itemPanel == ItemPanelSelect.Wing) { @@ -150,6 +207,16 @@ public class UIHome_BY_ItemListPanels : SubUIBase /// private void UpdateScrollViewVisibility(ItemPanelSelect selected) { + bool isZS = selected == ItemPanelSelect.ZS; + + // 切换主面板：战神有独立面板，炮台/翅膀共用一个面板 + if (obj_TurretWingPanel != null) + obj_TurretWingPanel.SetActive(!isZS); + if (obj_ZhanShenPanel != null) + obj_ZhanShenPanel.SetActive(isZS); + + if (isZS) return; // 战神面板有自己的列表，不需要显示炮台/翅膀的 Scroll View + bool showWing = selected == ItemPanelSelect.Wing; bool showTurret = !showWing; // 炮台和战神共用 turret 的列表 @@ -375,6 +442,269 @@ public class UIHome_BY_ItemListPanels : SubUIBase _toggleDataMap.Clear(); } + // ==================== 战神列表（二级列表：类型 + 道具） ==================== + + /// prefabType → 中文名（战神分类：1=国色天香 2=西游传说 3=山海奇闻） + private static string PrefabTypeName(int prefabType) + { + return prefabType switch { 1 => "国色天香", 2 => "西游传说", 3 => "山海奇闻", _ => "未知" }; + } + + /// 从数据表读取战神的 prefabType + private static int GetItemPrefabType(int turretNumber) + { + var data = TurretResourcesData.GetTurretData(turretNumber); + return data != null ? data.prefabType : 0; + } + + /// 重建战神类型列表（按 prefabType 分组：国色天香/西游传说/山海奇闻） + private void RebuildZhanShenTypeList() + { + ClearZhanShenTypeList(); + ClearZhanShenItemList(); + ClearPreview(); + + var allItems = TurretResourcesData.GetTurretDataByType(2); // 2=战神 + allItems = FilterUnsoldItems(allItems); + + // 按 prefabType 分组 + var typeGroups = new Dictionary>(); + foreach (var item in allItems) + { + int pt = item.prefabType; + if (!typeGroups.ContainsKey(pt)) + typeGroups[pt] = new List(); + typeGroups[pt].Add(item); + } + + var sortedTypes = new List(typeGroups.Keys); + sortedTypes.Sort(); + + if (sortedTypes.Count == 0) + { + if (tmp_ZHanShenName != null) tmp_ZHanShenName.text = ""; + if (tmp_ZHanShenLabel != null) tmp_ZHanShenLabel.text = ""; + RefreshDuiHuanUI_ZS(-1); + return; + } + + // 查找已装备战神所在类型 + int equippedType = -1; + if (_selectedZhanShenNumber > 0) + equippedType = GetItemPrefabType(_selectedZhanShenNumber); + + Toggle lastTypeToggle = null; + foreach (var pt in sortedTypes) + { + var toggleGo = Instantiate(toggle_ZhanShenTypeItemPrefab.gameObject, toggle_ZhanShenTypeItemParent); + toggleGo.SetActive(true); + var toggle = toggleGo.GetComponent(); + + // 设置类型名称 + var tmp = toggleGo.GetComponentInChildren(); + if (tmp != null) + + tmp.text = PrefabTypeName(pt); + tmp = toggleGo.transform.GetChild(1).GetChild(0).GetComponent(); + if (tmp != null) + + tmp.text = PrefabTypeName(pt); + + + int prefabTypeVal = pt; + toggle.onValueChanged.AddListener((isOn) => + { + if (isOn) RebuildZhanShenItemList(prefabTypeVal); + }); + + if (pt == equippedType) + lastTypeToggle = toggle; + + _zsTypeToggleMap[toggle] = pt; + _instantiatedZSTypeToggles.Add(toggle); + } + + // 选中已装备类型，否则选第一个 + if (lastTypeToggle != null) + lastTypeToggle.isOn = true; + else if (_instantiatedZSTypeToggles.Count > 0) + _instantiatedZSTypeToggles[0].isOn = true; + } + + /// 重建战神道具列表（指定 prefabType 下） + private void RebuildZhanShenItemList(int prefabType) + { + _selectedZhanShenType = prefabType; + ClearZhanShenItemList(); + ClearPreview(); + + var allItems = TurretResourcesData.GetTurretDataByType(2); + allItems = FilterUnsoldItems(allItems); + + // 筛选指定 prefabType + var filtered = allItems.FindAll(d => d.prefabType == prefabType); + + // 排序：已拥有在前 + filtered.Sort((a, b) => + { + bool aOwned = IsItemOwned(a.turretNumber); + bool bOwned = IsItemOwned(b.turretNumber); + if (aOwned && !bOwned) return -1; + if (!aOwned && bOwned) return 1; + return a.turretNumber.CompareTo(b.turretNumber); + }); + + if (filtered.Count == 0) + { + if (tmp_ZHanShenName != null) tmp_ZHanShenName.text = ""; + if (tmp_ZHanShenLabel != null) tmp_ZHanShenLabel.text = ""; + RefreshDuiHuanUI_ZS(-1); + return; + } + + Toggle lastItemToggle = null; + foreach (var resData in filtered) + { + var toggleGo = Instantiate(toggle_ZhanShenItemPrefab.gameObject, toggle_ZhanShenItemParent); + toggleGo.SetActive(true); + var toggle = toggleGo.GetComponent(); + var toggleDisplay = toggleGo.GetComponent(); + + // 设置图标（和炮台一样从 TurretData.uiIconSprite 获取） + if (toggleDisplay != null && resData != null) + { + GameObject turretPrefab = TurretResourcesData.GetTurretPrefab(resData.turretNumber); + if (turretPrefab != null) + { + TurretData turretData = turretPrefab.GetComponent(); + if (turretData != null && turretData.uiIconSprite != null) + toggleDisplay.SetSprite(turretData.uiIconSprite); + } + + bool isOwned = IsItemOwned(resData.turretNumber); + bool isEquipped = IsItemEquipped(resData.turretNumber); + toggleDisplay.SetLockState(!isOwned); + toggleDisplay.SetEquipped(isEquipped); + } + + int turretNumber = resData.turretNumber; + toggle.onValueChanged.AddListener((isOn) => + { + if (isOn) OnZhanShenItemSelected(turretNumber); + }); + + if (turretNumber == _selectedZhanShenNumber) + lastItemToggle = toggle; + + _zsItemToggleMap[toggle] = resData; + _instantiatedZSItemToggles.Add(toggle); + } + + // 恢复选中 + if (lastItemToggle != null) + lastItemToggle.isOn = true; + else if (_instantiatedZSItemToggles.Count > 0) + _instantiatedZSItemToggles[0].isOn = true; + } + + private void ClearZhanShenTypeList() + { + foreach (var toggle in _instantiatedZSTypeToggles) + { + if (toggle != null) + Destroy(toggle.gameObject); + } + _instantiatedZSTypeToggles.Clear(); + _zsTypeToggleMap.Clear(); + } + + private void ClearZhanShenItemList() + { + foreach (var toggle in _instantiatedZSItemToggles) + { + if (toggle != null) + Destroy(toggle.gameObject); + } + _instantiatedZSItemToggles.Clear(); + _zsItemToggleMap.Clear(); + } + + // ==================== 战神选中 / 详情 ==================== + + private void OnZhanShenItemSelected(int turretNumber) + { + _selectedZhanShenNumber = turretNumber; + _selectedTurretNumber = turretNumber; // 同步给 OnClickGet/OnClickDuiHuan 使用 + RefreshZhanShenDetail(turretNumber); + } + + /// 刷新战神详情：名字、标签、预览、兑换 UI（和翅膀一样用相机照出来） + private void RefreshZhanShenDetail(int turretNumber) + { + ClearPreview(); + + var resData = turretNumber > 0 ? TurretResourcesData.GetTurretData(turretNumber) : null; + GameObject prefab = resData != null ? TurretResourcesData.GetTurretPrefab(resData.turretNumber) : null; + TurretData turretData = prefab != null ? prefab.GetComponent() : null; + + // ---- 名字 ---- + string name = resData?.turretName ?? ""; + if (turretData != null && !string.IsNullOrEmpty(turretData.displayName)) + name = turretData.displayName; + if (tmp_ZHanShenName != null) + tmp_ZHanShenName.text = name; + + // ---- 标签（分类 + 描述）---- + string label = ""; + if (resData != null && resData.prefabType > 0) + label = $"分类: {PrefabTypeName(resData.prefabType)}"; + if (turretData != null && !string.IsNullOrEmpty(turretData.description)) + label += (string.IsNullOrEmpty(label) ? "" : " | ") + turretData.description; + if (tmp_ZHanShenLabel != null) + tmp_ZHanShenLabel.text = label; + + // ---- 兑换 UI ---- + RefreshDuiHuanUI_ZS(turretNumber); + + // ---- 选择按钮：已拥有才可点击装备 ---- + bool isOwned = turretNumber > 0 && IsItemOwned(turretNumber); + if (btn_XuanZe != null) + btn_XuanZe.interactable = isOwned; + + // ---- 缩略图（和翅膀一样显示 RawImage）---- + if (rawImg_DetailPreview != null) + rawImg_DetailPreview.gameObject.SetActive(true); + + // ---- 预览（和翅膀一样实例化预制体到预览区）---- + if (resData != null && previewParent != null && prefab != null) + { + _currentPreviewObj = Instantiate(prefab, previewParent); + _currentPreviewObj.SetActive(true); + } + } + + // ==================== 战神选择按钮 ==================== + + /// 选择按钮：装备选中的战神 + private void OnClickXuanZe() + { + if (_selectedZhanShenNumber < 0) + { + Debug.Log("[UIHome_BY_ItemListPanels] 未选中任何战神"); + return; + } + + bool isOwned = IsItemOwned(_selectedZhanShenNumber); + if (isOwned) + { + EquipTurret(_selectedZhanShenNumber); + } + else + { + Debug.Log($"[UIHome_BY_ItemListPanels] 未拥有战神 #{_selectedZhanShenNumber}，需先兑换"); + } + } + // ==================== GameManager 用户数据关联 ==================== /// 检查玩家是否拥有指定炮台/翅膀/战神。 @@ -628,7 +958,11 @@ public class UIHome_BY_ItemListPanels : SubUIBase } } - RebuildItemList(); + // 战神走独立的二级列表重建 + if (_currentSelectType == ItemPanelSelect.ZS) + RebuildZhanShenTypeList(); + else + RebuildItemList(); }); } @@ -657,6 +991,8 @@ public class UIHome_BY_ItemListPanels : SubUIBase if (select != ItemPanelSelect.None && select != _currentSelectType) UpdateSelectType(select); + else if (_currentSelectType == ItemPanelSelect.ZS) + RebuildZhanShenTypeList(); else RebuildItemList(); } @@ -720,6 +1056,54 @@ public class UIHome_BY_ItemListPanels : SubUIBase btn_DuiHuan.interactable = info.ownedCount >= info.config.fragmentCount; } + /// 刷新战神兑换相关的 UI：碎片图标、进度条、文本（使用 propIcon_ZS / slider_ZS / tmp_CurrSuiPian_ZS） + private void RefreshDuiHuanUI_ZS(int turretNumber) + { + // 战神兑换 UI 父节点：以 propIcon_ZS 的父对象为准 + if (_duiHuanParent_ZS == null && propIcon_ZS != null) + _duiHuanParent_ZS = propIcon_ZS.transform.parent.gameObject; + + if (turretNumber <= 0) + { + if (_duiHuanParent_ZS != null) _duiHuanParent_ZS.SetActive(false); + return; + } + + bool isOwned = IsItemOwned(turretNumber); + var info = isOwned ? (null, 0) : GetFragmentInfo(turretNumber); + bool hasFragment = info.config != null; + + // 统一控制战神兑换 UI 父节点的显隐 + if (_duiHuanParent_ZS != null) + _duiHuanParent_ZS.SetActive(hasFragment); + + if (!hasFragment) return; + + // 设置图标（异步加载网络图片） + if (propIcon_ZS != null) + info.config.GetSprite(sprite => propIcon_ZS.sprite = sprite); + + // 进度条 + if (slider_ZS != null) + { + slider_ZS.maxValue = info.config.fragmentCount; + slider_ZS.value = Mathf.Min(info.ownedCount, info.config.fragmentCount); + slider_ZS.interactable = false; // 只读 + } + + // 文本："当前数量/所需数量" + if (tmp_CurrSuiPian_ZS != null) + { + bool canExchange = info.ownedCount >= info.config.fragmentCount; + string color = canExchange ? "green" : "red"; + tmp_CurrSuiPian_ZS.text = $"{info.ownedCount}/{info.config.fragmentCount}"; + } + + // 战神没有独立兑换按钮，复用 btn_DuiHuan（若在面板外则同样可用） + if (btn_DuiHuan != null) + btn_DuiHuan.interactable = info.ownedCount >= info.config.fragmentCount; + } + /// 根据道具编号查找碎片配置和拥有的碎片数量。 private (PropFragmentConfig config, int ownedCount) GetFragmentInfo(int turretNumber) { @@ -784,6 +1168,8 @@ public class UIHome_BY_ItemListPanels : SubUIBase private void OnDestroy() { ClearItemList(); + ClearZhanShenItemList(); + ClearZhanShenTypeList(); ClearPreview(); OnItemSelectedCallback = null; } diff --git a/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta b/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta index b4af7adb4..43a25c220 100644 --- a/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta +++ b/Assets/UIResources/Home/炮台/godking_main_suipian_bar01.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 8, y: 0, z: 8, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -106,6 +106,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -113,7 +126,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: []