ZhangBiao
|
57cdcc0809
|
【寻宝迷踪】增加到达特效
|
2021-08-13 15:34:06 +08:00 |
jiaoyangna
|
76dbc01270
|
Merge branch 'china/dev' into 0功能/silingshilian
|
2021-08-12 15:54:58 +08:00 |
ZhangBiao
|
bbe2bb6d6d
|
【寻宝迷踪】提交
|
2021-08-12 12:00:18 +08:00 |
ZhangBiao
|
13777a78cb
|
【寻宝迷踪】增加主角箭头
|
2021-08-11 19:33:01 +08:00 |
ZhangBiao
|
d017873b79
|
【寻宝迷踪】提交
|
2021-08-10 15:27:32 +08:00 |
jiaoyangna
|
34357fddff
|
滑动条修改提交
|
2021-08-06 15:47:31 +08:00 |
jiaoyangna
|
5cf3388a59
|
滑动 回弹修改提交
|
2021-08-06 11:29:06 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
jiaoyangna
|
488b7469f6
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:52:30 +08:00 |
jiaoyangna
|
3f9b6be120
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:36:39 +08:00 |
wangzhenxing
|
4358ef97e3
|
[bug]====聊天界面称号特效穿透问题修改
|
2021-08-02 14:27:13 +08:00 |
ZhangBiao
|
e829b33d14
|
【万象商会】白篇处理
|
2021-07-30 16:34:50 +08:00 |
gaoxin
|
5aadeb406b
|
【聊天】聊天框根据内容跳转到不同的频道
|
2021-07-30 14:07:08 +08:00 |
jiaoyangna
|
f4cc4d7df6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:46:11 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
gaoxin
|
e552db5499
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:43:04 +08:00 |
gaoxin
|
ef78e0ae21
|
【跨服聊天】添加跨服聊天频道
|
2021-07-28 17:42:58 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
|
2021-07-28 16:58:52 +08:00 |
wangzhenxing
|
68e3a32140
|
[bug]====称号层级修改
|
2021-07-28 16:41:37 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
ZhangBiao
|
07de90eb45
|
【提交】
|
2021-07-26 15:07:49 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029.
|
2021-07-26 10:00:59 +08:00 |
ZhangBiao
|
7e9fad28b7
|
【万象商会】提交
|
2021-07-24 19:33:56 +08:00 |
ZhangBiao
|
4c73ac0976
|
【万象商会】刷新
|
2021-07-24 18:59:42 +08:00 |
ZhangBiao
|
ccc208b2c4
|
【万象商会】界面关闭
|
2021-07-24 17:02:30 +08:00 |
jiaoyangna
|
fd7d51168d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:12:46 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
ZhangBiao
|
38bbb808b4
|
【主题活动】商店
|
2021-07-23 19:05:53 +08:00 |
wangzhenxing
|
20bf67d50e
|
【称号】====称号特效显示修改,称号特效预设修改
|
2021-07-23 18:23:55 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
c2dfe0ee92
|
【IOS提审】链接提审服时,部分按钮跳转到妖晶充值
|
2021-07-21 11:33:09 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
gaoxin
|
2cc76fd123
|
Merge branch 'china/ios' into china/dev
|
2021-07-16 15:57:29 +08:00 |
JLIOSM1
|
56e7492a91
|
【商店】修复妖精商店资源回收导致白片
|
2021-07-16 15:37:48 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
wangzhenxing
|
fe8714f7fa
|
[乾坤宝盒]========优化提交
|
2021-07-15 16:43:35 +08:00 |
ZhangBiao
|
109a109301
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
# Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/StreamingAssets/Android.meta
|
2021-07-15 16:19:05 +08:00 |
gaoxin
|
1f4499e8bb
|
【物品特效】修复魂印特效显示错误
|
2021-07-09 17:05:55 +08:00 |
gaoxin
|
be7cc055a1
|
【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示
|
2021-07-09 14:56:57 +08:00 |
ZhangBiao
|
5e1897515b
|
【商店】商店黑屏修复
|
2021-07-09 11:10:38 +08:00 |
ZhangBiao
|
e64223b78b
|
【副本】新界面提交
|
2021-07-06 16:30:58 +08:00 |
ZhangBiao
|
7b66ae5db4
|
【副本】新界面
|
2021-07-06 14:47:10 +08:00 |
jiaoyangna
|
bd030bedbc
|
神将来源 新人商城 描述修改
|
2021-07-05 17:18:49 +08:00 |
jiaoyangna
|
c038859400
|
【ID1017091】
【神将来源】跳转首充,来源界面自动关闭,再次打开情报界面自动弹出
|
2021-07-05 11:29:05 +08:00 |
jiaoyangna
|
19247e296e
|
神将来源跳转修改提交
|
2021-07-02 11:23:07 +08:00 |
jiaoyangna
|
9b01d308e8
|
孙悟空添加新人商城
|
2021-07-02 11:13:59 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
jiaoyangna
|
410a0cac4f
|
神将来源跳转星辰商店修改提交
|
2021-07-01 18:22:36 +08:00 |
ZhangBiao
|
36ccbe968b
|
【森罗幻境】排行榜信息冗余修改
|
2021-07-01 15:42:23 +08:00 |
jiaoyangna
|
2cbb0b0a59
|
添加特效
|
2021-06-30 18:46:15 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
jiaoyangna
|
9d11a48f70
|
跳转返回报错修改
|
2021-06-30 16:21:37 +08:00 |
jiaoyangna
|
a4281ed031
|
四元阵跳转修改
|
2021-06-30 16:07:37 +08:00 |
jiaoyangna
|
e44449391d
|
神将来源修改提交
|
2021-06-30 15:47:13 +08:00 |
jiaoyangna
|
b5324c165a
|
神将来源碎皮合成修改提交
|
2021-06-30 15:27:27 +08:00 |
jiaoyangna
|
a1c397d1f3
|
无尽商店添加需刷新
|
2021-06-30 14:32:58 +08:00 |
jiaoyangna
|
b65e6c7bac
|
神将来源修改提交
|
2021-06-30 14:21:02 +08:00 |
jiaoyangna
|
de642a3572
|
去掉点击事件
|
2021-06-30 10:48:50 +08:00 |
jiaoyangna
|
f834e2e17d
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-30 10:12:44 +08:00 |
jiaoyangna
|
37b7071ccf
|
【ID1009590】
【神将信息】增加神将获取途径来源预览功能
|
2021-06-29 20:05:15 +08:00 |
zhangqiang
|
6f7d6731a4
|
【特效】主城/挂机界面自己小人脚底添加光圈4
|
2021-06-25 11:52:54 +08:00 |
zhangqiang
|
20ffda9ec2
|
【特效】主城/挂机界面自己小人脚底添加光圈3
|
2021-06-24 18:13:17 +08:00 |
zhangqiang
|
a1f0db3d38
|
【特效】主城/挂机界面自己小人脚底添加光圈2
|
2021-06-24 16:19:41 +08:00 |
zhangqiang
|
c7f8a84c99
|
【特效】主城/挂机界面自己小人脚底添加光圈
|
2021-06-24 16:15:39 +08:00 |
gaoxin
|
efca8d1244
|
【称号】修复老包中称号报错
|
2021-06-22 17:42:18 +08:00 |
ZhangBiao
|
4fdbc4a559
|
【降妖夺宝】抽卡跳转修改
|
2021-06-21 11:45:03 +08:00 |
jiaoyangna
|
60b2cf1cf6
|
Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
|
2021-06-18 18:27:01 +08:00 |
gaoxin
|
21875c589f
|
【称号】称号特效显示兼容处理
|
2021-06-18 11:31:49 +08:00 |
jiaoyangna
|
10c86e509a
|
超凡入圣修改提交
|
2021-06-18 10:50:04 +08:00 |
zhangqiang
|
4438ad6a72
|
【跨服天梯】国内首提
|
2021-06-15 20:08:14 +08:00 |
zhangqiang
|
8b4aa53984
|
【心魔试炼】3
|
2021-06-09 20:29:50 +08:00 |
zhangqiang
|
d21ebe57bb
|
【心魔试炼】2
|
2021-06-09 20:12:11 +08:00 |
zhangqiang
|
d91c57f6ea
|
【心魔试炼】
|
2021-06-09 19:48:28 +08:00 |
gaoxin
|
498bc9a9b5
|
【称号】显示再优化,老包也能正常显示
|
2021-06-08 14:06:12 +08:00 |
gaoxin
|
8d6168a7d9
|
【称号】优化称号在老包中的显示
|
2021-06-08 11:04:11 +08:00 |
gaoxin
|
3204bd5945
|
【upview】优化被关闭后依然可以通过事件触发报错的问题
|
2021-06-05 00:25:54 +08:00 |
gaoxin
|
518cb7dac1
|
【无用log】
|
2021-06-04 23:59:31 +08:00 |
ZhangBiao
|
39180183a9
|
【任务头像】红点问题修改
|
2021-06-04 18:41:32 +08:00 |
ZhangBiao
|
4b708011bc
|
【玩家信息】红点问题修复 和log清楚
|
2021-06-04 16:10:17 +08:00 |
gaoxin
|
fb6338de41
|
【挂机】修复伤害数字不消失
|
2021-06-03 19:10:41 +08:00 |
gaoxin
|
ec6404419d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-03 18:10:20 +08:00 |
gaoxin
|
02f02206ca
|
【循环滚动】修复快速切换报错
|
2021-06-03 18:10:15 +08:00 |
ZhangBiao
|
1d697c5370
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-03 17:59:27 +08:00 |
ZhangBiao
|
d19325ce7b
|
【公会红点】报错修改
|
2021-06-03 17:59:14 +08:00 |
wangzhenxing
|
9c3f1cb5eb
|
[称号]====挂机界面特效显示修改,称号位置修改
|
2021-06-03 15:52:12 +08:00 |
wangzhenxing
|
200e48ed73
|
[称号]=====称号高度设置
|
2021-06-03 11:23:05 +08:00 |
gaoxin
|
d65a7fd11a
|
【称号】修复地图称号不显示
|
2021-06-02 20:53:49 +08:00 |
gaoxin
|
b7c8ed1ee1
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 19:49:20 +08:00 |
gaoxin
|
6f6df7f5d6
|
【称号】在地图中删除称号上的canvas
|
2021-06-02 19:49:14 +08:00 |
wangzhenxing
|
9bd4103768
|
【称号】====称号特效显示修改提交
|
2021-06-02 18:26:31 +08:00 |
wangzhenxing
|
6d41cde054
|
[称号]=======称号无法卸下修改提交,称号高度修改
|
2021-06-02 14:47:54 +08:00 |
gaoxin
|
548f3f9f00
|
【称号】修复老包称号显示错误的问题
|
2021-06-02 14:32:16 +08:00 |
gaoxin
|
39bb3d5c06
|
【称号】修改称号节点为通用节点
|
2021-06-01 21:13:03 +08:00 |
ZhangBiao
|
681b3b63bb
|
【每日礼包】特效问题修改
|
2021-06-01 20:02:48 +08:00 |
zhangqiang
|
028a31941f
|
【背包】背包中道具详情没有“使用”按钮
|
2021-05-29 20:44:43 +08:00 |
ZhangBiao
|
717b0039cb
|
【修行】印记提交2
|
2021-05-29 19:49:25 +08:00 |
ZhangBiao
|
1d4842a7d6
|
【修行】印记提交
|
2021-05-29 19:32:47 +08:00 |
ZhangBiao
|
5aeb2f0ed3
|
【修行】名字左侧印记提交
|
2021-05-29 18:06:15 +08:00 |
jiaoyangna
|
33909a2f91
|
【旗开得胜】社稷赏商店购买限购商品到达上限后,页面不限时已售空,需要切换页签。
|
2021-05-28 15:02:17 +08:00 |
gaoxin
|
1e36398a50
|
【内存优化】Util.Loadsprite 替换为 spLoader
|
2021-05-28 14:41:58 +08:00 |
zhangqiang
|
fe6b69bfe6
|
【bug】提交
|
2021-05-28 10:32:42 +08:00 |
gaoxin
|
d0b8f8db8e
|
【bug】修复报错
|
2021-05-27 20:24:33 +08:00 |
gaoxin
|
21208dcf58
|
【挂机】金钱特效报错
|
2021-05-27 17:39:36 +08:00 |
gaoxin
|
9b1a412eb8
|
【log】无用log删除
|
2021-05-27 16:50:49 +08:00 |
zhangqiang
|
0bcd6ade1f
|
【山河社稷图】bug + 资源 前端得刷资源
|
2021-05-27 14:06:20 +08:00 |
gaoxin
|
7a972628c3
|
Merge branch 'china/dev' into china/dev-c
|
2021-05-27 10:19:53 +08:00 |
zhangqiang
|
aca4aa47ac
|
【音效修改】
|
2021-05-26 19:40:03 +08:00 |
wangzhenxing
|
b7eaf9a65a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 16:03:40 +08:00 |
wangzhenxing
|
d821836909
|
福利红包修改提交
|
2021-05-26 16:03:28 +08:00 |
zhangqiang
|
945ee5a968
|
【bug提交】
|
2021-05-26 15:47:29 +08:00 |
zhangqiang
|
da9aeed441
|
【心魔试炼】提交
|
2021-05-26 11:48:44 +08:00 |
zhangqiang
|
281e19ad74
|
【心魔试炼】一键
|
2021-05-26 09:53:41 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
jiaoyangna
|
80691b1a9e
|
限购次数修改提交
(cherry picked from commit f7235b087b)
|
2021-05-25 11:33:52 +08:00 |
jiaoyangna
|
33834cc9b2
|
Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Atlas/FourElement.meta
# Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
# Assets/ManagedResources/LuaBytes.meta
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
# 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/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-05-24 16:39:34 +08:00 |
ZhangBiao
|
70729ca2d0
|
【修行】增加红点
|
2021-05-24 11:21:56 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
gaoxin
|
f15fbf6576
|
【探宝】物品置灰后不再显示光效
|
2021-05-21 14:14:09 +08:00 |
gaoxin
|
d89511a3d9
|
【跳转】资源条添加碎繁星辰跳转
|
2021-05-21 11:02:24 +08:00 |
ZhangBiao
|
46cc1d9591
|
【修行】限制特权入口,增加仙尘加号
|
2021-05-20 18:00:45 +08:00 |
ZhangBiao
|
be1085d2bb
|
Merge branch 'china/dev-c' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua
|
2021-05-19 20:01:57 +08:00 |
gaoxin
|
17d453dd51
|
【乾坤商店】修复消耗品显示白片的问题
|
2021-05-19 17:51:40 +08:00 |
gaoxin
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
zhangqiang
|
433bcf9ddb
|
【添加音效】
|
2021-05-18 14:24:09 +08:00 |
ZhangBiao
|
db0ede868d
|
【特权】保持开启
|
2021-05-18 09:35:25 +08:00 |
ZhangBiao
|
ffd695f3b1
|
【修行】名字提交
|
2021-05-17 15:20:20 +08:00 |
ZhangBiao
|
58e7cea17e
|
【修行】名字颜色提交
|
2021-05-17 14:34:37 +08:00 |
ZhangBiao
|
10481bc650
|
【修行】名字颜色修改
|
2021-05-17 14:15:55 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
ZhangBiao
|
8003c43f71
|
Merge branch 'china/dev-c' into 0功能/修行玩法
|
2021-05-17 10:32:30 +08:00 |
jiaoyangna
|
9662b5f236
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
# Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
# Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
# Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
|
2021-05-15 16:37:00 +08:00 |
zhangqiang
|
5292b1441b
|
【山河社稷图】提交
|
2021-05-14 16:44:40 +08:00 |
ZhangBiao
|
410262cee8
|
Merge branch 'china/dev' into 0功能/修行玩法
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-14 13:27:01 +08:00 |
ZhangBiao
|
4b20254ddd
|
【修行】提交
|
2021-05-13 21:03:27 +08:00 |
jiaoyangna
|
bc1a22a1f9
|
跳转提交
|
2021-05-13 20:59:29 +08:00 |
jiaoyangna
|
ac8eaf78bb
|
剧情音效提交
|
2021-05-13 16:32:40 +08:00 |
jiaoyangna
|
35d0f1337f
|
音效提交
|
2021-05-13 15:49:39 +08:00 |
jiaoyangna
|
20b5ded8e9
|
修改add 为addOnce
(cherry picked from commit 14b1420d14)
|
2021-05-12 17:42:51 +08:00 |
jiaoyangna
|
5817146b6f
|
主题活动修改提交
(cherry picked from commit 0b5177748b)
|
2021-05-12 17:41:19 +08:00 |
jiaoyangna
|
14b1420d14
|
修改add 为addOnce
|
2021-05-12 14:38:45 +08:00 |
jiaoyangna
|
214c971c41
|
Merge branch '0活动开发聚集地/new主题活动' into china/dev-c
|
2021-05-12 11:21:28 +08:00 |
jiaoyangna
|
e9d548d5b6
|
【活动优化】每日豪礼界面优化调整
|
2021-05-12 11:16:33 +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 |
ZhangBiao
|
7ba5209394
|
【修行】提交
|
2021-05-11 17:23:19 +08:00 |
gaoxin
|
b7b3f610ed
|
【翻译文字导出】
|
2021-05-11 17:03:09 +08:00 |
ZhangBiao
|
7104d77d7e
|
【修行】开坑
|
2021-05-11 15:09:25 +08:00 |
jiaoyangna
|
0b5177748b
|
主题活动修改提交
|
2021-05-11 14:59:41 +08:00 |
gaoxin
|
2db750da5d
|
【灵兽】修复获得灵兽时,物品无点击事件的问题
|
2021-05-11 10:32:21 +08:00 |
gaoxin
|
0f01c9eb2b
|
Merge branch 'china/dev-c' into china/dev
|
2021-04-30 12:40:23 +08:00 |
ZhangBiao
|
1980c01573
|
【竞技场】时间到弹出
|
2021-04-30 11:49:45 +08:00 |
gaoxin
|
72ab9438d1
|
【关卡】修复突破第一章最后一关进入第二章时,切换地图出现黑屏
|
2021-04-30 11:22:19 +08:00 |
jiaoyangna
|
8c7208dff3
|
删除log
|
2021-04-29 15:57:00 +08:00 |
jiaoyangna
|
1da013efda
|
剧情提交
|
2021-04-29 15:35:18 +08:00 |
jiaoyangna
|
80b9cbe3c1
|
关掉跑步音效
|
2021-04-29 11:37:12 +08:00 |
jiaoyangna
|
58e6a0a554
|
剧情提交
(cherry picked from commit f43cd38a73)
|
2021-04-27 22:21:46 +08:00 |
jiaoyangna
|
b52e90c96a
|
Merge branch 'china/dev' into china/dev-c
|
2021-04-27 20:46:12 +08:00 |
jiaoyangna
|
dd90a200c3
|
剧情提交
|
2021-04-27 20:45:03 +08:00 |
jiaoyangna
|
fd9084da86
|
关掉挂机打怪的声音
|
2021-04-27 20:18:26 +08:00 |
jiaoyangna
|
ccaab65e25
|
剧情提交
|
2021-04-27 19:51:40 +08:00 |
zhangqiang
|
f20c58dc96
|
【公会援助】 每次点击援助,列表都会重新置顶显示----3
|
2021-04-27 17:56:55 +08:00 |
gaoxin
|
357a27c100
|
Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
# Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-04-26 19:03:05 +08:00 |
jiaoyangna
|
637aa36041
|
剧情提交
|
2021-04-26 18:29:47 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
zhangqiang
|
fbd3bc91ee
|
【公会援助】每次点击援助,列表都会重新置顶显示——2
|
2021-04-25 16:54:03 +08:00 |
gaoxin
|
ae913805c5
|
【挂机】界面关闭后,携程中添加空判断防止报错
|
2021-04-25 16:49:39 +08:00 |
gaoxin
|
77955d6f9c
|
【挂机】修复金钱流光在宝箱上不消失
|
2021-04-25 16:11:00 +08:00 |
gaoxin
|
4a33407d27
|
【挂机】修复部分章节卡死
|
2021-04-25 16:05:11 +08:00 |
gaoxin
|
fa61ea1317
|
【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏
|
2021-04-22 20:39:30 +08:00 |
jiaoyangna
|
42b91c0a4e
|
剧情提交
|
2021-04-22 18:13:28 +08:00 |
zhangqiang
|
2b122d7fee
|
【公会援助】每次点击援助,列表都会重新置顶显示
|
2021-04-22 15:31:03 +08:00 |
jiaoyangna
|
3b59ae09ec
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-22 13:59:37 +08:00 |
jiaoyangna
|
a5d90a6000
|
挂机界面报错修改
|
2021-04-22 13:59:33 +08:00 |
gaoxin
|
43afe3d6f1
|
【内存】btview可能会导致重复卸载资源的问题
|
2021-04-22 13:40:04 +08:00 |
gaoxin
|
e277760221
|
【内存优化】修复资源卸载时会错误卸载其他界面的问题
|
2021-04-21 22:45:37 +08:00 |
gaoxin
|
a6dadba241
|
【内存优化】挂机地图不再回收资源,修改未加入公会时点击公会按钮界面错误的问题
|
2021-04-21 18:23:00 +08:00 |
zhangqiang
|
bf895d04d1
|
【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来
|
2021-04-21 17:49:58 +08:00 |
wangzhenxing
|
8e24eea290
|
称号bug修改
|
2021-04-21 14:42:06 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
jiaoyangna
|
61833b8b00
|
Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2021-04-20 17:51:14 +08:00 |
jiaoyangna
|
86bc16f904
|
名字添加
|
2021-04-20 17:14:25 +08:00 |
jiaoyangna
|
45b9c8d81b
|
名字提交
|
2021-04-20 16:42:59 +08:00 |
jiaoyangna
|
8590617839
|
名字提交
|
2021-04-20 16:31:41 +08:00 |
jiaoyangna
|
089f0ce436
|
挂机提交
|
2021-04-20 16:09:56 +08:00 |
jiaoyangna
|
1e04dcc200
|
名字提交
|
2021-04-20 14:52:02 +08:00 |
jiaoyangna
|
9cf2502a10
|
删除log
|
2021-04-20 14:00:53 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
jiaoyangna
|
f3fa2c9a99
|
挂机界面提交
|
2021-04-19 18:20:57 +08:00 |
zhangqiang
|
46efdd02de
|
【英雄升星祭品】提交——02
|
2021-04-19 15:11:39 +08:00 |
zhangqiang
|
de76c697c4
|
【英雄升星祭品】提交——01
|
2021-04-19 13:46:24 +08:00 |
jiaoyangna
|
d101c5ce7b
|
名字修改提交
|
2021-04-19 13:02:37 +08:00 |
jiaoyangna
|
efe1bdeab0
|
挂机界面修改
|
2021-04-19 11:58:22 +08:00 |
jiaoyangna
|
c94f1051da
|
挂机修改提交
|
2021-04-17 21:04:09 +08:00 |
jiaoyangna
|
12f1a42161
|
挂机报错 提交
|
2021-04-16 16:22:15 +08:00 |
jiaoyangna
|
3738137554
|
【挂机演示优化】挂机界面增加其他玩家
|
2021-04-15 15:51:24 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
gaoxin
|
56bf418509
|
Merge branch 'xma/dev' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua
|
2021-04-12 16:04:46 +08:00 |
jiaoyangna
|
b26f09d6a3
|
添加不显示前往按钮的跳转
|
2021-04-12 15:12:12 +08:00 |
ZhangBiao
|
692e1de637
|
偶现会显示妖晶或者经验有【200%】标识 修复
|
2021-04-10 14:15:10 +08:00 |
gaoxin
|
d620d4ff5e
|
【金钱显示】修复每日豪礼销毁再打开报错,更换MoneyNumView字体文件加载方式
|
2021-04-10 11:07:47 +08:00 |
ZhangBiao
|
da0d4f49d6
|
【装备详情】界面调整
|
2021-04-09 20:31:45 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
jiaoyangna
|
38e64fb774
|
还原文字提交
|
2021-04-09 11:39:09 +08:00 |
ZhangBiao
|
8893dd7d7b
|
【活动优化】日周月礼包增加角标及妖晶数量变更
|
2021-04-09 11:05:08 +08:00 |
gaoxin
|
645fc52869
|
【金钱组件】添加旋转接口
|
2021-04-08 20:06:57 +08:00 |
ZhangBiao
|
83f173bc74
|
【天枢密卷】提交
|
2021-04-07 17:48:07 +08:00 |
jiaoyangna
|
2a0589b1d8
|
天书秘卷修改提交
|
2021-04-07 10:58:37 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
d6319948f2
|
【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。
|
2021-04-06 22:30:21 +08:00 |
ZhangBiao
|
63bcee6168
|
Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-04-06 15:51:24 +08:00 |
gaoxin
|
cf5a2a46fa
|
【本地化】还原文本到代码种
|
2021-04-06 15:23:27 +08:00 |
gaoxin
|
0c4e2e5bf6
|
【bug】修复穿戴头像框时会报错的问题
|
2021-04-02 21:05:01 +08:00 |
ZhangBiao
|
d99899d37f
|
【十五日登陆】
|
2021-04-02 19:06:08 +08:00 |
jiaoyangna
|
3b229cd8fc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-02 17:13:29 +08:00 |
jiaoyangna
|
1b4807a144
|
itemview 关闭时设为true
|
2021-04-02 17:13:26 +08:00 |
zhangqiang
|
a73924a275
|
【称号坐骑时装】取消注释
|
2021-04-02 15:47:40 +08:00 |
jiaoyangna
|
640c866388
|
成长礼包 红点修改
|
2021-04-02 11:24:59 +08:00 |
jiaoyangna
|
a81c48c533
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
|
2021-04-01 18:52:58 +08:00 |
jiaoyangna
|
cff04dc520
|
签到 修改
|
2021-04-01 18:50:06 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
ZhangBiao
|
74077e2484
|
【十五日登陆】
|
2021-04-01 17:44:44 +08:00 |
ZhangBiao
|
e86078ce69
|
【十五日登陆】
|
2021-04-01 16:04:13 +08:00 |
zhangqiang
|
319ba45193
|
【称号坐骑时装】修改
|
2021-03-31 16:45:55 +08:00 |
jiaoyangna
|
ad24255948
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 21:02:36 +08:00 |
gaoxin
|
6e34c88fa5
|
【人物信息栏】修复战力刷新不及时的问题
|
2021-03-30 20:46:47 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
jiaoyangna
|
23b46ba218
|
活动 修改提交
|
2021-03-30 20:17:26 +08:00 |
gaoxin
|
9ca4850841
|
【特权优化】将界面顶部的特权等级移回-修复更换头像名称等不刷新,gm仅在主界面可以打开
|
2021-03-30 20:03:34 +08:00 |
gaoxin
|
c2a5c2dc17
|
【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i
|
2021-03-30 19:54:19 +08:00 |
gaoxin
|
3cc0b51edd
|
【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题
|
2021-03-30 18:42:30 +08:00 |
gaoxin
|
202658d6d9
|
【特权优化】将界面顶部的特权等级移回
|
2021-03-30 18:10:39 +08:00 |
jiaoyangna
|
87e724d19d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Common/functions.lua
|
2021-03-30 13:48:08 +08:00 |
jiaoyangna
|
ed1d9a2b1f
|
Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-03-30 13:46:49 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
zhangqiang
|
cbdfb75576
|
【称号坐骑时装】提交
|
2021-03-29 16:45:04 +08:00 |
zhangqiang
|
51bb90edce
|
【称号坐骑时装】 协议 无尽副本修改
|
2021-03-29 12:07:28 +08:00 |
zhangqiang
|
9637337c39
|
【称号坐骑时装】 修改提交
|
2021-03-27 20:01:39 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
jiaoyangna
|
cfa67e8479
|
删除log
|
2021-03-25 15:34:57 +08:00 |