Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb

This commit is contained in:
hujiabin 2024-04-23 14:40:27 +08:00
commit ef7b0759c3
3 changed files with 23 additions and 2 deletions

16
docker/php7.4/Dockerfile Normal file
View File

@ -0,0 +1,16 @@
# Download base image ubuntu 20.04
FROM ubuntu:20.04
# LABEL about the custom image
LABEL maintainer="aozhiwei@kingsome.cn"
LABEL version="0.1"
LABEL description="This is custom Docker Image for \
the php Services."
# RUN sh -c '/bin/echo -e "\n6\n70" | sh Anaconda3-4.4.0-Linux-x86_64.sh'
# 6 70
RUN apt update
RUN apt install -y tzdata
RUN apt install -y net-tools iputils-ping vim mariadb-client redis php php-fpm php-pdo php-mysql php-redis php-mbstring
#php-pecl-libsodium
#RUN sh -c '/bin/echo -e "\n6\n70" | apt install -y net-tools iputils-ping mariadb-client php php-fpm'

View File

@ -594,7 +594,7 @@ class UserController extends BaseAuthedController {
$heroInfo = Hero::toDto($heroDb);
$heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
{
$preset = HeroPreset::getHeroPreset($heroUniId);
HeroPreset::upsertPresetNew($heroUniId, $specSkill);
$heroInfo['spec_skill'] = '' . $specSkill;
}
myself()->_rspData(array(

View File

@ -93,4 +93,9 @@ class HeroPreset extends BaseModel {
)
);
}
}
public static function upsertPresetNew($heroId,$skillId){
self::upsertPreset($heroId, $skillId, 0, 0, 0);
}
}