Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs   resolved by origin/master(远端) version

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XnNOvS2rBXlxXpr16fvCmsPHgWH8VFHvaajxnXEO0+Lb+o7fajApk9g=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wn9Osn6uWy19n3dRwPVXSi8zA/NNxMGamLi6utiwD+X5DpzMgms/FuQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D3IW4HirVHp0wSS+sYuhPq4wOVtRbtACyDpCZepeaCbfGI08iv6f7nQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CHkc4CmoWyo5sfhaQFShkw8xWrnK+juSPLRnEr3llUekkRBix5ZoBfM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: By8e43v/W3qLQOMbGDHKnzQ1oVBoz5MMFUugFGg14LSYNj1Njr+MPYQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnxK5HivV33OupUJ+JP+V/9teQap+ztGB11Lq2ALmJ7bla/ddbhYa04=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WntJtHioU3NKb2nnD0dUISgC1zZQcsilS4IbgriLnCZ1wIyK9cX4J6k=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Di8X4SmvB3ge6zef2gCaXRZq3zBtFY8jFzd5o6bomPWk5L14wwtHKJ0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XHJK4S6rBi/k6hiG+4qlvyeg8D9jbTYaSpnLNdwRKj8F6vNTRi6falo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XX4etS2oB371NxuZcw05IS7s+EBX/Ogp24kPquNVxP4ZZ7thmGQ150s=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DnwbtX+qW3kUcU7gF/g5Ww8eYRAfyBUw09gomb/TK0PqVTeGcmPy6+c=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DHsZ5yisAX7UVf3pVzwzK1HoZ/JB0X6kdTqBV+yZJOe8wTWWflACQro=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XSxL5yOuUnkMucF5NjiSv6mC0MomCcuCw/OcjNahb/EEKvGYmLA88bo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XixO5yKtBSkujT/Yo+LlHZVgWWHJlfZDrxmT87bhSGjnJVND3Stiajg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CyxKsC2sWypcCjPE0h7XuANJjwfU+gi9pwWnq6SzC0jS2RgVBz+xElI=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XnkX4yr+UH2DIh54RIzV3KC0zEu/+w8JOEJAjd+8DkooXRRnVRS8gn4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DX4dtHz4Bipv7q0XRgKEar+wpEuoC5+XJQm5wBThWoKT7rD9nJ7811M=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS4WtSytUXqUcAvvuEz6MIe6wC5++VEmCknpN9DxdlxEC/9fhamMdSY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D35Nt3/7V3oeeg2tECPRN5W7PXslQjV7n/sPfo4SCFc3sJPYe5J8ky8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D3tNsyilB3i4xmmkmAD3BN/NbtaODW6sRIh/o2RdBJE/jqqDLbidyr4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wysbt3+vVXnqMmqdutbdvYNzhJ9lOfMN3MvpbBt8w0h3jmxv5PhvZF0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnxNsnuqBX4S8omhxPbs1mqYKa1B0YuAkaDOycWbV8KQv1GXlh5SG08=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wiwa4S+qV3NOhqCLPdnZ0OEH1LYB0bSGgD5xAnWooXHJCl1VRAiHQf8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Bi9L4Cj+AHPuGn8LZIYTb5B2HOjwV6mjAvna2Ye/9nSE+zxpNfe5LcY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CXsZvXmvVXsRGEYgSXpAoLhOATQ4iz+KOq51ccrRpyxNPfFkTWo7IJg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CitKsiOsU3nwm9PqkqRsuIBPvjM/CQqmZo6H14bJDHRhyBJooAqrf38=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CilLsCytBi7buU3Wf6Zw+6P64zzFZXQmZ66qyUp0JNKprV5dI0muOPk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DyxKty2rBXn/06ZsUtf9TF7orZHiO76HLMfFgi8hUUL4ToHtSgK4yMY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WX4Y43usUyorijdis2k62UjUG1/+PvFyLo6icQdiFk+P5zkhnYYV0tQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CSlJ5yKoVn9L6v/2bU+18WEkkeJMVwhHj2EXqitM3KO0Vpscl4EEDow=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnoY4yqtBn/wYhJMhwat1IBCtMjJ9ma1tBGHRbYCQtN9QetRU21pdxE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CSsZtSyrW3KdesuXUQEF3GG0ZG6PcjmSlhNda4HHSHWHdJJU4ZWcIWU=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: W3MWvC2sU3kqwEOsO5qExfOMwKbalcywli/mlT3+gBhnH/DcEg4LIXY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DitM4CP4Wy8kasO+J7x8PL4OCgy0MqfDYl7/WUQ55A0IbTgyDRYDckQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XHoa536qVSo1MMzWPhQGBzsVJIL+JaetQxMdeZg5pa6ogw4scREnmvY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: C3tOtyr/AHp/afz3Hg+9Q47UzuY2IqYHplEf4ui3zRoLkI/GLN6CujE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: BnhN4X6rUH0jMn3fYObWQUvXrEiasSCkPhc8JbOsINIutcWU4CgChWg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CCwetCutAi2UV5mMi3dJGtbf7TH8Pl7uWAXtnE2Q8o6LEffgYLVMPok=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Ci5M4XmtV3kTcEFfo31h77sRxXdBJug8JUP5av/cDJOmU91aMB3aWAs=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CHpOtiOlUCiLhXBdTUlThN/xOtLXptISi6yHthB8Gmz24rf6IL106tE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XXMasS75BX98L9GjB44gwXorFMSrN633nseMNo6AitM4/+nv8KTFnbk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CywasCz7B3jMYlg5tDSfqsXkczUoioSG65XnqOwbGBKzKSdFXt0Df+k=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DX0ZsCz/VnOmWhUILaTbxboK/G7/GWAzv8HhlihSjNiR+Y4CLWGobrM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: By8X53yrU38bknJGUihaIUtOATknopJbDRlc+JSwkT64aIy5qDG7EEA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WX9OvC6uByoOIrVW3nIQSMNf3LM1pZD9Ka2y441hC4JSQIu9SrdoSno=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnhLti+lWyl9Kn3CNyMd2EJiT+dJT6mEOlKfEBXlesCRUFd/EeJFJS8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CX8dtSKlB3jowDuy6mzIlk6K9S+iuvY2p4nGn2PAWSpGaTQdEzIEXoo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnpNsiikVS0cPCBiY0rPqTCAaLCqpejlGuaYCE/ygObHZK+qTG5tFiE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wi8b4SqsBntipPRSKRJiQN1SMhfD4TziuhYK9TFzunh65XqXmYg+Kp8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: C30W5HysAn+0f2PAjQx5oTiz0ATQjbJb5Q0VTjAlfmSRrU1sfJUP9NA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wy8ftS6uUH5y5qPwQ0yu8W/oYp7ZH6MFLPwcssmhpvfuF4Hn+HwbtXo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Dn0btXz4VX8OXiNzaUfQswmQwVhP0uonJUtbFeIgLOpvDA2SrIVx6RM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CXxNsnv/USgeazDGmL/lIDqBQZgOfxKN6zmeUKj6dMlSXl/IVr9iYTM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CH0ftij5VC97tNfIkeEuIHzHPrIDIqpQITPaUgF/jP7GWCmLbbmKub0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CC4Y5i37USg4QBqGqWb0PcWqg+/JirlZgWVdlE7zYZSzFywN6HoiKOs=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CikWtiytBn2/7jzkHypzFxJoLGSG+NWtu4kZSOHtbfAvMTyZkCX8SD8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnIcsyv8W3JU+JtswB+d+yeRz1OsDww2KAKE4L9ZkeMrktxzi3TrJMo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -133,7 +133,7 @@ namespace GameLogic.Bag
         public bool AddItem(int itemId, long count, string guid = "")
         {
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
-            
+
             ItemInfo item = GetItemInfo(itemId, guidStr);
             return AddItemCount(item, count);
         }

Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -299,7 +299,7 @@ namespace GameLogic.Equipment
         /// <param name="eqItemInfo"></param>
         public void AddEquipment(ItemInfo eqItemInfo)
         {
-            if (eqItemInfo.eqInfo == null)
+            if (!eqItemInfo.IsEquipItem())
             {
                 return;
             }

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -111,6 +111,31 @@ namespace GameLogic.Hero
             SendEvent(HeroUpType.Level, heroInfo, HeroUpResultType.Success);
         }
 
+
+        public HeroUpResultType PromoteHeroLogic(HeroInfo heroInfo)
+        {
+            
+            HeroUpResultType resultType = CanPromote(heroInfo);
+
+            if (resultType == HeroUpResultType.Success)
+            {
+                //扣除碎片
+                bool isOk = BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount);
+                if (isOk)
+                {
+                    if (resultType == HeroUpResultType.Success)
+                    {
+                        heroInfo.Promote();
+                        PlayerManager.Instance.SaveHeroData(heroInfo);
+                        SendEvent(HeroUpType.Promote, heroInfo, resultType);
+                    }
+                }
+            }
+            
+            return resultType;
+            
+        }
+
         /// <summary>
         /// 英雄升级逻辑，主要是改数据，不在这里做UI表现
         /// </summary>

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -233,6 +233,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // 从后往前遍历，这样删除元素,可以一般循环，一遍删除
         for (int i = playerData.ItemListData.Count - 1; i >= 0; i--)
         {
+            string ss = "";
             ItemData itemData = playerData.ItemListData[i];
             if (itemData.itemCount == 0)
             {
@@ -240,14 +241,18 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
                 if (itemData.eqData == null || itemData.eqData.zyEqId == 0)
                 {
                     playerData.ItemListData.RemoveAt(i);
+                    ss = "删除道具:" + itemData.guid;
                     return;
                 }
 
                 //是装备，但是没有穿，删除
                 if (itemData.eqData != null && itemData.eqData.zyEqId != 0 && !itemData.eqData.isEquip)
                 {
+                    ss = "删除装备:" + itemData.guid;
                     playerData.ItemListData.RemoveAt(i);
                 }
+                
+                LogTool.Log(ss);
             }
         }
         

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -4,6 +4,7 @@ using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Player;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -40,56 +41,48 @@ namespace Fort23.Mono
 
         private void OnButtonCallBack()
         {
-            ItemInfo itemInfo=   BagController.Instance.GetItemInfo(GlobalParam.Item_Coin_ID);
-            if (itemInfo.count < 500)
+
+            if (BagController.Instance.IsEnough(GlobalParam.Item_Coin_ID, openBoxConfig.oneConsume))
             {
-                return;
-            }
+                BagController.Instance.DeductCoin(openBoxConfig.oneConsume);
+                List<ItemInfo> allIitem = DropManager.Instance.DropItem(openBoxConfig.reward);
+                BagController.Instance.AddItem(allIitem);
 
-            List<ItemInfo> allIitem = DropManager.Instance.DropItem(openBoxConfig.reward);
-            BagController.Instance.AddItem(allIitem);
-            if (allIitem.Count > 0)
+                UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(delegate(RewardsPanel panel)
+                {
+                    panel.InitRewardsPanel(allIitem, CloseButtonCallBack);
+                }, layer: UILayer.Top);
+            }
+            else
             {
-                Dictionary<string, string> lable = new Dictionary<string, string>();
-                lable.Add("one", allIitem[0].itemID.ToString());
-                PottingMobile._CustomEvent("oneBox", lable);
+                TipMessagePanel.OpenTipMessagePanel("金币不足", Vector2.zero);
             }
-            BagController.Instance.DeductCoin(500);
-            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(
-                delegate(RewardsPanel panel) { panel.InitRewardsPanel(allIitem, CloseButtonCallBack); },
-                layer: UILayer.Top);
+            
         }
 
         private void TenButtonCallBack()
         {
-            ItemInfo itemInfo=   BagController.Instance.GetItemInfo(GlobalParam.Item_Coin_ID);
-            if (itemInfo.count < 4500)
+            if (BagController.Instance.IsEnough(GlobalParam.Item_Coin_ID, openBoxConfig.oneConsume))
             {
-                return;
-            }
-            List<ItemInfo> allIitem = new List<ItemInfo>();
-            string message = "";
-            for (int i = 0; i < 10; i++)
-            {
-                List<ItemInfo> currItem = DropManager.Instance.DropItem(openBoxConfig.reward);
-                for (int j = 0; j < currItem.Count; j++)
+                BagController.Instance.DeductCoin(openBoxConfig.tenConsume);
+                
+                List<ItemInfo> allIitem = new List<ItemInfo>();
+                for (int i = 0; i < 10; i++)
                 {
-                    message += "_" + currItem[j].itemID.ToString();
+                    List<ItemInfo> currItem = DropManager.Instance.DropItem(openBoxConfig.reward);
+                    allIitem.AddRange(currItem);
                 }
-                allIitem.AddRange(currItem);
+
+                BagController.Instance.AddItem(allIitem);
+
+                UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(
+                    delegate(RewardsPanel panel) { panel.InitRewardsPanel(allIitem, CloseButtonCallBack); },
+                    layer: UILayer.Top);
             }
-            if (allIitem.Count > 0)
+            else
             {
-                Dictionary<string, string> lable = new Dictionary<string, string>();
-                lable.Add("tenBox", message);
-                PottingMobile._CustomEvent("oneBox", lable);
+                TipMessagePanel.OpenTipMessagePanel("金币不足", Vector2.zero);
             }
-
-            BagController.Instance.AddItem(allIitem);
-            BagController.Instance.DeductCoin(4500);
-            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(
-                delegate(RewardsPanel panel) { panel.InitRewardsPanel(allIitem, CloseButtonCallBack); },
-                layer: UILayer.Top);
         }
 
         private void CloseButtonCallBack()

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -164,19 +164,32 @@ namespace Fort23.Mono
             if (isOpenPre)
             {
 
-                if (PlayerManager.Instance.heroController.CanPromote(heroInfo) == HeroUpResultType.Success)
+                HeroUpResultType upResultType = PlayerManager.Instance.heroController.PromoteHeroLogic(heroInfo);
+
+                if (upResultType == HeroUpResultType.Success)
                 {
-                    heroInfo.Promote();
-                    PlayerManager.Instance.SaveHeroData(heroInfo);
                     UpdateAttributeUI();
                     HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-                    PlayerManager.Instance.heroController.SendEvent(HeroUpType.Promote, heroInfo, HeroUpResultType.Success);
                     ExitPowerUpPre(curPreTyp, upPre.Stars2);
                 }
                 else
                 {
                     TipMessagePanel.OpenTipMessagePanel("资源不足", Vector2.zero);
                 }
+
+                // if (PlayerManager.Instance.heroController.CanPromote(heroInfo) == HeroUpResultType.Success)
+                // {
+                //     heroInfo.Promote();
+                //     PlayerManager.Instance.SaveHeroData(heroInfo);
+                //     UpdateAttributeUI();
+                //     HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+                //     PlayerManager.Instance.heroController.SendEvent(HeroUpType.Promote, heroInfo, HeroUpResultType.Success);
+                //     ExitPowerUpPre(curPreTyp, upPre.Stars2);
+                // }
+                // else
+                // {
+                //     TipMessagePanel.OpenTipMessagePanel("资源不足", Vector2.zero);
+                // }
             }
             else
             {
@@ -490,55 +503,12 @@ namespace Fort23.Mono
             
             PlayEft(isInit, txtHP, heroInfo.hp.Value.ToStringEx(), 0);
             
-            // if (txtHP.text != heroInfo.hp.Value.ToStringEx())
-            // {
-            //     long old = long.Parse(txtHP.text);
-            //     txtHP.text = heroInfo.hp.Value.ToStringEx();
-            //     if(!isInit)
-            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
-            //             {
-            //                 heroUpTxtEft.txtEft.text = "+" + (heroInfo.hp.Value - old).ToStringEx();
-            //             }, 
-            //             poolName: "HeroUpTxtEft", root: eftNumPos[0] as RectTransform);
-            // }
-
             PlayEft(isInit, txtATK, heroInfo.attack.Value.ToStringEx(), 1);
-            
-            // if (txtATK.text != heroInfo.attack.Value.ToStringEx())
-            // {
-            //     long old = long.Parse(txtATK.text);
-            //     txtATK.text = heroInfo.attack.Value.ToStringEx();
-            //     if(!isInit)
-            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
-            //             {
-            //                 heroUpTxtEft.txtEft.text = "+" + (heroInfo.attack.Value - old).ToStringEx();
-            //             },
-            //             poolName: "HeroUpTxtEft", root: eftNumPos[1] as RectTransform);
-            // }
-            
+         
             PlayEft(isInit, txtDEF, heroInfo.defense.Value.ToStringEx(), 2);
-            // if (txtDEF.text != heroInfo.defense.Value.ToStringEx())
-            // {
-            //     long old = long.Parse(txtDEF.text);
-            //     txtDEF.text = heroInfo.defense.Value.ToStringEx();
-            //     if(!isInit)
-            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
-            //             {
-            //                 heroUpTxtEft.txtEft.text = "+" + (heroInfo.defense.Value - old).ToStringEx();
-            //             },
-            //             poolName: "HeroUpTxtEft", root: eftNumPos[2] as RectTransform);
-            // }
 
             PlayEft(isInit, txtSHANBI, heroInfo.shanbi.Value.ToStringEx(), 3);
-            // if (txtSHANBI.text != heroInfo.shanbi.Value.ToStringEx())
-            // {
-            //     txtSHANBI.text = heroInfo.shanbi.Value.ToStringEx();
-            //     if(!isInit)
-            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
-            //             poolName: "HeroUpTxtEft", root: eftNumPos[3] as RectTransform);
-            // }
-            
-            
+
             txtLv.text = heroInfo.level.Value.ToStringEx();
             txtExpGain.text = heroInfo.expGain.Value.ToStringEx();
 

Assets/Scripts/GameUI/UI/Hero/ProfessionEquipmentPanel.cs

@@ -31,6 +31,7 @@ namespace Fort23.Mono
 
         protected override void DelEvent()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.HeroEquip, OnHeroEquip);
         }
         public override void AddButtonEvent()
         {
@@ -69,17 +70,6 @@ namespace Fort23.Mono
             HeroUITools.OpenSpecificProfessionEquipmentPanel(4);
         }
 
-        /// <summary>
-        /// 打开对应职业的装备面板
-        /// </summary>
-        /// <param name="zy">1战士；2法师；3牧师；4游侠</param>
-        // private async void OpenSpecificProfessionEquipmentPanel(int zy)
-        // {
-        //     SpecificProfessionEquipmentPanel specificProfessionEquipmentPanel 
-        //         = await UIManager.Instance.LoadAndOpenPanel<SpecificProfessionEquipmentPanel>(null);
-        //     specificProfessionEquipmentPanel.InitPanel(zy);
-        // }
-
         private void OnclickBack()
         {
             UIManager.Instance.HideUIUIPanel(this);

Assets/Scripts/GameUI/UI/Hero/SpecificProfessionEquipmentPanel.cs

@@ -85,8 +85,8 @@ namespace Fort23.Mono
                 
                 SendWearEvent();
                 
-                UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq2");
-                HeroUITools.UpdateZyEqIcon(curZy, eqs);
+                UIManager.Instance.DormancyAllGComponent<WidgetItem>(poolName : SpecificEqsPoolName);
+                HeroUITools.UpdateZyEqIcon(curZy, eqs, poolName : SpecificEqsPoolName);
             }
         }
 
@@ -108,14 +108,14 @@ namespace Fort23.Mono
         {
             UIManager.Instance.HideUIUIPanel(this);
             closeAction?.Invoke();
-            UIManager.Instance.DormancyAllGComponent<WidgetItem>(spoolName);
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(SpecificEqsPoolName);
             if (isClickOnce)
             {
                 UIManager.Instance.DormancyAllGComponent<WidgetItem>("eq");
             }
         }
 
-        private string spoolName = "eq2";
+        private string SpecificEqsPoolName = "eq2";
         private Action closeAction;
         
         public void InitPanel(int zy, Action action = null)
@@ -124,8 +124,8 @@ namespace Fort23.Mono
             curZy = zy;
             closeAction = action;
             SetZyInfo();
-            UIManager.Instance.DormancyAllGComponent<WidgetItem>(spoolName);
-            HeroUITools.UpdateZyEqIcon(zy, eqs, poolName : spoolName);
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(SpecificEqsPoolName);
+            HeroUITools.UpdateZyEqIcon(zy, eqs, poolName : SpecificEqsPoolName);
         }
 
         private void SetZyInfo()

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -112,8 +112,9 @@ namespace Fort23.Mono
         private void OnUpgradeClick()
         {
             // throw new System.NotImplementedException();
-            PlayerManager.Instance.heroController.UpgradeHeroLogic(heroInfo);
-            if (PlayerManager.Instance.heroController.CanUpgrade(heroInfo) == HeroUpResultType.Success)
+            HeroUpResultType resultType = PlayerManager.Instance.heroController.UpgradeHeroLogic(heroInfo);
+            //PlayerManager.Instance.heroController.CanUpgrade(heroInfo)
+            if (resultType == HeroUpResultType.Success)
             {
                 txtUpgrade.color = Color.white;
             }

美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=900,100
+Size=715,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1300,0
+Pos=1115,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=900,70
+Size=715,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=900,130
+Size=715,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=900,420
+Size=715,420
 Collapsed=0
 
 [Docking][Data]