jiaoyangna
|
c82afde747
|
删除log
|
2021-06-05 11:43:01 +08:00 |
jiaoyangna
|
46b4e3cd84
|
删除log
|
2021-06-05 11:18:13 +08:00 |
jiaoyangna
|
1912473cbe
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-05 11:04:46 +08:00 |
jiaoyangna
|
b5dda1e81c
|
剧情跳过修改提交
|
2021-06-05 11:04:28 +08:00 |
gaoxin
|
0e85d88c21
|
【剧情】修复连续跳过导致卡死的问题
|
2021-06-05 03:10:19 +08:00 |
jiaoyangna
|
461f481bd8
|
配音提交
|
2021-06-03 11:41:08 +08:00 |
jiaoyangna
|
d4cea59040
|
剧情跳过修改提交
|
2021-06-02 21:32:23 +08:00 |
jiaoyangna
|
06cac292f2
|
每日豪礼 修改提交
|
2021-06-02 20:20:39 +08:00 |
jiaoyangna
|
b345d54cbe
|
剧情修改提交
|
2021-06-01 20:22:14 +08:00 |
jiaoyangna
|
c95211428b
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-26 11:55:14 +08:00 |
jiaoyangna
|
4452bb1d9a
|
音效提交
|
2021-05-24 20:22:38 +08:00 |
jiaoyangna
|
c22e26a5f5
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
|
2021-05-24 13:53:28 +08:00 |
gaoxin
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
jiaoyangna
|
4c41ca0572
|
音效提交
(cherry picked from commit 5a19a26d943af8465f22614548083da158ee8c85)
|
2021-05-12 11:07:44 +08:00 |
jiaoyangna
|
0843bb8c4e
|
音效提交
(cherry picked from commit 44cc010a8a26b372fefd28e09414bfa641e90100)
|
2021-05-12 11:07:36 +08:00 |
jiaoyangna
|
412a4ec851
|
没有找到剧情继续执行,不卡死
|
2021-04-30 16:13:00 +08:00 |
jiaoyangna
|
6c673de50a
|
剧情提交
|
2021-04-30 09:50:35 +08:00 |
jiaoyangna
|
45eef519df
|
战斗剧情播放两边修改
|
2021-04-29 19:44:41 +08:00 |
jiaoyangna
|
dd8d7df89f
|
剧情特效提交
|
2021-04-29 18:55:31 +08:00 |
jiaoyangna
|
bd1f264452
|
剧情提交
|
2021-04-29 15:36:36 +08:00 |
jiaoyangna
|
1da013efda
|
剧情提交
|
2021-04-29 15:35:18 +08:00 |
jiaoyangna
|
cbc49ace13
|
屏蔽跳过按钮
(cherry picked from commit 479931095c )
|
2021-04-28 00:43:18 +08:00 |
jiaoyangna
|
e009f94f48
|
删除多余按钮
|
2021-04-28 00:25:27 +08:00 |
jiaoyangna
|
4326a6b300
|
删除多余的按钮
|
2021-04-27 23:39:40 +08:00 |
jiaoyangna
|
07810200cb
|
剧情提交
|
2021-04-27 23:37:16 +08:00 |
jiaoyangna
|
f43cd38a73
|
剧情提交
|
2021-04-27 22:21:14 +08:00 |
jiaoyangna
|
ccaab65e25
|
剧情提交
|
2021-04-27 19:51:40 +08:00 |
jiaoyangna
|
8b8d0a3956
|
剧情 提交
|
2021-04-26 18:57:54 +08:00 |
jiaoyangna
|
637aa36041
|
剧情提交
|
2021-04-26 18:29:47 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
jiaoyangna
|
a0ecd56968
|
剧情提交
|
2021-04-22 15:06:47 +08:00 |