From 0bcd6ade1fd420aa41ee0908c43d73e1cec2e519 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 27 May 2021 14:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE=E7=A8=B7?= =?UTF-8?q?=E5=9B=BE=E3=80=91bug=20+=20=E8=B5=84=E6=BA=90=20=20=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=BE=97=E5=88=B7=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../s_shanhe_xiaoditu_xiabao.png | Bin 1521 -> 1101 bytes .../s_shanhe_xiaoditu_xiabao_01.png | Bin 1496 -> 1119 bytes .../Prefabs/UI/Common/CardRendererRoot.prefab | 1254 +++++++++++++++++ .../FightLevelSingleChapterPanel.prefab | 4 +- .../FightLevelSingleLevelInfoPopup.prefab | 8 +- .../RTexture/CardTexture10.renderTexture | 34 + .../RTexture/CardTexture10.renderTexture.meta | 8 + .../RTexture/CardTexture11.renderTexture | 34 + .../RTexture/CardTexture11.renderTexture.meta | 8 + .../RTexture/CardTexture12.renderTexture | 34 + .../RTexture/CardTexture12.renderTexture.meta | 8 + .../RTexture/CardTexture7.renderTexture | 34 + .../RTexture/CardTexture7.renderTexture.meta | 8 + .../RTexture/CardTexture8.renderTexture | 34 + .../RTexture/CardTexture8.renderTexture.meta | 8 + .../RTexture/CardTexture9.renderTexture | 34 + .../RTexture/CardTexture9.renderTexture.meta | 8 + .../Framework/Manager/CardRendererManager.lua | 2 +- .../FightLevelSingleLevelInfoPopup.lua | 3 - .../FightLevelInfoPopup_AssistantLevel.lua | 4 +- .../MonsterCamp/MonsterCampNewPanel.lua | 4 +- .../~Lua/View/MonsterCampSingleWave.lua | 2 +- 22 files changed, 1518 insertions(+), 15 deletions(-) create mode 100644 Assets/ManagedResources/RTexture/CardTexture10.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture11.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture12.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture7.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture8.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta create mode 100644 Assets/ManagedResources/RTexture/CardTexture9.renderTexture create mode 100644 Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta diff --git a/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png b/Assets/ManagedResources/Atlas/FightLevelAtlas/s_shanhe_xiaoditu_xiabao.png index 5eda53d1fbfccd99069fb5e4380a565d4be8c50c..dff04b74475f833f841da990ad8cb2c8321bad42 100644 GIT binary patch literal 1101 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 literal 1496 zcmV;}1tb>h+E&!*)+WOwrcGGnOfp_0}9Ut!6Lps1X0P)5lXOQsM{Q%d@8r4u0poEzYrLzpHE!+9t?74S7 z|KiI_0BW8hqyyZydez+nPi)%wBV%-kkpBZ-SgxxHFs?k8N(fUdfO{l_fUr!M!m9m# z^3>KHJ9i%kU`sVT*)0IEx8Hnux8G+yL+R~-cP_>`I5QL&H;fJfi^rkVa2)*g!Ygk) z4qy&Im3!U;=!r$cj~R@?ahy9QAVHZI2f|d(+~5!r*x-tYbSshQSq`9AD^T|c_yNSL zc7v~8wH%X~EEr?A1x$1_Nnk1eKP1E=34jVE z8#k;qS1dD;oymbxirb9^O4-6ONF`)E2%%(`_mpuA3=W{TH-V3K?3D6`H74ac1`PS) z%J8WB$)2z9+P1A&w{{Im^Cjf-ML0Up=zoxL6#=Rgpo}R%LlcR|dywqwLw0%w@4f#4 z4j(xxx0^cM6@kUV6OTolk&#jC`fM*YtY3qN9$1gT!2z|U)oh{NZlPXppxti&D?2>} zEX#**IHDAA92dp;d3>|~d+hu6J4{SWAel%Yn=5+Nl<*roab1$=?EzyHKm2qEhmZY^ zEt?<4eXH(4I2=+QhC(3(O#%0YKqbm^sgiBiaPIsC)a!M$nsuD`;|vZR{uP$bhh;-U zD3!{jqcpo70adRlAw*_?45HQduEh1}9DX_a8^*@QkV+;HjfN48M&Yw8m|~&uNH1mD zHX1EdZ5xF`0dx5R>a`lmRU31~GScZZEK8{Da$Lvl><_%7d9-Tv#&`s{Uv89Vno9QI z>g09U^%k1#HZBd1A=Mj4Um~tpSM8c2(QLM03ZaO|cZE_JmSv(+YhX5CKsXeH-)E`& za>c&b(HmT zi)CbI^C(wqxI8?L*|~zseMwG!7Yz8&Zab(}?cC_qse`%(G$aY8(@@A-;5cp|J2O|b zEVC~jjRfV#z455>Kzg6<>&4P^QU#Vr(BSgyfr?#2tzJhg7C|%|#^}{+h=hXbTUm@Q z506e=xH5VGz%YPu05bq8tg8!3B0M)&C}*d0ElP=iOAO8^3kLm40io(WLonb+I21r> zzJgFN0Lxs6dY>s!u2j{(x-Qz|lbOPaGv_W&X0oRMT+sw30pw*<>g)wk080Se1z-h$ zWdKsLYDL4L?X6#fdcckGIzw yNIeoB5$UP4#k}txQ15gq?zZlpbZ1jBfWHBV5E%lm^WTjC0000