Commit Graph

341 Commits (242ec973ade4c92cb210b62f3f0c6dd7b4f88b56)

Author SHA1 Message Date
luyao 352de7108e 【神将头像朝向修改左>右】 2021-11-27 16:45:05 +08:00
wangzhenxing 1c7de24da1 [战斗]=======人物属性名称修改 2021-11-22 14:42:39 +08:00
wangzhenxing 9f374c1cd5 [战斗]========属性描述修改 2021-11-22 14:39:34 +08:00
gaoxin e077b70f02 【图片压缩】修改spine动画图片的压缩配置 2021-11-01 17:19:18 +08:00
gaoxin f9417e0746 【隐私协议】文字内容由代码控制 2021-10-27 17:03:47 +08:00
gaoxin 2b74430e61 【隐私协议】修改隐私协议的配置方式,查看协议的连接由GM协议配置的母包配置 2021-10-27 16:22:24 +08:00
gaoxin ab20dc943c 【用户隐私协议】内容完善 2021-10-25 13:53:44 +08:00
gaoxin b30a5e09eb 【用户隐私协议】添加到健康提示之后,热更之前 2021-10-21 10:21:03 +08:00
jiaoyangna a62e656d7b Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-29 15:49:39 +08:00
gaoxin eb452a1c69 【图片压缩工具】 2021-09-28 19:44:39 +08:00
jiaoyangna a8eeec83f6 Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
2021-09-22 20:53:08 +08:00
gaoxin a3bc278624 【配置】获取配置前,拉取更新 2021-09-18 12:02:16 +08:00
gaoxin 071e7db748 【配置】打包和同步校验服修改到配置文件工程中 2021-09-17 19:22:45 +08:00
gaoxin c17ea51996 【先遣配置】修改打包和战斗校验服分支配置 2021-09-17 16:10:01 +08:00
jiaoyangna d9c2f3451b 好感度第一次提交 2021-09-14 14:45:22 +08:00
zhangshanxue e4f65ba04b Merge branch 'china/test' into china/xq 2021-09-07 18:07:31 +08:00
gaoxin e04cb9cdb8 【热更新】修改热更新配置文件 2021-09-07 18:05:30 +08:00
zhangshanxue ddab583582 Merge branch 'china/dev' into china/xq 2021-09-06 11:02:57 +08:00
gaoxin 65dfb661ad 【version】修复设置version文件失败的问题 2021-09-06 11:02:11 +08:00
zhangshanxue 39fc099fe6 Merge branch 'china/dev' into china/xq
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-03 16:01:20 +08:00
gaoxin 7d8bb2bc36 【Version工具】修改配置文件走svn 2021-09-03 15:54:33 +08:00
gaoxin 104100ad01 【还原图片优化工具】 2021-09-03 09:49:30 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
gaoxin 908ca14632 【shader】添加对所有平台的支持 2021-08-28 13:40:15 +08:00
zhangshanxue 0946e743ba 【覆盖安装包时清除缓存】 2021-08-27 16:46:26 +08:00
gaoxin 672ca7db26 【判空方法】修复组件无法判断空值的问题 2021-08-26 22:29:19 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
gaoxin a6e93212d0 【数数】修改部分数据到进入游戏时上报 2021-08-25 19:38:49 +08:00
JLIOSM1 4756f15a93 【热更工具】优化IOS更新卡死的问题 2021-08-24 16:04:06 +08:00
gaoxin 090bd32b66 【Version】只显示配置文件 2021-08-16 16:50:48 +08:00
jiaoyangna f45b61adba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 10:55:15 +08:00
gaoxin 2d065b675c 【资源优化工具】ui贴图优化,修改为图片优化像素为2的N次方 2021-08-11 18:14:50 +08:00
jiaoyangna c3d45f1316 【ID1010059】
【新功能】太初密卷
2021-08-11 15:15:41 +08:00
gaoxin 5dc039ab3a 【热更配置】跨服热更从test分支出 2021-08-04 22:14:59 +08:00
gaoxin b82f910df8 【热更新】热更新界面退出游戏弹窗优化 2021-08-03 15:47:02 +08:00
gaoxin 233df8ca23 【AB包】添加解密工具 2021-08-02 11:22:24 +08:00
gaoxin 7d1c748a75 【热更工具】文件大小显示错误 2021-08-02 10:22:00 +08:00
gaoxin 09ab5dea99 【热更工具】文件大小保留两位xiaoshu 2021-08-02 10:11:14 +08:00
gaoxin e3730ac549 【热更工具】更新列表显示每个文件的大小 2021-08-02 10:06:33 +08:00
gaoxin 7757dc2f1e 【热更配置】添加跨服测试热更配置 2021-07-31 15:59:48 +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
jiaoyangna 957513db52 添加一些log 2021-07-28 17:41:48 +08:00
jiaoyangna 0d16b1511a 资源删除工具修改提交 2021-07-28 17:26:13 +08:00
jiaoyangna b98fd71d35 删除资源工具提交 2021-07-28 17:00:14 +08:00
gaoxin d7009c9950 【热更配置】添加动游和灵动商务服热更配置 2021-07-28 15:32:08 +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
gaoxin d0249ac5f0 【打包工具】优化Android出包时替换文件夹导致部分.so文件被删除的问题 2021-07-23 17:45:35 +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
gaoxin a16d134d2d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:37:13 +08:00
gaoxin 1d49490fe3 【热更工具】提交热更文件到git时,如果目录不存在则创建 2021-07-22 19:37:06 +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 d1a82b5132 【IOS】打开文本的方式兼容IOS 2021-07-21 16:49:54 +08:00
JLIOSM1 12a8fd2417 【IOS】添加IOS热更新配置,修改热更新文件名连接符为下划线 2021-07-21 16:48:45 +08:00
DESKTOP-98AVA47\Administrator 06cf7f6cdd 资源导入自动上传提交 2021-07-19 17:48:31 +08:00
jiaoyangna 4d8bf852d4 Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
2021-07-19 14:10:11 +08:00
jiaoyangna 01b3f79c43 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40 2021-07-19 14:09:40 +08:00
gaoxin 3205cdf5d0 【热更配置】添加游心渠道 2021-07-17 12:57:43 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
JLIOSM1 8f272916c5 【资源加载】IOS资源加载增加前缀:file:// 2021-07-15 23:09:33 +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
DESKTOP-98AVA47\Administrator 9b97a35ce8 mata 文件修改提交 2021-07-15 19:44:55 +08:00
ZhangBiao edaacd0e69 重复名资源提交 2021-07-15 17:24:56 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
JLIOSM1 63dc0dc0c2 合并zf_test到iOS 2021-07-13 18:55:21 +08:00
JLIOSM1 1ba37dce92 【IOS】修改翻译文件 2021-07-13 18:20:56 +08:00
JLIOSM1 b2f88a0d29 【ios】修改宏定义,修复resconfig加载失败 2021-07-13 18:20:03 +08:00
JLIOSM1 683a13bf2a 【IOS】修改iOS包的AB包目录结构 2021-07-12 18:31:52 +08:00
gaoxin 9b48609229 【C#Log】C#层log打印走log等级控制 2021-07-09 11:56:53 +08:00
JLIOSM1 ab339f2b37 【IOS】添加IOS执行命令行的工具代码 2021-07-07 16:44:21 +08:00
jiaoyangna b36edb9ae9 资源导入工具修改提交 2021-07-05 18:52:37 +08:00
jiaoyangna c6963b337c 添加音频导入工具 2021-07-05 16:43:19 +08:00
jiaoyangna bc4d6fb744 资源导入工具修改提交
(cherry picked from commit e587f6d35d7b4b592e1785c1aa9bc27c190a0e0e)
2021-07-05 16:32:40 +08:00
wangzhenxing fd3b2c0ed6 [战斗]=============减怒数字图片字修改提交,生成材质球文本文件修改提交 2021-07-03 18:52:28 +08:00
zhangqiang c87576944f 【刷资源提交】 2021-07-03 17:02:18 +08:00
wangzhenxing 6ad90cf3cf [战斗]==========伤害文字修改提交 2021-07-03 15:50:58 +08:00
jiaoyangna cf412831e2 buildconfig 脚本提交 2021-07-02 16:24:50 +08:00
jiaoyangna 69ea241c46 config 修改 2021-07-02 16:23:09 +08:00
jiaoyangna 5bd477fbab config 修改提交 2021-07-02 13:05:29 +08:00
gaoxin 38b1a22a2d 【bug】尝试修复打开游戏时花瓶的问题 2021-06-30 19:50:47 +08:00
gaoxin 318323e50d 【配置】新增硬核渠道配置 2021-06-28 14:12:13 +08:00
jiaoyangna 0c7c48beaf 删除多余脚本 2021-06-28 11:10:23 +08:00
jiaoyangna 10e4552c4f Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-06-28 10:31:22 +08:00
gaoxin 8085adfe25 【工具】同步战斗校验服,添加未进版本的文件 2021-06-28 10:27:08 +08:00
gaoxin da16945d78 【工具】同步战斗校验服代码添加,提交需svn命令行工具
https://www.visualsvn.com/files/Apache-Subversion-1.14.1.zip
2021-06-26 19:52:08 +08:00
gaoxin d89d4427c1 【背景适配】优化宽屏下背景显示错误 2021-06-26 15:16:50 +08:00
gaoxin 09cddf573e 【背景适配】优化宽屏下背景显示错误 2021-06-25 11:12:22 +08:00
jiaoyangna 1690b59b67 buildconfig工具优化 2021-06-24 16:22:21 +08:00
gaoxin 9d0c42f0ca 【配置】添加硬核渠道,先遣打包配置,热更删除默认密码 2021-06-24 13:54:48 +08:00
jiaoyangna 8b3e5dbae4 config build 提交 2021-06-22 20:41:51 +08:00
jiaoyangna 97da91abc3 buildconfig 修改提交 2021-06-22 20:37:34 +08:00
gaoxin e88dcb7863 【热更】脚本优化,添加自动打tag的功能 2021-06-18 16:03:27 +08:00
gaoxin 12bd0b64a1 Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-17 10:26:13 +08:00
JieLing a9685687a3 Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test 2021-06-17 10:01:30 +08:00
gaoxin 6cf9492d06 【优化更新界面显示】 2021-06-16 18:23:30 +08:00
gaoxin 98b1518306 【添加stream配置】 2021-06-16 17:29:17 +08:00
gaoxin fbd02f1a29 【工具】热更和打包工具完成后自动提交 2021-06-16 11:47:07 +08:00