ZhangBiao
|
cef2b42bcc
|
【七界试炼】提交
|
2021-09-10 10:30:50 +08:00 |
ZhangBiao
|
1fefbb43e6
|
【七界试炼】提交
|
2021-09-09 11:10:43 +08:00 |
ZhangBiao
|
b05227f79e
|
【七界试炼】提交
|
2021-09-08 17:32:48 +08:00 |
ZhangBiao
|
2fe984719b
|
【七界试炼】遗物1/2
|
2021-09-08 16:26:40 +08:00 |
ZhangBiao
|
6ec532f769
|
【七界试炼】排行奖励
|
2021-09-08 14:36:37 +08:00 |
ZhangBiao
|
1693300255
|
【七界试炼】目标特性
|
2021-09-08 10:06:24 +08:00 |
ZhangBiao
|
adb77b501e
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-07 19:26:13 +08:00 |
ZhangBiao
|
db522d563e
|
【七界试炼】先显示界灵
|
2021-09-07 19:23:16 +08:00 |
wangzhenxing
|
03b2acbb91
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-07 18:45:25 +08:00 |
wangzhenxing
|
c531b3776b
|
玉虚论道提交
|
2021-09-07 18:27:23 +08:00 |
ZhangBiao
|
8c95c7f8ad
|
【七界试炼】主界面基本完成
|
2021-09-07 18:09:33 +08:00 |
wangzhenxing
|
5f0bfe53bd
|
玉虚论道提交
|
2021-09-07 17:05:46 +08:00 |
gaoxin
|
0bd0137a2b
|
【战斗】v1.0.57
1、尝试修复孙悟空大招不会增加伤害的问题
2、添加用于debug的log
|
2021-09-07 15:14:10 +08:00 |
gaoxin
|
79832f3232
|
【碎片详情】碎片详情添加灵兽和神将的查看
|
2021-09-07 11:40:12 +08:00 |
gaoxin
|
b5ad62620f
|
【背包】修复滑动后切换页签不回到最顶部的 问题
|
2021-09-06 19:23:41 +08:00 |
gaoxin
|
17ebbc1872
|
【优化】灵兽商城商品上显示当前已有的灵兽碎片
|
2021-09-06 18:19:45 +08:00 |
gaoxin
|
b953fac2a0
|
【巅峰赛】选拔赛组界面添加角色信息展示
|
2021-09-06 17:58:31 +08:00 |
ZhangBiao
|
6078ae545a
|
【七界试炼】提交
|
2021-09-06 17:21:53 +08:00 |
gaoxin
|
59ec0d6f20
|
【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题
|
2021-09-06 16:35:46 +08:00 |
gaoxin
|
11495d1076
|
【山河社稷图】修复奖励界面报错导致卡死
|
2021-09-06 11:45:30 +08:00 |
ZhangBiao
|
2d7ba67846
|
【七界试炼】提交
|
2021-09-06 11:37:49 +08:00 |
ZhangBiao
|
d564f0cf11
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-06 11:16:40 +08:00 |
ZhangBiao
|
a471905a9f
|
Merge branch 'china/dev' into 0功能/七界试炼
|
2021-09-06 11:13:15 +08:00 |
gaoxin
|
17001dd7d8
|
【防沉迷】游戏内添加未成年人判断
|
2021-09-06 11:00:34 +08:00 |
ZhangBiao
|
68791a5745
|
【战力】连续打开变负数修改
|
2021-09-03 11:10:24 +08:00 |
ZhangBiao
|
009a17a25a
|
【战力】漏提交
|
2021-09-03 10:19:51 +08:00 |
ZhangBiao
|
5ea7acdef7
|
【幸运探宝】提交
|
2021-09-02 22:35:44 +08:00 |
ZhangBiao
|
72c42eb871
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-02 22:25:08 +08:00 |
ZhangBiao
|
08e8944e47
|
【战力问题】PVP增减伤引起的战力不统一问题修改
|
2021-09-02 22:24:58 +08:00 |
gaoxin
|
316adf6fbd
|
【登录】优化登录失败时,界面文字提示
|
2021-09-02 22:12:58 +08:00 |
ZhangBiao
|
fbfa80611a
|
【幸运摊薄】时间显示
|
2021-09-02 20:58:11 +08:00 |
ZhangBiao
|
f6d05b433d
|
【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致
|
2021-09-02 18:07:49 +08:00 |
gaoxin
|
45ddf4e09e
|
【防沉迷】修复切服不生效,添加防沉迷登录提示
|
2021-09-02 14:27:18 +08:00 |
ZhangBiao
|
d3f7213de0
|
【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑
|
2021-09-02 11:34:15 +08:00 |
ZhangBiao
|
6bbf30e344
|
【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000
|
2021-09-02 11:19:29 +08:00 |
ZhangBiao
|
00bd84f77c
|
【升星有礼】增加新将例会
|
2021-09-02 09:57:17 +08:00 |
jiaoyangna
|
3ef0ad39b6
|
【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
|
2021-09-01 20:06:09 +08:00 |
jiaoyangna
|
5b8001ce28
|
【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
(cherry picked from commit 41831fad79 )
|
2021-09-01 19:36:19 +08:00 |
wangzhenxing
|
3e36a537b3
|
[战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改
|
2021-09-01 18:40:32 +08:00 |
wangzhenxing
|
dcacc94fad
|
玉虚论道脚本预设提交
|
2021-08-31 15:10:27 +08:00 |
gaoxin
|
8a0b1c80a2
|
【战斗】被动添加时Log
|
2021-08-31 14:48:44 +08:00 |
gaoxin
|
4e8e552ca8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-31 14:29:46 +08:00 |
wangzhenxing
|
7eeebb014e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-31 14:26:02 +08:00 |
wangzhenxing
|
8c6c57d916
|
[战斗]=============被动263 269 274 332 112 145 修改提交
|
2021-08-31 14:25:43 +08:00 |
gaoxin
|
93413b3b07
|
【战斗】添加一些战斗日志
|
2021-08-31 14:25:29 +08:00 |
gaoxin
|
c67c9fb93b
|
【战斗】修复战斗报错
|
2021-08-31 13:44:13 +08:00 |
ZhangBiao
|
4e9ce855f2
|
【玩家神将信息界面】魂印本身战力不增加修改
|
2021-08-30 18:45:21 +08:00 |
ZhangBiao
|
1f2a21a587
|
【推荐工会】
|
2021-08-30 16:24:30 +08:00 |
wangzhenxing
|
01ad6f3229
|
【玉虚轮道】=====功能入口提交
|
2021-08-30 15:41:14 +08:00 |
ZhangBiao
|
f484e60f87
|
【工会推荐】搜索修改
|
2021-08-30 15:37:10 +08:00 |