DESKTOP-98AVA47\Administrator
|
c3cdf85e4d
|
【大闹天宫】试炼节点
|
2021-03-17 11:48:25 +08:00 |
JieLing
|
a0135661dc
|
【大闹天宫】试炼节点显示修改
|
2021-03-15 11:35:40 +08:00 |
JieLing
|
1982c4f81c
|
logo图标替换
|
2021-03-15 10:01:00 +08:00 |
jiaoyangna
|
1a50957fce
|
修改提交
|
2021-03-13 20:20:20 +08:00 |
wangzhenxing
|
0ed597648a
|
[战斗]========= buff 叠层表现修改
|
2021-03-13 16:42:24 +08:00 |
ZhangBiao
|
a5224f0744
|
【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败)
|
2021-03-13 16:42:13 +08:00 |
gaoxin
|
9b449fb958
|
【策划场景】修改战斗中立绘的配置方式
|
2021-03-13 16:41:57 +08:00 |
JieLing
|
0bae1d524b
|
【回滚提交】1
|
2021-03-13 16:41:06 +08:00 |
JieLing
|
054d6cba54
|
Revert "[战斗]=============272被动修改 根据配置回合数开始计算概率"
This reverts commit 130a7d6548 .
|
2021-03-13 16:39:02 +08:00 |
JieLing
|
7a8de27f1c
|
Revert "[战斗]==============249修改"
This reverts commit b67d6485c9 .
|
2021-03-13 16:38:43 +08:00 |
JieLing
|
177d07ecfd
|
Revert "【战斗】=========打闹天宫获取英雄模板数据修改,改为全从 heroconfig 表获取"
This reverts commit a2b96970cc .
|
2021-03-13 16:37:33 +08:00 |
JieLing
|
60100b65cd
|
Revert "【策划场景】修改战斗中立绘的配置方式"
This reverts commit ee6fde0370 .
|
2021-03-13 16:36:11 +08:00 |
JieLing
|
c2da8ae81f
|
Revert "【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败)"
This reverts commit b926310982 .
|
2021-03-13 16:35:59 +08:00 |
JieLing
|
be28abd54c
|
Revert "[战斗]========= buff 叠层表现修改"
This reverts commit 491a6f311a .
|
2021-03-13 16:35:35 +08:00 |
ZhangBiao
|
17a9550df8
|
【首领来袭】
|
2021-03-13 15:52:50 +08:00 |
jiaoyangna
|
b63d62c7f1
|
文字修改提交
|
2021-03-13 14:25:25 +08:00 |
jiaoyangna
|
b260a2d0d8
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 14:22:54 +08:00 |
jiaoyangna
|
c7860fec99
|
文字修改提交
|
2021-03-13 14:22:48 +08:00 |
ZhangBiao
|
a9d26fb31e
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 14:01:04 +08:00 |
ZhangBiao
|
e9cadb6cb9
|
重登确认框
|
2021-03-13 14:00:27 +08:00 |
jiaoyangna
|
ea095efbfd
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 13:57:50 +08:00 |
jiaoyangna
|
8eec6650f2
|
图片提交
|
2021-03-13 13:57:42 +08:00 |
ZhangBiao
|
0779a816e0
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-13 12:57:41 +08:00 |
ZhangBiao
|
5334a7c7da
|
【首领来袭】
|
2021-03-13 12:57:31 +08:00 |
jiaoyangna
|
8656408ac9
|
宝箱状态修改
|
2021-03-12 18:18:25 +08:00 |
jiaoyangna
|
388f68d39d
|
鸿蒙提示修改
|
2021-03-12 17:28:10 +08:00 |
jiaoyangna
|
446d9c85ea
|
添加妖晶不足提示
|
2021-03-12 17:24:24 +08:00 |
jiaoyangna
|
5ed4d34201
|
合并修改提交
|
2021-03-12 17:08:51 +08:00 |
jiaoyangna
|
aa94edf1d7
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
|
2021-03-12 16:41:18 +08:00 |
jiaoyangna
|
579f2806c3
|
竞技守卫名字修改提交
(cherry picked from commit d3efa809d8 )
|
2021-03-12 16:35:55 +08:00 |
jiaoyangna
|
fa64d90f08
|
社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea )
|
2021-03-12 15:55:57 +08:00 |
jiaoyangna
|
5be52f6b33
|
限时活动提交
(cherry picked from commit e3460c8b83 )
|
2021-03-12 15:48:29 +08:00 |
ZhangBiao
|
4f326e59e5
|
【本地化】战力排名弹窗,弹窗中无玩家排名,排名未刷新
|
2021-03-12 15:10:55 +08:00 |
ZhangBiao
|
51c0b51a87
|
【本地化】魂灵宝处需要修改
|
2021-03-12 15:07:17 +08:00 |
jiaoyangna
|
7b5cc295e8
|
文字提交
|
2021-03-12 14:32:45 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
dd706075d2
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
|
2021-03-12 14:30:10 +08:00 |
jiaoyangna
|
8430af12af
|
文字提交
|
2021-03-12 14:24:41 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
decb1e6ff0
|
图片提交
|
2021-03-12 14:13:42 +08:00 |
jiaoyangna
|
2a6a2e69da
|
图片提交,巅峰赛竞技守卫名字提交
|
2021-03-12 12:08:24 +08:00 |
jiaoyangna
|
5acc67ead5
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-03-12 11:11:25 +08:00 |
jiaoyangna
|
a018c485c0
|
哪吒修改提交
|
2021-03-12 11:11:14 +08:00 |
wangzhenxing
|
491a6f311a
|
[战斗]========= buff 叠层表现修改
|
2021-03-12 11:04:06 +08:00 |
jiaoyangna
|
04ab1e5451
|
社稷大典奖励领取提交
|
2021-03-12 10:32:32 +08:00 |
ZhangBiao
|
b926310982
|
【大闹天宫】死亡神将可以一键上阵,并且进入战斗页直接显示(败)
|
2021-03-11 15:05:38 +08:00 |
ZhangBiao
|
9b30532bda
|
【图鉴】十星神将图鉴等级显示错误
|
2021-03-11 14:32:08 +08:00 |
ZhangBiao
|
1e2dc32804
|
【列表打开动画】森罗幻境选择神将界面,每选中一个头像都会播一遍动画
|
2021-03-11 14:28:44 +08:00 |
jiaoyangna
|
292069ba5d
|
活动提交
|
2021-03-11 10:59:49 +08:00 |
ZhangBiao
|
4631f663a8
|
【本地化】魂灵宝处需要修改
|
2021-03-11 10:41:34 +08:00 |