From 09c02d51f72504c430852780acf7be571f110b8e Mon Sep 17 00:00:00 2001 From: barry Date: Tue, 7 Jul 2026 14:18:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1=E3=80=81=E6=BC=8F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=A4=9A=E8=AF=AD=E8=A8=80xml=E6=96=87=E4=BB=B6=202?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E4=BA=86=E9=83=A8=E5=88=86=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChillConnectAssets/TextAsset/I18N/en.xml | 649 ++++++++++++++++++ .../TextAsset/I18N/en.xml.meta} | 5 +- .../ChillConnectAssets/TextAsset/I18N/ja.xml | 624 +++++++++++++++++ .../TextAsset/I18N/ja.xml.meta} | 5 +- Assets/Scripts/ChillConnectRoot.cs | 7 +- Assets/Scripts/ModuleManager/CtrlConst.cs | 16 - Assets/Scripts/ModuleManager/ModelConst.cs | 16 - .../ModuleManager/ModuleManagerRegister.cs | 32 - Assets/Scripts/ModuleManager/UIConst.cs | 15 - Assets/Scripts/ModuleManager/UICtrlConst.cs | 16 - .../Scripts/ModuleUI/AddView/AddViewCtrl.cs | 42 -- .../ModuleUI/AddView/AddViewCtrl.cs.meta | 11 - .../Scripts/ModuleUI/AddView/AddViewModel.cs | 43 -- .../ModuleUI/AddView/AddViewModel.cs.meta | 11 - Assets/Scripts/ModuleUI/AddView/AddViewUI.cs | 224 ------ .../ModuleUI/AddView/AddViewUI.cs.meta | 11 - .../Scripts/ModuleUI/AddView/AddViewUICtrl.cs | 71 -- .../ModuleUI/AddView/AddViewUICtrl.cs.meta | 11 - .../ModuleUI/Addviewnew/AddviewnewCtrl.cs | 25 - .../Addviewnew/AddviewnewCtrl.cs.meta | 11 - .../ModuleUI/Addviewnew/AddviewnewModel.cs | 20 - .../Addviewnew/AddviewnewModel.cs.meta | 11 - .../ModuleUI/Addviewnew/AddviewnewUI.cs | 258 ------- .../ModuleUI/Addviewnew/AddviewnewUI.cs.meta | 11 - .../ModuleUI/Addviewnew/AddviewnewUICtrl.cs | 73 -- .../Addviewnew/AddviewnewUICtrl.cs.meta | 11 - Assets/Scripts/ModuleUI/BuyProp.meta | 8 - .../Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs | 42 -- .../ModuleUI/BuyProp/BuyPropCtrl.cs.meta | 11 - .../Scripts/ModuleUI/BuyProp/BuyPropModel.cs | 43 -- .../ModuleUI/BuyProp/BuyPropModel.cs.meta | 11 - Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs | 258 ------- .../ModuleUI/BuyProp/BuyPropUI.cs.meta | 11 - .../Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs | 71 -- .../ModuleUI/BuyProp/BuyPropUICtrl.cs.meta | 11 - Assets/Scripts/ModuleUI/ChooseProp.meta | 8 - .../ModuleUI/ChooseProp/ChoosePropCtrl.cs | 42 -- .../ChooseProp/ChoosePropCtrl.cs.meta | 11 - .../ModuleUI/ChooseProp/ChoosePropModel.cs | 43 -- .../ChooseProp/ChoosePropModel.cs.meta | 11 - .../ModuleUI/ChooseProp/ChoosePropUI.cs | 206 ------ .../ModuleUI/ChooseProp/ChoosePropUI.cs.meta | 11 - .../ModuleUI/ChooseProp/ChoosePropUICtrl.cs | 71 -- .../ChooseProp/ChoosePropUICtrl.cs.meta | 11 - Assets/Scripts/ModuleUI/CurrencyReward.meta | 8 - Assets/Scripts/ModuleUI/Packreward.meta | 3 - .../ModuleUI/Packreward/PackrewardCtrl.cs | 44 -- .../Packreward/PackrewardCtrl.cs.meta | 11 - .../ModuleUI/Packreward/PackrewardModel.cs | 29 - .../Packreward/PackrewardModel.cs.meta | 11 - .../ModuleUI/Packreward/PackrewardUI.cs | 504 -------------- .../ModuleUI/Packreward/PackrewardUI.cs.meta | 11 - .../ModuleUI/Packreward/PackrewardUICtrl.cs | 73 -- .../Packreward/PackrewardUICtrl.cs.meta | 11 - Assets/Scripts/ModuleUI/RewardMulNew.meta | 8 - .../ModuleUI/RewardMulNew/RewardMulNewCtrl.cs | 19 - .../RewardMulNew/RewardMulNewCtrl.cs.meta | 11 - .../RewardMulNew/RewardMulNewModel.cs | 13 - .../RewardMulNew/RewardMulNewModel.cs.meta | 11 - .../ModuleUI/RewardMulNew/RewardMulNewUI.cs | 204 ------ .../RewardMulNew/RewardMulNewUI.cs.meta | 11 - .../RewardMulNew/RewardMulNewUICtrl.cs | 72 -- .../RewardMulNew/RewardMulNewUICtrl.cs.meta | 11 - Assets/Scripts/ModuleUI/ThreeDaysGift.meta | 8 - .../ThreeDaysGift/ThreeDaysGiftCtrl.cs | 19 - .../ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta | 11 - .../ThreeDaysGift/ThreeDaysGiftModel.cs | 13 - .../ThreeDaysGift/ThreeDaysGiftModel.cs.meta | 11 - .../ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs | 514 -------------- .../ThreeDaysGift/ThreeDaysGiftUI.cs.meta | 11 - .../ThreeDaysGift/ThreeDaysGiftUICtrl.cs | 72 -- .../ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta | 11 - Assets/Scripts/ModuleUI/WheelView.meta | 8 - .../ModuleUI/WheelView/WheelViewCtrl.cs | 41 -- .../ModuleUI/WheelView/WheelViewCtrl.cs.meta | 11 - .../ModuleUI/WheelView/WheelViewModel.cs | 38 - .../ModuleUI/WheelView/WheelViewModel.cs.meta | 11 - .../Scripts/ModuleUI/WheelView/WheelViewUI.cs | 363 ---------- .../ModuleUI/WheelView/WheelViewUI.cs.meta | 11 - .../ModuleUI/WheelView/WheelViewUICtrl.cs | 85 --- .../WheelView/WheelViewUICtrl.cs.meta | 11 - 81 files changed, 1278 insertions(+), 4145 deletions(-) create mode 100644 Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml rename Assets/{Scripts/ModuleUI/AddView.meta => Resources/ChillConnectAssets/TextAsset/I18N/en.xml.meta} (57%) create mode 100644 Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml rename Assets/{Scripts/ModuleUI/Addviewnew.meta => Resources/ChillConnectAssets/TextAsset/I18N/ja.xml.meta} (57%) delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewModel.cs delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewUI.cs delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/BuyProp.meta delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp.meta delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/CurrencyReward.meta delete mode 100644 Assets/Scripts/ModuleUI/Packreward.meta delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew.meta delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift.meta delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/WheelView.meta delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs.meta delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs delete mode 100644 Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs.meta diff --git a/Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml new file mode 100644 index 0000000..e01d2f1 --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml @@ -0,0 +1,649 @@ + + + + Reduced Difficulty + Add 1 bolck for all level + Watch {num=60} Rewarded ADs can receive + Owner Rewarded ADs: [color=#e2a838]{num=0}/[color][color=#84b93f]{need=60}[color] + Difficulty reduced for all level + + Add 1 block for all level + Difficulty reduced for all level + Watch {num=60} Rewarded ADS can receive + Owner Rewarded ADs: [color=#2c7a2e]{num=3/}[/color][color=#b53746]{num1=60}[/color] + [color=#ffee90]{off=80%}[/color] +OFF + + Theme + Dark Mode + + Clear levels to reach 100% progress + + Clear + + In Use + In Use + Select + + Select + + Hint + + Petty Prize + Cash received + + + Piggy Bank + + Sign In + + Statement + + Use Item + + Level {lv=1} + + Hint + Hint + Delete + Find a arrow that can escape. + Find a arrow that can escape. + You can delete any one of the arrows. + + Reward + + {price=199} + + Claim x{bet=2} + + Claim + + Claim + + Claim x{bet=2} + Multiply Claim + + FAQ + + Resume + + $ {price=199} + + lucky gift + + Petty Cash + Cash received + + + Rank + + Send + + Record + + CASH OUT + + Restore Purchases + + Bear Bank + + Statement + + Task + + Lv.1 + Verti Pass + + Claim + + 3 Days Gift + + Watch AD + Receive + + Update + + [color=#304981][size=32]{0}[/size][/color] withdraw [color=#304981][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color] + [color=#304981][size=32]{0}[/size][/color] withdraw [color=#304981][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color] + + Receive Gold + + Only 03:45:45 + + Clear {x=50} more level to redeem all the prizes! + + AD is coming + Remove ADs + + TIPS + Log In Again + The network connection is abnormal. Please log in again. + + Congratulations,User [color=#ffe868][size=42]xxx[/size][/color] !After purchasing the ThreeDays Bouns,play [color=#ffe868]xxx[/color] matcher to clear the stage! + + Congratulations,User [color=#ad4800][size=36]xxx[/size][/color] !After purchasing the +1 Grid Pack,play [color=#ad4800]xxx[/color] matcher to clear the stage! + Congratulations,User [color=#ad4800][size=36]xxx[/size][/color] !After purchasing the +1 Grid Pack,play [color=#ad4800]xxx[/color] matcher to clear the stage! + Congratulations,User [color=#ad4800][size=36]xxx[/size][/color] !After purchasing the +1 Grid Pack,play [color=#ad4800]xxx[/color] matcher to clear the stage! + Congratulations,User [color=#ad4800][size=36]xxx[/size][/color] !After purchasing the +1 Grid Pack,play [color=#ad4800]xxx[/color] matcher to clear the stage! + + Congratulations, [color=#71fdff]{0}[/color] withdrew [color=#96ff71]{1} [/color]dollars [color=#96ff71]{2}[/color] + Congratulations, [color=#71fdff]{0}[/color] withdrew [color=#96ff71]{1} [/color]dollars [color=#96ff71]{2} [/color] + + X3 + + Redeem + + Restart + + Congratulations, [color=#dfad42]{0}[/color] withdrew [color=#90c04e]{1} [/color]dollars + + Withdrawals can be made through level x + + Out of hearts + & Refill Hearts + Revive + Revive + Restart + + Restart + Restarting will erase this level's progress. Are you sure? + Revive + Restart + + Watch an ad to get double money + Withdraw all of your money after +pass this level + X450 + Passing this level for withdrwals. + FAILED CHALLENGE + CONGRTULATIONS + + Loading... + + Start + + Shop +Fracture + + Loop +Labyrinth + + Voyage +Wheel + + Com:123456ComC456Com + + user:123456sdfsdfs + + 1.How togetcash0000 + + FAQ + [color=#627f95][size=46]Enter your message here[/size][/color] + Send + Contact Us + + You Receive + Claim + + Player001 + + LEVEL REWARD + Congratulations, you can get the following rewards + x300 + Claim + + Quick Start + + By tapping the any login button, you agree to the + + And + [color=#ffe84e][url=link_href][size=43]Terms of Service[/size][/url][/color] + [color=#ffe84e][url=link_href1][size=43]Privacy Policy[/size][/url][/color] + + ad test + error test + int: + reward: + key:oXM0CzVDi7P1HstOpKvFMInPMOzpQ9uA6t3x75q5f5wQvsEy9vuiiiM94ZJCJSV7PcZGroSSInQCTGsu04QEiE + + Connecting both players... {0} + + Claim + + Activate + + x100 + + Premium + Free + + Eliminate tiles to achieve the +next level, one tile for one point + + 12D 23:12:17 + Eliminate tiles to achieve the +next level,one tile for one point + + Need ADs: {num=10} + You have ADs:{num=10} + MAX + Nautical Gifts + + x300 + x1 + x1 + x1 + Remove all Forced-ADs,keep +optional ADs for rewards. + Remove ADs Pack + Need ADs:{num=10} + You have ADs: {num=10} + Deluxe Bundle + Need ADs:{num=10} + You have ADs:{num=10} + x450 + Valid for 10 hours + + Monkeys Spinning Monkeys Kevin MacLeod (incompetech.com) +Licensed under Creative Commons: By Attribution 3.0 License +http://creativecommons.org/licenses/by/3.0/ +Music promoted by https://www.chosic.com/free-music/all/ + Privacy policy + + content + + Resurrection + Resurrection + No Thanks + Use props to revie + Resurrection + Remove + + Remove + Remove + Refresh + Undo + Clear 3 blockers, unlock 75% grid space + Clear 3 blockers, unlock 75% grid space + Restore 1 move, 100% resources saved + Re-layout all blocks, success rate +230% + Buy Props + + CONGRATULATIONS + x2 + + Privacy Policy + Terms of Use + View Credits + Official Website + Exit + Contact Us + Restore Purchases + + User name + Input Your Name + + Settings + ID:{UID=1234567} + Version:{count=1.0.1} + Music + Sound + Drag Speed + Revive + Slow + Fast + Level : Lv{lv=2} + Player + + Profile + Change + + Remove + x2 + x20 + + Collect + Loop Labyrinth + + {times=0}/{limits=9} + + Watch AD + Free Spin + Daily Limit Reach + + Left Spin Times: [color=#95c852]{times=0}/[color][color=#dd786d]{limits=60}[color] + Voyage Wheel + + Receive + + Play + + Exchange + Watch AD + + Level 3 + Win Rate + Using tools can improve the success +rate of levels. + x10 + x10 + x10 + Power Up! + Play + Owner Rewarded ADs: [color=#fbd459]{num=0}/[color][color=#addb79]{need=0}[color] + + Level 3 + Play + Special Gift + Win rate + Using tools can improve the success rate of levels. + x10 + x10 + x10 + + READY! + + Cash Out + + Collect {money=$223.46} more to cash out + + RECEIVE THEM +NOW! + + Master Pass + Free + + Confirm + + withdraw + + Enter Account + Enter your PayPal Account + You can exchange cash to the +following PayPal account. + + Payment Details + Payment Amount: {num=} USD + Payment Date: {data=} + Order Number: {order=} + PayPal: [color=#1777ff]{email=}[/color] + (Estimated delivery in 0-{day=} business days) + Redeem + + [color=#bfbfbf]E-mail Address[/color] + + [color=#bfbfbf]First Name[/color] + + Congratulations! +You've got a bonus. + 10.00 USD + + [color=#bfbfbf]Last Name[/color] + + Confirm Account + Account: {account=} + First Name: {name=} + Last Name: {name=} + Please confirm your account.Paypal will ensure your account safety. + + Collect + + Passing + Time + Ad Views + + x3 + Matching 10 times + + Achievement + + Reward + Watch an AD to get double gold + + xxxxxxx + claimed + + Record + + Watch an ad to get double money + + Completion: 38% + x1 + x1 + x1 + Rise Again and Fight On! + x10 + Owner ADs:0 + need 3 ADs + + 30 ADs + + Watch Ad + + Watch AD + Receive + + Need {ads=10} ADs + x3 + OFF + + Collection + OwnerADs: {num=10} + + Receive + + x20 + + Owner ADs:0 + need 3 ADs + Buy the gift pack, receive three-day bonus + Receive + $ {price=199} + + Back to Previous + + Copy Code + Go Shopping + + Comfirmar + + Claim x{bet=2} + + Claim + + Watch AD + + Go to Summary + + Cash + Process in query + Account: + Time: + Status + .COM + Under Review + + Cash + Process in query + Account: + Time: + Status + .com + Under Review + + [color=#6a879d]E-mail Address[/color] + + [color=#6a879d]First Name[/color] + + [color=#6a879d]Last Name[/color] + + Your current ranking + No waiting! Top spot in queue gets +automatic rewards + 1.Watching an advertisement can speed up [color=#ffda3c]{rank=2-5}[/color] rankings + 1.Watching an advertisement can speed up [color=#ffda3c]{rank=2-5}[/color] rankings + 1.You have sped up [color=#feee88]{rank=2}[/color] ranks by +watching ads + 2.You have sped up [color=#feee88]{rank=2}[/color] ranks by logging + 2.Logging in every day can speed up [color=#ffda3c]{rank=5}[/color] rankings + 2.You have sped up [color=#feee88]{rank=2}[/color] ranks by logging + 3.Go to the gameplay room page, +active [color=#ffda3c]{time=2}[/color] mins can speed up [color=#ffda3c]{rank=2}[/color] rankings + + 3.Go to the gameplay room page, +active [color=#ffda3c]{time=2}[/color] mins can speed up [color=#ffda3c]{rank=2}[/color] rankings + + 3.You have sped up [color=#feee88]{rank=2}[/color] ranks through +active tasks + + + Order placed.order ID: + Watch {ad=20} Reward Ads: + Get your prizes + Let's get ready to claim + + DISCOUNT +COUPON + + <img src='ui://o9974uc5qbo98'/>1/<img src='ui://o9974uc5qbo98'/>1 + + Please complete all conditions to cash out + Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page. + Processing the payment to +[color=#c49f82] {account=1234567@qq.com}[/color] + Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page. + Enter your email + We'll contact you to process your redemption. + Exchange rules: + In query: {cur=1234}/{tol=8000} + Claim condition + (1) Make sure your app's version is the latest version. +(2)Please confirm that the account is correct, otherwise the cash will be unsuccessful or the wrong account will be charged, and you are responsible for it. +(3) Please confirm the exchange amount. After sending, the amount cannot be changed anymore. +(4) Exchange process will be completed within 3 working days. + Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page. + Waiting in line to reach the first place for withdrawal. + Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page. + Redeem + Account + Condition + Steps + Completed + Account + Redeem + Code + Enter Account + Please confirm your account for Arrow Game: Beat Tap to send out payment.Paypal will ensure your account safety. + Withdraw all cash through level {0} + Level2 + Information({0}) + People who passed today + Number of challenger per capita + Challenger withdrawal per capita + Confirm + Redeem + Redeem + Complete + Confirm + Confirm + Cash Out + Your limit wil expire in + Your limit has expired. Watch ads to unlock it. + Condition 1: Collect + DISCOUNT +COUPON + Claim Code + Claim Code + How to Redeem Instructions + 1.Copy Code +2. Click to Contact Us +3. Submit the code and account details via email + Your code + is ready below + Owner ADs: {0}/{1} + Confirm + {cash=$300.00} + <img src='ui://o9974uc5qbo98'/> {cash=300.00} + + No Record + Record + + Code + DISCOUNT +COUPON + Claim Code + Claim Code + Go Shopping + How to Redeem Instructions + 1.Copy the promo code. +2. Click on the shopping mall. +3. Select a product in the mall and enter the promo code at checkout. + Your code + is ready below + + +We need multi-party verification for withdrawal, so the payment time maybe longer. Please be patient. + +Under normal circumstances, the payment will be credited within one month, if it has not been credited for more than a month, please contact our customer service Facebook: + + maxyuen001@gmail.com + RULE + + Claim + + Claim + + Beginner + Beginner + Expext + Master + + 12d 23:12:12111111 + 1. Earn XXX USD for each ad you watch + 2. Pay X USD for X times cashback. + GO + If the event ends without meeting the goal, +you will lose {num=0} tickets. + + Comfirm + Comfirm + Complete + Account + Account + Account + Compeleted + Compeleted + Redeem + Code + Condition + Please complete all conditions to cash out + Congratulations + 12314444@qq.com + You will get the $200 for 90 days + Please leave your email information and we will issue a gift card redemption code + Please confirm your email to Arrow Game: Beat Tap to send out payment.We will send the gift card redemption code to your email + Redemption Gift Card information + Gift Card + Account + DISCOUNT +COUPON + Claim Code + Claim Code + How to Redeem Instructions + 1.Copy Code +2. Click to Contact Us +3. Submit the code and account details via email + Your code + is ready below + Confirm + + Change + + {fname=KKK} {lname=Walker} + KKK_walker8800@gmail.com + + Level 02 + Level 01 + Level 03 + Wait to unlock + \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/AddView.meta b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml.meta similarity index 57% rename from Assets/Scripts/ModuleUI/AddView.meta rename to Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml.meta index dd49cee..fc5be18 100644 --- a/Assets/Scripts/ModuleUI/AddView.meta +++ b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 3ec7125d0333e284db6729a02dd964b0 -folderAsset: yes -DefaultImporter: +guid: cdb4480106a5b4d4692f7f4a6704be66 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml new file mode 100644 index 0000000..448fbd3 --- /dev/null +++ b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml @@ -0,0 +1,624 @@ + + + 難易度緩和 + 全ステージにブロックを1個追加 + {num=60}回報酬広告を視聴すると獲得できます + 保有報酬広告回数：[color=#e2a838]{num=0}/[color][color=#84b93f]{need=60}[color] + 全ステージの難易度が緩和されました + + 全ステージにブロックを1個追加 + 全ステージの難易度が緩和されました + {num=60}回報酬広告を視聴すると獲得できます + 保有報酬広告回数：[color=#2c7a2e]{num=3/}[/color][color=#b53746]{num1=60}[/color] + [color=#ffee90]{off=80%}[/color] +オフ + + テーマ + ダークモード + + ステージをクリアして進捗率を100％にしましょう + + 消去 + + 使用中 + 使用中 + 選択 + + 選択 + + ヒント + + 少額報酬 + 受け取った現金 + + + 貯金箱 + + ログイン + + 取引明細 + + アイテムを使用 + + レベル{lv=1} + + ヒント + ヒント + 削除 + 脱出できる矢印を探してください。 + 脱出できる矢印を探してください。 + 矢印を任意で1本削除できます。 + + 報酬 + + {price=199} + + 受け取る×{bet=2} + + 受け取る + + 受け取る + + 受け取る×{bet=2} + 報酬倍増受け取り + + よくある質問 + + 再開 + + $ {price=199} + + ラッキーギフト + + 少額現金 + 受け取った現金 + + + ランキング + + 送信 + + 記録 + + 出金 + + 購入履歴を復元 + + クマの貯金箱 + + 取引明細 + + ミッション + + レベル1 + バーチパス + + 受け取る + + 3日間限定ギフト + + 広告を視聴 + 受け取る + + 更新 + + [color=#304981][size=32]{0}[/size][/color] が [color=#304981][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/color] 出金しました + [color=#304981][size=32]{0}[/size][/color] が [color=#304981][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/color] 出金しました + + ゴールドを獲得 + + 残り03:45:45 + + あと{x=50}ステージクリアで全報酬を交換可能！ + + 広告が表示されます + 広告を削除 + + ヒント + 再ログイン + ネットワーク接続が異常です。再度ログインしてください。 + + おめでとうございますユーザー[color=#ffe868][size=42]xxx[/size][/color]！3日間ボーナスを購入後、[color=#ffe868]xxx[/color]マッチゲームをプレイしてステージをクリアしよう！ + + おめでとうございますユーザー[color=#ad4800][size=36]xxx[/size][/color]！+1グリッドパック購入後、[color=#ad4800]xxx[/color]マッチゲームでステージクリアしよう！ + おめでとうございますユーザー[color=#ad4800][size=36]xxx[/size][/color]！+1グリッドパック購入後、[color=#ad4800]xxx[/color]マッチゲームでステージクリアしよう！ + おめでとうございますユーザー[color=#ad4800][size=36]xxx[/size][/color]！+1グリッドパック購入後、[color=#ad4800]xxx[/color]マッチゲームでステージクリアしよう！ + おめでとうございますユーザー[color=#ad4800][size=36]xxx[/size][/color]！+1グリッドパック購入後、[color=#ad4800]xxx[/color]マッチゲームでステージクリアしよう！ + + おめでとうございます、[color=#71fdff]{0}[/color] が [color=#96ff71]{1} [/color]米ドルを出金しました [color=#96ff71]{2}[/color] + おめでとうございます、[color=#71fdff]{0}[/color] が [color=#96ff71]{1} [/color]米ドルを出金しました [color=#96ff71]{2}[/color] + + ×3 + + 交換 + + リトライ + + おめでとうございます、[color=#dfad42]{0}[/color] が [color=#90c04e]{1} [/color]米ドルを出金しました + + レベルxをクリアすると出金可能 + + ハートがなくなりました + & ハートを補充 + 復活 + 復活 + リトライ + + リトライ + リトライすると今回のステージ進捗が消去されます。よろしいですか？ + 復活 + リトライ + + 広告を視聴すると報酬が2倍になります + このステージをクリア後、全額出金可能 + ×450 + このステージクリアで出金条件達成 + チャレンジ失敗 + おめでとうございます + + 読み込み中... + + スタート + + ショップ +破壊 + + ループ +迷宮 + + 航海 +ルーレット + + Com:123456ComC456Com + + ユーザー:123456sdfsdfs + + 1.現金を入手する方法は？ + + よくある質問 + [color=#627f95][size=46]ここにメッセージを入力[/size][/color] + 送信 + お問い合わせ + + 獲得しました + 受け取る + + プレイヤー001 + + レベル報酬 + おめでとうございます、以下の報酬を受け取れます + ×300 + 受け取る + + クイックスタート + + ログインボタンをタップすると、以下に同意したものとみなされます + + 及び + [color=#ffe84e][url=link_href][size=43][/size]プライバシーポリシー[/color] + [color=#ffe84e][url=link_href1][size=43]利用規約[/size][/url][/color] + + + 広告テスト + エラーテスト + 整数： + 報酬： + キー：oXM0CzVDi7P1HstOpKvFMInPMOzpQ9uA6t3x75q5f5wQvsEy9vuiiiM94ZJCJSV7PcZGroSSInQCTGsu04QEiE + + プレイヤー同士を接続中... {0} + + 受け取る + + 有効化 + + ×100 + + プレミアム + 無料 + + タイルを消して次のレベルへ、1タイルにつき1ポイント + + 12日 23:12:17 + タイルを消して次のレベルへ、1タイルにつき1ポイント + + 必要広告回数：{num=10} + 保有広告回数：{num=10} + 上限 + 航海ギフト + + ×300 + ×1 + ×1 + ×1 + 強制広告をすべて削除、報酬用任意広告は残ります。 + 広告削除パック + 必要広告回数：{num=10} + 保有広告回数：{num=10} + 豪華バンドル + 必要広告回数：{num=10} + 保有広告回数：{num=10} + ×450 + 有効期間10時間 + + BGM：Monkeys Spinning Monkeys Kevin MacLeod (incompetech.com) +クリエイティブ・コモンズ 表示3.0ライセンスに基づき使用 +http://creativecommons.org/licenses/by/3.0/ +音楽配信：https://www.chosic.com/free-music/all/ + プライバシーポリシー + + 本文 + + 復活 + 復活 + いいえ、結構です + アイテムを使用して復活 + 復活 + 削除 + + 削除 + 削除 + 再配置 + 取り消し + 障害ブロック3個消去、グリッド75％解放 + 障害ブロック3個消去、グリッド75％解放 + 一手戻し、素材を完全回復 + 全ブロック再配置、クリア成功率＋230％ + アイテム購入 + + おめでとうございます + ×2 + + プライバシーポリシー + 利用規約 + クレジット確認 + 公式サイト + 終了 + お問い合わせ + 購入履歴を復元 + + ユーザー名 + 名前を入力してください + + 設定 + ID:{UID=1234567} + バージョン:{count=1.0.1} + 音楽 + 効果音 + ドラッグ速度 + 復活 + 遅い + 速い + レベル：Lv{lv=2} + プレイヤー + + プロフィール + 変更 + + 削除 + ×2 + ×20 + + 受け取る + ループ迷宮 + + {times=0}/{limits=9} + + 広告を視聴 + 無料スピン + 1日の上限回数に達しました + + 残りスピン回数：[color=#95c852]{times=0}/[color][color=#dd786d]{limits=60}[color] + 航海ルーレット + + 受け取る + + プレイ + + 交換 + 広告を視聴 + + レベル3 + クリア確率 + ツールを使用するとクリア成功率が上昇します。 + ×10 + ×10 + ×10 + パワーアップ！ + プレイ + 保有報酬広告回数：[color=#fbd459]{num=0}/[color][color=#addb79]{need=0}[color] + + レベル3 + プレイ + 限定特典 + クリア確率 + ツールを使用するとクリア成功率が上昇します。 + ×10 + ×10 + ×10 + + 準備完了！ + + 出金 + + あと{money=$223.46}米ドルで出金可能 + + 今すぐ受け取れ +！ + + マスターパス + 無料 + + 確認 + + 出金 + + アカウント入力 + PayPalアカウントを入力してください + 以下のPayPalアカウントに現金を交換できます。 + + お支払詳細 + お支払金額：{num=} USD + お支払日：{data=} + 注文番号：{order=} + PayPal：[color=#1777ff]{email=}[/color] + (営業日0-{day=}日以内に届く予定) + 交換 + + [color=#bfbfbf]メールアドレス[/color] + + [color=#bfbfbf]ファーストネーム[/color] + + おめでとうございます！ +ボーナスを獲得しました。 + 10.00 USD + + [color=#bfbfbf]ラストネーム[/color] + + アカウント確認 + アカウント：{account=} + 名前：{name=} + 名字：{name=} + アカウント情報をご確認ください。PayPalがアカウントを保護します。 + + 受け取る + + クリア + 時間 + 広告視聴 + + ×3 + 10回マッチをプレイする + + 実績 + + 報酬 + 広告視聴でゴールドが2倍になる + + xxxxxxx + 受取済み + + 記録 + + 広告視聴で報酬2倍 + + 達成率：38% + ×1 + ×1 + ×1 + 再挑戦しよう！ + ×10 + 保有広告回数：0 + 広告を3回視聴する必要があります + + 広告30回 + + 広告を視聴 + + 広告を視聴 + 受け取る + + 必要広告回数：{ads=10} + ×3 + オフ + + コレクション + 保有広告回数：{num=10} + + 受け取る + + ×20 + + 保有広告回数：0 + 広告を3回視聴する必要があります + ギフトパック購入で3日間限定ボーナスを獲得可能 + 受け取る + $ {price=199} + + 前の画面に戻る + + コードをコピー + ショップへ移動 + + 確認 + + 受け取る×{bet=2} + + 受け取る + + 広告を視聴 + + 明細を確認 + + 現金 + 審査中 + アカウント： + 日時： + 状態 + .COM + 審査中 + + 現金 + 審査中 + アカウント： + 日時： + 状態 + .com + 審査中 + + [color=#6a879d]メールアドレス[/color] + + [color=#6a879d]ファーストネーム[/color] + + [color=#6a879d]ラストネーム[/color] + + 現在の順位 + 待ち時間なし！上位になると自動で報酬を獲得 + 1.広告視聴で[color=#ffda3c]2～5位まで順位アップ + 1.広告視聴で[color=#ffda3c]2～5位まで順位アップ + 1.広告視聴で[color=#feee88]2ランク上がりました + 2.毎日ログインで[color=#ffda3c]5位まで順位アップ + 2.毎日ログインで[color=#ffda3c]5位まで順位アップ + 2.ログインで[color=#feee88]2ランク上がりました + 3.ゲームを[color=#ffda3c]2分間プレイすると[color=#ffda3c]2ランクアップ + 3.ゲームを[color=#ffda3c]2分間プレイすると[color=#ffda3c]2ランクアップ + 3.ゲームプレイで[color=#feee88]2ランク上がりました + + 注文ID： + 報酬広告を{ad=20}回視聴： + 報酬を受け取ろう + 報酬受け取り準備完了 + + 割引クーポン + + <img src='ui://o9974uc5qbo98'/>1/<img src='ui://o9974uc5qbo98'/>1 + + 出金するには全条件を達成してください + お支払いまで3～5営業日かかります。出金履歴ページで状況を確認できます。 + [color=#c49f82]{account=1234567@qq.com}[/color] へ送金処理中 + お支払いまで3～5営業日かかります。出金履歴ページで状況を確認できます。 + メールアドレスを入力 + 交換手続きのためご連絡差し上げます。 + 交換ルール： + 審査進行中：{cur=1234}/{tol=8000} + 受取条件 + (1)アプリを最新版に更新してください。 +(2)アカウント情報に誤記があると送金エラーまたは誤送金となり、責任は自身が負います。 +(3)交換金額を確認してください。送信後金額変更はできません。 +(4)交換処理は3営業日以内に完了いたします。 +お支払い完了まで 3～5 営業日かかります。出金履歴画面にて状況を確認できます。 +お支払いまで3～5営業日かかります。出金履歴画面で状況を確認できます。 +出金順番待ち中です。 +お支払いまで3～5営業日かかります。出金履歴画面で状況を確認できます。 +アカウント +アカウント +条件 +手順 +完了 +アカウント +交換 +コード +アカウントを入力 +出金処理のためArrow Gameのアカウント情報を確認してください。PayPalがアカウントを保護します。 +レベル{0}到達で全額出金可能 +レベル2 +情報({0}) +本日クリアした人数 +一人当たり挑戦回数 +一人当たり出金額 +確認 +交換 +交換 +完了 +確認 +確認 +出金 +上限有効期限まであと +上限が切れました。広告を視聴して解除しましょう。 +条件1：獲得する +割引クーポン +受取用コード +受取用コード +交換手順 +1.コードをコピー +2.お問い合わせをタップ +3.メールにてコードとアカウント情報を送信 +下にコードが表示されています +保有広告：{0}/{1} +確認 +{cash=$300.00} +<img src='ui://o9974uc5qbo98'/> {cash=300.00} + +記録なし +記録 + +コード +割引クーポン +受取用コード +受取用コード +ショップへ移動 +交換手順 +1.プロモコードをコピー +2.ショップを開く +3.商品を選び会計時にコードを入力 +下にコードが用意されています + +出金に複数段階の審査が入るため、お支払いまで時間を要する場合があります。しばらくお待ちください。 +通常は1ヶ月以内に入金されますが、1ヶ月以上経過しても届かない場合はFacebookカスタマーサービスまでご連絡ください： +maxyuen001@gmail.com +利用規約 + +受け取る + +受け取る + +初心者 +初心者 +熟練者 +達人 + +12日 23:12:12111111 +1.広告1回視聴ごとにXXX米ドル獲得 +2.X米ドル支払うとX回キャッシュバック +進む +目標達成前にイベントが終了すると、{num=0}枚のチケットが失われます。 +確認 +確認 +完了 +アカウント +アカウント +アカウント +完了 +完了 +交換 +コード +条件 +出金には全ての条件を満たす必要があります +おめでとうございます +12314444@qq.com +90日間に渡って200米ドルを受け取れます +PayPalアカウントを入力 +ギフトカード交換コードを発行するためメールアドレスをご記入ください +出金手続きのためArrow Gameのメールアドレスを確認してください。ギフトカード交換コードをメールに送信いたします +ギフトカード交換情報 +ギフトカード +アカウント +割引クーポン +受取用コード +受取用コード +交換手順 +1.コードをコピー +2.お問い合わせをタップ +3.メールにてコードとアカウント情報を送信 +下にコードが表示されています +確認 + +変更 + +{fname=KKK} {lname=Walker} +KKK_walker8800@gmail.com + +レベル02 +レベル01 +レベル03 +解放待ち + \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Addviewnew.meta b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml.meta similarity index 57% rename from Assets/Scripts/ModuleUI/Addviewnew.meta rename to Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml.meta index 01fb921..a877a9c 100644 --- a/Assets/Scripts/ModuleUI/Addviewnew.meta +++ b/Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: ba8038fc2cb1842cbbdae804b4f0982c -folderAsset: yes -DefaultImporter: +guid: c68a0fbf089584140a8a8015851ea281 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scripts/ChillConnectRoot.cs b/Assets/Scripts/ChillConnectRoot.cs index 4d4ea8a..12f3a6c 100644 --- a/Assets/Scripts/ChillConnectRoot.cs +++ b/Assets/Scripts/ChillConnectRoot.cs @@ -67,12 +67,7 @@ public class ChillConnectRoot : MonoBehaviour DataMgr.SignState.Value.Add(GameHelper.GetNowTime() + (long)TimeSpan.FromDays(DataMgr.SignState.Value.Count).TotalSeconds); DataMgr.SignState.Save(); })); - GMTool.Instance.AddItem(new GMToolItem(GUIType.Button, - () => "打开礼包界面", - s => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, true); - })); + GMTool.Instance.AddItem(new GMToolItem(GUIType.Button, () => "类型测试+10", s => diff --git a/Assets/Scripts/ModuleManager/CtrlConst.cs b/Assets/Scripts/ModuleManager/CtrlConst.cs index fb43288..e2b657c 100644 --- a/Assets/Scripts/ModuleManager/CtrlConst.cs +++ b/Assets/Scripts/ModuleManager/CtrlConst.cs @@ -14,20 +14,12 @@ namespace ChillConnect public const string PrivacyCtrl = "PrivacyCtrl"; public const string PreferencesDataReadyCtrl = "PreferencesDataReadyCtrl"; public const string GameResultCtrl = "GameResultCtrl"; - public const string RainPlayCtrl = "RainPlayCtrl"; - public const string BuyPropCtrl = "BuyPropCtrl"; - public const string ChoosePropCtrl = "ChoosePropCtrl"; - public const string AddViewCtrl = "AddViewCtrl"; public const string OpenGameCtrl = "OpenGameCtrl"; public const string RewardboxCtrl = "RewardboxCtrl"; public const string PayloadingCtrl = "PayloadingCtrl"; - public const string HallCtrl = "HallCtrl"; public const string H5Ctrl = "H5Ctrl"; - public const string WheelViewCtrl = "WheelViewCtrl"; public const string BuygoldCtrl = "BuygoldCtrl"; - public const string BuyConfirmCtrl = "BuyConfirmCtrl"; public const string GameMenuCtrl = "GameMenuCtrl"; - public const string EggViewCtrl = "EggViewCtrl"; public const string PersonViewCtrl = "PersonViewCtrl"; public const string TipsViewCtrl = "TipsViewCtrl"; public const string LevelRewardCtrl = "LevelRewardCtrl"; @@ -35,22 +27,14 @@ namespace ChillConnect public const string MakeupConfirmCtrl = "MakeupConfirmCtrl"; public const string SaveingPotCtrl = "SaveingPotCtrl"; public const string ResurgenceCtrl = "ResurgenceCtrl"; - public const string RewardMulNewCtrl = "RewardMulNewCtrl"; public const string FirstRewardCtrl = "FirstRewardCtrl"; - public const string ThreeDaysGiftCtrl = "ThreeDaysGiftCtrl"; public const string PassViewCtrl = "PassViewCtrl"; public const string PassunlockCtrl = "PassunlockCtrl"; public const string BroadcastCtrl = "BroadcastCtrl"; public const string RecordViewCtrl = "RecordViewCtrl"; public const string AdcomingCtrl = "AdcomingCtrl"; - public const string FAQCtrl = "FAQCtrl"; public const string AddViewoffCtrl = "AddViewoffCtrl"; - public const string RankCtrl = "RankCtrl"; - public const string RankRewardCtrl = "RankRewardCtrl"; - public const string RankRuleCtrl = "RankRuleCtrl"; - public const string PackrewardCtrl = "PackrewardCtrl"; public const string GoldRewardCtrl = "GoldRewardCtrl"; - public const string AddviewnewCtrl = "AddviewnewCtrl"; public const string NewTaskCtrl = "NewTaskCtrl"; public const string GetTaskRewardCtrl = "GetTaskRewardCtrl"; public const string PettyAwardCtrl = "PettyAwardCtrl"; diff --git a/Assets/Scripts/ModuleManager/ModelConst.cs b/Assets/Scripts/ModuleManager/ModelConst.cs index 39ab467..716ba4b 100644 --- a/Assets/Scripts/ModuleManager/ModelConst.cs +++ b/Assets/Scripts/ModuleManager/ModelConst.cs @@ -12,21 +12,13 @@ namespace ChillConnect public const string OpenBgModel = "OpenBgModel"; public const string NetLoadingModel = "NetLoadingModel"; public const string MenuModel = "MenuModel"; - public const string RainPlayModel = "RainPlayModel"; public const string RewardModel = "RewardModel"; - public const string ChoosePropModel = "ChoosePropModel"; - public const string BuyPropModel = "BuyPropModel"; public const string GameResultModel = "GameResultModel"; - public const string AddViewModel = "AddViewModel"; public const string OpenGameModel = "OpenGameModel"; public const string RewardboxModel = "RewardboxModel"; public const string PayloadingModel = "PayloadingModel"; - public const string HallModel = "HallModel"; - public const string WheelViewModel = "WheelViewModel"; public const string BuygoldModel = "BuygoldModel"; - public const string BuyConfirmModel = "BuyConfirmModel"; public const string GameMenuModel = "GameMenuModel"; - public const string EggViewModel = "EggViewModel"; public const string PersonViewModel = "PersonViewModel"; public const string TipsViewModel = "TipsViewModel"; public const string LevelRewardModel = "LevelRewardModel"; @@ -34,22 +26,14 @@ namespace ChillConnect public const string MakeupConfirmModel = "MakeupConfirmModel"; public const string SaveingPotModel = "SaveingPotModel"; public const string ResurgenceModel = "ResurgenceModel"; - public const string RewardMulNewModel = "RewardMulNewModel"; public const string FirstRewardModel = "FirstRewardModel"; - public const string ThreeDaysGiftModel = "ThreeDaysGiftModel"; public const string PassViewModel = "PassViewModel"; public const string PassunlockModel = "PassunlockModel"; public const string BroadcastModel = "BroadcastModel"; public const string RecordViewModel = "RecordViewModel"; public const string AdcomingModel = "AdcomingModel"; - public const string FAQModel = "FAQModel"; public const string AddViewoffModel = "AddViewoffModel"; - public const string RankModel = "RankModel"; - public const string RankRewardModel = "RankRewardModel"; - public const string RankRuleModel = "RankRuleModel"; - public const string PackrewardModel = "PackrewardModel"; public const string GoldRewardModel = "GoldRewardModel"; - public const string AddviewnewModel = "AddviewnewModel"; public const string NewTaskModel = "NewTaskModel"; public const string GetTaskRewardModel = "GetTaskRewardModel"; public const string PettyAwardModel = "PettyAwardModel"; diff --git a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs index d9afed7..fb6af93 100644 --- a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs +++ b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs @@ -17,15 +17,11 @@ namespace ChillConnect moduleManager.AddModel(ModelConst.OpenBgModel, new OpenBgModel()); moduleManager.AddModel(ModelConst.PrivacyModel, new PrivacyModel()); moduleManager.AddModel(ModelConst.RewardModel, new RewardModel()); - moduleManager.AddModel(ModelConst.ChoosePropModel, new ChoosePropModel()); - moduleManager.AddModel(ModelConst.BuyPropModel, new BuyPropModel()); moduleManager.AddModel(ModelConst.GameResultModel, new GameResultModel()); - moduleManager.AddModel(ModelConst.AddViewModel, new AddViewModel()); moduleManager.AddModel(ModelConst.OpenGameModel, new OpenGameModel()); moduleManager.AddModel(ModelConst.RewardboxModel, new RewardboxModel()); moduleManager.AddModel(ModelConst.PayloadingModel, new PayloadingModel()); moduleManager.AddModel(ModelConst.FXWndModel, new FXWndModel()); - moduleManager.AddModel(ModelConst.WheelViewModel, new WheelViewModel()); moduleManager.AddModel(ModelConst.BuygoldModel, new BuygoldModel()); moduleManager.AddModel(ModelConst.GameMenuModel, new GameMenuModel()); moduleManager.AddModel(ModelConst.PersonViewModel, new PersonViewModel()); @@ -36,17 +32,13 @@ namespace ChillConnect moduleManager.AddModel(ModelConst.SaveingPotModel, new SaveingPotModel()); moduleManager.AddModel(ModelConst.ResurgenceModel, new ResurgenceModel()); moduleManager.AddModel(ModelConst.FirstRewardModel, new FirstRewardModel()); - moduleManager.AddModel(ModelConst.ThreeDaysGiftModel, new ThreeDaysGiftModel()); moduleManager.AddModel(ModelConst.PassViewModel, new PassViewModel()); moduleManager.AddModel(ModelConst.PassunlockModel, new PassunlockModel()); moduleManager.AddModel(ModelConst.BroadcastModel, new BroadcastModel()); moduleManager.AddModel(ModelConst.RecordViewModel, new RecordViewModel()); - moduleManager.AddModel(ModelConst.RewardMulNewModel, new RewardMulNewModel()); moduleManager.AddModel(ModelConst.AdcomingModel, new AdcomingModel()); moduleManager.AddModel(ModelConst.AddViewoffModel, new AddViewoffModel()); - moduleManager.AddModel(ModelConst.PackrewardModel, new PackrewardModel()); moduleManager.AddModel(ModelConst.GoldRewardModel, new GoldRewardModel()); - moduleManager.AddModel(ModelConst.AddviewnewModel, new AddviewnewModel()); moduleManager.AddModel(ModelConst.NewTaskModel, new NewTaskModel()); moduleManager.AddModel(ModelConst.GetTaskRewardModel, new GetTaskRewardModel()); moduleManager.AddModel(ModelConst.PettyAwardModel, new PettyAwardModel()); @@ -72,15 +64,11 @@ namespace ChillConnect moduleManager.AddUICtrl(UICtrlConst.OpenBgUICtrl, new OpenBgUICtrl()); moduleManager.AddUICtrl(UICtrlConst.PrivacyUICtrl, new PrivacyUICtrl()); moduleManager.AddUICtrl(UICtrlConst.RewardUICtrl, new RewardUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.ChoosePropUICtrl, new ChoosePropUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.BuyPropUICtrl, new BuyPropUICtrl()); moduleManager.AddUICtrl(UICtrlConst.GameResultUICtrl, new GameResultUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.AddViewUICtrl, new AddViewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.OpenGameUICtrl, new OpenGameUICtrl()); moduleManager.AddUICtrl(UICtrlConst.RewardboxUICtrl, new RewardboxUICtrl()); moduleManager.AddUICtrl(UICtrlConst.PayloadingUICtrl, new PayloadingUICtrl()); moduleManager.AddUICtrl(UICtrlConst.FXWndUICtrl, new FXWndUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.WheelViewUICtrl, new WheelViewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.BuygoldUICtrl, new BuygoldUICtrl()); moduleManager.AddUICtrl(UICtrlConst.GameMenuUICtrl, new GameMenuUICtrl()); moduleManager.AddUICtrl(UICtrlConst.PersonViewUICtrl, new PersonViewUICtrl()); @@ -91,17 +79,13 @@ namespace ChillConnect moduleManager.AddUICtrl(UICtrlConst.SaveingPotUICtrl, new SaveingPotUICtrl()); moduleManager.AddUICtrl(UICtrlConst.ResurgenceUICtrl, new ResurgenceUICtrl()); moduleManager.AddUICtrl(UICtrlConst.FirstRewardUICtrl, new FirstRewardUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.ThreeDaysGiftUICtrl, new ThreeDaysGiftUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.RewardMulNewUICtrl, new RewardMulNewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.PassViewUICtrl, new PassViewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.PassunlockUICtrl, new PassunlockUICtrl()); moduleManager.AddUICtrl(UICtrlConst.BroadcastUICtrl, new BroadcastUICtrl()); moduleManager.AddUICtrl(UICtrlConst.RecordViewUICtrl, new RecordViewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.AdcomingUICtrl, new AdcomingUICtrl()); moduleManager.AddUICtrl(UICtrlConst.AddViewoffUICtrl, new AddViewoffUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.PackrewardUICtrl, new PackrewardUICtrl()); moduleManager.AddUICtrl(UICtrlConst.GoldRewardUICtrl, new GoldRewardUICtrl()); - moduleManager.AddUICtrl(UICtrlConst.AddviewnewUICtrl, new AddviewnewUICtrl()); moduleManager.AddUICtrl(UICtrlConst.NewTaskUICtrl, new NewTaskUICtrl()); moduleManager.AddUICtrl(UICtrlConst.GetTaskRewardUICtrl, new GetTaskRewardUICtrl()); moduleManager.AddUICtrl(UICtrlConst.PettyAwardUICtrl, new PettyAwardUICtrl()); @@ -130,15 +114,11 @@ namespace ChillConnect moduleManager.AddCtrl(CtrlConst.PrivacyCtrl, new PrivacyCtrl()); moduleManager.AddCtrl(CtrlConst.RewardCtrl, new RewardCtrl()); moduleManager.AddCtrl(CtrlConst.PreferencesDataReadyCtrl, new PreferencesDataReadyCtrl()); - moduleManager.AddCtrl(CtrlConst.ChoosePropCtrl, new ChoosePropCtrl()); - moduleManager.AddCtrl(CtrlConst.BuyPropCtrl, new BuyPropCtrl()); moduleManager.AddCtrl(CtrlConst.GameResultCtrl, new GameResultCtrl()); - moduleManager.AddCtrl(CtrlConst.AddViewCtrl, new AddViewCtrl()); moduleManager.AddCtrl(CtrlConst.OpenGameCtrl, new OpenGameCtrl()); moduleManager.AddCtrl(CtrlConst.RewardboxCtrl, new RewardboxCtrl()); moduleManager.AddCtrl(CtrlConst.PayloadingCtrl, new PayloadingCtrl()); moduleManager.AddCtrl(CtrlConst.FXWndCtrl, new FXWndCtrl()); - moduleManager.AddCtrl(CtrlConst.WheelViewCtrl, new WheelViewCtrl()); moduleManager.AddCtrl(CtrlConst.BuygoldCtrl, new BuygoldCtrl()); moduleManager.AddCtrl(CtrlConst.GameMenuCtrl, new GameMenuCtrl()); moduleManager.AddCtrl(CtrlConst.PersonViewCtrl, new PersonViewCtrl()); @@ -149,17 +129,13 @@ namespace ChillConnect moduleManager.AddCtrl(CtrlConst.SaveingPotCtrl, new SaveingPotCtrl()); moduleManager.AddCtrl(CtrlConst.ResurgenceCtrl, new ResurgenceCtrl()); moduleManager.AddCtrl(CtrlConst.FirstRewardCtrl, new FirstRewardCtrl()); - moduleManager.AddCtrl(CtrlConst.ThreeDaysGiftCtrl, new ThreeDaysGiftCtrl()); - moduleManager.AddCtrl(CtrlConst.RewardMulNewCtrl, new RewardMulNewCtrl()); moduleManager.AddCtrl(CtrlConst.PassViewCtrl, new PassViewCtrl()); moduleManager.AddCtrl(CtrlConst.PassunlockCtrl, new PassunlockCtrl()); moduleManager.AddCtrl(CtrlConst.BroadcastCtrl, new BroadcastCtrl()); moduleManager.AddCtrl(CtrlConst.RecordViewCtrl, new RecordViewCtrl()); moduleManager.AddCtrl(CtrlConst.AdcomingCtrl, new AdcomingCtrl()); moduleManager.AddCtrl(CtrlConst.AddViewoffCtrl, new AddViewoffCtrl()); - moduleManager.AddCtrl(CtrlConst.PackrewardCtrl, new PackrewardCtrl()); moduleManager.AddCtrl(CtrlConst.GoldRewardCtrl, new GoldRewardCtrl()); - moduleManager.AddCtrl(CtrlConst.AddviewnewCtrl, new AddviewnewCtrl()); moduleManager.AddCtrl(CtrlConst.NewTaskCtrl, new NewTaskCtrl()); moduleManager.AddCtrl(CtrlConst.GetTaskRewardCtrl, new GetTaskRewardCtrl()); moduleManager.AddCtrl(CtrlConst.PettyAwardCtrl, new PettyAwardCtrl()); @@ -187,14 +163,10 @@ namespace ChillConnect moduleManager.AddUIType(UIConst.OpenBgUI, typeof(OpenBgUI)); moduleManager.AddUIType(UIConst.PrivacyUI, typeof(PrivacyUI)); moduleManager.AddUIType(UIConst.RewardUI, typeof(RewardUI)); - moduleManager.AddUIType(UIConst.ChoosePropUI, typeof(ChoosePropUI)); - moduleManager.AddUIType(UIConst.BuyPropUI, typeof(BuyPropUI)); moduleManager.AddUIType(UIConst.GameResultUI, typeof(GameResultUI)); - moduleManager.AddUIType(UIConst.AddViewUI, typeof(AddViewUI)); moduleManager.AddUIType(UIConst.OpenGameUI, typeof(OpenGameUI)); moduleManager.AddUIType(UIConst.RewardboxUI, typeof(RewardboxUI)); moduleManager.AddUIType(UIConst.PayloadingUI, typeof(PayloadingUI)); - moduleManager.AddUIType(UIConst.WheelViewUI, typeof(WheelViewUI)); moduleManager.AddUIType(UIConst.BuygoldUI, typeof(BuygoldUI)); moduleManager.AddUIType(UIConst.GameMenuUI, typeof(GameMenuUI)); moduleManager.AddUIType(UIConst.PersonViewUI, typeof(PersonViewUI)); @@ -205,17 +177,13 @@ namespace ChillConnect moduleManager.AddUIType(UIConst.SaveingPotUI, typeof(SaveingPotUI)); moduleManager.AddUIType(UIConst.ResurgenceUI, typeof(ResurgenceUI)); moduleManager.AddUIType(UIConst.FirstRewardUI, typeof(FirstRewardUI)); - moduleManager.AddUIType(UIConst.ThreeDaysGiftUI, typeof(ThreeDaysGiftUI)); - moduleManager.AddUIType(UIConst.RewardMulNewUI, typeof(RewardMulNewUI)); moduleManager.AddUIType(UIConst.PassViewUI, typeof(PassViewUI)); moduleManager.AddUIType(UIConst.PassunlockUI, typeof(PassunlockUI)); moduleManager.AddUIType(UIConst.BroadcastUI, typeof(BroadcastUI)); moduleManager.AddUIType(UIConst.RecordViewUI, typeof(RecordViewUI)); moduleManager.AddUIType(UIConst.AdcomingUI, typeof(AdcomingUI)); moduleManager.AddUIType(UIConst.AddViewoffUI, typeof(AddViewoffUI)); - moduleManager.AddUIType(UIConst.PackrewardUI, typeof(PackrewardUI)); moduleManager.AddUIType(UIConst.GoldRewardUI, typeof(GoldRewardUI)); - moduleManager.AddUIType(UIConst.AddviewnewUI, typeof(AddviewnewUI)); moduleManager.AddUIType(UIConst.NewTaskUI, typeof(NewTaskUI)); moduleManager.AddUIType(UIConst.GetTaskRewardUI, typeof(GetTaskRewardUI)); moduleManager.AddUIType(UIConst.PettyAwardUI, typeof(PettyAwardUI)); diff --git a/Assets/Scripts/ModuleManager/UIConst.cs b/Assets/Scripts/ModuleManager/UIConst.cs index f63f125..debc008 100644 --- a/Assets/Scripts/ModuleManager/UIConst.cs +++ b/Assets/Scripts/ModuleManager/UIConst.cs @@ -12,44 +12,29 @@ namespace ChillConnect public const string OpenBgUI = "OpenBgUI"; public const string PrivacyUI = "PrivacyUI"; public const string RewardUI = "RewardUI"; - public const string ChoosePropUI = "ChoosePropUI"; public const string H5UI = "H5UI"; public const string RainPlayUI = "RainPlayUI"; public const string GameResultUI = "GameResultUI"; - public const string AddViewUI = "AddViewUI"; - public const string BuyPropUI = "BuyPropUI"; public const string OpenGameUI = "OpenGameUI"; public const string RewardboxUI = "RewardboxUI"; public const string PayloadingUI = "PayloadingUI"; - public const string HallUI = "HallUI"; - public const string WheelViewUI = "WheelViewUI"; public const string PassViewUI = "PassViewUI"; public const string PassunlockUI = "PassunlockUI"; - public const string PackrewardUI = "PackrewardUI"; public const string BuygoldUI = "BuygoldUI"; - public const string BuyConfirmUI = "BuyConfirmUI"; public const string GameMenuUI = "GameMenuUI"; - public const string EggViewUI = "EggViewUI"; public const string PersonViewUI = "PersonViewUI"; public const string TipsViewUI = "TipsViewUI"; public const string LevelRewardUI = "LevelRewardUI"; public const string SignInViewUI = "SignInViewUI"; - public const string ThreeDaysGiftUI = "ThreeDaysGiftUI"; public const string MakeupConfirmUI = "MakeupConfirmUI"; public const string SaveingPotUI = "SaveingPotUI"; public const string ResurgenceUI = "ResurgenceUI"; - public const string RewardMulNewUI = "RewardMulNewUI"; public const string FirstRewardUI = "FirstRewardUI"; public const string BroadcastUI = "BroadcastUI"; public const string RecordViewUI = "RecordViewUI"; public const string AdcomingUI = "AdcomingUI"; - public const string FAQUI = "FAQUI"; public const string AddViewoffUI = "AddViewoffUI"; - public const string RankUI = "RankUI"; - public const string RankRewardUI = "RankRewardUI"; - public const string RankRuleUI = "RankRuleUI"; public const string GoldRewardUI = "GoldRewardUI"; - public const string AddviewnewUI = "AddviewnewUI"; public const string GetTaskRewardUI = "GetTaskRewardUI"; public const string NewTaskUI = "NewTaskUI"; public const string PettyAwardUI = "PettyAwardUI"; diff --git a/Assets/Scripts/ModuleManager/UICtrlConst.cs b/Assets/Scripts/ModuleManager/UICtrlConst.cs index c873373..91322b6 100644 --- a/Assets/Scripts/ModuleManager/UICtrlConst.cs +++ b/Assets/Scripts/ModuleManager/UICtrlConst.cs @@ -6,7 +6,6 @@ namespace ChillConnect public const string LoadingUICtrl = "LoadingUICtrl"; public const string RewardAniUICtrl = "RewardAniUICtrl"; public const string FXWndUICtrl = "FXWndUICtrl"; - public const string BuyPropUICtrl = "BuyPropUICtrl"; public const string GameResultUICtrl = "GameResultUICtrl"; public const string MenuUICtrl = "MenuUICtrl"; public const string NetLoadingUICtrl = "NetLoadingUICtrl"; @@ -14,20 +13,13 @@ namespace ChillConnect public const string RewardUICtrl = "RewardUICtrl"; public const string H5UICtrl = "H5UICtrl"; - public const string RainPlayUICtrl = "RainPlayUICtrl"; - public const string ChoosePropUICtrl = "ChoosePropUICtrl"; public const string OpenBgUICtrl = "OpenBgUICtrl"; public const string PrivacyUICtrl = "PrivacyUICtrl"; - public const string AddViewUICtrl = "AddViewUICtrl"; public const string OpenGameUICtrl = "OpenGameUICtrl"; public const string RewardboxUICtrl = "RewardboxUICtrl"; public const string PayloadingUICtrl = "PayloadingUICtrl"; - public const string HallUICtrl = "HallUICtrl"; - public const string WheelViewUICtrl = "WheelViewUICtrl"; public const string BuygoldUICtrl = "BuygoldUICtrl"; - public const string BuyConfirmUICtrl = "BuyConfirmUICtrl"; public const string GameMenuUICtrl = "GameMenuUICtrl"; - public const string EggViewUICtrl = "EggViewUICtrl"; public const string PersonViewUICtrl = "PersonViewUICtrl"; public const string TipsViewUICtrl = "TipsViewUICtrl"; public const string LevelRewardUICtrl = "LevelRewardUICtrl"; @@ -35,22 +27,14 @@ namespace ChillConnect public const string MakeupConfirmUICtrl = "MakeupConfirmUICtrl"; public const string SaveingPotUICtrl = "SaveingPotUICtrl"; public const string ResurgenceUICtrl = "ResurgenceUICtrl"; - public const string RewardMulNewUICtrl = "RewardMulNewUICtrl"; public const string FirstRewardUICtrl = "FirstRewardUICtrl"; - public const string ThreeDaysGiftUICtrl = "ThreeDaysGiftUICtrl"; public const string PassViewUICtrl = "PassViewUICtrl"; public const string PassunlockUICtrl = "PassunlockUICtrl"; public const string BroadcastUICtrl = "BroadcastUICtrl"; public const string RecordViewUICtrl = "RecordViewUICtrl"; public const string AdcomingUICtrl = "AdcomingUICtrl"; - public const string FAQUICtrl = "FAQUICtrl"; public const string AddViewoffUICtrl = "AddViewoffUICtrl"; - public const string RankUICtrl = "RankUICtrl"; - public const string RankRewardUICtrl = "RankRewardUICtrl"; - public const string RankRuleUICtrl = "RankRuleUICtrl"; - public const string PackrewardUICtrl = "PackrewardUICtrl"; public const string GoldRewardUICtrl = "GoldRewardUICtrl"; - public const string AddviewnewUICtrl = "AddviewnewUICtrl"; public const string NewTaskUICtrl = "NewTaskUICtrl"; public const string GetTaskRewardUICtrl = "GetTaskRewardUICtrl"; public const string PettyAwardUICtrl = "PettyAwardUICtrl"; diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs b/Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs deleted file mode 100644 index 64b4cc4..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs +++ /dev/null @@ -1,42 +0,0 @@ -namespace ChillConnect -{ - public class AddViewCtrl : BaseCtrl - { - public static AddViewCtrl Instance { get; private set; } - - private AddViewModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.AddViewModel) as AddViewModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs.meta b/Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs.meta deleted file mode 100644 index 6fc7959..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b6058e09514454ec394a1478f2775964 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewModel.cs b/Assets/Scripts/ModuleUI/AddView/AddViewModel.cs deleted file mode 100644 index 51f2970..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewModel.cs +++ /dev/null @@ -1,43 +0,0 @@ -namespace ChillConnect -{ - public class AddViewModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - // protected override void OnReset() - // { - // } - // #endregion - - // #region 读取数据 - // protected override void OnReadData() - // { - // } - // #endregion - - // #region 本地存储 - // protected override void WriteLocalStorage() - // { - - // } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewModel.cs.meta b/Assets/Scripts/ModuleUI/AddView/AddViewModel.cs.meta deleted file mode 100644 index 8a180bb..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1b0a4fbab97e64d5b982896192bb6483 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs b/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs deleted file mode 100644 index 669d3ba..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs +++ /dev/null @@ -1,224 +0,0 @@ -using System; -using System.Collections.Generic; -using FairyGUI; -using FGUI.AddCell_12; -using FGUI.Common_01; -using IgnoreOPS; -using SGModule.Net; -using SGModule.NetKit; - -namespace ChillConnect -{ - public class AddViewUI : BaseUI - { - private AddViewUICtrl ctrl; - private AddViewModel model; - private com_addView ui; - public int ad_cool_down = 120; - public btn_watchAd btn_WatchAd; - - public AddViewUI(AddViewUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.AddViewUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "AddCell_12"; - uiInfo.assetName = "com_addView"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.AddViewModel) as AddViewModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - HallManager.Instance.UpdateSecondEvent -= updateWatchCD; - if (GameHelper.IsAdModelOfPay()) - { - AdRedeemManager.Instance.Destroy(); - } - if (need_open_turn) GameHelper.CallShowTurn(); - - } - private bool need_open_turn = false; - protected override void OnBind() - { - ui = baseUI as com_addView; - } - - protected override void OnOpenBefore(object args) - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneShow); - if (args != null) need_open_turn = (bool)args; - // ad_cool_down = ConfigSystem.GetConfig().exchangeCD; - // btn_WatchAd = ui.btn_watch as btn_watchAd; - if (!GameHelper.IsGiftSwitch()) - { - GameHelper.GetCommonModel().addspace=1; - } - if (GameHelper.IsAdModelOfPay()) - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_watch.GetChild("img_saveingpot").visible = true; - } - btn_watchAd btn = ui.btn_watch as btn_watchAd; - btn.buy_type.selectedIndex = 0; - AdRedeemManager.Instance.SetWatchAd(PurchasingManager.GetPaySku(PayType.buy_one), ui.btn_watch as btn_watchAd, SetTextString); - ui.pay_type.selectedIndex = 0; - - - AdRedeemManager.Instance.Start(); - SetTextString(); - } - else - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_max_pay.GetChild("img_saveingpot").visible = true; - } - ui.pay_type.selectedIndex = 1; - decimal price = (decimal)GameHelper.GetCommonModel().addspace2; - ui.btn_max_pay.title = GameHelper.getPrice(price); - ui.btn_max_pay.SetClick(() => - { - ApplePayClass maxPayData = new ApplePayClass - { - amount = (int)Math.Round(price * 100), - sku = PurchasingManager.GetPaySku(PayType.buy_one), - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - - } - #endregion - void pay_success(object str) - { - string type = (string)str; - - if (type == PurchasingManager.GetPaySku(PayType.buy_one)) - { - CtrlCloseUI(); - GameDispatcher.Instance.Dispatch(GameMsg.resurgence_close); - } - - - } - - //初始化页面逻辑 - private void InitView() - { - ui.btn_close.SetClick(() => - { - CtrlCloseUI(); - GameDispatcher.Instance.Dispatch(GameMsg.resurgence_close); - }); - - // HallManager.Instance.UpdateSecondEvent += updateWatchCD; - // updateWatchCD(); - - // checkBtnState(); - InitBroadCast(); - HallManager.Instance.UpdateSecondEvent += updateWatchCD; - updateWatchCD(); - if (GameHelper.IsGiftSwitch()) - { - ui.broad.visible = true; - } - } - - public void SetTextString() - { - var need = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.buy_one)); - var myAd = AdRedeemManager.Instance.GetLookRewardADNum(); - - ui.tips.SetVar("num", need.ToString()).FlushVars(); - ui.ads.SetVar("num", myAd.ToString()).FlushVars(); - ui.ads.SetVar("need", need.ToString()).FlushVars(); - } - void updateWatchCD() - { - broadtime++; - BroadCast(); - } - private int broadtime = 1; - private List config_name_list = ConfigSystem.GetConfig().config_name_list; - private List config_money_list = ConfigSystem.GetConfig().config_money_list; - private List broad_list = new List(); - private void BroadCast() - { - if (broadtime % 3 == 0) - { - (ui.broad as com_broadcast_new).t1.Play(() => - { - broad_list.RemoveAt(0); - int name_index = UnityEngine.Random.Range(0, config_name_list.Count); - int money_index = UnityEngine.Random.Range(0, config_money_list.Count); - broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] }); - for (int i = 0; i < 4; i++) - { - text_list[i].text = "Congratulations,User [color=#ad4800][size=36]" + broad_list[i][0] + "[/size][/color] !After purchasing the +1 Block Pack,play [color=#ad4800]" + broad_list[i][1] + "[/color] matcher to clear the level!"; - } - }); - - - } - - } - private List text_list = new List(); - private void InitBroadCast() - { - text_list.Add((ui.broad as com_broadcast_new).text_0); - text_list.Add((ui.broad as com_broadcast_new).text_1); - text_list.Add((ui.broad as com_broadcast_new).text_2); - text_list.Add((ui.broad as com_broadcast_new).text_3); - for (int i = 0; i < 4; i++) - { - - int name_index = UnityEngine.Random.Range(0, config_name_list.Count); - int money_index = UnityEngine.Random.Range(0, config_money_list.Count); - broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] }); - text_list[i].text = "Congratulations,User [color=#ad4800][size=36]" + broad_list[i][0] + "[/size][/color] !After purchasing the +1 Block Pack,play [color=#ad4800]" + broad_list[i][1] + "[/color] matcher to clear the level!"; - - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs.meta b/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs.meta deleted file mode 100644 index 03fe78f..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 40b42d370a2c34db89da3decb4b3ba0d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs b/Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs deleted file mode 100644 index 94cd5e5..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs +++ /dev/null @@ -1,71 +0,0 @@ -namespace ChillConnect -{ - public class AddViewUICtrl : BaseUICtrl - { - private AddViewUI ui; - private AddViewModel model; - - private uint openUIMsg = UICtrlMsg.BuyslotUI_Open; - private uint closeUIMsg = UICtrlMsg.BuyslotUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.AddViewModel) as AddViewModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new AddViewUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs.meta b/Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs.meta deleted file mode 100644 index 2049372..0000000 --- a/Assets/Scripts/ModuleUI/AddView/AddViewUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4c4feca1f3dc94e0291dbe534b773067 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs deleted file mode 100644 index f126b7d..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs +++ /dev/null @@ -1,25 +0,0 @@ - - -namespace ChillConnect -{ - public class AddviewnewCtrl : BaseCtrl - { - public static AddviewnewCtrl Instance { get; private set; } - - private AddviewnewModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.AddviewnewModel) as AddviewnewModel; - } - - protected override void OnDispose() - { - Instance = null; - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs.meta b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs.meta deleted file mode 100644 index f2035aa..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4cc0dc1a5313d412a83b8e39a7efb8fc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs deleted file mode 100644 index ea7ff5e..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs +++ /dev/null @@ -1,20 +0,0 @@ - - -namespace ChillConnect -{ - public class AddviewnewModel : BaseModel - { - #region 生命周期 - - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs.meta b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs.meta deleted file mode 100644 index 6c48439..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 046c52d08595a4040a001d8004b8875c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs deleted file mode 100644 index e21dc34..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs +++ /dev/null @@ -1,258 +0,0 @@ - -using FGUI.Common_01; -using UnityEngine; -using FairyGUI; -using IgnoreOPS; -using System; -using Spine.Unity; -using FGUI.AddCell_12; -using SGModule.Net; -using SGModule.NetKit; - -namespace ChillConnect -{ - public class AddviewnewUI : BaseUI - { - private AddviewnewUICtrl ctrl; - private AddviewnewModel model; - private FGUI.ZM_AddCell_12.com_addView_new ui; - private bool is_off = false; - - public AddviewnewUI(AddviewnewUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.AddviewnewUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "ZM_AddCell_12"; - uiInfo.assetName = "com_addView_new"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.AddviewnewModel) as AddviewnewModel; - } - private Action closeCallback; - protected override void OnClose() - { - GameHelper.showGameUI = true; - HallManager.Instance.UpdateSecondEvent -= updateWatchCD; - closeCallback?.Invoke(); - AdRedeemManager.Instance.Destroy(); - - } - - protected override void OnBind() - { - ui = baseUI as FGUI.ZM_AddCell_12.com_addView_new; - } - - protected override void OnOpenBefore(object args) - { - // if (ui.btn_watch is btn_watchAd watchAdBtn) - // { - // CommonTools.GetInstance.InitAdBtnAnim(watchAdBtn.icon_Parent); - // } - if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime()) is_off = true; - ui.text_out.text = "x" + GameHelper.GetItemNumber(0); - ui.text_back.text = "x" + GameHelper.GetItemNumber(1); - ui.text_refresh.text = "x" + GameHelper.GetItemNumber(2); - ui.text_level.text = "Level " + GameHelper.GetLevel(); - - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneNewShow); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyOneNewShow, 1); - - ui.btn_play.SetClick(() => - { - GameHelper.gameType = 0; - GameDispatcher.Instance.Dispatch(GameMsg.OpenGame); - CtrlCloseUI(); - }); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - (ui.btn_max_pay.GetChild("img_saveingpot") as GImage).visible = true; - } - - // (ui.btn_watch.GetChild("btn_text") as GTextField).scale = new Vector2(0.7f, 0.7f); - // (ui.btn_watch.GetChild("title1") as GTextField).scale = new Vector2(0.7f, 0.7f); - // ui.btn_watch.GetChild("img_saveingpot").x += 20; - // ui.btn_watch.GetChild("img_saveingpot").y -= 33; - // ad_cool_down = ConfigSystem.GetConfig().exchangeCD; - // btn_WatchAd = ui.btn_watch as btn_watchAd; - if (GameHelper.IsAdModelOfPay()) - { - if (is_off) - { - AdRedeemManager.Instance.SetWatchAd(PurchasingManager.GetPaySku(PayType.buy_one_off), ui.btn_watch as btn_watchAd, () => - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneNewClick); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyOneNewClick, 1); - SetTextString(); - }); - ui.pay_type.selectedIndex = 0; - AdRedeemManager.Instance.Start(); - } - else - { - AdRedeemManager.Instance.SetWatchAd(PurchasingManager.GetPaySku(PayType.buy_one), ui.btn_watch as btn_watchAd, () => - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneNewClick); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyOneNewClick, 1); - SetTextString(); - }); - ui.pay_type.selectedIndex = 0; - AdRedeemManager.Instance.Start(); - } - - SetTextString(); - } - else - { - ui.pay_type.selectedIndex = 1; - if (is_off) - { - decimal price = (decimal)GameHelper.GetCommonModel().AddDiscount2; - ui.btn_max_pay.title = GameHelper.getPrice(price); - ui.btn_max_pay.SetClick(() => - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneNewClick); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyOneNewClick, 1); - ApplePayClass maxPayData = new ApplePayClass - { - amount = (int)Math.Round(price * 100), - sku = PurchasingManager.GetPaySku(PayType.buy_one_off), - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - else - { - decimal price = (decimal)GameHelper.GetCommonModel().addspace2; - ui.btn_max_pay.title = GameHelper.getPrice(price); - ui.btn_max_pay.SetClick(() => - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneNewClick); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyOneNewClick, 1); - ApplePayClass maxPayData = new ApplePayClass() - { - amount = (int)Math.Round(price * 100), - sku = PurchasingManager.GetPaySku(PayType.buy_one), - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - - } - - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - GameDispatcher.Instance.AddListener(GameMsg.Sheep_item_refresh, SetItemNumber); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - GameDispatcher.Instance.RemoveListener(GameMsg.Sheep_item_refresh, SetItemNumber); - } - #endregion - void SetItemNumber(object a) - { - ui.text_out.text = "x" + GameHelper.GetItemNumber(0); - ui.text_back.text = "x" + GameHelper.GetItemNumber(1); - ui.text_refresh.text = "x" + GameHelper.GetItemNumber(2); - } - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.GetPaySku(PayType.buy_one) || type == PurchasingManager.GetPaySku(PayType.buy_one_off)) - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.BuyOneNewSuccess); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.BuyOneNewSuccess, 1); - SaveData.GetSaveObject().have_slot = true; - SaveData.saveDataFunc(); - GameDispatcher.Instance.Dispatch(GameMsg.Slot_refresh); - ui.pay_type.selectedIndex = 2; - SkeletonAnimation addeffect = FXManager.Instance.SetFx(ui.ani_parent1, Fx_Type.fx_addeffect, ref closeCallback); - addeffect.state.SetAnimation(0, "animation", true); - SkeletonAnimation addeffect1 = FXManager.Instance.SetFx(ui.ani_parent2, Fx_Type.fx_addeffect_1, ref closeCallback); - addeffect1.state.SetAnimation(0, "animation", true); - // CtrlCloseUI(); - } - - - } - - //初始化页面逻辑 - private void InitView() - { - - // var tAnimation = FXManager.Instance.SetFx(ui.tip_parent, Fx_Type.Fx_AddBoxTip, ref _closeCallback); - // tAnimation.state.AddAnimation(0, "animation", true, 0); - - ui.btn_close.SetClick(() => - { - GameDispatcher.Instance.Dispatch(GameMsg.OpenGame); - CtrlCloseUI(); - }); - - HallManager.Instance.UpdateSecondEvent += updateWatchCD; - ui.btn_addback.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 1); - }); - ui.btn_addout.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 0); - }); - ui.btn_addrefresh.SetClick(() => - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 2); - }); - // updateWatchCD(); - - // checkBtnState(); - } - void updateWatchCD() - { - - } - public void SetTextString() - { - int need = 0; - if (is_off) need = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.buy_one_off)); - else need = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.buy_one)); - var myAd = AdRedeemManager.Instance.GetLookRewardADNum(); - - // ui.tips.SetVar("num", need.ToString()).FlushVars(); - ui.ads.SetVar("num", myAd + "/").FlushVars(); - ui.ads.SetVar("need", need.ToString()).FlushVars(); - } - - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs.meta b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs.meta deleted file mode 100644 index 6715ee2..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3b62f3687397048a0a4365a156cc3eac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs deleted file mode 100644 index 4f15591..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs +++ /dev/null @@ -1,73 +0,0 @@ - - -namespace ChillConnect -{ - public class AddviewnewUICtrl : BaseUICtrl - { - private AddviewnewUI ui; - private AddviewnewModel model; - - private uint openUIMsg = UICtrlMsg.AddviewnewUI_Open; - private uint closeUIMsg = UICtrlMsg.AddviewnewUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.AddviewnewModel) as AddviewnewModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new AddviewnewUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs.meta b/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs.meta deleted file mode 100644 index 33fac00..0000000 --- a/Assets/Scripts/ModuleUI/Addviewnew/AddviewnewUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a375bc5ca46a34c92bc7dfa4c493c980 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/BuyProp.meta b/Assets/Scripts/ModuleUI/BuyProp.meta deleted file mode 100644 index b86b1ec..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b3a59974b3d5f6d49b4e54ed7605922c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs b/Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs deleted file mode 100644 index 3fb1493..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs +++ /dev/null @@ -1,42 +0,0 @@ -namespace ChillConnect -{ - public class BuyPropCtrl : BaseCtrl - { - public static BuyPropCtrl Instance { get; private set; } - - private BuyPropModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.BuyPropModel) as BuyPropModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs.meta b/Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs.meta deleted file mode 100644 index b035857..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 58e27508a01b144eab047fc0579e3520 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs b/Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs deleted file mode 100644 index eacaa1b..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs +++ /dev/null @@ -1,43 +0,0 @@ -namespace ChillConnect -{ - public class BuyPropModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - // protected override void OnReset() - // { - // } - // #endregion - - // #region 读取数据 - // protected override void OnReadData() - // { - // } - // #endregion - - // #region 本地存储 - // protected override void WriteLocalStorage() - // { - - // } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs.meta b/Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs.meta deleted file mode 100644 index f1e313a..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6f1d88ea5dfa34e1a927e5bef7f9c714 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs b/Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs deleted file mode 100644 index de13899..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs +++ /dev/null @@ -1,258 +0,0 @@ -using System; -using FGUI.Common_01; -using FGUI.Prop_09; -using FGUI.store_17; -using IgnoreOPS; -using UnityEngine; - -namespace ChillConnect -{ - public class BuyPropUI : BaseUI - { - private BuyPropUICtrl ctrl; - private BuyPropModel model; - private com_prop ui; - private int state_; - private int prop_num = 1; - - private int _price; - - public BuyPropUI(BuyPropUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.BuyPropUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "Prop_09"; - uiInfo.assetName = "com_prop"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = true; - uiInfo.isNeedCloseAnim = true; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.BuyPropModel) as BuyPropModel; - } - - protected override void OnClose() - { - GameHelper.showGameUI = true; - HallManager.Instance.UpdateSecondEvent -= UpdateCd; - - } - - protected override void OnBind() - { - ui = baseUI as com_prop; - } - - protected override void OnOpenBefore(object args) - { - - _price = ConfigSystem.GetConfig().Purchaseprops; - - - state_ = (int)args; - ui.prop.selectedIndex = state_; - - ui.btn_buy.SetClick(buyItem); - setBtnState(state_); - - InitView(); - setPropText(); - SetAddText(); - - ui.btn_add.state.selectedIndex = 0; - ui.btn_jian.state.selectedIndex = 1; - ui.btn_add.SetClick(AddProNum); - ui.btn_jian.SetClick(ReduceProNum); - - HallManager.Instance.UpdateSecondEvent += UpdateCd; - UpdateCd(); - - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) ui.img_saveingpot.visible = true; - - - ui.btn_watch.SetClick(() => - { - buyItem(); - }); - - } - void buyItem() - { - if (state_ == 0) - { - - } - else if (state_ == 1) - { - - - } - else if (state_ == 2) - { - - - } - - if (DataMgr.NewWatchCd.Value[state_ + 2] < Convert.ToInt32(GameHelper.GetNowTime())) - { - GameHelper.ShowVideoAd("reward_prop", isSuccess => - { - if (isSuccess) - { - GameHelper.SetWatchCd(state_ + 2); - int numbers = GameHelper.GetItemNumber(state_); - numbers++; - GameHelper.SetItemNumber(state_, numbers); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - GameHelper.ShowTips("The purchase was successful", true); - - CtrlCloseUI(); - } - }); - } - - - // int price = _price * prop_num; - // if (GameHelper.CheckGoldNumber(price)) - // { - // GameHelper.AddGoldNumber(-price); - // int numbers = GameHelper.GetItemNumber(state_); - // numbers += prop_num; - // GameHelper.SetItemNumber(state_, numbers); - // GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - // GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - // GameHelper.ShowTips("The purchase was successful", true); - // - // CtrlCloseUI(); - // - // } - // else - // { - // GameHelper.ShowTips("Not enough gold"); - // } - - - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - - private void UpdateCd() - { - btn_watchAd btnWatch = ui.btn_watch as btn_watchAd; - // Debug.Log($"DataMgr.NewWatchCd.Value[state_ + 2]==={DataMgr.NewWatchCd.Value[state_ + 2]}"); - if (DataMgr.NewWatchCd.Value[state_ + 2] > Convert.ToInt32(GameHelper.GetNowTime())) - { - btnWatch.enabled = false; - btnWatch.can_buy.selectedIndex = 1; - btnWatch.btn_text.text = CommonHelper.TimeFormat(DataMgr.NewWatchCd.Value[state_ + 2] - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - } - else - { - ui.btn_watch.enabled = true; - btnWatch.can_buy.selectedIndex = 0; - btnWatch.watch.text = "Watch AD"; - } - } - - private void AddProNum() - { - prop_num++; - SetAddText(); - setPropText(); - } - - private void SetAddText() - { - ui.text_add.text = prop_num.ToString(); - } - - private void ReduceProNum() - { - prop_num--; - if (prop_num <= 1) - { - prop_num = 1; - } - - setPropText(); - SetAddText(); - } - - private void setPropText() - { - ui.btn_buy.GetChild("text_gold").text = GameHelper.Get101Str( _price * prop_num); - } - - //初始化页面逻辑 - private void InitView() - { - ui.btn_back.SetClick(() => - { - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Close); - - }); - - // ui.btn_buy0.SetClick(() => - // { - // state_ = 0; - // ui.prop.selectedIndex = 0; - // setBtnState(0); - // }); - // ui.btn_buy1.SetClick(() => - // { - // state_ = 1; - - // ui.prop.selectedIndex = 1; - // setBtnState(1); - - // }); - // ui.btn_buy2.SetClick(() => - // { - // state_ = 2; - - // ui.prop.selectedIndex = 2; - // setBtnState(2); - - // }); - } - - private void setBtnState(int index) - { - // ui.btn_buy0.tab_choose.selectedIndex = index == 0 ? 1 : 0; - // ui.btn_buy1.tab_choose.selectedIndex = index == 1 ? 1 : 0; - // ui.btn_buy2.tab_choose.selectedIndex = index == 2 ? 1 : 0; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs.meta b/Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs.meta deleted file mode 100644 index d5adef5..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d07e071d35d5041feaf834faa7cac3a0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs b/Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs deleted file mode 100644 index d8139c4..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs +++ /dev/null @@ -1,71 +0,0 @@ -namespace ChillConnect -{ - public class BuyPropUICtrl : BaseUICtrl - { - private BuyPropUI ui; - private BuyPropModel model; - - private uint openUIMsg = UICtrlMsg.SheepwindowUI_Open; - private uint closeUIMsg = UICtrlMsg.SheepwindowUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.BuyPropModel) as BuyPropModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new BuyPropUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs.meta b/Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs.meta deleted file mode 100644 index 727520b..0000000 --- a/Assets/Scripts/ModuleUI/BuyProp/BuyPropUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b85f17625775040eb85b386d6c9c5c79 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ChooseProp.meta b/Assets/Scripts/ModuleUI/ChooseProp.meta deleted file mode 100644 index 6baed11..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cf8752ba62de0944699341c95ac0fdc8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs deleted file mode 100644 index 0710fed..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs +++ /dev/null @@ -1,42 +0,0 @@ -namespace ChillConnect -{ - public class ChoosePropCtrl : BaseCtrl - { - public static ChoosePropCtrl Instance { get; private set; } - - private ChoosePropModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.ChoosePropModel) as ChoosePropModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs.meta b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs.meta deleted file mode 100644 index 1030014..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 30f4147b6a9f34f8a98d5bbc0a788e6d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs deleted file mode 100644 index 5c557c9..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs +++ /dev/null @@ -1,43 +0,0 @@ -namespace ChillConnect -{ - public class ChoosePropModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - // protected override void OnReset() - // { - // } - // #endregion - - // #region 读取数据 - // protected override void OnReadData() - // { - // } - // #endregion - - // #region 本地存储 - // protected override void WriteLocalStorage() - // { - - // } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs.meta b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs.meta deleted file mode 100644 index 64fbd46..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 24f4458949b044bf5ad0e021638528e0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs deleted file mode 100644 index 5790ae2..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs +++ /dev/null @@ -1,206 +0,0 @@ -using FGUI.Prop_09; -using IgnoreOPS; -using UnityEngine; - -namespace ChillConnect -{ - public class ChoosePropUI : BaseUI - { - private ChoosePropUICtrl ctrl; - private ChoosePropModel model; - private com_choose ui; - - public ChoosePropUI(ChoosePropUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.ChoosePropUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "Prop_09"; - uiInfo.assetName = "com_choose"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.ChoosePropModel) as ChoosePropModel; - } - - protected override void OnClose() - { - } - - protected override void OnBind() - { - ui = baseUI as com_choose; - } - - protected override void OnOpenBefore(object args) - { - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - //初始化页面逻辑 - private void InitView() - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_ad.GetChild("img_saveingpot").visible = true; - } - // Debug.Log(GameHelper.GetLevelstate()); - int state = GameHelper.GetLevelstate(); - int need_gold = ConfigSystem.GetConfig().RevivalCoins; - ui.btn_gold_buy.GetChild("text_gold").text = GameHelper.Get101Str(need_gold); - - Debug.Log($"state===================:{state}"); - initProp(state); - - // ui.btn_thanks.SetClick(() => - // { - // float[] cash_array = GameHelper.GetRewardValue(2); - // var temp = new SuccessData(); - // temp.IsWin = false; - // temp.cash_number = cash_array[0]; - // temp.IsLevelSuccess = true; - // temp.IsH5Reward = false; - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Close); - - // }); - ui.btn_close.SetClick(() => - { - clsoeFunc(); - }); - - ui.btn_thanks.SetClick(() => - { - clsoeFunc(); - }); - - - } - - private static void clsoeFunc() - { - float[] cash_array = GameHelper.GetRewardValue(2); - var temp = new SuccessData(); - temp.IsWin = false; - temp.cash_number = cash_array[0]; - temp.IsLevelSuccess = true; - temp.IsH5Reward = false; - temp.boost_array = GameHelper.GetRewardBoost(2); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Close); - } - - private void initProp(int state) - { - int need_gold = ConfigSystem.GetConfig().RevivalCoins; - - if (state == 3) - { - ui.state.selectedIndex = ui._State_all_; - ui.btn_ad.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - // GameHelper.SetLevelstate(1); - GameHelper.SetLevelstate(0); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Close); - } - }); - - }); - ui.btn_gold_buy.SetClick(() => - { - if (GameHelper.CheckGoldNumber(need_gold)) - { - GameHelper.AddGoldNumber(-need_gold); - // GameHelper.SetLevelstate(2); - GameHelper.SetLevelstate(0); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Close); - } - else - { - GameHelper.ShowTips("Not enough gold"); - } - - }); - } - else if (state == 2) - { - ui.state.selectedIndex = ui._State_ad; - ui.btn_ad.SetClick(() => - { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameHelper.SetLevelstate(0); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Close); - } - }); - - }); - - } - else if (state == 1) - { - ui.state.selectedIndex = ui._State_gold; - ui.btn_gold_buy.SetClick(() => - { - if (GameHelper.CheckGoldNumber(need_gold)) - { - GameHelper.AddGoldNumber(-need_gold); - GameHelper.SetLevelstate(0); - GameDispatcher.Instance.Dispatch(GameMsg.Remake_state, true); - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChoosePropUI_Close); - } - else - { - GameHelper.ShowTips("Not enough gold"); - } - - }); - } - - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs.meta b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs.meta deleted file mode 100644 index 8f88452..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 05d11be9302224ba99cc14d10974266f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs deleted file mode 100644 index 0650482..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs +++ /dev/null @@ -1,71 +0,0 @@ -namespace ChillConnect -{ - public class ChoosePropUICtrl : BaseUICtrl - { - private ChoosePropUI ui; - private ChoosePropModel model; - - private uint openUIMsg = UICtrlMsg.ChoosePropUI_Open; - private uint closeUIMsg = UICtrlMsg.ChoosePropUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.ChoosePropModel) as ChoosePropModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new ChoosePropUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs.meta b/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs.meta deleted file mode 100644 index 8574a8e..0000000 --- a/Assets/Scripts/ModuleUI/ChooseProp/ChoosePropUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d012c092edd6c41a2bbbed3c72ca2bfe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/CurrencyReward.meta b/Assets/Scripts/ModuleUI/CurrencyReward.meta deleted file mode 100644 index 6584eac..0000000 --- a/Assets/Scripts/ModuleUI/CurrencyReward.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b05bab87ee5860d45b1e0e643cda6b64 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Packreward.meta b/Assets/Scripts/ModuleUI/Packreward.meta deleted file mode 100644 index 3a0882a..0000000 --- a/Assets/Scripts/ModuleUI/Packreward.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 068c2a0f8e2744509a0ec2ed3b6126b3 -timeCreated: 1749106141 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs b/Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs deleted file mode 100644 index 7434e64..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -namespace ChillConnect -{ - public class PackrewardCtrl : BaseCtrl - { - public static PackrewardCtrl Instance { get; private set; } - - private PackrewardModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - //model = ModuleManager.Instance..GetModel(ModelConst.PackrewardModel) as PackrewardModel; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs.meta b/Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs.meta deleted file mode 100644 index 5b19ed6..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6716776f97890437d8a618c997ea689d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs b/Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs deleted file mode 100644 index 2253a74..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections; -using System.Collections.Generic; - -namespace ChillConnect -{ - public class PackrewardModel : BaseModel - { - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs.meta b/Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs.meta deleted file mode 100644 index 921ec51..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8f3f1bbd4dedd499bb4917a0a83b8d09 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs b/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs deleted file mode 100644 index 7183b8a..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs +++ /dev/null @@ -1,504 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using FutureCore; -using FairyGUI; -using FGUI.Pack_16; -using DG.Tweening; -using FGUI.Common_01; -using System; -using IgnoreOPS; -using SGModule.Net; -using IgnoreOPS; -using SGModule.NetKit; -using Unity.VisualScripting; - -namespace ChillConnect -{ - public class PackrewardUI : BaseUI - { - private PackrewardUICtrl ctrl; - private PackrewardModel model; - private FGUI.Pack_16.com_packaward ui; - private List list; - - public PackrewardUI(PackrewardUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.PackrewardUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "Pack_16"; - uiInfo.assetName = "com_packaward"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PackrewardModel) as PackrewardModel; - } - - private bool isAutoPop = false; - - protected override void OnClose() - { - AdRedeemManager.Instance.Destroy(); - GameHelper.showGameUI = true; - // WebviewManager.Instance.SetDarkThough(true); - GameDispatcher.Instance.Dispatch(GameMsg.pack_close); - HallManager.Instance.UpdateEvent -= InitView; - int three_gift_got_index = SaveData.GetSaveObject().three_gift_got_index; - if (isAutoPop && (three_gift_got_index <= (int)rewardState.day3)) - { - // uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open); - } - GameHelper.CallShowTurn(); - } - - protected override void OnBind() - { - ui = baseUI as FGUI.Pack_16.com_packaward; - } - - protected override void OnOpenBefore(object args) - { - if (Screen.safeArea.y != 0) - { - //刘海屏 - ui.gold.y += Screen.safeArea.y; - } - if (!GameHelper.IsGiftSwitch()) - { - ConfigSystem.GetConfig().DataList[0].Paid_price = 1; - ConfigSystem.GetConfig().DataList[1].Paid_price = 1; - } - - ui.panel_parent.panel.gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0; - - bool need_scroll = false; - - PackRewardData Datas = args as PackRewardData; - if (args != null) - { - Datas = args as PackRewardData; - need_scroll = Datas.isNeedScroll; - isAutoPop = Datas.isAutoPop; - } - - if (need_scroll) ui.panel_parent.scrollPane.ScrollDown(300, false); - if (need_scroll) - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.RemoveAdShow); - } - else - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(), Property.FirstPackShow); - } - - ui.gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber()); - - - list = ConfigSystem.GetConfig().DataList; - if (!GameHelper.IsGiftSwitch()) - { - list[0].Paid_price = 1; - list[1].Paid_price = 1; - } - - if (GameHelper.IsAdModelOfPay()) - { - // if (!GameHelper.IsGiftSwitch()) - // { - // if (SaveData.GetSaveObject().is_get_packreward) - // { - - // } - // ui.panel_parent.panel.btn_buypack.SetClick(() => - // { - // GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, PurchasingManager.GetPaySku(PayType.pack_reward)); - // InitView(); - // }); - // ui.panel_parent.panel.btn_buyremovead.SetClick(() => - // { - // GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, PurchasingManager.GetPaySku(PayType.remove_ad)); - // InitView(); - // }); - // } - // else - // { - // AdRedeemManager.Instance.SetWatchAd(PurchasingManager.GetPaySku(PayType.pack_reward), - // ui.panel_parent.panel.btn_buypack as btn_watchAd, SetTextString1); - // AdRedeemManager.Instance.SetWatchAd(PurchasingManager.GetPaySku(PayType.remove_ad), - // ui.panel_parent.panel.btn_buyremovead as btn_watchAd, SetTextString1); - // } - } - HallManager.Instance.UpdateEvent += InitView; - InitView(); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - - #endregion - - #region 消息 - - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - } - - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - } - - #endregion - - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.GetPaySku(PayType.remove_ad)) - { - var gold = list[1].coins_quantity; - var start = GameHelper.GetUICenterPosition(ui.panel_parent.panel.text_goldnum2); - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("icon")); - - var rewardData = new RewardData(); - var rewardSingleData = new RewardSingleData(101, gold, RewardOrigin.AdTask) - { - startPosition = start, - endPosition = end, - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted((isScu) => - { - DOVirtual.DelayedCall(0.5f, () => - { - var startNum = DataMgr.Coin.Value - gold; - DOVirtual.Float((float)startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); }); - }); - }); - - GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - - - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Close); - SaveData.GetSaveObject().is_get_removead = true; - InitView(); - } - else if (type == PurchasingManager.GetPaySku(PayType.pack_reward)) - { - var start = GameHelper.GetUICenterPosition(ui.panel_parent.panel.text_goldnum); - var end = GameHelper.GetUICenterPosition(ui.gold.GetChild("icon")); - var gold = list[0].coins_quantity; - - var rewardData = new RewardData(); - var rewardSingleData = new RewardSingleData(101, gold, RewardOrigin.AdTask) - { - startPosition = start, - endPosition = new Vector2(end.x - 100, end.y - 180) - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted((isScu) => - { - DOVirtual.DelayedCall(0.5f, () => - { - var startNum = DataMgr.Coin.Value - gold; - DOVirtual.Float((float)startNum, (float)GameHelper.GetGoldNumber(), 1f, - value => { ui.gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); }); - }); - }); - - GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - - - SaveData.GetSaveObject().is_get_packreward = true; - Debug.Log(SaveData.GetSaveObject().is_get_packreward + "////////////////////////"); - InitView(); - } - } - - //初始化页面逻辑 - private int gold_num = 300; - private int back_num = 1; - private int out_num = 1; - private int refresh_num = 1; - - private void InitView() - { - if (!GameHelper.IsGiftSwitch()) - { - ConfigSystem.GetConfig().DataList[0].Paid_price = 1; - ConfigSystem.GetConfig().DataList[1].Paid_price = 1; - list= ConfigSystem.GetConfig().DataList; - } - - gold_num = list[0].coins_quantity; - back_num = list[0].props_quantity[1]; - out_num = list[0].props_quantity[0]; - refresh_num = list[0].props_quantity[2]; - - ui.panel_parent.panel.btn_close0.SetClick(CtrlCloseUI); - ui.panel_parent.panel.btn_close1.SetClick(CtrlCloseUI); - ui.panel_parent.panel.text_goldnum.text = "x" + GameHelper.Get101Str(gold_num); - ui.panel_parent.panel.text_backnum1.text = "x" + back_num; - ui.panel_parent.panel.text_outnum.text = "x" + out_num; - ui.panel_parent.panel.text_refreshnum.text = "x" + refresh_num; - var buy_text = ui.panel_parent.panel.btn_buypack.GetChild("title") as GTextField; - buy_text.SetVar("price", list[0].Paid_price.ToString()).FlushVars(); - - ui.panel_parent.panel.text_goldnum2.text = "x" + GameHelper.Get101Str(list[1].coins_quantity); - var buy_text1 = ui.panel_parent.panel.btn_buyremovead.GetChild("title") as GTextField; - buy_text1.SetVar("price", list[1].Paid_price.ToString()).FlushVars(); - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.panel_parent.panel.btn_max_pack.GetChild("img_saveingpot") as GImage).visible = true; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) (ui.panel_parent.panel.btn_max_remove.GetChild("img_saveingpot") as GImage).visible = true; - if (!GameHelper.IsAdModelOfPay()) - { - ui.panel_parent.panel.pay_type.selectedIndex = 1; - decimal price_pack = (decimal)list[0].Paid_price2; - ui.panel_parent.panel.btn_max_pack.title = GameHelper.getPrice(price_pack); - bool is_get = SaveData.GetSaveObject().is_get_packreward; - if (is_get) - { - ui.panel_parent.panel.btn_max_pack.enabled = false; - ui.panel_parent.panel.btn_max_pack.SetClick(() => { }); - } - else - { - ui.panel_parent.panel.btn_max_pack.SetClick(() => - { - ApplePayClass maxPayData = new ApplePayClass - { - amount = (int)Math.Round(price_pack * 100), - sku = PurchasingManager.GetPaySku(PayType.pack_reward), - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - - decimal price_remove = (decimal)list[1].Paid_price2; - ui.panel_parent.panel.btn_max_remove.title = GameHelper.getPrice(price_remove); - bool is_get1 = SaveData.GetSaveObject().is_get_removead; - if (is_get1) - { - ui.panel_parent.panel.btn_max_remove.enabled = false; - ui.panel_parent.panel.btn_max_remove.SetClick(() => { }); - } - else - { - string sku = PurchasingManager.GetPaySku(PayType.pack_reward); - // if (GameHelper.IsGiftSwitch()) - // { - // sku = PurchasingManager.GetPaySku(PayType.pack_reward); - // } - // else - // { - sku = PurchasingManager.GetPaySku(PayType.remove_ad); - //} - - ui.panel_parent.panel.btn_max_remove.SetClick(() => - { - ApplePayClass maxPayData = new ApplePayClass - { - amount = (int)Math.Round(price_remove * 100), - sku = sku, - type = PurchasingManager.GetPaySku(PayType.remove_ad), - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - } - else - { - ui.panel_parent.panel.pay_type.selectedIndex = 0; - AdRedeemManager.Instance.Start(); - SetTextString1(); - } - ui.panel_parent.panel.btn_max_remove.grayed = false; - - if (GameHelper.IsAdModelOfPay()) - { - - if (SaveData.GetSaveObject().is_get_packreward) - { - (ui.panel_parent.panel.btn_buypack as btn_watchAd).buy_state.selectedIndex = 1; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).title = "Received"; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).enabled = false; - } - else - { - // Debug.Log(AdRedeemManager.Instance.GetLookRewardADNum()); - // Debug.Log(ConfigSystem.GetConfig().DataList[0].Paid_price); - if (AdRedeemManager.Instance.GetLookRewardADNum() >= ConfigSystem.GetConfig().DataList[0].Paid_price) - { - (ui.panel_parent.panel.btn_buypack as btn_watchAd).enabled = true; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).buy_state.selectedIndex = 1; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).title = "Receive"; - ui.panel_parent.panel.btn_buypack.SetClick(() => - { - AdRedeemData adRedeemData = new AdRedeemData - { - type = PurchasingManager.GetPaySku(PayType.pack_reward), - ad_count = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.pack_reward)) - }; - AdRedeemManager.Instance.Redeem(adRedeemData); - }); - } - else if (SaveData.GetSaveObject()._watch_ad_cd > GameHelper.GetNowTime()) - { - (ui.panel_parent.panel.btn_buypack as btn_watchAd).enabled = false; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).buy_state.selectedIndex = 0; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).can_buy.selectedIndex = 1; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).btn_text.text = CommonHelper.TimeFormat((int)SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - } - else - { - (ui.panel_parent.panel.btn_buypack as btn_watchAd).enabled = true; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).buy_state.selectedIndex = 0; - (ui.panel_parent.panel.btn_buypack as btn_watchAd).can_buy.selectedIndex = 0; - ui.panel_parent.panel.btn_buypack.SetClick(() => - { - GameHelper.ShowVideoAd("buy_add_one", isSuccess => - { - if (isSuccess) - { - var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - SaveData.GetSaveObject()._watch_ad_cd = ad_times + ConfigSystem.GetConfig().exchangeCD; - InitView(); - } - }); - // AdRedeemManager.Instance.SendEventClickByName(PurchasingManager.GetPaySku(PayType.pack_reward), "click"); - // AdRedeemManager.Instance.ShowVideoAd("buy_add_one", () => - // { - // TimerHelper.mEasy.AddTimer(0.1f, () => - // { - // var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - // SaveData.GetSaveObject()._watch_ad_cd = ad_times + ConfigSystem.GetConfig().exchangeCD; - // InitView(); - // }); - // }); - }); - } - - } - - if (SaveData.GetSaveObject().is_get_removead && GameHelper.GetNowTime() < SaveData.GetSaveObject().remove_ad_time) - { - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).buy_state.selectedIndex = 0; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).can_buy.selectedIndex = 1; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).btn_text.text = CommonHelper.TimeFormat(SaveData.GetSaveObject().remove_ad_time - (int)GameHelper.GetNowTime(), CountDownType.Hour); - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).enabled = false; - } - else - { - - if (AdRedeemManager.Instance.GetLookRewardADNum() >= ConfigSystem.GetConfig().DataList[1].Paid_price) - { - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).enabled = true; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).buy_state.selectedIndex = 1; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).title = "Receive"; - ui.panel_parent.panel.btn_buyremovead.SetClick(() => - { - AdRedeemData adRedeemData = new AdRedeemData - { - type = PurchasingManager.GetPaySku(PayType.remove_ad), - ad_count = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.remove_ad)) - }; - AdRedeemManager.Instance.Redeem(adRedeemData); - }); - } - else if (SaveData.GetSaveObject()._watch_ad_cd > GameHelper.GetNowTime()) - { - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).enabled = false; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).buy_state.selectedIndex = 0; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).can_buy.selectedIndex = 1; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).btn_text.text = CommonHelper.TimeFormat((int)SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - } - else - { - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).enabled = true; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).buy_state.selectedIndex = 0; - (ui.panel_parent.panel.btn_buyremovead as btn_watchAd).can_buy.selectedIndex = 0; - ui.panel_parent.panel.btn_buyremovead.SetClick(() => - { - GameHelper.ShowVideoAd("buy_add_one", isSuccess => - { - if (isSuccess) - { - var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - SaveData.GetSaveObject()._watch_ad_cd = ad_times + ConfigSystem.GetConfig().exchangeCD; - InitView(); - } - }); - // AdRedeemManager.Instance.ShowVideoAd("buy_add_one", () => - // { - // TimerHelper.mEasy.AddTimer(0.1f, () => - // { - // var ad_times = Convert.ToInt32(GameHelper.GetNowTime()); - // SaveData.GetSaveObject()._watch_ad_cd = ad_times + ConfigSystem.GetConfig().exchangeCD; - // InitView(); - // }); - // }); - }); - } - } - - - } - else - { - if (SaveData.GetSaveObject().remove_ad_time > GameHelper.GetNowTime()) - { - // (item.btn_max_remove as btn_yellow).can_buy.selectedIndex = 1; - ui.panel_parent.panel.btn_max_remove.grayed = true; - ui.panel_parent.panel.btn_max_remove.title = CommonHelper.TimeFormat((int)SaveData.GetSaveObject().remove_ad_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - } - - } - - ui.panel_parent.panel.text_removetime.text = "Valid for " + GameHelper.GetCommonModel().RemoveADsPackDuration + " hours"; - - } - - public void SetTextString1() - { - var remove_need = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.remove_ad)); - var pack_need = AdRedeemManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.pack_reward)); - var myAd = AdRedeemManager.Instance.GetLookRewardADNum(); - - ui.panel_parent.panel.ads.SetVar("num", myAd.ToString()).FlushVars(); - ui.panel_parent.panel.ads1.SetVar("num", myAd.ToString()).FlushVars(); - ui.panel_parent.panel.tips1.SetVar("num", pack_need.ToString()).FlushVars(); - ui.panel_parent.panel.tips2.SetVar("num", remove_need.ToString()).FlushVars(); - } - } - - - public class PackRewardData - { - public bool isAutoPop; - public bool isNeedScroll; - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs.meta b/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs.meta deleted file mode 100644 index d508d02..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2e683256807814283b0ddd73c92ca520 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs b/Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs deleted file mode 100644 index f420a58..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -namespace ChillConnect -{ - public class PackrewardUICtrl : BaseUICtrl - { - private PackrewardUI ui; - private PackrewardModel model; - - private uint openUIMsg = UICtrlMsg.PackrewardUI_Open; - private uint closeUIMsg = UICtrlMsg.PackrewardUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.PackrewardModel) as PackrewardModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new PackrewardUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs.meta b/Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs.meta deleted file mode 100644 index 2abdc43..0000000 --- a/Assets/Scripts/ModuleUI/Packreward/PackrewardUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 485f5d5cee496478b8c94d2649adcb49 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/RewardMulNew.meta b/Assets/Scripts/ModuleUI/RewardMulNew.meta deleted file mode 100644 index 73efe13..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a12350834579110408a9ff5a7f970c5e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs deleted file mode 100644 index 49c0d9a..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace ChillConnect -{ - public class RewardMulNewCtrl : BaseCtrl - { - public static RewardMulNewCtrl Instance { get; private set; } - - private RewardMulNewModel model; - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta deleted file mode 100644 index 73199e3..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ad6b6ad714766497bab936fd94a74d9e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs deleted file mode 100644 index 4c0e4e0..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace ChillConnect -{ - public class RewardMulNewModel : BaseModel - { - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta deleted file mode 100644 index 2f9079d..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: de45ca22a6e504abca9a1fc7b66af5f1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs deleted file mode 100644 index 3a0fef9..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs +++ /dev/null @@ -1,204 +0,0 @@ -using System; -using DG.Tweening; -using FairyGUI; -using FGUI.bkg_reward_new; -using IgnoreOPS; -using UnityEngine; - -namespace ChillConnect -{ - public class RewardMulNewUI : BaseUI - { - private RewardMulNewUICtrl ctrl; - private RewardMulNewModel model; - private com_reward_mul ui; - private Action closeCallback; - private GiftData rewardInfo; - bool hasCoin; - decimal m_coinReward; - public RewardMulNewUI(RewardMulNewUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.RewardMulNewUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "bkg_reward_new"; - uiInfo.assetName = "com_reward_mul"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - - protected override void OnInit() - { - - } - - protected override void OnClose() - { - - } - - protected override void OnBind() - { - ui = baseUI as com_reward_mul; - - } - - protected override void OnOpenBefore(object args) - { - rewardInfo = (GiftData)args; - InitView(); - } - - protected override void OnOpen(object args) - { - - } - - - - private void InitView() - { - // AudioManager.Instance.PlayDynamicEffect(AudioConst.reward_show); - ui.node_coin.visible = false; - ui.node_undo.visible = false; - ui.node_move_out.visible = false; - ui.node_refresh.visible = false; - ui.add_undo.visible = false; - ui.add_move_out.visible = false; - ui.add_refresh.visible = false; - - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) { - (ui.btn_mul.GetChild("img_saveingpot") as GImage).visible = true; - } else { - (ui.btn_mul.GetChild("img_saveingpot") as GImage).visible = false; - } - - - for (int i = 0; i < rewardInfo.type.Count; i++) { - if (rewardInfo.type[i] == (int)GiftType.coin) { - hasCoin = true; - ui.node_coin.visible = true; - ui.node_coin.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } else if (rewardInfo.type[i] == (int)GiftType.undo) { - ui.node_undo.visible = true; - ui.node_undo.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - ui.add_undo.visible = true; - ui.add_undo.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } else if (rewardInfo.type[i] == (int)GiftType.move_out) { - ui.node_move_out.visible = true; - ui.node_move_out.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - ui.add_move_out.visible = true; - ui.add_move_out.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } else if (rewardInfo.type[i] == (int)GiftType.refresh) { - ui.node_refresh.visible = true; - ui.node_refresh.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - ui.add_refresh.visible = true; - ui.add_refresh.GetChild("lab_num").text = "x" + rewardInfo.reward[i]; - } - } - - ui.btn_mul.SetClick(() => { - GameHelper.ShowVideoAd("reward_lobby", isSuccess => - { - if (isSuccess) - { - GameHelper.ShowTips("Successfully claimed"); - - getReward(2); - playCoinAni(); - - ui.ani_group.visible = true; - ui.t0.Play(() => { - ui.ani_group.visible = false; - }); - } - }); - }); - - ui.btn_claim.SetClick(() => - { - ui.btn_claim.SetClick(() => { }); - ui.btn_mul.SetClick(() => { }); - getReward(); - playCoinAni(); - DOVirtual.DelayedCall(2f, () => - { - GameHelper.addInterAdnumber(); - }); - - ui.ani_group.visible = true; - ui.t0.Play(() => { - ui.ani_group.visible = false; - }); - }); - } - - private void getReward(int rate = 1) { - for (int i = 0; i < rewardInfo.type.Count; i++) { - if (rewardInfo.type[i] == (int)GiftType.coin || rewardInfo.type[i] == 101) { - m_coinReward = rewardInfo.reward[i] * rate; - } else if (rewardInfo.type[i] == (int)GiftType.undo) { - int num = GameHelper.GetItemNumber(1) + rewardInfo.reward[i] * rate; - GameHelper.SetItemNumber(1, num); - ui.add_undo.GetChild("lab_num").text = "x" + rewardInfo.reward[i] * rate; - } else if (rewardInfo.type[i] == (int)GiftType.move_out) { - int num = GameHelper.GetItemNumber(0) + rewardInfo.reward[i] * rate; - GameHelper.SetItemNumber(0, num); - ui.add_move_out.GetChild("lab_num").text = "x" + rewardInfo.reward[i] * rate; - } else if (rewardInfo.type[i] == (int)GiftType.refresh) { - int num = GameHelper.GetItemNumber(2) + rewardInfo.reward[i] * rate; - GameHelper.SetItemNumber(2, num); - ui.add_refresh.GetChild("lab_num").text = "x" + rewardInfo.reward[i] * rate; - } - } - } - - private bool isget; - private void playCoinAni() - { - if (!hasCoin) { - GameDispatcher.Instance.Dispatch(GameMsg.rewardMul_close); - CtrlCloseUI(); - return; - } - - if(isget) return; - isget=true; - var rewardData = new RewardData(); - - int curr_type = 101; - Vector2 end_ = GameHelper.GetUICenterPosition(ui.node_end, true); - - - var rewardSingleData = new RewardSingleData(curr_type, m_coinReward, RewardOrigin.Play) - { - startPosition = GameHelper.GetUICenterPosition(ui.btn_mul, true), - endPosition = new Vector2(end_.x + 30, end_.y + 30), - }; - - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - rewardData.AddCompleted(success => - { - if (success) - { - DOVirtual.DelayedCall(0.7f, () => - { - GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); - GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh); - GameDispatcher.Instance.Dispatch(GameMsg.rewardMul_close); - CtrlCloseUI(); - }); - } - }); - - GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta deleted file mode 100644 index 5fbbd21..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4490553e4e1f94f1bba8ad923fbb61c0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs deleted file mode 100644 index 09c98e3..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs +++ /dev/null @@ -1,72 +0,0 @@ -namespace ChillConnect - -{ - public class RewardMulNewUICtrl : BaseUICtrl - { - private RewardMulNewUI ui; - private RewardMulNewModel model; - - private uint openUIMsg = UICtrlMsg.RewardMulNewUI_Open; - private uint closeUIMsg = UICtrlMsg.RewardMulNewUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.RewardMulNewModel) as RewardMulNewModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new RewardMulNewUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs.meta b/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs.meta deleted file mode 100644 index 9ada3eb..0000000 --- a/Assets/Scripts/ModuleUI/RewardMulNew/RewardMulNewUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c90cdcc991c64c09a5c46a37c7ea15d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift.meta b/Assets/Scripts/ModuleUI/ThreeDaysGift.meta deleted file mode 100644 index f98d1ca..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 35b8dbeae63cb7345a045f2a648b022e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs deleted file mode 100644 index e6f4ce4..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace ChillConnect -{ - public class ThreeDaysGiftCtrl : BaseCtrl - { - public static ThreeDaysGiftCtrl Instance { get; private set; } - - private ThreeDaysGiftModel model; - - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta deleted file mode 100644 index 71f2b9a..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2c26aef375ac148dc9b4bd8090279823 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs deleted file mode 100644 index 050134e..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace ChillConnect -{ - public class ThreeDaysGiftModel : BaseModel - { - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta deleted file mode 100644 index aac17a8..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c2702ca6f5c254a3cbaffdc3c9a51550 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs deleted file mode 100644 index 2fd522a..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs +++ /dev/null @@ -1,514 +0,0 @@ -using System; -using System.Collections.Generic; -using DG.Tweening; -using FairyGUI; -using FGUI.Common_01; -using FGUI.threeDaysGift; -using IgnoreOPS; -using SGModule.Net; -using SGModule.NetKit; -using Spine.Unity; -using UnityEngine; - -namespace ChillConnect -{ - public class ThreeDaysGiftUI : BaseUI - { - private ThreeDaysGiftUICtrl ctrl; - private ThreeDaysGiftModel model; - private com_three_days ui; - - public ThreeDaysGiftUI(ThreeDaysGiftUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.ThreeDaysGiftUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "threeDaysGift"; - uiInfo.assetName = "com_three_days"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = false; - uiInfo.isNeedCloseAnim = false; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - - } - - protected override void OnClose() - { - HallManager.Instance.UpdateSecondEvent -= InitView; - GameHelper.showGameUI = true; - GameDispatcher.Instance.Dispatch(GameMsg.pack_close); - GameHelper.CallShowTurn(); - } - - protected override void OnBind() - { - ui = baseUI as com_three_days; - } - private Action closeCallback; - protected override void OnOpenBefore(object args) - { - - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_pay_event, BuriedPointEvent.three_days_gift_show, 1); - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.ThreeDaysGiftShow); - list = ConfigSystem.GetConfig().DataList; - - ui.btn_close.SetClick(() => - { - GameDispatcher.Instance.Dispatch(GameMsg.ThreeDaysGiftUIClose); - CtrlCloseUI(); - }); - - ui.groups.visible = false; - - var ske_bg = FXManager.Instance.SetFx(ui.ani_bg, Fx_Type.fx_three_gift, ref closeCallback); - ske_bg.state.SetAnimation(0, "3_days", false); - ske_bg.state.Complete += a => - { - ske_bg.state.SetAnimation(0, "3_days_dj", false); - }; - - DOVirtual.DelayedCall(0.7f, () => - { - ui.groups.visible = true; - }); - - // var ske_btn = FXManager.Instance.SetFx(ui.ani_title, Fx_Type.fx_title_effect, ref closeCallback); - // ske_btn.state.SetAnimation(0, "animation", true); - InitBroadCast(); - InitView(); - HallManager.Instance.UpdateSecondEvent += InitView; - if (Screen.safeArea.y != 0) - { - ui.broadcast_top.y += 68; - } - if (GameHelper.IsGiftSwitch()) - { - ui.broadcast_top.visible = true; - } - // WebviewManager.Instance.SetDarkThough(false); - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - GameDispatcher.Instance.AddListener(GameMsg.apple_pay_success, pay_success); - GameDispatcher.Instance.AddListener(GameMsg.rewardMul_close, rewardMul_close); - } - protected override void RemoveListener() - { - GameDispatcher.Instance.RemoveListener(GameMsg.apple_pay_success, pay_success); - GameDispatcher.Instance.RemoveListener(GameMsg.rewardMul_close, rewardMul_close); - } - #endregion - void pay_success(object str) - { - string type = (string)str; - if (type == PurchasingManager.GetPaySku(PayType.three_days_gift)) - { - - // var start = Vector2.zero; - // if (SaveData.GetSaveObject().three_gift_got_index == (int)rewardState.day1) { - // start = GameHelper.GetUICenterPosition(ui.day1.item1.lab_num); - // } else if (SaveData.GetSaveObject().three_gift_got_index == (int)rewardState.day2) { - // start = GameHelper.GetUICenterPosition(ui.day2.item1.lab_num); - // } else if (SaveData.GetSaveObject().three_gift_got_index == (int)rewardState.day3) { - // start = GameHelper.GetUICenterPosition(ui.day3.item1.lab_num); - // } - // - // var rewardData = new RewardData(); - // var end = GameHelper.GetUICenterPosition(ui.node_end); - // - // var rewardSingleData = new RewardSingleData(101, list[1].coins_quantity, RewardOrigin.AdTask) - // { - // startPosition = start, - // endPosition = end - // }; - // - // rewardData.AddReward(rewardSingleData); - // rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; - // rewardData.AddCompleted(success => - // { - // // if (success) - // // { - // // RefreshGold(awardNum); - // // } - // }); - // - // GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - // // DataMgr.Coin.Value -= list[1].coins_quantity; - // - // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Close); - // SaveData.GetSaveObject().is_get_removead = true; - // InitView(); - - ui.pay_type.selectedIndex = 2; - } - // GameDispatcher.Instance.Dispatch(GameMsg.noads_refresh); - - } - - void rewardMul_close(object str) - { - if (SaveData.GetSaveObject().three_gift_got_index == (int)rewardState.day1) - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.ThreeDays1GiftSuccess); - // NetworkKit.BuriedPoint(BuriedPointEvent.Three_days_gift_event, BuriedPointEvent.three_day1_success, 1); - } - else if (SaveData.GetSaveObject().three_gift_got_index == (int)rewardState.day2) - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.ThreeDays2GiftSuccess); - // NetworkKit.BuriedPoint(BuriedPointEvent.Three_days_gift_event, BuriedPointEvent.three_day2_success, 1); - } - else if (SaveData.GetSaveObject().three_gift_got_index == (int)rewardState.day3) - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.ThreeDays3GiftSuccess); - // NetworkKit.BuriedPoint(BuriedPointEvent.Three_days_gift_event, BuriedPointEvent.three_day3_success, 1); - } - - SaveData.GetSaveObject().three_gift_got_index++; - SaveData.GetSaveObject().last_got_three_gift_time = GameHelper.GetNowTime(); - - } - - private List list; - - - private void InitView() - { - int myAdNum = AdRedeemManager.Instance.GetLookRewardADNum(); - ui.text_have.text = "Owner ADs:" + myAdNum; - ui.need_text.text = "need " + list[0].Paid_price + " ADs"; - ui.btn_buypack.GetChild("img_saveingpot").visible = false; - ui.btn_max_pack.GetChild("img_saveingpot").visible = false; - - initItem(0); - initItem(1); - initItem(2); - - btn_watchAd btn_buypack = (ui.btn_buypack as btn_watchAd); - GObject pack_title = ui.btn_buypack.GetChild("title"); - - if (SaveData.GetSaveObject().is_get_ThreeDaysGift) - { - ui.pay_type.selectedIndex = 2; - var isToday = GameHelper.InToday(SaveData.GetSaveObject().last_got_three_gift_time, 0, true); - int three_gift_got_index = SaveData.GetSaveObject().three_gift_got_index; - if (isToday || (three_gift_got_index > (int)rewardState.day3)) - { - ui.btn_get.grayed = true; - ui.btn_get.SetClick(() => - { - if (three_gift_got_index < (int)rewardState.day3) - { - GameHelper.ShowTips("Come back and pick it up tomorrow."); - } - }); - } - else - { - ui.btn_get.SetClick(() => - { - getReward(); - ui.btn_get.SetClick(() => { }); - }); - } - - } - else - { - if (!GameHelper.IsAdModelOfPay()) - { - ui.pay_type.selectedIndex = 1; - decimal price_pack = (decimal)list[0].Paid_price2; - ui.btn_max_pack.title = GameHelper.getPrice(price_pack); - bool is_get = SaveData.GetSaveObject().is_get_ThreeDaysGift; - if (is_get) - { - ui.btn_max_pack.enabled = false; - ui.btn_max_pack.SetClick(() => { }); - } - else - { - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_max_pack.GetChild("img_saveingpot").visible = true; - } - ui.btn_max_pack.SetClick(() => - { - Debug.Log(price_pack); - ApplePayClass maxPayData = new ApplePayClass - { - amount = (int)Math.Round(price_pack * 100), - sku = PurchasingManager.GetPaySku(PayType.three_days_gift), - currency = "USD" - }; - MaxPayManager.Instance.Buy(maxPayData); - }); - } - } - else - { - ui.pay_type.selectedIndex = 0; - - bool is_get = SaveData.GetSaveObject().is_get_ThreeDaysGift; - if (is_get) - { - btn_buypack.buy_state.selectedIndex = 0; - btn_buypack.can_buy.selectedIndex = 1; - ui.btn_buypack.grayed = true; - pack_title.text = "Cliamed"; - ui.btn_buypack.SetClick(() => - { - - }); - } - else if (myAdNum >= list[0].Paid_price) - { - btn_buypack.buy_state.selectedIndex = 1; - btn_buypack.can_buy.selectedIndex = 0; - btn_buypack.SetClick(() => - { - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.ThreeDaysGiftBuySuccess); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_AD_event, BuriedPointEvent.three_days_gift_buy_success, 1); - AdRedeemManager.Instance.SetLookRewardADNum(myAdNum - (int)list[0].Paid_price); - GameDispatcher.Instance.Dispatch(GameMsg.apple_pay_success, PurchasingManager.GetPaySku(PayType.three_days_gift)); - - //getReward(); - ui.btn_buypack.SetClick(() => { }); - }); - } - else if (SaveData.GetSaveObject()._watch_ad_cd > GameHelper.GetNowTime()) - { - btn_buypack.buy_state.selectedIndex = 0; - btn_buypack.can_buy.selectedIndex = 1; - btn_watchAd btn_buy = ui.btn_buypack as btn_watchAd; - btn_buy.btn_text.text = CommonHelper.TimeFormat(SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour); - btn_buypack.SetClick(() => { }); - } - else - { - btn_buypack.buy_state.selectedIndex = 0; - btn_buypack.can_buy.selectedIndex = 0; - if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig().PiggyBankSwitch == 1) - { - ui.btn_buypack.GetChild("img_saveingpot").visible = true; - } - btn_buypack.SetClick(() => - { - - GameHelper.ShowVideoAd("ThreeDaysGift", issuccess => - { - if (issuccess) - { - SaveData.GetSaveObject()._watch_ad_cd = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().exchangeCD; - InitView(); - } - }); - TrackKit.SendEvent(GameHelper.getTrackEvenName(),Property.ThreeDaysGiftClick); - // NetworkKit.BuriedPoint(BuriedPointEvent.Apple_AD_event, BuriedPointEvent.three_days_gift_click, 1); - }); - } - } - } - BroadCast(); - } - - private void initItem(int index) - { - com_item day = null; - if (index == 0) - { - day = ui.day1; - } - else if (index == 1) - { - day = ui.day2; - } - else if (index == 2) - { - day = ui.day3; - } - - if (SaveData.GetSaveObject().three_gift_got_index - 1 > index) - { - day.img_select.visible = true; - if (SaveData.GetSaveObject().three_gift_got_index - 1 > 2) - { - day.img_select2.visible = true; - } - } - - if (index == 2) - { - day.state.selectedIndex = 3; - for (int i = 0; i < 3; i++) - { - item_reward item = day.GetChild("item" + (i + 2)) as item_reward; - item.visible = false; - } - } - else - { - day.state.selectedIndex = list[index].props_quantity.Length; - } - - setItemUrl(day.item1.loader_, GiftType.coin); - day.item1.lab_num.text = "x" + list[index].coins_quantity; - - for (int i = 0; i < list[index].props_quantity.Length; i++) - { - item_reward item = (day.GetChild("item" + (i + 2)) as item_reward); - setItemUrl(item.loader_, (GiftType)list[index].props_type[i]); - item.visible = true; - item.lab_num.text = "x" + list[index].props_quantity[i]; - } - } - - private void setItemUrl(GLoader loader, GiftType urltype) - { - if (urltype == GiftType.coin) loader.url = "ui://threeDaysGift/3DAYS_prs_001"; - else if (urltype == GiftType.move_out) loader.url = "ui://threeDaysGift/3DAYS_prs_003"; - else if (urltype == GiftType.refresh) loader.url = "ui://threeDaysGift/3DAYS_prs_004"; - else if (urltype == GiftType.undo) loader.url = "ui://threeDaysGift/3DAYS_prs_002"; - } - - private void getReward() - { - int index = SaveData.GetSaveObject().three_gift_got_index; - - com_item item = null; - if (index == (int)rewardState.day1) - { - item = ui.day1; - } - else if (index == (int)rewardState.day2) - { - item = ui.day2; - } - else if (index == (int)rewardState.day3) - { - item = ui.day3; - } - item.img_select.visible = true; - - - List types = new List(); - List rewards = new List(); - types.Add((int)GiftType.coin); - rewards.Add(list[index - 1].coins_quantity); - for (int i = 0; i < list[index - 1].props_quantity.Length; i++) - { - types.Add(list[index - 1].props_type[i]); // GiftType 类型 - rewards.Add(list[index - 1].props_quantity[i]); - } - GiftData data = new GiftData(); - data.type = types; - data.reward = rewards; - uiCtrlDispatcher.Dispatch(UICtrlMsg.RewardMulNewUI_Open, data); - } - private int broadtime = 0; - private List config_name_list = ConfigSystem.GetConfig().config_name_list; - private List config_money_list = ConfigSystem.GetConfig().config_money_list; - private List broad_list = new List(); - private List text_list = new List(); - private void InitBroadCast() - { - text_list.Add((ui.broadcast_top as broadcast_top).item_0.text_1); - text_list.Add((ui.broadcast_top as broadcast_top).item_1.text_1); - text_list.Add((ui.broadcast_top as broadcast_top).item_2.text_1); - for (int i = 0; i < 3; i++) - { - - int name_index = UnityEngine.Random.Range(0, config_name_list.Count); - int money_index = UnityEngine.Random.Range(0, config_money_list.Count); - broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] }); - text_list[i].text = "Congratulations,User [color=#ff9600][size=42]" + broad_list[i][0] + "[/size][/color] !After purchasing the ThreeDays Bouns,play [color=#ff9600]" + broad_list[i][1] + "[/color] matcher to clear the stage!"; - } - } - - - private void BroadCast() - { - broadtime++; - if (broadtime % 13 == 1) - { - (ui.broadcast_top as broadcast_top).t1.Play(() => - { - - int name_index = UnityEngine.Random.Range(0, config_name_list.Count); - int money_index = UnityEngine.Random.Range(0, config_money_list.Count); - string[] array_ = new string[2] { config_name_list[name_index], config_money_list[money_index] }; - text_list[0].text = "Congratulations,User [color=#ff9600][size=42]" + array_[0] + - "[/size][/color] !After purchasing the ThreeDays Bouns,play [color=#ff9600]" + array_[1] + "[/color] matcher to clear the stage!"; - }); - } - else if (broadtime % 13 == 4) - { - (ui.broadcast_top as broadcast_top).t2.Play(() => - { - - int name_index = UnityEngine.Random.Range(0, config_name_list.Count); - int money_index = UnityEngine.Random.Range(0, config_money_list.Count); - string[] array_ = new string[2] { config_name_list[name_index], config_money_list[money_index] }; - text_list[1].text = "Congratulations,User [color=#ff9600][size=42]" + array_[0] + - "[/size][/color] !After purchasing the ThreeDays Bouns,play [color=#ff9600]" + array_[1] + "[/color] matcher to clear the stage!"; - }); - - } - else if (broadtime % 13 == 7) - { - (ui.broadcast_top as broadcast_top).t3.Play(() => - { - - int name_index = UnityEngine.Random.Range(0, config_name_list.Count); - int money_index = UnityEngine.Random.Range(0, config_money_list.Count); - string[] array_ = new string[2] { config_name_list[name_index], config_money_list[money_index] }; - text_list[2].text = "Congratulations,User [color=#ff9600][size=42]" + array_[0] + - "[/size][/color] !After purchasing the ThreeDays Bouns,play [color=#ff9600]" + array_[1] + "[/color] matcher to clear the stage!"; - }); - - } - } - } -} -enum rewardState -{ - day1 = 1, - day2, - day3 -} -public class GiftData -{ - public List type; - public List reward; - public string uiName; -} - -public enum GiftType -{ - coin = 101, - move_out = 0, - undo = 1, - refresh = 2, -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta deleted file mode 100644 index 7c5660f..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 34e42e54a15e74f5fa6f4738876e5946 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs deleted file mode 100644 index acf6c96..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs +++ /dev/null @@ -1,72 +0,0 @@ -namespace ChillConnect - -{ - public class ThreeDaysGiftUICtrl : BaseUICtrl - { - private ThreeDaysGiftUI ui; - private ThreeDaysGiftModel model; - - private uint openUIMsg = UICtrlMsg.ThreeDaysGiftUI_Open; - private uint closeUIMsg = UICtrlMsg.ThreeDaysGiftUI_Close; - - #region 生命周期 - protected override void OnInit() - { - //model = ModuleManager.Instance.GetModel(ModelConst.ThreeDaysGiftModel) as ThreeDaysGiftModel; - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new ThreeDaysGiftUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) - { - ui.Close(); - } - ui = null; - } - #endregion - - #region 消息 - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta b/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta deleted file mode 100644 index 7a3cde0..0000000 --- a/Assets/Scripts/ModuleUI/ThreeDaysGift/ThreeDaysGiftUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9a66b1a98eeb44e23940d70809964ad8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/WheelView.meta b/Assets/Scripts/ModuleUI/WheelView.meta deleted file mode 100644 index 25f0d8a..0000000 --- a/Assets/Scripts/ModuleUI/WheelView.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a52244fcb0d17ec47bc599e792de7abc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs b/Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs deleted file mode 100644 index 73ab367..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs +++ /dev/null @@ -1,41 +0,0 @@ -namespace ChillConnect -{ - public class WheelViewCtrl : BaseCtrl - { - public static WheelViewCtrl Instance { get; private set; } - - private WheelViewModel model; - - #region 生命周期 - protected override void OnInit() - { - Instance = this; - } - - protected override void OnDispose() - { - Instance = null; - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - - protected override void AddServerListener() - { - - } - protected override void RemoveServerListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs.meta b/Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs.meta deleted file mode 100644 index 8deafeb..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewCtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4fcd41e0110dca543936cdcd3ea1c51e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs b/Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs deleted file mode 100644 index ce8deca..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs +++ /dev/null @@ -1,38 +0,0 @@ -using IgnoreOPS; - -namespace ChillConnect -{ - public class WheelViewModel : BaseModel - { - public string NextOpenWheelTimeStr - { - get - { - var val = (int)(DataMgr.NextOpenWheelStampTime.Value - GameHelper.GetNowTime()); - if (val > 0) return CommonHelper.FormatTime(val, CountDownType.Hour); - return "00:00:00"; - } - } - - #region 生命周期 - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs.meta b/Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs.meta deleted file mode 100644 index 3409c6c..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewModel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 635967f500a9fb94cab3762e18574c38 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs b/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs deleted file mode 100644 index bd64ac5..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs +++ /dev/null @@ -1,363 +0,0 @@ -// using FGUI.A000_common; - -using System; -using System.Collections.Generic; -using DG.Tweening; -using FairyGUI; -using FGUI.Common_01; -using FGUI.Turntable_11; -using IgnoreOPS; -using SGModule.Common.Extensions; -using Spine.Unity; -using UnityEngine; - -namespace ChillConnect -{ - public class WheelViewUI : BaseUI - { - private WheelViewUICtrl ctrl; - private WheelViewModel model; - private readonly int[] vidieWeight = new int[8]; - private TurntableModel turntableData; - - private List ItemList = new(); - private bool isClickSpin; - private bool isClickAbleWatchAD = true; - - private SkeletonAnimation normalAnim; - // private SkeletonAnimation turnAnim; - // private SkeletonAnimation awardAnim; - private Action closeCallback; - - - private FGUI.Turntable_11.com_wheel ui; - - public WheelViewUI(WheelViewUICtrl ctrl) : base(ctrl) - { - uiName = UIConst.WheelViewUI; - this.ctrl = ctrl; - } - - protected override void SetUIInfo(UIInfo uiInfo) - { - uiInfo.packageName = "Turntable_11"; - uiInfo.assetName = "com_wheel"; - uiInfo.layerType = UILayerType.Popup; - uiInfo.isNeedOpenAnim = true; - uiInfo.isNeedCloseAnim = true; - uiInfo.isNeedUIMask = true; - } - - #region 生命周期 - protected override void OnInit() - { - model = moduleManager.GetModel(ModelConst.WheelViewModel) as WheelViewModel; - - } - - protected override void OnClose() - { - HallManager.Instance.UpdateSecondEvent -= UpdateTime; - - GameHelper.showGameUI = true; - } - - protected override void OnBind() - { - ui = baseUI as FGUI.Turntable_11.com_wheel; - } - - protected override void OnOpenBefore(object args) - { - - LoadLastCheckDate(); - - CheckNewDay(); - - - var disc = ui.disc; - ItemList.Add(disc.award1); - ItemList.Add(disc.award2); - ItemList.Add(disc.award3); - ItemList.Add(disc.award4); - ItemList.Add(disc.award5); - ItemList.Add(disc.award6); - ItemList.Add(disc.award7); - ItemList.Add(disc.award8); - - HallManager.Instance.UpdateSecondEvent += UpdateTime; - - turntableData = ConfigSystem.GetConfig(); - - - normalAnim = FXManager.Instance.SetFx(ui.light_parent, Fx_Type.fx_wheel, ref closeCallback); - - UpdateTime(); - - refreshData(); - - InitView(); - - } - private DateTime _lastCheckDate; - private const string PlayerPrefsKeyLastCheckDate = "Wheel_new_days"; - private void LoadLastCheckDate() - { - string lastCheckDateString = PlayerPrefs.GetString(PlayerPrefsKeyLastCheckDate, ""); - if (!string.IsNullOrEmpty(lastCheckDateString)) - { - _lastCheckDate = DateTime.ParseExact(lastCheckDateString, "yyyy-MM-dd", null); - } - else - { - // 如果没有找到日期，初始化为今天的日期 - _lastCheckDate = DateTime.Today; - SaveLastCheckDate(); - } - } - - private void SaveLastCheckDate() - { - // 将日期转换为字符串并存储到PlayerPrefs - PlayerPrefs.SetString(PlayerPrefsKeyLastCheckDate, _lastCheckDate.ToString("yyyy-MM-dd")); - PlayerPrefs.Save(); - } - private void CheckNewDay() - { - DateTime currentDate = DateTime.Today; - - // 如果当前日期与上次检查的日期不同，说明是新的一天 - if (_lastCheckDate != currentDate) - { - // 重置 ThisDayWatchSlyderVideoNum - DataMgr.ThisDayWatchSlyderVideoNum.Value = 0; - - // 更新最后检查的日期并保存到PlayerPrefs - _lastCheckDate = currentDate; - - SaveLastCheckDate(); - } - } - - //初始化页面逻辑 - private void InitView() - { - - normalAnim.state.SetAnimation(0, "daiji", true); - for (var i = 0; i < ItemList.Count; i++) - { - vidieWeight[i] = turntableData.DataList[i].weight; - } - ui.disc.rotation = 0; - ui.btn_spin.SetClick(SpineAnim); - ui.close.SetClick(() => - { - CtrlCloseUI(); - }); - } - - - private void refreshData() - { - - for (int i = 0; i < ItemList.Count; i++) - { - var item = ItemList[i]; - var turntable = turntableData.DataList[i]; - var id = turntable.wheel_item; - var quantity = turntable.quantity; - - if (!GameHelper.IsGiftSwitch() && id == 102) - { - id = 101; - quantity *= 10; - } - - item.text_num.text = id == 102 ? GameHelper.Get102Str((decimal)quantity) : GameHelper.Get101Str((decimal)quantity); - Debug.Log($"wheel id=========={id}"); - item.status.selectedIndex = id == 102 ? com_coin.Status_b : com_coin.Status_a; - } - - - var times = DataMgr.ThisDayWatchSlyderVideoNum.Value; - var limits = GameHelper.GetCommonModel().wheelTimes[0]; - // ui.spin.text_spintimes.SetVar("times", times.ToString()).FlushVars(); - // ui.spin.text_spintimes.SetVar("limits", limits.ToString()).FlushVars(); - - ui.text_spintimes.SetVar("times", times.ToString()).FlushVars(); - ui.text_spintimes.SetVar("limits", limits.ToString()).FlushVars(); - - } - - protected override void OnOpen(object args) - { - } - - protected override void OnHide() - { - } - - protected override void OnDisplay(object args) - { - } - #endregion - - #region 消息 - protected override void AddListener() - { - - } - protected override void RemoveListener() - { - - } - #endregion - - - private Tween ResultTween; - private float turnTime = 7.0f; - - - private void SpineAnim() - { - if (isClickSpin) - return; - - if (GameHelper.GetNowTime() < DataMgr.NextOpenWheelStampTime.Value) return; - - if (isClickAbleWatchAD) - { - isClickAbleWatchAD = false; - - GameHelper.ShowVideoAd("reward_luckySpin", isSuccess => - { - if (isSuccess) - { - Spin(); - } - - isClickAbleWatchAD = true; - }); - } - } - - private void Spin() - { - // normalAnim.SetActive(false); - ui.disc.rotation = 0; - normalAnim.state.SetAnimation(0, "zhuandong", true); - isClickSpin = true; - ui.close.touchable = false; - ui.close.grayed = false; - - ui.btn_spin.touchable = false; - - var index = CommonHelper.GetIndexByChanceList(vidieWeight); - var data = turntableData.DataList[index]; - var angle = 3600 - (data.Seq - 1) * 45; - AudioManager.Instance.PlayDynamicEffect(AudioConst.wheel_spin); - DOTween.To(() => ui.disc.rotation, e => ui.disc.rotation = e, angle, turnTime) - .SetEase(Ease.OutQuad); - - ResultTween = DOVirtual.DelayedCall(turnTime, () => ReceivePlane(data)); - - } - - private void ReceivePlane(Turntable vo) - { - normalAnim.state.SetAnimation(0, "zhongjiang", true); - - DOVirtual.DelayedCall(1.5f, () => - { - isClickSpin = false; - ResultTween = null; - ui.close.touchable = true; - ui.close.grayed = false; - - ui.btn_spin.cont_spin.selectedIndex = 1; - - ui.btn_spin.cont_state.selectedIndex = 1; - - var id = vo.wheel_item; - var quantity = vo.quantity; - - if (!GameHelper.IsGiftSwitch() && id == 102) - { - id = 101; - quantity *= 10; - } - - // if (id == 0) - // { - var endui = id == 101 ? ui.point : ui.point1; - - var startPoint = GameHelper.GetUICenterPosition(ui.startpoint); - var endPoint = GameHelper.GetUICenterPosition(endui); - - var rewardData = new RewardData(); - var rewardSingleData = new RewardSingleData(id, (decimal)quantity, RewardOrigin.LuckyWheel) - { - startPosition = startPoint, - endPosition = new Vector2(endPoint.x - 150, endPoint.y - 136), - }; - rewardData.AddReward(rewardSingleData); - rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.Dialog | - RewardDisplayType.ValueChange; - rewardData.AddCompleted((isScu) => - { - normalAnim.state.SetAnimation(0, "daiji", true); - }); - GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); - // } - // else - // { - // GameHelper.AddItemNumber(id - 1, (int)quantity); - // GameHelper.ShowTips("Successfully received"); - // } - - - - DataMgr.NextOpenWheelStampTime.Value = - GameHelper.GetNowTime() + GameHelper.GetCommonModel().wheelTimes[1]; - DataMgr.ThisDayWatchSlyderVideoNum.Value = DataMgr.ThisDayWatchSlyderVideoNum.Value + 1; - - UpdateTime(); - refreshData(); - }); - } - - private void UpdateTime() - { - if (DataMgr.ThisDayWatchSlyderVideoNum.Value >= GameHelper.GetCommonModel().wheelTimes[0]) - { - DateTime currentTime = DateTime.Now; - - - ui.btn_spin.cont_state.selectedIndex = 2; - ui.btn_spin.touchable = false; - ui.btn_spin.enabled = false; - ui.btn_spin.cont_spin.selectedIndex = 1; - } - else - { - if (GameHelper.GetNowTime() >= DataMgr.NextOpenWheelStampTime.Value) - { - ui.btn_spin.touchable = true; - ui.btn_spin.enabled = true; - ui.btn_spin.cont_spin.selectedIndex = 0; - ui.btn_spin.cont_state.selectedIndex = 0; - } - else - { - ui.btn_spin.touchable = false; - ui.btn_spin.enabled = false; - ui.btn_spin.cont_spin.selectedIndex = 1; - ui.btn_spin.cont_state.selectedIndex = 1; - } - - ui.btn_spin.text_time.text = model.NextOpenWheelTimeStr; - } - } - - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs.meta b/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs.meta deleted file mode 100644 index 74ab7f6..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewUI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1655b3ae9b24ea54c928b9705980bdc8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs b/Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs deleted file mode 100644 index 45e77de..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs +++ /dev/null @@ -1,85 +0,0 @@ - -namespace ChillConnect -{ - public class WheelViewUICtrl : BaseUICtrl - { - private readonly uint closeUIMsg = UICtrlMsg.WheelUI_Close; - private WheelViewModel model; - - private readonly uint openUIMsg = UICtrlMsg.WheelUI_Open; - private WheelViewUI ui; - - private void OnSignInUI_Display(object obj) - { - if (obj != null) - { - var isShow = (bool)obj; - if (isShow) - ui?.Display(); - else - ui?.Hide(); - } - } - - #region 生命周期 - - protected override void OnInit() - { - } - - protected override void OnDispose() - { - } - - public override void OpenUI(object args = null) - { - if (ui == null) - { - ui = new WheelViewUI(this); - ui.Open(args); - } - } - - public override void CloseUI(object args = null) - { - if (ui != null && !ui.isClose) ui.Close(); - ui = null; - } - - #endregion - - #region 消息 - - public override uint GetOpenUIMsg(string uiName) - { - return openUIMsg; - } - - public override uint GetCloseUIMsg(string uiName) - { - return closeUIMsg; - } - - protected override void AddListener() - { - uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); - uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); - } - - protected override void RemoveListener() - { - uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); - uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); - } - - protected override void AddServerListener() - { - } - - protected override void RemoveServerListener() - { - } - - #endregion - } -} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs.meta b/Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs.meta deleted file mode 100644 index 3f21092..0000000 --- a/Assets/Scripts/ModuleUI/WheelView/WheelViewUICtrl.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 753bb6798e3c56348ade900ff4651ac7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: