Merge branch 'hjb' of git.kingsome.cn:server/game2006api into hjb
This commit is contained in:
commit
ef7b0759c3
16
docker/php7.4/Dockerfile
Normal file
16
docker/php7.4/Dockerfile
Normal 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'
|
@ -594,7 +594,7 @@ class UserController extends BaseAuthedController {
|
|||||||
$heroInfo = Hero::toDto($heroDb);
|
$heroInfo = Hero::toDto($heroDb);
|
||||||
$heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
|
$heroInfo['avatar_info'] = Hero::avatarInfo($heroDb);
|
||||||
{
|
{
|
||||||
$preset = HeroPreset::getHeroPreset($heroUniId);
|
HeroPreset::upsertPresetNew($heroUniId, $specSkill);
|
||||||
$heroInfo['spec_skill'] = '' . $specSkill;
|
$heroInfo['spec_skill'] = '' . $specSkill;
|
||||||
}
|
}
|
||||||
myself()->_rspData(array(
|
myself()->_rspData(array(
|
||||||
|
@ -93,4 +93,9 @@ class HeroPreset extends BaseModel {
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
public static function upsertPresetNew($heroId,$skillId){
|
||||||
|
self::upsertPreset($heroId, $skillId, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user