From a19f6362a5c13234c86f699a0ec16813fb7f6057 Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Thu, 10 Apr 2025 15:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=8C=E6=A1=86=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/GameDate/cardDeckList.asset | 19 +- .../Card/CardBackGround.meta} | 5 +- .../Card/CardBackGround/CardBackGround.png | Bin 0 -> 23678 bytes .../CardBackGround/CardBackGround.png.meta | 127 + .../CardBackGround/CardBackGround.shadergraph | 5908 ++++++++++++++++ .../CardBackGround.shadergraph.meta | 10 + .../Card/CardBackGround/CardBackGround_1.mat | 158 + .../CardBackGround/CardBackGround_1.mat.meta | 8 + .../Card/CardBackGround/CardBackGround_2.mat | 158 + .../CardBackGround/CardBackGround_2.mat.meta | 8 + .../Card/CardBackGround/CardBackGround_3.mat | 158 + .../CardBackGround/CardBackGround_3.mat.meta | 8 + .../Tigger_CardBackGround_1.mat | 158 + .../Tigger_CardBackGround_1.mat.meta | 8 + .../Tigger_CardBackGround_2.mat | 158 + .../Tigger_CardBackGround_2.mat.meta | 8 + .../Tigger_CardBackGround_3.mat | 158 + .../Tigger_CardBackGround_3.mat.meta | 8 + .../CostPanel.meta} | 5 +- .../Materials/CostPanel/CardBackGround.png | Bin 0 -> 23678 bytes .../CostPanel/CardBackGround.png.meta | 127 + .../Assets/Materials/CostPanel/Cost.meta | 8 + .../CostPanel/Cost/CardBackGround 2.mat | 162 + .../CostPanel/Cost/CardBackGround 2.mat.meta | 8 + .../CostPanel/Cost/CardBackGround.mat | 162 + .../CostPanel/Cost/CardBackGround.mat.meta | 8 + .../CostPanel/Cost/CostBackGround.png | Bin 0 -> 37462 bytes .../CostPanel/Cost/CostBackGround.png.meta | 127 + .../CostPanel/CostBackGround.shadergraph | 6203 +++++++++++++++++ .../CostPanel/CostBackGround.shadergraph.meta | 10 + .../Assets/Materials/CostPanel/Step.meta | 8 + .../CostPanel/Step/CardBackGround 1.mat | 162 + .../CostPanel/Step/CardBackGround 1.mat.meta | 8 + .../CostPanel/Step/CardBackGround 2.mat | 162 + .../CostPanel/Step/CardBackGround 2.mat.meta | 8 + .../CostPanel/Step/StepBackGround.png | Bin 0 -> 34194 bytes .../CostPanel/Step/StepBackGround.png.meta | 127 + .../PlayerUnderCirle.shadergraph | 52 - .../Assets/Materials/UILightBackGround.meta | 8 + .../UILightBackGround/CardBackGround.png | Bin 0 -> 23678 bytes .../UILightBackGround/CardBackGround.png.meta | 127 + .../CostBackGround.shadergraph | 3509 ++++++++++ .../CostBackGround.shadergraph.meta | 10 + .../Materials/UILightBackGround/UIGround.mat | 141 + .../UILightBackGround/UIGround.mat.meta | 8 + .../UILightBackGround/UIGround.shadergraph | 3441 +++++++++ .../UIGround.shadergraph.meta | 10 + .../Materials/UILightBackGround/blackLine.png | Bin 0 -> 366509 bytes .../UILightBackGround/blackLine.png.meta | 127 + .../Prefab/CardPrefab/Card_v04-Color.prefab | 949 ++- .../Prefab/CardPrefab/Card_v04-Common.prefab | 547 +- .../CardPrefab/ForLook/Card_v04-0319.prefab | 1047 +-- .../CardPrefab/ForLook/Card_v04-Common.prefab | 2401 ------- .../ForLook/Card_v04.3-Common.prefab | 1295 ---- .../ForLook/Color-Card_v04-0319.prefab | 857 ++- .../Assets/Scenes/SampleScene.unity | 625 +- .../Assets/Scripts/Card/CardEntity.cs | 31 +- .../Scripts/Card/CardResourcesManager.cs | 1 + .../Scripts/FightReward/RewardManager.cs | 2 +- .../PlayerManager/PlayerStatsManager.cs | 6 +- .../Scripts/manager/SettlementManager.cs | 2 +- .../Assets/Scripts/manager/Usermanager.cs | 2 +- 62 files changed, 24423 insertions(+), 5135 deletions(-) rename ColorlessWorld-2024-4-2/Assets/{Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta => Materials/Card/CardBackGround.meta} (57%) create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround.png.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround.shadergraph create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround.shadergraph.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround_1.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround_1.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround_2.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround_2.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround_3.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround_3.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/Tigger_CardBackGround_1.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/Tigger_CardBackGround_1.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/Tigger_CardBackGround_2.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/Tigger_CardBackGround_2.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/Tigger_CardBackGround_3.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/Tigger_CardBackGround_3.mat.meta rename ColorlessWorld-2024-4-2/Assets/{Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab.meta => Materials/CostPanel.meta} (57%) create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/CardBackGround.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/CardBackGround.png.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost/CardBackGround 2.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost/CardBackGround 2.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost/CardBackGround.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost/CardBackGround.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost/CostBackGround.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Cost/CostBackGround.png.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/CostBackGround.shadergraph create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/CostBackGround.shadergraph.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step/CardBackGround 1.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step/CardBackGround 1.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step/CardBackGround 2.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step/CardBackGround 2.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step/StepBackGround.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/CostPanel/Step/StepBackGround.png.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/CardBackGround.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/CardBackGround.png.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/CostBackGround.shadergraph create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/CostBackGround.shadergraph.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/UIGround.mat create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/UIGround.mat.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/UIGround.shadergraph create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/UIGround.shadergraph.meta create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/blackLine.png create mode 100644 ColorlessWorld-2024-4-2/Assets/Materials/UILightBackGround/blackLine.png.meta delete mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab delete mode 100644 ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset index 3383a92f..c8a7a561 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset @@ -13,16 +13,11 @@ MonoBehaviour: m_Name: cardDeckList m_EditorClassIdentifier: cardDeckList: - - 1001 - - 1001 - - 1001 - - 1002 - - 1002 - - 1002 - - 1003 - - 2008 - - 2015 + - 1005 + - 1005 + - 1005 + - 1005 + - 1005 + - 2001 + - 2001 - 2001 - - 2008 - - 1004 - - 1004 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround.meta similarity index 57% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround.meta index 3633b97a..eb8913cf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-Common.prefab.meta +++ b/ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 873560de094707c4baa099f728c643bd -PrefabImporter: +guid: 483dc12cdad3d0744821c998a1138a53 +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround.png b/ColorlessWorld-2024-4-2/Assets/Materials/Card/CardBackGround/CardBackGround.png new file mode 100644 index 0000000000000000000000000000000000000000..5df4289d1c664741338df218c8206ab5459db753 GIT binary patch literal 23678 zcmdqJ`9IYA`#=7)W{pZAYv~+GmP+
K7|Z9ObY8t)ulMWw2Yi1xx6_%P%j5aDuIql?uj_H$&&`w8a8aS1
zLJ$Or9 bkq0RWp7LsgEVjP%n7EFyvbb(z@=aWN<0r`KJsz5kf&cfWdvQa=?FY$L)u
zi+FOWeHv{cCExcuV^_xsBv#Gcn*g7Xlm+afKBqK|I@p7u>Ek{Z&WD%aN|l=RB>#@3
z8G=KYp280Ifd?Upc$HM%Q4*o_v#Bqt4aMEytb5a`l;x0s--J#_n|*ByGtWSSgAP<>
zb)xNpnipB-w$&9}Yrej$XvZNy^eVnly&k7J3pH{UousIn2K(zH;uRw5>$P~v+`fz@
z{hdija*NYb0!u`=rdi<49divTCNUV{-htyHNLl-q$Lo^uEiYxNEe#HQ>Kj~0GAzZF
z-m!mORq6dMFl{skz+R5mRcfgn!LwqAsS@RAv`@)(+w(?c?4YXxQ?Q7m=m%(Ye3xb&
z-(YWmGP{Z+Kj@@bBAWa(cDURS(^Xlg(XWalpiN67d*O;5nE`*LI(^-pD}+W=>$t16
zbX1v}&frf>%p_!sP}`2t`yZD^bq1C-`PLZj^oN@wY-BvwkG8I(;~XB|q%tja)meLU
z bkq0RWp7LsgEVjP%n7EFyvbb(z@=aWN<0r`KJsz5kf&cfWdvQa=?FY$L)u
zi+FOWeHv{cCExcuV^_xsBv#Gcn*g7Xlm+afKBqK|I@p7u>Ek{Z&WD%aN|l=RB>#@3
z8G=KYp280Ifd?Upc$HM%Q4*o_v#Bqt4aMEytb5a`l;x0s--J#_n|*ByGtWSSgAP<>
zb)xNpnipB-w$&9}Yrej$XvZNy^eVnly&k7J3pH{UousIn2K(zH;uRw5>$P~v+`fz@
z{hdija*NYb0!u`=rdi<49divTCNUV{-htyHNLl-q$Lo^uEiYxNEe#HQ>Kj~0GAzZF
z-m!mORq6dMFl{skz+R5mRcfgn!LwqAsS@RAv`@)(+w(?c?4YXxQ?Q7m=m%(Ye3xb&
z-(YWmGP{Z+Kj@@bBAWa(cDURS(^Xlg(XWalpiN67d*O;5nE`*LI(^-pD}+W=>$t16
zbX1v}&frf>%p_!sP}`2t`yZD^bq1C-`PLZj^oN@wY-BvwkG8I(;~XB|q%tja)meLU
zQeOpcK9>0ClD_l#lFuQeOpcK9>0ClD_l#lFu5|V2fjJ&p+
z;RT1Boi+nwX