update GameDictionary

hundun000 · Feb 26, 2023 · f1a8bdc · f1a8bdc
1 parent 32ef713
commit f1a8bdc
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 9 deletions.
diff --git a/IdleDemo-game/core/assets/skins/DefaultSkinWithFreeType/DefaultSkinWithFreeType.json b/IdleDemo-game/core/assets/skins/DefaultSkinWithFreeType/DefaultSkinWithFreeType.json
@@ -47,7 +47,7 @@
 		"font": "MiSans-Bold.ttf",
 		"size": 16,
 		"mono": false,
-		"color": "MIKU_COLOR",
+		"color": "black",
 		"gamma": 1.8,
 		"renderCount": 2,
 		"borderWidth": 0,
@@ -112,7 +112,7 @@
 },
 "com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle": {
 	"default": {
-		"font": "default-font",
+		"font": "MiSans-Bold",
 		"fontColorSelected": "white",
 		"fontColorUnselected": "white",
 		"selection": "selection"
@@ -139,7 +139,7 @@
 },
 "com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle": {
 	"default": {
-		"font": "default-font",
+		"font": "MiSans-Bold",
 		"fontColor": "white",
 		"background": "default-select",
 		"scrollStyle": "default",

diff --git a/IdleDemo-game/core/src/main/java/hundun/gdxgame/idledemo/logic/DemoGameDictionary.java b/IdleDemo-game/core/src/main/java/hundun/gdxgame/idledemo/logic/DemoGameDictionary.java
@@ -1,6 +1,7 @@
 package hundun.gdxgame.idledemo.logic;
 
 import java.util.List;
+import java.util.Map;
 
 import hundun.gdxgame.gamelib.base.util.JavaFeatureForGwt;
 import hundun.gdxgame.idleshare.gamelib.framework.util.text.IGameDictionary;
@@ -89,4 +90,12 @@ public List<String> getMemuScreenTexts(Language language) {
                 return JavaFeatureForGwt.arraysAsList("IdleDemo", "New Game", "Continue", "Language", "Take effect after restart");
         }
     }
+
+    @Override
+    public Map<Language, String> getLanguageShowNameMap() {
+        return JavaFeatureForGwt.mapOf(
+                Language.CN, "中文",
+                Language.EN, "English"
+                );
+    }
 }
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ allprojects {
         gdxFreeTypeGwtVersion = '1.9.10.1'
         gwtFrameworkVersion = '2.8.2'
 
-        hundunLibVersion = '55fef3b76d'
+        hundunLibVersion = '236a579777'
         raeleusStripeVersion = '1.4.1'
     }
 

diff --git a/...re/core/src/hundun/gdxgame/idleshare/core/starter/ui/screen/menu/LanguageSwitchBoard.java b/...re/core/src/hundun/gdxgame/idleshare/core/starter/ui/screen/menu/LanguageSwitchBoard.java
@@ -1,7 +1,10 @@
 package hundun.gdxgame.idleshare.core.starter.ui.screen.menu;
 
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
@@ -25,8 +28,9 @@ public class LanguageSwitchBoard<T_GAME extends BaseIdleGame<T_SAVE>, T_SAVE> ex
 
     BaseIdleMenuScreen<T_GAME, T_SAVE> parent;
     @Getter
-    SelectBox<Language> selectBox;
+    SelectBox<String> selectBox;
     Label restartHintLabel;
+    private Map<Language, String> languageShowNameMap;
 
     LanguageSwitchBoard(BaseIdleMenuScreen<T_GAME, T_SAVE> parent,
             Language[] values,
@@ -37,19 +41,27 @@ public class LanguageSwitchBoard<T_GAME extends BaseIdleGame<T_SAVE>, T_SAVE> ex
             ) {
         this.parent = parent;
         this.setBackground(DrawableFactory.getSimpleBoardBackground());
-
+        this.languageShowNameMap = parent.getGame().getIdleGameplayExport().getGameDictionary().getLanguageShowNameMap();
 
         this.add(new Label(startText, parent.getGame().getMainSkin()));
 
 
         this.selectBox = new SelectBox<>(parent.getGame().getMainSkin());
-        selectBox.setItems(values);
-        selectBox.setSelected(current);
+        selectBox.setItems(Stream.of(values)
+                .map(it -> languageShowNameMap.get(it))
+                .collect(Collectors.toList())
+                .toArray(new String[] {})
+                );
+        selectBox.setSelected(languageShowNameMap.get(current));
         selectBox.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {
                 restartHintLabel.setVisible(true);
-                onSelect.accept(selectBox.getSelected());
+                Language language = languageShowNameMap.entrySet().stream()
+                        .filter(x -> x.getValue().equals(selectBox.getSelected()))
+                        .findFirst()
+                        .get().getKey();
+                onSelect.accept(language);
             }
         });
         this.add(selectBox).row();

diff --git a/...are/gamelib/src/hundun/gdxgame/idleshare/gamelib/framework/util/text/IGameDictionary.java b/...are/gamelib/src/hundun/gdxgame/idleshare/gamelib/framework/util/text/IGameDictionary.java
@@ -1,6 +1,7 @@
 package hundun.gdxgame.idleshare.gamelib.framework.util.text;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author hundun
@@ -13,4 +14,5 @@ public interface IGameDictionary {
     String constructionIdToShowName(Language language, String constructionId);
     String constructionIdToDetailDescroptionConstPart(Language language, String constructionId);
     List<String> getMemuScreenTexts(Language language);
+    Map<Language, String> getLanguageShowNameMap();
 }