 MushrooMagician
|
b41f6e9453
|
Merge remote-tracking branch 'origin/feature/xk/language' into dajun
# Conflicts:
# tgx-games-client/assets/Prefebs.meta
# tgx-games-client/assets/Prefebs/role/Character001.prefab
# tgx-games-client/assets/Prefebs/role/Character002.prefab
# tgx-games-client/assets/Prefebs/role/Character003.prefab
# tgx-games-client/assets/level1/Script/AreanPlayer.ts.meta
# tgx-games-client/assets/level1/Script/BattleView.ts.meta
# tgx-games-client/assets/level1/Script/PlayerController.ts
# tgx-games-client/assets/level1/Script/WoodenManGame.ts.meta
# tgx-games-client/assets/level1/Script/gameManager.ts
# tgx-games-client/assets/level1/Script/player.ts
# tgx-games-client/assets/level1/UI/图层 0.png.meta
# tgx-games-client/assets/level1/scene/level1Scene.scene
# tgx-games-client/assets/level3/scene/BallScene.scene
# tgx-games-client/assets/level3/script/GameManager.ts
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_bluegray.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_red.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_rectangle_01_n_yellow.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Button/btn_sqeure_01.png.meta
# tgx-games-client/assets/module_arean/common/comUI/Label/label_tag_01_Demo.png.meta
# tgx-games-client/assets/module_arean/common/role/doll.prefab
# tgx-games-client/assets/module_arean/common/role/red_c.prefab
# tgx-games-client/assets/module_arean/lobby_arean.scene
# tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
# tgx-games-client/assets/module_arean/scripts/AreanLobbyScene.ts
# tgx-games-client/assets/module_arean/scripts/common/CameraOrbit.ts
# tgx-games-client/assets/module_arean/ui_searching_rival/ui_searching_rival.prefab
# tgx-games-client/assets/module_basic/scripts/FrontConfig.ts
# tgx-games-client/tsconfig.json
# tgx-games-server/src/SrvGame/RoomArean.ts
# tgx-games-server/src/db/mongodb/MongoDBHero.ts
# tgx-games-server/src/shared/configs/data/LanguageCfg.json.meta
# tgx-games-server/src/shared/configs/interface/ILanguageCfg.ts.meta
|
2025-02-21 14:15:16 +08:00 |
xukuan