Просмотр исходного кода

修仙项目整理框架, 从WebGL项目复制过来的

hexiaojie 2 дней назад
Родитель
Сommit
99dd9d319a
82 измененных файлов с 2388 добавлено и 3272 удалено
  1. 0 14
      AndroidLibrary/.gitignore
  2. 0 1
      AndroidLibrary/.idea/.name
  3. 0 116
      AndroidLibrary/.idea/codeStyles/Project.xml
  4. 0 6
      AndroidLibrary/.idea/compiler.xml
  5. 0 22
      AndroidLibrary/.idea/gradle.xml
  6. 0 25
      AndroidLibrary/.idea/jarRepositories.xml
  7. 0 9
      AndroidLibrary/.idea/misc.xml
  8. 0 6
      AndroidLibrary/.idea/vcs.xml
  9. 0 1
      AndroidLibrary/app/.gitignore
  10. 0 33
      AndroidLibrary/app/build.gradle
  11. 0 21
      AndroidLibrary/app/proguard-rules.pro
  12. 0 26
      AndroidLibrary/app/src/androidTest/java/com/example/myapplication/ExampleInstrumentedTest.java
  13. 0 21
      AndroidLibrary/app/src/main/AndroidManifest.xml
  14. BIN
      AndroidLibrary/app/src/main/app_icon-playstore.png
  15. BIN
      AndroidLibrary/app/src/main/ic_launcher-playstore.png
  16. 0 14
      AndroidLibrary/app/src/main/java/com/example/myapplication/MainActivity.java
  17. 0 30
      AndroidLibrary/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
  18. BIN
      AndroidLibrary/app/src/main/res/drawable/icon.jpg
  19. BIN
      AndroidLibrary/app/src/main/res/drawable/icon.png
  20. 0 18
      AndroidLibrary/app/src/main/res/layout/activity_main.xml
  21. 0 5
      AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/app_icon.xml
  22. 0 5
      AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml
  23. 0 5
      AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  24. 0 5
      AndroidLibrary/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  25. BIN
      AndroidLibrary/app/src/main/res/mipmap-hdpi/ic_launcher.png
  26. BIN
      AndroidLibrary/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
  27. BIN
      AndroidLibrary/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
  28. BIN
      AndroidLibrary/app/src/main/res/mipmap-mdpi/ic_launcher.png
  29. BIN
      AndroidLibrary/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
  30. BIN
      AndroidLibrary/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
  31. BIN
      AndroidLibrary/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  32. BIN
      AndroidLibrary/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
  33. BIN
      AndroidLibrary/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  34. BIN
      AndroidLibrary/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  35. BIN
      AndroidLibrary/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
  36. BIN
      AndroidLibrary/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  37. BIN
      AndroidLibrary/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  38. BIN
      AndroidLibrary/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
  39. BIN
      AndroidLibrary/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  40. 0 6
      AndroidLibrary/app/src/main/res/values/colors.xml
  41. 0 4
      AndroidLibrary/app/src/main/res/values/ic_launcher_background.xml
  42. 0 3
      AndroidLibrary/app/src/main/res/values/strings.xml
  43. 0 10
      AndroidLibrary/app/src/main/res/values/styles.xml
  44. 0 17
      AndroidLibrary/app/src/test/java/com/example/myapplication/ExampleUnitTest.java
  45. 0 24
      AndroidLibrary/build.gradle
  46. 0 1
      AndroidLibrary/gfglibrary/.gitignore
  47. 0 38
      AndroidLibrary/gfglibrary/build.gradle
  48. 0 0
      AndroidLibrary/gfglibrary/consumer-rules.pro
  49. BIN
      AndroidLibrary/gfglibrary/libsunity/classes.jar
  50. 0 21
      AndroidLibrary/gfglibrary/proguard-rules.pro
  51. 0 26
      AndroidLibrary/gfglibrary/src/androidTest/java/com/gfg/gfglibrary/ExampleInstrumentedTest.java
  52. 0 8
      AndroidLibrary/gfglibrary/src/main/AndroidManifest.xml
  53. 0 14
      AndroidLibrary/gfglibrary/src/main/java/com/gfg/gfglibrary/JavaCTest.java
  54. 0 202
      AndroidLibrary/gfglibrary/src/main/java/com/gfg/gfglibrary/SaveImage.java
  55. 0 17
      AndroidLibrary/gfglibrary/src/test/java/com/gfg/gfglibrary/ExampleUnitTest.java
  56. 0 19
      AndroidLibrary/gradle.properties
  57. BIN
      AndroidLibrary/gradle/wrapper/gradle-wrapper.jar
  58. 0 6
      AndroidLibrary/gradle/wrapper/gradle-wrapper.properties
  59. 0 172
      AndroidLibrary/gradlew
  60. 0 84
      AndroidLibrary/gradlew.bat
  61. 0 3
      AndroidLibrary/settings.gradle
  62. 1 0
      GameClient/.idea/.idea.GameClient/.idea/vcs.xml
  63. 2087 78
      GameClient/.idea/.idea.GameClient/.idea/workspace.xml
  64. 8 0
      GameClient/Assets/Build.meta
  65. 292 162
      GameClient/UserSettings/Layouts/default-2022.dwlt
  66. 0 266
      LuckyBox/LuckyBoxActivityView.cs
  67. 0 11
      LuckyBox/LuckyBoxActivityView.cs.meta
  68. 0 357
      LuckyBox/LuckyBoxBonusView.cs
  69. 0 11
      LuckyBox/LuckyBoxBonusView.cs.meta
  70. 0 81
      LuckyBox/LuckyBoxNewCardView.cs
  71. 0 11
      LuckyBox/LuckyBoxNewCardView.cs.meta
  72. 0 178
      LuckyBox/LuckyBoxNewDressView.cs
  73. 0 11
      LuckyBox/LuckyBoxNewDressView.cs.meta
  74. 0 81
      LuckyBox/LuckyBoxPreShowView.cs
  75. 0 11
      LuckyBox/LuckyBoxPreShowView.cs.meta
  76. 0 391
      LuckyBox/LuckyBoxStarView.cs
  77. 0 11
      LuckyBox/LuckyBoxStarView.cs.meta
  78. 0 434
      LuckyBox/LuckyBoxView.cs
  79. 0 11
      LuckyBox/LuckyBoxView.cs.meta
  80. 0 11
      z_push.bat
  81. 0 16
      z_update.bat
  82. 0 82
      全量上传.bat

+ 0 - 14
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

+ 0 - 1
AndroidLibrary/.idea/.name

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

+ 0 - 116
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>

+ 0 - 6
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>

+ 0 - 22
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>

+ 0 - 25
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>

+ 0 - 9
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>

+ 0 - 6
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>

+ 0 - 1
AndroidLibrary/app/.gitignore

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

+ 0 - 33
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'
-
-}

+ 0 - 21
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

+ 0 - 26
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());
-    }
-}

+ 0 - 21
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>

BIN
AndroidLibrary/app/src/main/app_icon-playstore.png


BIN
AndroidLibrary/app/src/main/ic_launcher-playstore.png


+ 0 - 14
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);
-    }
-}

+ 0 - 30
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>

BIN
AndroidLibrary/app/src/main/res/drawable/icon.jpg


BIN
AndroidLibrary/app/src/main/res/drawable/icon.png


+ 0 - 18
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>

+ 0 - 5
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>

+ 0 - 5
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>

+ 0 - 5
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>

+ 0 - 5
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>

BIN
AndroidLibrary/app/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
AndroidLibrary/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png


BIN
AndroidLibrary/app/src/main/res/mipmap-hdpi/ic_launcher_round.png


BIN
AndroidLibrary/app/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
AndroidLibrary/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png


BIN
AndroidLibrary/app/src/main/res/mipmap-mdpi/ic_launcher_round.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png


BIN
AndroidLibrary/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png


+ 0 - 6
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>

+ 0 - 4
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>

+ 0 - 3
AndroidLibrary/app/src/main/res/values/strings.xml

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

+ 0 - 10
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>

+ 0 - 17
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);
-    }
-}

+ 0 - 24
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
-}

+ 0 - 1
AndroidLibrary/gfglibrary/.gitignore

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

+ 0 - 38
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')
-}

+ 0 - 0
AndroidLibrary/gfglibrary/consumer-rules.pro


BIN
AndroidLibrary/gfglibrary/libsunity/classes.jar


+ 0 - 21
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

+ 0 - 26
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());
-    }
-}

+ 0 - 8
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>

+ 0 - 14
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;
-    }
-}

+ 0 - 202
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;
-    }
-}

+ 0 - 17
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);
-    }
-}

+ 0 - 19
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

BIN
AndroidLibrary/gradle/wrapper/gradle-wrapper.jar


+ 0 - 6
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

+ 0 - 172
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" "$@"

+ 0 - 84
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

+ 0 - 3
AndroidLibrary/settings.gradle

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

+ 1 - 0
GameClient/.idea/.idea.GameClient/.idea/vcs.xml

@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/Assets/Game/CSShare" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/Assets/Res" vcs="Git" />
   </component>
 </project>

Разница между файлами не показана из-за своего большого размера
+ 2087 - 78
GameClient/.idea/.idea.GameClient/.idea/workspace.xml


+ 8 - 0
GameClient/Assets/Build.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e55535cbc09ac464eab2b6400e3f1029
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 292 - 162
GameClient/UserSettings/Layouts/default-2022.dwlt

@@ -14,17 +14,41 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 360
-    y: 475
-    width: 1565
-    height: 755
+    x: 333
+    y: 269
+    width: 640
+    height: 601
+  m_ShowMode: 0
+  m_Title: Build Settings
+  m_RootView: {fileID: 5}
+  m_MinSize: {x: 640, y: 601}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 7
+    y: 423
+    width: 800
+    height: 621
   m_ShowMode: 0
   m_Title: AssetBundle Builder
-  m_RootView: {fileID: 4}
+  m_RootView: {fileID: 7}
   m_MinSize: {x: 800, y: 621}
   m_MaxSize: {x: 4000, y: 4021}
   m_Maximized: 0
---- !u!114 &2
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -38,17 +62,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 8
+    x: 21
     y: 51
-    width: 2544
-    height: 1341
+    width: 1902
+    height: 1333
   m_ShowMode: 4
-  m_Title: Console
-  m_RootView: {fileID: 9}
+  m_Title: Project
+  m_RootView: {fileID: 12}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 0
---- !u!114 &3
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -58,23 +82,73 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: AssetBundleBuilderWindow
+  m_Name: BuildPlayerWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1565
-    height: 755
-  m_MinSize: {x: 800, y: 621}
+    width: 640
+    height: 601
+  m_MinSize: {x: 640, y: 580}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 19}
+  m_Panes:
+  - {fileID: 19}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &5
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 4}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 640
+    height: 601
+  m_MinSize: {x: 640, y: 601}
   m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 16}
+  vertical: 0
+  controlID: 170
+--- !u!114 &6
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: AssetBundleBuilderWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 800
+    height: 621
+  m_MinSize: {x: 800, y: 600}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,18 +161,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1565
-    height: 755
+    width: 800
+    height: 621
   m_MinSize: {x: 800, y: 621}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 5296
---- !u!114 &5
+  controlID: 16
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -114,17 +188,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 785
-    width: 600
-    height: 506
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+    y: 781
+    width: 610
+    height: 502
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -137,19 +211,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 14}
-  - {fileID: 5}
+  - {fileID: 17}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
-    x: 1944
+    x: 1292
     y: 0
-    width: 600
-    height: 1291
+    width: 610
+    height: 1283
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 139
---- !u!114 &7
+  controlID: 79
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -164,18 +238,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1572
+    x: 1175
     y: 0
-    width: 372
-    height: 1291
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+    width: 117
+    height: 1283
+  m_MinSize: {x: 277, y: 71}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,16 +266,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 838
-    height: 1291
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 22}
+    width: 627
+    height: 1283
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 26}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 26}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -214,22 +288,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 11}
-  - {fileID: 12}
+  - {fileID: 13}
+  - {fileID: 14}
+  - {fileID: 15}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
-    height: 1341
+    width: 1902
+    height: 1333
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -246,12 +320,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
+    width: 1902
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -264,22 +338,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 15}
-  - {fileID: 13}
-  - {fileID: 7}
-  - {fileID: 6}
+  - {fileID: 11}
+  - {fileID: 18}
+  - {fileID: 16}
+  - {fileID: 10}
+  - {fileID: 9}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1291
+    width: 1902
+    height: 1283
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 45
---- !u!114 &12
+  controlID: 78
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -295,12 +369,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1321
-    width: 2544
+    y: 1313
+    width: 1902
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &13
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -315,18 +389,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1298
+    x: 970
     y: 0
-    width: 274
-    height: 1291
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+    width: 205
+    height: 1283
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -343,16 +417,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 600
-    height: 785
+    width: 610
+    height: 781
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 25}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -367,19 +441,75 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 838
+    x: 627
     y: 0
-    width: 460
-    height: 1291
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 23}
+    width: 343
+    height: 1283
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 27}
   m_Panes:
-  - {fileID: 23}
-  - {fileID: 18}
+  - {fileID: 27}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &16
+--- !u!114 &19
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 640, y: 580}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Build Settings
+    m_Image: {fileID: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 333
+    y: 269
+    width: 640
+    height: 580
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_TreeViewState:
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 
+    m_LastClickedID: 0
+    m_ExpandedIDs: 
+    m_RenameOverlay:
+      m_UserAcceptedRename: 0
+      m_Name: 
+      m_OriginalName: 
+      m_EditFieldRect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      m_UserData: 0
+      m_IsWaitingForDelay: 0
+      m_IsRenaming: 0
+      m_OriginalEventType: 11
+      m_IsRenamingFilename: 0
+      m_ClientGUIView: {fileID: 0}
+    m_SearchString: 
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -399,10 +529,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 360
-    y: 475
-    width: 1565
-    height: 734
+    x: 7
+    y: 423
+    width: 800
+    height: 600
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -413,7 +543,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -433,10 +563,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1952
-    y: 866
-    width: 599
-    height: 485
+    x: 1313
+    y: 862
+    width: 609
+    height: 481
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -447,7 +577,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -517,7 +647,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &19
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -537,10 +667,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1306
+    x: 991
     y: 81
-    width: 272
-    height: 1270
+    width: 203
+    height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -554,9 +684,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 84ee0000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 0a0bfeffa212feffb412feffba12feff8c84feffa284feff92e0fffff4ffffff
+      m_ExpandedIDs: 18fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -572,7 +702,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 13}
+        m_ClientGUIView: {fileID: 16}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -580,7 +710,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4ca40d111d51deb4f81f85b0a6d43c19
---- !u!114 &20
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -600,10 +730,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1580
+    x: 1196
     y: 81
-    width: 370
-    height: 1270
+    width: 115
+    height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -627,7 +757,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &21
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -647,10 +777,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1952
+    x: 1313
     y: 81
-    width: 599
-    height: 764
+    width: 609
+    height: 760
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -674,7 +804,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/ResIn/UI/ActivityAFuGift
+    - Assets/Game
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -682,16 +812,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/ResIn/UI/ActivityAFuGift
+  - Assets/Game
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\Client\Client\GameClient
+  m_LastProjectPath: E:\0AWebgl\client_webgl\GameClient
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 600}
-    m_SelectedIDs: 84ee0000
-    m_LastClickedID: 61060
-    m_ExpandedIDs: 00000000fed1000000d2000002d2000004d2000006d2000008d200000ad200000cd200000ed2000010d2000012d2000014d2000016d2000018d200001ed2000022d2000024d2000026d2000028d200002ad200002cd200002ed2000032d2000034d200004ad200006ad200007ad20000a2d20000f8d5000006d60000acea000000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 16a00000
+    m_LastClickedID: 40982
+    m_ExpandedIDs: 00000000829f000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -707,7 +837,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 17}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -719,7 +849,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000fed1000000d2000002d2000004d2000006d2000008d200000ad200000cd200000ed2000010d2000012d2000014d2000016d2000018d200001ad200001cd200001ed2000020d2000022d2000024d2000026d2000028d200002ad200002cd200002ed2000030d2000032d2000034d20000
+    m_ExpandedIDs: 00000000829f0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -746,7 +876,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 3ac8000028d3000068c907006eac0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -763,7 +893,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 17}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -775,7 +905,7 @@ MonoBehaviour:
     m_GridSize: 64
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 245
---- !u!114 &22
+--- !u!114 &26
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -795,10 +925,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
+    x: 21
     y: 81
-    width: 837
-    height: 1270
+    width: 626
+    height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -815,7 +945,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1080, y: 1920}
+  m_TargetSize: {x: 626, y: 1113}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -824,23 +954,23 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 0a000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 09000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -540
-    m_HBaseRangeMax: 540
-    m_VBaseRangeMin: -960
-    m_VBaseRangeMax: 960
+    m_HBaseRangeMin: -313
+    m_HBaseRangeMax: 313
+    m_VBaseRangeMin: -556.5
+    m_VBaseRangeMax: 556.5
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 1
+    m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -851,29 +981,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 837
-      height: 1249
-    m_Scale: {x: 0.65052086, y: 0.65052086}
-    m_Translation: {x: 418.5, y: 624.49994}
+      width: 626
+      height: 1241
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 313, y: 620.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -643.3306
-      y: -959.9999
-      width: 1286.6613
-      height: 1919.9999
+      x: -313
+      y: -620.5
+      width: 626
+      height: 1241
     m_MinimalGUI: 1
-  m_defaultScale: 0.65052086
-  m_LastWindowPixelSize: {x: 837, y: 1270}
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 626, y: 1262}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &23
+--- !u!114 &27
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -893,10 +1023,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 846
+    x: 648
     y: 81
-    width: 458
-    height: 1270
+    width: 341
+    height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -912,7 +1042,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -156, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: -10, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -1216,9 +1346,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.7070326, y: -0.10116604, z: 0.19793835}
+    m_Target: {x: 0.5749625, y: -1.1621449, z: -0.014116665}
     speed: 2
-    m_Value: {x: -0.7070326, y: -0.10116604, z: 0.19793835}
+    m_Value: {x: 0.5749625, y: -1.1621449, z: -0.014116665}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1268,9 +1398,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 7.3782063
+    m_Target: 11.411661
     speed: 2
-    m_Value: 7.3782063
+    m_Value: 11.411661
   m_Ortho:
     m_Target: 1
     speed: 2

+ 0 - 266
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();
-        }
-    }
-}

+ 0 - 11
LuckyBox/LuckyBoxActivityView.cs.meta

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

+ 0 - 357
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);
-            }
-        }
-    }
-}

+ 0 - 11
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: 

+ 0 - 81
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();
-
-        }
-    }
-}

+ 0 - 11
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: 

+ 0 - 178
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();
-        }
-    }
-}

+ 0 - 11
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: 

+ 0 - 81
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;
-
-        }
-    }
-}

+ 0 - 11
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: 

+ 0 - 391
LuckyBox/LuckyBoxStarView.cs

@@ -1,391 +0,0 @@
-using System.Collections;
-using UnityEngine;
-using UI.LuckyBox;
-using System.Collections.Generic;
-using FairyGUI;
-using System.Threading;
-using System.Threading.Tasks;
-using System;
-
-namespace GFGGame
-{
-    public class LuckyBoxStarView : BaseWindow
-    {
-        private UI_LuckyBoxStarUI _ui;
-        private List<GObject> comStars = new List<GObject>();
-        private List<GObject> clickComStars = new List<GObject>();
-        private List<GObject> notClickComStars = new List<GObject>();
-
-        // private List<GameObject> _gameObjects = new List<GameObject>();
-        // private List<GoWrapper> _wrappers = new List<GoWrapper>();
-        // private List<GameObject> _gameObjects1 = new List<GameObject>();
-        // private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
-        private Dictionary<int, List<GameObject>> dicGameobj = new Dictionary<int, List<GameObject>>();
-        private Dictionary<int, List<GoWrapper>> dicWraper = new Dictionary<int, List<GoWrapper>>();
-
-        private GObject curComStar;//当前选中的星星
-        private Vector2 lastPos;//鼠标的上一个位置,每颗星星初始时默认为Vector2.right;
-
-        private List<ItemData> _rewardList;
-
-        private const int checkDistance = 40;//鼠标靠近星星周围加减40都算选中星星
-        private const int imgLineWidth = 10;//线的原始长度
-
-        private bool showGuide = false;
-        public override void Dispose()
-        {
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-        protected override void OnHide()
-        {
-            int index = 0;
-            GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-            while (star != null && star.visible == true)
-            {
-                UI_ComStar comStar = UI_ComStar.Proxy(star);
-                for (int i = comStar.target.numChildren - 1; i >= 0; i--)
-                {
-                    if (comStar.target.GetChildAt(i).name == "imgLine") continue;
-                    comStar.target.RemoveChildAt(i);
-                }
-                index++;
-                star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-                UI_ComStar.ProxyEnd();
-            }
-            foreach (int key in dicGameobj.Keys)
-            {
-                List<GameObject> value = dicGameobj[key];
-                List<GoWrapper> wrappersValue = dicWraper[key];
-                for (int i = 0; i < value.Count; i++)
-                {
-                    SceneController.DestroyObjectFromView(value[i], wrappersValue[i]);
-                }
-            }
-            notClickComStars.Clear();
-            clickComStars.Clear();
-            dicGameobj.Clear();
-            dicWraper.Clear();
-
-            Timers.inst.Remove(CheckGuide);
-        }
-        protected override void OnInit()
-        {
-            base.OnInit();
-            _ui = UI_LuckyBoxStarUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            _ui.m_btnBack.visible = false;
-            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-
-
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
-            _ui.target.onTouchBegin.Add(OnClickUIBegin);
-            _ui.target.onTouchMove.Add(OnClickUIMove);
-            _ui.target.onTouchEnd.Add(OnClickUIEnd);
-            _ui.m_effEnd.visible = false;
-            _rewardList = LuckyBoxDataManager.Instance.RewardList;
-            _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
-
-            bool isLuckyBox = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(LuckyBoxDataManager.Instance.currentBoxId) >= 0;
-            _ui.m_ctrlRewardsType.selectedIndex = isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
-            string resPath = string.Format("cj_tp_{0}", isLuckyBox ? LuckyBoxDataManager.Instance.currentBoxId : 1);
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath(resPath);
-
-            ResetStartView();
-            Timers.inst.AddUpdate(CheckGuide);
-        }
-
-        private void ResetStartView()
-        {
-            showGuide = GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX_LINE) <= 0;
-
-            curComStar = null;
-            comStars.Clear();
-            int index = 0;
-            GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-
-
-            while (star != null && star.visible == true)
-            {
-                UI_ComStar comStar = UI_ComStar.Proxy(star);
-                comStar.m_imgLine.visible = true;
-
-                comStar.m_c1.selectedIndex = 0;
-                comStar.m_imgLine.width = imgLineWidth;
-                comStar.m_imgLine.rotation = 0;
-
-                GComponent gcom = CreateEffect(comStar, 1, "ui_ck"); ;
-                gcom.visible = true;
-                comStar.target.AddChildAt(gcom, 1);
-
-                GComponent gcom1 = CreateEffect(comStar, 2, "ui_ck_dj");
-                gcom1.visible = false;
-                comStar.target.AddChildAt(gcom1, 2);
-
-                GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
-                gcom2.visible = false;
-                comStar.target.AddChildAt(gcom2, 3);
-
-                GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
-                gcom3.visible = false;
-                comStar.target.AddChildAt(gcom3, 4);
-
-
-
-                star.data = new Vector2(comStar.target.x, comStar.target.y);
-                comStars.Add(star);
-
-                index++;
-                star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-                UI_ComStar.ProxyEnd();
-            }
-
-        }
-        private GComponent CreateEffect(UI_ComStar comStar, int index, string name)
-        {
-            GComponent gcom;
-            if (comStar.target.numChildren > index)
-            {
-                gcom = comStar.target.GetChildAt(index).asCom;
-            }
-            else
-            {
-                gcom = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
-                string resPath = ResPathUtil.GetViewEffectPath("ui_ck", name);
-                SceneController.AddObjectToView(null, null, gcom.GetChild("holder").asGraph, resPath, out GameObject gameObject, out GoWrapper wrapper);
-                if (!dicGameobj.ContainsKey(index))
-                {
-                    dicGameobj.Add(index, new List<GameObject>());
-                    dicWraper.Add(index, new List<GoWrapper>());
-                }
-                dicGameobj[index].Add(gameObject);
-                dicWraper[index].Add(wrapper);
-            }
-            return gcom;
-        }
-        private void OnClickUIBegin(EventContext context)
-        {
-            context.CaptureTouch();
-            InputEvent inputEvent = (InputEvent)context.data;
-            Vector2 mousePos = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
-            CheckNearbyPos(mousePos);
-        }
-        private void OnClickUIMove(EventContext context)
-        {
-            InputEvent inputEvent = (InputEvent)context.data;
-            Vector2 mousePos = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
-
-            CheckNearbyPos(mousePos);
-
-            if (comStars.Count == 0)//所有星星都点亮了主动结束
-            {
-                this.OnClickUIEnd();
-            }
-        }
-
-        //检测鼠标附近的星星
-        private void CheckNearbyPos(Vector2 mousePos)
-        {
-            for (int i = comStars.Count - 1; i >= 0; i--)
-            {
-                Vector2 comStarPos = (Vector2)comStars[i].data;
-                if (IsSamePos(mousePos, comStarPos))
-                {
-                    if (curComStar != null)
-                    {
-                        SetCurComStarTransfrom(comStarPos);
-                    }
-                    UI_ComStar comStar = UI_ComStar.Proxy(comStars[i]);
-                    comStar.target.GetChildAt(2).asCom.visible = true;
-                    comStar.target.GetChildAt(1).asCom.visible = false;
-                    UI_ComStar.ProxyEnd();
-                    // comStar.m_c1.selectedIndex = 1;
-                    curComStar = comStars[i];
-                    lastPos = Vector2.right;
-
-                    clickComStars.Add(comStars[i]);
-                    comStars.RemoveAt(i);
-
-                }
-                else
-                {
-                    if (curComStar != null)
-                    {
-                        Vector2 curPos = mousePos - (Vector2)curComStar.data;
-                        SetCurComStarTransfrom(mousePos);
-                        lastPos = curPos;
-                    }
-                }
-            }
-
-
-        }
-        private void SetCurComStarTransfrom(Vector2 targetPos)
-        {
-
-            Vector2 curPos = targetPos - (Vector2)curComStar.data;
-            float angle = Vector3.Angle(lastPos, curPos); //求出两向量之间的夹角 
-            Vector3 normal = Vector3.Cross(lastPos, curPos);//叉乘求出法线向量 
-            angle *= Mathf.Sign(Vector3.Dot(normal, Vector3.forward));  //Mathf.Sign()求符号,Vector3.Dot()求方向,求法线向量与物体上方向向量点乘,结果为1或-1,修正旋转方向 
-
-            UI_ComStar comStar = UI_ComStar.Proxy(curComStar);
-            comStar.m_imgLine.rotation += angle;
-            comStar.m_imgLine.width = Vector2.Distance(targetPos, (Vector2)curComStar.data);
-            UI_ComStar.ProxyEnd();
-
-        }
-
-        private void OnClickUIEnd()
-        {
-            if (clickComStars.Count <= 0) return;
-
-            UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[clickComStars.Count - 1]);
-            comStar.m_imgLine.visible = false;
-            UI_ComStar.ProxyEnd();
-
-
-            if (showGuide && clickComStars.Count < 2)
-            {
-                ResetStartView();
-            }
-            else
-            {
-                CheckNotClickComStar();
-                SetComStarDarken();
-                RemoveListener();
-                Timers.inst.Add(1f, 1, SetClickComStarAni);
-
-            }
-        }
-        private void CheckNotClickComStar()
-        {
-            int index = 0;
-            GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-
-            while (star != null && star.visible == true)
-            {
-                if (clickComStars.IndexOf(star) < 0)
-                {
-                    notClickComStars.Add(star);
-                }
-                index++;
-                star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-            }
-        }
-
-        private void SetComStarDarken()
-        {
-
-            for (int i = 0; i < notClickComStars.Count; i++)
-            {
-                UI_ComStar notClickComStar = UI_ComStar.Proxy(notClickComStars[i]);
-                notClickComStar.m_imgLine.visible = false;
-                notClickComStar.target.GetChildAt(3).asCom.visible = true;
-                notClickComStar.target.GetChildAt(1).asCom.visible = false;
-                UI_ComStar.ProxyEnd();
-
-            }
-
-        }
-
-        private void SetClickComStarAni(object param)
-        {
-            for (int i = 0; i < clickComStars.Count; i++)
-            {
-                UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[i]);
-                comStar.target.GetChildAt(4).asCom.visible = true;
-                UI_ComStar.ProxyEnd();
-
-            }
-            Timers.inst.Add(0.5f, 1, SetEndEffect);
-        }
-        private void SetEndEffect(object param)
-        {
-            _ui.m_effEnd.visible = true;
-            _ui.m_effEnd.SetPlaySettings(0, -1, 1, -1);
-
-            Timers.inst.Add(0.6f, 1, ClickUIEnd);
-            // ClickUIEnd(null);
-            TryCompleteGuide();
-        }
-        private void ClickUIEnd(object param)
-        {
-            if (curComStar != null)
-            {
-
-                RemoveListener();
-                ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
-                this.Hide();
-            }
-        }
-
-        private bool IsSamePos(Vector2 mousePos, Vector2 comStarPos)
-        {
-            return (mousePos.x < comStarPos.x + checkDistance) && (mousePos.x > comStarPos.x - checkDistance) && (mousePos.y < comStarPos.y + checkDistance) && (mousePos.y > comStarPos.y - checkDistance);
-        }
-
-        private void RemoveListener()
-        {
-            _ui.target.onTouchBegin.Remove(OnClickUIBegin);
-            _ui.target.onTouchMove.Remove(OnClickUIMove);
-            _ui.target.onTouchEnd.Remove(OnClickUIEnd);
-
-        }
-
-        private void OnClickBtnBack()
-        {
-            this.Hide();
-            RemoveListener();
-
-            ViewManager.Show(ViewName.LUCKY_BOX_VIEW);
-        }
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX_LINE) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
-            // GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX, 4);
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX_LINE, 1, "点击将星连接在一起。", -1, true, (int)(this.viewCom.height - 200), true);
-            TryCompleteGuide();
-        }
-        protected override void TryCompleteGuide()
-        {
-            if (clickComStars.Count >= 2)
-            {
-                GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
-
-                GuideController.TryCompleteGuideIndex(cfg.id, 1);
-                GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX_LINE, 1);
-            }
-            else
-            {
-                GuideDataManager.SetGuideIndexState(GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, 0);
-                GuideDataManager.currentGuideIdIndex = 3;
-            }
-
-
-        }
-
-    }
-}

+ 0 - 11
LuckyBox/LuckyBoxStarView.cs.meta

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

+ 0 - 434
LuckyBox/LuckyBoxView.cs

@@ -1,434 +0,0 @@
-using FairyGUI;
-using UI.LuckyBox;
-using UI.CommonGame;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using ET;
-
-namespace GFGGame
-{
-    public class LuckyBoxView : BaseView
-    {
-        private UI_LuckyBoxUI _ui;
-        private ValueBarController _valueBarController;
-        private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
-
-        //private GameObject _gameObject;
-        //private GoWrapper _wrapper;
-        //private GameObject _gameObject1;
-        //private GoWrapper _wrapper1;
-        //private GameObject _gameObject2;
-        //private GoWrapper _wrapper2;
-        //private GameObject _gameObject3;
-        //private GoWrapper _wrapper3;
-
-        private DressUpObjUI _dressUpObjUIXiHe;
-
-        //private GameObject _scenePrefab;
-        //private GameObject _sceneObject;
-        //private GoWrapper _wrapper4;
-        //private DressUpObj _dressUpObj;
-        private DressUpObjUI _dressUpObjUIChangXi;
-
-        private bool isActiveBoxOpen = false;
-        private int _activeBoxId = 0;
-        private int _bgIndex = 0;
-        private int _curIndex = 0;
-
-        public override void Dispose()
-        {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
-            foreach (int key in _lcukyBoxCtrl.Keys)
-            {
-                _lcukyBoxCtrl[key].Dispose();
-            }
-            _lcukyBoxCtrl.Clear();
-            if (_dressUpObjUIXiHe != null)
-            {
-                _dressUpObjUIXiHe.Dispose();
-                _dressUpObjUIXiHe = null;
-            }
-            if (_dressUpObjUIChangXi != null)
-            {
-                _dressUpObjUIChangXi.Dispose();
-                _dressUpObjUIChangXi = null;
-            }
-
-            //SceneController.DestroyObjectFromView(_gameObject, _wrapper);
-            //SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            //SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            //SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
-
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_LuckyBoxUI.PACKAGE_NAME;
-            _ui = UI_LuckyBoxUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-
-            _dressUpObjUIXiHe = new DressUpObjUI("SceneDressUp");
-            _dressUpObjUIChangXi = new DressUpObjUI("SceneDressUp");
-            // _ui.m_txtRemainTimes.visible = false;
-            _valueBarController = new ValueBarController(_ui.m_valueBar);
-            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-
-            _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
-            _ui.m_btnRight.onClick.Add(OnBtnRightClick);
-
-            _ui.m_listBg.SetVirtual();
-            _ui.m_listBg.itemRenderer = RenderListBgItem;
-            _ui.m_listBg.itemProvider = GetListItemResource;
-            _ui.m_listBg.scrollPane.onScrollEnd.Add(OnListBgScroll);
-
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("jingzhongh_bg");
-        }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-
-            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnListBgScroll);
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, OnListBgScroll);
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
-
-            LuckyBoxDataManager.Instance.luckyBoxIds.Clear();
-            LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_2);
-            LuckyBoxDataManager.Instance.luckyBoxIds.Add(LuckyBoxDataManager.BOX_ID_3);
-            _activeBoxId = 0;
-            if (LuckyBoxDataManager.Instance.RotatingId > 0)
-            {
-                RotatingLuckyBoxCfg rotatingLuckyBox = RotatingLuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.RotatingId);
-                _activeBoxId = rotatingLuckyBox.luckyBoxId;
-                LuckyBoxDataManager.Instance.endTime = TimeUtil.GetTimestamp(rotatingLuckyBox.endTime);
-                LuckyBoxDataManager.Instance.luckyBoxIds.Insert(0, _activeBoxId);
-            }
-
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
-            if (this.viewData != null)
-            {
-                boxId = (int)this.viewData;
-            }
-
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0) boxId = LuckyBoxDataManager.BOX_ID_2;
-            LuckyBoxDataManager.Instance.currentBoxId = boxId;
-
-            if (_activeBoxId > 0) Timers.inst.Add(1, 0, CheckTime);
-
-            _valueBarController.OnShown();
-            _valueBarController.Controller(4);
-
-            _curIndex = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(boxId);
-            _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Count;
-            _ui.m_listBg.ScrollToView(_curIndex);
-            _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
-
-            OnListBgScroll();
-            updateBoxEffect();
-
-            Timers.inst.AddUpdate(CheckGuide);
-        }
-        private string GetListItemResource(int index)
-        {
-            if (index == 0 && _activeBoxId > 0)
-            {
-                return "UI://LuckyBox/ComBox";
-            }
-            else
-            {
-                int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-                return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
-            }
-        }
-        private void RenderListBgItem(int index, GObject obj)
-        {
-            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            LuckyBoxDataManager.Instance.InitData(boxId);
-
-            UI_ComBox comBox = UI_ComBox.Proxy(obj);
-            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[_bgIndex]);
-            if (!_lcukyBoxCtrl.ContainsKey(boxId))
-            {
-                _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
-                if (_ui.m_listBg.ChildIndexToItemIndex(0) == index)
-                {
-                    _lcukyBoxCtrl[boxId].OnShown(boxId);
-                }
-            }
-            comBox.m_btnPreview.m_c1.selectedIndex = boxId;
-            LuckyBoxDataManager.Instance.GetOwnedCount(boxId, 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(cfg.numericType);
-            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数:{0}", cfg.maxCount - boughtCount);
-            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            if (comBox.m_btnBuyOne.target.data == null)
-            {
-                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
-            }
-            comBox.m_btnBuyOne.target.data = boxId;
-
-            if (comBox.m_btnBuyTen.target.data == null)
-            {
-                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
-            }
-            comBox.m_btnBuyTen.target.data = boxId;
-
-            if (comBox.m_btnPreview.target.data == null)
-            {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
-            }
-            comBox.m_btnPreview.target.data = boxId;
-
-            obj.data = boxId;
-            // if (comBox.m_grpLuckyBox != null)
-            // {
-            //     comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
-            // }
-            if (boxId == _activeBoxId)
-            {
-                long endTime = LuckyBoxDataManager.Instance.endTime;
-                long curTime = TimeHelper.ServerNow();
-                TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-                comBox.m_txtTime.text = string.Format("剩余{0}{1}", num, str);
-                comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
-            }
-
-            UI_ComBox.ProxyEnd();
-
-        }
-
-        // private void UpdateBg(object param)
-        // {
-        //     string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
-        //     _bgIndex++;
-        //     if (_bgIndex >= resArr.Length) _bgIndex = 0;
-        //     GObject gObject = _ui.m_listBg.GetChildAt(0);
-        //     if (gObject == null) return;
-        //     GComponent item = gObject.asCom;
-        //     if (item.gameObjectName != "ComBox_2") return;
-        //     GLoader loaBg = item.GetChild("loaBg").asLoader;
-        //     loaBg.url = ResPathUtil.GetBgImgPath(resArr[_bgIndex]);
-        // }
-
-
-        private void OnBtnLeftClick()
-        {
-            int index = _curIndex - 1;
-            // _curIndex--;
-            index = Mathf.Max(0, index);
-            _ui.m_listBg.ScrollToView(index, true);
-            // OnListBgScroll();
-        }
-
-        private void OnBtnRightClick()
-        {
-            int index = _curIndex + 1;
-            // _curIndex++;
-            index = Mathf.Min(_ui.m_listBg.numItems - 1, index);
-            _ui.m_listBg.ScrollToView(index, true);
-            // OnListBgScroll();
-        }
-
-        private void OnListBgScroll()
-        {
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
-            _curIndex = _ui.m_listBg.ChildIndexToItemIndex(0);
-            LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
-
-            _bgIndex = 0;
-            _valueBarController.UpdateCJ();
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
-            _ui.m_btnLeft.grayed = _curIndex <= 0;
-            _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
-
-        }
-
-        private void CheckTime(object param = null)
-        {
-            if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
-            long endTime = LuckyBoxDataManager.Instance.endTime;
-            long curTime = TimeHelper.ServerNow();
-            TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-
-            GObject item = _ui.m_listBg.GetChildAt(0);
-            if (item == null) return;
-            GObject textField = item.asCom.GetChild("txtTime");
-            if (textField == null) return;
-            textField.asTextField.text = string.Format("剩余{0}{1}", num, str);
-        }
-        private void updateBoxEffect()
-        {
-            if (isActiveBoxOpen)
-            {
-                // int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
-                // UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(index));
-                // string resPath = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_bt");
-                // SceneController.AddObjectToView(_gameObject, _wrapper, item.m_holder, resPath, out _gameObject, out _wrapper);
-                // string resPath3 = ResPathUtil.GetDressUpAnimationPath("dz_jiyuet");
-                // SceneController.AddObjectToView(_gameObject3, _wrapper3, item.m_holder1, resPath3, out _gameObject3, out _wrapper3, 120);
-
-                // string resPath1 = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_sl");
-                // SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_btnBuyOne.m_holder, resPath1, out _gameObject1, out _wrapper1);
-                // SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_btnBuyTen.m_holder, resPath1, out _gameObject2, out _wrapper2);
-                // UI_ComListBgItem.ProxyEnd();
-
-            }
-        }
-        // private void OnClickBtnExChange(EventContext context)
-        // {
-        //     GObject obj = context.sender as GObject;
-        //     int boxId = (int)obj.data;
-        //     int storeId = boxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
-        //     ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-        //     this.Hide();
-        // }
-        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)
-        {
-            GObject obj = context.sender as GObject;
-            int boxId = (int)obj.data;
-            LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(luckyBoxCfg.numericType);
-            if (boughtCount + LuckyBoxDataManager.ONCE_TIME > luckyBoxCfg.maxCount)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
-                return;
-            }
-            LuckyBoxDataManager.Instance.CheckItemEnough(boxId, LuckyBoxDataManager.ONCE_TIME, async () =>
-             {
-                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME);
-                 if (result)
-                 {
-                     ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
-                 }
-             });
-        }
-
-        private void OnClickBtnBuyTen(EventContext context)
-        {
-
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0 && (GuideDataManager.currentGuideId == 0 || GuideDataManager.currentGuideIdIndex != 2))
-            {
-                //防止点击太快,在引导开启前就被点击到,导致引导卡死
-                return;
-            }
-            GObject obj = context.sender as GObject;
-            int boxId = (int)obj.data;
-            LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(luckyBoxCfg.numericType);
-            if (boughtCount + LuckyBoxDataManager.TEN_TIME > luckyBoxCfg.maxCount)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("抽奖次数不足");
-                return;
-            }
-            LuckyBoxDataManager.Instance.CheckItemEnough(boxId, LuckyBoxDataManager.TEN_TIME, async () =>
-            {
-
-                bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.TEN_TIME);
-                if (result)
-                {
-
-                    ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
-
-                }
-            });
-        }
-
-        protected override void OnHide()
-        {
-            base.OnHide();
-            _valueBarController.OnHide();
-            foreach (int key in _lcukyBoxCtrl.Keys)
-            {
-                _lcukyBoxCtrl[key].OnHide();
-            }
-
-            Timers.inst.Remove(CheckTime);
-            // Timers.inst.Remove(UpdateBg);
-            Timers.inst.Remove(CheckGuide);
-            // Timers.inst.Remove(UpdateTime);
-        }
-
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnListBgScroll);
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, OnListBgScroll);
-        }
-
-        private void OnClickBtnBack()
-        {
-            Reset();
-            ViewManager.GoBackFrom(ViewName.LUCKY_BOX_VIEW);
-
-        }
-
-        private void OnClickBtnHome()
-        {
-            GameController.GoBackToMainView();
-        }
-
-        private void Reset()
-        {
-            LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
-
-        }
-        private void CheckGuide(object param)
-        {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.LUCKY_BOX) <= 0)
-            {
-                UpdateToCheckGuide(null);
-            }
-            else
-            {
-                Timers.inst.Remove(CheckGuide);
-            }
-        }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GObject gObject = _ui.m_listBg.GetChildAt(0);
-            if (gObject == null) return;
-            GButton btnBuyTen = gObject.asCom.GetChild("btnBuyTen").asButton;
-
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 1, "“摘星”里可以通过星辰的力量获得服饰。", -1, true, _ui.target.height - 600);
-            GuideController.TryGuide(btnBuyTen, ConstGuideId.LUCKY_BOX, 2, "点击摘取十次。");
-        }
-        protected override void TryCompleteGuide()
-        {
-            base.TryCompleteGuide();
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
-            GuideController.TryCompleteGuideIndex(cfg.id, 2);
-        }
-    }
-}

+ 0 - 11
LuckyBox/LuckyBoxView.cs.meta

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

+ 0 - 11
z_push.bat

@@ -1,11 +0,0 @@
-git status
-git push
-echo -------------------------------------------
-cd GameClient/Assets/Game/CSShare
-git status
-git push
-echo -------------------------------------------
-cd ../../../../FGUIProject
-git status
-git push
-pause

+ 0 - 16
z_update.bat

@@ -1,16 +0,0 @@
-cd GameClient/Assets/Res
-svn up
-echo -------------------------------------------
-cd ../../../
-git status
-git pull
-echo -------------------------------------------
-cd GameClient/Assets/Game/CSShare
-git status
-git pull
-echo -------------------------------------------
-cd ../../../../FGUIProject
-git status
-git pull
-
-pause

+ 0 - 82
全量上传.bat

@@ -1,82 +0,0 @@
-@echo off
-chcp 65001
-title WebGL上传调试
-
-set "OBSUTIL=C:\RuanJian\obsutil_windows_amd64\obsutil.exe"
-
-echo ===== 调试信息 =====
-echo 当前目录: %CD%
-echo OBSUTIL: %OBSUTIL%
-echo.
-
-:: 第一个上传任务
-set "LOCAL_DIR1=C:\Code\Client\GameClient\Bundles\WebGL\GameLogic\HostPlay"
-set "OBS_DIR1=obs://gfg-client/ResWebGlTest/WebGL/GameLogic/HostPlay/"
-
-echo ===== 任务1: 上传GameLogic/HostPlay =====
-echo 本地目录: %LOCAL_DIR1%
-echo OBS目录: %OBS_DIR1%
-echo.
-
-echo 执行命令...
-%OBSUTIL% cp "%LOCAL_DIR1%" "%OBS_DIR1%" -r -f -flat -u -vmd5
-
-if %errorlevel% equ 0 (
-    echo [成功] 任务1上传完成!
-) else (
-    echo [错误] 任务1上传失败,错误代码: %errorlevel%
-    goto :error
-)
-
-echo.
-
-:: 第二个上传任务
-set "LOCAL_DIR2=C:\Code\Client\GameClient\build\webgl"
-set "OBS_DIR2=obs://gfg-client/ResWebGlTest/gfg/"
-
-echo ===== 任务2: 上传WebGL构建文件 =====
-echo 本地目录: %LOCAL_DIR2%
-echo OBS目录: %OBS_DIR2%
-echo.
-
-echo 执行命令...
-%OBSUTIL% cp "%LOCAL_DIR2%" "%OBS_DIR2%" -r -f -flat -u -vmd5
-
-if %errorlevel% equ 0 (
-    echo [成功] 任务2上传完成!
-) else (
-    echo [错误] 任务2上传失败,错误代码: %errorlevel%
-    goto :error
-)
-
-echo.
-
-:: 第三个上传任务
-set "LOCAL_DIR3=C:\Code\Client\BuildPush\webgl"
-set "OBS_DIR3=obs://gfg-client/ResWebGlTest/gfg/"
-
-echo ===== 任务3: 上传BuildPush/webgl =====
-echo 本地目录: %LOCAL_DIR3%
-echo OBS目录: %OBS_DIR3%
-echo.
-
-echo 执行命令...
-%OBSUTIL% cp "%LOCAL_DIR3%" "%OBS_DIR3%" -r -f -flat -u -vmd5
-
-if %errorlevel% equ 0 (
-    echo [成功] 任务3上传完成!
-) else (
-    echo [错误] 任务3上传失败,错误代码: %errorlevel%
-    goto :error
-)
-
-echo.
-echo ===== 所有任务完成 =====
-goto :end
-
-:error
-echo.
-echo ===== 上传过程中出现错误 =====
-
-:end
-pause

Некоторые файлы не были показаны из-за большого количества измененных файлов