清理

AndroidLibrary/.gitignore

@@ -1,14 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx

AndroidLibrary/.idea/.name

@@ -1 +0,0 @@
-My Application

AndroidLibrary/.idea/codeStyles/Project.xml

@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

AndroidLibrary/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>

AndroidLibrary/.idea/gradle.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/gfglibrary" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

AndroidLibrary/.idea/jarRepositories.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>

AndroidLibrary/.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

AndroidLibrary/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

AndroidLibrary/app/.gitignore

@@ -1 +0,0 @@
-/build

AndroidLibrary/app/build.gradle

@@ -1,33 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
-
-    defaultConfig {
-        applicationId "com.example.myapplication"
-        minSdkVersion 23
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-}

AndroidLibrary/app/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

AndroidLibrary/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.example.myapplication;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.example.myapplication", appContext.getPackageName());
-    }
-}

AndroidLibrary/app/src/main/AndroidManifest.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.myapplication">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>

AndroidLibrary/app/src/main/java/com/example/myapplication/MainActivity.java

@@ -1,14 +0,0 @@
-package com.example.myapplication;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-}

AndroidLibrary/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

AndroidLibrary/app/src/main/res/layout/activity_main.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/app_icon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

AndroidLibrary/app/src/main/res/values/colors.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
-</resources>

AndroidLibrary/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#3DDC84</color>
-</resources>

AndroidLibrary/app/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">My Application</string>
-</resources>

AndroidLibrary/app/src/main/res/values/styles.xml

@@ -1,10 +0,0 @@
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>

AndroidLibrary/app/src/test/java/com/example/myapplication/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.example.myapplication;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

AndroidLibrary/build.gradle

@@ -1,24 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}

AndroidLibrary/gfglibrary/.gitignore

@@ -1 +0,0 @@
-/build

AndroidLibrary/gfglibrary/build.gradle

@@ -1,38 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-
-    defaultConfig {
-        minSdkVersion 23
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-repositories{
-    flatDir {
-        dirs 'libsunity'
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-//    testImplementation 'junit:junit:4.12'
-//    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    compileOnly files('libsunity/classes.jar')
-}

AndroidLibrary/gfglibrary/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

AndroidLibrary/gfglibrary/src/androidTest/java/com/gfg/gfglibrary/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.gfg.gfglibrary;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.gfg.gfglibrary.test", appContext.getPackageName());
-    }
-}

AndroidLibrary/gfglibrary/src/main/AndroidManifest.xml

@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gfg.gfglibrary">
-
-    <application>
-
-    </application>
-
-</manifest>

AndroidLibrary/gfglibrary/src/main/java/com/gfg/gfglibrary/JavaCTest.java

@@ -1,14 +0,0 @@
-package com.gfg.gfglibrary;
-
-import android.content.Context;
-public class JavaCTest {
-    private static JavaCTest instance;
-    public static JavaCTest Instance(){
-        if(instance==null)
-            instance=new JavaCTest();
-        return instance;
-    }
-    public int Sub(int a,int b){
-        return a-b;
-    }
-}

AndroidLibrary/gfglibrary/src/main/java/com/gfg/gfglibrary/SaveImage.java

@@ -1,202 +0,0 @@
-package com.gfg.gfglibrary;
-
-//所需要用到的库
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.widget.Toast;
-
-import androidx.annotation.Nullable;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.FileNameMap;
-import java.net.URLConnection;
-
-public class SaveImage {
-    public static Context context;
-    //unity项目启动时的的Activity
-    private static Activity _unityActivity;
-    private static String DIRECTORY_WANSHIJING = "Wanshijing";
-
-    //获取unity项目的Activity
-    private static Activity getActivity() {
-        if (null == _unityActivity) {
-            try {
-                Class<?> classtype = Class.forName("com.unity3d.player.UnityPlayer");
-                Activity activity = (Activity) classtype.getDeclaredField("currentActivity").get(classtype);
-                _unityActivity = activity;
-            } catch (ClassNotFoundException e) {
-
-            } catch (IllegalAccessException e) {
-
-            } catch (NoSuchFieldException e) {
-
-            }
-        }
-        return _unityActivity;
-    }
-
-    /**
-     * 调用Unity的方法
-     * @param gameObjectName    调用的GameObject的名称
-     * @param functionName      方法名
-     * @param args              参数
-     * @return                  调用是否成功
-     */
-    boolean callUnity(String gameObjectName, String functionName, String args){
-        try {
-            Class<?> classtype = Class.forName("com.unity3d.player.UnityPlayer");
-            Method method =classtype.getMethod("UnitySendMessage", String.class,String.class,String.class);
-            method.invoke(classtype,gameObjectName,functionName,args);
-            return true;
-        } catch (ClassNotFoundException e) {
-
-        } catch (NoSuchMethodException e) {
-
-        } catch (IllegalAccessException e) {
-
-        } catch (InvocationTargetException e) {
-
-        }
-        return false;
-    }
-    @Nullable
-    File getAppSpecificAlbumStorageDir(Context context, String albumName) {
-        // Get the pictures directory that's inside the app-specific directory on
-        // external storage.
-        File file = new File(context.getExternalFilesDir(
-                Environment.DIRECTORY_PICTURES), albumName);
-        if (!file.exists() && !file.mkdirs()) {
-            Toast.makeText(getActivity(), "Directory not created", Toast.LENGTH_SHORT).show();
-        }
-        return file;
-    }
-    //更新相册
-    public static void scanFile(String filePath, String str) {
-        if(str == null)
-            str = "已保存至相册";//设置保存成功的提示内容.
-        context = getActivity().getApplicationContext();
-        File oldFile = new File(filePath);
-        String fileName = oldFile.getName();
-//        File appDir = getAppSpecificAlbumStorageDir(context, "Gfg");
-//        Toast.makeText(getActivity(), "appDir " + appDir.getPath(), Toast.LENGTH_SHORT).show();
-//        File file = new File(appDir.getPath(), fileName);
-        String oldFilePath = oldFile.getPath();
-
-//        Bitmap bitmap = BitmapFactory.decodeFile(filePath);
-//        FileOutputStream fos = null;
-//        try {
-//            fos = new FileOutputStream(file);
-//        } catch (FileNotFoundException e) {
-//            // TODO Auto-generated catch block
-//            Log.w("cat", e.toString());
-//        }
-//        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-//
-//        try {
-//            fos.flush();
-//        } catch (IOException e) {
-//            // TODO Auto-generated catch block
-//            Log.w("cat", e.toString());
-//        }
-//        try {
-//            fos.close();
-//        } catch (IOException e) {
-//            // TODO Auto-generated catch block
-//            Log.w("cat", e.toString());
-//        }
-//        bitmap.recycle();
-        String mimeType = getMimeType(oldFile);
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
-            ContentValues values = new ContentValues();
-            values.put(MediaStore.MediaColumns.DISPLAY_NAME,fileName);
-            values.put(MediaStore.MediaColumns.MIME_TYPE, mimeType);
-            values.put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_PICTURES + File.separator + DIRECTORY_WANSHIJING);
-            ContentResolver contentResolver = context.getContentResolver();
-            Uri uri = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-            if(uri == null){
-                String dirPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath() + File.separator + DIRECTORY_WANSHIJING;
-                File dir = new File(dirPath);
-                if(!dir.exists())
-                {
-                    dir.mkdirs();
-                }
-                String newFilePath = dirPath + File.separator + fileName;
-                File newFile = new File(newFilePath);
-                try
-                {
-                    FileOutputStream out = new FileOutputStream(newFile);
-                    FileInputStream fis = new FileInputStream(oldFile);
-                    byte[] data = new byte[1024];
-                    while (fis.read(data) != -1) {
-                        out.write(data);
-                    }
-                    fis.close();
-                    out.close();
-                    context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(new File(newFilePath))));
-                    str += "!";
-                }
-                catch (IOException e)
-                {
-                    e.printStackTrace();
-                    Toast.makeText(getActivity(), "保存失败。", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-            }
-            else
-            {
-                try {
-                    OutputStream out = contentResolver.openOutputStream(uri);
-                    FileInputStream fis = new FileInputStream(oldFile);
-                    byte[] data = new byte[1024];
-                    while (fis.read(data) != -1) {
-                        out.write(data);
-                    }
-                    fis.close();
-                    out.close();
-                    str += "!";
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    Toast.makeText(getActivity(), "保存失败！", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-            }
-
-//        }
-//        else
-//        {
-//            // 其次把文件插入到系统图库
-//            try {
-//                MediaStore.Images.Media.insertImage(context.getContentResolver(),
-//                        newFilePath, fileName, null);
-//            } catch (FileNotFoundException e) {
-//                e.printStackTrace();
-//                Toast.makeText(getActivity(), "insertImage failed", Toast.LENGTH_SHORT).show();
-//            }
-//            context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.fromFile(new File(newFilePath))));
-//        }
-
-        oldFile.delete();
-        //显示提示
-        Toast.makeText(getActivity(), str, Toast.LENGTH_SHORT).show();
-    }
-
-    public static String getMimeType(File file){
-        FileNameMap fileNameMap = URLConnection.getFileNameMap();
-        String type = fileNameMap.getContentTypeFor(file.getName());
-        return type;
-    }
-}

AndroidLibrary/gfglibrary/src/test/java/com/gfg/gfglibrary/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.gfg.gfglibrary;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

AndroidLibrary/gradle.properties

@@ -1,19 +0,0 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true

AndroidLibrary/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Tue Mar 01 11:50:32 CST 2022
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

AndroidLibrary/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

AndroidLibrary/gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

AndroidLibrary/settings.gradle

@@ -1,3 +0,0 @@
-include ':gfglibrary'
-include ':app'
-rootProject.name = "My Application"

GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -12,10 +12,10 @@ namespace GFGGame
             ViewManager.Show<LoginView>();
         }
 
-        public static async ET.ETTask LoginTest(string account)
+        public static async ET.ETTask LoginTest(string account, bool cancelDelete = false)
         {
             ViewManager.Show<ModalStatusView>("登录中...");
-            int errorCode = await ET.LoginHelper.LoginTest(GameGlobal.zoneScene, GameConfig.LoginAddress, account);
+            (int errorCode, long deleteTime) = await ET.LoginHelper.LoginTest(GameGlobal.zoneScene, GameConfig.LoginAddress, account, cancelDelete);
 
             if (errorCode == ET.ErrorCode.ERR_Success)
             {
@@ -42,15 +42,15 @@ namespace GFGGame
             }
             else
             {
-                OnLoginFail(errorCode, account);
+                OnLoginFail(errorCode, account, deleteTime, null, false);
             }
         }
 
 
-        public static async ET.ETTask Login(string account, string password, bool isMD5 = false)
+        public static async ET.ETTask Login(string account, string password, bool isMD5 = false, bool cancelDelete = false)
         {
             ViewManager.Show<ModalStatusView>("登录中...");
-            int errorCode = await ET.LoginHelper.Login(GameGlobal.zoneScene, GameConfig.LoginAddress, account, password, isMD5);
+            (int errorCode, long deleteTime) = await ET.LoginHelper.Login(GameGlobal.zoneScene, GameConfig.LoginAddress, account, password, isMD5, cancelDelete);
 
             if (errorCode == ET.ErrorCode.ERR_Success)
             {
@@ -82,7 +82,7 @@ namespace GFGGame
             }
             else
             {
-                OnLoginFail(errorCode, account);
+                OnLoginFail(errorCode, account, deleteTime, password, isMD5);
             }
         }
 
@@ -101,6 +101,38 @@ namespace GFGGame
 
             ViewManager.Hide<ModalStatusView>();
         }
+        private static void OnLoginFail(int errorCode, string account, long deleteTime, string password, bool isMD5)
+        {
+            ViewManager.Hide<ModalStatusView>();
+            if(errorCode == ErrorCode.ERR_LoginIsLimit && deleteTime > 0)
+            {
+                //删除账号提示
+                AlertSystem.Show("账号注销处理中，若确定登录将取消账号注销，是否确定登录游戏？")
+                    .SetLeftButton(true, "取消", (o)=>
+                    {
+                        GameController.QuitToLoginView(true);
+                        EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL, account);
+                    })
+                    .SetRightButton(true, "确定", (o)=>
+                    {
+                        if(string.IsNullOrEmpty(password))
+                        {
+                            LoginTest(account, true).Coroutine();
+                        }
+                        else
+                        {
+                            Login(account, password, isMD5, true).Coroutine();
+                        }
+                    });
+                return;
+            }
+            if (ErrorCodeController.Handler(errorCode))
+            {
+                GameController.QuitToLoginView(true);
+            }
+            EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL, account);
+        }
+
         private static async ETTask ReqNoticeInfo()
         {
             int result = await LoginHelper.ReqGetLatestNotice();
@@ -124,16 +156,6 @@ namespace GFGGame
             return;
         }
 
-        private static void OnLoginFail(int errorCode, string account)
-        {
-            ViewManager.Hide<ModalStatusView>();
-            if (ErrorCodeController.Handler(errorCode))
-            {
-                GameController.QuitToLoginView(true);
-            }
-            EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL, account);
-        }
-
         public static async ETTask Register(string account, string password, string name, string identityNum, string code)
         {
             ViewManager.Show<ModalStatusView>("注册中...");

GameClient/Assets/Game/HotUpdate/Data/CardDataManager.cs

@@ -32,7 +32,7 @@ namespace GFGGame
 
 
 
-        public static void Add(CardInfoProto cardInfoProto)
+        public static void Add(CardInfoProto cardInfoProto, bool fromeList = false)
         {
             CardData cardData = new CardData();
 
@@ -64,7 +64,7 @@ namespace GFGGame
             }
             _cardDicByType[0][cardData.id] = cardData;
             _cardDicByType[cardData.mainScore][cardData.id] = cardData;
-            if(GameGlobal.AfterDataInited)
+            if(GameGlobal.AfterDataInited && !fromeList)
             {
                 PreloadManager.Instance.PreloadCardAnimationRes(cardData.id);
             }

GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -438,5 +438,14 @@ namespace GFGGame
                 }
             }
         }
+
+        public static bool dataDicOfItemid(int itemId)
+        {
+            if (_dataDic.ContainsKey(itemId))
+            {
+                return true;
+            }
+            return false;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -5,7 +5,7 @@ namespace ET
 {
     public static class LoginHelper
     {
-        public static async ETTask<int> LoginTest(Scene zoneScene, string address, string account)
+        public static async ETTask<(int, long)> LoginTest(Scene zoneScene, string address, string account, bool cancelDelete)
         {
             A2C_LoginAccount a2CLoginAccount = null;
             Session accountSession = null;
@@ -18,27 +18,28 @@ namespace ET
                     Account = account,
                     Version = GameConst.SERVER_VERSION,
                     PlatformId = LauncherConfig.platformId,
-                    ChannelId = LauncherConfig.ChannelId
+                    ChannelId = LauncherConfig.ChannelId,
+                    CancelDelete = cancelDelete
                 });
             }
             catch (Exception e)
             {
                 accountSession?.Dispose();
                 Log.Debug(e.ToString());
-                return ErrorCode.ERR_NetWorkError;
+                return (ErrorCode.ERR_NetWorkError, 0);
             }
 
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
                 accountSession?.Dispose();
-                return a2CLoginAccount.Error;
+                return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
             OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account);
 
-            return ErrorCode.ERR_Success;
+            return (ErrorCode.ERR_Success, 0);
         }
 
-        public static async ETTask<int> Login(Scene zoneScene, string address, string account, string password, bool isMD5)
+        public static async ETTask<(int, long)> Login(Scene zoneScene, string address, string account, string password, bool isMD5, bool cancelDelete)
         {
             A2C_LoginAccount a2CLoginAccount = null;
             Session accountSession = null;
@@ -57,24 +58,25 @@ namespace ET
                     Password = passwordMD5,
                     Version = GameConst.SERVER_VERSION,
                     PlatformId = LauncherConfig.platformId,
-                    ChannelId = LauncherConfig.ChannelId
+                    ChannelId = LauncherConfig.ChannelId,
+                    CancelDelete = cancelDelete
                 });
             }
             catch (Exception e)
             {
                 accountSession?.Dispose();
                 Log.Debug(e.ToString());
-                return ErrorCode.ERR_NetWorkError;
+                return (ErrorCode.ERR_NetWorkError, 0);
             }
 
             if (a2CLoginAccount.Error != ErrorCode.ERR_Success)
             {
                 accountSession?.Dispose();
-                return a2CLoginAccount.Error;
+                return (a2CLoginAccount.Error, a2CLoginAccount.DeleteTime);
             }
             OnLoginSuccess(zoneScene, a2CLoginAccount, accountSession, account);
 
-            return ErrorCode.ERR_Success;
+            return (ErrorCode.ERR_Success, 0);
         }
 
         public static void OnLoginSuccess(Scene zoneScene, A2C_LoginAccount a2CLoginAccount, Session accountSession, string account)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -18,7 +18,7 @@ namespace UI.ActivityThemeLuckyBox
         public GButton m_btnLuckyBox_old;
         public UI_Button1 m_btnLuckyBox;
         public GGraph m_bgEffectHolder;
-        public Transition m_In_1;
+        public Transition m_In_2;
         public const string URL = "ui://ubfk2kobmbf1k";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
         public const string RES_NAME = "ActivityThemeLuckyBoxUI";
@@ -77,7 +77,7 @@ namespace UI.ActivityThemeLuckyBox
             m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
             m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
             m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
-            m_In_1 = comp.GetTransition("In_1");
+            m_In_2 = comp.GetTransition("In_2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,7 +96,7 @@ namespace UI.ActivityThemeLuckyBox
             m_btnLuckyBox.Dispose();
             m_btnLuckyBox = null;
             m_bgEffectHolder = null;
-            m_In_1 = null;
+            m_In_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DeleteAccount/UI_DeleteAccountUI.cs

@@ -23,6 +23,7 @@ namespace UI.DeleteAccount
         public GTextField m_txtAccount;
         public GTextField m_txtLvl;
         public GGroup m_groupSure;
+        public GTextField m_txtSuccess;
         public UI_Button19 m_btnQuit;
         public GGroup m_groupResult;
         public UI_ComTextProtocal m_txtComp_2;
@@ -93,6 +94,7 @@ namespace UI.DeleteAccount
             m_txtAccount = (GTextField)comp.GetChild("txtAccount");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_groupSure = (GGroup)comp.GetChild("groupSure");
+            m_txtSuccess = (GTextField)comp.GetChild("txtSuccess");
             m_btnQuit = (UI_Button19)UI_Button19.Create(comp.GetChild("btnQuit"));
             m_groupResult = (GGroup)comp.GetChild("groupResult");
             m_txtComp_2 = (UI_ComTextProtocal)UI_ComTextProtocal.Create(comp.GetChild("txtComp"));
@@ -123,6 +125,7 @@ namespace UI.DeleteAccount
             m_txtAccount = null;
             m_txtLvl = null;
             m_groupSure = null;
+            m_txtSuccess = null;
             m_btnQuit.Dispose();
             m_btnQuit = null;
             m_groupResult = null;

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -35,7 +35,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            //LoginAddress = "10.108.64.100:10005";//测试地址
+            //LoginAddress = "10.108.64.127:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/HotUpdate/ServerProxy/AccountSProxy.cs

@@ -0,0 +1,61 @@
+using ET;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GFGGame
+{
+    public static class AccountSProxy
+    {
+        public static async ETTask<bool> ReqDeleteAccount(string name, string identityNum)
+        {
+            A2C_ReqDeleteAccount response = null;
+            bool notLogin = false;
+            Session accountSession = GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession;
+            if (accountSession == null || accountSession.IsDisposed)
+            {
+                notLogin = true;
+                accountSession = GameGlobal.zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+            }
+            try
+            {
+                AccountInfoComponent accountInfoComponent = GameGlobal.zoneScene.GetComponent<AccountInfoComponent>();
+                response = (A2C_ReqDeleteAccount)await accountSession?.Call(new C2A_ReqDeleteAccount()
+                {
+                    Account = accountInfoComponent.Account,
+                    Name = name,
+                    IdentityNum = identityNum,
+                    PlatformId = LauncherConfig.platformId,
+                    ChannelId = LauncherConfig.ChannelId
+                });
+            }
+            catch(Exception e)
+            {
+                Log.Debug(e.ToString());
+                ErrorCodeController.Handler(ErrorCode.ERR_NetWorkError);
+                if (notLogin)
+                {
+                    accountSession?.Dispose();
+                }
+                return false;
+            }
+            if(response.Error != ErrorCode.ERR_Success)
+            {
+                ErrorCodeController.Handler(response.Error);
+
+                if (notLogin)
+                {
+                    accountSession?.Dispose();
+                }
+                return false;
+            }
+            if (notLogin)
+            {
+                accountSession?.Dispose();
+            }
+            return true;
+        }
+    }
+}

LuckyBox/LuckyBoxActivityView.cs.meta → GameClient/Assets/Game/HotUpdate/ServerProxy/AccountSProxy.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: add37497970445245886e85b662f414a
+guid: 49d01f5d549e86e4c876a4ab0e69b46f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ServerProxy/CardSProxy.cs

@@ -28,7 +28,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.CardInfos.Count; i++)
                     {
-                        CardDataManager.Add(response.CardInfos[i]);
+                        CardDataManager.Add(response.CardInfos[i], true);
                         SkillDataManager.Instance.InitCardData(response.CardInfos[i].CardId, response.CardInfos[i].KsSkill, response.CardInfos[i].VsSkill);
                     }
                     EventAgent.DispatchEvent(ConstMessage.CARD_INFO);

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -7,6 +7,7 @@ namespace ET
     {
         protected override async ETTask Run(Session session, M2C_NoticeUnitNumeric message)
         {
+            if (GameGlobal.myNumericComponent == null) return;//如果为空表示角色还没有进入游戏，忽略
             var oldValue = GameGlobal.myNumericComponent.GetAsInt(message.NumericType);
             GameGlobal.myNumericComponent.Set(message.NumericType, message.NewValue);
 

GameClient/Assets/Game/HotUpdate/ServerProxy/MessageHelper.cs

@@ -27,5 +27,6 @@ namespace GFGGame
                 return null;
             }
         }
+
     }
 }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -115,6 +115,18 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 将时间戳转换成yyyy-mm-dd hh-mm-ss格式
+        /// </summary>
+        /// <param name="timeMsec">毫秒</param>
+        public static string FormattingTimeMinute(long timeMsec, char split = '-')
+        {
+            DateTime date = TimeInfo.Instance.ToDateTime(timeMsec);
+            string str = date.ToString(string.Format("yyyy{0}MM{0}dd HH:mm", split));
+
+            return str;
+        }
+
+        /// <summary>
         /// 将时间戳转换成yyyy/MM/dd格式
         /// </summary>
         /// <param name="timeMsec">毫秒</param>

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -58,12 +58,10 @@ namespace GFGGame
             _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
 
             // 界面根据ID改变
-            if (_activityId == 2)
-                _ui.m_c1.selectedIndex = 1;
-            else
-                _ui.m_c1.selectedIndex = 0;
-
+            _ui.m_c1.SetSelectedPage(_activityId.ToString());
+            // 活动主界面入场动画
             _ui.target.GetTransition("In_" + _activityId.ToString())?.Play();
+
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
 
@@ -139,7 +137,8 @@ namespace GFGGame
 
         private void UpdateEffect()
         {
-            if (_activityId == 1)
+            // 2表示 阳春花蔓
+            if (_activityId == 2)
             {
                 // Effect
                 _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/New_CK_Flower", "All_tx"));

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs

@@ -69,11 +69,18 @@ namespace GFGGame
             itemReward.m_QualityType.selectedIndex = itemCfg.rarity - 1;
             RarityIconController.UpdateRarityIcon(itemReward.m_loaRarity, itemCfg.id, false);
             if (itemReward.target.data == null)
-                itemReward.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]); });
+                itemReward.target.onClick.Add(OnClickItemReward);
 
-            itemReward.target.data = index;
+            itemReward.target.data = cfg.rewardsArr[0][0];
             UI_ComItem.ProxyEnd();
             UI_ListRewardItem.ProxyEnd();
         }
+
+        public void OnClickItemReward(EventContext context)
+        {
+            if (!(context.sender is GObject obj)) return;
+            int itemID = (int)obj.data;
+            GoodsItemTipsController.ShowItemTips(itemID);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -116,14 +116,19 @@ namespace GFGGame
             _ui.m_comTipsBase.m_loaRarity.visible = isDressUpOrCard;
             _ui.m_comTipsBase.m_grpScore.visible = isDressUpOrCard;
             if (!isDressUpOrCard) return;
-            //_ui.m_comTipsBase.m_txtGong.text = "" + itemCfg.score1;
-            //_ui.m_comTipsBase.m_txtShang.text = "" + itemCfg.score2;
-            //_ui.m_comTipsBase.m_txtJue.text = "" + itemCfg.score3;
-            //_ui.m_comTipsBase.m_txtZhi.text = "" + itemCfg.score4;
-            _ui.m_comTipsBase.m_txtGong.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.FENG).ToString();
-            _ui.m_comTipsBase.m_txtShang.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.HUA).ToString();
-            _ui.m_comTipsBase.m_txtJue.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.XUE).ToString();
-            _ui.m_comTipsBase.m_txtZhi.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.YUE).ToString();
+            if (ItemDataManager.dataDicOfItemid(itemCfg.id))
+            {
+                _ui.m_comTipsBase.m_txtGong.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.FENG).ToString();
+                _ui.m_comTipsBase.m_txtShang.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.HUA).ToString();
+                _ui.m_comTipsBase.m_txtJue.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.XUE).ToString();
+                _ui.m_comTipsBase.m_txtZhi.text = ItemDataManager.GetItemAdditionScore(itemCfg.id, (int)ConstItemAttributeType.YUE).ToString();
+            }
+            else {
+                _ui.m_comTipsBase.m_txtGong.text = "" + itemCfg.score1;
+                _ui.m_comTipsBase.m_txtShang.text = "" + itemCfg.score2;
+                _ui.m_comTipsBase.m_txtJue.text = "" + itemCfg.score3;
+                _ui.m_comTipsBase.m_txtZhi.text = "" + itemCfg.score4;
+            }
         }
         private void UpdateTags()
         {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -81,7 +81,6 @@ namespace GFGGame
             _ui.m_t0.SetHook("touch", () => { GRoot.inst.touchable = true; });
             _ui.m_t0.Play(() =>
             {
-                _ui.m_proSign.m_holder.visible = true;
                 //不知道sethook会不会出问题，在这里也加一个
                 GRoot.inst.touchable = true;
                 if (m_holderSign != null)
@@ -145,6 +144,10 @@ namespace GFGGame
             {
                 _ui.m_proSign.m_holder.visible = false;
             }
+            else
+            {
+                _ui.m_proSign.m_holder.visible = true;
+            }
             _ui.m_proSign.m_holder.x = _signCount / signCfgs[signCfgs.Count - 1].day * _ui.m_proSign.target.width - 88;
             
             _ui.m_proSign.m_holderReward.visible = false;

GameClient/Assets/Game/HotUpdate/Views/DeleteAccount/DeleteAccountView.cs

@@ -2,6 +2,7 @@
 using ET;
 using UI.DeleteAccount;
 using UnityEngine;
+using System;
 
 namespace GFGGame
 {
@@ -122,10 +123,10 @@ namespace GFGGame
 
         private void OnClickBtnQuit(EventContext context)
         {
-            Application.Quit();
+            GameController.QuitToLoginView(true);
         }
 
-        private void OnClickBtnSure(EventContext context)
+        private async void OnClickBtnSure(EventContext context)
         {
             string realName = _ui.m_inputName.text;
             string idNumberStr = _ui.m_inputIDNumber.text;
@@ -139,7 +140,12 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("请输入身份证号");
                 return;
             }
-            _ui.m_c1.selectedIndex = IndexResult;
+            bool result = await AccountSProxy.ReqDeleteAccount(realName, idNumberStr);
+            if(result)
+            {
+                _ui.m_c1.selectedIndex = IndexResult;
+                UpdateSuccessTab();
+            }
         }
 
         private void OnClickBtnNext2(EventContext context)
@@ -162,5 +168,11 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = IndexText2;
         }
 
+        private void UpdateSuccessTab()
+        {
+            long targetTime = TimeUtil.AddDays(15);
+            var targetTimeStr = TimeUtil.FormattingTimeMinute(targetTime);
+            _ui.m_txtSuccess.SetVar("time", targetTimeStr).FlushVars();
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -199,19 +199,32 @@ namespace GFGGame
             GObject obj = context.sender as GObject;
             int index = (int)obj.data;
 
+            Vector2 size = Vector2.zero;
             Vector2 pos = new Vector2();
-            if (index % 2 == 0) {
-                pos = _ui.m_ListTeaParty.LocalToGlobal(TeaPartyItemObj[index].position);
-                pos.x = pos.x + TeaPartyItemObj[index].width;
-                pos.y = pos.y + TeaPartyItemObj[index].height / 2;
+            UI_comTeaPartyItem itemObj = UI_comTeaPartyItem.Proxy(TeaPartyItemObj[index]);
+            if (itemObj.m_btnDetail != null)
+            {
+                pos = itemObj.m_btnDetail.LocalToRoot(Vector2.zero, GRoot.inst);
+                size = itemObj.m_btnDetail.LocalToRoot(itemObj.m_btnDetail.size, GRoot.inst) - pos;
             }
-            else { 
-                pos = _ui.m_ListTeaParty.LocalToGlobal(TeaPartyItemObj[index].position);
-                pos.x = pos.x - TeaPartyItemObj[index].width;
-                pos.y = pos.y + TeaPartyItemObj[index].height / 2;
+            else
+            {
+                pos = obj.GlobalToLocal(Stage.inst.touchPosition);
             }
-            
-            _ui.m_teaPartyItemTips.m_window.position = pos;
+
+            float xx, yy;
+            xx = pos.x - size.x * 2;
+            if (xx + _ui.m_teaPartyItemTips.m_window.width > _ui.target.viewWidth)
+                xx = xx + size.x * 4 - _ui.m_teaPartyItemTips.m_window.width;
+            yy = pos.y + size.y;
+            if (yy + _ui.m_teaPartyItemTips.m_window.height > _ui.target.viewHeight)
+            {
+                yy = pos.y - _ui.m_teaPartyItemTips.m_window.height;
+                if (yy < 0)
+                    yy = 0;
+            }
+            UI_comTeaPartyItem.ProxyEnd();
+            _ui.m_teaPartyItemTips.m_window.position = new Vector2(Mathf.RoundToInt(xx), Mathf.RoundToInt(yy));
 
             _ui.m_teaPartyItemTips.target.visible = true;
             _ui.m_teaPartyItemTips.m_txtName.text = teapartyRoleCfg[index].name;

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs

@@ -171,7 +171,9 @@ namespace GFGGame
             Timers.inst.Remove(UpDataTime);
             Timers.inst.Remove(UpClickDataTime);
             Timers.inst.Remove(touchFlipOpen);
+            Timers.inst.Remove(UpDataTimeTouchLoaBg);
             GetSuitItemController.isAuto = false;
+            _touchLoaBg = true;
 
             foreach (var v in _effectUIDic)
             {
@@ -332,7 +334,7 @@ namespace GFGGame
                 return;
             }
             _touchLoaBg = false;
-            Timers.inst.Add(0.01f, 1, UpDataTimeTouchLoaBg);
+            Timers.inst.Add(0.5f, 1, UpDataTimeTouchLoaBg);
 
             if (_recordOpenIndex.Count >= _rewardList.Count)
             {

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoSaveView.cs

@@ -77,7 +77,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    RefreshTravelPhoto(savePhoto.photoInfos[i]);
+                    RefreshTravelPhoto(savePhoto.photoInfos[index]);
                     await Task.Delay(50);
                     captureFinished = false;
                     Timers.inst.StartCoroutine(CaptureByUI());

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -49,6 +49,11 @@ namespace GFGGame
             _ui.m_btnAddNum.onClick.Add(OnClickBtnAddCount);
             _ui.m_btnSetNum.onClick.Add(OnClickBtnSetCount);
             _ui.m_ComBtn.m_btnTeaPartyStart.onClick.Add(OnClickBtnTeaPartyStart);
+
+
+            var dataArray = RoleLevelCfgArray.Instance.dataArray;
+            RoleLevelCfg maxLvlCfg = dataArray[dataArray.Length - 1];
+            _ui.m_ComBtn.m_txtRoleLv.text = maxLvlCfg.id + "";
         }
 
         protected override void OnShown()
@@ -248,7 +253,7 @@ namespace GFGGame
             }
             OnClickBtnGetAllDressUpItem();
             OnClickBtnGetAllCardItem();
-            _ui.m_ComBtn.m_txtRoleLv.text = "99";
+
             OnClickBtnSetLv();
             InitChapterText();
             OnClickBtnSetChapter();

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/SettingView.cs

@@ -62,7 +62,7 @@ namespace GFGGame
             _ui.m_childrenAgree.onClick.Add(OnChildrenAgreeClick);
             _ui.m_txtDeleteAccount.onClick.Add(OnClickTxtDeleteAccount);
 
-            _ui.m_groupAccount.visible = false;
+            _ui.m_groupAccount.visible = GameConfig.tsStatus > 0;
         }
 
         protected override void OnShown()

LuckyBox/LuckyBoxActivityView.cs

@@ -1,266 +0,0 @@
-using FairyGUI;
-using UI.LuckyBox;
-using UI.CommonGame;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-using ET;
-
-namespace GFGGame
-{
-    public class LuckyBoxActivityView : BaseWindow
-    {
-        private UI_LuckyBoxActivityUI _ui;
-        private ValueBarController _valueBarController;
-        private LuckyBoxController _luckyBoxCtrl;
-        private ActivityOpenCfg _activityCfg;
-        private LuckyBoxCfg _luckyBoxCfg;
-        private int _activityId;
-
-        public override void Dispose()
-        {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
-            if (_luckyBoxCtrl != null)
-            {
-                _luckyBoxCtrl.Dispose();
-                _luckyBoxCtrl = null;
-            }
-
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_LuckyBoxActivityUI.PACKAGE_NAME;
-            _ui = UI_LuckyBoxActivityUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
-            _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
-
-            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnReward.onClick.Add(OnClikcBtnReward);
-            _ui.m_btnShop.onClick.Add(OnClikcBtnShop);
-            _ui.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
-
-        }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
-            _activityId = (int)this.viewData;
-            _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
-            _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
-            _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
-            Timers.inst.Add(1, 0, UpdateTime);
-            UpdateView();
-        }
-        private void UpdateTime(object param = null)
-        {
-            long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
-            long curTime = TimeHelper.ServerNow();
-            if (endTime < curTime)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-                Timers.inst.Remove(UpdateTime);
-                OnClickBtnBack();
-                return;
-            }
-            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
-
-            //=====限时礼包倒计时
-            UpGiftBox();
-            if (ViewManager.isViewOpen(nameof(RushSaleGiftBoxView)))
-            {
-                var rushSaleGiftBoxView =
-                    ViewManager.GetUIView(nameof(RushSaleGiftBoxView)) as RushSaleGiftBoxView;
-                rushSaleGiftBoxView?.UpTime();
-            }
-            //=====限时礼包倒计时END
-        }
-
-        private void UpdateView()
-        {
-            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
-            _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
-            UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
-
-            LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
-            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
-            comBox.m_btnPreview.m_c1.selectedIndex = 1;
-            LuckyBoxDataManager.Instance.GetOwnedCount(_luckyBoxCfg.id, out int count, out int totalCount);
-            comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
-            comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
-            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
-            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", _luckyBoxCfg.maxCount - boughtCount);
-
-            comBox.m_comCostOne.m_txtCost.text = _luckyBoxCfg.costNum.ToString();
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
-            comBox.m_comCostTen.m_txtCost.text = _luckyBoxCfg.costNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
-
-            if (comBox.m_btnBuyOne.target.data == null)
-            {
-                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
-            }
-            comBox.m_btnBuyOne.target.data = _luckyBoxCfg.id;
-
-            if (comBox.m_btnBuyTen.target.data == null)
-            {
-                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
-            }
-            comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
-            comBox.m_imgActLuckyBox.visible = true;
-            comBox.m_grpLuckyBox.visible = false;
-            if (comBox.m_btnPreview.target.data == null)
-            {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
-            }
-            comBox.m_btnPreview.target.data = _luckyBoxCfg.id;
-
-            comBox.target.data = _luckyBoxCfg.id;
-
-            UI_ComBox.ProxyEnd();
-        }
-
-        private void UpGiftBox()
-        {
-            var activityInfoByTypeList =
-                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
-
-            var list = activityInfoByTypeList
-                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-            {
-                _ui.m_comBagTime.target.visible = false;
-                _ui.m_btnGiftBag.visible = false;
-            }
-            else
-            {
-                _ui.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_comBagTime.target.visible = true;
-                _ui.m_btnGiftBag.visible = true;
-            }
-        }
-
-        private void OnClickBtnPreview(EventContext context)
-        {
-            GObject obj = context.sender as GObject;
-            int boxId = (int)obj.data;
-            ViewManager.Show(ViewName.LUCKY_BOX_PRE_SHOW_VIEW, boxId);
-        }
-
-        private void OnClickBtnBuyOne(EventContext context)
-        {
-            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
-            if (boughtCount + LuckyBoxDataManager.ONCE_TIME > _luckyBoxCfg.maxCount)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
-                return;
-            }
-            LuckyBoxDataManager.Instance.CheckItemEnough(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME, async () =>
-             {
-                 bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME);
-                 if (result)
-                 {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
-                     //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
-                 }
-             });
-        }
-
-        private void OnClickBtnBuyTen(EventContext context)
-        {
-
-            GObject obj = context.sender as GObject;
-            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
-            if (boughtCount + LuckyBoxDataManager.TEN_TIME > _luckyBoxCfg.maxCount)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
-                return;
-            }
-            LuckyBoxDataManager.Instance.CheckItemEnough(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME, async () =>
-            {
-                bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME);
-                if (result)
-                {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
-                    // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
-                }
-            });
-        }
-
-        private void OnClikcBtnReward()
-        {
-            ViewManager.Show<ActivityThemeLuckyBoxBonusView>();
-        }
-        private void OnClikcBtnShop()
-        {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
-        }
-
-        //限时礼包按钮点击执行方法
-        private void OnClikcBtnGiftBag()
-        {
-            var activityInfoByTypeList =
-                ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLB3);
-
-            var list = activityInfoByTypeList
-                .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
-            if (list.Count == 0)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("活动已结束");
-            }
-            else
-            {
-                ViewManager.Show<RushSaleGiftBoxView>(new object[] { ActivityType.XSLB3, this.viewData });
-            }
-        }
-
-        protected override void OnHide()
-        {
-            base.OnHide();
-            _valueBarController.OnHide();
-            _luckyBoxCtrl.OnHide();
-            Timers.inst.Remove(UpdateTime);
-        }
-
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-        }
-
-        private void OnClickBtnBack()
-        {
-            ViewManager.GoBackFrom(typeof(LuckyBoxActivityView).FullName);
-        }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-        }
-        protected override void TryCompleteGuide()
-        {
-            base.TryCompleteGuide();
-        }
-    }
-}

LuckyBox/LuckyBoxBonusView.cs

@@ -1,357 +0,0 @@
-using UnityEngine;
-using FairyGUI;
-using UI.LuckyBox;
-using System.Collections.Generic;
-using System.Collections;
-
-namespace GFGGame
-{
-    public class LuckyBoxBonusView : BaseWindow
-    {
-        private UI_LuckBoxBonusUI _ui;
-        private List<ItemData> itemList;
-        private List<ItemData> itemListAni;
-        private GComponent _curComItem;
-        private int openCount = 0;
-        private List<ItemData> newItemList = new List<ItemData>();
-        private List<int> newCardList = new List<int>();
-        private List<bool> openState = new List<bool>();
-        // private int openIndex = 0;
-
-        private List<GameObject> _gameobjects = new List<GameObject>();
-        private List<GoWrapper> _wrappers = new List<GoWrapper>();
-        private GameObject _gameobject;
-        private GoWrapper _wrapper;
-
-        private string _goBackViewName;
-        private object _goBackParams;
-        public override void Dispose()
-        {
-            base.Dispose();
-            for (int i = 0; i < _gameobjects.Count; i++)
-            {
-                SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
-
-            }
-            SceneController.DestroyObjectFromView(_gameobject, _wrapper);
-
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_LuckBoxBonusUI.PACKAGE_NAME;
-            _ui = UI_LuckBoxBonusUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            InitAllItem();
-            _ui.m_loaBg.onClick.Add(OnClickBg);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bj_ckzxin");
-            _ui.m_btnPass.onClick.Add(OnBtnPassClick);
-
-        }
-
-        protected override void OnShown()
-        {
-            base.OnShown();
-            _goBackViewName = ViewManager.GetGoBackDatas(typeof(LuckyBoxStarView).FullName)[0].ToString();
-            _goBackParams = ViewManager.GetGoBackDatas(typeof(LuckyBoxStarView).FullName)[1];
-
-            itemList = (viewData as object[])[0] as List<ItemData>;
-            itemListAni = new List<ItemData>(itemList.ToArray());
-            _ui.m_loaMask.visible = true;
-
-            int count = itemList.Count;
-            if (count == 10)
-            {
-                _ui.m_c1.selectedIndex = 1;
-            }
-            else if (count > 0)
-            {
-                _ui.m_c1.selectedIndex = 0;
-            }
-            ShowBonusList();
-
-            _ui.m_t0.Play(UpdateView);
-            //
-        }
-
-        protected override void OnHide()
-        {
-            base.OnHide();
-            _ui.m_t1.Play();
-            openCount = 0;
-            newCardList.Clear();
-            newItemList.Clear();
-            itemList.Clear();
-            for (int i = 0; i < openState.Count; i++)
-            {
-                openState[i] = false;
-            }
-        }
-        private void InitAllItem()
-        {
-            string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_fk");
-            UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne.target);
-            itemUI.target.onClick.Add(OnClickItem);
-            itemUI.m_comIcon.m_icon.onClick.Add(OnClickItemTips);
-            SceneController.AddObjectToView(null, null, itemUI.m_holder, resPath, out _gameobject, out _wrapper);
-            UI_LuckyBoxBonusItem.ProxyEnd();
-
-            for (int i = 0; i < 10; i++)
-            {
-                GObject itemObject = _ui.target.GetChild("item" + i);
-                if (itemObject != null)
-                {
-                    UI_LuckyBoxBonusItem itemUITen = UI_LuckyBoxBonusItem.Proxy(itemObject);
-                    itemUITen.target.onClick.Add(OnClickItem);
-                    itemUITen.m_comIcon.m_icon.onClick.Add(OnClickItemTips);
-                    SceneController.AddObjectToView(null, null, itemUITen.m_holder, resPath, out GameObject gameobject, out GoWrapper wrapper);
-                    _gameobjects.Add(gameobject);
-                    _wrappers.Add(wrapper);
-                    UI_LuckyBoxBonusItem.ProxyEnd();
-                    openState.Add(false);
-                }
-            }
-        }
-        private void OnClickBg()
-        {
-            if (openCount < itemList.Count)
-            {
-                OnClickOpen();
-            }
-            else
-            {
-                this.Hide();
-                ViewManager.Show(_goBackViewName, _goBackParams);
-                GetSuitItemController.TryShow(0);
-                _ui.m_t0.Stop(true, false);
-            }
-        }
-        private void UpdateView()
-        {
-
-            _ui.m_loaMask.visible = false;
-            // int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            // List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            // ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
-        }
-        private void ShowBonusList()
-        {
-            if (itemList.Count > 1)
-            {
-                for (int i = 0; i < itemList.Count; i++)
-                {
-                    GObject itemObject = _ui.target.GetChild("item" + i);
-                    if (itemObject != null)
-                    {
-                        _gameobjects[i].SetActive(false);
-                        UpdateItem(i, itemObject);
-                    }
-                }
-            }
-            else
-            {
-                _gameobject.SetActive(false);
-                UpdateItem(0, _ui.m_itemOne.target);
-            }
-        }
-
-        private void UpdateItem(int index, GObject obj)
-        {
-            ItemData itemData = itemList[index];
-            UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(obj);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-            bool isFirst = true;
-            int count = 0;
-            for (int i = 0; i < itemList.Count; i++)
-            {
-                if (i < index && itemList[i].id == itemData.id)
-                {
-                    isFirst = false;
-                }
-                if (itemList[i].id == itemData.id)
-                {
-                    count++;
-                }
-            }
-            itemUI.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            itemUI.m_comIcon.m_imgNew.visible = itemCfg.itemType != ConstItemType.ITEM && ItemDataManager.GetItemNum(itemData.id) == count && isFirst ? true : false;
-            string itemName = itemCfg.name;
-            itemUI.m_comIcon.m_txtName.text = itemName;
-            itemUI.m_c1.selectedIndex = itemCfg.rarity;
-            itemUI.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
-            RarityIconController.UpdateRarityIcon(itemUI.m_comIcon.m_rarity, itemData.id, false);
-            itemUI.m_comIcon.m_icon.data = itemData.id;
-            itemUI.target.data = index;
-            itemUI.m_t0.Play();
-            UI_LuckyBoxBonusItem.ProxyEnd();
-        }
-
-
-        private void OnClickItem(EventContext context)
-        {
-            GComponent item = context.sender as GComponent;
-
-            PlayOpenAni(item);
-        }
-        private void OnClickOpen()
-        {
-            if (itemList.Count == 1)
-            {
-                PlayOpenAni(_ui.m_itemOne.target);
-                return;
-            }
-            for (int i = 0; i < itemList.Count; i++)
-            {
-                GComponent component = _ui.target.GetChild("item" + i).asCom;
-                if (component != null)
-                {
-                    bool playing = PlayOpenAni(component);
-                    if (!playing) continue;
-                    if (playing) break;
-                }
-            }
-        }
-
-
-        private bool PlayOpenAni(GComponent component)
-        {
-            Transition transition = component.GetTransition("t1");
-            GComponent comIcon = component.GetChild("comIcon").asCom;
-            if (transition.playing || comIcon.alpha == 1) return false;
-            GImage imgNew = component.GetChild("comIcon").asCom.GetChild("imgNew").asImage;
-            if (imgNew.visible)
-            {
-                _ui.m_loaMask.visible = true;
-
-            }
-            _curComItem = component;
-            int index = (int)_curComItem.data;
-            if (itemList.Count == 1)
-            {
-                _gameobject.SetActive(true);
-            }
-            else
-            {
-                _gameobjects[index].SetActive(true);
-            }
-            transition.Play(UpdateOpenCount);
-            return true;
-        }
-        private void UpdateOpenCount()
-        {
-            GImage imgNew = _curComItem.GetChild("comIcon").asCom.GetChild("imgNew").asImage;
-            int index = (int)_curComItem.data;
-            if (imgNew.visible)
-            {
-                ItemData itemData = itemList[index];
-                ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                if (cfg.itemType == ConstItemType.DRESS_UP)
-                {
-                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemData.id, itemData.num);
-                    ViewManager.Show<LuckyBoxNewDressView>(itemDatas);
-                }
-                else if (cfg.itemType == ConstItemType.CARD)
-                {
-                    List<int> list = new List<int>();
-                    list.Add(itemData.id);
-                    ViewManager.Show<LuckyBoxNewCardView>(new object[] { list, new List<ItemData>() });
-                }
-            }
-            openCount++;
-            openState[index] = true;
-            _ui.m_loaMask.visible = false;
-
-        }
-        private void OnClickItemTips(EventContext context)
-        {
-            GLoader item = context.sender as GLoader;
-            int itemID = (int)item.data;
-            GoodsItemTipsController.ShowItemTips(itemID);
-        }
-
-
-        private void OnBtnPassClick()
-        {
-            if (openCount == itemList.Count)
-            {
-                OnClickBg();
-                return;
-            }
-            _ui.m_loaMask.visible = true;
-            if (itemList.Count == 1)
-            {
-                PlayOpenAni(_ui.m_itemOne.target);
-            }
-            else
-            {
-                // Timers.inst.Add(0.3f, openState.Count - openCount, UpdateTime);
-                Timers.inst.StartCoroutine(UpdatePass());
-            }
-        }
-        public IEnumerator UpdatePass()
-        {
-            for (int i = 0; i < openState.Count; i++)
-            {
-                if (openState[i] == false)
-                {
-                    yield return new WaitForSeconds(0.3f);
-                    yield return UpdateTime(i);
-                }
-            }
-            _ui.m_loaMask.visible = false;
-        }
-        private IEnumerator UpdateTime(int index)
-        {
-            GComponent component = _ui.target.GetChild("item" + index).asCom;
-            Transition transition = component.GetTransition("t1");
-            GComponent comIcon = component.GetChild("comIcon").asCom;
-            GImage imgNew = comIcon.GetChild("imgNew").asImage;
-
-            openCount++;
-            openState[index] = true;
-            if (imgNew.visible)
-            {
-                ItemData itemData = itemList[index];
-                ET.Log.Debug("zoya:  itemData:" + itemData);
-                ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemData.id);
-                if (cfg.itemType == ConstItemType.DRESS_UP)
-                {
-                    newItemList.Insert(0, itemData);
-                }
-                else if (cfg.itemType == ConstItemType.CARD)
-                {
-                    newCardList.Insert(0, itemData.id);
-                }
-            }
-            _gameobjects[index].SetActive(true);
-            if (openCount == itemList.Count)
-            {
-                transition.Play(PlayComplete);
-            }
-            else
-            {
-                transition.Play();
-            }
-            yield return null;
-        }
-        private void PlayComplete()
-        {
-            if (newCardList.Count > 0)
-            {
-                ViewManager.Show<LuckyBoxNewCardView>(new object[] { newCardList, newItemList });
-            }
-            else if (newItemList.Count > 0)
-            {
-                ViewManager.Show<LuckyBoxNewDressView>(newItemList);
-            }
-        }
-    }
-}

LuckyBox/LuckyBoxBonusView.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 73af8e74b08d7954ab3b1b372524f7f6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

LuckyBox/LuckyBoxNewCardView.cs

@@ -1,81 +0,0 @@
-using System.Collections.Generic;
-using ET;
-using FairyGUI;
-using UI.LuckyBox;
-using UnityEngine;
-
-namespace GFGGame
-{
-    public class LuckyBoxNewCardView : BaseWindow
-    {
-        private UI_LuckyBoxNewCardUI _ui;
-        private List<int> _newCardList = new List<int>();
-        private List<ItemData> _newDressList = new List<ItemData>();
-        public override void Dispose()
-        {
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_LuckyBoxNewCardUI.PACKAGE_NAME;
-            _ui = UI_LuckyBoxNewCardUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            _ui.m_loaBg.onClick.Add(OnClickBtnBg);
-        }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
-
-            _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
-            _newDressList = new List<ItemData>((this.viewData as object[])[1] as List<ItemData>);
-            updateView();
-
-        }
-        private void updateView()
-        {
-            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_newCardList[0]);
-            _ui.m_loaBg.url = ResPathUtil.GetCardPath(cfg.res);
-            _newCardList.RemoveAt(0);
-        }
-        protected override void OnHide()
-        {
-            base.OnHide();
-
-        }
-
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-
-        }
-
-        private void OnClickBtnBg()
-        {
-            if (_newCardList.Count == 0)
-            {
-                this.Hide();
-                if (_newDressList.Count > 0)
-                {
-                    ViewManager.Show<LuckyBoxNewDressView>(_newDressList);
-                }
-                return;
-            }
-            updateView();
-
-        }
-    }
-}

LuckyBox/LuckyBoxNewCardView.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 180e77ed5042c9e4ca338758a35f3e93
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

LuckyBox/LuckyBoxNewDressView.cs

@@ -1,178 +0,0 @@
-using System.Collections;
-using UnityEngine;
-using UI.LuckyBox;
-using System.Collections.Generic;
-using FairyGUI;
-using System.Linq;
-
-namespace GFGGame
-{
-
-    public class LuckyBoxNewDressView : BaseWindow
-    {
-        private UI_LuckyBoxNewDressUI _ui;
-        private List<ItemData> _rewardList = new List<ItemData>();
-        // private List<ItemData> _newRewardList = new List<ItemData>();
-        // private List<ItemData> _oldRewardList = new List<ItemData>();
-        // private List<ItemData> _showRewardList = new List<ItemData>();
-
-        // private int _type = 0;//弹窗类型：0可跳过，1：首次获得物品不可跳过,2首次获得物品不可跳过,不弹获得套装界面
-
-        private GameObject gameObject;
-        private GoWrapper wrapper;
-        public override void Dispose()
-        {
-            base.Dispose();
-            SceneController.DestroyObjectFromView(gameObject, wrapper);
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_LuckyBoxNewDressUI.PACKAGE_NAME;
-            _ui = UI_LuckyBoxNewDressUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            this.modal = true;
-
-
-            _ui.m_bg.onTouchBegin.Add(OnClickBg);
-            _ui.m_btnPass.onClick.Add(OnClickBtnPass);
-
-
-            string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
-            SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
-            List<ItemData> rewardList = this.viewData as List<ItemData>;
-            if (_rewardList.Count > 0)
-            {
-                _rewardList.AddRange(rewardList);
-                return;
-            }
-            else
-            {
-                _rewardList = rewardList;
-            }
-            _ui.m_btnPass.visible = false;
-            // _newRewardList.Clear();
-            // _oldRewardList.Clear();
-            // for (int i = 0; i < _rewardList.Count; i++)
-            // {
-            //     if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
-            //     {
-            //         _newRewardList.Add(_rewardList[i]);
-            //     }
-            //     else
-            //     {
-            //         _oldRewardList.Add(_rewardList[i]);
-            //     }
-            // }
-            // if (LuckyBoxDataManager.Instance.luckyBoxId > 0)//必展示必掉奖励
-            // {
-            //     int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            //     List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            //     _newRewardList.AddRange(itemDatas);
-            //     LuckyBoxDataManager.Instance.luckyBoxId = 0;
-            // }
-            LuckyBoxDataManager.Instance.luckyBoxId = 0;
-
-            UpdateView();
-        }
-        private void UpdateView()
-        {
-            // _ui.m_btnPass.visible = _newRewardList.Count <= 1;
-            // _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
-
-            if (_rewardList.Count - 1 < 0) return;
-            ItemData itemdata = _rewardList[_rewardList.Count - 1];
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemdata.id);
-            _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + itemCfg.rarity);
-            _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            // int mainScore = 0;
-            // int mainScoreValue = 0;
-            // ItemDataManager.GetMainScore(itemdata.id, out mainScore, out mainScoreValue);
-            _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
-
-            _ui.m_comCard.m_txtName.text = itemCfg.name;
-            _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
-            _ui.m_comCard.m_holder.visible = true;
-
-            if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
-            {
-                LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);
-            }
-            _rewardList.RemoveAt(_rewardList.Count - 1);
-
-        }
-
-        private void OnClickBg()
-        {
-            if (_rewardList.Count == 0)
-            {
-                //     // if (_type == (int)FirstGetCardViewType.JUMP)
-                //     // {
-                //     ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0] as List<ItemData>, _rewardList });
-                //     // }
-                //     // else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
-                //     // {
-                //     //     GetSuitItemController.TryShow(0);
-
-                //     // }
-                this.Hide();
-                return;
-            }
-
-
-            _ui.m_t_close.Play(() =>
-            {
-                _ui.m_comCard.m_holder.visible = false;
-                _ui.m_t_open.Play();
-                UpdateView();
-            });
-        }
-        private int GetThisCount(int itemId, List<ItemData> rewards)
-        {
-            int count = 0;
-            for (int i = 0; i < rewards.Count; i++)
-            {
-                if (rewards[i].id == itemId)
-                {
-                    count++;
-                }
-            }
-            return count;
-        }
-        private bool IsAddToNewRewardList(int itemId)
-        {
-            for (int i = 0; i < _rewardList.Count; i++)
-            {
-                if (itemId == _rewardList[i].id)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-        private void OnClickBtnPass()
-        {
-
-            ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0], _rewardList });
-            this.Hide();
-        }
-        protected override void OnHide()
-        {
-            _ui.m_t_close.Stop(true, false);
-            _ui.m_t_open.Stop(true, false);
-            base.OnHide();
-        }
-    }
-}

LuckyBox/LuckyBoxNewDressView.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: af5d144dfd5a4b745a528cb1e1b173fa
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

LuckyBox/LuckyBoxPreShowView.cs

@@ -1,81 +0,0 @@
-using UI.LuckyBox;
-using UI.CommonGame;
-using System.Collections.Generic;
-using FairyGUI;
-
-namespace GFGGame
-{
-    public class LuckyBoxPreShowView : BaseWindow
-    {
-        private UI_LuckyBoxPreShowUI _ui;
-        private List<LuckyBoxBonusData> _bonusList;
-
-        public override void Dispose()
-        {
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            _ui = UI_LuckyBoxPreShowUI.Create();
-            this.viewCom = _ui.target;
-            this.viewCom.Center();
-            this.modal = true;
-        }
-
-        protected override void OnShown()
-        {
-            base.OnShown();
-            int boxId = (int)this.viewData;
-            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            string probShow = cfg.probShow.Replace("\\n", "\n");
-            _ui.m_compText.m_txtShow.text = probShow;
-
-            _bonusList = LuckyBoxDataManager.Instance.GetCurrentShowList(boxId);
-            _ui.m_list.RemoveChildrenToPool();
-            _ui.m_list.itemRenderer = ListItemRenderer;
-            _ui.m_list.numItems = _bonusList.Count;
-        }
-
-        protected override void OnHide()
-        {
-            base.OnHide();
-            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
-            _ui.m_list.RemoveChildrenToPool();
-        }
-
-        private void ListItemRenderer(int index, GObject item)
-        {
-            UI_CompLuckyBoxBonusListItem listItem = UI_CompLuckyBoxBonusListItem.Proxy(item);
-            LuckyBoxBonusData luckyBoxBonusData = _bonusList[index];
-            listItem.m_txtName.text = luckyBoxBonusData.name;
-            if (listItem.m_list.data == null)
-            {
-                listItem.m_list.itemRenderer = ListItemRewardRender;
-            }
-            listItem.m_list.data = luckyBoxBonusData.itemList;
-            listItem.m_list.numItems = luckyBoxBonusData.itemList.Count;
-            listItem.m_list.ResizeToFit();
-            listItem.target.height = listItem.m_list.y + listItem.m_list.height;
-            UI_CompLuckyBoxBonusListItem.ProxyEnd();
-        }
-        private void ListItemRewardRender(int index, GObject obj)
-        {
-            ItemData itemData = (obj.parent.data as List<ItemData>)[index];
-            if (obj.data == null)
-            {
-                obj.data = new ItemView(obj as GComponent);
-            }
-                (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).ShowHasCount = false;
-            (obj.data as ItemView).ImgHasVisible = ItemDataManager.GetItemNum(itemData.id) > 0;
-
-        }
-    }
-}

LuckyBox/LuckyBoxPreShowView.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1d4d2ee15f610904fb75977c3c3beb6a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: