diff --git a/.gitignore b/.gitignore index be3d3eb..ee07a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -78,5 +78,8 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* -/[Aa]ssets/Cainos/* -/[Aa]ssets/Cainos.meta + +/UI参考 + +/DisplayItemInfoForm_Summary.md +/UI_Design_Summary.md diff --git a/Assets/GameMain/DataTables/Aircraft.txt b/Assets/GameMain/DataTables/Aircraft.txt deleted file mode 100644 index ed7d40e..0000000 Binary files a/Assets/GameMain/DataTables/Aircraft.txt and /dev/null differ diff --git a/Assets/GameMain/DataTables/Armor.txt b/Assets/GameMain/DataTables/Armor.txt deleted file mode 100644 index 9445c35..0000000 Binary files a/Assets/GameMain/DataTables/Armor.txt and /dev/null differ diff --git a/Assets/GameMain/DataTables/Armor.txt.meta b/Assets/GameMain/DataTables/Armor.txt.meta deleted file mode 100644 index 80dc167..0000000 --- a/Assets/GameMain/DataTables/Armor.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2cebe04343227945bab3729ca9a3493 -timeCreated: 1528026123 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/DataTables/Asteroid.txt b/Assets/GameMain/DataTables/Asteroid.txt deleted file mode 100644 index c6c5498..0000000 Binary files a/Assets/GameMain/DataTables/Asteroid.txt and /dev/null differ diff --git a/Assets/GameMain/DataTables/Asteroid.txt.meta b/Assets/GameMain/DataTables/Asteroid.txt.meta deleted file mode 100644 index 173053c..0000000 --- a/Assets/GameMain/DataTables/Asteroid.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad56aae2bb0f2ce4a86711287e14e223 -timeCreated: 1528026123 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/DataTables/Goods.txt b/Assets/GameMain/DataTables/Goods.txt index 8ba24eb..3d5237b 100644 --- a/Assets/GameMain/DataTables/Goods.txt +++ b/Assets/GameMain/DataTables/Goods.txt @@ -1,9 +1,9 @@ -# 商品表 -# Id GoodsType MinPrice MaxPrice GoodsTypeId -# int GoodsType int int int -# 商品编号 策划备注 商品类型 最低价格 最高价格 商品对应物品Id - 101 道具：药 Prop 100 200 101 - 102 小刀 Weapon 120 150 201 - 103 Prop 200 230 102 - 104 Prop 210 250 103 - 105 Prop 80 100 104 +# 商品表 +# Id GoodsType GoodsTypeId +# int GoodsType int +# 商品编号 策划备注 商品类型 商品对应物品Id + 101 道具：药 Prop 101 + 102 小刀 Weapon 201 + 103 Prop 102 + 104 Prop 103 + 105 Prop 104 diff --git a/Assets/GameMain/DataTables/LevelUpReward.txt b/Assets/GameMain/DataTables/LevelUpReward.txt new file mode 100644 index 0000000..b2eb50e --- /dev/null +++ b/Assets/GameMain/DataTables/LevelUpReward.txt @@ -0,0 +1,8 @@ +# 道具表 +# Id Title IconAssetName Modifiers +# int string string StatModifier[] +# 奖励编号 策划备注 奖励名 图标资源名 道具属性 + 101 测试道具 肌肉 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] + 102 牙齿 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] + 103 脑 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] + 104 鼻子 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] diff --git a/Assets/GameMain/DataTables/Aircraft.txt.meta b/Assets/GameMain/DataTables/LevelUpReward.txt.meta similarity index 54% rename from Assets/GameMain/DataTables/Aircraft.txt.meta rename to Assets/GameMain/DataTables/LevelUpReward.txt.meta index db3b221..0e4e546 100644 --- a/Assets/GameMain/DataTables/Aircraft.txt.meta +++ b/Assets/GameMain/DataTables/LevelUpReward.txt.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 64f3bb52c6a54854688fcc656af2b1c9 -timeCreated: 1528026123 -licenseType: Pro +guid: e8def20f1612e8844b8f0dda497fa5ba TextScriptImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GameMain/DataTables/Prop.txt b/Assets/GameMain/DataTables/Prop.txt index 75d4ad7..028dce3 100644 --- a/Assets/GameMain/DataTables/Prop.txt +++ b/Assets/GameMain/DataTables/Prop.txt @@ -1,8 +1,24 @@ -# 道具表 -# Id Title IconAssetName Modifiers -# int string string StatModifier[] -# 道具编号 策划备注 道具名 图标资源名 道具属性 - 101 测试道具 药 Almighty_Icon [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] - 102 小药 Almighty_Icon [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] - 103 中药 Almighty_Icon [{"StatType":"Critical","Value":20,"IsPercent":false},{"StatType":"Defense","Value":1,"IsPercent":false}] - 104 大药 Almighty_Icon [{"StatType":"Attack","Value":2,"IsPercent":false},{"StatType":"AttackSpeed","Value":0.1,"IsPercent":true}] +# 道具表 +# Id Title IconAssetName Rarity Price PriceRandomPercent Modifiers +# int string string RarityType int float StatModifier[] +# 道具编号 策划备注 道具名 图标资源名 道具品质 道具价格 价格浮动 道具属性 + 101 道具_1 Almighty_Icon White 119 0.0500000007450581 [{"StatType":"Attack","Value":10,"IsPercent":false},{"StatType":"Defense","Value":12,"IsPercent":false}] + 102 道具_2 Almighty_Icon Green 225 0.0799999982118607 [{"StatType":"MaxHealth","Value":53,"IsPercent":false},{"StatType":"AttackSpeed","Value":0.09,"IsPercent":true},{"StatType":"Attack","Value":11,"IsPercent":false}] + 103 道具_3 Almighty_Icon Blue 329 0.100000001490116 [{"StatType":"Critical","Value":15,"IsPercent":false},{"StatType":"CriticalDamage","Value":21,"IsPercent":false},{"StatType":"Defense","Value":23,"IsPercent":false}] + 104 道具_4 Almighty_Icon Red 423 0.119999997317791 [{"StatType":"Defense","Value":79,"IsPercent":false}] + 105 道具_5 Almighty_Icon White 120 0.0500000007450581 [{"StatType":"MovementSpeed","Value":0.8,"IsPercent":false},{"StatType":"Attack","Value":10,"IsPercent":false}] + 106 道具_6 Almighty_Icon Green 195 0.0799999982118607 [{"StatType":"Dodge","Value":10,"IsPercent":false},{"StatType":"Attack","Value":12,"IsPercent":false},{"StatType":"MaxHealth","Value":44,"IsPercent":false}] + 107 道具_7 Almighty_Icon Blue 335 0.100000001490116 [{"StatType":"Defense","Value":62,"IsPercent":false}] + 108 道具_8 Almighty_Icon Red 433 0.119999997317791 [{"StatType":"Attack","Value":44,"IsPercent":false},{"StatType":"Dodge","Value":27,"IsPercent":false}] + 109 道具_9 Almighty_Icon White 121 0.0500000007450581 [{"StatType":"MaxHealth","Value":32,"IsPercent":false},{"StatType":"Attack","Value":7,"IsPercent":false},{"StatType":"Defense","Value":8,"IsPercent":false}] + 110 道具_10 Almighty_Icon Green 198 0.0799999982118607 [{"StatType":"AttackSpeed","Value":0.19,"IsPercent":true}] + 111 道具_11 Almighty_Icon Blue 341 0.100000001490116 [{"StatType":"Attack","Value":57,"IsPercent":false}] + 112 道具_12 Almighty_Icon Red 443 0.119999997317791 [{"StatType":"MaxHealth","Value":139,"IsPercent":false},{"StatType":"Critical","Value":27,"IsPercent":false}] + 113 道具_13 Almighty_Icon White 122 0.0500000007450581 [{"StatType":"Critical","Value":5,"IsPercent":false},{"StatType":"Dodge","Value":7,"IsPercent":false},{"StatType":"MovementSpeed","Value":0.6,"IsPercent":false}] + 114 道具_14 Almighty_Icon Green 201 0.0799999982118607 [{"StatType":"Defense","Value":38,"IsPercent":false}] + 115 道具_15 Almighty_Icon Blue 346 0.100000001490116 [{"StatType":"MovementSpeed","Value":1.6,"IsPercent":false},{"StatType":"Defense","Value":32,"IsPercent":false}] + 116 道具_16 Almighty_Icon Red 454 0.119999997317791 [{"StatType":"Dodge","Value":28,"IsPercent":false},{"StatType":"Defense","Value":24,"IsPercent":false},{"StatType":"Attack","Value":24,"IsPercent":false}] + 117 道具_17 Almighty_Icon White 124 0.0500000007450581 [{"StatType":"Defense","Value":23,"IsPercent":false}] + 118 道具_18 Almighty_Icon Green 204 0.0799999982118607 [{"StatType":"Attack","Value":17,"IsPercent":false},{"StatType":"MaxHealth","Value":69,"IsPercent":false}] + 119 道具_19 Almighty_Icon Blue 352 0.100000001490116 [{"StatType":"MaxHealth","Value":74,"IsPercent":false},{"StatType":"Attack","Value":19,"IsPercent":false},{"StatType":"Dodge","Value":20,"IsPercent":false}] + 120 道具_20 Almighty_Icon Red 464 0.119999997317791 [{"StatType":"AttackSpeed","Value":0.15,"IsPercent":true},{"StatType":"Attack","Value":29,"IsPercent":false},{"StatType":"Defense","Value":27,"IsPercent":false}] diff --git a/Assets/GameMain/DataTables/Role.txt b/Assets/GameMain/DataTables/Role.txt index c412a60..beceb9a 100644 --- a/Assets/GameMain/DataTables/Role.txt +++ b/Assets/GameMain/DataTables/Role.txt @@ -2,5 +2,5 @@ # Id RoleName IconAssetName MaxHp Speed Coin WeaponCapacity InitialProperty InitialItem Lv0 Lv1 Lv2 Lv3 Lv4 Lv5 Lv6 Lv7 Lv8 Lv9 Lv10 Lv11 Lv12 Lv13 Lv14 Lv15 Lv16 Lv17 Lv18 Lv19 Lv20 Lv21 Lv22 Lv23 Lv24 Lv25 Lv26 Lv27 Lv28 Lv29 Lv30 Lv31 Lv32 Lv33 Lv34 Lv35 Lv36 Lv37 Lv38 Lv39 Lv40 Lv41 Lv42 Lv43 Lv44 Lv45 Lv46 Lv47 Lv48 Lv49 Lv50 Lv51 Lv52 Lv53 Lv54 Lv55 Lv56 Lv57 Lv58 Lv59 Lv60 # int string string int float int int Modifier[] Item[] 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 # 角色编号 策划备注 角色名称 图标资源名 初始最大生命 初始速度 初始金币 最大持有武器数 初始额外属性 初始额外物品 每级升级所需经验 - 101 全能者 全能者 Almighty_Icon 100 4 10 6 [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] [] 100 110 121 133 146 161 177 195 214 236 259 285 314 345 380 418 459 505 556 612 673 740 814 895 985 1083 1192 1311 1442 1586 1745 1919 2111 2323 2555 2810 3091 3400 3740 4114 4526 4979 5476 6024 6626 7289 8018 8820 9702 10672 11739 12913 14204 15625 17187 18906 20797 22876 25164 27680 30448 - 102 老人 老人 Old_Man_Icon 200 3 5 6 [] [] 100 112 125 140 157 176 197 221 248 277 311 348 390 436 489 547 613 687 769 861 965 1080 1210 1355 1518 1700 1904 2132 2388 2675 2996 3356 3758 4209 4714 5280 5914 6623 7418 8308 9305 10422 11672 13073 14642 16399 18367 20571 23039 25804 28900 32368 36252 40603 45475 50932 57044 63889 71556 80143 89760 + 101 全能者 全能者 Almighty_Icon 100 6 10 6 [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] [] 100 110 121 133 146 161 177 195 214 236 259 285 314 345 380 418 459 505 556 612 673 740 814 895 985 1083 1192 1311 1442 1586 1745 1919 2111 2323 2555 2810 3091 3400 3740 4114 4526 4979 5476 6024 6626 7289 8018 8820 9702 10672 11739 12913 14204 15625 17187 18906 20797 22876 25164 27680 30448 + 102 老人 老人 Old_Man_Icon 200 4 5 6 [] [] 100 112 125 140 157 176 197 221 248 277 311 348 390 436 489 547 613 687 769 861 965 1080 1210 1355 1518 1700 1904 2132 2388 2675 2996 3356 3758 4209 4714 5280 5914 6623 7418 8308 9305 10422 11672 13073 14642 16399 18367 20571 23039 25804 28900 32368 36252 40603 45475 50932 57044 63889 71556 80143 89760 diff --git a/Assets/GameMain/DataTables/Thruster.txt b/Assets/GameMain/DataTables/Thruster.txt deleted file mode 100644 index 02a7be0..0000000 Binary files a/Assets/GameMain/DataTables/Thruster.txt and /dev/null differ diff --git a/Assets/GameMain/DataTables/Thruster.txt.meta b/Assets/GameMain/DataTables/Thruster.txt.meta deleted file mode 100644 index 0dca55f..0000000 --- a/Assets/GameMain/DataTables/Thruster.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c3961f379234354e813d7b38146424d -timeCreated: 1528026124 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/DataTables/UIForm.txt b/Assets/GameMain/DataTables/UIForm.txt index d7a16ce..fb145ef 100644 --- a/Assets/GameMain/DataTables/UIForm.txt +++ b/Assets/GameMain/DataTables/UIForm.txt @@ -9,4 +9,6 @@ 200 开始菜单 StartMenuForm Default False True 201 角色选择页 SelectRoleForm Default False True 202 游戏商店页 ShopForm Default False True - 203 游戏HUD HudForm Default False True + 203 游戏HUD HudForm HUD False True + 204 角色升级奖励页 LevelUpForm Default False True + 205 物品信息展示 DisplayItemInfoForm Default False False diff --git a/Assets/GameMain/DataTables/Weapon.txt b/Assets/GameMain/DataTables/Weapon.txt index 3260465..8e6d608 100644 --- a/Assets/GameMain/DataTables/Weapon.txt +++ b/Assets/GameMain/DataTables/Weapon.txt @@ -1,6 +1,6 @@ -# 武器表 -# Id Title IconAssetName Attack Cooldown AttackRange AttackSoundId Pramas Modifiers -# int string string int float float int string[] StatModifier[] -# 武器编号 策划备注 武器名 图标资源名 伤害 冷却 范围 攻击音效编号 额外参数 额外属性 - 201 玩家武器 小刀 Almighty_Icon 100 1.5 3 10000 [] [] - 202 手枪 Almighty_Icon 120 1 10 10000 [] [] +# 武器表 +# Id Title IconAssetName Rarity Price PriceRandomPercent Attack Cooldown AttackRange AttackSoundId Pramas Modifiers +# int string string RarityType int float int float float int string[] StatModifier[] +# 武器编号 策划备注 武器名 图标资源名 道具品质 武器价格 价格浮动 伤害 冷却 范围 攻击音效编号 额外参数 额外属性 + 201 玩家武器 小刀 Almighty_Icon White 120 0.05 100 1.5 3 10000 [] [] + 202 手枪 Almighty_Icon White 130 0.05 120 1 10 10000 [] [] diff --git a/Assets/GameMain/Fonts/MainTMPFont.asset b/Assets/GameMain/Fonts/MainTMPFont.asset index 2d84aee..5a836c4 100644 --- a/Assets/GameMain/Fonts/MainTMPFont.asset +++ b/Assets/GameMain/Fonts/MainTMPFont.asset @@ -118,7 +118,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0 + - _OutlineWidth: 0.1 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8333333 @@ -168,9 +168,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} m_Name: MainTMPFont m_EditorClassIdentifier: - hashCode: -1438885570 + hashCode: 1106704785 material: {fileID: -1106088975554028259} - materialHashCode: -1897074850 + materialHashCode: -1461255791 m_Version: 1.1.0 m_SourceFontFileGUID: 376d7b8f751da3646930f65eab02a204 m_SourceFontFile_EditorRef: {fileID: 12800000, guid: 376d7b8f751da3646930f65eab02a204, diff --git a/Assets/GameMain/Scripts/Base/GameEntry.Custom.cs b/Assets/GameMain/Scripts/Base/GameEntry.Custom.cs index f6d7a1d..d70f028 100644 --- a/Assets/GameMain/Scripts/Base/GameEntry.Custom.cs +++ b/Assets/GameMain/Scripts/Base/GameEntry.Custom.cs @@ -7,6 +7,7 @@ using CustomComponent; using StarForce; +using UI; using UnityEngine; /// @@ -22,11 +23,14 @@ public partial class GameEntry : MonoBehaviour public static SpriteCacheComponent SpriteCache { get; private set; } + public static UIRouterComponent UIRouter { get; private set; } + private static void InitCustomComponents() { BuiltinData = UnityGameFramework.Runtime.GameEntry.GetComponent(); HPBar = UnityGameFramework.Runtime.GameEntry.GetComponent(); EnemyManager = UnityGameFramework.Runtime.GameEntry.GetComponent(); SpriteCache = UnityGameFramework.Runtime.GameEntry.GetComponent(); + UIRouter = UnityGameFramework.Runtime.GameEntry.GetComponent(); } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Components/BackpackComponent.cs b/Assets/GameMain/Scripts/Components/BackpackComponent.cs index 2234151..7c6781a 100644 --- a/Assets/GameMain/Scripts/Components/BackpackComponent.cs +++ b/Assets/GameMain/Scripts/Components/BackpackComponent.cs @@ -38,6 +38,10 @@ namespace Components /// [SerializeField] private Transform[] _weaponSlots; + public IReadOnlyList Weapons => _weapons; + public IReadOnlyList Props => _props; + public int WeaponCapacity => _weaponCapacity; + public void OnInit(Player player, int weaponCapacity) { _weaponCapacity = weaponCapacity; @@ -97,4 +101,4 @@ namespace Components } } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Components/HealthComponent.cs b/Assets/GameMain/Scripts/Components/HealthComponent.cs index 8eab6e6..26aca1e 100644 --- a/Assets/GameMain/Scripts/Components/HealthComponent.cs +++ b/Assets/GameMain/Scripts/Components/HealthComponent.cs @@ -51,7 +51,10 @@ namespace Components { _maxHealthStat = _statComponent.GetStat(StatType.MaxHealth); _maxHealthStatCallback = (modifier, isApply) => + { _statComponent.UpdateStat(_maxHealthStat, modifier, isApply); + GameEntry.Event.Fire(this, PlayerHealthChangeEventArgs.Create(0, CurrentHealth, MaxHealth)); + }; _statComponent.Subscribe(StatType.MaxHealth, _maxHealthStatCallback); _defenseStat = _statComponent.GetStat(StatType.Defense); diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm.meta b/Assets/GameMain/Scripts/CustomComponent.meta similarity index 77% rename from Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm.meta rename to Assets/GameMain/Scripts/CustomComponent.meta index fdd9e8a..5f84c22 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm.meta +++ b/Assets/GameMain/Scripts/CustomComponent.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c13ac6879bf568a42b12d798738efd84 +guid: bce93539c13d79d4fb88e16597c05a27 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GameMain/Scripts/BuiltinData.meta b/Assets/GameMain/Scripts/CustomComponent/BuiltinData.meta similarity index 100% rename from Assets/GameMain/Scripts/BuiltinData.meta rename to Assets/GameMain/Scripts/CustomComponent/BuiltinData.meta diff --git a/Assets/GameMain/Scripts/BuiltinData/BuiltinDataComponent.cs b/Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/BuiltinData/BuiltinDataComponent.cs rename to Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs diff --git a/Assets/GameMain/Scripts/BuiltinData/BuiltinDataComponent.cs.meta b/Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/BuiltinData/BuiltinDataComponent.cs.meta rename to Assets/GameMain/Scripts/CustomComponent/BuiltinData/BuiltinDataComponent.cs.meta diff --git a/Assets/GameMain/Scripts/EnemyManager.meta b/Assets/GameMain/Scripts/CustomComponent/EnemyManager.meta similarity index 100% rename from Assets/GameMain/Scripts/EnemyManager.meta rename to Assets/GameMain/Scripts/CustomComponent/EnemyManager.meta diff --git a/Assets/GameMain/Scripts/EnemyManager/EnemyManagerComponent.cs b/Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/EnemyManager/EnemyManagerComponent.cs rename to Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs diff --git a/Assets/GameMain/Scripts/EnemyManager/EnemyManagerComponent.cs.meta b/Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/EnemyManager/EnemyManagerComponent.cs.meta rename to Assets/GameMain/Scripts/CustomComponent/EnemyManager/EnemyManagerComponent.cs.meta diff --git a/Assets/GameMain/Scripts/HPBar.meta b/Assets/GameMain/Scripts/CustomComponent/HPBar.meta similarity index 100% rename from Assets/GameMain/Scripts/HPBar.meta rename to Assets/GameMain/Scripts/CustomComponent/HPBar.meta diff --git a/Assets/GameMain/Scripts/HPBar/HPBarComponent.cs b/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs similarity index 100% rename from Assets/GameMain/Scripts/HPBar/HPBarComponent.cs rename to Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs diff --git a/Assets/GameMain/Scripts/HPBar/HPBarComponent.cs.meta b/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/HPBar/HPBarComponent.cs.meta rename to Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarComponent.cs.meta diff --git a/Assets/GameMain/Scripts/HPBar/HPBarItem.cs b/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs similarity index 100% rename from Assets/GameMain/Scripts/HPBar/HPBarItem.cs rename to Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs diff --git a/Assets/GameMain/Scripts/HPBar/HPBarItem.cs.meta b/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/HPBar/HPBarItem.cs.meta rename to Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItem.cs.meta diff --git a/Assets/GameMain/Scripts/HPBar/HPBarItemObject.cs b/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs similarity index 100% rename from Assets/GameMain/Scripts/HPBar/HPBarItemObject.cs rename to Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs diff --git a/Assets/GameMain/Scripts/HPBar/HPBarItemObject.cs.meta b/Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/HPBar/HPBarItemObject.cs.meta rename to Assets/GameMain/Scripts/CustomComponent/HPBar/HPBarItemObject.cs.meta diff --git a/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs b/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs new file mode 100644 index 0000000..721289c --- /dev/null +++ b/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using Definition.Enum; +using UnityGameFramework.Runtime; +using UI; + +namespace CustomComponent +{ + public class UIRouterComponent : GameFrameworkComponent + { + private readonly Dictionary _routeControllers = new(); + + public void BindUIUseCase(UIFormType uiFormType, IUIUseCase useCase) + { + IUIFormController controller = GetOrCreateController(uiFormType); + controller.BindUseCase(useCase); + } + + public int? OpenUI(UIFormType uiFormType, object userData = null) + { + IUIFormController controller = GetOrCreateController(uiFormType); + return controller.OpenUI(userData); + } + + public void CloseUI(UIFormType uiFormType) + { + IUIFormController controller = GetOrCreateController(uiFormType); + controller.CloseUI(); + } + + private IUIFormController GetOrCreateController(UIFormType uiFormType) + { + if (_routeControllers.TryGetValue(uiFormType, out IUIFormController controller)) + { + return controller; + } + + string typename = $"UI.{uiFormType}Controller"; + Type controllerType = Type.GetType(typename); + if (controllerType == null) + { + controller = new DefaultUIFormController(uiFormType); + } + else + { + controller = (IUIFormController)Activator.CreateInstance(controllerType); + } + + _routeControllers.Add(uiFormType, controller); + return controller; + } + + private void OnDestroy() + { + foreach (KeyValuePair pair in _routeControllers) + { + pair.Value.CloseUI(); + } + + _routeControllers.Clear(); + } + + private class DefaultUIFormController : IUIFormController + { + private readonly UIFormType _uiFormType; + private int? _lastSerialId; + + public DefaultUIFormController(UIFormType uiFormType) + { + _uiFormType = uiFormType; + } + + public int? OpenUI(object userData = null) + { + _lastSerialId = GameEntry.UI.OpenUIForm(_uiFormType, userData); + return _lastSerialId; + } + + public void CloseUI() + { + if (_lastSerialId.HasValue) + { + GameEntry.UI.CloseUIForm(_lastSerialId.Value); + _lastSerialId = null; + return; + } + + UGuiForm uiForm = GameEntry.UI.GetUIForm(_uiFormType); + if (uiForm != null) + { + GameEntry.UI.CloseUIForm(uiForm); + } + } + + public void BindUseCase(IUIUseCase useCase) + { + } + } + + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleShowArea.cs.meta b/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs.meta similarity index 83% rename from Assets/GameMain/Scripts/UI/MenuScene/SelectRoleShowArea.cs.meta rename to Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs.meta index b490424..6c62cc0 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleShowArea.cs.meta +++ b/Assets/GameMain/Scripts/CustomComponent/UIRouterComponent.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3ec6493d4e6c45d489e1dd3d5c6228a6 +guid: b3695ff420be99d44ab812d7e1863044 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/GameMain/Scripts/DataTable/DRAircraft.cs b/Assets/GameMain/Scripts/DataTable/DRAircraft.cs deleted file mode 100644 index e9c6dc8..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRAircraft.cs +++ /dev/null @@ -1,207 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.517 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace DataTable -{ - /// - /// 战机表。 - /// - public class DRAircraft : DataRowBase - { - private int m_Id = 0; - - /// - /// 获取战机编号。 - /// - public override int Id - { - get { return m_Id; } - } - - /// - /// 获取推进器编号。 - /// - public int ThrusterId { get; private set; } - - /// - /// 获取武器编号0。 - /// - public int WeaponId0 { get; private set; } - - /// - /// 获取武器编号1。 - /// - public int WeaponId1 { get; private set; } - - /// - /// 获取武器编号2。 - /// - public int WeaponId2 { get; private set; } - - /// - /// 获取装甲编号0。 - /// - public int ArmorId0 { get; private set; } - - /// - /// 获取装甲编号1。 - /// - public int ArmorId1 { get; private set; } - - /// - /// 获取装甲编号2。 - /// - public int ArmorId2 { get; private set; } - - /// - /// 获取死亡特效编号。 - /// - public int DeadEffectId { get; private set; } - - /// - /// 获取死亡声音编号。 - /// - public int DeadSoundId { get; private set; } - - public override bool ParseDataRow(string dataRowString, object userData) - { - string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators); - for (int i = 0; i < columnStrings.Length; i++) - { - columnStrings[i] = columnStrings[i].Trim(DataTableExtension.DataTrimSeparators); - } - - int index = 0; - index++; - m_Id = int.Parse(columnStrings[index++]); - index++; - ThrusterId = int.Parse(columnStrings[index++]); - WeaponId0 = int.Parse(columnStrings[index++]); - WeaponId1 = int.Parse(columnStrings[index++]); - WeaponId2 = int.Parse(columnStrings[index++]); - ArmorId0 = int.Parse(columnStrings[index++]); - ArmorId1 = int.Parse(columnStrings[index++]); - ArmorId2 = int.Parse(columnStrings[index++]); - DeadEffectId = int.Parse(columnStrings[index++]); - DeadSoundId = int.Parse(columnStrings[index++]); - - GeneratePropertyArray(); - return true; - } - - public override bool ParseDataRow(byte[] dataRowBytes, int startIndex, int length, object userData) - { - using (MemoryStream memoryStream = new MemoryStream(dataRowBytes, startIndex, length, false)) - { - using (BinaryReader binaryReader = new BinaryReader(memoryStream, Encoding.UTF8)) - { - m_Id = binaryReader.Read7BitEncodedInt32(); - ThrusterId = binaryReader.Read7BitEncodedInt32(); - WeaponId0 = binaryReader.Read7BitEncodedInt32(); - WeaponId1 = binaryReader.Read7BitEncodedInt32(); - WeaponId2 = binaryReader.Read7BitEncodedInt32(); - ArmorId0 = binaryReader.Read7BitEncodedInt32(); - ArmorId1 = binaryReader.Read7BitEncodedInt32(); - ArmorId2 = binaryReader.Read7BitEncodedInt32(); - DeadEffectId = binaryReader.Read7BitEncodedInt32(); - DeadSoundId = binaryReader.Read7BitEncodedInt32(); - } - } - - GeneratePropertyArray(); - return true; - } - - private KeyValuePair[] m_WeaponId = null; - - public int WeaponIdCount - { - get { return m_WeaponId.Length; } - } - - public int GetWeaponId(int id) - { - foreach (KeyValuePair i in m_WeaponId) - { - if (i.Key == id) - { - return i.Value; - } - } - - throw new GameFrameworkException(Utility.Text.Format("GetWeaponId with invalid id '{0}'.", id)); - } - - public int GetWeaponIdAt(int index) - { - if (index < 0 || index >= m_WeaponId.Length) - { - throw new GameFrameworkException(Utility.Text.Format("GetWeaponIdAt with invalid index '{0}'.", index)); - } - - return m_WeaponId[index].Value; - } - - private KeyValuePair[] m_ArmorId = null; - - public int ArmorIdCount - { - get { return m_ArmorId.Length; } - } - - public int GetArmorId(int id) - { - foreach (KeyValuePair i in m_ArmorId) - { - if (i.Key == id) - { - return i.Value; - } - } - - throw new GameFrameworkException(Utility.Text.Format("GetArmorId with invalid id '{0}'.", id)); - } - - public int GetArmorIdAt(int index) - { - if (index < 0 || index >= m_ArmorId.Length) - { - throw new GameFrameworkException(Utility.Text.Format("GetArmorIdAt with invalid index '{0}'.", index)); - } - - return m_ArmorId[index].Value; - } - - private void GeneratePropertyArray() - { - m_WeaponId = new KeyValuePair[] - { - new KeyValuePair(0, WeaponId0), - new KeyValuePair(1, WeaponId1), - new KeyValuePair(2, WeaponId2), - }; - - m_ArmorId = new KeyValuePair[] - { - new KeyValuePair(0, ArmorId0), - new KeyValuePair(1, ArmorId1), - new KeyValuePair(2, ArmorId2), - }; - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/DataTable/DRAircraft.cs.meta b/Assets/GameMain/Scripts/DataTable/DRAircraft.cs.meta deleted file mode 100644 index 69a8096..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRAircraft.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: e7a6297d01a7dc348b1488bf6245cb1b -timeCreated: 1528026147 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/DataTable/DRArmor.cs b/Assets/GameMain/Scripts/DataTable/DRArmor.cs deleted file mode 100644 index 5d85622..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRArmor.cs +++ /dev/null @@ -1,85 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.539 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace DataTable -{ - /// - /// 装甲表。 - /// - public class DRArmor : DataRowBase - { - private int m_Id = 0; - - /// - /// 获取装甲编号。 - /// - public override int Id - { - get { return m_Id; } - } - - /// - /// 获取最大生命。 - /// - public int MaxHP { get; private set; } - - /// - /// 获取防御力。 - /// - public int Defense { get; private set; } - - public override bool ParseDataRow(string dataRowString, object userData) - { - string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators); - for (int i = 0; i < columnStrings.Length; i++) - { - columnStrings[i] = columnStrings[i].Trim(DataTableExtension.DataTrimSeparators); - } - - int index = 0; - index++; - m_Id = int.Parse(columnStrings[index++]); - index++; - MaxHP = int.Parse(columnStrings[index++]); - Defense = int.Parse(columnStrings[index++]); - - GeneratePropertyArray(); - return true; - } - - public override bool ParseDataRow(byte[] dataRowBytes, int startIndex, int length, object userData) - { - using (MemoryStream memoryStream = new MemoryStream(dataRowBytes, startIndex, length, false)) - { - using (BinaryReader binaryReader = new BinaryReader(memoryStream, Encoding.UTF8)) - { - m_Id = binaryReader.Read7BitEncodedInt32(); - MaxHP = binaryReader.Read7BitEncodedInt32(); - Defense = binaryReader.Read7BitEncodedInt32(); - } - } - - GeneratePropertyArray(); - return true; - } - - private void GeneratePropertyArray() - { - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/DataTable/DRAsteroid.cs b/Assets/GameMain/Scripts/DataTable/DRAsteroid.cs deleted file mode 100644 index 2a40804..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRAsteroid.cs +++ /dev/null @@ -1,113 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.557 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace DataTable -{ - /// - /// 小行星表。 - /// - public class DRAsteroid : DataRowBase - { - private int m_Id = 0; - - /// - /// 获取小行星编号。 - /// - public override int Id - { - get { return m_Id; } - } - - /// - /// 获取最大生命。 - /// - public int MaxHP { get; private set; } - - /// - /// 获取冲击力。 - /// - public int Attack { get; private set; } - - /// - /// 获取速度。 - /// - public float Speed { get; private set; } - - /// - /// 获取角速度。 - /// - public float AngularSpeed { get; private set; } - - /// - /// 获取死亡特效编号。 - /// - public int DeadEffectId { get; private set; } - - /// - /// 获取死亡声音编号。 - /// - public int DeadSoundId { get; private set; } - - public override bool ParseDataRow(string dataRowString, object userData) - { - string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators); - for (int i = 0; i < columnStrings.Length; i++) - { - columnStrings[i] = columnStrings[i].Trim(DataTableExtension.DataTrimSeparators); - } - - int index = 0; - index++; - m_Id = int.Parse(columnStrings[index++]); - index++; - MaxHP = int.Parse(columnStrings[index++]); - Attack = int.Parse(columnStrings[index++]); - Speed = float.Parse(columnStrings[index++]); - AngularSpeed = float.Parse(columnStrings[index++]); - DeadEffectId = int.Parse(columnStrings[index++]); - DeadSoundId = int.Parse(columnStrings[index++]); - - GeneratePropertyArray(); - return true; - } - - public override bool ParseDataRow(byte[] dataRowBytes, int startIndex, int length, object userData) - { - using (MemoryStream memoryStream = new MemoryStream(dataRowBytes, startIndex, length, false)) - { - using (BinaryReader binaryReader = new BinaryReader(memoryStream, Encoding.UTF8)) - { - m_Id = binaryReader.Read7BitEncodedInt32(); - MaxHP = binaryReader.Read7BitEncodedInt32(); - Attack = binaryReader.Read7BitEncodedInt32(); - Speed = binaryReader.ReadSingle(); - AngularSpeed = binaryReader.ReadSingle(); - DeadEffectId = binaryReader.Read7BitEncodedInt32(); - DeadSoundId = binaryReader.Read7BitEncodedInt32(); - } - } - - GeneratePropertyArray(); - return true; - } - - private void GeneratePropertyArray() - { - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/DataTable/DRGoods.cs b/Assets/GameMain/Scripts/DataTable/DRGoods.cs index ec74640..bf578e9 100644 --- a/Assets/GameMain/Scripts/DataTable/DRGoods.cs +++ b/Assets/GameMain/Scripts/DataTable/DRGoods.cs @@ -18,16 +18,6 @@ namespace DataTable /// public GoodsType GoodsType { get; private set; } - /// - /// 获取最低价格 - /// - public int MinPrice { get; private set; } - - /// - /// 获取最高价格 - /// - public int MaxPrice { get; private set; } - /// /// 获取商品对应具体类型的表Id /// @@ -43,8 +33,6 @@ namespace DataTable m_Id = int.Parse(fields[index++]); index++; GoodsType = EnumUtility.Get(fields[index++]); - MinPrice = int.Parse(fields[index++]); - MaxPrice = int.Parse(fields[index++]); GoodsTypeId = int.Parse(fields[index++]); return true; diff --git a/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs b/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs new file mode 100644 index 0000000..e37c5ed --- /dev/null +++ b/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs @@ -0,0 +1,34 @@ +using Definition.DataStruct; +using Newtonsoft.Json; +using UnityGameFramework.Runtime; + +namespace DataTable +{ + public class DRLevelUpReward : DataRowBase + { + private int m_Id; + + public override int Id => m_Id; + + public string Title { get; private set; } + + public string IconAssetName { get; private set; } + + public StatModifier[] Modifiers { get; private set; } + + public override bool ParseDataRow(string dataRowString, object userData) + { + string[] fields = dataRowString.Split(DataTableExtension.DataSplitSeparators); + int index = 0; + + index++; + m_Id = int.Parse(fields[index++]); + index++; + Title = fields[index++]; + IconAssetName = fields[index++]; + Modifiers = JsonConvert.DeserializeObject(fields[index++]); + + return true; + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/DataTable/DRArmor.cs.meta b/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs.meta similarity index 69% rename from Assets/GameMain/Scripts/DataTable/DRArmor.cs.meta rename to Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs.meta index 3500118..611c7b7 100644 --- a/Assets/GameMain/Scripts/DataTable/DRArmor.cs.meta +++ b/Assets/GameMain/Scripts/DataTable/DRLevelUpReward.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 6e945cefd12dc05428a0b4d287784707 -timeCreated: 1528026147 -licenseType: Pro +guid: d84933d61f76d7942a903b8db26a3ad6 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GameMain/Scripts/DataTable/DRProp.cs b/Assets/GameMain/Scripts/DataTable/DRProp.cs index 17e1b59..9739d41 100644 --- a/Assets/GameMain/Scripts/DataTable/DRProp.cs +++ b/Assets/GameMain/Scripts/DataTable/DRProp.cs @@ -1,7 +1,9 @@ using Definition.DataStruct; using GameFramework; using Newtonsoft.Json; +using StarForce; using UnityGameFramework.Runtime; +using Definition.Enum; namespace DataTable { @@ -12,6 +14,9 @@ namespace DataTable public override int Id => m_Id; public string Title { get; private set; } public string IconAssetName { get; private set; } + public ItemRarity Rarity { get; private set; } + public int Price { get; private set; } + public float PriceRandomPercent { get; private set; } public StatModifier[] Modifiers { get; private set; } public override bool ParseDataRow(string dataRowString, object userData) @@ -24,6 +29,9 @@ namespace DataTable index++; Title = fields[index++]; IconAssetName = fields[index++]; + Rarity = EnumUtility.Get(fields[index++]); + Price = int.Parse(fields[index++]); + PriceRandomPercent = float.Parse(fields[index++]); Modifiers = JsonConvert.DeserializeObject(fields[index++]); return true; diff --git a/Assets/GameMain/Scripts/DataTable/DRThruster.cs b/Assets/GameMain/Scripts/DataTable/DRThruster.cs deleted file mode 100644 index 0f9ddf9..0000000 --- a/Assets/GameMain/Scripts/DataTable/DRThruster.cs +++ /dev/null @@ -1,78 +0,0 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ -// 此文件由工具自动生成，请勿直接修改。 -// 生成时间：2021-06-16 21:54:35.638 -//------------------------------------------------------------ - -using GameFramework; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using UnityEngine; -using UnityGameFramework.Runtime; - -namespace DataTable -{ - /// - /// 推进器表。 - /// - public class DRThruster : DataRowBase - { - private int m_Id = 0; - - /// - /// 获取推进器编号。 - /// - public override int Id - { - get { return m_Id; } - } - - /// - /// 获取。 - /// - public float Speed { get; private set; } - - public override bool ParseDataRow(string dataRowString, object userData) - { - string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators); - for (int i = 0; i < columnStrings.Length; i++) - { - columnStrings[i] = columnStrings[i].Trim(DataTableExtension.DataTrimSeparators); - } - - int index = 0; - index++; - m_Id = int.Parse(columnStrings[index++]); - index++; - Speed = float.Parse(columnStrings[index++]); - - GeneratePropertyArray(); - return true; - } - - public override bool ParseDataRow(byte[] dataRowBytes, int startIndex, int length, object userData) - { - using (MemoryStream memoryStream = new MemoryStream(dataRowBytes, startIndex, length, false)) - { - using (BinaryReader binaryReader = new BinaryReader(memoryStream, Encoding.UTF8)) - { - m_Id = binaryReader.Read7BitEncodedInt32(); - Speed = binaryReader.ReadSingle(); - } - } - - GeneratePropertyArray(); - return true; - } - - private void GeneratePropertyArray() - { - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/DataTable/DRWeapon.cs b/Assets/GameMain/Scripts/DataTable/DRWeapon.cs index fee369d..498a687 100644 --- a/Assets/GameMain/Scripts/DataTable/DRWeapon.cs +++ b/Assets/GameMain/Scripts/DataTable/DRWeapon.cs @@ -26,12 +26,16 @@ namespace DataTable /// 获取武器名称。 /// public string Title { get; private set; } - + /// /// 获取图标资源名称。 /// public string IconAssetName { get; private set; } + public ItemRarity Rarity { get; private set; } + public int Price { get; private set; } + public float PriceRandomPercent { get; private set; } + /// /// 获取武器伤害。 /// @@ -51,7 +55,7 @@ namespace DataTable /// 获取武器攻击音效。 /// public int AttackSoundId { get; private set; } - + /// /// 获取武器额外参数。 /// @@ -72,6 +76,9 @@ namespace DataTable index++; Title = columnStrings[index++]; IconAssetName = columnStrings[index++]; + Rarity = EnumUtility.Get(columnStrings[index++]); + Price = int.Parse(columnStrings[index++]); + PriceRandomPercent = float.Parse(columnStrings[index++]); Attack = int.Parse(columnStrings[index++]); Cooldown = float.Parse(columnStrings[index++]); AttackRange = float.Parse(columnStrings[index++]); @@ -80,7 +87,7 @@ namespace DataTable Modifiers = Utility.Json.ToObject(columnStrings[index++]); GeneratePropertyArray(); - + return true; } diff --git a/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs b/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs index c68b626..848ae40 100644 --- a/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs +++ b/Assets/GameMain/Scripts/Definition/DataStruct/PropItem.cs @@ -1,20 +1,44 @@ using Components; using DataTable; +using Definition.Enum; namespace Definition.DataStruct { public class PropItem { - private DRProp _prop; - + private readonly StatModifier[] _modifiers; + public string Title { get; private set; } + public string IconAssetName { get; private set; } + public ItemRarity Rarity { get; private set; } + public StatModifier[] Modifiers => _modifiers; + public PropItem(DRProp prop) { - _prop = prop; + if (prop == null) return; + + _modifiers = prop.Modifiers; + Title = prop.Title; + Rarity = prop.Rarity; + IconAssetName = prop.IconAssetName; + } + + public PropItem(StatModifier[] modifiers) + { + _modifiers = modifiers; + } + + public PropItem(StatModifier[] modifiers, ItemRarity rarity, string title, string iconAssetName) + { + _modifiers = modifiers; + Title = title; + Rarity = rarity; + IconAssetName = iconAssetName; } public void OnAttach(StatComponent statComponent) { - foreach (var modifier in _prop.Modifiers) + if (_modifiers == null || statComponent == null) return; + foreach (var modifier in _modifiers) { statComponent.AddModifier(modifier); } @@ -22,7 +46,8 @@ namespace Definition.DataStruct public void OnDetach(StatComponent statComponent) { - foreach (var modifier in _prop.Modifiers) + if (_modifiers == null || statComponent == null) return; + foreach (var modifier in _modifiers) { statComponent.RemoveModifier(modifier); } diff --git a/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs b/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs new file mode 100644 index 0000000..b2c956f --- /dev/null +++ b/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs @@ -0,0 +1,12 @@ +namespace Definition.Enum +{ + public enum ItemRarity + { + None, + White = 1, + Green = 2, + Blue, + Purple, + Red + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/DataTable/DRAsteroid.cs.meta b/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs.meta similarity index 69% rename from Assets/GameMain/Scripts/DataTable/DRAsteroid.cs.meta rename to Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs.meta index 19ca6a8..1fd836e 100644 --- a/Assets/GameMain/Scripts/DataTable/DRAsteroid.cs.meta +++ b/Assets/GameMain/Scripts/Definition/Enum/ItemRarity.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 836a293c79cb42e42a7235ebdeb3344f -timeCreated: 1528026147 -licenseType: Pro +guid: bb7ab0222a370b649956dacb56a122fc MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs b/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs index a3dc469..369f906 100644 --- a/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs +++ b/Assets/GameMain/Scripts/Definition/Enum/UIFormType.cs @@ -12,7 +12,7 @@ namespace Definition.Enum /// public enum UIFormType : byte { - Undefined = 0, + TUIForm = 0, /// /// 弹出框。 @@ -58,5 +58,10 @@ namespace Definition.Enum /// 升级选择。 /// LevelUpForm = 204, + + /// + /// 物品信息展示页 + /// + DisplayItemInfoForm = 205, } } diff --git a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs b/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs index c694d2c..d3becfc 100644 --- a/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs +++ b/Assets/GameMain/Scripts/Entity/EntityData/Weapon/WeaponData.cs @@ -21,6 +21,20 @@ namespace Entity.EntityData /// public int Attack => _drWeapon.Attack; + /// + /// 武器名称。 + /// + public string Title => _drWeapon.Title; + + /// + /// 图标资源名称。 + /// + public string IconAssetName => _drWeapon.IconAssetName; + + public ItemRarity Rarity => _drWeapon.Rarity; + + public int Price => _drWeapon.Price; + /// /// 攻击间隔。 /// diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs b/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs index d7fd7bb..3327b4a 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs +++ b/Assets/GameMain/Scripts/Entity/EntityLogic/Player.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using Components; using CustomEvent; using DataTable; @@ -63,6 +64,8 @@ namespace Entity { value -= _expRequires[_currentLevel + 1]; _currentLevel++; + PendingLevelPoints++; + GameEntry.Event.Fire(this, PlayerLevelUpEventArgs.Create()); } GameEntry.Event.Fire(this, PlayerExpChangeEventArgs.Create(value, _expRequires[_currentLevel + 1])); @@ -71,7 +74,19 @@ namespace Entity } public int CurrentLevel => _currentLevel; - + + public int PendingLevelPoints { get; set; } + + public IReadOnlyList Weapons => _backpackComponent != null ? _backpackComponent.Weapons : null; + public IReadOnlyList Props => _backpackComponent != null ? _backpackComponent.Props : null; + public int WeaponCapacity => _backpackComponent != null ? _backpackComponent.WeaponCapacity : 0; + + public bool AddProp(PropItem prop) + { + if (prop == null || _backpackComponent == null) return false; + return _backpackComponent.AttachProp(prop); + } + public bool Enable { get => _enable; diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs b/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs index 33249d5..4610baf 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs +++ b/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponBase.cs @@ -24,10 +24,15 @@ namespace Entity public abstract class WeaponBase : EntityBase { protected const string AttachPoint = "Weapon Point"; + protected bool _isAttacking = false; + protected bool _isEnabled = false; + public WeaponData WeaponData; + public bool IsAttacking => _isAttacking; + protected WeaponStateBase _currentState; #region FSM diff --git a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife.cs b/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife.cs index a5681e5..1d1d7f9 100644 --- a/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife.cs +++ b/Assets/GameMain/Scripts/Entity/EntityLogic/Weapon/WeaponKnife.cs @@ -134,6 +134,7 @@ namespace Entity Log.Error("WeaponKnife data is invalid."); return; } + WeaponData = _weaponData; _collider = GetComponent(); _rigidbody = GetComponent(); @@ -329,4 +330,4 @@ namespace Entity } } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Event/DisplayItemHideEventArgs.cs b/Assets/GameMain/Scripts/Event/DisplayItemHideEventArgs.cs new file mode 100644 index 0000000..9715dd9 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/DisplayItemHideEventArgs.cs @@ -0,0 +1,28 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class DisplayItemHideEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(DisplayItemHideEventArgs).GetHashCode(); + + public override int Id => EventId; + + + public DisplayItemHideEventArgs() + { + } + + public static DisplayItemHideEventArgs Create() + { + var args = ReferencePool.Acquire(); + + return args; + } + + public override void Clear() + { + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/DisplayItemHideEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/DisplayItemHideEventArgs.cs.meta new file mode 100644 index 0000000..223ff05 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/DisplayItemHideEventArgs.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a515c94c54304c79b0fa4761f07a732d +timeCreated: 1771071838 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs b/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs new file mode 100644 index 0000000..a64726f --- /dev/null +++ b/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs @@ -0,0 +1,41 @@ +using GameFramework; +using GameFramework.Event; +using UnityEngine; + +namespace CustomEvent +{ + public class DisplayItemShowEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(DisplayItemShowEventArgs).GetHashCode(); + + public override int Id => EventId; + + public int Index { get; private set; } + + public bool IsWeapon { get; private set; } + + public Vector3 TargetPos { get; private set; } + + public DisplayItemShowEventArgs() + { + Index = -1; + IsWeapon = false; + } + + public static DisplayItemShowEventArgs Create(int index, bool isWeapon, Vector3 targetPos) + { + var args = ReferencePool.Acquire(); + args.Index = index; + args.IsWeapon = isWeapon; + args.TargetPos = targetPos; + return args; + } + + public override void Clear() + { + Index = -1; + IsWeapon = false; + TargetPos = Vector3.zero; + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs.meta new file mode 100644 index 0000000..1f461ac --- /dev/null +++ b/Assets/GameMain/Scripts/Event/DisplayItemShowEventArgs.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 51bff2c6818f44398b4b8f7d1448b310 +timeCreated: 1771071724 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/LevelUp.meta b/Assets/GameMain/Scripts/Event/LevelUp.meta new file mode 100644 index 0000000..0305804 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/LevelUp.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9ee8d2a2a12545b8b8cfc85c5fe912ed +timeCreated: 1771071689 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Event/LevelUpPropSelectedEventArgs.cs b/Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelUpPropSelectedEventArgs.cs rename to Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs diff --git a/Assets/GameMain/Scripts/Event/LevelUpPropSelectedEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/LevelUpPropSelectedEventArgs.cs.meta rename to Assets/GameMain/Scripts/Event/LevelUp/LevelUpPropSelectedEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Event/Menu.meta b/Assets/GameMain/Scripts/Event/Menu.meta new file mode 100644 index 0000000..56d13af --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fc42c90ffa598d4e89c908ad82116d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs new file mode 100644 index 0000000..dcffdee --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuAboutButtonClickEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuAboutButtonClickEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuAboutButtonClickEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/DataTable/DRThruster.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta similarity index 69% rename from Assets/GameMain/Scripts/DataTable/DRThruster.cs.meta rename to Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta index 1ebc0b7..898a9f2 100644 --- a/Assets/GameMain/Scripts/DataTable/DRThruster.cs.meta +++ b/Assets/GameMain/Scripts/Event/Menu/MenuAboutButtonClickEventArgs.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: a9b85e7308914ee49bacd872a67716aa -timeCreated: 1528026148 -licenseType: Pro +guid: f58e49962f2db9140aaf209ca65dd2f9 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs new file mode 100644 index 0000000..5688472 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuFileButtonClickEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuFileButtonClickEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuFileButtonClickEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs.meta new file mode 100644 index 0000000..cac6ac6 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuFileButtonClickEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e093cff04ac83fc47ae21bd659b338ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs new file mode 100644 index 0000000..705d342 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuGuideButtonClickEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuGuideButtonClickEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuGuideButtonClickEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta new file mode 100644 index 0000000..5c6d94c --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuGuideButtonClickEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b39712010e7085f428e9ef9727bda043 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs new file mode 100644 index 0000000..28444ad --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuQuitButtonClickEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuQuitButtonClickEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuQuitButtonClickEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta new file mode 100644 index 0000000..433bb0f --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuQuitButtonClickEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c008a5618fa012842992de55bef3791c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs new file mode 100644 index 0000000..dd79882 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuSelectRoleConfirmEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuSelectRoleConfirmEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuSelectRoleConfirmEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta new file mode 100644 index 0000000..c065365 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleConfirmEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c360f9423f498704dbb32820841451c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs new file mode 100644 index 0000000..132569b --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuSelectRoleReturnEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuSelectRoleReturnEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuSelectRoleReturnEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta new file mode 100644 index 0000000..12dd940 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleReturnEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 25cf88630e365d2428872f6bae81001e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs new file mode 100644 index 0000000..a3f9c52 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs @@ -0,0 +1,26 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuSelectRoleSelectedEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuSelectRoleSelectedEventArgs).GetHashCode(); + + public override int Id => EventId; + + public int RoleId { get; private set; } = -1; + + public static MenuSelectRoleSelectedEventArgs Create(int roleId) + { + var args = ReferencePool.Acquire(); + args.RoleId = roleId; + return args; + } + + public override void Clear() + { + RoleId = -1; + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta new file mode 100644 index 0000000..ea481b1 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSelectRoleSelectedEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c99f1c134cc628142a36d21c209ed507 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs new file mode 100644 index 0000000..379c6c5 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuSettingButtonClickEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuSettingButtonClickEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuSettingButtonClickEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta new file mode 100644 index 0000000..f1d56f4 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuSettingButtonClickEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d5de2367f2bc83642bbbdc02081ae804 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs b/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs new file mode 100644 index 0000000..4a1db27 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs @@ -0,0 +1,21 @@ +using GameFramework; +using GameFramework.Event; + +namespace CustomEvent +{ + public class MenuStartGameEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(MenuStartGameEventArgs).GetHashCode(); + + public override int Id => EventId; + + public static MenuStartGameEventArgs Create() + { + return ReferencePool.Acquire(); + } + + public override void Clear() + { + } + } +} diff --git a/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs.meta new file mode 100644 index 0000000..9b54b72 --- /dev/null +++ b/Assets/GameMain/Scripts/Event/Menu/MenuStartGameEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 217b0022ddd4a4545a8d8e3d8158a967 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopRefreshEventArgs.cs b/Assets/GameMain/Scripts/Event/RefreshEventArgs.cs similarity index 58% rename from Assets/GameMain/Scripts/Event/Shop/ShopRefreshEventArgs.cs rename to Assets/GameMain/Scripts/Event/RefreshEventArgs.cs index 2c0751e..6f4537f 100644 --- a/Assets/GameMain/Scripts/Event/Shop/ShopRefreshEventArgs.cs +++ b/Assets/GameMain/Scripts/Event/RefreshEventArgs.cs @@ -3,22 +3,22 @@ using GameFramework.Event; namespace CustomEvent { - public class ShopRefreshEventArgs : GameEventArgs + public class RefreshEventArgs : GameEventArgs { - public static readonly int EventId = typeof(ShopRefreshEventArgs).GetHashCode(); + public static readonly int EventId = typeof(RefreshEventArgs).GetHashCode(); public override int Id => EventId; public int Cost { get; private set; } - public ShopRefreshEventArgs() + public RefreshEventArgs() { Cost = 0; } - public static ShopRefreshEventArgs Create(int cost) + public static RefreshEventArgs Create(int cost) { - var args = ReferencePool.Acquire(); + var args = ReferencePool.Acquire(); args.Cost = cost; diff --git a/Assets/GameMain/Scripts/Event/Shop/ShopRefreshEventArgs.cs.meta b/Assets/GameMain/Scripts/Event/RefreshEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Event/Shop/ShopRefreshEventArgs.cs.meta rename to Assets/GameMain/Scripts/Event/RefreshEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs index 242c35e..e596069 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureCheckVersion.cs @@ -6,6 +6,7 @@ //------------------------------------------------------------ using Definition.DataStruct; +using Definition.Enum; using GameFramework; using GameFramework.Event; using GameFramework.Resource; @@ -112,7 +113,7 @@ namespace Procedure if (m_VersionInfo.ForceUpdateGame) { // 需要强制更新游戏应用 - GameEntry.UI.OpenDialog(new DialogParams + GameEntry.UIRouter.OpenUI(UIFormType.DialogForm, new DialogFormRawData { Mode = 2, Title = GameEntry.Localization.GetString("ForceUpdate.Title"), diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs index 562beaf..f675b69 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedurePreload.cs @@ -37,6 +37,7 @@ namespace Procedure "Prop", "Role", "Level", + "LevelUpReward" }; private Dictionary _loadedFlag = new Dictionary(); diff --git a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs index 78354aa..2b7c39a 100644 --- a/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs +++ b/Assets/GameMain/Scripts/Procedure/Base/ProcedureUpdateResources.cs @@ -1,6 +1,7 @@ -using GameFramework; +using GameFramework; using GameFramework.Event; using System.Collections.Generic; +using Definition.Enum; using StarForce; using UI; using UnityEngine; @@ -46,7 +47,7 @@ namespace Procedure if (Application.internetReachability == NetworkReachability.ReachableViaCarrierDataNetwork) { - GameEntry.UI.OpenDialog(new DialogParams + GameEntry.UIRouter.OpenUI(UIFormType.DialogForm, new DialogFormRawData { Mode = 2, Title = GameEntry.Localization.GetString("UpdateResourceViaCarrierDataNetwork.Title"), diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs index 2f2a225..557cf92 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateBattle.cs @@ -11,9 +11,13 @@ namespace Procedure public override GameStateType GameStateType => GameStateType.Battle; private EnemyManagerComponent _enemyManager = null; + private int _currentLevel = 0; + private bool _levelOver; + private Player Player => _procedureGame.Player; + private ProcedureGame _procedureGame = null; public void LevelOver() @@ -35,8 +39,8 @@ namespace Procedure _currentLevel = _procedureGame.CurrentLevel; _levelOver = false; _enemyManager.OnInit(_currentLevel, this); - Player player = _procedureGame.Player; - if (player != null) player.Enable = false; + + if (Player != null) Player.Enable = true; } public override void OnUpdate(IFsm procedureOwner, float elapseSeconds, @@ -47,7 +51,7 @@ namespace Procedure if (_levelOver) { procedureOwner.SetData("CurrentLevel", (byte)(_currentLevel + 1)); - _procedureGame.BattleToShop(); + _procedureGame.BattleToShopOrLevelUp(); } } @@ -57,8 +61,7 @@ namespace Procedure _enemyManager.OnReset(); // 停止玩家逻辑 - Player player = _procedureGame.Player; - player.Enable = false; + Player.Enable = false; // 隐藏所有掉落物实体 var entities = GameEntry.Entity.GetEntityGroup("Drop").GetAllEntities(); @@ -76,4 +79,4 @@ namespace Procedure #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs new file mode 100644 index 0000000..521b758 --- /dev/null +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs @@ -0,0 +1,64 @@ +using Definition.Enum; +using GameFramework.Fsm; +using GameFramework.Procedure; +using UI; +using UnityGameFramework.Runtime; + +namespace Procedure +{ + public class GameStateLevelUp : GameStateBase + { + public override GameStateType GameStateType => GameStateType.LevelUp; + + private ProcedureGame _procedureGame; + + public bool IsCompleted { get; set; } + + #region FSM + + public override void OnInit(ProcedureGame master) + { + Log.Debug("GameStateLevelUp::OnInit"); + + _procedureGame = master; + + var useCase = new LevelUpFormUseCase(_procedureGame.Player, this); + GameEntry.UIRouter.BindUIUseCase(UIFormType.LevelUpForm, useCase); + } + + public override void OnEnter(IFsm procedureOwner) + { + Log.Debug("GameStateLevelUp::OnEnter"); + + IsCompleted = false; + + GameEntry.UIRouter.OpenUI(UIFormType.LevelUpForm); + } + + public override void OnUpdate(IFsm procedureOwner, float elapseSeconds, + float realElapseSeconds) + { + if (IsCompleted) + { + _procedureGame.LevelUpToShop(); + } + } + + public override void OnLeave(IFsm procedureOwner) + { + Log.Debug("GameStateLevelUp::OnLeave"); + + GameEntry.UIRouter.CloseUI(UIFormType.LevelUpForm); + } + + public override void OnDestroy(IFsm procedureOwner) + { + _procedureGame = null; + + Log.Debug("GameStateLevelUp::OnDestroy"); + } + + #endregion + + } +} diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs.meta b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs.meta new file mode 100644 index 0000000..2ae699f --- /dev/null +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateLevelUp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: be7365d38adfd8546a0f4b964a128abb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs b/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs index 0d09dc8..59cd95b 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/GameStateShop.cs @@ -1,161 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using CustomEvent; -using DataTable; using Definition.Enum; -using Entity; -using GameFramework.DataTable; using GameFramework.Fsm; using GameFramework.Procedure; using UI; -using UnityEngine; using UnityGameFramework.Runtime; -using Random = UnityEngine.Random; namespace Procedure { public class GameStateShop : GameStateBase { - #region Property - public override GameStateType GameStateType => GameStateType.Shop; private ProcedureGame _procedureGame; - private DRGoods[] _drGoods; - - private DRProp[] _drProps; - private IDataTable _propDataTable; - - private IDataTable _weaponDataTable; - - private ShopFormController _shopFormController; - private ShopFormContext _shopFormContext; - - private LevelUpFormController _levelUpFormController; - private LevelUpFormContext _levelUpFormContext; - - private int _shopRefreshTime = 0; - - private Player _player => _procedureGame.Player; - - private bool _shopOver = false; - - #endregion - - #region Methods - - #region LevelUp - - private LevelUpFormContext BuildLevelUpFormContext(int count = 4) - { - List props = new List(); - int total = _drProps.Length; - if (total <= 0) - { - Log.Error("GameStateShop::BuildLevelUpFormContext(): _drProps == null"); - return null; - } - - count = Mathf.Min(count, total); - - for (int i = 0; i < count; i++) - { - int index = Random.Range(0, total); - DRProp drProp = _drProps[index]; - props.Add(new LevelUpPropContext - { - PropId = drProp.Id, - Title = drProp.Title, - Type = "Prop", - Icon = null, - Description = GoodsItemContext.CreatePropDescription(drProp.Modifiers), - IconAssetName = drProp.IconAssetName - }); - } - - return new LevelUpFormContext - { - Level = _player.CurrentLevel, - Props = props - }; - } - - #endregion - - #region Shop - - private void RefreshGoodsItems() - { - _shopFormContext = BuildShopFormContext(); - _shopFormContext.RefreshPrice = (_shopRefreshTime + 1) * _procedureGame.CurrentLevel; - _shopRefreshTime++; - _shopFormController.OpenUI(_shopFormContext); - } - - private ShopFormContext BuildShopFormContext() - { - int currentLevel = _procedureGame.CurrentLevel; - var context = new ShopFormContext - { - CurrentLevel = currentLevel, - RefreshPrice = currentLevel, - PlayerCoin = _player.Coin, - GoodsItems = InitRandomGoodsItems() - }; - return context; - } - - private List InitRandomGoodsItems(int count = -1) - { - if (_drGoods == null || _drGoods.Length == 0) - { - Log.Error("GameStateShop::InitRandomGoodsItems(): _drGoods == null"); - return null; - } - - count = Mathf.Max(count, Random.Range(4, 6)); - int totalCount = _drGoods.Length; - List items = new List(count); - if (totalCount <= 0) return items; - count = Mathf.Min(count, totalCount); - - for (int i = 0; i < count; i++) - { - int index = Random.Range(0, totalCount); - DRGoods drGoods = _drGoods[index]; - GoodsItemContext goodsItem = new GoodsItemContext - { - Price = Random.Range(drGoods.MinPrice, drGoods.MaxPrice) - }; - - if (drGoods.GoodsType == GoodsType.Prop) - { - DRProp drProp = _propDataTable.GetDataRow(drGoods.GoodsTypeId); - goodsItem.Title = drProp.Title; - goodsItem.Type = "Prop"; - GameEntry.SpriteCache.GetSprite(drProp.IconAssetName, sprite => goodsItem.Icon = sprite); - goodsItem.Description = GoodsItemContext.CreatePropDescription(drProp.Modifiers); - } - else if (drGoods.GoodsType == GoodsType.Weapon) - { - DRWeapon drWeapon = _weaponDataTable.GetDataRow(drGoods.GoodsTypeId); - goodsItem.Title = drWeapon.Title; - goodsItem.Type = "Weapon"; - GameEntry.SpriteCache.GetSprite(drWeapon.IconAssetName, sprite => goodsItem.Icon = sprite); - goodsItem.Description = GoodsItemContext.CreateWeaponDescription(drWeapon); - } - - items.Add(goodsItem); - } - - return items; - } - - #endregion - - #endregion + public bool ShopFinish { get; set; } #region FSM @@ -163,47 +20,25 @@ namespace Procedure { Log.Debug("GameStateShop::OnInit"); _procedureGame = master; - - _levelUpFormController = new LevelUpFormController(); - _shopFormController = new ShopFormController(); - - _drGoods = GameEntry.DataTable.GetDataTable().ToArray(); - _propDataTable = GameEntry.DataTable.GetDataTable(); - _drProps = _propDataTable.ToArray(); - _weaponDataTable = GameEntry.DataTable.GetDataTable(); - - _shopOver = false; + + var shopFormUseCase = new ShopFormUseCase(_procedureGame, this); + GameEntry.UIRouter.BindUIUseCase(UIFormType.ShopForm, shopFormUseCase); } public override void OnEnter(IFsm procedureOwner) { Log.Debug("GameStateShop::OnEnter"); - GameEntry.Event.Subscribe(ShopRefreshEventArgs.EventId, ShopRefresh); - GameEntry.Event.Subscribe(ShopPurchaseEventArgs.EventId, ShopPurchase); - GameEntry.Event.Subscribe(ShopContinueEventArgs.EventId, ShopContinue); - GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + ShopFinish = false; - if (_procedureGame.PlayerPendingLevel != 0) - { - _levelUpFormContext = BuildLevelUpFormContext(); - _levelUpFormController.OpenUI(_levelUpFormContext); - } - else - { - _shopFormContext = BuildShopFormContext(); - _shopFormController.OpenUI(_shopFormContext); - } - - _shopOver = false; + GameEntry.UIRouter.OpenUI(UIFormType.ShopForm); } public override void OnUpdate(IFsm procedureOwner, float elapseSeconds, float realElapseSeconds) { - if (_shopOver) + if (ShopFinish) { - _shopFormController?.CloseUI(); _procedureGame.ShopToBattle(); } } @@ -212,96 +47,16 @@ namespace Procedure { Log.Debug("GameStateShop::OnLeave"); - _shopFormContext = null; - _shopFormController.CloseUI(); - _shopFormController = null; - - _levelUpFormContext = null; - _levelUpFormController.CloseUI(); - _levelUpFormController = null; - - GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); - GameEntry.Event.Unsubscribe(ShopRefreshEventArgs.EventId, ShopRefresh); - GameEntry.Event.Unsubscribe(ShopPurchaseEventArgs.EventId, ShopPurchase); - GameEntry.Event.Unsubscribe(ShopContinueEventArgs.EventId, ShopContinue); + GameEntry.UIRouter.CloseUI(UIFormType.ShopForm); } public override void OnDestroy(IFsm procedureOwner) { _procedureGame = null; - _shopFormController = null; - _shopFormContext = null; - - _levelUpFormController = null; - _levelUpFormContext = null; - - _drGoods = null; - _propDataTable = null; - _weaponDataTable = null; Log.Debug("GameStateShop::OnDestroy"); } #endregion - - #region Event Handlers - - private void ShopRefresh(object sender, EventArgs e) - { - if (!(e is ShopRefreshEventArgs args)) return; - - if (_player.Coin < args.Cost) return; - _player.Coin -= args.Cost; - RefreshGoodsItems(); - } - - - private void ShopPurchase(object sender, EventArgs e) - { - if (!(e is ShopPurchaseEventArgs args)) return; - - int index = args.GoodsIndex; - - if (index < 0 && index >= _shopFormContext.GoodsItems.Count) - { - Log.Warning("GameStateShop::ShopPurchase: Invalid index"); - return; - } - - if (_player.Coin < _shopFormContext.GoodsItems[index].Price) return; - _player.Coin -= _shopFormContext.GoodsItems[index].Price; - _shopFormContext.GoodsItems.RemoveAt(index); - _shopFormController.OpenUI(_shopFormContext); - // TODO: OnGoodsPurchased - } - - private void ShopContinue(object sender, EventArgs e) - { - if (!(e is ShopContinueEventArgs)) return; - - _shopOver = true; - } - - private void CloseUIFormComplete(object sender, EventArgs e) - { - if (!(e is CloseUIFormCompleteEventArgs args)) return; - - if (args.UIFormAssetName == nameof(UIFormType.LevelUpForm)) - { - - if (--_procedureGame.PlayerPendingLevel != 0) - { - _levelUpFormContext = BuildLevelUpFormContext(); - _levelUpFormController.OpenUI(_levelUpFormContext); - } - else - { - _levelUpFormContext = BuildLevelUpFormContext(); - _levelUpFormController.OpenUI(_levelUpFormContext); - } - } - } - - #endregion } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs index d9deafa..b152640 100644 --- a/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs +++ b/Assets/GameMain/Scripts/Procedure/Game/ProcedureGame.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using CustomComponent; using CustomEvent; using DataTable; using Definition.Enum; @@ -8,7 +7,6 @@ using Entity.EntityData; using GameFramework.Event; using GameFramework.Fsm; using GameFramework.Procedure; -using StarForce; using UnityGameFramework.Runtime; using UI; @@ -19,6 +17,7 @@ namespace Procedure None = 0, Battle = 1, Shop = 2, + LevelUp = 3, } public class ProcedureGame : ProcedureBase @@ -36,31 +35,28 @@ namespace Procedure private Dictionary _gameStates; public Player Player; - /// - /// 玩家升级可分配点数 - /// - public int PlayerPendingLevel = 0; - private void InitGameState() { _gameStates = new Dictionary { { GameStateType.Battle, new GameStateBattle() }, + { GameStateType.LevelUp, new GameStateLevelUp() }, { GameStateType.Shop, new GameStateShop() }, }; _gameStates[GameStateType.Battle].OnInit(this); + _gameStates[GameStateType.LevelUp].OnInit(this); _gameStates[GameStateType.Shop].OnInit(this); _currentGameState = GameStateType.Battle; _gameStates[_currentGameState].OnEnter(_procedureOwner); } - public void BattleToShop() + public void BattleToShopOrLevelUp() { - if (_currentGameState == GameStateType.Shop) return; + if (_currentGameState == GameStateType.Shop || _currentGameState == GameStateType.LevelUp) return; _gameStates[_currentGameState].OnLeave(_procedureOwner); - _currentGameState = GameStateType.Shop; + _currentGameState = Player.PendingLevelPoints > 0 ? GameStateType.LevelUp : GameStateType.Shop; _gameStates[_currentGameState].OnEnter(_procedureOwner); } @@ -73,6 +69,15 @@ namespace Procedure _gameStates[_currentGameState].OnEnter(_procedureOwner); } + public void LevelUpToShop() + { + if (_currentGameState == GameStateType.Shop) return; + + _gameStates[_currentGameState].OnLeave(_procedureOwner); + _currentGameState = GameStateType.Shop; + _gameStates[_currentGameState].OnEnter(_procedureOwner); + } + #region FSM protected override void OnEnter(IFsm procedureOwner) @@ -83,14 +88,13 @@ namespace Procedure GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); GameEntry.Event.Subscribe(ShowEntitySuccessEventArgs.EventId, ShowEntitySuccess); - GameEntry.Event.Subscribe(PlayerLevelUpEventArgs.EventId, PlayerLevelUp); - + CurrentLevel = 1; _currentPlayerData = new PlayerData(-1, 1001); GameEntry.Entity.ShowPlayer(_currentPlayerData); - - GameEntry.UI.OpenUIForm(UIFormType.HudForm, this); - + + GameEntry.UIRouter.OpenUI(UIFormType.HudForm); + InitGameState(); } @@ -107,9 +111,11 @@ namespace Procedure var role = GameEntry.DataTable.GetDataTableRow(selectedRoleId); Player.InitRole(role); _hudInitialized = true; + InitGameState(); } - _gameStates[_currentGameState].OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); + if (_hudInitialized) + _gameStates[_currentGameState].OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); } protected override void OnLeave(IFsm procedureOwner, bool isShutdown) @@ -121,12 +127,14 @@ namespace Procedure _gameStates.Clear(); - _hudForm.Close(); + GameEntry.UIRouter.CloseUI(UIFormType.HudForm); + _hudForm = null; + Player = null; + _procedureOwner = null; - GameEntry.Event.Unsubscribe(PlayerLevelUpEventArgs.EventId, PlayerLevelUp); GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); GameEntry.Event.Unsubscribe(ShowEntitySuccessEventArgs.EventId, ShowEntitySuccess); @@ -141,9 +149,9 @@ namespace Procedure { if (!(e is OpenUIFormSuccessEventArgs args)) return; - if (args.UserData == this) + if (args.UIForm.Logic is HudForm hudForm) { - _hudForm = args.UIForm.Logic as HudForm; + _hudForm = hudForm; } } @@ -151,19 +159,12 @@ namespace Procedure { if (!(e is ShowEntitySuccessEventArgs args)) return; - if (args.EntityLogicType == typeof(Player)) + if (args.Entity.Logic is Player player) { - Player = args.Entity.Logic as Player; + Player = player; } } - private void PlayerLevelUp(object sender, GameEventArgs e) - { - if (!(e is PlayerLevelUpEventArgs)) return; - - //PlayerPendingLevel++; - } - #endregion } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs b/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs index 14aba0e..89cb9a8 100644 --- a/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs +++ b/Assets/GameMain/Scripts/Procedure/ProcedureStartMenu.cs @@ -1,12 +1,4 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - using Definition.Enum; -using GameFramework.Event; using Scene; using UI; using UnityGameFramework.Runtime; @@ -16,31 +8,16 @@ namespace Procedure { public class ProcedureStartMenu : ProcedureBase { - private bool _isStartGame = false; - private StartMenuForm _startMenuForm = null; - private SelectRoleForm _selectRoleForm = null; - public override bool UseNativeDialog => false; + private bool _startGame = false; + private int _selectedRoleId = 0; - public void StartGame(int roleId) + public void StartGame(int selectedRoleId) { - _isStartGame = true; - _selectedRoleId = roleId; - } - - private void OnStartGame(ProcedureOwner procedureOwner) - { - procedureOwner.SetData("NextSceneId", (int)SceneId.Game); - procedureOwner.SetData("SelectedRoleId", _selectedRoleId); - ChangeState(procedureOwner); - } - - public void OpenSelectForm() - { - _startMenuForm.Close(); - GameEntry.UI.OpenUIForm(UIFormType.SelectRoleForm, this); + _selectedRoleId = selectedRoleId; + _startGame = true; } #region FSM @@ -48,54 +25,29 @@ namespace Procedure protected override void OnEnter(ProcedureOwner procedureOwner) { base.OnEnter(procedureOwner); + + GameEntry.UIRouter.OpenUI(UIFormType.StartMenuForm); - // 1. 初始化变量与事件 - GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OnOpenUIFormSuccess); - _isStartGame = false; - - // 2. 打开 StartMenuForm - GameEntry.UI.OpenUIForm(UIFormType.StartMenuForm, this); + var useCase2 = new SelectRoleFormUseCase(this); + GameEntry.UIRouter.BindUIUseCase(UIFormType.SelectRoleForm, useCase2); } protected override void OnLeave(ProcedureOwner procedureOwner, bool isShutdown) { base.OnLeave(procedureOwner, isShutdown); - - GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OnOpenUIFormSuccess); - - if (_startMenuForm != null) - { - _startMenuForm.Close(true); - _startMenuForm = null; - } - - if (_selectRoleForm != null) - { - _selectRoleForm.Close(true); - _selectRoleForm = null; - } + GameEntry.UIRouter.CloseUI(UIFormType.StartMenuForm); + GameEntry.UIRouter.CloseUI(UIFormType.SelectRoleForm); } protected override void OnUpdate(ProcedureOwner procedureOwner, float elapseSeconds, float realElapseSeconds) { base.OnUpdate(procedureOwner, elapseSeconds, realElapseSeconds); - if (_isStartGame) + if (_startGame) { - OnStartGame(procedureOwner); - } - } - - #endregion - - #region Event Handlers - - private void OnOpenUIFormSuccess(object sender, GameEventArgs e) - { - if (e is OpenUIFormSuccessEventArgs ne) - { - if (ne.UIForm.Logic is StartMenuForm startMenuForm) _startMenuForm = startMenuForm; - if (ne.UIForm.Logic is SelectRoleForm selectRoleForm) _selectRoleForm = selectRoleForm; + procedureOwner.SetData("NextSceneId", (int)SceneId.Game); + procedureOwner.SetData("SelectedRoleId", _selectedRoleId); + ChangeState(procedureOwner); } } diff --git a/Assets/GameMain/Scripts/UI/Base.meta b/Assets/GameMain/Scripts/UI/Base.meta new file mode 100644 index 0000000..69073d6 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cf6edb3e93c9814dbeb37df22394fed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs b/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs new file mode 100644 index 0000000..ccf6d76 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs @@ -0,0 +1,9 @@ +namespace UI +{ + public interface IUIFormController + { + int? OpenUI(object userData = null); + void CloseUI(); + void BindUseCase(IUIUseCase useCase); + } +} diff --git a/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs.meta b/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs.meta new file mode 100644 index 0000000..3dd2ad8 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/IUIFormController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 08145adf06b2b2c4b9d61d3ef6d39cfc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs b/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs new file mode 100644 index 0000000..6e7557e --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UI +{ + public interface IUIUseCase + { + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs.meta b/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs.meta new file mode 100644 index 0000000..4482853 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/IUIUseCase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8b527e4ad6d6207418137211caa179d5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/UGuiForm.cs b/Assets/GameMain/Scripts/UI/Base/UGuiForm.cs similarity index 99% rename from Assets/GameMain/Scripts/UI/UGuiForm.cs rename to Assets/GameMain/Scripts/UI/Base/UGuiForm.cs index 61afa05..6043234 100644 --- a/Assets/GameMain/Scripts/UI/UGuiForm.cs +++ b/Assets/GameMain/Scripts/UI/Base/UGuiForm.cs @@ -242,4 +242,4 @@ namespace UI GameEntry.UI.CloseUIForm(this); } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/UGuiForm.cs.meta b/Assets/GameMain/Scripts/UI/Base/UGuiForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/UGuiForm.cs.meta rename to Assets/GameMain/Scripts/UI/Base/UGuiForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/UGuiGroupHelper.cs b/Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/UGuiGroupHelper.cs rename to Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs diff --git a/Assets/GameMain/Scripts/UI/UGuiGroupHelper.cs.meta b/Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/UGuiGroupHelper.cs.meta rename to Assets/GameMain/Scripts/UI/Base/UGuiGroupHelper.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIContext.cs b/Assets/GameMain/Scripts/UI/Base/UIContext.cs new file mode 100644 index 0000000..9f4ca66 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIContext.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UI +{ + public class UIContext + { + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/Base/UIContext.cs.meta b/Assets/GameMain/Scripts/UI/Base/UIContext.cs.meta new file mode 100644 index 0000000..40f98b7 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ac4a8b30b5b7684ca58f70386314a4b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/UIExtension.cs b/Assets/GameMain/Scripts/UI/Base/UIExtension.cs similarity index 90% rename from Assets/GameMain/Scripts/UI/UIExtension.cs rename to Assets/GameMain/Scripts/UI/Base/UIExtension.cs index 934d5f3..944156e 100644 --- a/Assets/GameMain/Scripts/UI/UIExtension.cs +++ b/Assets/GameMain/Scripts/UI/Base/UIExtension.cs @@ -157,24 +157,12 @@ namespace UI return uiComponent.OpenUIForm(assetName, drUIForm.UIGroupName, Constant.AssetPriority.UIFormAsset, drUIForm.PauseCoveredUIForm, userData); } - public static void OpenDialog(this UIComponent uiComponent, DialogParams dialogParams) - { - if (((ProcedureBase)GameEntry.Procedure.CurrentProcedure).UseNativeDialog) - { - OpenNativeDialog(dialogParams); - } - else - { - uiComponent.OpenUIForm(UIFormType.DialogForm, dialogParams); - } - } - - private static void OpenNativeDialog(DialogParams dialogParams) + private static void OpenNativeDialog(DialogFormRawData rawData) { // TODO：这里应该弹出原生对话框，先简化实现为直接按确认按钮 - if (dialogParams.OnClickConfirm != null) + if (rawData != null && rawData.OnClickConfirm != null) { - dialogParams.OnClickConfirm(dialogParams.UserData); + rawData.OnClickConfirm(rawData.UserData); } } } diff --git a/Assets/GameMain/Scripts/UI/UIExtension.cs.meta b/Assets/GameMain/Scripts/UI/Base/UIExtension.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/UIExtension.cs.meta rename to Assets/GameMain/Scripts/UI/Base/UIExtension.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs b/Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs new file mode 100644 index 0000000..3169580 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs @@ -0,0 +1,10 @@ +namespace UI +{ + public abstract class UIFormControllerBase : IUIFormController where TContext : UIContext + { + protected abstract int? OpenUIInternal(TContext context); + public abstract int? OpenUI(object userData = null); + public abstract void CloseUI(); + public abstract void BindUseCase(IUIUseCase useCase); + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/IFormController.cs.meta b/Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Controller/IFormController.cs.meta rename to Assets/GameMain/Scripts/UI/Base/UIFormControllerBase.cs.meta diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs b/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs new file mode 100644 index 0000000..199ce15 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs @@ -0,0 +1,179 @@ +using Definition.Enum; +using GameFramework.Event; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class TUIFormController : UIFormControllerBase + { + private IUIUseCase _useCase; + private UIContext _context; + private TUIForm _tForm; + private int? _tFormSerialId; + private bool _pendingRefresh; + private bool _isBindEvent; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = false; + } + + protected override int? OpenUIInternal(UIContext context) + { + if (context == null) + { + Log.Warning("TUIFormController open failed. context is null."); + return null; + } + + _context = context; + + if (_tForm != null && _tFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_tFormSerialId.Value)) + { + _tForm.RefreshUI(_context); + return _tFormSerialId; + } + + CloseUI(); + _pendingRefresh = true; + SubscribeEvents(); + _tFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.TUIForm, context); + return _tFormSerialId; + } + + public override int? OpenUI(object userData = null) + { + if (userData is UIContext context) + { + return OpenUIInternal(context); + } + + if (userData != null) + { + Log.Warning("TUIFormController.OpenUI() userData type is invalid."); + return null; + } + + return OpenUIInternal(_context); + } + + public override void CloseUI() + { + _pendingRefresh = false; + UnsubscribeEvents(); + + if (_tFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_tFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_tFormSerialId.Value); + } + + _tForm = null; + _tFormSerialId = null; + return; + } + + if (_tForm != null) + { + _tForm.Close(); + _tForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + if (!(useCase is IUIUseCase UIFormUseCase)) + { + Log.Error("LevelUpForm.BindUseCase() useCase is invalid."); + return; + } + + _useCase = UIFormUseCase; + } + + private void TryRefreshUI() + { + if (_context == null) + { + return; + } + + if (_tForm == null) + { + _pendingRefresh = true; + return; + } + + _tForm.RefreshUI(_context); + _pendingRefresh = false; + } + + #region EventHanlders + + private void OpenUIFormSuccess(object sender, GameEventArgs e) + { + if (!(e is OpenUIFormSuccessEventArgs args)) + { + return; + } + + if (!_tFormSerialId.HasValue) + { + return; + } + + if (args.UIForm == null || args.UIForm.SerialId != _tFormSerialId.Value || args.UserData != _context) + { + return; + } + + _tForm = args.UIForm.Logic as TUIForm; + + if (_tForm == null) + { + Log.Warning("DialogFormController open success but form logic is invalid."); + return; + } + + if (_pendingRefresh) + { + TryRefreshUI(); + } + } + + private void CloseUIFormComplete(object sender, GameEventArgs e) + { + if (!(e is CloseUIFormCompleteEventArgs args)) + { + return; + } + + if (args.SerialId != _tFormSerialId) + { + return; + } + + _tForm = null; + _tFormSerialId = null; + } + + #endregion + } +} diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs.meta b/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs.meta new file mode 100644 index 0000000..918885a --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIFormControllerTemplate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7e46538e3d51b6b4ca463fa6080ad335 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs b/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs new file mode 100644 index 0000000..f0e02c4 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs @@ -0,0 +1,27 @@ +using UnityEngine; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class TUIForm : UGuiForm + { + + public void RefreshUI(UIContext context) + { + + } + + protected override void OnOpen(object userData) + { + base.OnOpen(userData); + + if (!(userData is UIContext context)) + { + Log.Error("UIContext is invalid."); + return; + } + + RefreshUI(context); + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs.meta b/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs.meta new file mode 100644 index 0000000..24db713 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/Base/UIFormTemplate.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e8bc5e59a2be3094798c8c46d1a4999f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/UpdateResourceForm.cs b/Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/UpdateResourceForm.cs rename to Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs diff --git a/Assets/GameMain/Scripts/UI/UpdateResourceForm.cs.meta b/Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/UpdateResourceForm.cs.meta rename to Assets/GameMain/Scripts/UI/Base/UpdateResourceForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/CommonButton.cs b/Assets/GameMain/Scripts/UI/CommonButton.cs index db65c67..f856a25 100644 --- a/Assets/GameMain/Scripts/UI/CommonButton.cs +++ b/Assets/GameMain/Scripts/UI/CommonButton.cs @@ -5,16 +5,13 @@ // Feedback: mailto:ellan@gameframework.cn //------------------------------------------------------------ -using System; using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; -using UnityEngine.Serialization; -using UnityGameFramework.Runtime; namespace UI { - public class CommonButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerDownHandler, + public class CommonButton : MonoBehaviour, IPointerEnterHandler, IPointerDownHandler, IPointerExitHandler, IPointerUpHandler { private const float FadeTime = 0.3f; @@ -27,6 +24,8 @@ namespace UI [SerializeField] private UnityEvent _onPointerExitAction = null; + [SerializeField] private bool _enableFade = true; + private CanvasGroup _canvasGroup = null; private void Awake() @@ -47,22 +46,11 @@ namespace UI } StopAllCoroutines(); - StartCoroutine(_canvasGroup.FadeToAlpha(OnHoverAlpha, FadeTime)); + if (_enableFade) + StartCoroutine(_canvasGroup.FadeToAlpha(OnHoverAlpha, FadeTime)); _onPointerEnterAction.Invoke(); } - public void OnPointerExit(PointerEventData eventData) - { - if (eventData.button != PointerEventData.InputButton.Left) - { - return; - } - - StopAllCoroutines(); - StartCoroutine(_canvasGroup.FadeToAlpha(1f, FadeTime)); - _onPointerExitAction?.Invoke(); - } - public void OnPointerDown(PointerEventData eventData) { if (eventData.button != PointerEventData.InputButton.Left) @@ -84,45 +72,17 @@ namespace UI _canvasGroup.alpha = OnHoverAlpha; } - /// - /// 注册鼠标相关事件 - /// - /// 0、1、2 分别是 Enter、Click、Exit - /// 回调事件 - public void RegisterAction(int actionId, UnityAction action) + public void OnPointerExit(PointerEventData eventData) { - switch (actionId) + if (eventData.button != PointerEventData.InputButton.Left) { - case 0: - _onPointerEnterAction.AddListener(action); - break; - case 1: - _onClickAction.AddListener(action); - break; - case 2: - _onPointerExitAction.AddListener(action); - break; - default: - throw new IndexOutOfRangeException("actionId 无效"); + return; } - } - public void UnRegisterAction(int actionId, UnityAction action) - { - switch (actionId) - { - case 0: - _onPointerEnterAction.RemoveListener(action); - break; - case 1: - _onClickAction.RemoveListener(action); - break; - case 2: - _onPointerExitAction.RemoveListener(action); - break; - default: - throw new IndexOutOfRangeException("actionId 无效"); - } + StopAllCoroutines(); + if (_enableFade) + StartCoroutine(_canvasGroup.FadeToAlpha(1.0f, FadeTime)); + _onPointerExitAction.Invoke(); } } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs new file mode 100644 index 0000000..cfd8b55 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs @@ -0,0 +1,11 @@ +using Definition.Enum; + +namespace UI +{ + public class DisplayItemContext : UIContext + { + public string IconAssetName; + public ItemRarity Rarity; + public bool IsWeapon; + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs.meta new file mode 100644 index 0000000..b853266 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df1bccc6ff70fbc4089c7809e35c1f61 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs new file mode 100644 index 0000000..6146b38 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs @@ -0,0 +1,17 @@ +using Definition.Enum; +using UnityEngine; + +namespace UI +{ + public class DisplayItemInfoFormContext : UIContext + { + public string IconAssetName; + public string Title; + public string TypeText; + public ItemRarity Rarity; + public string Description; + public int Price; + public bool IsWeapon; + public Vector3 TargetPos; + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs.meta new file mode 100644 index 0000000..cbbf159 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayItemInfoFormContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cdcef9502b7fa944ca95cb839fdc60bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs new file mode 100644 index 0000000..6cf9381 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UI +{ + public class DisplayListAreaContext : UIContext + { + public string Title; + public int CurrentCount; + public int MaxCount = -1; + public DisplayItemContext[] ItemContexts; + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs.meta new file mode 100644 index 0000000..c37730d --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/DisplayListAreaContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a10dfda6cc0f45247bfcdbfb578110bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs index b8fb2ac..c8ea3cf 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/GoodsItemContext.cs @@ -1,40 +1,15 @@ -using System.Text; -using DataTable; -using Definition.DataStruct; +using Definition.Enum; using UnityEngine; namespace UI { - public class GoodsItemContext + public class GoodsItemContext : UIContext { public string Title; + public ItemRarity Rarity; public string Type; public Sprite Icon; public string Description; public int Price; - - public static string CreateWeaponDescription(DRWeapon drWeapon) - { - StringBuilder sb = new StringBuilder(); - sb.Append($"伤害：{drWeapon.Attack}\n"); - sb.Append($"冷却：{drWeapon.Cooldown}\n"); - sb.Append($"范围：{drWeapon.AttackRange}\n"); - sb.Append(CreatePropDescription(drWeapon.Modifiers)); - - return sb.ToString(); - } - - public static string CreatePropDescription(StatModifier[] modifiers) - { - if (modifiers == null || modifiers.Length == 0) return null; - StringBuilder sb = new StringBuilder(); - foreach (var modifier in modifiers) - { - sb.Append(modifier.ToString()); - sb.Append("\n"); - } - - return sb.ToString(); - } - } -} + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs new file mode 100644 index 0000000..d79a0a6 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace UI +{ + public class HudFormContext : UIContext + { + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs.meta new file mode 100644 index 0000000..679c5d5 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/HudFormContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f8d476720436b84483bd1c29da4d558 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs index 030d90c..c18d0e0 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpFormContext.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; namespace UI { - public class LevelUpFormContext + public class LevelUpFormContext : UIContext { - public int Level; - public List Props; + public List Props; + public int RefreshPrice; } } diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpPropContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs similarity index 66% rename from Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpPropContext.cs rename to Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs index 39fabfc..14a15fe 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpPropContext.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs @@ -2,11 +2,9 @@ using UnityEngine; namespace UI { - public class LevelUpPropContext + public class LevelUpRewardItemContext : UIContext { - public int PropId; public string Title; - public string Type; public Sprite Icon; public string Description; public string IconAssetName; diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpPropContext.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpPropContext.cs.meta rename to Assets/GameMain/Scripts/UI/GameScene/Context/LevelUpRewardItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs b/Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs index 87a6ab8..204a530 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/Context/ShopFormContext.cs @@ -2,11 +2,13 @@ using System.Collections.Generic; namespace UI { - public class ShopFormContext + public class ShopFormContext : UIContext { public int CurrentLevel; public int RefreshPrice; public int PlayerCoin; public List GoodsItems; + public DisplayListAreaContext PropListContext; + public DisplayListAreaContext WeaponListContext; } } diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs b/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs new file mode 100644 index 0000000..d023b6c --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs @@ -0,0 +1,216 @@ +using Definition.Enum; +using GameFramework.Event; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class DisplayItemInfoFormController : UIFormControllerBase + { + private DisplayItemInfoFormContext _context; + + private DisplayItemInfoForm _itemInfoForm; + + private int? _itemInfoFormSerialId; + + private bool _pendingRefresh; + + private bool _isBindEvent = false; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = false; + } + + private static DisplayItemInfoFormContext BuildContext(DisplayItemInfoFormRawData rawData) + { + if (rawData == null) + { + return null; + } + + return new DisplayItemInfoFormContext + { + IconAssetName = rawData.IconAssetName, + Title = rawData.Title, + Rarity = rawData.Rarity, + TypeText = rawData.TypeText, + Description = rawData.Description, + Price = rawData.Price, + IsWeapon = rawData.IsWeapon, + TargetPos = rawData.TargetPos + }; + } + + #region UI Methods + + protected override int? OpenUIInternal(DisplayItemInfoFormContext context) + { + if (context == null) + { + Log.Warning("ItemInfoFormController open failed. context is null."); + return null; + } + + _context = context; + + if (_itemInfoForm != null && _itemInfoFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_itemInfoFormSerialId.Value)) + { + _itemInfoForm.RefreshUI(_context); + return _itemInfoFormSerialId; + } + + CloseUI(); + _pendingRefresh = true; + SubscribeEvents(); + _itemInfoFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.DisplayItemInfoForm, context); + return _itemInfoFormSerialId; + } + + public int? OpenUI(DisplayItemInfoFormRawData rawData) + { + DisplayItemInfoFormContext context = BuildContext(rawData); + return OpenUIInternal(context); + } + + public override int? OpenUI(object userData = null) + { + if (userData is DisplayItemInfoFormContext context) + { + return OpenUIInternal(context); + } + + if (userData is DisplayItemInfoFormRawData rawData) + { + return OpenUI(rawData); + } + + if (userData != null) + { + Log.Warning("DisplayItemInfoFormController.OpenUI() userData type is invalid."); + return null; + } + + return OpenUIInternal(_context); + } + + public override void CloseUI() + { + _pendingRefresh = false; + + UnsubscribeEvents(); + + if (_itemInfoFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_itemInfoFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_itemInfoFormSerialId.Value); + } + + _itemInfoForm = null; + _itemInfoFormSerialId = null; + return; + } + + if (_itemInfoForm != null) + { + GameEntry.UI.CloseUIForm(_itemInfoForm); + _itemInfoForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + if (!(useCase is DisplayItemInfoFormUseCase)) + { + Log.Error("DisplayItemInfoForm.BindUseCase() useCase is invalid."); + return; + } + } + + private void TryRefreshUI() + { + if (_context == null) + { + return; + } + + if (_itemInfoForm == null) + { + _pendingRefresh = true; + return; + } + + _itemInfoForm.RefreshUI(_context); + _pendingRefresh = false; + } + + #endregion + + #region EventHanlders + + private void OpenUIFormSuccess(object sender, GameEventArgs e) + { + if (!(e is OpenUIFormSuccessEventArgs args)) + { + return; + } + + if (!_itemInfoFormSerialId.HasValue) + { + return; + } + + if (args.UIForm == null || args.UIForm.SerialId != _itemInfoFormSerialId.Value || args.UserData != _context) + { + return; + } + + _itemInfoForm = args.UIForm.Logic as DisplayItemInfoForm; + + if (_itemInfoForm == null) + { + Log.Warning("DisplayItemInfoFormController open success but form logic is invalid."); + return; + } + + if (_pendingRefresh) + { + TryRefreshUI(); + } + } + + private void CloseUIFormComplete(object sender, GameEventArgs e) + { + if (!(e is CloseUIFormCompleteEventArgs args)) + { + return; + } + + if (args.SerialId != _itemInfoFormSerialId) + { + return; + } + + _itemInfoForm = null; + _itemInfoFormSerialId = null; + } + + #endregion + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs.meta new file mode 100644 index 0000000..370452e --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Controller/DisplayItemInfoFormController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8a9b5acbc476ae44a8259a5aea1c0cf2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs b/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs new file mode 100644 index 0000000..a789a50 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs @@ -0,0 +1,192 @@ +using Definition.Enum; +using GameFramework.Event; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class HudFormController : UIFormControllerBase + { + private HudFormContext _context; + + private HudForm _hudForm; + + private int? _hudFormSerialId; + + private bool _pendingRefresh; + + private bool _isBindEvent; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = false; + } + + private static HudFormContext BuildHudFormContext() + { + return new HudFormContext(); + } + + #region UI Methods + + protected override int? OpenUIInternal(HudFormContext context) + { + if (context == null) + { + Log.Warning("HudFormController.OpenUI() context is null."); + return null; + } + + _context = context; + + if (_hudForm != null && _hudFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_hudFormSerialId.Value)) + { + _hudForm.RefreshUI(_context); + return _hudFormSerialId; + } + + CloseUI(); + _pendingRefresh = true; + SubscribeEvents(); + _hudFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.HudForm, context); + return _hudFormSerialId; + } + + public override int? OpenUI(object userData = null) + { + if (userData is HudFormContext context) + { + return OpenUIInternal(context); + } + + if (userData != null) + { + Log.Warning("HudFormController.OpenUI() userData type is invalid."); + return null; + } + + return OpenUIInternal(BuildHudFormContext()); + } + + public int? OpenUI(HudFormContext context) + { + return OpenUIInternal(context); + } + + public override void CloseUI() + { + _pendingRefresh = false; + UnsubscribeEvents(); + + if (_hudFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_hudFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_hudFormSerialId.Value); + } + + _hudForm = null; + _hudFormSerialId = null; + return; + } + + if (_hudForm != null) + { + _hudForm.Close(); + _hudForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + Log.Info("HudFormController doesn't need UseCase"); + } + + private void TryRefreshUI() + { + if (_context == null) + { + return; + } + + if (_hudForm == null) + { + _pendingRefresh = true; + return; + } + + _hudForm.RefreshUI(_context); + _pendingRefresh = false; + } + + #endregion + + + #region Event Handlers + + private void OpenUIFormSuccess(object sender, GameEventArgs e) + { + if (!(e is OpenUIFormSuccessEventArgs args)) + { + return; + } + + if (!_hudFormSerialId.HasValue) + { + return; + } + + if (args.UIForm == null || args.UIForm.SerialId != _hudFormSerialId.Value || + args.UserData != _context) + { + return; + } + + _hudForm = args.UIForm.Logic as HudForm; + + if (_hudForm == null) + { + Log.Warning("HudFormController open success but form logic is invalid."); + return; + } + + if (_pendingRefresh) + { + TryRefreshUI(); + } + } + + private void CloseUIFormComplete(object sender, GameEventArgs e) + { + if (!(e is CloseUIFormCompleteEventArgs args)) + { + return; + } + + if (args.SerialId != _hudFormSerialId) + { + return; + } + + _hudForm = null; + _hudFormSerialId = null; + } + + #endregion + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs.meta new file mode 100644 index 0000000..44a0b69 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/Controller/HudFormController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7360b01093fa984d86105e2dd024dd5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/IFormController.cs b/Assets/GameMain/Scripts/UI/GameScene/Controller/IFormController.cs deleted file mode 100644 index 792c64c..0000000 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/IFormController.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace UI -{ - public interface IFormController - { - int? OpenUI(TContext context); - void CloseUI(); - } -} diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs b/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs index 03ce768..c2e072b 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/Controller/LevelUpFormController.cs @@ -1,44 +1,81 @@ using System.Collections.Generic; using CustomEvent; -using DataTable; using Definition.Enum; -using GameFramework.DataTable; +using Game.Utility; using GameFramework.Event; -using UnityEngine; +using Procedure; using UnityGameFramework.Runtime; namespace UI { - public class LevelUpFormController : IFormController + public class LevelUpFormController : UIFormControllerBase { - private int _currentLevel = 1; - private int _buildCount = 4; + private LevelUpFormUseCase _useCase; private bool _pendingRefresh; private int? _levelUpFormSerialId; + private LevelUpForm _levelUpForm; + private LevelUpFormContext _context; - public LevelUpFormController() + private bool _isBindEvent; + + private void SubscribeEvents() { + if (_isBindEvent) return; + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + GameEntry.Event.Subscribe(RefreshEventArgs.EventId, OnRefresh); + GameEntry.Event.Subscribe(LevelUpPropSelectedEventArgs.EventId, OnLevelUpPropSelected); + + _isBindEvent = true; } - ~LevelUpFormController() + private void UnsubscribeEvents() { + if (!_isBindEvent) return; + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + GameEntry.Event.Unsubscribe(RefreshEventArgs.EventId, OnRefresh); + GameEntry.Event.Unsubscribe(LevelUpPropSelectedEventArgs.EventId, OnLevelUpPropSelected); + + _isBindEvent = false; } - public void ConfigureBuild(int level, int count = 4) + private static LevelUpFormContext BuildContext(LevelUpFormRawData rawData) { - _currentLevel = Mathf.Max(1, level); - _buildCount = Mathf.Max(0, count); + List props = new List(rawData.Rewards.Count); + foreach (var reward in rawData.Rewards) + { + if (reward == null) + { + continue; + } + + props.Add(new LevelUpRewardItemContext + { + Title = reward.Title, + Icon = null, + Description = ItemDescUtility.CreatePropDescription(reward.Modifiers), + IconAssetName = reward.IconAssetName + }); + } + + return new LevelUpFormContext + { + RefreshPrice = rawData.RefreshPrice, + Props = props + }; } - public int? OpenUI(LevelUpFormContext context) + + #region UI Methods + + protected override int? OpenUIInternal(LevelUpFormContext context) { if (context == null) { @@ -48,7 +85,8 @@ namespace UI _context = context; - if (_levelUpForm != null) + if (_levelUpForm != null && _levelUpFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_levelUpFormSerialId.Value)) { _levelUpForm.RefreshUI(_context); return _levelUpFormSerialId; @@ -56,37 +94,43 @@ namespace UI CloseUI(); _pendingRefresh = true; + SubscribeEvents(); _levelUpFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.LevelUpForm, context); return _levelUpFormSerialId; } - public void CloseUI() + public override int? OpenUI(object userData = null) { - _pendingRefresh = false; - - if (_levelUpFormSerialId.HasValue) + if (userData is LevelUpFormContext context) { - GameEntry.UI.CloseUIForm(_levelUpFormSerialId.Value); - return; + return OpenUIInternal(context); } - if (_levelUpForm != null) + if (userData is LevelUpFormRawData rawDataFromUserData) { - _levelUpForm.Close(); + return OpenUI(rawDataFromUserData); } + + if (userData != null) + { + Log.Warning("LevelUpFormController.OpenUI() userData type is invalid."); + return null; + } + + if (_useCase == null) + { + Log.Error("LevelUpFormController.OpenUI() useCase is null."); + return null; + } + + LevelUpFormRawData rawData = _useCase.CreateInitialModel(); + return OpenUI(rawData); } - public void Reset() + public int? OpenUI(LevelUpFormRawData rawData) { - _context = null; - _levelUpForm = null; - _levelUpFormSerialId = null; - _pendingRefresh = false; - } - - public void OnSelectProp(int propId) - { - + LevelUpFormContext context = BuildContext(rawData); + return OpenUIInternal(context); } private void TryRefreshUI() @@ -106,6 +150,82 @@ namespace UI _pendingRefresh = false; } + public override void CloseUI() + { + _pendingRefresh = false; + UnsubscribeEvents(); + + if (_levelUpFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_levelUpFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_levelUpFormSerialId.Value); + } + + _levelUpForm = null; + _levelUpFormSerialId = null; + return; + } + + if (_levelUpForm != null) + { + _levelUpForm.Close(); + _levelUpForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + if (!(useCase is LevelUpFormUseCase levelUpFormUseCase)) + { + Log.Error("LevelUpForm.BindUseCase() useCase is invalid."); + return; + } + + _useCase = levelUpFormUseCase; + } + + #endregion + + #region Service + + private void SelectReward(int selectedIndex) + { + if (_useCase == null) + { + Log.Error("LevelUpFormController.OpenUI() useCase is null."); + return; + } + + LevelUpFormRawData rawData = _useCase.SelectReward(selectedIndex); + + if (rawData == null) + { + return; + } + + OpenUI(rawData); + } + + private void RefreshRewardList(int refreshCost) + { + if (_useCase == null) + { + Log.Error("LevelUpFormController.OpenUI() useCase is null."); + return; + } + + LevelUpFormRawData rawData = _useCase.TryRefresh(refreshCost); + if (rawData == null) + { + return; + } + + OpenUI(rawData); + } + + #endregion + #region Event Handlers private void OpenUIFormSuccess(object sender, GameEventArgs e) @@ -149,6 +269,31 @@ namespace UI _levelUpFormSerialId = null; } + private void OnRefresh(object sender, GameEventArgs e) + { + if (!(sender is LevelUpForm)) + { + return; + } + + if (!(e is RefreshEventArgs args)) + { + return; + } + + RefreshRewardList(args.Cost); + } + + private void OnLevelUpPropSelected(object sender, GameEventArgs e) + { + if (!(e is LevelUpPropSelectedEventArgs args)) + { + return; + } + + SelectReward(args.SelectedId); + } + #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs b/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs index 5a680f4..c8f11a3 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/Controller/ShopFormController.cs @@ -1,12 +1,17 @@ +using System.Collections.Generic; +using CustomEvent; +using Definition.DataStruct; using Definition.Enum; +using Entity; +using Game.Utility; using GameFramework.Event; using UnityGameFramework.Runtime; namespace UI { - public class ShopFormController : IFormController + public class ShopFormController : UIFormControllerBase { - #region Property + private ShopFormUseCase _useCase; private bool _pendingRefresh; @@ -14,23 +19,167 @@ namespace UI private ShopForm _shopForm; + private ShopFormRawData _rawData; + private ShopFormContext _context; + private bool _isBindEvent; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + GameEntry.Event.Subscribe(RefreshEventArgs.EventId, Refresh); + GameEntry.Event.Subscribe(ShopPurchaseEventArgs.EventId, ShopPurchase); + GameEntry.Event.Subscribe(ShopContinueEventArgs.EventId, ShopContinue); + GameEntry.Event.Subscribe(DisplayItemShowEventArgs.EventId, DisplayItemShow); + GameEntry.Event.Subscribe(DisplayItemHideEventArgs.EventId, DisplayItemHide); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + GameEntry.Event.Unsubscribe(RefreshEventArgs.EventId, Refresh); + GameEntry.Event.Unsubscribe(ShopPurchaseEventArgs.EventId, ShopPurchase); + GameEntry.Event.Unsubscribe(ShopContinueEventArgs.EventId, ShopContinue); + GameEntry.Event.Unsubscribe(DisplayItemShowEventArgs.EventId, DisplayItemShow); + GameEntry.Event.Unsubscribe(DisplayItemHideEventArgs.EventId, DisplayItemHide); + + _isBindEvent = false; + } + + #region BuildContext + + private ShopFormContext BuildContext(ShopFormRawData rawData) + { + if (rawData == null) + { + return null; + } + + _rawData = rawData; + + return new ShopFormContext + { + CurrentLevel = rawData.CurrentLevel, + RefreshPrice = rawData.RefreshPrice, + PlayerCoin = rawData.PlayerCoin, + GoodsItems = rawData.GoodsItems, + PropListContext = BuildDisplayListAreaContext("道具", rawData.PropItems, rawData.PropMaxCount), + WeaponListContext = BuildDisplayListAreaContext("武器", rawData.WeaponItems, rawData.WeaponMaxCount) + }; + } + + private static DisplayListAreaContext BuildDisplayListAreaContext(string title, IReadOnlyList items, + int maxCount) + { + DisplayItemContext[] itemContexts = new DisplayItemContext[items.Count]; + if (title == "武器") + { + if (items is IReadOnlyList weapons) + { + for (int i = 0; i < weapons.Count; i++) + { + WeaponBase weapon = weapons[i]; + if (weapon == null) break; + itemContexts[i] = BuildWeaponItem(weapon); + } + } + } + else if (title == "道具") + { + if (items is IReadOnlyList propItems) + { + for (int i = 0; i < propItems.Count; i++) + { + PropItem propItem = propItems[i]; + if (propItem == null) break; + itemContexts[i] = BuildPropItem(propItem); + } + } + } + + int currentCount = itemContexts.Length; + return new DisplayListAreaContext + { + Title = title, + CurrentCount = currentCount, + MaxCount = maxCount, + ItemContexts = itemContexts + }; + } + + private static DisplayItemContext BuildPropItem(PropItem propItem) + { + string iconAssetName = null; + ItemRarity rarity = ItemRarity.None; + + if (propItem != null) + { + iconAssetName = propItem.IconAssetName; + rarity = propItem.Rarity; + } + + return new DisplayItemContext + { + IconAssetName = iconAssetName, + Rarity = rarity, + IsWeapon = false + }; + } + + + private static DisplayItemContext BuildWeaponItem(WeaponBase weaponBase) + { + string iconAssetName = null; + ItemRarity rarity = ItemRarity.None; + + if (weaponBase != null && weaponBase.WeaponData != null) + { + iconAssetName = weaponBase.WeaponData.IconAssetName; + rarity = weaponBase.WeaponData.Rarity; + } + + return new DisplayItemContext + { + IconAssetName = iconAssetName, + Rarity = rarity, + IsWeapon = true + }; + } + + private static void AppendDisplayItemContext(DisplayListAreaContext listContext, DisplayItemContext newItem) + { + if (listContext == null || newItem == null) + { + return; + } + + int oldCount = listContext.ItemContexts != null ? listContext.ItemContexts.Length : 0; + DisplayItemContext[] newContexts = new DisplayItemContext[oldCount + 1]; + if (oldCount > 0) + { + System.Array.Copy(listContext.ItemContexts, newContexts, oldCount); + } + + newContexts[oldCount] = newItem; + listContext.ItemContexts = newContexts; + listContext.CurrentCount = oldCount + 1; + } + #endregion - public ShopFormController() - { - GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); - GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); - } - ~ShopFormController() - { - GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); - GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); - } + #region UI Methods - public int? OpenUI(ShopFormContext context) + protected override int? OpenUIInternal(ShopFormContext context) { if (context == null) { @@ -40,7 +189,8 @@ namespace UI _context = context; - if (_shopForm != null) + if (_shopForm != null && _shopFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_shopFormSerialId.Value)) { _shopForm.RefreshUI(_context); return _shopFormSerialId; @@ -48,26 +198,79 @@ namespace UI CloseUI(); _pendingRefresh = true; + SubscribeEvents(); _shopFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.ShopForm, context); return _shopFormSerialId; } - public void CloseUI() + public int? OpenUI(ShopFormRawData rawData) + { + ShopFormContext context = BuildContext(rawData); + return OpenUIInternal(context); + } + + public override int? OpenUI(object userData = null) + { + if (userData is ShopFormContext context) + { + return OpenUIInternal(context); + } + + if (userData is ShopFormRawData rawDataFromUserData) + { + return OpenUI(rawDataFromUserData); + } + + if (userData != null) + { + Log.Warning("ShopFormController.OpenUI() userData type is invalid."); + return null; + } + + if (_useCase == null) + { + Log.Error("ShopForm.OpenUI():: useCase is null."); + return null; + } + + ShopFormRawData rawData = _useCase.CreateInitialModel(); + return OpenUI(rawData); + } + + public override void CloseUI() { _pendingRefresh = false; - + UnsubscribeEvents(); if (_shopFormSerialId.HasValue) { - GameEntry.UI.CloseUIForm(_shopFormSerialId.Value); + if (GameEntry.UI.HasUIForm(_shopFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_shopFormSerialId.Value); + } + + _shopForm = null; + _shopFormSerialId = null; return; } if (_shopForm != null) { _shopForm.Close(); + _shopForm = null; } } + public override void BindUseCase(IUIUseCase useCase) + { + if (!(useCase is ShopFormUseCase shopFormUseCase)) + { + Log.Error("LevelUpForm.BindUseCase() useCase is invalid."); + return; + } + + _useCase = shopFormUseCase; + } + private void TryRefreshUI() { if (_context == null) @@ -84,7 +287,59 @@ namespace UI _shopForm.RefreshUI(_context); _pendingRefresh = false; } - + + #endregion + + #region Service + + private void RefreshGoodsItems(ShopRefreshResult result) + { + if (_context == null || result == null) + { + return; + } + + _context.GoodsItems = result.GoodsItems; + _context.RefreshPrice = result.RefreshPrice; + + if (_shopForm == null) + { + return; + } + + _shopForm.RefreshGoodsItems(result.GoodsItems); + _shopForm.RefreshRefreshPrice(result.RefreshPrice); + } + + private void ApplyGoodsPurchased(ShopPurchaseResult result) + { + if (_context == null || result == null) + { + return; + } + + if (_context.GoodsItems != null && result.GoodsIndex >= 0 && result.GoodsIndex < _context.GoodsItems.Count) + { + _context.GoodsItems[result.GoodsIndex] = null; + } + + if (result.DisplayItem != null) + { + if (result.DisplayItem.IsWeapon) + { + AppendDisplayItemContext(_context.WeaponListContext, result.DisplayItem); + } + else + { + AppendDisplayItemContext(_context.PropListContext, result.DisplayItem); + } + } + + _shopForm?.ApplyGoodsPurchased(result.GoodsIndex, result.DisplayItem); + } + + #endregion + #region Event Handlers private void OpenUIFormSuccess(object sender, GameEventArgs e) @@ -128,6 +383,103 @@ namespace UI _shopFormSerialId = null; } + private void Refresh(object sender, GameEventArgs e) + { + if (!(sender is ShopForm)) + { + return; + } + + if (!(e is RefreshEventArgs args)) + { + return; + } + + ShopRefreshResult result = _useCase.TryRefresh(args.Cost); + if (result == null) + { + return; + } + + RefreshGoodsItems(result); + } + + private void ShopPurchase(object sender, GameEventArgs e) + { + if (!(sender is ShopForm)) + { + return; + } + + if (!(e is ShopPurchaseEventArgs args)) + { + return; + } + + ShopPurchaseResult result = _useCase.TryPurchase(args.GoodsIndex); + if (result == null) + { + return; + } + + ApplyGoodsPurchased(result); + } + + private void ShopContinue(object sender, GameEventArgs e) + { + if (!(sender is ShopForm)) + { + return; + } + + if (!(e is ShopContinueEventArgs)) + { + return; + } + + _useCase?.Continue(); + } + + private void DisplayItemShow(object sender, GameEventArgs e) + { + if (!(e is DisplayItemShowEventArgs args)) return; + + DisplayItemInfoFormRawData rawData = new(); + rawData.TargetPos = args.TargetPos; + if (args.IsWeapon) + { + var weaponData = _rawData.WeaponItems[args.Index].WeaponData; + rawData.IconAssetName = weaponData.IconAssetName; + rawData.Title = weaponData.Title; + rawData.Rarity = weaponData.Rarity; + rawData.TypeText = "武器"; + rawData.Description = ItemDescUtility.CreateWeaponDescription(weaponData); + rawData.Price = 0; + rawData.IsWeapon = true; + } + else + { + var propItem = _rawData.PropItems[args.Index]; + rawData.IconAssetName = propItem.IconAssetName; + rawData.Title = propItem.Title; + rawData.Rarity = propItem.Rarity; + rawData.TypeText = "道具"; + rawData.Description = ItemDescUtility.CreatePropDescription(propItem); + rawData.Price = 0; + rawData.IsWeapon = false; + } + + GameEntry.UIRouter.OpenUI(UIFormType.DisplayItemInfoForm, rawData); + } + + + private void DisplayItemHide(object sender, GameEventArgs e) + { + if (!(e is DisplayItemHideEventArgs)) return; + + GameEntry.UIRouter.CloseUI(UIFormType.DisplayItemInfoForm); + } + #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData.meta b/Assets/GameMain/Scripts/UI/GameScene/RawData.meta new file mode 100644 index 0000000..dfe9b44 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac5b4f32ba8b93e4f93b94bc402245bd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs b/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs new file mode 100644 index 0000000..7b87585 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using Definition.Enum; +using UnityEngine; + +namespace UI +{ + public class DisplayItemInfoFormRawData + { + public string IconAssetName; + public string Title; + public string TypeText; + public ItemRarity Rarity; + public string Description; + public int Price; + public bool IsWeapon; + public Vector3 TargetPos; + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs.meta new file mode 100644 index 0000000..756de7f --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData/DisplayItemInfoFormRawData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 012ded06be40bcf48b3e79ce89df4e2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs b/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs new file mode 100644 index 0000000..dc48291 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using DataTable; + +namespace UI +{ + public class LevelUpFormRawData + { + public List Rewards; + public int RefreshPrice; + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs.meta new file mode 100644 index 0000000..55a5abe --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData/LevelUpFormRawData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a3ece8e2fb75f424cb4885d4344434d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs b/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs new file mode 100644 index 0000000..070be43 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; +using Definition.DataStruct; +using Entity; + +namespace UI +{ + public class ShopFormRawData + { + public int CurrentLevel; + public int RefreshPrice; + public int PlayerCoin; + public List GoodsItems; + public IReadOnlyList PropItems; + public int PropMaxCount = -1; + public IReadOnlyList WeaponItems; + public int WeaponMaxCount = -1; + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs.meta new file mode 100644 index 0000000..39f4261 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/RawData/ShopFormRawData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 533bff5f9d3bc7847af44dcd1cdffba3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase.meta b/Assets/GameMain/Scripts/UI/GameScene/UseCase.meta new file mode 100644 index 0000000..6f51431 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 134aefa2f7839e641b5824d665cbb8ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs b/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs new file mode 100644 index 0000000..351e7e0 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs @@ -0,0 +1,74 @@ +using Definition.DataStruct; +using Entity; +using Game.Utility; +using Procedure; + +namespace UI +{ + public class DisplayItemInfoFormUseCase : IUIUseCase + { + private readonly ProcedureGame _procedureGame; + + private Player Player => _procedureGame != null ? _procedureGame.Player : null; + + public DisplayItemInfoFormUseCase(ProcedureGame procedureGame) + { + _procedureGame = procedureGame; + } + + public DisplayItemInfoFormRawData CreateModel(int index, bool isWeapon) + { + if (index < 0 || Player == null) + { + return null; + } + + if (isWeapon) + { + var weapons = Player.Weapons; + if (weapons == null || index >= weapons.Count) + { + return null; + } + + WeaponBase weapon = weapons[index]; + if (weapon == null || weapon.WeaponData == null) + { + return null; + } + + return new DisplayItemInfoFormRawData + { + IconAssetName = weapon.WeaponData.IconAssetName, + Title = weapon.WeaponData.Title, + TypeText = "Weapon", + Description = ItemDescUtility.CreateWeaponDescription(weapon), + Price = 0, + IsWeapon = true + }; + } + + var props = Player.Props; + if (props == null || index >= props.Count) + { + return null; + } + + PropItem prop = props[index]; + if (prop == null) + { + return null; + } + + return new DisplayItemInfoFormRawData + { + IconAssetName = prop.IconAssetName, + Title = prop.Title, + TypeText = "Prop", + Description = ItemDescUtility.CreatePropDescription(prop), + Price = 0, + IsWeapon = false + }; + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs.meta new file mode 100644 index 0000000..75dc647 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase/DisplayItemInfoFormUseCase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 48c1f32fe95e20c43b8015ac1438d54e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs b/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs new file mode 100644 index 0000000..823353e --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs @@ -0,0 +1,137 @@ +using System.Collections.Generic; +using System.Linq; +using DataTable; +using Definition.DataStruct; +using Definition.Enum; +using Entity; +using Procedure; +using UnityEngine; +using UnityGameFramework.Runtime; + +namespace UI +{ + internal class LevelUpFormUseCase : IUIUseCase + { + private const int BaseRefreshPrice = 2; + private readonly GameStateLevelUp _gameStateLevelUp; + private readonly DRLevelUpReward[] _allRewards; + + private int _refreshCount; + private LevelUpFormRawData _currentModel; + + private readonly Player _player; + + public LevelUpFormUseCase(Player player, GameStateLevelUp gameStateLevelUp) + { + _player = player; + _gameStateLevelUp = gameStateLevelUp; + _allRewards = GameEntry.DataTable.GetDataTable().ToArray(); + } + + public LevelUpFormRawData CreateInitialModel(int count = 4) + { + _refreshCount = 0; + + if (_gameStateLevelUp == null || _player.PendingLevelPoints <= 0) + { + _currentModel = null; + return null; + } + + _currentModel = BuildModel(BaseRefreshPrice, count); + return _currentModel; + } + + public LevelUpFormRawData TryRefresh(int refreshCost, int count = 4) + { + if (_currentModel == null) + { + return null; + } + + if (_player == null || _player.Coin < refreshCost) + { + return null; + } + + _player.Coin -= refreshCost; + + _refreshCount++; + _currentModel = BuildModel((_refreshCount + 1) * BaseRefreshPrice, count); + return _currentModel; + } + + public LevelUpFormRawData SelectReward(int selectedIndex, int count = 4) + { + if (_currentModel?.Rewards == null) + { + return null; + } + + if (selectedIndex < 0 || selectedIndex >= _currentModel.Rewards.Count) + { + Log.Warning("LevelUpFormUseCase::SelectReward: Invalid index"); + return null; + } + + ApplyReward(_currentModel.Rewards[selectedIndex]); + + if (--_player.PendingLevelPoints > 0) + { + _refreshCount = 0; + _currentModel = BuildModel(BaseRefreshPrice, count); + return _currentModel; + } + + _gameStateLevelUp.IsCompleted = true; + _currentModel = null; + return null; + } + + private LevelUpFormRawData BuildModel(int refreshPrice, int count) + { + if (_allRewards == null || _allRewards.Length == 0) + { + Log.Error("LevelUpFormUseCase::BuildModel(): _allRewards is empty"); + return null; + } + + int finalCount = count > 0 ? System.Math.Min(count, _allRewards.Length) : _allRewards.Length; + List selections = new List(finalCount); + + for (int i = 0; i < finalCount; i++) + { + int index = Random.Range(0, _allRewards.Length); + selections.Add(_allRewards[index]); + } + + return new LevelUpFormRawData + { + Rewards = selections, + RefreshPrice = refreshPrice + }; + } + + private void ApplyReward(DRLevelUpReward reward) + { + if (reward == null) + { + return; + } + + if (_player == null) + { + Log.Warning("LevelUpFormUseCase::ApplyReward: Player is null"); + return; + } + + if (reward.Modifiers == null || reward.Modifiers.Length == 0) + { + Log.Warning("LevelUpFormUseCase::ApplyReward: Reward modifiers are empty"); + return; + } + + _player.AddProp(new PropItem(reward.Modifiers, ItemRarity.White, reward.Title, reward.IconAssetName)); + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs.meta new file mode 100644 index 0000000..ad4db23 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase/LevelUpFormUseCase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19d2fa806b03510498d072c5b8710bcb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs b/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs new file mode 100644 index 0000000..e33fed2 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs @@ -0,0 +1,248 @@ +using System.Collections.Generic; +using System.Linq; +using DataTable; +using Definition.DataStruct; +using Definition.Enum; +using Entity; +using Game.Utility; +using GameFramework.DataTable; +using Procedure; +using UnityEngine; +using UnityGameFramework.Runtime; +using Random = UnityEngine.Random; + +namespace UI +{ + internal sealed class ShopRefreshResult + { + public List GoodsItems; + public int RefreshPrice; + } + + internal sealed class ShopPurchaseResult + { + public int GoodsIndex; + public DisplayItemContext DisplayItem; + } + + internal class ShopFormUseCase : IUIUseCase + { + private readonly ProcedureGame _procedureGame; + private readonly GameStateShop _gameStateShop; + + private readonly DRGoods[] _allGoods; + private readonly IDataTable _propDataTable; + private readonly IDataTable _weaponDataTable; + + private readonly List _selections = new(); + private int _refreshTime; + + private Player Player => _procedureGame.Player; + + private sealed class ShopGoodsSelection + { + public GoodsType GoodsType; + public int GoodsTypeId; + public int Price; + } + + public ShopFormUseCase(ProcedureGame procedureGame, GameStateShop gameStateShop) + { + _procedureGame = procedureGame; + _gameStateShop = gameStateShop; + _allGoods = GameEntry.DataTable.GetDataTable().ToArray(); + _propDataTable = GameEntry.DataTable.GetDataTable(); + _weaponDataTable = GameEntry.DataTable.GetDataTable(); + } + + public ShopFormRawData CreateInitialModel() + { + _refreshTime = 0; + + Player player = Player; + if (_procedureGame == null || player == null) + { + return null; + } + + int currentLevel = _procedureGame.CurrentLevel; + return new ShopFormRawData + { + CurrentLevel = currentLevel, + RefreshPrice = currentLevel, + PlayerCoin = player.Coin, + GoodsItems = BuildRandomGoodsItems(4), + PropItems = player.Props, + PropMaxCount = -1, + WeaponItems = player.Weapons, + WeaponMaxCount = player.WeaponCapacity + }; + } + + public ShopRefreshResult TryRefresh(int cost) + { + Player player = Player; + if (player == null || _procedureGame == null || player.Coin < cost) + { + return null; + } + + player.Coin -= cost; + + int refreshPrice = (_refreshTime + 1) * _procedureGame.CurrentLevel; + _refreshTime++; + + return new ShopRefreshResult + { + GoodsItems = BuildRandomGoodsItems(4), + RefreshPrice = refreshPrice + }; + } + + public ShopPurchaseResult TryPurchase(int goodsIndex) + { + if (goodsIndex < 0 || goodsIndex >= _selections.Count) + { + Log.Warning("ShopFormUseCase::TryPurchase: Invalid index"); + return null; + } + + ShopGoodsSelection selection = _selections[goodsIndex]; + if (selection == null) + { + Log.Warning("ShopFormUseCase::TryPurchase: Item already purchased."); + return null; + } + + Player player = Player; + if (player == null || player.Coin < selection.Price) + { + return null; + } + + player.Coin -= selection.Price; + DisplayItemContext displayItem = ApplyGoodsPurchase(selection); + _selections[goodsIndex] = null; + + return new ShopPurchaseResult + { + GoodsIndex = goodsIndex, + DisplayItem = displayItem + }; + } + + public void Continue() + { + _gameStateShop.ShopFinish = true; + } + + private List BuildRandomGoodsItems(int count) + { + if (_allGoods == null || _allGoods.Length == 0) + { + Log.Error("ShopFormUseCase::BuildRandomGoodsItems(): _allGoods is empty"); + return null; + } + + int finalCount = Mathf.Min(count, _allGoods.Length); + List goodsItems = new List(finalCount); + _selections.Clear(); + + for (int i = 0; i < finalCount; i++) + { + int index = Random.Range(0, _allGoods.Length); + DRGoods drGoods = _allGoods[index]; + GoodsItemContext goodsItem = new GoodsItemContext(); + int price; + + if (drGoods.GoodsType == GoodsType.Prop) + { + DRProp drProp = _propDataTable.GetDataRow(drGoods.GoodsTypeId); + if (drProp == null) + { + Log.Warning($"ShopFormUseCase::BuildRandomGoodsItems: Missing DRProp, id = {drGoods.GoodsTypeId}"); + continue; + } + + price = CalculateRandomizedPrice(drProp.Price, drProp.PriceRandomPercent); + goodsItem.Title = drProp.Title; + goodsItem.Type = "Prop"; + goodsItem.Rarity = drProp.Rarity; + GameEntry.SpriteCache.GetSprite(drProp.IconAssetName, sprite => goodsItem.Icon = sprite); + goodsItem.Description = ItemDescUtility.CreatePropDescription(drProp.Modifiers); + } + else if (drGoods.GoodsType == GoodsType.Weapon) + { + DRWeapon drWeapon = _weaponDataTable.GetDataRow(drGoods.GoodsTypeId); + if (drWeapon == null) + { + Log.Warning($"ShopFormUseCase::BuildRandomGoodsItems: Missing DRWeapon, id = {drGoods.GoodsTypeId}"); + continue; + } + + price = CalculateRandomizedPrice(drWeapon.Price, drWeapon.PriceRandomPercent); + goodsItem.Title = drWeapon.Title; + goodsItem.Type = "Weapon"; + goodsItem.Rarity = drWeapon.Rarity; + GameEntry.SpriteCache.GetSprite(drWeapon.IconAssetName, sprite => goodsItem.Icon = sprite); + goodsItem.Description = ItemDescUtility.CreateWeaponDescription(drWeapon); + } + else + { + Log.Warning($"ShopFormUseCase::BuildRandomGoodsItems: Unsupported goods type = {drGoods.GoodsType}"); + continue; + } + + goodsItem.Price = price; + + _selections.Add(new ShopGoodsSelection + { + GoodsType = drGoods.GoodsType, + GoodsTypeId = drGoods.GoodsTypeId, + Price = price + }); + + goodsItems.Add(goodsItem); + } + + return goodsItems; + } + + private static int CalculateRandomizedPrice(int basePrice, float priceRandomPercent) + { + float normalizedPercent = priceRandomPercent > 1f ? priceRandomPercent / 100f : priceRandomPercent; + normalizedPercent = Mathf.Max(0f, normalizedPercent); + float offsetPercent = Random.Range(-normalizedPercent, normalizedPercent); + int finalPrice = Mathf.RoundToInt(basePrice * (1f + offsetPercent)); + return Mathf.Max(1, finalPrice); + } + + private DisplayItemContext ApplyGoodsPurchase(ShopGoodsSelection goods) + { + if (goods == null || Player == null) + { + return null; + } + + if (goods.GoodsType == GoodsType.Prop) + { + DRProp drProp = _propDataTable != null ? _propDataTable.GetDataRow(goods.GoodsTypeId) : null; + if (drProp == null || drProp.Modifiers == null || drProp.Modifiers.Length == 0) + { + Log.Warning("ShopFormUseCase::ApplyGoodsPurchase: Prop modifiers are empty"); + return null; + } + + Player.AddProp(new PropItem(drProp.Modifiers, drProp.Rarity, drProp.Title, drProp.IconAssetName)); + return new DisplayItemContext + { + IconAssetName = drProp.IconAssetName, + Rarity = drProp.Rarity, + IsWeapon = false + }; + } + + return null; + } + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs.meta new file mode 100644 index 0000000..fea180b --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/UseCase/ShopFormUseCase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e973748d1bd846349d42e219a80f07c2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs new file mode 100644 index 0000000..532dd3a --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs @@ -0,0 +1,59 @@ +using CustomEvent; +using UnityEngine; +using UnityEngine.UI; + +namespace UI +{ + public class DisplayItem : MonoBehaviour + { + [SerializeField] private IconArea _iconArea; + + [SerializeField] private RectTransform _itemRect; + + private DisplayItemContext _context; + + private int _index = -1; + + public void OnInit(DisplayItemContext context, int index) + { + if (context == null) return; + + _context = context; + _index = index; + + if (_iconArea != null) + { + string iconName = _context.IconAssetName; + GameEntry.SpriteCache.GetSprite(iconName, sprite => { _iconArea.OnInit(sprite, context.Rarity); }); + } + } + + public void OnReset() + { + _context = null; + _index = -1; + + if (_iconArea != null) + { + _iconArea.OnReset(); + } + } + + public void OnItemInfoShow() + { + if (_index < 0) return; + Vector3 targetPos = _itemRect.position + new Vector3(0, _itemRect.sizeDelta.y / 2, 0); + GameEntry.Event.Fire(this, DisplayItemShowEventArgs.Create(_index, _context.IsWeapon, targetPos)); + } + + public void SetIndex(int index) + { + _index = index; + } + + public void OnItemInfoHide() + { + GameEntry.Event.Fire(this, DisplayItemHideEventArgs.Create()); + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs.meta new file mode 100644 index 0000000..8b82422 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7fe0ad0e96348114786974bb02d62914 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs new file mode 100644 index 0000000..7e8b6d1 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs @@ -0,0 +1,191 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class DisplayItemInfoForm : UGuiForm + { + [SerializeField] private RectTransform _content; + + [SerializeField] private IconArea _iconArea; + + [SerializeField] private TMP_Text _itemTitle; + + [SerializeField] private TMP_Text _itemTypeText; + + [SerializeField] private TMP_Text _itemDescription; + + [SerializeField] private CommonButton _recycleButton; + + [SerializeField] private TMP_Text _itemPrice; + + [SerializeField] private bool _autoResizeHeight = true; + + [SerializeField] private float _fixedTopHeight = 150f; + + [SerializeField] private float _fixedBottomHeight = 150f; + + [SerializeField] private float _fixedWidth = 300f; + + [SerializeField] private float _screenEdgePadding = 0f; + + private DisplayItemInfoFormContext _context; + private Vector3 _targetPos; + + public void RefreshUI(DisplayItemInfoFormContext context) + { + if (context == null) + { + Log.Warning("DisplayItemInfoForm context is invalid."); + return; + } + + _context = context; + + _targetPos = ConvertWorldToAnchored(_context.TargetPos); + + if (_content != null) + { + _content.anchoredPosition3D = _targetPos; + } + + if (_itemTitle != null) _itemTitle.text = _context.Title ?? string.Empty; + if (_itemTypeText != null) _itemTypeText.text = _context.TypeText ?? string.Empty; + if (_itemDescription != null) _itemDescription.text = _context.Description ?? string.Empty; + if (_itemPrice != null) _itemPrice.text = $"{_context.Price} "; + + if (_recycleButton != null) + { + _recycleButton.gameObject.SetActive(_context.IsWeapon); + } + + if (_iconArea != null) + { + if (!string.IsNullOrEmpty(_context.IconAssetName)) + { + string iconAssetName = _context.IconAssetName; + GameEntry.SpriteCache.GetSprite(iconAssetName, sprite => + { + if (_context != null && _context.IconAssetName == iconAssetName) + { + _iconArea.OnInit(sprite, context.Rarity); + ResizeToFitContent(); + ApplyClampedTargetPos(); + } + }); + } + } + + ResizeToFitContent(); + ApplyClampedTargetPos(); + } + + protected override void OnOpen(object userData) + { + base.OnOpen(userData); + + if (!(userData is DisplayItemInfoFormContext context)) + { + Log.Error("DisplayItemInfoFormContext is invalid."); + return; + } + + RefreshUI(context); + } + + protected override void OnClose(bool isShutdown, object userData) + { + _context = null; + base.OnClose(isShutdown, userData); + } + + private void ResizeToFitContent() + { + if (!_autoResizeHeight || _content == null) + { + return; + } + + if (_itemDescription == null) + { + return; + } + + _itemDescription.ForceMeshUpdate(); + var descriptionSize = _itemDescription.rectTransform.sizeDelta; + descriptionSize.y = _itemDescription.preferredHeight; + _itemDescription.rectTransform.sizeDelta = descriptionSize; + float descriptionHeight = Mathf.Max(0f, _itemDescription.preferredHeight); + float targetHeight = _fixedTopHeight + descriptionHeight + _fixedBottomHeight; + + Vector2 size = new Vector2(_fixedWidth, targetHeight); + _content.sizeDelta = size; + } + + private void ApplyClampedTargetPos() + { + if (_content == null) + { + return; + } + + RectTransform parent = _content.parent as RectTransform; + if (parent == null) + { + return; + } + + Vector2 size = _content.sizeDelta; + if (size.x <= 0f || size.y <= 0f) + { + size = _content.rect.size; + } + + Vector2 pivot = _content.pivot; + float halfWidth = parent.rect.width * 0.5f; + float halfHeight = parent.rect.height * 0.5f; + + float minX = -halfWidth + size.x * pivot.x + _screenEdgePadding; + float maxX = halfWidth - size.x * (1f - pivot.x) - _screenEdgePadding; + float minY = -halfHeight + size.y * pivot.y + _screenEdgePadding; + float maxY = halfHeight - size.y * (1f - pivot.y) - _screenEdgePadding; + + float clampedX = minX <= maxX ? Mathf.Clamp(_targetPos.x, minX, maxX) : 0f; + float clampedY = minY <= maxY ? Mathf.Clamp(_targetPos.y, minY, maxY) : 0f; + + _content.anchoredPosition3D = new Vector3(clampedX, clampedY, _targetPos.z); + } + + private Vector3 ConvertWorldToAnchored(Vector3 worldPos) + { + if (_content == null) + { + return worldPos; + } + + RectTransform parent = _content.parent as RectTransform; + if (parent == null) + { + return worldPos; + } + + Canvas canvas = _content.GetComponentInParent(); + Camera uiCamera = null; + if (canvas != null && canvas.renderMode != RenderMode.ScreenSpaceOverlay) + { + uiCamera = canvas.worldCamera; + } + + Vector2 screenPoint = RectTransformUtility.WorldToScreenPoint(uiCamera, worldPos); + if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(parent, screenPoint, uiCamera, out Vector2 localPoint)) + { + return worldPos; + } + + float z = _content.anchoredPosition3D.z; + return new Vector3(localPoint.x, localPoint.y, z); + } + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs.meta new file mode 100644 index 0000000..11d8319 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemInfoForm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 32469245f20597240a3c51d2cd1fb0c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs new file mode 100644 index 0000000..b303dbe --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs @@ -0,0 +1,27 @@ +using GameFramework; +using GameFramework.ObjectPool; +using UnityEngine; + +namespace UI +{ + public class DisplayItemObject : ObjectBase + { + public static DisplayItemObject Create(object target) + { + DisplayItemObject displayItemObject = ReferencePool.Acquire(); + displayItemObject.Initialize(target); + return displayItemObject; + } + + protected override void Release(bool isShutdown) + { + DisplayItem item = (DisplayItem)Target; + if (item == null) + { + return; + } + + Object.Destroy(item.gameObject); + } + } +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs.meta new file mode 100644 index 0000000..3d13c86 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayItemObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f21ab051c635de04998b80804d9bafe5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs new file mode 100644 index 0000000..2f806aa --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs @@ -0,0 +1,278 @@ +using System; +using System.Collections.Generic; +using GameFramework.ObjectPool; +using TMPro; +using UnityEngine; +using UnityEngine.UI; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class DisplayListArea : MonoBehaviour + { + [SerializeField] private TMP_Text _titleText; + + [SerializeField] private TMP_Text _countText; + + [SerializeField] private DisplayItem _displayItemTemplate; + + [SerializeField] private Transform _displayItemRoot; + + [SerializeField] private Vector2 _startPosition = Vector2.zero; + + [SerializeField] private float _itemSize = 150f; + + [SerializeField] private float _itemSpacing = 10f; + + [SerializeField] private int _fixedColumnCount = 0; + + [SerializeField] private int _instancePoolCapacity = 32; + + private DisplayListAreaContext _context; + + private IObjectPool _displayItemObjectPool; + private const string DisplayItemPoolName = "DisplayItem"; + + private readonly List _activeItems = new List(); + + public void OnInit(DisplayListAreaContext context) + { + if (context == null) + { + Log.Warning("DisplayListArea context is invalid."); + return; + } + + EnsurePool(); + _context = context; + + if (_titleText != null) _titleText.text = context.Title; + UpdateCountText(context.CurrentCount, context.MaxCount); + + int itemCount = context.ItemContexts?.Length ?? 0; + int targetCount = Mathf.Min(context.CurrentCount, itemCount); + EnsureItemCount(targetCount); + for (int i = 0; i < targetCount; i++) + { + _activeItems[i].OnInit(context.ItemContexts[i], i); + } + + LayoutItems(); + } + + public void OnReset() + { + _context = null; + + for (int i = _activeItems.Count - 1; i >= 0; i--) + { + HideItem(_activeItems[i]); + } + } + + public void OnDestroy() + { + _displayItemObjectPool.ReleaseAllUnused(); + } + + public DisplayItem AddItem(DisplayItemContext itemContext) + { + EnsurePool(); + if (_displayItemObjectPool == null) + { + return null; + } + + DisplayItem item = CreateItem(); + if (item == null) + { + return null; + } + + int index = _activeItems.Count; + _activeItems.Add(item); + item.OnInit(itemContext, index); + item.SetIndex(index); + + int columnCount = _fixedColumnCount > 0 ? _fixedColumnCount : CalculateColumnCount(GetRootWidth()); + LayoutItem(item, index, columnCount); + + int currentCount = _activeItems.Count; + int maxCount = _context != null ? _context.MaxCount : -1; + if (_context != null) + { + _context.CurrentCount = currentCount; + } + + UpdateCountText(currentCount, maxCount); + + return item; + } + + public bool RemoveItemAt(int index) + { + if (index < 0 || index >= _activeItems.Count) + { + return false; + } + + HideItem(_activeItems[index]); + LayoutItems(); + + int currentCount = _activeItems.Count; + int maxCount = _context != null ? _context.MaxCount : -1; + if (_context != null) + { + _context.CurrentCount = currentCount; + } + + UpdateCountText(currentCount, maxCount); + + return true; + } + + private void EnsurePool() + { + if (_displayItemObjectPool != null) return; + + if (_displayItemRoot == null) + { + _displayItemRoot = transform; + } + + GridLayoutGroup gridLayout = _displayItemRoot.GetComponent(); + if (gridLayout != null) + { + gridLayout.enabled = false; + } + + if (GameEntry.ObjectPool.HasObjectPool(DisplayItemPoolName)) + { + _displayItemObjectPool = GameEntry.ObjectPool.GetObjectPool(DisplayItemPoolName); + return; + } + + if (_displayItemTemplate == null) + { + Debug.LogError("DisplayListArea requires a DisplayItem template."); + return; + } + + _displayItemObjectPool = + GameEntry.ObjectPool.CreateSingleSpawnObjectPool(DisplayItemPoolName, + _instancePoolCapacity); + } + + private void EnsureItemCount(int count) + { + if (_displayItemObjectPool == null) return; + + for (int i = _activeItems.Count; i < count; i++) + { + DisplayItem item = CreateItem(); + if (item == null) + { + break; + } + + _activeItems.Add(item); + } + + for (int i = _activeItems.Count - 1; i >= count; i--) + { + HideItem(_activeItems[i]); + } + } + + private DisplayItem CreateItem() + { + DisplayItem item = null; + DisplayItemObject itemObject = _displayItemObjectPool.Spawn(); + if (itemObject != null) + { + item = (DisplayItem)itemObject.Target; + } + else + { + if (_displayItemTemplate == null) + { + Debug.LogError("DisplayListArea requires a DisplayItem template."); + return null; + } + + item = Instantiate(_displayItemTemplate); + _displayItemObjectPool.Register(DisplayItemObject.Create(item), true); + } + + if (_displayItemRoot != null) + { + Transform itemTransform = item.transform; + itemTransform.SetParent(_displayItemRoot, false); + } + + item.gameObject.SetActive(true); + return item; + } + + private void HideItem(DisplayItem item) + { + if (item == null) return; + item.OnReset(); + _activeItems.Remove(item); + item.gameObject.SetActive(false); + _displayItemObjectPool?.Unspawn(item); + } + + private void LayoutItems() + { + if (_displayItemRoot == null) return; + + int columnCount = _fixedColumnCount > 0 ? _fixedColumnCount : CalculateColumnCount(GetRootWidth()); + + for (int i = 0; i < _activeItems.Count; i++) + { + DisplayItem item = _activeItems[i]; + item.SetIndex(i); + LayoutItem(item, i, columnCount); + } + } + + private void LayoutItem(DisplayItem item, int index, int columnCount) + { + if (item == null) return; + RectTransform itemRect = item.GetComponent(); + if (itemRect == null) return; + + float step = _itemSize + _itemSpacing; + int row = index / columnCount; + int col = index % columnCount; + + itemRect.anchorMin = new Vector2(0f, 1f); + itemRect.anchorMax = new Vector2(0f, 1f); + itemRect.pivot = new Vector2(0f, 1f); + itemRect.sizeDelta = new Vector2(_itemSize, _itemSize); + itemRect.anchoredPosition = _startPosition + new Vector2(col * step, -row * step); + } + + private float GetRootWidth() + { + RectTransform rootRect = _displayItemRoot as RectTransform; + return rootRect != null ? rootRect.rect.width : 0f; + } + + private int CalculateColumnCount(float rootWidth) + { + if (rootWidth <= 0f) return 1; + + float step = _itemSize + _itemSpacing; + int columns = Mathf.FloorToInt((rootWidth + _itemSpacing) / step); + return Mathf.Max(1, columns); + } + + private void UpdateCountText(int currentCount, int maxCount) + { + if (_countText == null) return; + _countText.text = maxCount == -1 ? $"({currentCount})" : $"({currentCount}/{maxCount})"; + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs.meta new file mode 100644 index 0000000..70b6bc3 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/GameScene/View/DisplayListArea.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 58c6ff306e4be41458bdf4dd82ad92e1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs b/Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs index 92326a4..f464d57 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/View/HudForm.cs @@ -13,32 +13,47 @@ namespace UI [SerializeField] private float _sliderFadeDuration = 0.5f; [SerializeField] private Slider _hpSlider; + + [SerializeField] private TMP_Text _hpText; + private float _currentHpPercent = 0; private Coroutine _hpSliderFadeCoroutine; [SerializeField] private Slider _expSlider; + private float _currentExpPercent = 0; private Coroutine _expSliderFadeCoroutine; + + [SerializeField] private TMP_Text _expText; + + private int _playerCurrentLevel = 1; [SerializeField] private TMP_Text _coinText; private int _currentCoin = 0; + public void RefreshUI(HudFormContext hudFormContext) + { + + } + #region FSM protected override void OnInit(object userData) { base.OnInit(userData); - GameEntry.Event.Subscribe(PlayerHealthChangeEventArgs.EventId, OnPlayerHpChange); - GameEntry.Event.Subscribe(PlayerExpChangeEventArgs.EventId, OnPlayerExpChange); - GameEntry.Event.Subscribe(PlayerCoinChangeEventArgs.EventId, OnPlayerCoinChange); + GameEntry.Event.Subscribe(PlayerHealthChangeEventArgs.EventId, PlayerHpChange); + GameEntry.Event.Subscribe(PlayerExpChangeEventArgs.EventId, PlayerExpChange); + GameEntry.Event.Subscribe(PlayerCoinChangeEventArgs.EventId, PlayerCoinChange); + GameEntry.Event.Subscribe(PlayerLevelUpEventArgs.EventId, PlayerLevelUp); } protected override void OnClose(bool isShutdown, object userData) { - GameEntry.Event.Unsubscribe(PlayerHealthChangeEventArgs.EventId, OnPlayerHpChange); - GameEntry.Event.Unsubscribe(PlayerExpChangeEventArgs.EventId, OnPlayerExpChange); - GameEntry.Event.Unsubscribe(PlayerCoinChangeEventArgs.EventId, OnPlayerCoinChange); + GameEntry.Event.Unsubscribe(PlayerLevelUpEventArgs.EventId, PlayerLevelUp); + GameEntry.Event.Unsubscribe(PlayerHealthChangeEventArgs.EventId, PlayerHpChange); + GameEntry.Event.Unsubscribe(PlayerExpChangeEventArgs.EventId, PlayerExpChange); + GameEntry.Event.Unsubscribe(PlayerCoinChangeEventArgs.EventId, PlayerCoinChange); base.OnClose(isShutdown, userData); } @@ -47,9 +62,12 @@ namespace UI #region Event Handlers - private void OnPlayerHpChange(object sender, GameEventArgs e) + private void PlayerHpChange(object sender, GameEventArgs e) { if (!(e is PlayerHealthChangeEventArgs args)) return; + + _hpText.text = $"{args.CurrentHealth}/{args.MaxHealth}"; + float percent = (float)args.CurrentHealth / args.MaxHealth; if (Mathf.Approximately(_currentHpPercent, percent)) return; @@ -59,7 +77,7 @@ namespace UI _hpSliderFadeCoroutine = StartCoroutine(_hpSlider.SmoothValue(percent, _sliderFadeDuration)); } - private void OnPlayerExpChange(object sender, GameEventArgs e) + private void PlayerExpChange(object sender, GameEventArgs e) { if (!(e is PlayerExpChangeEventArgs args)) return; float percent = (float)args.CurrentExp / args.MaxExp; @@ -71,12 +89,20 @@ namespace UI _expSliderFadeCoroutine = StartCoroutine(_expSlider.SmoothValue(percent, _sliderFadeDuration)); } - private void OnPlayerCoinChange(object sender, GameEventArgs e) + private void PlayerLevelUp(object sender, GameEventArgs e) + { + if (!(e is PlayerLevelUpEventArgs)) return; + + _playerCurrentLevel++; + _expText.text = $"LV.{_playerCurrentLevel}"; + } + + private void PlayerCoinChange(object sender, GameEventArgs e) { if (!(e is PlayerCoinChangeEventArgs args)) return; if (_currentCoin == args.CoinCount) return; - _coinText.text = args.CoinCount.ToString(); + _coinText.text = $" {args.CoinCount}"; _currentCoin = args.CoinCount; } @@ -100,4 +126,4 @@ namespace UI #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs b/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs index f5656a3..b43d3ce 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpForm.cs @@ -7,21 +7,16 @@ namespace UI { public class LevelUpForm : UGuiForm { - [SerializeField] private TMP_Text _titleText; + [SerializeField] private LevelUpRewardItem[] _propItems; - [SerializeField] private LevelUpPropItem[] _propItems; + [SerializeField] private TMP_Text _refreshButtonText; private LevelUpFormContext _context; public void RefreshUI(LevelUpFormContext context) { _context = context; - - if (_titleText != null) - { - _titleText.text = $"Level Up (Lv.{_context.Level})"; - } - + foreach (var propItem in _propItems) { propItem.gameObject.SetActive(false); @@ -33,6 +28,9 @@ namespace UI _propItems[i].gameObject.SetActive(true); _propItems[i].Init(_context.Props[i]); } + + //刷新 -20 + _refreshButtonText.text = $"刷新 -{context.RefreshPrice} "; } #region FSM @@ -58,9 +56,14 @@ namespace UI #endregion - private void OnSelectProp(int index) + public void OnSelectButtonClick(int index) { GameEntry.Event.Fire(this, LevelUpPropSelectedEventArgs.Create(index)); } + + public void OnRefreshButtonClick() + { + GameEntry.Event.Fire(this, RefreshEventArgs.Create(_context.RefreshPrice)); + } } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpPropItem.cs b/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs similarity index 66% rename from Assets/GameMain/Scripts/UI/GameScene/View/LevelUpPropItem.cs rename to Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs index 50d6997..cc0404c 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpPropItem.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs @@ -1,15 +1,13 @@ -using System; using TMPro; using UnityEngine; -using UnityEngine.Events; using UnityEngine.UI; using UnityGameFramework.Runtime; namespace UI { - public class LevelUpPropItem : MonoBehaviour + public class LevelUpRewardItem : MonoBehaviour { - [SerializeField] private Image _iconImage; + [SerializeField] private IconArea _iconArea; [SerializeField] private TMP_Text _titleText; @@ -17,10 +15,10 @@ namespace UI [SerializeField] private TMP_Text _descriptionText; - private LevelUpPropContext _context; + private LevelUpRewardItemContext _context; - public void Init(LevelUpPropContext context) + public void Init(LevelUpRewardItemContext context) { if (context == null) { @@ -31,20 +29,19 @@ namespace UI _context = context; if (_titleText != null) _titleText.text = context.Title; - if (_typeText != null) _typeText.text = context.Type; if (_descriptionText != null) _descriptionText.text = context.Description; - if (_iconImage != null) _iconImage.sprite = context.Icon; + if (_iconArea != null) _iconArea.SetIcon(context.Icon); LoadIcon(_context.IconAssetName); } private void LoadIcon(string iconAssetName) { - if (_iconImage == null) return; + if (_iconArea == null) return; if (string.IsNullOrEmpty(iconAssetName)) return; - GameEntry.SpriteCache.GetSprite(iconAssetName, sprite => _iconImage.sprite = sprite); + GameEntry.SpriteCache.GetSprite(iconAssetName, sprite => _iconArea.SetIcon(sprite)); } } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpPropItem.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/LevelUpPropItem.cs.meta rename to Assets/GameMain/Scripts/UI/GameScene/View/LevelUpRewardItem.cs.meta diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs b/Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs index 75c7a6a..90adcdc 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/View/ShopForm.cs @@ -1,7 +1,9 @@ +using System.Collections.Generic; using CustomEvent; using GameFramework.Event; using TMPro; using UnityEngine; +using UnityGameFramework.Runtime; namespace UI { @@ -18,7 +20,11 @@ namespace UI [SerializeField] private TMP_Text _playerCoinText; private int _currentCoin; - [SerializeField] private GoodsItem[] _goodsItems; + [SerializeField] private ShopGoodsItem[] _goodsItems; + + [SerializeField] private DisplayListArea _propListArea; + + [SerializeField] private DisplayListArea _weaponListArea; private ShopFormContext _context; @@ -31,22 +37,89 @@ namespace UI _titleText.text = $"商店 (Lv.{context.CurrentLevel})"; _continueButtonText.text = $"继续 (Lv.{context.CurrentLevel + 1})"; - _refreshPriceText.text = $"-{context.RefreshPrice}"; - _playerCoinText.text = context.PlayerCoin.ToString(); + RefreshRefreshPrice(context.RefreshPrice); + _playerCoinText.text = $" {context.PlayerCoin}"; + RefreshGoodsItems(context.GoodsItems); + + if (_propListArea != null && context.PropListContext != null) + { + _propListArea.OnInit(context.PropListContext); + } + + if (_weaponListArea != null && context.WeaponListContext != null) + { + _weaponListArea.OnInit(context.WeaponListContext); + } + } + + internal void RefreshGoodsItems(List goodsItems) + { foreach (var item in _goodsItems) { item.gameObject.SetActive(false); } - if (_context.GoodsItems == null) return; - for (int i = 0; i < _context.GoodsItems.Count; i++) + if (goodsItems == null) { - _goodsItems[i].Init(context.GoodsItems[i]); + return; + } + + int count = Mathf.Min(_goodsItems.Length, goodsItems.Count); + for (int i = 0; i < count; i++) + { + _goodsItems[i].Init(goodsItems[i]); _goodsItems[i].gameObject.SetActive(true); } } + internal void RefreshRefreshPrice(int refreshPrice) + { + _refreshPriceText.text = $"刷新 -{refreshPrice} "; + } + + internal void ApplyGoodsPurchased(int goodsIndex, DisplayItemContext displayItem) + { + SetGoodsItemVisible(goodsIndex, false); + + if (displayItem == null) + { + return; + } + + if (displayItem.IsWeapon) + { + AddWeaponDisplayItem(displayItem); + } + else + { + AddPropDisplayItem(displayItem); + } + } + + private void SetGoodsItemVisible(int index, bool visible) + { + if (_goodsItems == null || index < 0 || index >= _goodsItems.Length) + { + Log.Warning("ShopForm.SetGoodsItemVisible: Invalid index."); + return; + } + + _goodsItems[index].gameObject.SetActive(visible); + } + + private void AddPropDisplayItem(DisplayItemContext context) + { + if (_propListArea == null || context == null) return; + _propListArea.AddItem(context); + } + + private void AddWeaponDisplayItem(DisplayItemContext context) + { + if (_weaponListArea == null || context == null) return; + _weaponListArea.AddItem(context); + } + #region ButtonClick public void OnContinueButtonClick() @@ -61,7 +134,7 @@ namespace UI public void OnRefreshButtonClick() { - GameEntry.Event.Fire(this, ShopRefreshEventArgs.Create(_context.RefreshPrice)); + GameEntry.Event.Fire(this, RefreshEventArgs.Create(_context.RefreshPrice)); } #endregion @@ -80,7 +153,7 @@ namespace UI return; } - UnityGameFramework.Runtime.Log.Warning("ShopForm requires ShopFormContext as userData."); + Log.Warning("ShopForm requires ShopFormContext as userData."); } protected override void OnClose(bool isShutdown, object userData) @@ -89,6 +162,9 @@ namespace UI GameEntry.Event.Unsubscribe(PlayerCoinChangeEventArgs.EventId, OnPlayerCoinChange); + _propListArea?.OnReset(); + _weaponListArea?.OnReset(); + base.OnClose(isShutdown, userData); } @@ -102,9 +178,9 @@ namespace UI if (args.CoinCount == _currentCoin) return; _currentCoin = args.CoinCount; - _playerCoinText.text = _currentCoin.ToString(); + _playerCoinText.text = $" {_currentCoin}"; } #endregion } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/GoodsItem.cs b/Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs similarity index 69% rename from Assets/GameMain/Scripts/UI/GameScene/View/GoodsItem.cs rename to Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs index b4b65a7..0d31450 100644 --- a/Assets/GameMain/Scripts/UI/GameScene/View/GoodsItem.cs +++ b/Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs @@ -4,9 +4,9 @@ using UnityEngine.UI; namespace UI { - public class GoodsItem : MonoBehaviour + public class ShopGoodsItem : MonoBehaviour { - [SerializeField] private Image _iconImage; + [SerializeField] private IconArea _iconArea; [SerializeField] private TMP_Text _titleText; @@ -15,18 +15,16 @@ namespace UI [SerializeField] private TMP_Text _descriptionText; [SerializeField] private TMP_Text _costText; - - [SerializeField] private CommonButton _purchaseButton; #region Init public void Init(GoodsItemContext data) { - _iconImage.sprite = data.Icon; + _iconArea.OnInit(data.Icon, data.Rarity); _titleText.text = data.Title; _typeText.text = data.Type; _descriptionText.text = data.Description; - _costText.text = data.Price.ToString(); + _costText.text = $"{data.Price} "; } #endregion diff --git a/Assets/GameMain/Scripts/UI/GameScene/View/GoodsItem.cs.meta b/Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/GameScene/View/GoodsItem.cs.meta rename to Assets/GameMain/Scripts/UI/GameScene/View/ShopGoodsItem.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General.meta b/Assets/GameMain/Scripts/UI/General.meta new file mode 100644 index 0000000..b919e05 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85f5f27b7946745469a9e6d5e6316048 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/Context.meta b/Assets/GameMain/Scripts/UI/General/Context.meta new file mode 100644 index 0000000..4349b39 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/Context.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96db679da2f373f40aed4ad29967aede +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs b/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs new file mode 100644 index 0000000..ff2aaa6 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs @@ -0,0 +1,19 @@ +using GameFramework; + +namespace UI +{ + public class DialogFormContext : UIContext + { + public int Mode; + public string Title; + public string Message; + public bool PauseGame; + public string ConfirmText; + public GameFrameworkAction OnClickConfirm; + public string CancelText; + public GameFrameworkAction OnClickCancel; + public string OtherText; + public GameFrameworkAction OnClickOther; + public object UserData; + } +} diff --git a/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs.meta b/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs.meta new file mode 100644 index 0000000..019e838 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/Context/DialogFormContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e9602a461df53c048af85df015fa8cb7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/Controller.meta b/Assets/GameMain/Scripts/UI/General/Controller.meta new file mode 100644 index 0000000..4c97736 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/Controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eab5a115034214041b5647a33d64c224 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs b/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs new file mode 100644 index 0000000..8d42a09 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs @@ -0,0 +1,215 @@ +using Definition.Enum; +using GameFramework.Event; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class DialogFormController : UIFormControllerBase + { + private DialogFormContext _context; + + private DialogForm _dialogForm; + + private int? _dialogFormSerialId; + + private bool _pendingRefresh; + + private bool _isBindEvent; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + _isBindEvent = false; + } + + private static DialogFormContext BuildContext(DialogFormRawData rawData) + { + if (rawData == null) + { + return null; + } + + return new DialogFormContext + { + Mode = rawData.Mode, + Title = rawData.Title, + Message = rawData.Message, + PauseGame = rawData.PauseGame, + ConfirmText = rawData.ConfirmText, + OnClickConfirm = rawData.OnClickConfirm, + CancelText = rawData.CancelText, + OnClickCancel = rawData.OnClickCancel, + OtherText = rawData.OtherText, + OnClickOther = rawData.OnClickOther, + UserData = rawData.UserData + }; + } + + protected override int? OpenUIInternal(DialogFormContext context) + { + if (context == null) + { + Log.Warning("DialogFormController.OpenUI() context is null."); + return null; + } + + _context = context; + + if (_dialogForm != null && _dialogFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_dialogFormSerialId.Value)) + { + _dialogForm.RefreshUI(_context); + return _dialogFormSerialId; + } + + CloseUI(); + _pendingRefresh = true; + SubscribeEvents(); + _dialogFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.DialogForm, context); + return _dialogFormSerialId; + } + + public int? OpenUI(DialogFormRawData rawData) + { + DialogFormContext context = BuildContext(rawData); + return OpenUIInternal(context); + } + + public override int? OpenUI(object userData = null) + { + if (userData is DialogFormContext context) + { + return OpenUIInternal(context); + } + + if (userData is DialogFormRawData rawData) + { + return OpenUI(rawData); + } + + if (userData is DialogFormRawData dialogParams) + { + return OpenUIInternal(BuildContext(dialogParams)); + } + + if (userData != null) + { + Log.Warning("DialogFormController.OpenUI() userData type is invalid."); + return null; + } + + return OpenUIInternal(_context); + } + + public override void CloseUI() + { + _pendingRefresh = false; + UnsubscribeEvents(); + + if (_dialogFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_dialogFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_dialogFormSerialId.Value); + } + + _dialogForm = null; + _dialogFormSerialId = null; + return; + } + + if (_dialogForm != null) + { + GameEntry.UI.CloseUIForm(_dialogForm); + _dialogForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + if (useCase != null) + { + Log.Warning("DialogFormController does not use a use case."); + } + } + + private void TryRefreshUI() + { + if (_context == null) + { + return; + } + + if (_dialogForm == null) + { + _pendingRefresh = true; + return; + } + + _dialogForm.RefreshUI(_context); + _pendingRefresh = false; + } + + private void OpenUIFormSuccess(object sender, GameEventArgs e) + { + if (!(e is OpenUIFormSuccessEventArgs args)) + { + return; + } + + if (!_dialogFormSerialId.HasValue) + { + return; + } + + if (args.UIForm == null || args.UIForm.SerialId != _dialogFormSerialId.Value || + args.UserData != _context) + { + return; + } + + _dialogForm = args.UIForm.Logic as DialogForm; + + if (_dialogForm == null) + { + Log.Warning("DialogFormController open success but form logic is invalid."); + return; + } + + if (_pendingRefresh) + { + TryRefreshUI(); + } + } + + private void CloseUIFormComplete(object sender, GameEventArgs e) + { + if (!(e is CloseUIFormCompleteEventArgs args)) + { + return; + } + + if (args.SerialId != _dialogFormSerialId) + { + return; + } + + _dialogForm = null; + _dialogFormSerialId = null; + } + } +} diff --git a/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs.meta b/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs.meta new file mode 100644 index 0000000..cb7fc26 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/Controller/DialogFormController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bcea24781fc934c42a5aac696d86f98d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/General/RawData.meta b/Assets/GameMain/Scripts/UI/General/RawData.meta new file mode 100644 index 0000000..444add4 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/RawData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90a3026e140b55f47b670f4a786f7070 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/DialogParams.cs b/Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs similarity index 85% rename from Assets/GameMain/Scripts/UI/DialogParams.cs rename to Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs index fb92cdd..f2dfbd9 100644 --- a/Assets/GameMain/Scripts/UI/DialogParams.cs +++ b/Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs @@ -1,18 +1,11 @@ -//------------------------------------------------------------ -// Game Framework -// Copyright © 2013-2021 Jiang Yin. All rights reserved. -// Homepage: https://gameframework.cn/ -// Feedback: mailto:ellan@gameframework.cn -//------------------------------------------------------------ - -using GameFramework; +using GameFramework; namespace UI { /// /// 对话框显示数据。 /// - public class DialogParams + public class DialogFormRawData { /// /// 模式，即按钮数量。取值 1、2、3。 diff --git a/Assets/GameMain/Scripts/UI/DialogParams.cs.meta b/Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/DialogParams.cs.meta rename to Assets/GameMain/Scripts/UI/General/RawData/DialogFormRawData.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General/View.meta b/Assets/GameMain/Scripts/UI/General/View.meta new file mode 100644 index 0000000..f930bf8 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/View.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61587606f17823143b72f971d68ce995 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/DialogForm.cs b/Assets/GameMain/Scripts/UI/General/View/DialogForm.cs similarity index 69% rename from Assets/GameMain/Scripts/UI/DialogForm.cs rename to Assets/GameMain/Scripts/UI/General/View/DialogForm.cs index 267ebd1..2ceb87f 100644 --- a/Assets/GameMain/Scripts/UI/DialogForm.cs +++ b/Assets/GameMain/Scripts/UI/General/View/DialogForm.cs @@ -29,6 +29,7 @@ namespace UI private GameFrameworkAction _onClickConfirmGFAction = null; private GameFrameworkAction _onClickCancelGFAction = null; private GameFrameworkAction _onClickOtherGFAction = null; + private DialogFormContext _context = null; public int DialogMode => _dialogMode; @@ -74,32 +75,19 @@ namespace UI { base.OnOpen(userData); - DialogParams dialogParams = (DialogParams)userData; - if (dialogParams == null) + if (userData is DialogFormContext context) { - Log.Warning("DialogParams is invalid."); + RefreshUI(context); return; } - _dialogMode = dialogParams.Mode; - RefreshDialogMode(); + if (userData is DialogFormRawData dialogParams) + { + RefreshUI(BuildContext(dialogParams)); + return; + } - _titleText.text = dialogParams.Title; - _messageText.text = dialogParams.Message; - - _pauseGame = dialogParams.PauseGame; - RefreshPauseGame(); - - _userData = dialogParams.UserData; - - RefreshConfirmText(dialogParams.ConfirmText); - _onClickConfirmGFAction = dialogParams.OnClickConfirm; - - RefreshCancelText(dialogParams.CancelText); - _onClickCancelGFAction = dialogParams.OnClickCancel; - - RefreshOtherText(dialogParams.OtherText); - _onClickOtherGFAction = dialogParams.OnClickOther; + Log.Warning("DialogForm requires DialogFormContext or DialogParams as userData."); } #if UNITY_2017_3_OR_NEWER @@ -118,6 +106,7 @@ namespace UI _messageText.text = string.Empty; _pauseGame = false; _userData = null; + _context = null; RefreshConfirmText(string.Empty); _onClickConfirmGFAction = null; @@ -131,6 +120,60 @@ namespace UI base.OnClose(isShutdown, userData); } + public void RefreshUI(DialogFormContext context) + { + if (context == null) + { + Log.Warning("DialogForm context is invalid."); + return; + } + + _context = context; + + _dialogMode = context.Mode; + RefreshDialogMode(); + + _titleText.text = context.Title; + _messageText.text = context.Message; + + _pauseGame = context.PauseGame; + RefreshPauseGame(); + + _userData = context.UserData; + + RefreshConfirmText(context.ConfirmText); + _onClickConfirmGFAction = context.OnClickConfirm; + + RefreshCancelText(context.CancelText); + _onClickCancelGFAction = context.OnClickCancel; + + RefreshOtherText(context.OtherText); + _onClickOtherGFAction = context.OnClickOther; + } + + private static DialogFormContext BuildContext(DialogFormRawData rawData) + { + if (rawData == null) + { + return null; + } + + return new DialogFormContext + { + Mode = rawData.Mode, + Title = rawData.Title, + Message = rawData.Message, + PauseGame = rawData.PauseGame, + ConfirmText = rawData.ConfirmText, + OnClickConfirm = rawData.OnClickConfirm, + CancelText = rawData.CancelText, + OnClickCancel = rawData.OnClickCancel, + OtherText = rawData.OtherText, + OnClickOther = rawData.OnClickOther, + UserData = rawData.UserData + }; + } + private void RefreshDialogMode() { for (int i = 1; i <= _modeObjects.Length; i++) @@ -186,4 +229,4 @@ namespace UI } } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/UI/DialogForm.cs.meta b/Assets/GameMain/Scripts/UI/General/View/DialogForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/DialogForm.cs.meta rename to Assets/GameMain/Scripts/UI/General/View/DialogForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/General/View/IconArea.cs b/Assets/GameMain/Scripts/UI/General/View/IconArea.cs new file mode 100644 index 0000000..cb1c8d9 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/View/IconArea.cs @@ -0,0 +1,43 @@ +using Definition.Enum; +using UnityEngine; +using UnityEngine.UI; + +namespace UI +{ + public class IconArea : MonoBehaviour + { + [SerializeField] private Image _board; + + [SerializeField] private Image _icon; + + public void OnInit(Sprite sprite, ItemRarity rarity) + { + SetIcon(sprite); + SetRarity(rarity); + } + + public void SetIcon(Sprite sprite) + { + _icon.sprite = sprite; + } + + public void SetRarity(ItemRarity rarity) + { + _board.color = rarity switch + { + ItemRarity.White => Color.white, + ItemRarity.Green => Color.green, + ItemRarity.Blue => Color.blue, + ItemRarity.Purple => Color.magenta, + ItemRarity.Red => Color.red, + _ => Color.clear, + }; + } + + public void OnReset() + { + SetIcon(null); + SetRarity(ItemRarity.None); + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/General/View/IconArea.cs.meta b/Assets/GameMain/Scripts/UI/General/View/IconArea.cs.meta new file mode 100644 index 0000000..c5bc334 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/General/View/IconArea.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 578fa91d15f54e74a95ccce338d0a772 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context.meta b/Assets/GameMain/Scripts/UI/MenuScene/Context.meta new file mode 100644 index 0000000..c4559e6 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3e1fd66709232c439fe452b81dffab6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs b/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs new file mode 100644 index 0000000..61ed660 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs @@ -0,0 +1,8 @@ +namespace UI +{ + public class RoleItemContext : UIContext + { + public int RoleId; + public string IconName; + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs.meta new file mode 100644 index 0000000..1e5d9e5 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/RoleItemContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0337fd9faf4a5b44eb95858bff44c015 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs b/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs new file mode 100644 index 0000000..b17f699 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs @@ -0,0 +1,8 @@ +namespace UI +{ + public class RolePropertyAreaContext : UIContext + { + public string RoleName; + public string InitialPropertyText; + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs.meta new file mode 100644 index 0000000..03ce836 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/RolePropertyAreaContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f37335b27f20c647a0a6175226c0b45 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs b/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs new file mode 100644 index 0000000..88cd103 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs @@ -0,0 +1,9 @@ +namespace UI +{ + public class SelectRoleFormContext : UIContext + { + public RoleItemContext[] RoleItemContexts; + public RolePropertyAreaContext RolePropertyAreaContext; + public int[] RoleIds; + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs.meta new file mode 100644 index 0000000..2f628ed --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/SelectRoleFormContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6c34d5aa87925ee41b70887958e7611c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs b/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs new file mode 100644 index 0000000..76c335d --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs @@ -0,0 +1,6 @@ +namespace UI +{ + public class StartMenuFormContext : UIContext + { + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs.meta new file mode 100644 index 0000000..eb88571 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Context/StartMenuFormContext.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 77a32872255d9f84b9332418d1352514 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller.meta b/Assets/GameMain/Scripts/UI/MenuScene/Controller.meta new file mode 100644 index 0000000..009dee5 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70ae7a701eac84b4eb4ec27bf2ada3c1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs b/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs new file mode 100644 index 0000000..d566bf4 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs @@ -0,0 +1,293 @@ +using CustomEvent; +using Definition.Enum; +using GameFramework.Event; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class SelectRoleFormController : UIFormControllerBase + { + private SelectRoleFormUseCase _useCase; + + private SelectRoleFormContext _context; + + private SelectRoleForm _selectRoleForm; + + private int? _selectRoleFormSerialId; + + private bool _pendingRefresh; + + private bool _isBindEvent; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + GameEntry.Event.Subscribe(MenuSelectRoleReturnEventArgs.EventId, OnMenuSelectRoleReturn); + GameEntry.Event.Subscribe(MenuSelectRoleSelectedEventArgs.EventId, OnMenuSelectRoleSelected); + GameEntry.Event.Subscribe(MenuSelectRoleConfirmEventArgs.EventId, OnMenuSelectRoleConfirm); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + GameEntry.Event.Unsubscribe(MenuSelectRoleReturnEventArgs.EventId, OnMenuSelectRoleReturn); + GameEntry.Event.Unsubscribe(MenuSelectRoleSelectedEventArgs.EventId, OnMenuSelectRoleSelected); + GameEntry.Event.Unsubscribe(MenuSelectRoleConfirmEventArgs.EventId, OnMenuSelectRoleConfirm); + + _isBindEvent = false; + } + + private static SelectRoleFormContext BuildContext(SelectRoleFormRawData rawData) + { + if (rawData == null) + { + return null; + } + + int count = rawData.RoleIds?.Length ?? 0; + RoleItemContext[] roleItems = new RoleItemContext[count]; + for (int i = 0; i < count; i++) + { + string iconName = rawData.RoleIconNames != null && i < rawData.RoleIconNames.Length + ? rawData.RoleIconNames[i] + : null; + + roleItems[i] = new RoleItemContext + { + RoleId = rawData.RoleIds[i], + IconName = iconName + }; + } + + RolePropertyAreaContext propertyContext = null; + if (rawData.SelectedRoleId >= 0) + { + propertyContext = new RolePropertyAreaContext + { + RoleName = rawData.SelectedRoleName, + InitialPropertyText = rawData.SelectedRoleInitialPropertyText + }; + } + + return new SelectRoleFormContext + { + RoleItemContexts = roleItems, + RolePropertyAreaContext = propertyContext, + RoleIds = rawData.RoleIds + }; + } + + #region UI Methods + + protected override int? OpenUIInternal(SelectRoleFormContext context) + { + if (context == null) + { + Log.Warning("SelectRoleFormController.OpenUI() context is null."); + return null; + } + + _context = context; + + if (_selectRoleForm != null && _selectRoleFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_selectRoleFormSerialId.Value)) + { + _selectRoleForm.RefreshUI(_context); + return _selectRoleFormSerialId; + } + + CloseUI(); + _pendingRefresh = true; + SubscribeEvents(); + _selectRoleFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.SelectRoleForm, context); + return _selectRoleFormSerialId; + } + + public override int? OpenUI(object userData = null) + { + if (userData is SelectRoleFormContext selectRoleFormContext) + { + return OpenUIInternal(selectRoleFormContext); + } + + if (userData != null) + { + Log.Warning("SelectRoleFormController.OpenUI() userData type is invalid."); + return null; + } + + SelectRoleFormRawData rawData = _useCase.CreateModel(); + SelectRoleFormContext context = BuildContext(rawData); + return OpenUIInternal(context); + } + + public override void CloseUI() + { + _pendingRefresh = false; + UnsubscribeEvents(); + + if (_selectRoleFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_selectRoleFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_selectRoleFormSerialId.Value); + } + + _selectRoleForm = null; + _selectRoleFormSerialId = null; + return; + } + + if (_selectRoleForm != null) + { + _selectRoleForm.Close(); + _selectRoleForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + if (!(useCase is SelectRoleFormUseCase selectRoleUseCase)) + { + Log.Error("SelectRoleUseCase.BindUseCase() useCase is invalid."); + return; + } + + _useCase = selectRoleUseCase; + } + + private void TryRefreshUI() + { + if (_context == null) + { + return; + } + + if (_selectRoleForm == null) + { + _pendingRefresh = true; + return; + } + + _selectRoleForm.RefreshUI(_context); + _pendingRefresh = false; + } + + #endregion + + #region Service + + public void UpdateShowRole(RolePropertyAreaContext rolePropertyAreaContext) + { + if (_context != null) + { + _context.RolePropertyAreaContext = rolePropertyAreaContext; + } + + if (_selectRoleForm != null) + { + _selectRoleForm.UpdateShowRole(rolePropertyAreaContext); + } + } + + #endregion + + #region Event Handlers + + private void OpenUIFormSuccess(object sender, GameEventArgs e) + { + if (!(e is OpenUIFormSuccessEventArgs args)) + { + return; + } + + if (!_selectRoleFormSerialId.HasValue) + { + return; + } + + if (args.UIForm == null || args.UIForm.SerialId != _selectRoleFormSerialId.Value || + args.UserData != _context) + { + return; + } + + _selectRoleForm = args.UIForm.Logic as SelectRoleForm; + + if (_selectRoleForm == null) + { + Log.Warning("SelectRoleFormController open success but form logic is invalid."); + return; + } + + if (_pendingRefresh) + { + TryRefreshUI(); + } + } + + private void CloseUIFormComplete(object sender, GameEventArgs e) + { + if (!(e is CloseUIFormCompleteEventArgs args)) + { + return; + } + + if (args.SerialId != _selectRoleFormSerialId) + { + return; + } + + _selectRoleForm = null; + _selectRoleFormSerialId = null; + } + + private void OnMenuSelectRoleReturn(object sender, GameEventArgs e) + { + if (!(sender is SelectRoleForm) || !(e is MenuSelectRoleReturnEventArgs)) + { + return; + } + + CloseUI(); + } + + private void OnMenuSelectRoleSelected(object sender, GameEventArgs e) + { + if (!(e is MenuSelectRoleSelectedEventArgs args)) + { + return; + } + + SelectRoleFormRawData rawData = _useCase != null ? _useCase.SelectRole(args.RoleId) : null; + SelectRoleFormContext context = BuildContext(rawData); + if (context == null) + { + return; + } + + _context = context; + UpdateShowRole(_context.RolePropertyAreaContext); + } + + private void OnMenuSelectRoleConfirm(object sender, GameEventArgs e) + { + if (!(e is MenuSelectRoleConfirmEventArgs)) + { + return; + } + + _useCase.ConfirmSelectedRole(); + } + + #endregion + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs.meta new file mode 100644 index 0000000..82997a1 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Controller/SelectRoleFormController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ff46cd6b508b0304a801223cbae79419 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs b/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs new file mode 100644 index 0000000..d811140 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs @@ -0,0 +1,276 @@ +using CustomEvent; +using Definition.Enum; +using GameFramework.Event; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class StartMenuFormController : UIFormControllerBase + { + private StartMenuFormContext _context; + + private StartMenuForm _startMenuForm; + + private int? _startMenuFormSerialId; + + private bool _pendingRefresh; + + private bool _isBindEvent; + + private void SubscribeEvents() + { + if (_isBindEvent) return; + + GameEntry.Event.Subscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Subscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + GameEntry.Event.Subscribe(MenuStartGameEventArgs.EventId, OnMenuStartGameButtonClick); + GameEntry.Event.Subscribe(MenuFileButtonClickEventArgs.EventId, OnMenuFileButtonClick); + GameEntry.Event.Subscribe(MenuGuideButtonClickEventArgs.EventId, OnMenuGuideButtonClick); + GameEntry.Event.Subscribe(MenuSettingButtonClickEventArgs.EventId, OnMenuSettingButtonClick); + GameEntry.Event.Subscribe(MenuQuitButtonClickEventArgs.EventId, OnMenuQuitButtonClick); + GameEntry.Event.Subscribe(MenuAboutButtonClickEventArgs.EventId, OnMenuAboutButtonClick); + + _isBindEvent = true; + } + + private void UnsubscribeEvents() + { + if (!_isBindEvent) return; + + GameEntry.Event.Unsubscribe(OpenUIFormSuccessEventArgs.EventId, OpenUIFormSuccess); + GameEntry.Event.Unsubscribe(CloseUIFormCompleteEventArgs.EventId, CloseUIFormComplete); + + GameEntry.Event.Unsubscribe(MenuStartGameEventArgs.EventId, OnMenuStartGameButtonClick); + GameEntry.Event.Unsubscribe(MenuFileButtonClickEventArgs.EventId, OnMenuFileButtonClick); + GameEntry.Event.Unsubscribe(MenuGuideButtonClickEventArgs.EventId, OnMenuGuideButtonClick); + GameEntry.Event.Unsubscribe(MenuSettingButtonClickEventArgs.EventId, OnMenuSettingButtonClick); + GameEntry.Event.Unsubscribe(MenuQuitButtonClickEventArgs.EventId, OnMenuQuitButtonClick); + GameEntry.Event.Unsubscribe(MenuAboutButtonClickEventArgs.EventId, OnMenuAboutButtonClick); + + _isBindEvent = false; + } + + private static StartMenuFormContext BuildStartMenuFormContext() + { + return new StartMenuFormContext(); + } + + #region UI Methods + + protected override int? OpenUIInternal(StartMenuFormContext context) + { + if (context == null) + { + Log.Warning("StartMenuFormController.OpenUI() context is null."); + return null; + } + + _context = context; + + if (_startMenuForm != null && _startMenuFormSerialId.HasValue && + GameEntry.UI.HasUIForm(_startMenuFormSerialId.Value)) + { + _startMenuForm.RefreshUI(_context); + return _startMenuFormSerialId; + } + + CloseUI(); + _pendingRefresh = true; + SubscribeEvents(); + _startMenuFormSerialId = GameEntry.UI.OpenUIForm(UIFormType.StartMenuForm, context); + return _startMenuFormSerialId; + } + + public override int? OpenUI(object userData = null) + { + if (userData is StartMenuFormContext context) + { + return OpenUIInternal(context); + } + + if (userData != null) + { + Log.Warning("StartMenuFormController.OpenUI() userData type is invalid."); + return null; + } + + return OpenUIInternal(BuildStartMenuFormContext()); + } + + public int? OpenUI(StartMenuFormContext context) + { + return OpenUIInternal(context); + } + + public override void CloseUI() + { + _pendingRefresh = false; + UnsubscribeEvents(); + + if (_startMenuFormSerialId.HasValue) + { + if (GameEntry.UI.HasUIForm(_startMenuFormSerialId.Value)) + { + GameEntry.UI.CloseUIForm(_startMenuFormSerialId.Value); + } + + _startMenuForm = null; + _startMenuFormSerialId = null; + return; + } + + if (_startMenuForm != null) + { + _startMenuForm.Close(); + _startMenuForm = null; + } + } + + public override void BindUseCase(IUIUseCase useCase) + { + Log.Info("StartMenuForm doesn't need UseCase"); + } + + private void TryRefreshUI() + { + if (_context == null) + { + return; + } + + if (_startMenuForm == null) + { + _pendingRefresh = true; + return; + } + + _startMenuForm.RefreshUI(_context); + _pendingRefresh = false; + } + + #endregion + + + #region Event Handlers + + private void OpenUIFormSuccess(object sender, GameEventArgs e) + { + if (!(e is OpenUIFormSuccessEventArgs args)) + { + return; + } + + if (!_startMenuFormSerialId.HasValue) + { + return; + } + + if (args.UIForm == null || args.UIForm.SerialId != _startMenuFormSerialId.Value || + args.UserData != _context) + { + return; + } + + _startMenuForm = args.UIForm.Logic as StartMenuForm; + + if (_startMenuForm == null) + { + Log.Warning("StartMenuFormController open success but form logic is invalid."); + return; + } + + if (_pendingRefresh) + { + TryRefreshUI(); + } + } + + private void CloseUIFormComplete(object sender, GameEventArgs e) + { + if (!(e is CloseUIFormCompleteEventArgs args)) + { + return; + } + + if (args.SerialId != _startMenuFormSerialId) + { + return; + } + + _startMenuForm = null; + _startMenuFormSerialId = null; + } + + private void OnMenuStartGameButtonClick(object sender, GameEventArgs e) + { + if (!(sender is StartMenuForm) || !(e is MenuStartGameEventArgs)) + { + return; + } + + GameEntry.UIRouter.OpenUI(UIFormType.SelectRoleForm); + } + + private void OnMenuFileButtonClick(object sender, GameEventArgs e) + { + if (!(sender is StartMenuForm) || !(e is MenuFileButtonClickEventArgs)) + { + return; + } + + Log.Warning("Menu file button click is not implemented."); + } + + private void OnMenuGuideButtonClick(object sender, GameEventArgs e) + { + if (!(sender is StartMenuForm) || !(e is MenuGuideButtonClickEventArgs)) + { + return; + } + + Log.Warning("Menu guide button click is not implemented."); + } + + private void OnMenuSettingButtonClick(object sender, GameEventArgs e) + { + if (!(sender is StartMenuForm) || !(e is MenuSettingButtonClickEventArgs)) + { + return; + } + + GameEntry.UIRouter.OpenUI(UIFormType.SettingForm); + } + + private void OnMenuQuitButtonClick(object sender, GameEventArgs e) + { + if (!(sender is StartMenuForm) || !(e is MenuQuitButtonClickEventArgs)) + { + return; + } + + GameEntry.UIRouter.OpenUI(UIFormType.DialogForm, new DialogFormRawData + { + Mode = 2, + Title = GameEntry.Localization.GetString("AskQuitGame.Title"), + Message = GameEntry.Localization.GetString("AskQuitGame.Message"), + OnClickConfirm = delegate(object userData) + { + UnityGameFramework.Runtime.GameEntry.Shutdown(ShutdownType.Quit); + } + }); + } + + private void OnMenuAboutButtonClick(object sender, GameEventArgs e) + { + if (!(sender is StartMenuForm) || !(e is MenuAboutButtonClickEventArgs)) + { + return; + } + + Log.Warning("Menu about button click is not implemented."); + } + + #endregion + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs.meta new file mode 100644 index 0000000..9e1a26b --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/Controller/StartMenuFormController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3feee66cf220f6f47b147bca4f7967f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData.meta b/Assets/GameMain/Scripts/UI/MenuScene/RawData.meta new file mode 100644 index 0000000..31d063c --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/RawData.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 614e7dc72ab04ce8aaa7e750088f12d6 +timeCreated: 1771144270 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs b/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs new file mode 100644 index 0000000..53efae5 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs @@ -0,0 +1,11 @@ +namespace UI +{ + public class SelectRoleFormRawData + { + public int[] RoleIds; + public string[] RoleIconNames; + public int SelectedRoleId; + public string SelectedRoleName; + public string SelectedRoleInitialPropertyText; + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs.meta new file mode 100644 index 0000000..eddd103 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/RawData/SelectRoleFormRawData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5c23c1db541a47b09b8c475018758f9e +timeCreated: 1771144321 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs b/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs new file mode 100644 index 0000000..b72806b --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs @@ -0,0 +1,7 @@ +namespace UI +{ + public class StartMenuFormRawData + { + + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs.meta new file mode 100644 index 0000000..07762ad --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/RawData/StartMenuFormRawData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7f5cdd950661442fa1760bc2b2db6f2d +timeCreated: 1771144299 \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RoleItem.cs b/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RoleItem.cs deleted file mode 100644 index 435bcb6..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RoleItem.cs +++ /dev/null @@ -1,50 +0,0 @@ -using DataTable; -using UnityEngine; -using UnityEngine.UI; - -namespace UI -{ - public class RoleItem : MonoBehaviour - { - [SerializeField] private CommonButton _button = null; - [SerializeField] private Image _roleImage = null; - private SelectRoleForm _selectRoleForm = null; - private DRRole _role = null; - - public void OnInit(SelectRoleForm selectRoleForm, DRRole role) - { - this._selectRoleForm = selectRoleForm; - this._role = role; - GameEntry.SpriteCache.GetSprite(role.IconName, sprite => _roleImage.sprite = sprite); - - _button.RegisterAction(0, OnPointerEnter); - _button.RegisterAction(1, OnPointerClick); - _button.RegisterAction(2, OnPointerExit); - } - - public void OnReset() - { - this._selectRoleForm = null; - this._role = null; - - _button.UnRegisterAction(0, OnPointerEnter); - _button.UnRegisterAction(1, OnPointerClick); - _button.UnRegisterAction(2, OnPointerExit); - } - - private void OnPointerEnter() - { - _selectRoleForm.UpdateShowRole(_role); - } - - private void OnPointerClick() - { - _selectRoleForm.StartGame(); - } - - private void OnPointerExit() - { - _selectRoleForm.UpdateShowRole(null); - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RolePropertyArea.cs b/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RolePropertyArea.cs deleted file mode 100644 index 61a2395..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RolePropertyArea.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System.Text; -using DataTable; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -namespace UI -{ - public class RolePropertyArea : MonoBehaviour - { - [SerializeField] private TMP_Text _roleNameText; - - [SerializeField] private RawImage _roleAvatar; - - [SerializeField] private TMP_Text _roleInitialPropertyText; - - [SerializeField] private Transform _roleInitialItemParent; - - public void OnInit(DRRole role) - { - _roleNameText.text = role.RoleName; - // _roleAvatar.texture = AssetUtility.GetUITextureIcon(role.IconName); - - StringBuilder sb = new StringBuilder(); - if (role.InitialProperties != null) - { - foreach (var modifier in role.InitialProperties) - { - sb.Append($"{modifier.ToString()}\n"); - } - } - _roleInitialPropertyText.text = sb.ToString(); - - - // foreach (var item in role.InitialItemIds) - // { - // var itemGO = Instantiate(_roleInitialItemParent.GetChild(0), _roleInitialItemParent); - // itemGO.GetComponent().OnInit(item.Key, item.Value); - // } - } - - public void OnReset(object userData = null) - { - // _roleNameText.text = string.Empty; - // _roleAvatar.texture = null; - // _roleInitialPropertyText.text = string.Empty; - // foreach (Transform item in _roleInitialItemParent) - // { - // Destroy(item.gameObject); - // } - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleShowArea.cs b/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleShowArea.cs deleted file mode 100644 index 41bb57d..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleShowArea.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class SelectRoleShowArea : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/StartMenuForm.cs b/Assets/GameMain/Scripts/UI/MenuScene/StartMenuForm.cs deleted file mode 100644 index 5144947..0000000 --- a/Assets/GameMain/Scripts/UI/MenuScene/StartMenuForm.cs +++ /dev/null @@ -1,71 +0,0 @@ -using Definition.Enum; -using Procedure; -using UnityGameFramework.Runtime; - -namespace UI -{ - public class StartMenuForm : UGuiForm - { - private ProcedureStartMenu _procedureStartMenu = null; - - public void OnStartButtonClick() - { - _procedureStartMenu.OpenSelectForm(); - } - - public void OnFileButtonClick() - { - throw new System.NotImplementedException(); - } - - public void OnGuideButtonClick() - { - throw new System.NotImplementedException(); - } - - public void OnSettingButtonClick() - { - GameEntry.UI.OpenUIForm(UIFormType.SettingForm); - } - - public void OnQuitButtonClick() - { - GameEntry.UI.OpenDialog(new DialogParams() - { - Mode = 2, - Title = GameEntry.Localization.GetString("AskQuitGame.Title"), - Message = GameEntry.Localization.GetString("AskQuitGame.Message"), - OnClickConfirm = delegate(object userData) - { - UnityGameFramework.Runtime.GameEntry.Shutdown(ShutdownType.Quit); - }, - }); - } - - public void OnAboutButtonClick() - { - throw new System.NotImplementedException(); - } - - #region Lifecycle - - protected override void OnOpen(object userData) - { - base.OnOpen(userData); - - if (userData is ProcedureStartMenu procedure) - { - _procedureStartMenu = procedure; - } - } - - protected override void OnClose(bool isShutdown, object userData) - { - _procedureStartMenu = null; - - base.OnClose(isShutdown, userData); - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/UseCase.meta b/Assets/GameMain/Scripts/UI/MenuScene/UseCase.meta new file mode 100644 index 0000000..ded1c8d --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/UseCase.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ceb1fe7ab4fa37d4ca15992227229df6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs b/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs new file mode 100644 index 0000000..1558b52 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs @@ -0,0 +1,99 @@ +using System.Text; +using DataTable; +using GameFramework.DataTable; +using Procedure; +using UnityEngine; + +namespace UI +{ + public class SelectRoleFormUseCase : IUIUseCase + { + private readonly IDataTable _roleDataTable; + + private readonly ProcedureStartMenu _procedureStartMenu; + + public int SelectedRoleId { get; private set; } + + public SelectRoleFormUseCase(ProcedureStartMenu procedureStartMenu) + { + _procedureStartMenu = procedureStartMenu; + _roleDataTable = GameEntry.DataTable.GetDataTable(); + } + + public SelectRoleFormRawData CreateModel() + { + return BuildModel(0); + } + + public SelectRoleFormRawData SelectRole(int roleId) + { + SelectedRoleId = roleId; + return BuildModel(roleId); + } + + public bool ConfirmSelectedRole() + { + DRRole[] roles = _roleDataTable != null ? _roleDataTable.GetAllDataRows() : null; + if (roles == null || roles.Length == 0) + { + return false; + } + + if (SelectedRoleId < 0 || _roleDataTable.GetDataRow(SelectedRoleId) == null) + { + int randomIndex = Random.Range(0, roles.Length); + SelectedRoleId = roles[randomIndex].Id; + } + + bool result = SelectedRoleId >= 0; + if (result) + { + _procedureStartMenu.StartGame(SelectedRoleId); + } + + return result; + } + + private SelectRoleFormRawData BuildModel(int selectedRoleId) + { + DRRole[] roles = _roleDataTable.GetAllDataRows(); + int count = _roleDataTable.Count; + int[] roleIds = new int[count]; + string[] iconNames = new string[count]; + for (int i = 0; i < count; i++) + { + roleIds[i] = roles[i].Id; + iconNames[i] = roles[i].IconName; + } + + DRRole selectedRole = selectedRoleId > 0 ? _roleDataTable.GetDataRow(selectedRoleId) : null; + return new SelectRoleFormRawData + { + RoleIds = roleIds, + RoleIconNames = iconNames, + SelectedRoleId = selectedRole?.Id ?? -1, + SelectedRoleName = selectedRole?.RoleName, + SelectedRoleInitialPropertyText = selectedRole != null + ? BuildRoleInitialPropertyText(selectedRole) + : null + }; + } + + private static string BuildRoleInitialPropertyText(DRRole role) + { + if (role == null || role.InitialProperties == null || role.InitialProperties.Length == 0) + { + return string.Empty; + } + + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < role.InitialProperties.Length; i++) + { + sb.Append(role.InitialProperties[i]); + sb.Append('\n'); + } + + return sb.ToString(); + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs.meta new file mode 100644 index 0000000..301670b --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/UseCase/SelectRoleFormUseCase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aec2db2225cb4bb890eb347e73fc5890 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View.meta b/Assets/GameMain/Scripts/UI/MenuScene/View.meta new file mode 100644 index 0000000..debcda7 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/View.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 424c12088ffa5fc43bdf642094e15ae4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs b/Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs new file mode 100644 index 0000000..9e18a12 --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs @@ -0,0 +1,40 @@ +using CustomEvent; +using UnityEngine; +using UnityEngine.UI; + +namespace UI +{ + public class RoleItem : MonoBehaviour + { + [SerializeField] private Image _roleImage = null; + + private RoleItemContext _context = null; + + public void OnInit(RoleItemContext context) + { + _context = context; + if (_context == null || string.IsNullOrEmpty(_context.IconName)) + { + return; + } + + GameEntry.SpriteCache.GetSprite(_context.IconName, sprite => _roleImage.sprite = sprite); + } + + public void OnReset() + { + _context = null; + } + + public void UpdateShowRole() + { + int roleId = _context?.RoleId ?? -1; + GameEntry.Event.Fire(this, MenuSelectRoleSelectedEventArgs.Create(roleId)); + } + + public void OnConfirmRoleClick() + { + GameEntry.Event.Fire(this, MenuSelectRoleConfirmEventArgs.Create()); + } + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RoleItem.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RoleItem.cs.meta rename to Assets/GameMain/Scripts/UI/MenuScene/View/RoleItem.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs b/Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs new file mode 100644 index 0000000..9f8c2df --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs @@ -0,0 +1,37 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace UI +{ + public class RolePropertyArea : MonoBehaviour + { + [SerializeField] private TMP_Text _roleNameText; + + [SerializeField] private RawImage _roleAvatar; + + [SerializeField] private TMP_Text _roleInitialPropertyText; + + [SerializeField] private Transform _roleInitialItemParent; + + private RolePropertyAreaContext _context; + + public void OnInit(RolePropertyAreaContext context) + { + _context = context; + if (_context == null) + { + OnReset(); + return; + } + + _roleNameText.text = _context.RoleName; + _roleInitialPropertyText.text = _context.InitialPropertyText; + } + + public void OnReset(object userData = null) + { + _context = null; + } + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RolePropertyArea.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/RolePropertyArea.cs.meta rename to Assets/GameMain/Scripts/UI/MenuScene/View/RolePropertyArea.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/SelectRoleForm.cs b/Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs similarity index 53% rename from Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/SelectRoleForm.cs rename to Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs index a9661f7..097c456 100644 --- a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/SelectRoleForm.cs +++ b/Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs @@ -1,7 +1,5 @@ -using System.Linq; -using DataTable; -using GameFramework.DataTable; -using Procedure; +using System; +using CustomEvent; using UnityEngine; using UnityGameFramework.Runtime; @@ -15,52 +13,61 @@ namespace UI [SerializeField] private RolePropertyArea _propertyArea = null; - private DRRole _currentRole = null; - private IDataTable _roleDataTable = null; - private DRRole[] _roleList = null; + private SelectRoleFormContext _context = null; + private RoleItem[] _roleItems = null; - private ProcedureStartMenu _procedure; + public void RefreshUI(SelectRoleFormContext context) + { + _context = context; + + int itemIndex = 1, roleIndex = 0; + while (itemIndex < _roleItems.Length) + { + if (roleIndex < _context.RoleItemContexts.Length) + { + _roleItems[itemIndex].OnInit(_context.RoleItemContexts[roleIndex]); + _roleItems[itemIndex].gameObject.SetActive(true); + } + else + { + _roleItems[itemIndex].gameObject.SetActive(false); + _roleItems[itemIndex].OnReset(); + } + + itemIndex++; + roleIndex++; + } + + UpdateShowRole(_context.RolePropertyAreaContext); + } #region FSM protected override void OnInit(object userData) { base.OnInit(userData); - - if (userData is ProcedureStartMenu procedure) - { - _procedure = procedure; - } - - _roleDataTable = GameEntry.DataTable.GetDataTable(); _roleItems = this.transform.GetComponentsInChildren(); - _roleList = _roleDataTable.GetAllDataRows(); } protected override void OnOpen(object userData) { base.OnOpen(userData); - Log.Debug($"{_roleList.Length} || {_roleItems.Length}"); - for (int i = 0; i < _roleItems.Length; i++) + if (userData is SelectRoleFormContext context) { - if (i < _roleList.Length) - { - _roleItems[i].gameObject.SetActive(true); - _roleItems[i].OnInit(this, _roleList[i]); - } - else - { - _roleItems[i].gameObject.SetActive(false); - } + RefreshUI(context); + return; } + + Log.Warning("SelectRoleForm requires SelectRoleFormContext as userData."); } protected override void OnClose(bool isShutdown, object userData) { base.OnClose(isShutdown, userData); + _context = null; foreach (var item in _roleItems) { item.OnReset(); @@ -69,16 +76,9 @@ namespace UI #endregion - public void OnReturnButtonClick() + public void UpdateShowRole(RolePropertyAreaContext propertyAreaContext) { - GameEntry.UI.CloseUIForm(this); - } - - public void UpdateShowRole(DRRole role) - { - _currentRole = role; - - if (role == null) + if (propertyAreaContext == null) { _randomRoleCard.SetActive(true); _roleCard.SetActive(false); @@ -87,20 +87,14 @@ namespace UI else { _randomRoleCard.SetActive(false); - _propertyArea.OnInit(role); + _propertyArea.OnInit(propertyAreaContext); _roleCard.SetActive(true); } } - public void StartGame() + public void OnReturnButtonClick() { - if (_currentRole == null) - { - int roleIndex = Random.Range(0, _roleList.Length); - _currentRole = _roleList[roleIndex]; - } - - _procedure?.StartGame(_currentRole.Id); + GameEntry.Event.Fire(this, MenuSelectRoleReturnEventArgs.Create()); } } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/SelectRoleForm.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/SelectRoleForm/SelectRoleForm.cs.meta rename to Assets/GameMain/Scripts/UI/MenuScene/View/SelectRoleForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SettingForm.cs b/Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/SettingForm.cs rename to Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs diff --git a/Assets/GameMain/Scripts/UI/MenuScene/SettingForm.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/SettingForm.cs.meta rename to Assets/GameMain/Scripts/UI/MenuScene/View/SettingForm.cs.meta diff --git a/Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs b/Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs new file mode 100644 index 0000000..f50eeaf --- /dev/null +++ b/Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs @@ -0,0 +1,64 @@ +using CustomEvent; +using UnityGameFramework.Runtime; + +namespace UI +{ + public class StartMenuForm : UGuiForm + { + public void RefreshUI(StartMenuFormContext context) + { + } + + #region Lifecycle + + protected override void OnOpen(object userData) + { + base.OnOpen(userData); + + if (userData is StartMenuFormContext context) + { + RefreshUI(context); + return; + } + + Log.Warning("StartMenuForm requires StartMenuFormContext as userData."); + } + + protected override void OnClose(bool isShutdown, object userData) + { + base.OnClose(isShutdown, userData); + } + + #endregion + + public void OnStartButtonClick() + { + GameEntry.Event.Fire(this, MenuStartGameEventArgs.Create()); + } + + public void OnFileButtonClick() + { + GameEntry.Event.Fire(this, MenuFileButtonClickEventArgs.Create()); + } + + public void OnGuideButtonClick() + { + GameEntry.Event.Fire(this, MenuGuideButtonClickEventArgs.Create()); + } + + public void OnSettingButtonClick() + { + GameEntry.Event.Fire(this, MenuSettingButtonClickEventArgs.Create()); + } + + public void OnQuitButtonClick() + { + GameEntry.Event.Fire(this, MenuQuitButtonClickEventArgs.Create()); + } + + public void OnAboutButtonClick() + { + GameEntry.Event.Fire(this, MenuAboutButtonClickEventArgs.Create()); + } + } +} diff --git a/Assets/GameMain/Scripts/UI/MenuScene/StartMenuForm.cs.meta b/Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/UI/MenuScene/StartMenuForm.cs.meta rename to Assets/GameMain/Scripts/UI/MenuScene/View/StartMenuForm.cs.meta diff --git a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs b/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs new file mode 100644 index 0000000..3aaaee2 --- /dev/null +++ b/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs @@ -0,0 +1,86 @@ +using System.Text; +using DataTable; +using Definition.DataStruct; +using Entity; +using Entity.EntityData; + +namespace Game.Utility +{ + public static class ItemDescUtility + { + public static string CreatePropDescription(StatModifier[] modifiers) + { + if (modifiers == null || modifiers.Length == 0) + { + return null; + } + + StringBuilder sb = new StringBuilder(); + foreach (StatModifier modifier in modifiers) + { + sb.Append(modifier); + sb.Append('\n'); + } + + return sb.ToString(); + } + + public static string CreateWeaponDescription(DRWeapon drWeapon) + { + if (drWeapon == null) + { + return null; + } + + return CreateWeaponDescription(drWeapon.Attack, drWeapon.Cooldown, drWeapon.AttackRange, drWeapon.Modifiers); + } + + public static string CreateWeaponDescription(WeaponBase weapon) + { + if (weapon == null || weapon.WeaponData == null) + { + return null; + } + + return CreateWeaponDescription(weapon.WeaponData); + } + + public static string CreateWeaponDescription(WeaponData weaponData) + { + if (weaponData == null) + { + return null; + } + + return CreateWeaponDescription(weaponData.Attack, weaponData.Cooldown, + weaponData.AttackRange, weaponData.Modifiers); + } + + public static string CreatePropDescription(PropItem prop) + { + if (prop == null) + { + return null; + } + + return CreatePropDescription(prop.Modifiers); + } + + private static string CreateWeaponDescription(int attack, float cooldown, float attackRange, + StatModifier[] modifiers) + { + StringBuilder sb = new StringBuilder(); + sb.AppendLine($"Attack: {attack}"); + sb.AppendLine($"Cooldown: {cooldown}"); + sb.AppendLine($"Range: {attackRange}"); + + string modifiersDesc = CreatePropDescription(modifiers); + if (!string.IsNullOrEmpty(modifiersDesc)) + { + sb.Append(modifiersDesc); + } + + return sb.ToString(); + } + } +} diff --git a/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs.meta b/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs.meta new file mode 100644 index 0000000..359cbcf --- /dev/null +++ b/Assets/GameMain/Scripts/Utility/ItemDescUtility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcfdad321f8ce314fa013b885c2a78f7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIForms/DialogForm.prefab b/Assets/GameMain/UI/UIForms/DialogForm.prefab index 6b3f2eb..45e1a8b 100644 --- a/Assets/GameMain/UI/UIForms/DialogForm.prefab +++ b/Assets/GameMain/UI/UIForms/DialogForm.prefab @@ -857,11 +857,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -872,11 +872,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -888,7 +888,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.DialogForm, Assembly-CSharp m_MethodName: OnConfirmButtonClick m_Mode: 1 m_Arguments: @@ -1205,11 +1205,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1220,11 +1220,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1236,7 +1236,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.DialogForm, Assembly-CSharp m_MethodName: OnCancelButtonClick m_Mode: 1 m_Arguments: @@ -1306,11 +1306,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1321,11 +1321,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1337,7 +1337,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.DialogForm, Assembly-CSharp m_MethodName: OnOtherButtonClick m_Mode: 1 m_Arguments: @@ -1804,11 +1804,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1819,11 +1819,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1835,7 +1835,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.DialogForm, Assembly-CSharp m_MethodName: OnConfirmButtonClick m_Mode: 1 m_Arguments: @@ -2039,11 +2039,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -2054,11 +2054,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -2070,7 +2070,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.DialogForm, Assembly-CSharp m_MethodName: OnCancelButtonClick m_Mode: 1 m_Arguments: @@ -2392,11 +2392,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -2407,11 +2407,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -2423,7 +2423,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11461274} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.DialogForm, Assembly-CSharp m_MethodName: OnConfirmButtonClick m_Mode: 1 m_Arguments: diff --git a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab b/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab new file mode 100644 index 0000000..7b1721a --- /dev/null +++ b/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab @@ -0,0 +1,1315 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &395929355422612576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6368625289863409235} + - component: {fileID: 4303509830935515119} + m_Layer: 5 + m_Name: DisplayItemInfoForm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6368625289863409235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395929355422612576} + 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: 7543853000780573685} + m_Father: {fileID: 0} + 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!114 &4303509830935515119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 395929355422612576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 32469245f20597240a3c51d2cd1fb0c5, type: 3} + m_Name: + m_EditorClassIdentifier: + _content: {fileID: 7543853000780573685} + _iconArea: {fileID: 7488000213460330546} + _itemTitle: {fileID: 103163210424128144} + _itemTypeText: {fileID: 7330401870143477410} + _itemDescription: {fileID: 6102478747521363808} + _recycleButton: {fileID: 7966632555814587605} + _itemPrice: {fileID: 5325267725881622460} + _autoResizeHeight: 1 + _fixedTopHeight: 180 + _fixedBottomHeight: 300 + _fixedWidth: 600 + _screenEdgePadding: 0 +--- !u!1 &625540161254782982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7543853000780573685} + - component: {fileID: 3996340794476105959} + - component: {fileID: 1280310065211852598} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7543853000780573685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625540161254782982} + 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: 2638066273377455195} + - {fileID: 2312726378312491185} + - {fileID: 2131471118485666816} + - {fileID: 8691033862686863159} + - {fileID: 8339817834368489370} + - {fileID: 5554396850370679744} + m_Father: {fileID: 6368625289863409235} + 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: -500} + m_SizeDelta: {x: 600, y: 1000} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &3996340794476105959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625540161254782982} + m_CullTransparentMesh: 1 +--- !u!114 &1280310065211852598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 625540161254782982} + 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.078431375, g: 0.078431375, b: 0.078431375, a: 0.78431374} + 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &940244511227154073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5554396850370679744} + - component: {fileID: 3016715766725874917} + - component: {fileID: 6053195524865570449} + m_Layer: 5 + m_Name: CancelButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5554396850370679744 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940244511227154073} + 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: 4394995524413963284} + - {fileID: 8784750720261060916} + m_Father: {fileID: 7543853000780573685} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 80} + m_SizeDelta: {x: -60, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3016715766725874917 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940244511227154073} + m_CullTransparentMesh: 1 +--- !u!114 &6053195524865570449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940244511227154073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} + m_Name: + m_EditorClassIdentifier: + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10000 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onClickAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10001 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UI.ShopForm, Assembly-CSharp + m_MethodName: OnPurchaseButtonClick + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] + _enableFade: 1 +--- !u!1 &2619564942114189097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2312726378312491185} + - component: {fileID: 3590733437255178557} + - component: {fileID: 103163210424128144} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2312726378312491185 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2619564942114189097} + 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: 7543853000780573685} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 260, y: -55} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3590733437255178557 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2619564942114189097} + m_CullTransparentMesh: 1 +--- !u!114 &103163210424128144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2619564942114189097} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u624B\u67AA" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &3431459096652039295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8339817834368489370} + - component: {fileID: 948043910868272271} + - component: {fileID: 7966632555814587605} + m_Layer: 5 + m_Name: RecycleButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8339817834368489370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3431459096652039295} + 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: 3198512539087984072} + - {fileID: 2582297470296751951} + m_Father: {fileID: 7543853000780573685} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 180} + m_SizeDelta: {x: -60, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &948043910868272271 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3431459096652039295} + m_CullTransparentMesh: 1 +--- !u!114 &7966632555814587605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3431459096652039295} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} + m_Name: + m_EditorClassIdentifier: + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10000 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onClickAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp + m_MethodName: PlayUISound + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 10001 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UI.ShopForm, Assembly-CSharp + m_MethodName: OnPurchaseButtonClick + m_Mode: 3 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onPointerExitAction: + m_PersistentCalls: + m_Calls: [] + _enableFade: 1 +--- !u!1 &4049733250793100133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2131471118485666816} + - component: {fileID: 6203466971508003467} + - component: {fileID: 7330401870143477410} + m_Layer: 5 + m_Name: Type + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2131471118485666816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049733250793100133} + 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: 7543853000780573685} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 260, y: -98.70999} + m_SizeDelta: {x: 200, y: 37.421997} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6203466971508003467 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049733250793100133} + m_CullTransparentMesh: 1 +--- !u!114 &7330401870143477410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4049733250793100133} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u8FDC\u7A0B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289001471 + m_fontColor: {r: 1, g: 0.9684256, b: 0.64465404, 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: 28.35 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &4095056822365537865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2582297470296751951} + - component: {fileID: 82863396142021810} + - component: {fileID: 5325267725881622460} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2582297470296751951 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095056822365537865} + 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: 8339817834368489370} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &82863396142021810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095056822365537865} + m_CullTransparentMesh: 1 +--- !u!114 &5325267725881622460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095056822365537865} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u51FA\u552E 17 " + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 100 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 2 + 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 &4978846148003915283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8691033862686863159} + - component: {fileID: 4798810177026917072} + - component: {fileID: 6102478747521363808} + m_Layer: 5 + m_Name: Info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8691033862686863159 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978846148003915283} + 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: 7543853000780573685} + 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: -150} + m_SizeDelta: {x: 540, y: 540} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4798810177026917072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978846148003915283} + m_CullTransparentMesh: 1 +--- !u!114 &6102478747521363808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4978846148003915283} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u653B\u51FB\u4F24\u5BB3\uFF1A20" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &7041563492282097683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8784750720261060916} + - component: {fileID: 3305006182403380684} + - component: {fileID: 1072875920542669766} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8784750720261060916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7041563492282097683} + 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: 5554396850370679744} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3305006182403380684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7041563492282097683} + m_CullTransparentMesh: 1 +--- !u!114 &1072875920542669766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7041563492282097683} + 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: "\u53D6\u6D88" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 100 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 2 + 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 &8230569029959109490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4394995524413963284} + - component: {fileID: 8825771618855023712} + - component: {fileID: 1146537876476268394} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4394995524413963284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230569029959109490} + 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: 5554396850370679744} + 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 &8825771618855023712 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230569029959109490} + m_CullTransparentMesh: 1 +--- !u!114 &1146537876476268394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230569029959109490} + 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.30980393, g: 0.30980393, b: 0.30980393, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &8432810498733071531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3198512539087984072} + - component: {fileID: 8850606343170326118} + - component: {fileID: 3213865834535204668} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3198512539087984072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432810498733071531} + 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: 8339817834368489370} + 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 &8850606343170326118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432810498733071531} + m_CullTransparentMesh: 1 +--- !u!114 &3213865834535204668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8432810498733071531} + 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.30980393, g: 0.30980393, b: 0.30980393, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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!1001 &4570083026248103620 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7543853000780573685} + m_Modifications: + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -75 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Name + value: IconArea + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5396f61766946c4db970694836a49fc, type: 3} +--- !u!224 &2638066273377455195 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 4570083026248103620} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7488000213460330546 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 4570083026248103620} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab.meta b/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab.meta new file mode 100644 index 0000000..4ee4ab3 --- /dev/null +++ b/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 20e5dc75d1c3fe74bb841127a036d69d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIForms/HudForm.prefab b/Assets/GameMain/UI/UIForms/HudForm.prefab index 538da5c..7b82de6 100644 --- a/Assets/GameMain/UI/UIForms/HudForm.prefab +++ b/Assets/GameMain/UI/UIForms/HudForm.prefab @@ -170,8 +170,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: -100, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -14, y: -14} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5299361850566254458 MonoBehaviour: @@ -220,7 +220,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0 + m_Value: 0.409 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -233,6 +233,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1455300086952074150} + - component: {fileID: 6419646435329309139} + - component: {fileID: 1381521896688511850} m_Layer: 5 m_Name: ExpArea m_TagString: Untagged @@ -252,82 +254,45 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3960925762482222892} - {fileID: 8236818010774652375} + - {fileID: 7063504788097480022} m_Father: {fileID: 5845023051097607336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -250} - m_SizeDelta: {x: 700, y: 100} + m_AnchoredPosition: {x: 300, y: -230} + m_SizeDelta: {x: 500, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1182827725787535989 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8990597520301077916} - - component: {fileID: 4420973314484963618} - - component: {fileID: 4029625428277520590} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8990597520301077916 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1182827725787535989} - 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: 2701155363628883645} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 40, y: 0} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4420973314484963618 +--- !u!222 &6419646435329309139 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1182827725787535989} + m_GameObject: {fileID: 1093731290841678102} m_CullTransparentMesh: 1 ---- !u!114 &4029625428277520590 +--- !u!114 &1381521896688511850 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1182827725787535989} + m_GameObject: {fileID: 1093731290841678102} 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: 0.039215688, 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 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9f847ec5e66e03e4ead1d3c5f7b510e8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -367,86 +332,11 @@ RectTransform: - {fileID: 5322215605811729203} m_Father: {fileID: 1898912521751469060} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1596007973259430568 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3960925762482222892} - - component: {fileID: 1816411186335264093} - - component: {fileID: 5856507638323542265} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3960925762482222892 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596007973259430568} - 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: 1455300086952074150} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 40, y: 0} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1816411186335264093 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596007973259430568} - m_CullTransparentMesh: 1 ---- !u!114 &5856507638323542265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1596007973259430568} - 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.039215688, g: 1, b: 0.039215688, 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: 0} - 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 &1622132893095492543 GameObject: m_ObjectHideFlags: 0 @@ -479,8 +369,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 8236818010774652375} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} + 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} @@ -505,7 +395,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -522,81 +412,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1948982899618250765 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7152173870151528631} - - component: {fileID: 5525031853979546690} - - component: {fileID: 3099924130929265293} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7152173870151528631 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948982899618250765} - 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: 1036415600598359708} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 40, y: 0} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5525031853979546690 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948982899618250765} - m_CullTransparentMesh: 1 ---- !u!114 &3099924130929265293 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948982899618250765} - 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.9607843, g: 0.039215688, b: 0.039215688, 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: 0} - 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 &2365909501818953394 GameObject: m_ObjectHideFlags: 0 @@ -691,7 +506,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607843, g: 0.039215688, b: 0.039215688, a: 1} + m_Color: {r: 0.78431374, g: 0.039215688, b: 0.039215688, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -717,6 +532,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1036415600598359708} + - component: {fileID: 1248655326598707737} + - component: {fileID: 4046115579287931457} m_Layer: 5 m_Name: HpArea m_TagString: Untagged @@ -736,15 +553,53 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7152173870151528631} - {fileID: 1898912521751469060} + - {fileID: 4969722040546674666} m_Father: {fileID: 5845023051097607336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -150} - m_SizeDelta: {x: 700, y: 100} + m_AnchoredPosition: {x: 300, y: -150} + m_SizeDelta: {x: 500, y: 60} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1248655326598707737 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4006417201588705832} + m_CullTransparentMesh: 1 +--- !u!114 &4046115579287931457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4006417201588705832} + 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: 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &4133186729281980601 GameObject: m_ObjectHideFlags: 0 @@ -985,10 +840,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2701155363628883645} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: -100, y: 50} + 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 &1782615630760369603 CanvasRenderer: @@ -1018,7 +873,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 + m_text: 10 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -1038,7 +893,7 @@ MonoBehaviour: 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_spriteAsset: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} m_TextStyleHashCode: -1183493901 @@ -1046,10 +901,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 + m_fontSize: 60.6 m_fontSizeBase: 50 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -1123,8 +978,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: -100, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -14, y: -14} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8665470951107162402 MonoBehaviour: @@ -1173,7 +1028,7 @@ MonoBehaviour: m_MinValue: 0 m_MaxValue: 1 m_WholeNumbers: 0 - m_Value: 0 + m_Value: 0.545 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -1186,9 +1041,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5845023051097607336} - - component: {fileID: 6538820216580083649} - - component: {fileID: 9208955910188292614} - - component: {fileID: 6729290470935505517} - component: {fileID: 6441412682266920784} m_Layer: 5 m_Name: HudForm @@ -1220,58 +1072,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6538820216580083649 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5770324452358855434} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 100 - m_TargetDisplay: 0 ---- !u!225 &9208955910188292614 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5770324452358855434} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &6729290470935505517 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5770324452358855434} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!114 &6441412682266920784 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1286,7 +1086,9 @@ MonoBehaviour: m_EditorClassIdentifier: _sliderFadeDuration: 0.5 _hpSlider: {fileID: 5299361850566254458} + _hpText: {fileID: 239521969410047457} _expSlider: {fileID: 8665470951107162402} + _expText: {fileID: 1751630811530388523} _coinText: {fileID: 2927128461236740550} --- !u!1 &6271063710925358176 GameObject: @@ -1320,8 +1122,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1898912521751469060} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} + 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} @@ -1346,7 +1148,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_Color: {r: 0.39215687, g: 0.39215687, b: 0.39215687, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1363,6 +1165,276 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6311144745162350469 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4969722040546674666} + - component: {fileID: 134193338904535592} + - component: {fileID: 239521969410047457} + m_Layer: 5 + m_Name: HpText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4969722040546674666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6311144745162350469} + 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: 1036415600598359708} + 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: -14, y: -14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &134193338904535592 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6311144745162350469} + m_CullTransparentMesh: 1 +--- !u!114 &239521969410047457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6311144745162350469} + 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: 5/17 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + 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: 34.85 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &6730857398932861040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7063504788097480022} + - component: {fileID: 6366053473665816812} + - component: {fileID: 1751630811530388523} + m_Layer: 5 + m_Name: ExpText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7063504788097480022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730857398932861040} + 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: 1455300086952074150} + 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: -14, y: -14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6366053473665816812 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730857398932861040} + m_CullTransparentMesh: 1 +--- !u!114 &1751630811530388523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730857398932861040} + 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: LV.1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + 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: 34.85 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &6900972166332848737 GameObject: m_ObjectHideFlags: 0 @@ -1427,12 +1499,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8990597520301077916} - {fileID: 2321401882073682150} m_Father: {fileID: 5845023051097607336} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -350} - m_SizeDelta: {x: 700, y: 100} + m_AnchoredPosition: {x: 300, y: -330} + m_SizeDelta: {x: 500, y: 80} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/GameMain/UI/UIForms/LevelUpForm.prefab b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab new file mode 100644 index 0000000..9f04c29 --- /dev/null +++ b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab @@ -0,0 +1,1345 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1484822525723367822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9174928518681308934} + - component: {fileID: 3962864942331536083} + - component: {fileID: 6670311843598614604} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9174928518681308934 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484822525723367822} + 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: 1796226505867869039} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 1030, y: 350} + m_SizeDelta: {x: 400, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3962864942331536083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484822525723367822} + m_CullTransparentMesh: 1 +--- !u!114 &6670311843598614604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484822525723367822} + 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: "\u5347\u7EA7!" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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: 80 + m_fontSizeBase: 80 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 80 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &1998532815044069722 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7201235682374525352} + - component: {fileID: 9021583542650339210} + - component: {fileID: 2283333985161357846} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7201235682374525352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998532815044069722} + 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: 1796226505867869039} + 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 &9021583542650339210 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998532815044069722} + m_CullTransparentMesh: 1 +--- !u!114 &2283333985161357846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998532815044069722} + 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.3137255, g: 0.3137255, b: 0.3137255, a: 0.39215687} + 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: 0} + 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 &3062469789270053380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1796226505867869039} + - component: {fileID: 2913687516650505952} + m_Layer: 5 + m_Name: LevelUpForm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1796226505867869039 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3062469789270053380} + 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: 7201235682374525352} + - {fileID: 9174928518681308934} + - {fileID: 8030040287481431578} + - {fileID: 7799418069362394985} + m_Father: {fileID: 0} + 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!114 &2913687516650505952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3062469789270053380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73f52c8a6d8b8ec42ad8cd3c00e0254d, type: 3} + m_Name: + m_EditorClassIdentifier: + _propItems: + - {fileID: 5339260094138371585} + - {fileID: 5065979270503000871} + - {fileID: 3446409583753337201} + - {fileID: 7873551165193061568} + _refreshButtonText: {fileID: 2747827682437384067} +--- !u!1 &3106623975235177985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8030040287481431578} + - component: {fileID: 9198662534191252964} + m_Layer: 5 + m_Name: RewardArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8030040287481431578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3106623975235177985} + 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: 1260145051120981171} + - {fileID: 2101433581138342293} + - {fileID: 8408265286534267843} + - {fileID: 3900199648890134130} + m_Father: {fileID: 1796226505867869039} + 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: -250, y: 0} + m_SizeDelta: {x: 1950, y: 423} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &9198662534191252964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3106623975235177985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1001 &1183525928596393334 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1796226505867869039} + m_Modifications: + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9f847ec5e66e03e4ead1d3c5f7b510e8, + type: 3} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Color.b + value: 0.078431375 + objectReference: {fileID: 0} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Color.g + value: 0.078431375 + objectReference: {fileID: 0} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Color.r + value: 0.078431375 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_text + value: "\u5237\u65B0 -20 " + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSize + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor.b + value: 0.98039216 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor.g + value: 0.98039216 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor.r + value: 0.98039216 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSizeMax + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_spriteAsset + value: + objectReference: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, + type: 2} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSizeBase + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_enableAutoSizing + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294638330 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_VerticalAlignment + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387, guid: 92e9102fc83c8e949971efe6f1fa6501, + type: 3} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 3846984240573617890, guid: 92e9102fc83c8e949971efe6f1fa6501, + type: 3} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnRefreshButtonClick + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.UGuiForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.LevelUpForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.UGuiForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.UGuiForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Name + value: RefreshButton + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.x + value: 700 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -1530 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -300 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} +--- !u!114 &2747827682437384067 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 1183525928596393334} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7799418069362394985 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 1183525928596393334} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1289917844414936308 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8030040287481431578} + m_Modifications: + - target: {fileID: 837081792673381700, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Name + value: LevelUpRewardItem (1) + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 423.5012 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} +--- !u!224 &2101433581138342293 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 1289917844414936308} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5065979270503000871 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6317226738738323411, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 1289917844414936308} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &2140213659577717202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8030040287481431578} + m_Modifications: + - target: {fileID: 837081792673381700, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Name + value: LevelUpRewardItem + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 423.5012 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} +--- !u!224 &1260145051120981171 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 2140213659577717202} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5339260094138371585 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6317226738738323411, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 2140213659577717202} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4246671445623233299 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8030040287481431578} + m_Modifications: + - target: {fileID: 837081792673381700, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Name + value: LevelUpRewardItem (3) + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 423.5012 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} +--- !u!224 &3900199648890134130 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 4246671445623233299} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7873551165193061568 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6317226738738323411, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 4246671445623233299} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &8682754805774829218 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8030040287481431578} + m_Modifications: + - target: {fileID: 837081792673381700, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Name + value: LevelUpRewardItem (2) + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.x + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_SizeDelta.y + value: 423.5012 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2913687516650505952} + - target: {fileID: 1855730643842292243, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, type: 3} +--- !u!114 &3446409583753337201 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6317226738738323411, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 8682754805774829218} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8408265286534267843 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 923096931429369185, guid: ce8bbe245fa50b74bac0eea7bff0dc3a, + type: 3} + m_PrefabInstance: {fileID: 8682754805774829218} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/GameMain/UI/UIForms/LevelUpForm.prefab.meta b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab.meta new file mode 100644 index 0000000..4d57fd9 --- /dev/null +++ b/Assets/GameMain/UI/UIForms/LevelUpForm.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74de26a1b47fa13468ea72894a720176 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab index 253432b..bbd94f0 100644 --- a/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab +++ b/Assets/GameMain/UI/UIForms/SelectRoleForm.prefab @@ -1635,18 +1635,17 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 397114337025658313} - - {fileID: 259559770829372162} - - {fileID: 691984686878865501} - - {fileID: 7995641022404817670} - - {fileID: 1615720880259348202} - - {fileID: 5055475971841257549} - - {fileID: 4646147628908793329} - - {fileID: 5133268688704988234} - - {fileID: 8217609735068362146} - - {fileID: 8191581230398425637} - - {fileID: 8754574190278218555} - - {fileID: 1708390935586671204} - - {fileID: 1753517898338064402} + - {fileID: 3047004482816051651} + - {fileID: 1995905959149504556} + - {fileID: 8105348463665060978} + - {fileID: 7944645524809742427} + - {fileID: 4382565915989379915} + - {fileID: 7526225922685446747} + - {fileID: 4824704138270764712} + - {fileID: 1060015855714117705} + - {fileID: 3699355731434112743} + - {fileID: 1981089040712168302} + - {fileID: 5634731222495693178} m_Father: {fileID: 28259533045232718} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2150,7 +2149,7 @@ RectTransform: m_AnchoredPosition: {x: -250, y: 0} m_SizeDelta: {x: 500, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1333895969391184564 +--- !u!1001 &1678489317820465238 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2158,16 +2157,96 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 5201218836764882073} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 5201218836764882073} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -2278,13 +2357,25 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &5133268688704988234 stripped +--- !u!224 &4824704138270764712 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 1333895969391184564} + m_PrefabInstance: {fileID: 1678489317820465238} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1411688685490446003 +--- !u!114 &5201218836764882073 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 1678489317820465238} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1985363736125171588 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2292,16 +2383,96 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 4965267041341936459} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 4965267041341936459} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -2405,20 +2576,32 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (5) + value: RoleItem (11) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &5055475971841257549 stripped +--- !u!114 &4965267041341936459 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 1985363736125171588} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5634731222495693178 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 1411688685490446003} + m_PrefabInstance: {fileID: 1985363736125171588} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1568824264275501839 +--- !u!1001 &2721300650859557516 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2428,138 +2611,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &4646147628908793329 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 1568824264275501839} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2599047883640644827 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -2567,411 +2631,74 @@ PrefabInstance: objectReference: {fileID: 7510942500789349387} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + objectReference: {fileID: 8836415805828564547} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: m_Pivot.y - value: 0.5 + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem (9) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &8191581230398425637 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 2599047883640644827} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2861240958992567132 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem (8) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &8217609735068362146 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 2861240958992567132} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3225005225409543621 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 7510942500789349387} + objectReference: {fileID: 8836415805828564547} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem (10) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &8754574190278218555 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 3225005225409543621} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4272159956183850488 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -3082,11 +2809,475 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &7995641022404817670 stripped +--- !u!224 &8105348463665060978 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 4272159956183850488} + m_PrefabInstance: {fileID: 2721300650859557516} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8836415805828564547 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 2721300650859557516} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4323164267074819749 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6124030385652187818} + m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7249589387663696490} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7249589387663696490} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Name + value: RoleItem (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} +--- !u!114 &7249589387663696490 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 4323164267074819749} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7944645524809742427 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 4323164267074819749} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4453353475342255269 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6124030385652187818} + m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7108998779798040682} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7108998779798040682} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Name + value: RoleItem (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} +--- !u!114 &7108998779798040682 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 4453353475342255269} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7526225922685446747 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 4453353475342255269} m_PrefabAsset: {fileID: 0} --- !u!1001 &4531874067615589855 PrefabInstance: @@ -3357,7 +3548,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4531874067615589855} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4758782519080543386 +--- !u!1001 &5624180204000208594 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -3365,16 +3556,96 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1254353399428518429} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1254353399428518429} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -3478,154 +3749,32 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (11) + value: RoleItem (2) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &1708390935586671204 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, +--- !u!114 &1254353399428518429 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 4758782519080543386} + m_PrefabInstance: {fileID: 5624180204000208594} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4887472574223374356 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &1615720880259348202 stripped + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1995905959149504556 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 4887472574223374356} + m_PrefabInstance: {fileID: 5624180204000208594} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5614375481823246060 +--- !u!1001 &5675034716082216336 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -3633,16 +3782,96 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1271290373848557919} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1271290373848557919} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -3746,18 +3975,30 @@ PrefabInstance: - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Name - value: RoleItem (12) + value: RoleItem (10) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &1753517898338064402 stripped +--- !u!114 &1271290373848557919 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 5675034716082216336} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1981089040712168302 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 5614375481823246060} + m_PrefabInstance: {fileID: 5675034716082216336} m_PrefabAsset: {fileID: 0} --- !u!1001 &5781828759089275703 PrefabInstance: @@ -3767,16 +4008,96 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1105756041237075960} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1105756041237075960} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -3893,7 +4214,19 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5781828759089275703} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6207613682667640316 +--- !u!114 &1105756041237075960 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 5781828759089275703} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &6560079103928125111 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -3901,16 +4234,774 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6124030385652187818} m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 319567477725180536} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 319567477725180536} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Name + value: RoleItem (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} +--- !u!114 &319567477725180536 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 6560079103928125111} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1060015855714117705 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 6560079103928125111} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7415523741539100697 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6124030385652187818} + m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 4146823842836454614} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 4146823842836454614} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Name + value: RoleItem (9) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} +--- !u!224 &3699355731434112743 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 7415523741539100697} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4146823842836454614 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 7415523741539100697} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &7597004703067432373 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6124030385652187818} + m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 3893566779691405690} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 3893566779691405690} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: m_Name + value: RoleItem (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} +--- !u!114 &3893566779691405690 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 7597004703067432373} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &4382565915989379915 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 7597004703067432373} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9220796513465165629 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6124030385652187818} + m_Modifications: + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2347387293927117810} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfirmRoleClick + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 2347387293927117810} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: UpdateShowRole + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.RoleItem, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} propertyPath: m_Pivot.x @@ -4021,143 +5112,21 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &259559770829372162 stripped +--- !u!114 &2347387293927117810 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6873972826773845199, guid: 78595a129d0438c44b2d52720e9c0edd, + type: 3} + m_PrefabInstance: {fileID: 9220796513465165629} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35de2974f065de547952f8d5cbb9f6fe, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &3047004482816051651 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} - m_PrefabInstance: {fileID: 6207613682667640316} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6639879895112144547 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6124030385652187818} - m_Modifications: - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 3813327180119752992, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7510942500789349387} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8290519928564306843, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - propertyPath: m_Name - value: RoleItem (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 78595a129d0438c44b2d52720e9c0edd, type: 3} ---- !u!224 &691984686878865501 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6178934281176772350, guid: 78595a129d0438c44b2d52720e9c0edd, - type: 3} - m_PrefabInstance: {fileID: 6639879895112144547} + m_PrefabInstance: {fileID: 9220796513465165629} m_PrefabAsset: {fileID: 0} diff --git a/Assets/GameMain/UI/UIForms/SettingForm.prefab b/Assets/GameMain/UI/UIForms/SettingForm.prefab index 5f20c00..f58f77e 100644 --- a/Assets/GameMain/UI/UIForms/SettingForm.prefab +++ b/Assets/GameMain/UI/UIForms/SettingForm.prefab @@ -269,8 +269,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 22412012} - - component: {fileID: 22245532} - - component: {fileID: 22325564} - component: {fileID: 11472764} m_Layer: 5 m_Name: SettingForm @@ -299,37 +297,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &22245532 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107322} - m_CullTransparentMesh: 1 ---- !u!223 &22325564 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107322} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 1 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!114 &11472764 MonoBehaviour: m_ObjectHideFlags: 0 @@ -830,11 +797,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11472764} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -845,11 +812,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11472764} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -861,9 +828,9 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11472764} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: Close - m_Mode: 1 + m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -1074,11 +1041,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} m_Name: m_EditorClassIdentifier: - m_OnHover: + _onPointerEnterAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11472764} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1089,11 +1056,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_OnClick: + _onClickAction: m_PersistentCalls: m_Calls: - m_Target: {fileID: 11472764} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.UGuiForm, Assembly-CSharp m_MethodName: PlayUISound m_Mode: 3 m_Arguments: @@ -1105,7 +1072,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 11472764} - m_TargetAssemblyTypeName: + m_TargetAssemblyTypeName: UI.SettingForm, Assembly-CSharp m_MethodName: OnSubmitButtonClick m_Mode: 1 m_Arguments: diff --git a/Assets/GameMain/UI/UIForms/ShopForm.prefab b/Assets/GameMain/UI/UIForms/ShopForm.prefab index f588e52..836c2a3 100644 --- a/Assets/GameMain/UI/UIForms/ShopForm.prefab +++ b/Assets/GameMain/UI/UIForms/ShopForm.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &33396627038210325 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8361819934641080368} - - component: {fileID: 3854035550548326642} - - component: {fileID: 5456557988972698011} - m_Layer: 5 - m_Name: IconBg (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8361819934641080368 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 33396627038210325} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3854035550548326642 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 33396627038210325} - m_CullTransparentMesh: 1 ---- !u!114 &5456557988972698011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 33396627038210325} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &211900359981148007 GameObject: m_ObjectHideFlags: 0 @@ -178,7 +103,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5348204827379111394} - {fileID: 9171277918240658255} m_Father: {fileID: 2411888437285713139} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -187,178 +111,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &334189692109911098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1699414028525728575} - m_Layer: 5 - m_Name: CoinArea - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1699414028525728575 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 334189692109911098} - 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: 6341007853541803584} - - {fileID: 8334197743777063791} - m_Father: {fileID: 2522232489058699662} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -270, y: 0} - m_SizeDelta: {x: 250, y: 100} - m_Pivot: {x: 0, y: 0.5} ---- !u!1 &438153886538262911 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6341007853541803584} - - component: {fileID: 6336815174112617027} - - component: {fileID: 2114319424437729276} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6341007853541803584 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438153886538262911} - 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: 1699414028525728575} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -50, y: 0} - m_SizeDelta: {x: -100, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6336815174112617027 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438153886538262911} - m_CullTransparentMesh: 1 ---- !u!114 &2114319424437729276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438153886538262911} - 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: -20 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} - m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294638330 - m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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: 80 - m_fontSizeBase: 80 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 100 - m_fontStyle: 1 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 2 - 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 &838319344123269394 GameObject: m_ObjectHideFlags: 0 @@ -434,81 +186,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &915823541521274636 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1882063461834631758} - - component: {fileID: 1635990710807128463} - - component: {fileID: 6700672391218259074} - m_Layer: 5 - m_Name: IconBg (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1882063461834631758 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915823541521274636} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1635990710807128463 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915823541521274636} - m_CullTransparentMesh: 1 ---- !u!114 &6700672391218259074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915823541521274636} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &1172841486695233833 GameObject: m_ObjectHideFlags: 0 @@ -676,232 +353,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &1401021460865619293 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3473631314657123046} - - component: {fileID: 6253867153145587315} - - component: {fileID: 77030836322109773} - m_Layer: 5 - m_Name: IconBg (9) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3473631314657123046 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1401021460865619293} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6253867153145587315 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1401021460865619293} - m_CullTransparentMesh: 1 ---- !u!114 &77030836322109773 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1401021460865619293} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &1531186172834842668 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2073721498895463010} - - component: {fileID: 3708862320859342346} - - component: {fileID: 5004192048328285897} - m_Layer: 5 - m_Name: IconBg (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2073721498895463010 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531186172834842668} - 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: 5845702049125630971} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3708862320859342346 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531186172834842668} - m_CullTransparentMesh: 1 ---- !u!114 &5004192048328285897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531186172834842668} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &1950852733767469469 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6738229282025619383} - - component: {fileID: 6866648974739084553} - - component: {fileID: 4767525924938584164} - m_Layer: 5 - m_Name: ScrollView - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6738229282025619383 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1950852733767469469} - 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: 4655781017661762924} - m_Father: {fileID: 2867366890069726016} - 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 &6866648974739084553 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1950852733767469469} - m_CullTransparentMesh: 1 ---- !u!114 &4767525924938584164 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1950852733767469469} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 6435118920824550072} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 4655781017661762924} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2031395237339476724 GameObject: m_ObjectHideFlags: 0 @@ -938,81 +389,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2089539779510837093 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3508333514555080033} - - component: {fileID: 4067544859087098787} - - component: {fileID: 1229422003675640761} - m_Layer: 5 - m_Name: IconBg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3508333514555080033 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089539779510837093} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4067544859087098787 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089539779510837093} - m_CullTransparentMesh: 1 ---- !u!114 &1229422003675640761 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089539779510837093} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &2421321311317459406 GameObject: m_ObjectHideFlags: 0 @@ -1078,7 +454,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5546\u5E97" + m_text: "\u5546\u5E97(\u7B2C1\u6CE2)" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -1106,12 +482,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 80 + m_fontSize: 60 m_fontSizeBase: 80 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 80 + m_fontSizeMax: 60 m_fontStyle: 1 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -1157,10 +533,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1904881530488092821} - - component: {fileID: 1047557800192134594} - - component: {fileID: 240938256630192574} - - component: {fileID: 2060103886380523932} - - component: {fileID: 6924066151665217455} - component: {fileID: 6980281636704611500} m_Layer: 5 m_Name: ShopForm @@ -1178,7 +550,7 @@ RectTransform: m_GameObject: {fileID: 2594015405937660406} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2572918104515469108} @@ -1189,85 +561,10 @@ RectTransform: m_Father: {fileID: 0} 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, y: 0} ---- !u!223 &1047557800192134594 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594015405937660406} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &240938256630192574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594015405937660406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 2560, y: 1600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &2060103886380523932 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594015405937660406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!225 &6924066151665217455 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2594015405937660406} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6980281636704611500 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1282,15 +579,15 @@ MonoBehaviour: m_EditorClassIdentifier: _titleText: {fileID: 550116815674234749} _continueButtonText: {fileID: 1556461039405303740} - _refreshPriceText: {fileID: 2114319424437729276} + _refreshPriceText: {fileID: 7575022460236106084} _playerCoinText: {fileID: 4828239452296117559} _goodsItems: - {fileID: 4408146096950002354} - - {fileID: 5704320650765796013} - - {fileID: 8036388847395818767} - - {fileID: 822772734905577055} - - {fileID: 3813865854045780202} - - {fileID: 7129535280783160309} + - {fileID: 8125692873401483319} + - {fileID: 7155723060929665062} + - {fileID: 1113536076677295857} + _propListArea: {fileID: 5174071208824798050} + _weaponListArea: {fileID: 2144542113228689988} --- !u!1 &2599872763744672693 GameObject: m_ObjectHideFlags: 0 @@ -1319,7 +616,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6738229282025619383} + - {fileID: 6435118920824550072} m_Father: {fileID: 1904881530488092821} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1327,81 +624,6 @@ RectTransform: m_AnchoredPosition: {x: -225, y: 150} m_SizeDelta: {x: 2010, y: 700} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3129770011746228650 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8334197743777063791} - - component: {fileID: 6297571848399481845} - - component: {fileID: 5795840954041404698} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8334197743777063791 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129770011746228650} - 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: 1699414028525728575} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -40, y: 0} - m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6297571848399481845 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129770011746228650} - m_CullTransparentMesh: 1 ---- !u!114 &5795840954041404698 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129770011746228650} - 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: 0.039215688, 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: 0} - 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 &3287304047529558517 GameObject: m_ObjectHideFlags: 0 @@ -1411,8 +633,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6435118920824550072} - - component: {fileID: 625186092969302073} - - component: {fileID: 4972516828287923743} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -1433,58 +653,16 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7653824607798275002} - - {fileID: 1743711094383143845} - - {fileID: 4079632870962832391} - - {fileID: 6660870138841204567} - - {fileID: 7203133363365646818} - - {fileID: 3884930791209081597} - m_Father: {fileID: 4655781017661762924} + - {fileID: 2873151379806595391} + - {fileID: 3770926168027951406} + - {fileID: 6372358459578501113} + m_Father: {fileID: 2867366890069726016} 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_AnchoredPosition: {x: 0.000061035156, y: 0} + m_SizeDelta: {x: -2010, y: 0} m_Pivot: {x: 0, y: 1} ---- !u!114 &625186092969302073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3287304047529558517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 50 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &4972516828287923743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3287304047529558517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &3298487782671207872 GameObject: m_ObjectHideFlags: 0 @@ -1494,7 +672,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4930859207330783680} - - component: {fileID: 1953668855944177303} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -1513,124 +690,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3508333514555080033} - - {fileID: 4791712367180597647} - - {fileID: 8361819934641080368} - - {fileID: 4945265486412480652} - - {fileID: 1882063461834631758} - - {fileID: 851259000191537792} - - {fileID: 5533367414635946950} - - {fileID: 1362214897352788145} - - {fileID: 8385393759381136776} - - {fileID: 3473631314657123046} - - {fileID: 6987399504272209639} + m_Children: [] m_Father: {fileID: 2384114508316395579} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 300} + m_AnchoredPosition: {x: 2, y: 0.000067918794} + m_SizeDelta: {x: -2, y: 300} m_Pivot: {x: 0, y: 1} ---- !u!114 &1953668855944177303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3298487782671207872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 150, y: 150} - m_Spacing: {x: 10, y: 10} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!1 &3489325773989036511 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1362214897352788145} - - component: {fileID: 889265255049909221} - - component: {fileID: 1758669136032628542} - m_Layer: 5 - m_Name: IconBg (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1362214897352788145 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3489325773989036511} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &889265255049909221 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3489325773989036511} - m_CullTransparentMesh: 1 ---- !u!114 &1758669136032628542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3489325773989036511} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &3529895034686484875 GameObject: m_ObjectHideFlags: 0 @@ -1740,8 +807,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: -100, y: 80} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4368541988642550910 CanvasRenderer: @@ -1771,7 +838,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 123454 + m_text: 123454 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -1791,7 +858,7 @@ MonoBehaviour: 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_spriteAsset: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} m_TextStyleHashCode: -1183493901 @@ -1806,7 +873,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 100 m_fontStyle: 1 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1853,7 +920,7 @@ GameObject: - component: {fileID: 8053241550051454092} - component: {fileID: 1335373473209610113} m_Layer: 5 - m_Name: TipText + m_Name: TitleText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1875,8 +942,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 115, y: 0} - m_SizeDelta: {x: 230, y: 60} + m_AnchoredPosition: {x: 55, y: 0} + m_SizeDelta: {x: 110, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8053241550051454092 CanvasRenderer: @@ -1906,7 +973,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u6B66\u5668 (0/6)" + m_text: "\u6B66\u5668" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -1976,81 +1043,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3778025667585432787 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6987399504272209639} - - component: {fileID: 5673283662492961326} - - component: {fileID: 7342036164811940136} - m_Layer: 5 - m_Name: IconBg (10) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6987399504272209639 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3778025667585432787} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5673283662492961326 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3778025667585432787} - m_CullTransparentMesh: 1 ---- !u!114 &7342036164811940136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3778025667585432787} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &3963448221191384772 GameObject: m_ObjectHideFlags: 0 @@ -2087,171 +1079,6 @@ RectTransform: m_AnchoredPosition: {x: -250, y: 0} m_SizeDelta: {x: 500, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4238528322535225469 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5454896890313285988} - - component: {fileID: 2396870986285225523} - - component: {fileID: 3162489430643406328} - m_Layer: 5 - m_Name: IconBg (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5454896890313285988 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4238528322535225469} - 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: 5845702049125630971} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2396870986285225523 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4238528322535225469} - m_CullTransparentMesh: 1 ---- !u!114 &3162489430643406328 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4238528322535225469} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &4306979227791952741 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4655781017661762924} - - component: {fileID: 2116446824468925505} - - component: {fileID: 4864289287291060036} - - component: {fileID: 5299256399555853226} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4655781017661762924 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4306979227791952741} - 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: 6435118920824550072} - m_Father: {fileID: 6738229282025619383} - 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, y: 1} ---- !u!222 &2116446824468925505 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4306979227791952741} - m_CullTransparentMesh: 1 ---- !u!114 &4864289287291060036 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4306979227791952741} - 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: 10917, 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!114 &5299256399555853226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4306979227791952741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!1 &4650676685977817849 GameObject: m_ObjectHideFlags: 0 @@ -2281,6 +1108,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1157522922053796998} + - {fileID: 8271926014570095036} - {fileID: 6690814313829357658} m_Father: {fileID: 7033611228266608009} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2298,9 +1126,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5845702049125630971} - - component: {fileID: 8862859300421807266} m_Layer: 5 - m_Name: IconParent + m_Name: WeaponParent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2317,13 +1144,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2387740712149827772} - - {fileID: 2901250873742386078} - - {fileID: 8935256462978635282} - - {fileID: 9107857811115793917} - - {fileID: 5454896890313285988} - - {fileID: 2073721498895463010} + m_Children: [] m_Father: {fileID: 2543611553985333978} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2331,31 +1152,7 @@ RectTransform: m_AnchoredPosition: {x: -15, y: -45} m_SizeDelta: {x: 470, y: 310} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8862859300421807266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4873368730001398292} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 150, y: 150} - m_Spacing: {x: 10, y: 10} - m_Constraint: 2 - m_ConstraintCount: 2 ---- !u!1 &5882353211179696832 +--- !u!1 &5096030795213380013 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2363,73 +1160,133 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8935256462978635282} - - component: {fileID: 4590015110528118744} - - component: {fileID: 8036777470118620962} + - component: {fileID: 6984496433555195495} + - component: {fileID: 4204599436908175998} + - component: {fileID: 4363556359675586539} m_Layer: 5 - m_Name: IconBg (2) + m_Name: CountText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8935256462978635282 +--- !u!224 &6984496433555195495 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882353211179696832} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5096030795213380013} + 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: 5845702049125630971} + m_Father: {fileID: 8498973045758957642} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 170.00005, y: 0} + m_SizeDelta: {x: 120, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4590015110528118744 +--- !u!222 &4204599436908175998 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882353211179696832} + m_GameObject: {fileID: 5096030795213380013} m_CullTransparentMesh: 1 ---- !u!114 &8036777470118620962 +--- !u!114 &4363556359675586539 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5882353211179696832} + m_GameObject: {fileID: 5096030795213380013} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, 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 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 + m_text: (0/6) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + 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: 50 + m_fontSizeBase: 50 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &6033790442002412512 GameObject: m_ObjectHideFlags: 0 @@ -2439,6 +1296,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2543611553985333978} + - component: {fileID: 2144542113228689988} m_Layer: 5 m_Name: OwnedWeaponArea m_TagString: Untagged @@ -2467,306 +1325,28 @@ RectTransform: m_AnchoredPosition: {x: 755, y: 0.000005722} m_SizeDelta: {x: 500, y: 400} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6251294382021028326 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2387740712149827772} - - component: {fileID: 4434526314295466366} - - component: {fileID: 4038695237678865526} - m_Layer: 5 - m_Name: IconBg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2387740712149827772 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6251294382021028326} - 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: 5845702049125630971} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4434526314295466366 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6251294382021028326} - m_CullTransparentMesh: 1 ---- !u!114 &4038695237678865526 +--- !u!114 &2144542113228689988 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6251294382021028326} + m_GameObject: {fileID: 6033790442002412512} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 58c6ff306e4be41458bdf4dd82ad92e1, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &6654996308178949885 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2901250873742386078} - - component: {fileID: 5996171863627118383} - - component: {fileID: 5033978362226731920} - m_Layer: 5 - m_Name: IconBg (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2901250873742386078 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6654996308178949885} - 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: 5845702049125630971} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5996171863627118383 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6654996308178949885} - m_CullTransparentMesh: 1 ---- !u!114 &5033978362226731920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6654996308178949885} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &6682149309284934893 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8385393759381136776} - - component: {fileID: 5409649132680921402} - - component: {fileID: 258465914826401918} - m_Layer: 5 - m_Name: IconBg (8) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8385393759381136776 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6682149309284934893} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5409649132680921402 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6682149309284934893} - m_CullTransparentMesh: 1 ---- !u!114 &258465914826401918 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6682149309284934893} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &6804225353739493837 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4791712367180597647} - - component: {fileID: 1354089962168642872} - - component: {fileID: 5337523262730952924} - m_Layer: 5 - m_Name: IconBg (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4791712367180597647 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804225353739493837} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1354089962168642872 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804225353739493837} - m_CullTransparentMesh: 1 ---- !u!114 &5337523262730952924 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6804225353739493837} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 + _titleText: {fileID: 1335373473209610113} + _countText: {fileID: 4363556359675586539} + _displayItemTemplate: {fileID: 8108003253794388876, guid: a76ff56683a2bc2479ebd63dcdd658b0, + type: 3} + _displayItemRoot: {fileID: 5845702049125630971} + _startPosition: {x: 0, y: 0} + _itemSize: 150 + _itemSpacing: 10 + _fixedColumnCount: 3 + _instancePoolCapacity: 32 --- !u!1 &6965201405525023054 GameObject: m_ObjectHideFlags: 0 @@ -2833,6 +1413,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7754077635877504759} + - {fileID: 6984496433555195495} - {fileID: 2820595825152489719} m_Father: {fileID: 2543611553985333978} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2841,156 +1422,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -40} m_SizeDelta: {x: 0, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7084062733078142203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9107857811115793917} - - component: {fileID: 7470975900193535925} - - component: {fileID: 4782364531996086199} - m_Layer: 5 - m_Name: IconBg (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9107857811115793917 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7084062733078142203} - 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: 5845702049125630971} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7470975900193535925 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7084062733078142203} - m_CullTransparentMesh: 1 ---- !u!114 &4782364531996086199 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7084062733078142203} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &7090272007822716677 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4945265486412480652} - - component: {fileID: 8255494769696318096} - - component: {fileID: 2617563652246145443} - m_Layer: 5 - m_Name: IconBg (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4945265486412480652 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7090272007822716677} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8255494769696318096 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7090272007822716677} - m_CullTransparentMesh: 1 ---- !u!114 &2617563652246145443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7090272007822716677} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &7191069276534072237 GameObject: m_ObjectHideFlags: 0 @@ -3000,6 +1431,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7033611228266608009} + - component: {fileID: 5174071208824798050} m_Layer: 5 m_Name: OwnedPropArea m_TagString: Untagged @@ -3028,6 +1460,28 @@ RectTransform: m_AnchoredPosition: {x: -405, y: 0.000005722} m_SizeDelta: {x: 1150, y: 400} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5174071208824798050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7191069276534072237} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58c6ff306e4be41458bdf4dd82ad92e1, type: 3} + m_Name: + m_EditorClassIdentifier: + _titleText: {fileID: 3147210475793208583} + _countText: {fileID: 0} + _displayItemTemplate: {fileID: 8108003253794388876, guid: a76ff56683a2bc2479ebd63dcdd658b0, + type: 3} + _displayItemRoot: {fileID: 4930859207330783680} + _startPosition: {x: 2, y: -2} + _itemSize: 150 + _itemSpacing: 10 + _fixedColumnCount: 7 + _instancePoolCapacity: 32 --- !u!1 &7486433393231465357 GameObject: m_ObjectHideFlags: 0 @@ -3062,8 +1516,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 60, y: 0} - m_SizeDelta: {x: -120, y: 3} + m_AnchoredPosition: {x: 135, y: 0} + m_SizeDelta: {x: -270, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1149023497136580568 CanvasRenderer: @@ -3223,87 +1677,12 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3604025852863017522} m_HandleRect: {fileID: 8982130026310361329} m_Direction: 2 - m_Value: 1 - m_Size: 1 + m_Value: 0 + m_Size: 0.99999577 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &7754210075127527594 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5533367414635946950} - - component: {fileID: 3560979185178321756} - - component: {fileID: 2777177940154275163} - m_Layer: 5 - m_Name: IconBg (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5533367414635946950 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7754210075127527594} - 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3560979185178321756 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7754210075127527594} - m_CullTransparentMesh: 1 ---- !u!114 &2777177940154275163 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7754210075127527594} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &7990098028790493485 GameObject: m_ObjectHideFlags: 0 @@ -3316,7 +1695,7 @@ GameObject: - component: {fileID: 451856188572179315} - component: {fileID: 3147210475793208583} m_Layer: 5 - m_Name: TipText + m_Name: TitleText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3477,7 +1856,7 @@ RectTransform: m_AnchoredPosition: {x: -225, y: -100} m_SizeDelta: {x: -550, y: 200} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8462487032685258542 +--- !u!1 &8603634289503406039 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3485,149 +1864,134 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 851259000191537792} - - component: {fileID: 2134244900030282855} - - component: {fileID: 4619478201566901538} + - component: {fileID: 8271926014570095036} + - component: {fileID: 8943490797345218325} + - component: {fileID: 8582964069843304838} m_Layer: 5 - m_Name: IconBg (5) + m_Name: CountText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &851259000191537792 +--- !u!224 &8271926014570095036 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8462487032685258542} + m_GameObject: {fileID: 8603634289503406039} 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: 4930859207330783680} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2134244900030282855 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8462487032685258542} - m_CullTransparentMesh: 1 ---- !u!114 &4619478201566901538 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8462487032685258542} - 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &9178450107080152534 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5348204827379111394} - - component: {fileID: 2726882249406968764} - - component: {fileID: 4832466633297496649} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5348204827379111394 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9178450107080152534} - 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: 5266357523157936803} + m_Father: {fileID: 4231563412428212643} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 40, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 187.51, y: 0} + m_SizeDelta: {x: 155.0262, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2726882249406968764 +--- !u!222 &8943490797345218325 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9178450107080152534} + m_GameObject: {fileID: 8603634289503406039} m_CullTransparentMesh: 1 ---- !u!114 &4832466633297496649 +--- !u!114 &8582964069843304838 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9178450107080152534} + m_GameObject: {fileID: 8603634289503406039} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.039215688, 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 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - 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!1001 &1006031196670036788 + m_text: (1) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + 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: 50 + m_fontSizeBase: 50 + 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: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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!1001 &2418935844508275135 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -3668,7 +2032,7 @@ PrefabInstance: - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -3688,7 +2052,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -3698,7 +2062,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -3748,12 +2112,12 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1225 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -350 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -3773,195 +2137,24 @@ PrefabInstance: - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_Name - value: GoodsItem 1 + value: GoodsItem 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} ---- !u!224 &1743711094383143845 stripped +--- !u!224 &3770926168027951406 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} - m_PrefabInstance: {fileID: 1006031196670036788} + m_PrefabInstance: {fileID: 2418935844508275135} m_PrefabAsset: {fileID: 0} ---- !u!114 &5704320650765796013 stripped +--- !u!114 &7155723060929665062 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4818839934941563289, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} - m_PrefabInstance: {fileID: 1006031196670036788} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &2319010708242135660 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6435118920824550072} - m_Modifications: - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 6980281636704611500} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 6980281636704611500} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: OnPurchaseButtonClick - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 6980281636704611500} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.ShopForm, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.x - value: 450 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.y - value: 650 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Name - value: GoodsItem 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} ---- !u!224 &3884930791209081597 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - m_PrefabInstance: {fileID: 2319010708242135660} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7129535280783160309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4818839934941563289, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - m_PrefabInstance: {fileID: 2319010708242135660} + m_PrefabInstance: {fileID: 2418935844508275135} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -4353,7 +2546,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2582582569457716553} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3267652283010696342 +--- !u!1001 &3610681829673945518 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -4394,7 +2587,7 @@ PrefabInstance: - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4414,7 +2607,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4424,7 +2617,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4474,12 +2667,12 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 725 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -350 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4499,24 +2692,24 @@ PrefabInstance: - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_Name - value: GoodsItem 2 + value: GoodsItem 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} ---- !u!224 &4079632870962832391 stripped +--- !u!224 &2873151379806595391 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} - m_PrefabInstance: {fileID: 3267652283010696342} + m_PrefabInstance: {fileID: 3610681829673945518} m_PrefabAsset: {fileID: 0} ---- !u!114 &8036388847395818767 stripped +--- !u!114 &8125692873401483319 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4818839934941563289, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} - m_PrefabInstance: {fileID: 3267652283010696342} + m_PrefabInstance: {fileID: 3610681829673945518} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -4524,7 +2717,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &5311122828870084550 +--- !u!1001 &5596820170682541928 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -4585,7 +2778,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4595,7 +2788,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4645,12 +2838,12 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1725 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -350 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -4677,11 +2870,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} ---- !u!114 &822772734905577055 stripped +--- !u!114 &1113536076677295857 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4818839934941563289, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} - m_PrefabInstance: {fileID: 5311122828870084550} + m_PrefabInstance: {fileID: 5596820170682541928} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -4689,11 +2882,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &6660870138841204567 stripped +--- !u!224 &6372358459578501113 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} - m_PrefabInstance: {fileID: 5311122828870084550} + m_PrefabInstance: {fileID: 5596820170682541928} m_PrefabAsset: {fileID: 0} --- !u!1001 &6868384101991383953 PrefabInstance: @@ -4727,7 +2920,7 @@ PrefabInstance: - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_text - value: "\u5237\u65B0" + value: "\u5237\u65B0 -20 " objectReference: {fileID: 0} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -4754,6 +2947,12 @@ PrefabInstance: propertyPath: m_fontSizeMax value: 100 objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_spriteAsset + value: + objectReference: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, + type: 2} - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_fontSizeBase @@ -4919,12 +3118,12 @@ PrefabInstance: - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_SizeDelta.x - value: -270 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} propertyPath: m_AnchoredPosition.x - value: -135.00006 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} @@ -5048,11 +3247,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1699414028525728575} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} --- !u!224 &2522232489058699662 stripped @@ -5061,177 +3256,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6868384101991383953} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8516983825904660851 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 6435118920824550072} - m_Modifications: - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 6980281636704611500} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 6980281636704611500} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: OnPurchaseButtonClick - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 6980281636704611500} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UI.ShopForm, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 17896329480872315, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_IntArgument - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.x - value: 450 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_SizeDelta.y - value: 650 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3072890538777882148, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - propertyPath: m_Name - value: GoodsItem 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} ---- !u!114 &3813865854045780202 stripped +--- !u!114 &7575022460236106084 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4818839934941563289, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, + m_CorrespondingSourceObject: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} - m_PrefabInstance: {fileID: 8516983825904660851} + m_PrefabInstance: {fileID: 6868384101991383953} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7203133363365646818 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, - type: 3} - m_PrefabInstance: {fileID: 8516983825904660851} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9219735843002010411 PrefabInstance: m_ObjectHideFlags: 0 @@ -5288,7 +3324,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -5298,7 +3334,7 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} @@ -5348,12 +3384,12 @@ PrefabInstance: - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 225 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -350 objectReference: {fileID: 0} - target: {fileID: 1568602919960830097, guid: 9f5bba6d2f5c95049a59fcb56df2d38f, type: 3} diff --git a/Assets/GameMain/UI/UIForms/UpdateResourceForm.prefab b/Assets/GameMain/UI/UIForms/UpdateResourceForm.prefab index c7cb47b..792ca2b 100644 --- a/Assets/GameMain/UI/UIForms/UpdateResourceForm.prefab +++ b/Assets/GameMain/UI/UIForms/UpdateResourceForm.prefab @@ -29,7 +29,7 @@ RectTransform: m_GameObject: {fileID: 107322} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22424244} diff --git a/Assets/GameMain/UI/UIItems/DisplayItem.prefab b/Assets/GameMain/UI/UIItems/DisplayItem.prefab new file mode 100644 index 0000000..8184f1f --- /dev/null +++ b/Assets/GameMain/UI/UIItems/DisplayItem.prefab @@ -0,0 +1,366 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &257858949270972103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3448502482762597571} + - component: {fileID: 2817356147833661953} + - component: {fileID: 1037051458616003099} + - component: {fileID: 8108003253794388876} + - component: {fileID: 8968323939827146374} + m_Layer: 5 + m_Name: DisplayItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3448502482762597571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257858949270972103} + 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: 2563272144824088918} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2817356147833661953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257858949270972103} + m_CullTransparentMesh: 1 +--- !u!114 &1037051458616003099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257858949270972103} + 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.11764706, g: 0.11764706, b: 0.11764706, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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!114 &8108003253794388876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257858949270972103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fe0ad0e96348114786974bb02d62914, type: 3} + m_Name: + m_EditorClassIdentifier: + _iconArea: {fileID: 6981812689419148607} + _itemRect: {fileID: 3448502482762597571} +--- !u!114 &8968323939827146374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257858949270972103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} + m_Name: + m_EditorClassIdentifier: + _onPointerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8108003253794388876} + m_TargetAssemblyTypeName: UI.DisplayItem, Assembly-CSharp + m_MethodName: OnItemInfoShow + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _onClickAction: + m_PersistentCalls: + m_Calls: [] + _onPointerExitAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8108003253794388876} + m_TargetAssemblyTypeName: UI.DisplayItem, Assembly-CSharp + m_MethodName: OnItemInfoHide + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _enableFade: 0 +--- !u!1001 &4063068678868026313 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3448502482762597571} + m_Modifications: + - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1933500728459274583, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Name + value: IconArea + objectReference: {fileID: 0} + - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8734155450713179919, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9186646302530785755, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5396f61766946c4db970694836a49fc, type: 3} +--- !u!224 &2563272144824088918 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 4063068678868026313} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6981812689419148607 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 4063068678868026313} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UIItems/DisplayItem.prefab.meta b/Assets/GameMain/UI/UIItems/DisplayItem.prefab.meta new file mode 100644 index 0000000..19cd9a4 --- /dev/null +++ b/Assets/GameMain/UI/UIItems/DisplayItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a76ff56683a2bc2479ebd63dcdd658b0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIItems/GoodsItem.prefab b/Assets/GameMain/UI/UIItems/GoodsItem.prefab index 0725811..a7d3269 100644 --- a/Assets/GameMain/UI/UIItems/GoodsItem.prefab +++ b/Assets/GameMain/UI/UIItems/GoodsItem.prefab @@ -1,51 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1234502817532386723 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9154231783670383508} - - component: {fileID: 8863577925278007908} - m_Layer: 5 - m_Name: IconArea - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9154231783670383508 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1234502817532386723} - 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: 1983732750348593360} - - {fileID: 9092495955119362140} - m_Father: {fileID: 1568602919960830097} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -75} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8863577925278007908 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1234502817532386723} - m_CullTransparentMesh: 1 --- !u!1 &2039268993833529549 GameObject: m_ObjectHideFlags: 0 @@ -235,12 +189,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 271f2a0727c521c4280eb2d47fd8de33, type: 3} m_Name: m_EditorClassIdentifier: - _iconImage: {fileID: 1393297247218357371} + _iconArea: {fileID: 4358550435683084285} _titleText: {fileID: 8208316091986530181} _typeText: {fileID: 1750581065802632959} _descriptionText: {fileID: 498292184531558701} _costText: {fileID: 1939791114573821530} - _purchaseButton: {fileID: 17896329480872315} --- !u!1 &3487172905367850696 GameObject: m_ObjectHideFlags: 0 @@ -376,81 +329,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3921019517774596272 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9092495955119362140} - - component: {fileID: 9214106227568122371} - - component: {fileID: 1393297247218357371} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9092495955119362140 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921019517774596272} - 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: 9154231783670383508} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9214106227568122371 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921019517774596272} - m_CullTransparentMesh: 1 ---- !u!114 &1393297247218357371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3921019517774596272} - 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: 65a506fc3ca171347ac74203416a3d7f, 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 &4138126764445597825 GameObject: m_ObjectHideFlags: 0 @@ -551,17 +429,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4497931107686577648} - 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: [] - m_Father: {fileID: 6120885050425734336} + m_Father: {fileID: 5474605388468845308} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -40, y: 0} - m_SizeDelta: {x: -80, y: 80} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4920438946413307297 CanvasRenderer: @@ -591,7 +469,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 40 + m_text: 40 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, @@ -611,7 +489,7 @@ MonoBehaviour: 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_spriteAsset: {fileID: 11400000, guid: bc065bcf1474d7d4387fafd202678c37, type: 2} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} m_TextStyleHashCode: -1183493901 @@ -626,7 +504,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 100 m_fontStyle: 1 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -796,193 +674,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8718911634962840584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6120885050425734336} - m_Layer: 5 - m_Name: CoinArea - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6120885050425734336 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8718911634962840584} - 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: 1057033168998470395} - - {fileID: 3072992366066671141} - m_Father: {fileID: 5474605388468845308} - 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, y: 0.5} ---- !u!1 &8912476108212404741 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1983732750348593360} - - component: {fileID: 2658646132830467626} - - component: {fileID: 4698125748619583535} - m_Layer: 5 - m_Name: Bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1983732750348593360 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8912476108212404741} - 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: 9154231783670383508} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2658646132830467626 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8912476108212404741} - m_CullTransparentMesh: 1 ---- !u!114 &4698125748619583535 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8912476108212404741} - 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.3137255, g: 0.3137255, b: 0.3137255, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &9003062188997864453 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3072992366066671141} - - component: {fileID: 4853475659470553540} - - component: {fileID: 8969819700059641833} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3072992366066671141 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9003062188997864453} - 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: 6120885050425734336} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -40, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4853475659470553540 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9003062188997864453} - m_CullTransparentMesh: 1 ---- !u!114 &8969819700059641833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9003062188997864453} - 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: 0.039215688, 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: 0} - 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!1001 &4010481301637820643 PrefabInstance: m_ObjectHideFlags: 0 @@ -1321,24 +1012,148 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} insertIndex: -1 - addedObject: {fileID: 6120885050425734336} + addedObject: {fileID: 1057033168998470395} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} ---- !u!114 &17896329480872315 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, - type: 3} - m_PrefabInstance: {fileID: 4010481301637820643} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a5079836f95c2a44b96fa331487ebb70, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &5474605388468845308 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} m_PrefabInstance: {fileID: 4010481301637820643} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7276168068522768651 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1568602919960830097} + m_Modifications: + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -75 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Name + value: IconArea + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5396f61766946c4db970694836a49fc, type: 3} +--- !u!114 &4358550435683084285 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 7276168068522768651} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &9154231783670383508 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 7276168068522768651} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/GameMain/UI/UIItems/IconArea.prefab b/Assets/GameMain/UI/UIItems/IconArea.prefab new file mode 100644 index 0000000..061ef18 --- /dev/null +++ b/Assets/GameMain/UI/UIItems/IconArea.prefab @@ -0,0 +1,289 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &584092194682812729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8734155450713179919} + - component: {fileID: 7431400453079551114} + - component: {fileID: 34098086402281480} + m_Layer: 5 + m_Name: Board + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8734155450713179919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584092194682812729} + 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: 2013242078151408287} + 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 &7431400453079551114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584092194682812729} + m_CullTransparentMesh: 1 +--- !u!114 &34098086402281480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584092194682812729} + 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: a8c07bbe04fdaf04b80e27f651a8edd6, 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 &2257813602893232910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9186646302530785755} + - component: {fileID: 4620496254248783649} + - component: {fileID: 2722773646958450980} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9186646302530785755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2257813602893232910} + 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: 2013242078151408287} + 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 &4620496254248783649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2257813602893232910} + m_CullTransparentMesh: 1 +--- !u!114 &2722773646958450980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2257813602893232910} + 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.3137255, g: 0.3137255, b: 0.3137255, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &5949367483965305275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1933500728459274583} + - component: {fileID: 1956022961265664776} + - component: {fileID: 8624349548156562800} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1933500728459274583 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5949367483965305275} + 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: 2013242078151408287} + 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 &1956022961265664776 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5949367483965305275} + m_CullTransparentMesh: 1 +--- !u!114 &8624349548156562800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5949367483965305275} + 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: 65a506fc3ca171347ac74203416a3d7f, 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 &8492647102234125480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013242078151408287} + - component: {fileID: 2304687868387687279} + - component: {fileID: 6378938522083352310} + m_Layer: 5 + m_Name: IconArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2013242078151408287 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8492647102234125480} + 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: 9186646302530785755} + - {fileID: 8734155450713179919} + - {fileID: 1933500728459274583} + m_Father: {fileID: 0} + 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: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2304687868387687279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8492647102234125480} + m_CullTransparentMesh: 1 +--- !u!114 &6378938522083352310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8492647102234125480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} + m_Name: + m_EditorClassIdentifier: + _board: {fileID: 34098086402281480} + _icon: {fileID: 8624349548156562800} diff --git a/Assets/GameMain/UI/UIItems/IconArea.prefab.meta b/Assets/GameMain/UI/UIItems/IconArea.prefab.meta new file mode 100644 index 0000000..6c5e3da --- /dev/null +++ b/Assets/GameMain/UI/UIItems/IconArea.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d5396f61766946c4db970694836a49fc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab b/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab new file mode 100644 index 0000000..e0aa3d6 --- /dev/null +++ b/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab @@ -0,0 +1,1148 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &386079673958559484 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7260934452891186329} + - component: {fileID: 7634115106465672049} + - component: {fileID: 3710912924644550894} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7260934452891186329 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386079673958559484} + 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: 5910623998397677972} + 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 &7634115106465672049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386079673958559484} + m_CullTransparentMesh: 1 +--- !u!114 &3710912924644550894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386079673958559484} + 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: "\u9009\u62E9" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4293322470 + m_fontColor: {r: 0.9019608, g: 0.9019608, b: 0.9019608, 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: 45.45 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 100 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 2 + 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 &837081792673381700 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 923096931429369185} + - component: {fileID: 6317226738738323411} + m_Layer: 5 + m_Name: LevelUpRewardItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &923096931429369185 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 837081792673381700} + 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: 4023449246430043819} + - {fileID: 2988380103220247122} + - {fileID: 1437908740358975387} + - {fileID: 8221398388285613312} + - {fileID: 6807785679739763284} + - {fileID: 5910623998397677972} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 480, y: 423.5012} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6317226738738323411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 837081792673381700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 237d64392d274c14f9f5c81b54122a93, type: 3} + m_Name: + m_EditorClassIdentifier: + _iconArea: {fileID: 7642089700794670651} + _titleText: {fileID: 6853028224052317907} + _typeText: {fileID: 3911554554314658376} + _descriptionText: {fileID: 1810094455862003132} +--- !u!1 &4223357504617318674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437908740358975387} + - component: {fileID: 5857346503165444158} + - component: {fileID: 6853028224052317907} + m_Layer: 5 + m_Name: RewardTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1437908740358975387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4223357504617318674} + 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: 923096931429369185} + 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: 40, y: 161.75} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5857346503165444158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4223357504617318674} + m_CullTransparentMesh: 1 +--- !u!114 &6853028224052317907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4223357504617318674} + 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: "\u624B\u67AA" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &4352023504188658445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6807785679739763284} + - component: {fileID: 4350845093645789877} + - component: {fileID: 1810094455862003132} + m_Layer: 5 + m_Name: RewardInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6807785679739763284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4352023504188658445} + 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: 923096931429369185} + 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: -70} + m_SizeDelta: {x: 400, y: 187.7238} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4350845093645789877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4352023504188658445} + m_CullTransparentMesh: 1 +--- !u!114 &1810094455862003132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4352023504188658445} + 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: "\u653B\u51FB\u4F24\u5BB3\uFF1A20" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294638330 + m_fontColor: {r: 0.98039216, g: 0.98039216, b: 0.98039216, 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: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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 &5178760563069636636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4023449246430043819} + - component: {fileID: 8291299776821015289} + - component: {fileID: 4985400448038592131} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4023449246430043819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5178760563069636636} + 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: 923096931429369185} + 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 &8291299776821015289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5178760563069636636} + m_CullTransparentMesh: 1 +--- !u!114 &4985400448038592131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5178760563069636636} + 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.078431375, g: 0.078431375, b: 0.078431375, 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: 9f847ec5e66e03e4ead1d3c5f7b510e8, 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 &8665592665641696731 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8221398388285613312} + - component: {fileID: 1218129673885777630} + - component: {fileID: 3911554554314658376} + m_Layer: 5 + m_Name: RewardType + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8221398388285613312 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665592665641696731} + 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: 923096931429369185} + 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: 40, y: 118.04} + m_SizeDelta: {x: 200, y: 37.422} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1218129673885777630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665592665641696731} + m_CullTransparentMesh: 1 +--- !u!114 &3911554554314658376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8665592665641696731} + 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: "\u5347\u7EA7" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 99d811b0183246646a2ce8df996f4bca, type: 2} + m_sharedMaterial: {fileID: -1106088975554028259, guid: 99d811b0183246646a2ce8df996f4bca, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289001471 + m_fontColor: {r: 1, g: 0.9684256, b: 0.64465404, 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: 28.35 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, 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!1001 &3339246309143776139 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 923096931429369185} + m_Modifications: + - target: {fileID: 3323748832248698570, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9f847ec5e66e03e4ead1d3c5f7b510e8, + type: 3} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Color.b + value: 0.23529412 + objectReference: {fileID: 0} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Color.g + value: 0.23529412 + objectReference: {fileID: 0} + - target: {fileID: 3719248416810234768, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Color.r + value: 0.23529412 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_text + value: "\u5237\u65B0" + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSize + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSizeMax + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_fontSizeBase + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3913210503624231669, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7510942500789349387, guid: 92e9102fc83c8e949971efe6f1fa6501, + type: 3} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 3846984240573617890, guid: 92e9102fc83c8e949971efe6f1fa6501, + type: 3} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnSelectButtonClick + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayUISound + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.UGuiForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UI.LevelUpForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.UGuiForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10001 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UI.UGuiForm, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument + value: 10000 + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onClickAction.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onHoverAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4005815405540692376, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: _onPointerEnterAction.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.x + value: -260 + objectReference: {fileID: 0} + - target: {fileID: 4454541538445599263, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -130.00006 + objectReference: {fileID: 0} + - target: {fileID: 6036930758348516521, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Name + value: SelectButton + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.x + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_SizeDelta.y + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 3793303208490381634, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7260934452891186329} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0722cd253d6bf014eb4134a2151ec7e3, type: 3} +--- !u!224 &5910623998397677972 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8958121344393284127, guid: 0722cd253d6bf014eb4134a2151ec7e3, + type: 3} + m_PrefabInstance: {fileID: 3339246309143776139} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3641339373252559053 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 923096931429369185} + m_Modifications: + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_SizeDelta.y + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 85 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -85 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8492647102234125480, guid: d5396f61766946c4db970694836a49fc, + type: 3} + propertyPath: m_Name + value: IconArea + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d5396f61766946c4db970694836a49fc, type: 3} +--- !u!224 &2988380103220247122 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2013242078151408287, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 3641339373252559053} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7642089700794670651 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6378938522083352310, guid: d5396f61766946c4db970694836a49fc, + type: 3} + m_PrefabInstance: {fileID: 3641339373252559053} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 578fa91d15f54e74a95ccce338d0a772, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab.meta b/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab.meta new file mode 100644 index 0000000..a296414 --- /dev/null +++ b/Assets/GameMain/UI/UIItems/LevelUpRewardItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ce8bbe245fa50b74bac0eea7bff0dc3a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/UI/UISprites/Common/coin.png b/Assets/GameMain/UI/UISprites/Common/coin.png new file mode 100644 index 0000000..a488b01 Binary files /dev/null and b/Assets/GameMain/UI/UISprites/Common/coin.png differ diff --git a/Assets/GameMain/UI/UISprites/Common/coin.png.meta b/Assets/GameMain/UI/UISprites/Common/coin.png.meta new file mode 100644 index 0000000..8fdc073 --- /dev/null +++ b/Assets/GameMain/UI/UISprites/Common/coin.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: a9be0531a19af934e97a1f3b47b78872 +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 + 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/Launcher.unity b/Assets/Launcher.unity index a9ff8e2..4112299 100644 --- a/Assets/Launcher.unity +++ b/Assets/Launcher.unity @@ -155,6 +155,7 @@ Transform: - {fileID: 1604812193} - {fileID: 1968988098} - {fileID: 472081678} + - {fileID: 2050832067} m_Father: {fileID: 1852670053} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &120093239 @@ -247,6 +248,143 @@ MonoBehaviour: m_PointerBehavior: 0 m_CursorLockBehavior: 0 m_ScrollDeltaPerTick: 6 +--- !u!1 &278770807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 278770808} + - component: {fileID: 278770811} + - component: {fileID: 278770810} + - component: {fileID: 278770809} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &278770808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278770807} + serializedVersion: 2 + 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: 1852670053} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &278770809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278770807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!81 &278770810 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278770807} + m_Enabled: 1 +--- !u!20 &278770811 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278770807} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1001 &343730742 PrefabInstance: m_ObjectHideFlags: 0 @@ -447,7 +585,7 @@ PrefabInstance: objectReference: {fileID: 553656362} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroupHelperTypeName @@ -459,7 +597,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.data[1].m_Name - value: Default + value: HUD objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.data[0].m_Depth @@ -467,7 +605,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11454530, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_UIGroups.Array.data[1].m_Depth - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 11461470, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_LocalizationHelperTypeName @@ -639,7 +777,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_RunInBackground - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3} propertyPath: m_EditorResourceMode @@ -862,7 +1000,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -1094,6 +1232,7 @@ Transform: m_Children: - {fileID: 343730743} - {fileID: 119167776} + - {fileID: 278770808} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1852670054 @@ -1152,6 +1291,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d840df1b53db744cb522b82426f2cd5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2050832066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2050832067} + - component: {fileID: 2050832068} + m_Layer: 0 + m_Name: UIRouter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2050832067 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050832066} + serializedVersion: 2 + 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: 119167776} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2050832068 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2050832066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3695ff420be99d44ab812d7e1863044, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/coin.asset b/Assets/TextMesh Pro/Resources/Sprite Assets/coin.asset new file mode 100644 index 0000000..79891be --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Sprite Assets/coin.asset @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &-6916845647086546323 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TextMeshPro/Sprite + m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: a9be0531a19af934e97a1f3b47b78872, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _CullMode: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3} + m_Name: coin + m_EditorClassIdentifier: + hashCode: 3533451 + material: {fileID: -6916845647086546323} + materialHashCode: 0 + m_Version: 1.1.0 + m_FaceInfo: + m_FaceIndex: 0 + m_FamilyName: + m_StyleName: + m_PointSize: 0 + m_Scale: 0 + m_UnitsPerEM: 0 + m_LineHeight: 0 + m_AscentLine: 0 + m_CapLine: 0 + m_MeanLine: 0 + m_Baseline: 0 + m_DescentLine: 0 + m_SuperscriptOffset: 0 + m_SuperscriptSize: 0 + m_SubscriptOffset: 0 + m_SubscriptSize: 0 + m_UnderlineOffset: 0 + m_UnderlineThickness: 0 + m_StrikethroughOffset: 0 + m_StrikethroughThickness: 0 + m_TabWidth: 0 + spriteSheet: {fileID: 2800000, guid: a9be0531a19af934e97a1f3b47b78872, type: 3} + m_SpriteCharacterTable: + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 0 + m_Scale: 1 + m_Name: coin + m_HashCode: 3533451 + m_SpriteGlyphTable: + - m_Index: 0 + m_Metrics: + m_Width: 200 + m_Height: 200 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 176.5 + m_HorizontalAdvance: 200 + m_GlyphRect: + m_X: 0 + m_Y: 0 + m_Width: 200 + m_Height: 200 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + sprite: {fileID: 21300000, guid: a9be0531a19af934e97a1f3b47b78872, type: 3} + spriteInfoList: [] + fallbackSpriteAssets: [] diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/coin.asset.meta b/Assets/TextMesh Pro/Resources/Sprite Assets/coin.asset.meta new file mode 100644 index 0000000..9352045 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Sprite Assets/coin.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc065bcf1474d7d4387fafd202678c37 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tools/PropGenerator.exe b/Tools/PropGenerator.exe new file mode 100644 index 0000000..2504332 Binary files /dev/null and b/Tools/PropGenerator.exe differ diff --git a/数据表/Goods.txt b/数据表/Goods.txt index 8ba24eb..3d5237b 100644 --- a/数据表/Goods.txt +++ b/数据表/Goods.txt @@ -1,9 +1,9 @@ -# 商品表 -# Id GoodsType MinPrice MaxPrice GoodsTypeId -# int GoodsType int int int -# 商品编号 策划备注 商品类型 最低价格 最高价格 商品对应物品Id - 101 道具：药 Prop 100 200 101 - 102 小刀 Weapon 120 150 201 - 103 Prop 200 230 102 - 104 Prop 210 250 103 - 105 Prop 80 100 104 +# 商品表 +# Id GoodsType GoodsTypeId +# int GoodsType int +# 商品编号 策划备注 商品类型 商品对应物品Id + 101 道具：药 Prop 101 + 102 小刀 Weapon 201 + 103 Prop 102 + 104 Prop 103 + 105 Prop 104 diff --git a/数据表/Goods.xlsx b/数据表/Goods.xlsx index 04ea557..f491b37 100644 Binary files a/数据表/Goods.xlsx and b/数据表/Goods.xlsx differ diff --git a/数据表/LevelUpReward.txt b/数据表/LevelUpReward.txt new file mode 100644 index 0000000..b2eb50e --- /dev/null +++ b/数据表/LevelUpReward.txt @@ -0,0 +1,8 @@ +# 道具表 +# Id Title IconAssetName Modifiers +# int string string StatModifier[] +# 奖励编号 策划备注 奖励名 图标资源名 道具属性 + 101 测试道具 肌肉 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] + 102 牙齿 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] + 103 脑 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] + 104 鼻子 Almighty_Icon [{"StatType":"Attack","Value":0.05,"IsPercent":true}] diff --git a/数据表/LevelUpReward.xlsx b/数据表/LevelUpReward.xlsx new file mode 100644 index 0000000..ffa763d Binary files /dev/null and b/数据表/LevelUpReward.xlsx differ diff --git a/数据表/Prop.txt b/数据表/Prop.txt index 75d4ad7..028dce3 100644 --- a/数据表/Prop.txt +++ b/数据表/Prop.txt @@ -1,8 +1,24 @@ -# 道具表 -# Id Title IconAssetName Modifiers -# int string string StatModifier[] -# 道具编号 策划备注 道具名 图标资源名 道具属性 - 101 测试道具 药 Almighty_Icon [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] - 102 小药 Almighty_Icon [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] - 103 中药 Almighty_Icon [{"StatType":"Critical","Value":20,"IsPercent":false},{"StatType":"Defense","Value":1,"IsPercent":false}] - 104 大药 Almighty_Icon [{"StatType":"Attack","Value":2,"IsPercent":false},{"StatType":"AttackSpeed","Value":0.1,"IsPercent":true}] +# 道具表 +# Id Title IconAssetName Rarity Price PriceRandomPercent Modifiers +# int string string RarityType int float StatModifier[] +# 道具编号 策划备注 道具名 图标资源名 道具品质 道具价格 价格浮动 道具属性 + 101 道具_1 Almighty_Icon White 119 0.0500000007450581 [{"StatType":"Attack","Value":10,"IsPercent":false},{"StatType":"Defense","Value":12,"IsPercent":false}] + 102 道具_2 Almighty_Icon Green 225 0.0799999982118607 [{"StatType":"MaxHealth","Value":53,"IsPercent":false},{"StatType":"AttackSpeed","Value":0.09,"IsPercent":true},{"StatType":"Attack","Value":11,"IsPercent":false}] + 103 道具_3 Almighty_Icon Blue 329 0.100000001490116 [{"StatType":"Critical","Value":15,"IsPercent":false},{"StatType":"CriticalDamage","Value":21,"IsPercent":false},{"StatType":"Defense","Value":23,"IsPercent":false}] + 104 道具_4 Almighty_Icon Red 423 0.119999997317791 [{"StatType":"Defense","Value":79,"IsPercent":false}] + 105 道具_5 Almighty_Icon White 120 0.0500000007450581 [{"StatType":"MovementSpeed","Value":0.8,"IsPercent":false},{"StatType":"Attack","Value":10,"IsPercent":false}] + 106 道具_6 Almighty_Icon Green 195 0.0799999982118607 [{"StatType":"Dodge","Value":10,"IsPercent":false},{"StatType":"Attack","Value":12,"IsPercent":false},{"StatType":"MaxHealth","Value":44,"IsPercent":false}] + 107 道具_7 Almighty_Icon Blue 335 0.100000001490116 [{"StatType":"Defense","Value":62,"IsPercent":false}] + 108 道具_8 Almighty_Icon Red 433 0.119999997317791 [{"StatType":"Attack","Value":44,"IsPercent":false},{"StatType":"Dodge","Value":27,"IsPercent":false}] + 109 道具_9 Almighty_Icon White 121 0.0500000007450581 [{"StatType":"MaxHealth","Value":32,"IsPercent":false},{"StatType":"Attack","Value":7,"IsPercent":false},{"StatType":"Defense","Value":8,"IsPercent":false}] + 110 道具_10 Almighty_Icon Green 198 0.0799999982118607 [{"StatType":"AttackSpeed","Value":0.19,"IsPercent":true}] + 111 道具_11 Almighty_Icon Blue 341 0.100000001490116 [{"StatType":"Attack","Value":57,"IsPercent":false}] + 112 道具_12 Almighty_Icon Red 443 0.119999997317791 [{"StatType":"MaxHealth","Value":139,"IsPercent":false},{"StatType":"Critical","Value":27,"IsPercent":false}] + 113 道具_13 Almighty_Icon White 122 0.0500000007450581 [{"StatType":"Critical","Value":5,"IsPercent":false},{"StatType":"Dodge","Value":7,"IsPercent":false},{"StatType":"MovementSpeed","Value":0.6,"IsPercent":false}] + 114 道具_14 Almighty_Icon Green 201 0.0799999982118607 [{"StatType":"Defense","Value":38,"IsPercent":false}] + 115 道具_15 Almighty_Icon Blue 346 0.100000001490116 [{"StatType":"MovementSpeed","Value":1.6,"IsPercent":false},{"StatType":"Defense","Value":32,"IsPercent":false}] + 116 道具_16 Almighty_Icon Red 454 0.119999997317791 [{"StatType":"Dodge","Value":28,"IsPercent":false},{"StatType":"Defense","Value":24,"IsPercent":false},{"StatType":"Attack","Value":24,"IsPercent":false}] + 117 道具_17 Almighty_Icon White 124 0.0500000007450581 [{"StatType":"Defense","Value":23,"IsPercent":false}] + 118 道具_18 Almighty_Icon Green 204 0.0799999982118607 [{"StatType":"Attack","Value":17,"IsPercent":false},{"StatType":"MaxHealth","Value":69,"IsPercent":false}] + 119 道具_19 Almighty_Icon Blue 352 0.100000001490116 [{"StatType":"MaxHealth","Value":74,"IsPercent":false},{"StatType":"Attack","Value":19,"IsPercent":false},{"StatType":"Dodge","Value":20,"IsPercent":false}] + 120 道具_20 Almighty_Icon Red 464 0.119999997317791 [{"StatType":"AttackSpeed","Value":0.15,"IsPercent":true},{"StatType":"Attack","Value":29,"IsPercent":false},{"StatType":"Defense","Value":27,"IsPercent":false}] diff --git a/数据表/Prop.xlsx b/数据表/Prop.xlsx index 90a4cdf..c3dcd27 100644 Binary files a/数据表/Prop.xlsx and b/数据表/Prop.xlsx differ diff --git a/数据表/Role.txt b/数据表/Role.txt index c412a60..beceb9a 100644 --- a/数据表/Role.txt +++ b/数据表/Role.txt @@ -2,5 +2,5 @@ # Id RoleName IconAssetName MaxHp Speed Coin WeaponCapacity InitialProperty InitialItem Lv0 Lv1 Lv2 Lv3 Lv4 Lv5 Lv6 Lv7 Lv8 Lv9 Lv10 Lv11 Lv12 Lv13 Lv14 Lv15 Lv16 Lv17 Lv18 Lv19 Lv20 Lv21 Lv22 Lv23 Lv24 Lv25 Lv26 Lv27 Lv28 Lv29 Lv30 Lv31 Lv32 Lv33 Lv34 Lv35 Lv36 Lv37 Lv38 Lv39 Lv40 Lv41 Lv42 Lv43 Lv44 Lv45 Lv46 Lv47 Lv48 Lv49 Lv50 Lv51 Lv52 Lv53 Lv54 Lv55 Lv56 Lv57 Lv58 Lv59 Lv60 # int string string int float int int Modifier[] Item[] 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 # 角色编号 策划备注 角色名称 图标资源名 初始最大生命 初始速度 初始金币 最大持有武器数 初始额外属性 初始额外物品 每级升级所需经验 - 101 全能者 全能者 Almighty_Icon 100 4 10 6 [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] [] 100 110 121 133 146 161 177 195 214 236 259 285 314 345 380 418 459 505 556 612 673 740 814 895 985 1083 1192 1311 1442 1586 1745 1919 2111 2323 2555 2810 3091 3400 3740 4114 4526 4979 5476 6024 6626 7289 8018 8820 9702 10672 11739 12913 14204 15625 17187 18906 20797 22876 25164 27680 30448 - 102 老人 老人 Old_Man_Icon 200 3 5 6 [] [] 100 112 125 140 157 176 197 221 248 277 311 348 390 436 489 547 613 687 769 861 965 1080 1210 1355 1518 1700 1904 2132 2388 2675 2996 3356 3758 4209 4714 5280 5914 6623 7418 8308 9305 10422 11672 13073 14642 16399 18367 20571 23039 25804 28900 32368 36252 40603 45475 50932 57044 63889 71556 80143 89760 + 101 全能者 全能者 Almighty_Icon 100 6 10 6 [{"StatType":"MovementSpeed","Value":0.5,"IsPercent":false},{"StatType":"MaxHealth","Value":0.2,"IsPercent":true}] [] 100 110 121 133 146 161 177 195 214 236 259 285 314 345 380 418 459 505 556 612 673 740 814 895 985 1083 1192 1311 1442 1586 1745 1919 2111 2323 2555 2810 3091 3400 3740 4114 4526 4979 5476 6024 6626 7289 8018 8820 9702 10672 11739 12913 14204 15625 17187 18906 20797 22876 25164 27680 30448 + 102 老人 老人 Old_Man_Icon 200 4 5 6 [] [] 100 112 125 140 157 176 197 221 248 277 311 348 390 436 489 547 613 687 769 861 965 1080 1210 1355 1518 1700 1904 2132 2388 2675 2996 3356 3758 4209 4714 5280 5914 6623 7418 8308 9305 10422 11672 13073 14642 16399 18367 20571 23039 25804 28900 32368 36252 40603 45475 50932 57044 63889 71556 80143 89760 diff --git a/数据表/Role.xlsx b/数据表/Role.xlsx index aad28cd..accd9ee 100644 Binary files a/数据表/Role.xlsx and b/数据表/Role.xlsx differ diff --git a/数据表/UIForm.txt b/数据表/UIForm.txt index d7a16ce..fb145ef 100644 --- a/数据表/UIForm.txt +++ b/数据表/UIForm.txt @@ -9,4 +9,6 @@ 200 开始菜单 StartMenuForm Default False True 201 角色选择页 SelectRoleForm Default False True 202 游戏商店页 ShopForm Default False True - 203 游戏HUD HudForm Default False True + 203 游戏HUD HudForm HUD False True + 204 角色升级奖励页 LevelUpForm Default False True + 205 物品信息展示 DisplayItemInfoForm Default False False diff --git a/数据表/UIForm.xlsx b/数据表/UIForm.xlsx index 42361e2..40e1431 100644 Binary files a/数据表/UIForm.xlsx and b/数据表/UIForm.xlsx differ diff --git a/数据表/Weapon.txt b/数据表/Weapon.txt index 3260465..8e6d608 100644 --- a/数据表/Weapon.txt +++ b/数据表/Weapon.txt @@ -1,6 +1,6 @@ -# 武器表 -# Id Title IconAssetName Attack Cooldown AttackRange AttackSoundId Pramas Modifiers -# int string string int float float int string[] StatModifier[] -# 武器编号 策划备注 武器名 图标资源名 伤害 冷却 范围 攻击音效编号 额外参数 额外属性 - 201 玩家武器 小刀 Almighty_Icon 100 1.5 3 10000 [] [] - 202 手枪 Almighty_Icon 120 1 10 10000 [] [] +# 武器表 +# Id Title IconAssetName Rarity Price PriceRandomPercent Attack Cooldown AttackRange AttackSoundId Pramas Modifiers +# int string string RarityType int float int float float int string[] StatModifier[] +# 武器编号 策划备注 武器名 图标资源名 道具品质 武器价格 价格浮动 伤害 冷却 范围 攻击音效编号 额外参数 额外属性 + 201 玩家武器 小刀 Almighty_Icon White 120 0.05 100 1.5 3 10000 [] [] + 202 手枪 Almighty_Icon White 130 0.05 120 1 10 10000 [] [] diff --git a/数据表/Weapon.xlsx b/数据表/Weapon.xlsx index 3b8b187..d49019c 100644 Binary files a/数据表/Weapon.xlsx and b/数据表/Weapon.xlsx differ diff --git a/数据表/convert.py b/数据表/convert.py index 2edd72c..36ef9a8 100644 --- a/数据表/convert.py +++ b/数据表/convert.py @@ -1,4 +1,4 @@ -import pandas as pd +import pandas as pd import os import shutil import csv @@ -6,15 +6,21 @@ import csv def convert_excel_to_txt(folder_path='.'): # 计数器，用于最后汇总 count = 0 + # 固定从脚本所在目录读取，避免受运行时工作目录影响 + script_dir = os.path.dirname(os.path.abspath(__file__)) + scan_dir = script_dir if folder_path in ('.', '') else os.path.abspath(folder_path) target_dir = os.path.join(os.path.dirname(__file__), '../Assets/GameMain/DataTables') target_dir = os.path.abspath(target_dir) # 确保目标目录存在 os.makedirs(target_dir, exist_ok=True) - for file_name in os.listdir(folder_path): + for file_name in os.listdir(scan_dir): + # 跳过 Excel 打开时生成的临时锁文件 + if file_name.startswith('~$'): + continue if file_name.endswith(('.xlsx', '.xls')): - file_path = os.path.join(folder_path, file_name) + file_path = os.path.join(scan_dir, file_name) base_name = os.path.splitext(file_path)[0] output_file = base_name.replace(os.path.basename(base_name), os.path.basename(base_name)) + '.txt' @@ -59,4 +65,4 @@ if __name__ == "__main__": # --- 关键修改：在这里添加暂停 --- print("\n" + "="*30) - input("按回车键(Enter)退出程序...") \ No newline at end of file + input("按回车键(Enter)退出程序...")